Trying to fix mac workflow issue

lightningrodlabs · Mar 14, 2023 · 6087a87 · 6087a87
1 parent 6286633
commit 6087a87
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/electron/package.json b/electron/package.json
@@ -15,7 +15,8 @@
   },
   "scripts": {
     "postinstall": "electron-builder install-app-deps",
-    "build": "tsc",
+    "import-webapp": "cp -v -r ../webapp/dist/* web",
+    "build": "npm run import-webapp && tsc",
     "help": "electron --help",
     "devtest": "npm run build && electron .",
     "dist:win": "electron-builder --win",

diff --git a/package.json b/package.json
@@ -30,7 +30,7 @@
     "build:dna"            : "npm run build:zome && mkdir -p artifacts && $npm_package_config_bin/hc dna pack -o artifacts/where.dna dna/workdir/dna-where && $npm_package_config_bin/hc dna pack -o artifacts/ludotheque.dna dna/workdir/dna-ludotheque",
     "build:happ"           : "npm run build:dna && $npm_package_config_bin/hc app pack -o artifacts/where.happ dna/workdir/happ-where && $npm_package_config_bin/hc app pack -o artifacts/where-standalone.happ dna/workdir/happ-where-standalone && $npm_package_config_bin/hc app pack -o ./artifacts/ludotheque.happ dna/workdir/happ-ludotheque && npm run copy:happ",
 
-    "copy:happ"            : "cp artifacts/where.happ electron/bin && cp artifacts/ludotheque.happ electron/bin",
+    "copy:happ"            : "cp -v artifacts/where.happ electron/bin && cp -v artifacts/ludotheque.happ electron/bin",
     "extract:localize"     : "npm run localize:extract -w webcomponents && npm run localize:extract -w webapp",
     "build:localize"       : "npm run localize:build -w webcomponents && npm run localize:build -w webapp",
 
@@ -68,7 +68,7 @@
 
     "test"                 : "npm run build:happ && npm run build -w @where/elements && npm t -w @where/tests",
 
-    "package:webapp"       : "rm -rf artifacts/where-webapp-ui.zip & cp webapp/logo.svg webapp/dist && cd webapp/dist && bestzip ../../artifacts/where-webapp-ui.zip * && cd ../../ && $npm_package_config_bin/hc web-app pack webapp/webhapp.workdir -o artifacts/where.webhapp",
+    "package:webapp"       : "rm -rf artifacts/where-webapp-ui.zip & cp -v webapp/logo.svg webapp/dist && cd webapp/dist && bestzip ../../artifacts/where-webapp-ui.zip * && cd ../../ && $npm_package_config_bin/hc web-app pack webapp/webhapp.workdir -o artifacts/where.webhapp",
     "package:we-applet"    : "rm -rf artifacts/where-we_applet-ui.zip & cd we-applet/dist && bestzip ../../artifacts/where-we_applet-ui.zip * && cd ../../ && $npm_package_config_bin/hc web-app pack we-applet/webhapp.workdir",
 
     "update-version"       : "bash scripts/update-version-number.sh $npm_package_version",

diff --git a/webapp.ludotheque/package.json b/webapp.ludotheque/package.json
@@ -8,7 +8,7 @@
     "build": "rm -rf dist && tsc",
     "build:watch": "tsc -w --incremental --preserveWatchOutput",
     "dist": "npm run tsc && rollup -c",
-    "start:ui": "cp index.html dist && concurrently --names tsc,dev-server \"npm run build:watch\" \"web-dev-server --config ./web-dev-server.config.mjs\""
+    "start:ui": "cp -v index.html dist && concurrently --names tsc,dev-server \"npm run build:watch\" \"web-dev-server --config ./web-dev-server.config.mjs\""
   },
   "devDependencies": {
     "@babel/preset-env": "^7.15.0",

diff --git a/webapp/package.json b/webapp/package.json
@@ -7,7 +7,7 @@
   "scripts": {
     "build": "rm -rf dist && tsc",
     "build:watch": "tsc -w --incremental --preserveWatchOutput",
-    "dist": "npm run build && rollup -c rollup.config.js && cp logo.svg dist && cd dist && cp -r * ../../electron/web",
+    "dist": "rm -rf dist && tsc && rollup -c rollup.config.js && cp -v logo.svg dist",
     "start:ui": "concurrently --names tsc,dev-server \"npm run build:watch\" \"web-dev-server --config ./web-dev-server.config.mjs\"",
     "start:ui-old": "web-dev-server --config ./web-dev-server.config.mjs",
     "localize:extract": "lit-localize extract",