Skip to content

Commit 6087a87

Browse files
committed
Trying to fix mac workflow issue
1 parent 6286633 commit 6087a87

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

electron/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
},
1616
"scripts": {
1717
"postinstall": "electron-builder install-app-deps",
18-
"build": "tsc",
18+
"import-webapp": "cp -v -r ../webapp/dist/* web",
19+
"build": "npm run import-webapp && tsc",
1920
"help": "electron --help",
2021
"devtest": "npm run build && electron .",
2122
"dist:win": "electron-builder --win",

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"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",
3131
"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",
3232

33-
"copy:happ" : "cp artifacts/where.happ electron/bin && cp artifacts/ludotheque.happ electron/bin",
33+
"copy:happ" : "cp -v artifacts/where.happ electron/bin && cp -v artifacts/ludotheque.happ electron/bin",
3434
"extract:localize" : "npm run localize:extract -w webcomponents && npm run localize:extract -w webapp",
3535
"build:localize" : "npm run localize:build -w webcomponents && npm run localize:build -w webapp",
3636

@@ -68,7 +68,7 @@
6868

6969
"test" : "npm run build:happ && npm run build -w @where/elements && npm t -w @where/tests",
7070

71-
"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",
71+
"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",
7272
"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",
7373

7474
"update-version" : "bash scripts/update-version-number.sh $npm_package_version",

webapp.ludotheque/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"build": "rm -rf dist && tsc",
99
"build:watch": "tsc -w --incremental --preserveWatchOutput",
1010
"dist": "npm run tsc && rollup -c",
11-
"start:ui": "cp index.html dist && concurrently --names tsc,dev-server \"npm run build:watch\" \"web-dev-server --config ./web-dev-server.config.mjs\""
11+
"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\""
1212
},
1313
"devDependencies": {
1414
"@babel/preset-env": "^7.15.0",

webapp/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"scripts": {
88
"build": "rm -rf dist && tsc",
99
"build:watch": "tsc -w --incremental --preserveWatchOutput",
10-
"dist": "npm run build && rollup -c rollup.config.js && cp logo.svg dist && cd dist && cp -r * ../../electron/web",
10+
"dist": "rm -rf dist && tsc && rollup -c rollup.config.js && cp -v logo.svg dist",
1111
"start:ui": "concurrently --names tsc,dev-server \"npm run build:watch\" \"web-dev-server --config ./web-dev-server.config.mjs\"",
1212
"start:ui-old": "web-dev-server --config ./web-dev-server.config.mjs",
1313
"localize:extract": "lit-localize extract",

0 commit comments

Comments
 (0)