chore: improve extension scripts and provide dev command for firefox

Author: pczeglik-iohk

apps/browser-extension-wallet/package.json

@@ -25,24 +25,33 @@
     "README.md"
   ],
   "scripts": {
-    "build": "NODE_OPTIONS='--openssl-legacy-provider' rm -rf dist && yarn build:sw && yarn build:app",
+    "build": "run-s cleanup:dist build:project",
     "build:app": "NODE_OPTIONS='--openssl-legacy-provider' run -T webpack --config webpack.app.${WEBPACK_ENV:-prod}.js --progress",
     "build:dev": "WEBPACK_ENV=dev yarn build",
     "build:firefox": "BROWSER=firefox yarn build",
     "build:firefox:dev": "WEBPACK_ENV=dev yarn build:firefox",
+    "build:project": "run-p build:sw build:app",
     "build:sw": "NODE_OPTIONS='--openssl-legacy-provider' run -T webpack --config webpack.sw.${WEBPACK_ENV:-prod}.js --progress",
-    "cleanup": "yarn exec rm -rf dist node_modules",
-    "dev": "NODE_OPTIONS='--openssl-legacy-provider' rm -rf dist & run -T webpack --config webpack.sw.dev.js --progress --watch & run -T webpack serve --config webpack.app.dev.js --env RUN_DEV_SERVER=true",
+    "cleanup": "run-p cleanup:*",
+    "cleanup:dist": "rm -rf dist",
+    "cleanup:firefox-artifacts": "rm -rf artifacts-firefox",
+    "cleanup:node_modules": "rm -rf node_modules",
+    "dev": "run-s cleanup:dist watch:sw serve:app",
+    "dev:firefox": "BROWSER=firefox run-s cleanup:dist watch:sw serve:app ",
     "format-check": "echo \"@lace/browser-extension-wallet: no format-check command specified\"",
     "lint": "cd ../.. && yarn extension:lint",
     "prepack": "yarn build",
-    "pack:firefox": "rm -rf artifacts-firefox && web-ext build --source-dir=dist --artifacts-dir=artifacts-firefox",
+    "pack:firefox": "run-s cleanup:firefox-artifacts && web-ext build --source-dir=dist --artifacts-dir=artifacts-firefox",
     "prepare": "ts-patch install -s",
     "prettier": "run -T prettier --write .",
+    "serve:app": "NODE_OPTIONS='--openssl-legacy-provider' run -T webpack serve --config webpack.app.dev.js --env RUN_DEV_SERVER=true",
     "test": "run -T jest --config test/jest.config.js",
     "test:e2e": "yarn exec echo \"No e2e tests on this app yet!\"",
     "type-check": "echo \"@lace/browser-extension-wallet: no type-check command specified\"",
-    "watch": "NODE_OPTIONS='--openssl-legacy-provider' rm -rf dist & run -T webpack --config webpack.sw.dev.js --progress --watch & run -T webpack --config webpack.app.dev.js --progress --watch"
+    "watch": " run-s cleanup:dist watch:project",
+    "watch:app": "NODE_OPTIONS='--openssl-legacy-provider' run -T webpack --config webpack.app.dev.js --progress --watch",
+    "watch:sw": "NODE_OPTIONS='--openssl-legacy-provider' run -T webpack --config webpack.sw.dev.js --progress --watch",
+    "watch:project": "run-p watch:sw watch:app"
   },
   "dependencies": {
     "@ant-design/icons": "^4.7.0",
@@ -129,6 +138,7 @@
     "fake-indexeddb": "3.1.3",
     "fork-ts-checker-webpack-plugin": "^7.2.1",
     "jest-webextension-mock": "^3.9.0",
+    "npm-run-all": "4.1.5",
     "source-map-loader": "^5.0.0",
     "text-encoding-utf-8": "^1.0.2",
     "tsconfig-paths-webpack-plugin": "3.5.2",

package.json

@@ -191,6 +191,7 @@
     "node-gyp": "^9.4.0",
     "node-polyfill-webpack-plugin": "^3.0.0",
     "node-sass": "9.0.0",
+    "npm-run-all": "4.1.5",
     "p-retry": "5.1.2",
     "postcss": "8.4.31",
     "prettier": "^2.3.2",

packages/e2e-tests/package.json

@@ -5,22 +5,22 @@
   "author": "IOHK",
   "type": "module",
   "scripts": {
+    "allure": "npm run allure:generate && npm run allure:open",
+    "allure:clean": "rm -rf ./reports/allure",
+    "allure:generate": "yarn allure generate -c ./reports/allure/results -o ./reports/allure/report",
+    "allure:open": "allure open ./reports/allure/report/",
     "build": "yarn exec echo 'No build required'",
-    "test": "echo \"@lace/e2e-tests: no test command specified\"",
-    "test:local:chrome": "../../node_modules/.bin/wdio run wdio.conf.chrome.ts",
-    "test:local:edge": "../../node_modules/.bin/wdio run wdio.conf.edge.ts",
-    "test:local:firefox": "../../node_modules/.bin/wdio run wdio.conf.firefox.ts",
     "cleanup": "rm -rf logs node_modules reports screenshots",
     "lint": "run -T eslint -c .eslintrc.cjs .",
     "lint:fix": "run -T eslint -c .eslintrc.cjs . --fix",
     "pack-chrome-extension": "node ./src/utils/packExtension.ts",
+    "prettier": "prettier --write .",
     "safari:build": "sh tools/convertChromeExtToSafari.sh",
     "safari:open": "sh tools/openSafariExtension.sh",
-    "allure:generate": "yarn allure generate -c ./reports/allure/results -o ./reports/allure/report",
-    "allure:open": "allure open ./reports/allure/report/",
-    "allure": "npm run allure:generate && npm run allure:open",
-    "allure:clean": "rm -rf ./reports/allure",
-    "prettier": "prettier --write ."
+    "test": "echo \"@lace/e2e-tests: no test command specified\"",
+    "test:local:chrome": "../../node_modules/.bin/wdio run wdio.conf.chrome.ts",
+    "test:local:edge": "../../node_modules/.bin/wdio run wdio.conf.edge.ts",
+    "test:local:firefox": "../../node_modules/.bin/wdio run wdio.conf.firefox.ts"
   },
   "dependencies": {
     "@types/chai": "4.3.16",
@@ -53,7 +53,6 @@
     "eslint-plugin-import": "2.27.5",
     "eslint-plugin-wdio": "8.37.0",
     "flat": "6.0.1",
-    "npm-run-all": "4.1.5",
     "ts-node": "10.9.1",
     "typescript": "^4.9.5",
     "wdio-intercept-service": "4.4.1",

yarn.lock

@@ -12453,6 +12453,7 @@ __metadata:
     little-state-machine: 4.8.0
     lodash: 4.17.21
     node-abort-controller: ^3.1.1
+    npm-run-all: 4.1.5
     openpgp: ^5.11.2
     p-debounce: ^4.0.0
     pluralize: ^8.0.0
@@ -12647,7 +12648,6 @@ __metadata:
     eslint-plugin-import: 2.27.5
     eslint-plugin-wdio: 8.37.0
     flat: 6.0.1
-    npm-run-all: 4.1.5
     ts-node: 10.9.1
     typescript: ^4.9.5
     wdio-intercept-service: 4.4.1
@@ -42860,6 +42860,7 @@ __metadata:
     node-polyfill-webpack-plugin: ^3.0.0
     node-sass: 9.0.0
     normalize.css: ^8.0.1
+    npm-run-all: 4.1.5
     p-retry: 5.1.2
     postcss: 8.4.31
     prettier: ^2.3.2