chore(nx): add name to each project

This commit is contained in:
Elian Doran 2025-04-30 22:28:25 +03:00
parent e314372fbd
commit 87d7dc8618
No known key found for this signature in database
13 changed files with 20 additions and 18 deletions

View File

@ -86,7 +86,7 @@ runs:
APPLE_ID_PASSWORD: ${{ env.APPLE_ID_PASSWORD }} APPLE_ID_PASSWORD: ${{ env.APPLE_ID_PASSWORD }}
WINDOWS_SIGN_EXECUTABLE: ${{ env.WINDOWS_SIGN_EXECUTABLE }} WINDOWS_SIGN_EXECUTABLE: ${{ env.WINDOWS_SIGN_EXECUTABLE }}
TRILIUM_ARTIFACT_NAME_HINT: TriliumNextNotes-${{ github.ref_name }}-${{ inputs.os }}-${{ inputs.arch }} TRILIUM_ARTIFACT_NAME_HINT: TriliumNextNotes-${{ github.ref_name }}-${{ inputs.os }}-${{ inputs.arch }}
run: pnpm nx --project=@triliumnext/desktop electron-forge:make -- --arch=${{ inputs.arch }} --platform=${{ inputs.forge_platform }} run: pnpm nx --project=desktop electron-forge:make -- --arch=${{ inputs.arch }} --platform=${{ inputs.forge_platform }}
# Add DMG signing step # Add DMG signing step
- name: Sign DMG - name: Sign DMG

View File

@ -23,7 +23,7 @@ runs:
shell: bash shell: bash
run: | run: |
pnpm run chore:update-build-info pnpm run chore:update-build-info
pnpm nx --project=@triliumnext/server package pnpm nx --project=server package
- name: Prepare artifacts - name: Prepare artifacts
shell: bash shell: bash
run: | run: |

View File

@ -115,7 +115,7 @@ jobs:
- name: Update build info - name: Update build info
run: pnpm run chore:update-build-info run: pnpm run chore:update-build-info
- name: Trigger build - name: Trigger build
run: pnpm nx run @triliumnext/server:build run: pnpm nx run server:build
- uses: docker/setup-buildx-action@v3 - uses: docker/setup-buildx-action@v3
- uses: docker/build-push-action@v6 - uses: docker/build-push-action@v6
with: with:
@ -143,7 +143,7 @@ jobs:
- name: Update build info - name: Update build info
run: pnpm run chore:update-build-info run: pnpm run chore:update-build-info
- name: Trigger build - name: Trigger build
run: pnpm nx run @triliumnext/server:build run: pnpm nx run server:build
- name: Set IMAGE_NAME to lowercase - name: Set IMAGE_NAME to lowercase
run: echo "IMAGE_NAME=${IMAGE_NAME,,}" >> $GITHUB_ENV run: echo "IMAGE_NAME=${IMAGE_NAME,,}" >> $GITHUB_ENV

View File

@ -56,7 +56,7 @@ jobs:
run: npx playwright install --with-deps run: npx playwright install --with-deps
- name: Run the TypeScript build - name: Run the TypeScript build
run: npm nx run @triliumnext/server:build run: npm nx run server:build
- name: Build and export to Docker - name: Build and export to Docker
uses: docker/build-push-action@v6 uses: docker/build-push-action@v6

View File

@ -59,5 +59,8 @@
"@types/react-dom": "18.3.6", "@types/react-dom": "18.3.6",
"happy-dom": "17.4.4", "happy-dom": "17.4.4",
"script-loader": "0.7.2" "script-loader": "0.7.2"
},
"nx": {
"name": "client"
} }
} }

View File

@ -45,6 +45,7 @@
}, },
"description": "Build your personal knowledge base with TriliumNext Notes", "description": "Build your personal knowledge base with TriliumNext Notes",
"nx": { "nx": {
"name": "desktop",
"targets": { "targets": {
"postbuild": { "postbuild": {
"executor": "nx:run-commands", "executor": "nx:run-commands",

View File

@ -17,9 +17,6 @@
"eslint.config.mjs" "eslint.config.mjs"
], ],
"references": [ "references": [
{
"path": "../server/tsconfig.app.json"
},
{ {
"path": "../desktop/tsconfig.app.json" "path": "../desktop/tsconfig.app.json"
}, },

View File

@ -3,9 +3,6 @@
"files": [], "files": [],
"include": [], "include": [],
"references": [ "references": [
{
"path": "../server"
},
{ {
"path": "../desktop" "path": "../desktop"
}, },

View File

@ -3,9 +3,10 @@
"version": "0.0.1", "version": "0.0.1",
"private": true, "private": true,
"nx": { "nx": {
"name": "server-e2e",
"implicitDependencies": [ "implicitDependencies": [
"@triliumnext/client", "client",
"@triliumnext/server" "server"
] ]
} }
} }

View File

@ -124,8 +124,9 @@
"copy-webpack-plugin": "13.0.0" "copy-webpack-plugin": "13.0.0"
}, },
"nx": { "nx": {
"name": "server",
"implicitDependencies": [ "implicitDependencies": [
"@triliumnext/client" "client"
], ],
"targets": { "targets": {
"serve": { "serve": {
@ -135,15 +136,15 @@
"build" "build"
], ],
"options": { "options": {
"buildTarget": "@triliumnext/server:build", "buildTarget": "server:build",
"runBuildTargetDependencies": false "runBuildTargetDependencies": false
}, },
"configurations": { "configurations": {
"development": { "development": {
"buildTarget": "@triliumnext/server:build:development" "buildTarget": "server:build:development"
}, },
"production": { "production": {
"buildTarget": "@triliumnext/server:build:production" "buildTarget": "server:build:production"
} }
} }
}, },

View File

@ -9,7 +9,7 @@
"client:build": "nx build client", "client:build": "nx build client",
"server:build": "nx build server", "server:build": "nx build server",
"server:start": "nx run-many --target=serve --projects=client,server --parallel", "server:start": "nx run-many --target=serve --projects=client,server --parallel",
"server:start-prod": "nx run @triliumnext/server:start-prod", "server:start-prod": "nx run server:start-prod",
"electron:build": "nx build desktop", "electron:build": "nx build desktop",
"chore:ci-update-nightly-version": "tsx ./scripts/update-nightly-version.ts", "chore:ci-update-nightly-version": "tsx ./scripts/update-nightly-version.ts",
"chore:update-build-info": "tsx ./scripts/update-build-info.ts", "chore:update-build-info": "tsx ./scripts/update-build-info.ts",

View File

@ -23,6 +23,7 @@
"url": "https://github.com/TriliumNext/Notes" "url": "https://github.com/TriliumNext/Notes"
}, },
"nx": { "nx": {
"name": "commons",
"sourceRoot": "packages/commons/src", "sourceRoot": "packages/commons/src",
"targets": { "targets": {
"build": { "build": {

View File

@ -33,6 +33,7 @@
"gfm" "gfm"
], ],
"nx": { "nx": {
"name": "turndown-plugin-gfm",
"sourceRoot": "packages/turndown-plugin-gfm/src", "sourceRoot": "packages/turndown-plugin-gfm/src",
"targets": { "targets": {
"build": { "build": {