Merge pull request #10 from b263/release/0.6.0

Release 0.6.0
b263 · Jan 4, 2024 · c0e08bb · c0e08bb
2 parents c47565c + 37ca4c6
commit c0e08bb
Show file tree

Hide file tree

Showing 63 changed files with 14,218 additions and 543 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,11 @@
 /src/dev.b263.time-tracker.sdPlugin/**/*.bundle.js
 /src/dev.b263.time-tracker.sdPlugin/**/*.bundle.js.map
 /src/dev.b263.time-tracker.sdPlugin/*.txt
+/src/dev.b263.time-tracker.sdPlugin/actions/track/property-inspector
+/src/dev.b263.time-tracker.sdPlugin/external
 
 DistributionTool
 
 .DS_Store
-*.svg
+/*.svg
 
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Time tracker plugin for Elgato Stream Deck (v0.5.0)
+# Time tracker plugin for Elgato Stream Deck (v0.6.0)
 
 [![GitHub release (latest by SemVer including pre-releases)](https://img.shields.io/github/downloads-pre/b263/stream-deck-time-tracker/latest/total?style=for-the-badge&label=Download)](https://github.com/b263/stream-deck-time-tracker/releases/latest/download/dev.b263.time-tracker.streamDeckPlugin)
 ![Last commit](https://img.shields.io/github/last-commit/b263/stream-deck-time-tracker/main?style=for-the-badge)

diff --git a/install/install-macos.sh b/install/install-macos.sh
diff --git a/install/dev-macos.sh → scripts/dev-macos.sh b/install/dev-macos.sh → scripts/dev-macos.sh
diff --git a/install/uninstall-macos.sh → scripts/uninstall-macos.sh b/install/uninstall-macos.sh → scripts/uninstall-macos.sh
diff --git a/src/dev.b263.time-tracker.sdPlugin/actions/report/assets/action.svg b/src/dev.b263.time-tracker.sdPlugin/actions/report/assets/action.svg
diff --git a/src/dev.b263.time-tracker.sdPlugin/actions/track/assets/action.svg b/src/dev.b263.time-tracker.sdPlugin/actions/track/assets/action.svg
diff --git a/src/dev.b263.time-tracker.sdPlugin/actions/track/property-inspector/inspector.html b/src/dev.b263.time-tracker.sdPlugin/actions/track/property-inspector/inspector.html
diff --git a/src/dev.b263.time-tracker.sdPlugin/app.html → ...v.b263.time-tracker.sdPlugin/app/app.html b/src/dev.b263.time-tracker.sdPlugin/app.html → ...v.b263.time-tracker.sdPlugin/app/app.html
@@ -16,14 +16,14 @@
 
   <body>
     <!-- Stream Deck Libs -->
-    <script src="libs/js/constants.js"></script>
-    <script src="libs/js/prototypes.js"></script>
-    <script src="libs/js/timers.js"></script>
-    <script src="libs/js/utils.js"></script>
-    <script src="libs/js/events.js"></script>
-    <script src="libs/js/api.js"></script>
-    <script src="libs/js/stream-deck.js"></script>
-    <script src="libs/js/action.js"></script>
+    <script src="../libs/js/constants.js"></script>
+    <script src="../libs/js/prototypes.js"></script>
+    <script src="../libs/js/timers.js"></script>
+    <script src="../libs/js/utils.js"></script>
+    <script src="../libs/js/events.js"></script>
+    <script src="../libs/js/api.js"></script>
+    <script src="../libs/js/stream-deck.js"></script>
+    <script src="../libs/js/action.js"></script>
 
     <!-- Plugin Source -->
     <script src="app.bundle.js"></script>

diff --git a/src/dev.b263.time-tracker.sdPlugin/assets/category.svg b/src/dev.b263.time-tracker.sdPlugin/assets/category.svg
diff --git a/src/dev.b263.time-tracker.sdPlugin/external.html b/src/dev.b263.time-tracker.sdPlugin/external.html
diff --git a/src/dev.b263.time-tracker.sdPlugin/manifest.json b/src/dev.b263.time-tracker.sdPlugin/manifest.json
@@ -5,8 +5,8 @@
   "Description": "Time tracker using the Tracking Time platform. Requires a free account.",
   "Icon": "assets/category",
   "URL": "https://github.com/b263/stream-deck-time-tracker/issues",
-  "Version": "0.5.0",
-  "CodePath": "app.html",
+  "Version": "0.6.0",
+  "CodePath": "app/app.html",
   "Software": {
     "MinimumVersion": "5.0"
   },
@@ -34,7 +34,7 @@
       ],
       "Tooltip": "Start/stop time tracking",
       "UUID": "dev.b263.time-tracker.track",
-      "PropertyInspectorPath": "actions/track/property-inspector/inspector.html"
+      "PropertyInspectorPath": "actions/track/property-inspector/index.html"
     }
   ]
 }
diff --git a/src/js/package.json b/src/js/package.json
@@ -6,7 +6,10 @@
   "type": "module",
   "scripts": {
     "lint": "eslint src",
-    "build": "npm run lint && BUILD_TARGET=production rollup -c && npm run licenses",
+    "build": "npm run lint && BUILD_TARGET=production rollup -c && npm run licenses && npm run build:ui",
+    "build:ui": "npm run build:ui:external && npm run build:ui:track",
+    "build:ui:external": "cd ../ui && npm run build:external && mv dist/external/browser dist/external/external && cp -r dist/external/external ../dev.b263.time-tracker.sdPlugin",
+    "build:ui:track": "cd ../ui && npm run build:track && mv dist/action-track-pi/browser dist/action-track-pi/property-inspector && cp -r dist/action-track-pi/property-inspector ../dev.b263.time-tracker.sdPlugin/actions/track",
     "licenses": "generate-license-file --input package.json --output ../dev.b263.time-tracker.sdPlugin/THIRD-PARTY-LICENSES.txt --overwrite && cp ../../LICENSE ../dev.b263.time-tracker.sdPlugin/LICENSE.txt",
     "dist:version": "node_modules/node-jq/bin/jq '.Version' ../dev.b263.time-tracker.sdPlugin/manifest.json",
     "dist:dir": "npm run --silent dist:version | tr -d \"\\\"\"",

diff --git a/src/js/rollup.config.js b/src/js/rollup.config.js
@@ -16,7 +16,6 @@ function config([input, file]) {
       nodeResolve(),
       typescript({
         tsconfig: false,
-        // compilerOptions: { allowJs: true, outDir: "out", target: "es6" },
         compilerOptions: { target: "es6" },
       }),
       sentryRollupPlugin({
@@ -33,15 +32,4 @@ function config([input, file]) {
 const src = "./src";
 const target = "../dev.b263.time-tracker.sdPlugin";
 
-export default [
-  [`${src}/app.ts`, `${target}/app.bundle.js`],
-  [`${src}/external.ts`, `${target}/external.bundle.js`],
-  [
-    `${src}/action-track-pi.ts`,
-    `${target}/actions/track/property-inspector/inspector.bundle.js`,
-  ],
-  [
-    `${src}/action-report-pi.ts`,
-    `${target}/actions/report/property-inspector/inspector.bundle.js`,
-  ],
-].map(config);
+export default [[`${src}/app.ts`, `${target}/app/app.bundle.js`]].map(config);