From 6642dbad51ef2e5b82b19143de3af2001e1c2cc9 Mon Sep 17 00:00:00 2001 From: Mo Date: Sun, 12 Jun 2022 20:41:38 -0500 Subject: [PATCH] chore: workflows --- .github/workflows/desktop.release.yml | 6 +++--- package.json | 4 ---- packages/components/package.json | 2 +- packages/desktop/package.json | 5 +++-- .../desktop/scripts/{afterSignHook.js => notarizeMac.js} | 0 packages/icons/package.json | 2 +- packages/styles/package.json | 2 +- packages/toast/package.json | 2 +- packages/web-server/package.json | 3 ++- packages/web/package.json | 3 ++- 10 files changed, 14 insertions(+), 15 deletions(-) rename packages/desktop/scripts/{afterSignHook.js => notarizeMac.js} (100%) diff --git a/.github/workflows/desktop.release.yml b/.github/workflows/desktop.release.yml index 0d541bd53..19a94131a 100644 --- a/.github/workflows/desktop.release.yml +++ b/.github/workflows/desktop.release.yml @@ -16,7 +16,7 @@ jobs: with: registry-url: 'https://registry.npmjs.org' - run: yarn install - - run: yarn build:web:front + - run: yarn build:web:all - name: Compile Mac run: yarn run webpack --config desktop.webpack.prod.js - name: MacX64 @@ -48,7 +48,7 @@ jobs: with: registry-url: 'https://registry.npmjs.org' - run: yarn install - - run: yarn build:web:front + - run: yarn build:web:all - name: Compile for AppImage run: yarn run webpack --config desktop.webpack.prod.js - name: AppImage @@ -116,7 +116,7 @@ jobs: with: registry-url: 'https://registry.npmjs.org' - run: yarn install - - run: yarn build:web:front + - run: yarn build:web:all - run: yarn run webpack --config desktop.webpack.prod.js - run: yarn run electron-builder --windows --x64 --ia32 --publish=never diff --git a/package.json b/package.json index 3b5fcd5d6..346bf08f1 100644 --- a/package.json +++ b/package.json @@ -20,10 +20,6 @@ "build:toast": "yarn workspace @standardnotes/toast build", "build:styles": "yarn workspace @standardnotes/styles build", "build:web": "yarn workspace @standardnotes/web build", - "build:web:front": "yarn build:icons && yarn build:toast && yarn build:styles && yarn build:components && yarn build:web", - "build:web:back": "yarn workspace @standardnotes/web-server build", - "build:web:all": "yarn build:web:front && yarn build:web:back", - "build:components": "yarn workspace @standardnotes/components-meta build", "start:server:web": "lerna run start --scope=@standardnotes/web-server", "start:server:web:localhost": "lerna run start:no-binding --scope=@standardnotes/web-server", "prepare": "husky install", diff --git a/packages/components/package.json b/packages/components/package.json index 3bf1a51e5..fda105c00 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -8,7 +8,7 @@ ] }, "scripts": { - "build": "yarn workspaces foreach --parallel run build", + "build": "echo BUILDING COMPONENTS && yarn workspaces foreach --parallel run build", "lint": "yarn workspaces foreach --parallel run lint", "version": "node scripts/package-components.mjs && git add dist && git commit -m 'chore(release): components'" }, diff --git a/packages/desktop/package.json b/packages/desktop/package.json index ce14fa4f0..4db02be9d 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -15,7 +15,8 @@ }, "scripts": { "build:remove-unpacked": "rimraf dist/{linux-*,mac,win-*}", - "build": "yarn run webpack --config desktop.webpack.prod.js", + "build": "echo BUILDING DESKTOP && yarn run webpack --config desktop.webpack.prod.js", + "build:desktop:all": "yarn workspaces foreach -ptR run build", "change-version": "node scripts/change-version.mjs", "clean:build": "rimraf app/dist/", "clean:tests": "rimraf test/data/tmp/", @@ -88,7 +89,7 @@ "electronVersion": "17.4.2", "appId": "org.standardnotes.standardnotes", "artifactName": "${name}-${version}-${os}-${arch}.${ext}", - "afterSign": "scripts/afterSignHook.js", + "afterSign": "scripts/notarizeMac.js", "files": [ "compiled/**/*", "dist/**/*", diff --git a/packages/desktop/scripts/afterSignHook.js b/packages/desktop/scripts/notarizeMac.js similarity index 100% rename from packages/desktop/scripts/afterSignHook.js rename to packages/desktop/scripts/notarizeMac.js diff --git a/packages/icons/package.json b/packages/icons/package.json index b3aaf62f9..717c1f4c6 100644 --- a/packages/icons/package.json +++ b/packages/icons/package.json @@ -7,7 +7,7 @@ "scripts": { "start": "webpack-dev-server --config webpack.config.js", "watch": "webpack -w --config webpack.config.js", - "build": "webpack --config webpack.config.js && yarn run tsc", + "build": "echo BUILDING ICONS && webpack --config webpack.config.js && yarn run tsc", "tsc": "tsc --project ./tsconfig.json" }, "devDependencies": { diff --git a/packages/styles/package.json b/packages/styles/package.json index 1d48d64dc..4365f8cca 100644 --- a/packages/styles/package.json +++ b/packages/styles/package.json @@ -8,7 +8,7 @@ "access": "public" }, "scripts": { - "build": "webpack --mode='production' && yarn run tsc", + "build": "echo BUILDING STYLES && webpack --mode='production' && yarn run tsc", "start": "webpack --watch --mode='development'", "lint": "prettier --check *.js" }, diff --git a/packages/toast/package.json b/packages/toast/package.json index c37f77326..b8794c0a2 100644 --- a/packages/toast/package.json +++ b/packages/toast/package.json @@ -4,7 +4,7 @@ "private": true, "main": "./dist/index.js", "scripts": { - "build": "yarn tsc", + "build": "echo BUILDING TOAST && yarn tsc", "clean": "rm -fr dist", "prestart": "yarn clean", "start": "tsc -p tsconfig.json --watch", diff --git a/packages/web-server/package.json b/packages/web-server/package.json index ce3135030..5ce1b56c2 100644 --- a/packages/web-server/package.json +++ b/packages/web-server/package.json @@ -12,7 +12,8 @@ "start": "bundle exec rails s -b 0.0.0.0", "start:no-binding": "bundle exec rails s", "build:components": "cp -r ../../node_modules/@standardnotes/components/dist/. public/components/", - "build": "bundle install && yarn build:components && bundle exec rails assets:precompile" + "build": "bundle install && yarn build:components && bundle exec rails assets:precompile", + "build:server:all": "yarn workspaces foreach -ptR run build" }, "dependencies": { "@standardnotes/components-meta": "^0.2.0", diff --git a/packages/web/package.json b/packages/web/package.json index 084a32c75..23a645a8d 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -13,7 +13,8 @@ "watch": "webpack -w --config web.webpack.dev.js", "clean": "rm -fr dist", "prebuild": "yarn clean", - "build": "webpack --config web.webpack.prod.js && yarn tsc", + "build": "echo BUILDING WEB && webpack --config web.webpack.prod.js && yarn tsc", + "build:web:all": "yarn workspaces foreach -ptR run build", "lint": "eslint src/javascripts", "tsc": "tsc --project tsconfig.json", "test": "jest --config jest.config.js --coverage",