diff --git a/.github/workflows/desktop.publish.yml b/.github/workflows/desktop.publish.yml index 96b852bd3..ac4633590 100644 --- a/.github/workflows/desktop.publish.yml +++ b/.github/workflows/desktop.publish.yml @@ -126,7 +126,7 @@ jobs: CSC_LINK: ${{ secrets.mac_certs }} CSC_KEY_PASSWORD: ${{ secrets.mac_certs_password }} run: | - npm run release -- --variant=mas + npx nx run release --project @notesnook/desktop -- --variant=mas npx electron-builder --mac mas --universal -p never working-directory: ./apps/desktop @@ -139,7 +139,7 @@ jobs: APPLE_API_KEY_ID: ${{ secrets.api_key_id }} APPLE_API_KEY_ISSUER: ${{ secrets.api_key_issuer_id }} run: | - npm run release + npx nx run release --project @notesnook/desktop if [ ${{ inputs.publish-github }} == true ]; then npx electron-builder --mac zip dmg --arm64 --x64 -p always else @@ -192,7 +192,7 @@ jobs: npx lerna bootstrap --ignore=@notesnook/mobile -- --prefer-offline --no-audit - name: Build Electron wrapper - run: npm run release + run: npx nx run release --project @notesnook/desktop working-directory: ./apps/desktop - name: Build snap @@ -242,7 +242,7 @@ jobs: npx lerna bootstrap --ignore=@notesnook/mobile -- --prefer-offline --no-audit - name: Build Electron wrapper - run: npm run release + run: npx nx run release --project @notesnook/desktop working-directory: ./apps/desktop - name: Build app diff --git a/apps/desktop/package.json b/apps/desktop/package.json index ba0452962..5ebae64a1 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -36,6 +36,7 @@ "start": "turbowatch scripts/dev.ts", "staging": "zx scripts/build.mjs --run", "release": "zx scripts/build.mjs", + "build": "tsc", "bundle": "esbuild electron=./src/main.ts ./src/preload.ts --external:electron --external:fsevents --minify --bundle --outdir=./build --platform=node --tsconfig=tsconfig.json --define:MAC_APP_STORE=false --define:RELEASE=true", "bundle:mas": "esbuild electron=./src/main.ts ./src/preload.ts --minify --external:electron --external:fsevents --bundle --outdir=./build --platform=node --tsconfig=tsconfig.json --define:MAC_APP_STORE=true --define:RELEASE=true", "postinstall": "patch-package" diff --git a/nx.json b/nx.json index d1a3c6960..257278212 100644 --- a/nx.json +++ b/nx.json @@ -17,6 +17,10 @@ "{projectRoot}/languages" ] }, + "release": { + "dependsOn": ["^build"], + "outputs": ["{projectRoot}/build"] + }, "build:test": { "dependsOn": ["^build"], "outputs": ["{projectRoot}/build"]