From 1871ddf1e705c86d7451910048e36be52a1111f0 Mon Sep 17 00:00:00 2001 From: Kilian Panot Date: Mon, 6 Jan 2025 11:06:43 +0900 Subject: [PATCH] chore: reduce project.json duplication chore: split npm prepublish task --- .github/workflows/code-check.yml | 12 ++-- .github/workflows/e2e-tests.yml | 1 + .github/workflows/it-tests.yml | 1 + .github/workflows/main.yml | 1 + .github/workflows/publish.yml | 3 +- apps/chrome-devtools/project.json | 7 +-- apps/github-cascading-app/project.json | 11 +--- apps/showcase/project.json | 5 +- apps/vscode-extension/project.json | 18 +----- nx.json | 52 ++++++++++++++++- package.json | 10 ++-- packages/@ama-sdk/client-angular/project.json | 39 ++----------- packages/@ama-sdk/client-beacon/project.json | 39 ++----------- packages/@ama-sdk/client-fetch/project.json | 39 ++----------- packages/@ama-sdk/core/project.json | 39 ++----------- packages/@ama-sdk/create/project.json | 25 ++------ packages/@ama-sdk/schematics/project.json | 29 ++-------- .../@ama-sdk/swagger-builder/project.json | 25 ++------ packages/@ama-terasu/cli/project.json | 25 ++------ packages/@ama-terasu/core/project.json | 25 ++------ packages/@ama-terasu/schematics/project.json | 25 ++------ .../@o3r-training/showcase-sdk/project.json | 12 +--- .../@o3r-training/training-sdk/project.json | 12 +--- .../@o3r-training/training-tools/project.json | 30 ++-------- .../amaterasu/amaterasu-api-spec/project.json | 25 ++------ .../amaterasu/amaterasu-dodo/project.json | 25 ++------ .../amaterasu/amaterasu-otter/project.json | 25 ++------ .../@o3r/amaterasu/amaterasu-sdk/project.json | 25 ++------ packages/@o3r/analytics/project.json | 57 +++---------------- packages/@o3r/apis-manager/project.json | 53 +++-------------- packages/@o3r/application/project.json | 53 +++-------------- packages/@o3r/artifactory-tools/project.json | 46 +++------------ packages/@o3r/azure-tools/project.json | 46 +++------------ packages/@o3r/components/project.json | 57 +++---------------- packages/@o3r/configuration/project.json | 57 +++---------------- packages/@o3r/core/project.json | 51 +++-------------- packages/@o3r/create/project.json | 25 ++------ packages/@o3r/design/project.json | 55 +++--------------- packages/@o3r/dev-tools/project.json | 46 +++------------ packages/@o3r/dynamic-content/project.json | 50 +++------------- .../@o3r/eslint-config-otter/project.json | 46 +++------------ packages/@o3r/eslint-config/project.json | 46 +++------------ packages/@o3r/eslint-plugin/project.json | 39 ++----------- packages/@o3r/extractors/project.json | 53 +++-------------- packages/@o3r/forms/project.json | 46 +++------------ packages/@o3r/localization/project.json | 57 +++---------------- packages/@o3r/logger/project.json | 50 +++------------- packages/@o3r/mobile/project.json | 39 ++----------- packages/@o3r/new-version/project.json | 53 +++-------------- packages/@o3r/pipeline/project.json | 51 +++-------------- packages/@o3r/routing/project.json | 50 +++------------- packages/@o3r/rules-engine/project.json | 57 +++---------------- packages/@o3r/schematics/project.json | 53 +++-------------- packages/@o3r/store-sync/project.json | 37 ++---------- packages/@o3r/storybook/project.json | 46 +++------------ packages/@o3r/stylelint-plugin/project.json | 53 +++-------------- packages/@o3r/styling/project.json | 51 +++-------------- packages/@o3r/telemetry/project.json | 40 ++----------- packages/@o3r/test-helpers/project.json | 25 ++------ packages/@o3r/testing/project.json | 46 +++------------ packages/@o3r/third-party/project.json | 53 +++-------------- packages/@o3r/workspace/project.json | 37 ++---------- tools/@o3r/build-helpers/package.json | 1 - tools/@o3r/build-helpers/project.json | 7 ++- .../build-helpers/scripts/prepare-publish.mjs | 14 ++--- tools/@o3r/workspace-helpers/package.json | 3 +- .../scripts/update-package.mjs | 0 tools/github-actions/audit/project.json | 11 +--- tools/github-actions/cascading/project.json | 11 +--- tools/github-actions/get-npm-tag/project.json | 4 +- tools/github-actions/new-version/project.json | 11 +--- tools/github-actions/release/project.json | 4 +- yarn.lock | 38 ++++++++----- 73 files changed, 448 insertions(+), 1865 deletions(-) rename tools/@o3r/{build-helpers => workspace-helpers}/scripts/update-package.mjs (100%) diff --git a/.github/workflows/code-check.yml b/.github/workflows/code-check.yml index a86e444238..1e4760fabe 100644 --- a/.github/workflows/code-check.yml +++ b/.github/workflows/code-check.yml @@ -23,6 +23,7 @@ on: env: NX_PARALLEL: ${{ vars.NX_PARALLEL }} + NX_TASK_TARGET_CONFIGURATION: ci NX_SKIP_NX_CACHE: ${{ inputs.skipNxCache }} YARN_ENABLE_HARDENED_MODE: 0 NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }} @@ -72,7 +73,8 @@ jobs: run: yarn nx run ama-sdk-schematics:build-swagger - name: Test env: - testCmd: ${{ inputs.affected && format('test:affected --base=remotes/origin/{0}', github.base_ref || github.ref_name) || 'test'}} + NX_BASE: ${{ format('remotes/origin/{0}', github.base_ref || github.ref_name) }} + testCmd: ${{ inputs.affected && 'test:affected' || 'test'}} NODE_OPTIONS: ${{ runner.os == 'Windows' && '--max_old_space_size=4096' || '' }} run: yarn ${{ env.testCmd }} --collectCoverage - name: Upload results to Codecov @@ -114,8 +116,9 @@ jobs: ${{ runner.os }} - name: Lint env: - lintCmd: ${{ inputs.affected && format('lint:affected --base=remotes/origin/{0}', github.base_ref || github.ref_name) || 'lint'}} - run: yarn ${{ env.lintCmd }} --configuration ci + NX_BASE: ${{ format('remotes/origin/{0}', github.base_ref || github.ref_name) }} + lintCmd: ${{ inputs.affected && 'lint:affected' || 'lint'}} + run: yarn ${{ env.lintCmd }} # Check that the packaging of github-actions is still working github-actions: @@ -128,6 +131,7 @@ jobs: uses: ./tools/github-actions/setup - name: Package github actions env: - nxCmd: ${{ inputs.affected && format('nx affected --base=remotes/origin/{0}', github.base_ref || github.ref_name) || 'nx run-many'}} + NX_BASE: ${{ format('remotes/origin/{0}', github.base_ref || github.ref_name) }} + nxCmd: ${{ inputs.affected && 'nx affected' || 'nx run-many'}} run: yarn ${{ env.nxCmd }} --target=package-github-action diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index e8d7bc98dc..295b1841a9 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -15,6 +15,7 @@ on: env: NX_PARALLEL: ${{ vars.NX_PARALLEL }} + NX_TASK_TARGET_CONFIGURATION: ci NX_SKIP_NX_CACHE: ${{ inputs.skipNxCache }} YARN_ENABLE_HARDENED_MODE: 0 diff --git a/.github/workflows/it-tests.yml b/.github/workflows/it-tests.yml index b58a651500..eb7f8ec579 100644 --- a/.github/workflows/it-tests.yml +++ b/.github/workflows/it-tests.yml @@ -22,6 +22,7 @@ on: env: NX_PARALLEL: ${{ vars.NX_PARALLEL }} + NX_TASK_TARGET_CONFIGURATION: ci NX_SKIP_NX_CACHE: ${{ inputs.skipNxCache }} YARN_ENABLE_HARDENED_MODE: 0 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index abff19736f..738531a852 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -21,6 +21,7 @@ on: env: NX_PARALLEL: ${{ vars.NX_PARALLEL }} + NX_TASK_TARGET_CONFIGURATION: ci YARN_ENABLE_HARDENED_MODE: 0 NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }} diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 823e333cc0..6fbc0993e1 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -132,8 +132,9 @@ jobs: - run: yarn set:version ${{ inputs.version }} - name: Publish Extensions if: '!inputs.prerelease' - run: yarn run ${{ endsWith(inputs.version, '.0') && 'publish:extensions' || 'publish:extensions:affected --base=HEAD~1' }} + run: yarn run ${{ endsWith(inputs.version, '.0') && 'publish:extensions' || 'publish:extensions:affected' }} env: + NX_BASE: HEAD~1 VSCE_PAT: ${{ secrets.AZURE_VSC_EXT_TOKEN }} CHROME_CLIENT_ID: ${{ secrets.CHROME_CLIENT_ID }} CHROME_EXT_ID: ${{ secrets.CHROME_EXT_ID }} diff --git a/apps/chrome-devtools/project.json b/apps/chrome-devtools/project.json index 9fabe404a5..313762aeab 100644 --- a/apps/chrome-devtools/project.json +++ b/apps/chrome-devtools/project.json @@ -149,12 +149,7 @@ } } }, - "test": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "apps/chrome-devtools/jest.config.js" - } - }, + "test": {}, "copy-assets": { "executor": "nx:run-script", "options": { diff --git a/apps/github-cascading-app/project.json b/apps/github-cascading-app/project.json index 533414f485..688b708fa6 100644 --- a/apps/github-cascading-app/project.json +++ b/apps/github-cascading-app/project.json @@ -15,15 +15,8 @@ "script": "build" } }, - "lint": { - "executor": "nx:run-commands" - }, - "test": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "apps/github-cascading-app/jest.config.js" - } - } + "lint": {}, + "test": {} }, "tags": [] } diff --git a/apps/showcase/project.json b/apps/showcase/project.json index 848512b0ae..c8a8cf770c 100644 --- a/apps/showcase/project.json +++ b/apps/showcase/project.json @@ -242,10 +242,7 @@ "dependsOn": ["^build", "^build-builders"] }, "test": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "apps/showcase/jest.config.js" - } + "executor": "@nx/jest:jest" }, "generate-theme": { "executor": "@o3r/design:generate-css", diff --git a/apps/vscode-extension/project.json b/apps/vscode-extension/project.json index 383202afc0..3674dbe905 100644 --- a/apps/vscode-extension/project.json +++ b/apps/vscode-extension/project.json @@ -25,21 +25,9 @@ }, "outputs": ["{projectRoot}/dist/src/extension.js"] }, - "lint": { - "executor": "nx:run-commands" - }, - "test": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "apps/vscode-extension/jest.config.js" - } - }, - "prepare-publish": { - "executor": "nx:run-script", - "options": { - "script": "prepare:publish" - } - }, + "lint": {}, + "test": {}, + "prepare-publish": {}, "publish-extension": { "executor": "nx:run-commands", "options": { diff --git a/nx.json b/nx.json index 146a468d84..17493589ff 100644 --- a/nx.json +++ b/nx.json @@ -172,6 +172,7 @@ "cache": true }, "test": { + "executor": "@nx/jest:jest", "inputs": [ { "env": "RUNNER_OS" @@ -186,6 +187,8 @@ "{projectRoot}/coverage/cobertura-coverage.xml" ], "options": { + "jestConfig": "{projectRoot}/jest.config.js", + "cacheDirectory": "{workspaceRoot}/.cache/jest", "passWithNoTests": false, "silent": true }, @@ -198,6 +201,7 @@ "cache": true }, "test-int": { + "executor": "@nx/jest:jest", "inputs": [ { "env": "RUNNER_OS" @@ -218,6 +222,7 @@ "{projectRoot}/coverage/cobertura-coverage.xml" ], "options": { + "jestConfig": "{projectRoot}/testing/jest.config.it.js", "quiet": false, "passWithNoTests": false }, @@ -229,10 +234,39 @@ }, "cache": true }, + "publish": { + "cache": false, + "executor": "nx:run-commands", + "options": { + "command": "npm publish {projectRoot}/dist" + }, + "outputs": [], + "inputs": [ + "{projectRoot}/dist" + ], + "dependsOn": [ + "prepare-publish" + ] + }, "prepare-publish": { "cache": false, + "executor": "nx:run-script", + "options": { + "script": "prepare:publish" + }, + "inputs": [ + "{workspaceRoot}/readme.md", + "{workspaceRoot}/package.json", + "{workspaceRoot}/LICENSE", + "{workspaceRoot}/.npmignore", + "{projectRoot}/readme.md", + "{projectRoot}/.npmignore", + "{projectRoot}/package.json" + ], "outputs": [ - "{projectRoot}/dist/package.json" + "{projectRoot}/dist/package.json", + "{projectRoot}/dist/readme.json", + "{projectRoot}/dist/LICENSE" ] }, "publish-extension": { @@ -332,6 +366,10 @@ "cache": true }, "prepare-build-builders": { + "executor": "nx:run-script", + "options": { + "script": "prepare:build:builders" + }, "dependsOn": [ "compile" ], @@ -352,6 +390,10 @@ "cache": true }, "build-cli": { + "executor": "nx:run-script", + "options": { + "script": "build:cli" + }, "dependsOn": [ "compile" ], @@ -371,6 +413,10 @@ "cache": true }, "build-builders": { + "executor": "nx:run-script", + "options": { + "script": "build:builders" + }, "dependsOn": [ "^build", "prepare-build-builders", @@ -417,6 +463,10 @@ "cache": true }, "documentation": { + "executor": "nx:run-script", + "options": { + "script": "compodoc" + }, "outputs": [ "{workspaceRoot}/generated-doc/{projectName}/**/*" ], diff --git a/package.json b/package.json index 36b2d49361..150c846464 100644 --- a/package.json +++ b/package.json @@ -16,15 +16,14 @@ "build:tools": "yarn nx run-many --target=build --projects=eslint-plugin,workspace", "build:lint": "yarn nx run-many --target=build --projects=eslint-plugin", "build:swagger-gen": "yarn nx run-many --target=build-swagger", - "prepare:publish": "yarn prepare-publish \"$(yarn workspaces:list)\" --append dist", - "publish": "yarn run prepare:publish && yarn nx run-many --target=publish --exclude=tag:private --nx-bail", + "publish": "yarn nx run-many --target=publish --exclude=tag:private --nx-bail", "publish:extensions": "yarn nx run-many --target=publish-extension", "publish:extensions:affected": "yarn nx affected --target=publish-extension", "package-github-actions:affected": "yarn nx affected --target=package-github-action", "lint": "yarn nx run-many --target=lint", "lint:affected": "yarn nx affected --target=lint", - "test": "yarn nx run-many --target=test --cacheDirectory=$(yarn get:current-dir)/.cache/jest", - "test:affected": "yarn nx affected --target=test --cacheDirectory=$(yarn get:current-dir)/.cache/jest", + "test": "yarn nx run-many --target=test", + "test:affected": "yarn nx affected --target=test", "test-e2e": "yarn nx run-many --target=test-e2e", "test-int": "yarn nx run-many --target=test-int", "postinstall": "husky && yarn build:lint && yarn harmonize:version && yarn update-yarn-sdks", @@ -44,7 +43,7 @@ "verdaccio:start-persistent": "docker run -d -it --rm --name verdaccio -p 4873:4873 -v \"$(yarn get:current-dir)/.verdaccio/conf\":/verdaccio/conf -v \"$(yarn get:current-dir)/.verdaccio/storage\":/verdaccio/storage:z verdaccio/verdaccio", "verdaccio:clean": "rimraf -g \".verdaccio/storage/@{o3r,ama-sdk,ama-terasu}\"", "verdaccio:login": "yarn cpy --cwd=./.verdaccio/conf .npmrc . --rename=.npmrc-logged && npx --yes npm-cli-login -u verdaccio -p verdaccio -e test@test.com -r http://127.0.0.1:4873 --config-path \".verdaccio/conf/.npmrc-logged\"", - "verdaccio:prepare-publish": "yarn verdaccio:clean && yarn set:version 999.0.$(node -e 'process.stdout.write(String(Date.now()))') --include \"!**/!(dist)/package.json\" --include !package.json && yarn verdaccio:login && replace-in-files --regex=\"private(.*)true\" --replacement=private\\$1false '**/dist/package.json' && yarn run prepare:publish", + "verdaccio:prepare-publish": "yarn verdaccio:clean && yarn set:version 999.0.$(node -e 'process.stdout.write(String(Date.now()))') --include \"!**/!(dist)/package.json\" --include !package.json && yarn verdaccio:login && replace-in-files --regex=\"private(.*)true\" --replacement=private\\$1false '**/dist/package.json'", "verdaccio:publish": "yarn run verdaccio:prepare-publish && yarn nx run-many --target=publish --nx-bail --userconfig \".verdaccio/conf/.npmrc-logged\" --tag=latest --@o3r:registry=http://127.0.0.1:4873 --@ama-sdk:registry=http://127.0.0.1:4873 --@ama-terasu:registry=http://127.0.0.1:4873 --@o3r-training:registry=http://127.0.0.1:4873", "verdaccio:stop": "docker container stop $(docker ps -a -q --filter=\"name=verdaccio\")", "verdaccio:all": "yarn verdaccio:stop && yarn verdaccio:start && yarn verdaccio:publish", @@ -186,7 +185,6 @@ "@nx/jest": "~19.8.0", "@nx/js": "~19.8.0", "@nx/workspace": "~19.8.0", - "@o3r/build-helpers": "workspace:^", "@o3r/eslint-config": "workspace:^", "@o3r/eslint-plugin": "workspace:^", "@o3r/telemetry": "workspace:^", diff --git a/packages/@ama-sdk/client-angular/project.json b/packages/@ama-sdk/client-angular/project.json index 709e4abae6..8cb0235ab8 100644 --- a/packages/@ama-sdk/client-angular/project.json +++ b/packages/@ama-sdk/client-angular/project.json @@ -37,39 +37,12 @@ }, "outputs": ["{projectRoot}/dist/src"] }, - "lint": { - "executor": "nx:run-commands" - }, - "test": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@ama-sdk/client-angular/jest.config.js" - } - }, - "prepare-publish": { - "executor": "nx:run-script", - "options": { - "script": "prepare:publish" - } - }, - "publish": { - "executor": "nx:run-commands", - "options": { - "command": "npm publish packages/@ama-sdk/client-angular/dist" - } - }, - "prepare-build-builders": { - "executor": "nx:run-script", - "options": { - "script": "prepare:build:builders" - } - }, - "build-builders": { - "executor": "nx:run-script", - "options": { - "script": "build:builders" - } - } + "lint": {}, + "test": {}, + "prepare-publish": {}, + "publish": {}, + "prepare-build-builders": {}, + "build-builders": {} }, "tags": [] } diff --git a/packages/@ama-sdk/client-beacon/project.json b/packages/@ama-sdk/client-beacon/project.json index b8cc5865ce..737eb27dfd 100644 --- a/packages/@ama-sdk/client-beacon/project.json +++ b/packages/@ama-sdk/client-beacon/project.json @@ -37,39 +37,12 @@ }, "outputs": ["{projectRoot}/dist/src"] }, - "lint": { - "executor": "nx:run-commands" - }, - "test": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@ama-sdk/client-beacon/jest.config.js" - } - }, - "prepare-publish": { - "executor": "nx:run-script", - "options": { - "script": "prepare:publish" - } - }, - "publish": { - "executor": "nx:run-commands", - "options": { - "command": "npm publish packages/@ama-sdk/client-beacon/dist" - } - }, - "prepare-build-builders": { - "executor": "nx:run-script", - "options": { - "script": "prepare:build:builders" - } - }, - "build-builders": { - "executor": "nx:run-script", - "options": { - "script": "build:builders" - } - } + "lint": {}, + "test": {}, + "prepare-publish": {}, + "publish": {}, + "prepare-build-builders": {}, + "build-builders": {} }, "tags": [] } diff --git a/packages/@ama-sdk/client-fetch/project.json b/packages/@ama-sdk/client-fetch/project.json index 5925fcbbd4..369faaf9fc 100644 --- a/packages/@ama-sdk/client-fetch/project.json +++ b/packages/@ama-sdk/client-fetch/project.json @@ -37,39 +37,12 @@ }, "outputs": ["{projectRoot}/dist/src"] }, - "lint": { - "executor": "nx:run-commands" - }, - "test": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@ama-sdk/client-fetch/jest.config.js" - } - }, - "prepare-publish": { - "executor": "nx:run-script", - "options": { - "script": "prepare:publish" - } - }, - "publish": { - "executor": "nx:run-commands", - "options": { - "command": "npm publish packages/@ama-sdk/client-fetch/dist" - } - }, - "prepare-build-builders": { - "executor": "nx:run-script", - "options": { - "script": "prepare:build:builders" - } - }, - "build-builders": { - "executor": "nx:run-script", - "options": { - "script": "build:builders" - } - } + "lint": {}, + "test": {}, + "prepare-publish": {}, + "publish": {}, + "prepare-build-builders": {}, + "build-builders": {} }, "tags": [] } diff --git a/packages/@ama-sdk/core/project.json b/packages/@ama-sdk/core/project.json index bf773144e7..3a99acf85f 100644 --- a/packages/@ama-sdk/core/project.json +++ b/packages/@ama-sdk/core/project.json @@ -37,39 +37,12 @@ }, "outputs": ["{projectRoot}/dist/src"] }, - "lint": { - "executor": "nx:run-commands" - }, - "test": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@ama-sdk/core/jest.config.js" - } - }, - "prepare-publish": { - "executor": "nx:run-script", - "options": { - "script": "prepare:publish" - } - }, - "publish": { - "executor": "nx:run-commands", - "options": { - "command": "npm publish packages/@ama-sdk/core/dist" - } - }, - "prepare-build-builders": { - "executor": "nx:run-script", - "options": { - "script": "prepare:build:builders" - } - }, - "build-builders": { - "executor": "nx:run-script", - "options": { - "script": "build:builders" - } - } + "lint": {}, + "test": {}, + "prepare-publish": {}, + "publish": {}, + "prepare-build-builders": {}, + "build-builders": {} }, "tags": [] } diff --git a/packages/@ama-sdk/create/project.json b/packages/@ama-sdk/create/project.json index 2f2ec24dab..588a18fb40 100644 --- a/packages/@ama-sdk/create/project.json +++ b/packages/@ama-sdk/create/project.json @@ -24,27 +24,10 @@ }, "dependsOn": ["^build"] }, - "lint": { - "executor": "nx:run-commands" - }, - "prepare-publish": { - "executor": "nx:run-script", - "options": { - "script": "prepare:publish" - } - }, - "test-int": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@ama-sdk/create/testing/jest.config.it.js" - } - }, - "publish": { - "executor": "nx:run-commands", - "options": { - "command": "npm publish packages/@ama-sdk/create/dist" - } - } + "lint": {}, + "prepare-publish": {}, + "test-int": {}, + "publish": {} }, "tags": [] } diff --git a/packages/@ama-sdk/schematics/project.json b/packages/@ama-sdk/schematics/project.json index c86c481a3b..a9cc69e1d8 100644 --- a/packages/@ama-sdk/schematics/project.json +++ b/packages/@ama-sdk/schematics/project.json @@ -58,17 +58,11 @@ ] }, "build-cli": { - "executor": "nx:run-script", - "options": { - "script": "build:cli" - }, "dependsOn": [ "build-builders" ] }, - "lint": { - "executor": "nx:run-commands" - }, + "lint": {}, "build-swagger": { "executor": "nx:run-script", "inputs": [ @@ -82,30 +76,15 @@ } }, "test": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@ama-sdk/schematics/jest.config.js" - } + "executor": "@nx/jest:jest" }, "test-int": { - "executor": "@nx/jest:jest", "options": { - "jestConfig": "packages/@ama-sdk/schematics/testing/jest.config.it.js", "passWithNoTests": true } }, - "prepare-publish": { - "executor": "nx:run-script", - "options": { - "script": "prepare:publish" - } - }, - "publish": { - "executor": "nx:run-commands", - "options": { - "command": "npm publish packages/@ama-sdk/schematics/dist" - } - } + "prepare-publish": {}, + "publish": {} }, "tags": [] } diff --git a/packages/@ama-sdk/swagger-builder/project.json b/packages/@ama-sdk/swagger-builder/project.json index a0477ac69a..95721e5e8d 100644 --- a/packages/@ama-sdk/swagger-builder/project.json +++ b/packages/@ama-sdk/swagger-builder/project.json @@ -19,27 +19,10 @@ "script": "build:source" } }, - "lint": { - "executor": "nx:run-commands" - }, - "test": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@ama-sdk/swagger-builder/jest.config.js" - } - }, - "prepare-publish": { - "executor": "nx:run-script", - "options": { - "script": "prepare:publish" - } - }, - "publish": { - "executor": "nx:run-commands", - "options": { - "command": "npm publish packages/@ama-sdk/swagger-builder/dist" - } - } + "lint": {}, + "test": {}, + "prepare-publish": {}, + "publish": {} }, "tags": [] } diff --git a/packages/@ama-terasu/cli/project.json b/packages/@ama-terasu/cli/project.json index 520026b798..385ba4376a 100644 --- a/packages/@ama-terasu/cli/project.json +++ b/packages/@ama-terasu/cli/project.json @@ -19,27 +19,10 @@ "script": "build:source" } }, - "lint": { - "executor": "nx:run-commands" - }, - "test": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@ama-terasu/cli/jest.config.js" - } - }, - "prepare-publish": { - "executor": "nx:run-script", - "options": { - "script": "prepare:publish" - } - }, - "publish": { - "executor": "nx:run-commands", - "options": { - "command": "npm publish packages/@ama-terasu/cli/dist" - } - } + "lint": {}, + "test": {}, + "prepare-publish": {}, + "publish": {} }, "tags": [] } diff --git a/packages/@ama-terasu/core/project.json b/packages/@ama-terasu/core/project.json index 83d83c933d..1b9c90a7eb 100644 --- a/packages/@ama-terasu/core/project.json +++ b/packages/@ama-terasu/core/project.json @@ -19,27 +19,10 @@ "script": "build:source" } }, - "lint": { - "executor": "nx:run-commands" - }, - "test": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@ama-terasu/core/jest.config.js" - } - }, - "prepare-publish": { - "executor": "nx:run-script", - "options": { - "script": "prepare:publish" - } - }, - "publish": { - "executor": "nx:run-commands", - "options": { - "command": "npm publish packages/@ama-terasu/core/dist" - } - } + "lint": {}, + "test": {}, + "prepare-publish": {}, + "publish": {} }, "tags": [] } diff --git a/packages/@ama-terasu/schematics/project.json b/packages/@ama-terasu/schematics/project.json index 5d24be559e..fc710b8abb 100644 --- a/packages/@ama-terasu/schematics/project.json +++ b/packages/@ama-terasu/schematics/project.json @@ -19,27 +19,10 @@ "script": "build:source" } }, - "lint": { - "executor": "nx:run-commands" - }, - "test": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@ama-terasu/schematics/jest.config.js" - } - }, - "prepare-publish": { - "executor": "nx:run-script", - "options": { - "script": "prepare:publish" - } - }, - "publish": { - "executor": "nx:run-commands", - "options": { - "command": "npm publish packages/@ama-terasu/schematics/dist" - } - } + "lint": {}, + "test": {}, + "prepare-publish": {}, + "publish": {} }, "tags": [] } diff --git a/packages/@o3r-training/showcase-sdk/project.json b/packages/@o3r-training/showcase-sdk/project.json index 99befd756d..946109889d 100644 --- a/packages/@o3r-training/showcase-sdk/project.json +++ b/packages/@o3r-training/showcase-sdk/project.json @@ -23,14 +23,13 @@ ] }, "regen": { + "cache": false, "executor": "nx:run-script", "options": { "script": "spec:regen" } }, - "lint": { - "executor": "nx:run-commands" - }, + "lint": {}, "extract-folder-structure": { "cache": true, "executor": "nx:run-script", @@ -47,12 +46,7 @@ "outputs": ["{projectRoot}/dist/structure"], "dependsOn": ["^build", "compile"] }, - "publish": { - "executor": "nx:run-commands", - "options": { - "command": "npm publish packages/@o3r-training/showcase-sdk/dist" - } - } + "publish": {} }, "tags": [ "private", diff --git a/packages/@o3r-training/training-sdk/project.json b/packages/@o3r-training/training-sdk/project.json index fe3275aebe..42ee96f331 100644 --- a/packages/@o3r-training/training-sdk/project.json +++ b/packages/@o3r-training/training-sdk/project.json @@ -17,20 +17,14 @@ "inputs": ["source", "^cli"] }, "regen": { + "cache": false, "executor": "nx:run-script", "options": { "script": "spec:regen" } }, - "lint": { - "executor": "nx:run-commands" - }, - "publish": { - "executor": "nx:run-commands", - "options": { - "command": "npm publish packages/@o3r-training/training-sdk/dist" - } - }, + "lint": {}, + "publish": {}, "extract-folder-structure": { "cache": true, "executor": "nx:run-script", diff --git a/packages/@o3r-training/training-tools/project.json b/packages/@o3r-training/training-tools/project.json index bdf6977d78..5297e1a27a 100644 --- a/packages/@o3r-training/training-tools/project.json +++ b/packages/@o3r-training/training-tools/project.json @@ -18,38 +18,18 @@ "build-cli" ] }, - "prepare-build-builders": { - "executor": "nx:run-script", - "options": { - "script": "prepare:build:builders" - } - }, - "build-builders": { - "executor": "nx:run-script", - "options": { - "script": "build:builders" - } - }, - "build-cli": { - "executor": "nx:run-script", - "options": { - "script": "build:cli" - } - }, + "prepare-build-builders": {}, + "build-builders": {}, + "build-cli": {}, "compile": { "executor": "nx:run-script", "options": { "script": "build:source" } }, - "lint": { - "executor": "nx:run-commands" - }, + "lint": {}, "test": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@o3r-training/training-tools/jest.config.js" - } + "executor": "@nx/jest:jest" } }, "tags": ["private","showcase"] diff --git a/packages/@o3r/amaterasu/amaterasu-api-spec/project.json b/packages/@o3r/amaterasu/amaterasu-api-spec/project.json index 39ca532cbe..076e4defc7 100644 --- a/packages/@o3r/amaterasu/amaterasu-api-spec/project.json +++ b/packages/@o3r/amaterasu/amaterasu-api-spec/project.json @@ -19,27 +19,10 @@ "script": "build:source" } }, - "lint": { - "executor": "nx:run-commands" - }, - "test": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@o3r/amaterasu/amaterasu-api-spec/jest.config.js" - } - }, - "prepare-publish": { - "executor": "nx:run-script", - "options": { - "script": "prepare:publish" - } - }, - "publish": { - "executor": "nx:run-commands", - "options": { - "command": "npm publish packages/@o3r/amaterasu/amaterasu-api-spec/dist" - } - } + "lint": {}, + "test": {}, + "prepare-publish": {}, + "publish": {} }, "tags": [] } diff --git a/packages/@o3r/amaterasu/amaterasu-dodo/project.json b/packages/@o3r/amaterasu/amaterasu-dodo/project.json index 5fd5e1054a..2a186ef2bc 100644 --- a/packages/@o3r/amaterasu/amaterasu-dodo/project.json +++ b/packages/@o3r/amaterasu/amaterasu-dodo/project.json @@ -19,27 +19,10 @@ "script": "build:source" } }, - "lint": { - "executor": "nx:run-commands" - }, - "test": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@o3r/amaterasu/amaterasu-dodo/jest.config.js" - } - }, - "prepare-publish": { - "executor": "nx:run-script", - "options": { - "script": "prepare:publish" - } - }, - "publish": { - "executor": "nx:run-commands", - "options": { - "command": "npm publish packages/@o3r/amaterasu/amaterasu-dodo/dist" - } - } + "lint": {}, + "test": {}, + "prepare-publish": {}, + "publish": {} }, "tags": [] } diff --git a/packages/@o3r/amaterasu/amaterasu-otter/project.json b/packages/@o3r/amaterasu/amaterasu-otter/project.json index e94aa63392..0d9ad34c97 100644 --- a/packages/@o3r/amaterasu/amaterasu-otter/project.json +++ b/packages/@o3r/amaterasu/amaterasu-otter/project.json @@ -19,27 +19,10 @@ "script": "build:source" } }, - "lint": { - "executor": "nx:run-commands" - }, - "test": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@o3r/amaterasu/amaterasu-otter/jest.config.js" - } - }, - "prepare-publish": { - "executor": "nx:run-script", - "options": { - "script": "prepare:publish" - } - }, - "publish": { - "executor": "nx:run-commands", - "options": { - "command": "npm publish packages/@o3r/amaterasu/amaterasu-otter/dist" - } - } + "lint": {}, + "test": {}, + "prepare-publish": {}, + "publish": {} }, "tags": [] } diff --git a/packages/@o3r/amaterasu/amaterasu-sdk/project.json b/packages/@o3r/amaterasu/amaterasu-sdk/project.json index 7289e368a5..2308cb895a 100644 --- a/packages/@o3r/amaterasu/amaterasu-sdk/project.json +++ b/packages/@o3r/amaterasu/amaterasu-sdk/project.json @@ -19,27 +19,10 @@ "script": "build:source" } }, - "lint": { - "executor": "nx:run-commands" - }, - "test": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@o3r/amaterasu/amaterasu-sdk/jest.config.js" - } - }, - "prepare-publish": { - "executor": "nx:run-script", - "options": { - "script": "prepare:publish" - } - }, - "publish": { - "executor": "nx:run-commands", - "options": { - "command": "npm publish packages/@o3r/amaterasu/amaterasu-sdk/dist" - } - } + "lint": {}, + "test": {}, + "prepare-publish": {}, + "publish": {} }, "tags": [] } diff --git a/packages/@o3r/analytics/project.json b/packages/@o3r/analytics/project.json index 2b69ed75dc..6f57c16d74 100644 --- a/packages/@o3r/analytics/project.json +++ b/packages/@o3r/analytics/project.json @@ -26,9 +26,7 @@ "tsConfig": "packages/@o3r/analytics/tsconfig.build.json" } }, - "prepare": { - "executor": "nx:run-script" - }, + "prepare": {}, "build-fixtures": { "executor": "nx:noop" }, @@ -50,51 +48,14 @@ "script": "build:plugins" } }, - "lint": { - "executor": "nx:run-commands" - }, - "test": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@o3r/analytics/jest.config.js" - } - }, - "test-int": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@o3r/analytics/testing/jest.config.it.js" - } - }, - "prepare-publish": { - "executor": "nx:run-script", - "options": { - "script": "prepare:publish" - } - }, - "publish": { - "executor": "nx:run-commands", - "options": { - "command": "npm publish packages/@o3r/analytics/dist" - } - }, - "prepare-build-builders": { - "executor": "nx:run-script", - "options": { - "script": "prepare:build:builders" - } - }, - "build-builders": { - "executor": "nx:run-script", - "options": { - "script": "build:builders" - } - }, - "documentation": { - "executor": "nx:run-script", - "options": { - "script": "compodoc" - } - } + "lint": {}, + "test": {}, + "test-int": {}, + "prepare-publish": {}, + "publish": {}, + "prepare-build-builders": {}, + "build-builders": {}, + "documentation": {} }, "tags": [] } diff --git a/packages/@o3r/apis-manager/project.json b/packages/@o3r/apis-manager/project.json index 03458e8feb..8ec7a25791 100644 --- a/packages/@o3r/apis-manager/project.json +++ b/packages/@o3r/apis-manager/project.json @@ -16,51 +16,14 @@ "tsConfig": "packages/@o3r/apis-manager/tsconfig.build.json" } }, - "prepare-build-builders": { - "executor": "nx:run-script", - "options": { - "script": "prepare:build:builders" - } - }, - "build-builders": { - "executor": "nx:run-script", - "options": { - "script": "build:builders" - } - }, - "lint": { - "executor": "nx:run-commands" - }, - "test": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@o3r/apis-manager/jest.config.js" - } - }, - "test-int": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@o3r/apis-manager/testing/jest.config.it.js" - } - }, - "prepare-publish": { - "executor": "nx:run-script", - "options": { - "script": "prepare:publish" - } - }, - "publish": { - "executor": "nx:run-commands", - "options": { - "command": "npm publish packages/@o3r/apis-manager/dist" - } - }, - "documentation": { - "executor": "nx:run-script", - "options": { - "script": "compodoc" - } - } + "prepare-build-builders": {}, + "build-builders": {}, + "lint": {}, + "test": {}, + "test-int": {}, + "prepare-publish": {}, + "publish": {}, + "documentation": {} }, "tags": [] } diff --git a/packages/@o3r/application/project.json b/packages/@o3r/application/project.json index 6b0db904bc..da189cbaef 100644 --- a/packages/@o3r/application/project.json +++ b/packages/@o3r/application/project.json @@ -16,51 +16,14 @@ "tsConfig": "packages/@o3r/application/tsconfig.build.json" } }, - "test-int": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@o3r/application/testing/jest.config.it.js" - } - }, - "lint": { - "executor": "nx:run-commands" - }, - "test": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@o3r/application/jest.config.js" - } - }, - "prepare-publish": { - "executor": "nx:run-script", - "options": { - "script": "prepare:publish" - } - }, - "publish": { - "executor": "nx:run-commands", - "options": { - "command": "npm publish packages/@o3r/application/dist" - } - }, - "prepare-build-builders": { - "executor": "nx:run-script", - "options": { - "script": "prepare:build:builders" - } - }, - "build-builders": { - "executor": "nx:run-script", - "options": { - "script": "build:builders" - } - }, - "documentation": { - "executor": "nx:run-script", - "options": { - "script": "compodoc" - } - } + "test-int": {}, + "lint": {}, + "test": {}, + "prepare-publish": {}, + "publish": {}, + "prepare-build-builders": {}, + "build-builders": {}, + "documentation": {} }, "tags": [] } diff --git a/packages/@o3r/artifactory-tools/project.json b/packages/@o3r/artifactory-tools/project.json index d824c0201e..c855c18ac7 100644 --- a/packages/@o3r/artifactory-tools/project.json +++ b/packages/@o3r/artifactory-tools/project.json @@ -14,50 +14,18 @@ }, "dependsOn": ["compile", "build-builders"] }, - "prepare-build-builders": { - "executor": "nx:run-script", - "options": { - "script": "prepare:build:builders" - } - }, - "build-builders": { - "executor": "nx:run-script", - "options": { - "script": "build:builders" - } - }, + "prepare-build-builders": {}, + "build-builders": {}, "compile": { "executor": "nx:run-script", "options": { "script": "build:source" } }, - "lint": { - "executor": "nx:run-commands" - }, - "test": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@o3r/artifactory-tools/jest.config.js" - } - }, - "prepare-publish": { - "executor": "nx:run-script", - "options": { - "script": "prepare:publish" - } - }, - "publish": { - "executor": "nx:run-commands", - "options": { - "command": "npm publish packages/@o3r/artifactory-tools/dist" - } - }, - "documentation": { - "executor": "nx:run-script", - "options": { - "script": "compodoc" - } - } + "lint": {}, + "test": {}, + "prepare-publish": {}, + "publish": {}, + "documentation": {} } } diff --git a/packages/@o3r/azure-tools/project.json b/packages/@o3r/azure-tools/project.json index 195b67812d..18f774a558 100644 --- a/packages/@o3r/azure-tools/project.json +++ b/packages/@o3r/azure-tools/project.json @@ -13,51 +13,19 @@ }, "dependsOn": ["compile", "build-builders"] }, - "prepare-build-builders": { - "executor": "nx:run-script", - "options": { - "script": "prepare:build:builders" - } - }, - "build-builders": { - "executor": "nx:run-script", - "options": { - "script": "build:builders" - } - }, + "prepare-build-builders": {}, + "build-builders": {}, "compile": { "executor": "nx:run-script", "options": { "script": "build:source" } }, - "lint": { - "executor": "nx:run-commands" - }, - "test": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@o3r/azure-tools/jest.config.js" - } - }, - "prepare-publish": { - "executor": "nx:run-script", - "options": { - "script": "prepare:publish" - } - }, - "publish": { - "executor": "nx:run-commands", - "options": { - "command": "npm publish packages/@o3r/azure-tools/dist" - } - }, - "documentation": { - "executor": "nx:run-script", - "options": { - "script": "compodoc" - } - } + "lint": {}, + "test": {}, + "prepare-publish": {}, + "publish": {}, + "documentation": {} }, "tags": ["tools"] } diff --git a/packages/@o3r/components/project.json b/packages/@o3r/components/project.json index 8c75b84508..258d9c7943 100644 --- a/packages/@o3r/components/project.json +++ b/packages/@o3r/components/project.json @@ -13,12 +13,8 @@ }, "dependsOn": ["build-builders", "compile", "expose-schemas"] }, - "expose-schemas": { - "executor": "nx:run-script" - }, - "prepare": { - "executor": "nx:run-script" - }, + "expose-schemas": {}, + "prepare": {}, "compile": { "executor": "@angular-devkit/build-angular:ng-packagr", "options": { @@ -30,18 +26,8 @@ "^build" ] }, - "prepare-build-builders": { - "executor": "nx:run-script", - "options": { - "script": "prepare:build:builders" - } - }, - "build-builders": { - "executor": "nx:run-script", - "options": { - "script": "build:builders" - } - }, + "prepare-build-builders": {}, + "build-builders": {}, "lint": { "executor": "nx:run-commands", "options": { @@ -54,36 +40,11 @@ } } }, - "test": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@o3r/components/jest.config.js" - } - }, - "test-int": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@o3r/components/testing/jest.config.it.js" - } - }, - "prepare-publish": { - "executor": "nx:run-script", - "options": { - "script": "prepare:publish" - } - }, - "publish": { - "executor": "nx:run-commands", - "options": { - "command": "npm publish packages/@o3r/components/dist" - } - }, - "documentation": { - "executor": "nx:run-script", - "options": { - "script": "compodoc" - } - } + "test": {}, + "test-int": {}, + "prepare-publish": {}, + "publish": {}, + "documentation": {} }, "tags": [] } diff --git a/packages/@o3r/configuration/project.json b/packages/@o3r/configuration/project.json index 435ffc5b49..d77d34104d 100644 --- a/packages/@o3r/configuration/project.json +++ b/packages/@o3r/configuration/project.json @@ -21,9 +21,7 @@ "tsConfig": "packages/@o3r/configuration/tsconfig.build.json" } }, - "prepare": { - "executor": "nx:run-script" - }, + "prepare": {}, "build-fixtures": { "executor": "nx:noop" }, @@ -39,51 +37,14 @@ "script": "build:fixtures:jasmine" } }, - "build-builders": { - "executor": "nx:run-script", - "options": { - "script": "build:builders" - } - }, - "lint": { - "executor": "nx:run-commands" - }, - "test": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@o3r/configuration/jest.config.js" - } - }, - "test-int": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@o3r/configuration/testing/jest.config.it.js" - } - }, - "prepare-publish": { - "executor": "nx:run-script", - "options": { - "script": "prepare:publish" - } - }, - "publish": { - "executor": "nx:run-commands", - "options": { - "command": "npm publish packages/@o3r/configuration/dist" - } - }, - "prepare-build-builders": { - "executor": "nx:run-script", - "options": { - "script": "prepare:build:builders" - } - }, - "documentation": { - "executor": "nx:run-script", - "options": { - "script": "compodoc" - } - } + "build-builders": {}, + "lint": {}, + "test": {}, + "test-int": {}, + "prepare-publish": {}, + "publish": {}, + "prepare-build-builders": {}, + "documentation": {} }, "tags": [] } diff --git a/packages/@o3r/core/project.json b/packages/@o3r/core/project.json index ef5b3c3144..5cadaf9adc 100644 --- a/packages/@o3r/core/project.json +++ b/packages/@o3r/core/project.json @@ -20,51 +20,16 @@ "tsConfig": "packages/@o3r/core/tsconfig.build.json" } }, - "prepare-build-builders": { - "executor": "nx:run-script", - "options": { - "script": "prepare:build:builders" - } - }, - "build-builders": { - "executor": "nx:run-script", - "options": { - "script": "build:builders" - } - }, - "lint": { - "executor": "nx:run-commands" - }, + "prepare-build-builders": {}, + "build-builders": {}, + "lint": {}, "test": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@o3r/core/jest.config.js" - } - }, - "test-int": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@o3r/core/testing/jest.config.it.js" - } - }, - "prepare-publish": { - "executor": "nx:run-script", - "options": { - "script": "prepare:publish" - } + "executor": "@nx/jest:jest" }, - "publish": { - "executor": "nx:run-commands", - "options": { - "command": "npm publish packages/@o3r/core/dist" - } - }, - "documentation": { - "executor": "nx:run-script", - "options": { - "script": "compodoc" - } - } + "test-int": {}, + "prepare-publish": {}, + "publish": {}, + "documentation": {} }, "tags": [] } diff --git a/packages/@o3r/create/project.json b/packages/@o3r/create/project.json index 092d7dca7a..62bed77afe 100644 --- a/packages/@o3r/create/project.json +++ b/packages/@o3r/create/project.json @@ -21,27 +21,10 @@ }, "dependsOn": ["^build"] }, - "lint": { - "executor": "nx:run-commands" - }, - "test-int": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@o3r/create/testing/jest.config.it.js" - } - }, - "prepare-publish": { - "executor": "nx:run-script", - "options": { - "script": "prepare:publish" - } - }, - "publish": { - "executor": "nx:run-commands", - "options": { - "command": "npm publish packages/@o3r/create/dist" - } - } + "lint": {}, + "test-int": {}, + "prepare-publish": {}, + "publish": {} }, "tags": [] } diff --git a/packages/@o3r/design/project.json b/packages/@o3r/design/project.json index 452bb8e6bb..723d6a0751 100644 --- a/packages/@o3r/design/project.json +++ b/packages/@o3r/design/project.json @@ -20,9 +20,7 @@ "expose-schemas" ] }, - "expose-schemas": { - "executor": "nx:run-script" - }, + "expose-schemas": {}, "compile": { "executor": "nx:run-script", "options": { @@ -34,51 +32,16 @@ "^source" ] }, - "prepare-build-builders": { - "executor": "nx:run-script", - "options": { - "script": "prepare:build:builders" - } - }, - "build-builders": { - "executor": "nx:run-script", - "options": { - "script": "build:builders" - } - }, - "lint": { - "executor": "nx:run-commands" - }, + "prepare-build-builders": {}, + "build-builders": {}, + "lint": {}, "test": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@o3r/design/jest.config.js" - } + "executor": "@nx/jest:jest" }, - "test-int": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@o3r/design/testing/jest.config.it.js" - } - }, - "prepare-publish": { - "executor": "nx:run-script", - "options": { - "script": "prepare:publish" - } - }, - "publish": { - "executor": "nx:run-commands", - "options": { - "command": "npm publish packages/@o3r/design/dist" - } - }, - "documentation": { - "executor": "nx:run-script", - "options": { - "script": "compodoc" - } - } + "test-int": {}, + "prepare-publish": {}, + "publish": {}, + "documentation": {} }, "tags": [] } diff --git a/packages/@o3r/dev-tools/project.json b/packages/@o3r/dev-tools/project.json index 5318e70f95..f4cb2c0e77 100644 --- a/packages/@o3r/dev-tools/project.json +++ b/packages/@o3r/dev-tools/project.json @@ -13,51 +13,19 @@ }, "dependsOn": ["compile", "build-builders"] }, - "prepare-build-builders": { - "executor": "nx:run-script", - "options": { - "script": "prepare:build:builders" - } - }, - "build-builders": { - "executor": "nx:run-script", - "options": { - "script": "build:builders" - } - }, + "prepare-build-builders": {}, + "build-builders": {}, "compile": { "executor": "nx:run-script", "options": { "script": "build:source" } }, - "lint": { - "executor": "nx:run-commands" - }, - "test": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@o3r/dev-tools/jest.config.js" - } - }, - "prepare-publish": { - "executor": "nx:run-script", - "options": { - "script": "prepare:publish" - } - }, - "publish": { - "executor": "nx:run-commands", - "options": { - "command": "npm publish packages/@o3r/dev-tools/dist" - } - }, - "documentation": { - "executor": "nx:run-script", - "options": { - "script": "compodoc" - } - } + "lint": {}, + "test": {}, + "prepare-publish": {}, + "publish": {}, + "documentation": {} }, "tags": ["tools"] } diff --git a/packages/@o3r/dynamic-content/project.json b/packages/@o3r/dynamic-content/project.json index 7e82abdb44..3d72dee859 100644 --- a/packages/@o3r/dynamic-content/project.json +++ b/packages/@o3r/dynamic-content/project.json @@ -21,9 +21,7 @@ }, "dependsOn": ["prepare", "^build"] }, - "prepare": { - "executor": "nx:run-script" - }, + "prepare": {}, "build-fixtures": { "executor": "nx:noop" }, @@ -39,45 +37,13 @@ "script": "build:fixtures:jasmine" } }, - "prepare-build-builders": { - "executor": "nx:run-script", - "options": { - "script": "prepare:build:builders" - } - }, - "build-builders": { - "executor": "nx:run-script", - "options": { - "script": "build:builders" - } - }, - "lint": { - "executor": "nx:run-commands" - }, - "test": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@o3r/dynamic-content/jest.config.js" - } - }, - "prepare-publish": { - "executor": "nx:run-script", - "options": { - "script": "prepare:publish" - } - }, - "publish": { - "executor": "nx:run-commands", - "options": { - "command": "npm publish packages/@o3r/dynamic-content/dist" - } - }, - "documentation": { - "executor": "nx:run-script", - "options": { - "script": "compodoc" - } - } + "prepare-build-builders": {}, + "build-builders": {}, + "lint": {}, + "test": {}, + "prepare-publish": {}, + "publish": {}, + "documentation": {} }, "tags": [] } diff --git a/packages/@o3r/eslint-config-otter/project.json b/packages/@o3r/eslint-config-otter/project.json index 5c05dd21ca..17d2af546f 100644 --- a/packages/@o3r/eslint-config-otter/project.json +++ b/packages/@o3r/eslint-config-otter/project.json @@ -12,21 +12,9 @@ "build-builders" ] }, - "test": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@o3r/eslint-config-otter/jest.config.js" - } - }, - "test-int": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@o3r/eslint-config-otter/testing/jest.config.it.js" - } - }, - "lint": { - "executor": "nx:run-commands" - }, + "test": {}, + "test-int": {}, + "lint": {}, "compile": { "executor": "nx:run-script", "options": { @@ -34,30 +22,10 @@ }, "dependsOn": [] }, - "prepare-build-builders": { - "executor": "nx:run-script", - "options": { - "script": "prepare:build:builders" - } - }, - "prepare-publish": { - "executor": "nx:run-script", - "options": { - "script": "prepare:publish" - } - }, - "build-builders": { - "executor": "nx:run-script", - "options": { - "script": "build:builders" - } - }, - "publish": { - "executor": "nx:run-commands", - "options": { - "command": "npm publish packages/@o3r/eslint-config-otter/dist" - } - } + "prepare-build-builders": {}, + "prepare-publish": {}, + "build-builders": {}, + "publish": {} }, "tags": [] } diff --git a/packages/@o3r/eslint-config/project.json b/packages/@o3r/eslint-config/project.json index e3560489f4..70c3481e57 100644 --- a/packages/@o3r/eslint-config/project.json +++ b/packages/@o3r/eslint-config/project.json @@ -17,21 +17,9 @@ "build-builders" ] }, - "test": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@o3r/eslint-config/jest.config.js" - } - }, - "test-int": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@o3r/eslint-config/testing/jest.config.it.js" - } - }, - "lint": { - "executor": "nx:run-commands" - }, + "test": {}, + "test-int": {}, + "lint": {}, "compile": { "executor": "nx:run-script", "options": { @@ -39,30 +27,10 @@ }, "dependsOn": [] }, - "prepare-build-builders": { - "executor": "nx:run-script", - "options": { - "script": "prepare:build:builders" - } - }, - "prepare-publish": { - "executor": "nx:run-script", - "options": { - "script": "prepare:publish" - } - }, - "build-builders": { - "executor": "nx:run-script", - "options": { - "script": "build:builders" - } - }, - "publish": { - "executor": "nx:run-commands", - "options": { - "command": "npm publish packages/@o3r/eslint-config/dist" - } - } + "prepare-build-builders": {}, + "prepare-publish": {}, + "build-builders": {}, + "publish": {} }, "tags": [] } diff --git a/packages/@o3r/eslint-plugin/project.json b/packages/@o3r/eslint-plugin/project.json index 3a589132fe..77284d0298 100644 --- a/packages/@o3r/eslint-plugin/project.json +++ b/packages/@o3r/eslint-plugin/project.json @@ -17,12 +17,7 @@ }, "dependsOn": ["^build", "build-builders", "compile"] }, - "prepare-build-builders": { - "executor": "nx:run-script", - "options": { - "script": "prepare:build:builders" - } - }, + "prepare-build-builders": {}, "build-builders": { "executor": "nx:run-script", "options": { @@ -40,33 +35,11 @@ }, "dependsOn": [] }, - "lint": { - "executor": "nx:run-commands" - }, - "test": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@o3r/eslint-plugin/jest.config.js" - } - }, - "prepare-publish": { - "executor": "nx:run-script", - "options": { - "script": "prepare:publish" - } - }, - "publish": { - "executor": "nx:run-commands", - "options": { - "command": "npm publish packages/@o3r/eslint-plugin/dist" - } - }, - "documentation": { - "executor": "nx:run-script", - "options": { - "script": "compodoc" - } - } + "lint": {}, + "test": {}, + "prepare-publish": {}, + "publish": {}, + "documentation": {} }, "tags": [] } diff --git a/packages/@o3r/extractors/project.json b/packages/@o3r/extractors/project.json index 8f19b064a2..ee43ddd2da 100644 --- a/packages/@o3r/extractors/project.json +++ b/packages/@o3r/extractors/project.json @@ -13,18 +13,8 @@ }, "dependsOn": ["build-builders", "compile"] }, - "prepare-build-builders": { - "executor": "nx:run-script", - "options": { - "script": "prepare:build:builders" - } - }, - "build-builders": { - "executor": "nx:run-script", - "options": { - "script": "build:builders" - } - }, + "prepare-build-builders": {}, + "build-builders": {}, "compile": { "executor": "nx:run-script", "options": { @@ -32,39 +22,12 @@ }, "dependsOn": ["^build"] }, - "lint": { - "executor": "nx:run-commands" - }, - "test": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@o3r/extractors/jest.config.js" - } - }, - "test-int": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@o3r/extractors/testing/jest.config.it.js" - } - }, - "prepare-publish": { - "executor": "nx:run-script", - "options": { - "script": "prepare:publish" - } - }, - "publish": { - "executor": "nx:run-commands", - "options": { - "command": "npm publish packages/@o3r/extractors/dist" - } - }, - "documentation": { - "executor": "nx:run-script", - "options": { - "script": "compodoc" - } - } + "lint": {}, + "test": {}, + "test-int": {}, + "prepare-publish": {}, + "publish": {}, + "documentation": {} }, "tags": [] } diff --git a/packages/@o3r/forms/project.json b/packages/@o3r/forms/project.json index 5645389587..cb67c49934 100644 --- a/packages/@o3r/forms/project.json +++ b/packages/@o3r/forms/project.json @@ -16,45 +16,13 @@ "tsConfig": "packages/@o3r/forms/tsconfig.build.json" } }, - "lint": { - "executor": "nx:run-commands" - }, - "test": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@o3r/forms/jest.config.js" - } - }, - "prepare-publish": { - "executor": "nx:run-script", - "options": { - "script": "prepare:publish" - } - }, - "publish": { - "executor": "nx:run-commands", - "options": { - "command": "npm publish packages/@o3r/forms/dist" - } - }, - "prepare-build-builders": { - "executor": "nx:run-script", - "options": { - "script": "prepare:build:builders" - } - }, - "build-builders": { - "executor": "nx:run-script", - "options": { - "script": "build:builders" - } - }, - "documentation": { - "executor": "nx:run-script", - "options": { - "script": "compodoc" - } - } + "lint": {}, + "test": {}, + "prepare-publish": {}, + "publish": {}, + "prepare-build-builders": {}, + "build-builders": {}, + "documentation": {} }, "tags": [] } diff --git a/packages/@o3r/localization/project.json b/packages/@o3r/localization/project.json index bf08fe51ab..1f9b71e4ce 100644 --- a/packages/@o3r/localization/project.json +++ b/packages/@o3r/localization/project.json @@ -9,9 +9,7 @@ "executor": "nx:noop", "dependsOn": ["build-builders", "compile"] }, - "prepare": { - "executor": "nx:run-script" - }, + "prepare": {}, "compile": { "executor": "@angular-devkit/build-angular:ng-packagr", "options": { @@ -23,51 +21,14 @@ "^build" ] }, - "prepare-build-builders": { - "executor": "nx:run-script", - "options": { - "script": "prepare:build:builders" - } - }, - "build-builders": { - "executor": "nx:run-script", - "options": { - "script": "build:builders" - } - }, - "lint": { - "executor": "nx:run-commands" - }, - "test": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@o3r/localization/jest.config.js" - } - }, - "test-int": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@o3r/localization/testing/jest.config.it.js" - } - }, - "prepare-publish": { - "executor": "nx:run-script", - "options": { - "script": "prepare:publish" - } - }, - "publish": { - "executor": "nx:run-commands", - "options": { - "command": "npm publish packages/@o3r/localization/dist" - } - }, - "documentation": { - "executor": "nx:run-script", - "options": { - "script": "compodoc" - } - } + "prepare-build-builders": {}, + "build-builders": {}, + "lint": {}, + "test": {}, + "test-int": {}, + "prepare-publish": {}, + "publish": {}, + "documentation": {} }, "tags": [] } diff --git a/packages/@o3r/logger/project.json b/packages/@o3r/logger/project.json index 14c3f61001..1e33c51d9e 100644 --- a/packages/@o3r/logger/project.json +++ b/packages/@o3r/logger/project.json @@ -9,21 +9,9 @@ "executor": "nx:noop", "dependsOn": ["build-builders", "compile"] }, - "prepare-build-builders": { - "executor": "nx:run-script", - "options": { - "script": "prepare:build:builders" - } - }, - "build-builders": { - "executor": "nx:run-script", - "options": { - "script": "build:builders" - } - }, - "prepare": { - "executor": "nx:run-script" - }, + "prepare-build-builders": {}, + "build-builders": {}, + "prepare": {}, "compile": { "executor": "@angular-devkit/build-angular:ng-packagr", "options": { @@ -32,33 +20,11 @@ }, "dependsOn": ["prepare", "^build"] }, - "lint": { - "executor": "nx:run-commands" - }, - "test": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@o3r/logger/jest.config.js" - } - }, - "prepare-publish": { - "executor": "nx:run-script", - "options": { - "script": "prepare:publish" - } - }, - "publish": { - "executor": "nx:run-commands", - "options": { - "command": "npm publish packages/@o3r/logger/dist" - } - }, - "documentation": { - "executor": "nx:run-script", - "options": { - "script": "compodoc" - } - } + "lint": {}, + "test": {}, + "prepare-publish": {}, + "publish": {}, + "documentation": {} }, "tags": [] } diff --git a/packages/@o3r/mobile/project.json b/packages/@o3r/mobile/project.json index d23c71e607..932b9d01fb 100644 --- a/packages/@o3r/mobile/project.json +++ b/packages/@o3r/mobile/project.json @@ -30,39 +30,12 @@ "script": "build:builders" } }, - "lint": { - "executor": "nx:run-commands" - }, - "test": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@o3r/mobile/jest.config.js" - } - }, - "prepare-publish": { - "executor": "nx:run-script", - "options": { - "script": "prepare:publish" - } - }, - "publish": { - "executor": "nx:run-commands", - "options": { - "command": "npm publish packages/@o3r/mobile/dist" - } - }, - "prepare-build-builders": { - "executor": "nx:run-script", - "options": { - "script": "prepare:build:builders" - } - }, - "documentation": { - "executor": "nx:run-script", - "options": { - "script": "compodoc" - } - } + "lint": {}, + "test": {}, + "prepare-publish": {}, + "publish": {}, + "prepare-build-builders": {}, + "documentation": {} }, "tags": [] } diff --git a/packages/@o3r/new-version/project.json b/packages/@o3r/new-version/project.json index 81b8f841d7..958207df40 100644 --- a/packages/@o3r/new-version/project.json +++ b/packages/@o3r/new-version/project.json @@ -13,57 +13,20 @@ }, "dependsOn": ["compile", "build-builders"] }, - "prepare-build-builders": { - "executor": "nx:run-script", - "options": { - "script": "prepare:build:builders" - } - }, - "build-builders": { - "executor": "nx:run-script", - "options": { - "script": "build:builders" - } - }, + "prepare-build-builders": {}, + "build-builders": {}, "compile": { "executor": "nx:run-script", "options": { "script": "build:source" } }, - "lint": { - "executor": "nx:run-commands" - }, - "test": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@o3r/new-version/jest.config.js" - } - }, - "test-int": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@o3r/new-version/testing/jest.config.it.js" - } - }, - "prepare-publish": { - "executor": "nx:run-script", - "options": { - "script": "prepare:publish" - } - }, - "publish": { - "executor": "nx:run-commands", - "options": { - "command": "npm publish packages/@o3r/new-version/dist" - } - }, - "documentation": { - "executor": "nx:run-script", - "options": { - "script": "compodoc" - } - } + "lint": {}, + "test": {}, + "test-int": {}, + "prepare-publish": {}, + "publish": {}, + "documentation": {} }, "tags": ["tools"] } diff --git a/packages/@o3r/pipeline/project.json b/packages/@o3r/pipeline/project.json index db6dd0f5cc..96abb19bc1 100644 --- a/packages/@o3r/pipeline/project.json +++ b/packages/@o3r/pipeline/project.json @@ -29,51 +29,16 @@ "^source" ] }, - "prepare-build-builders": { - "executor": "nx:run-script", - "options": { - "script": "prepare:build:builders" - } - }, - "build-builders": { - "executor": "nx:run-script", - "options": { - "script": "build:builders" - } - }, - "lint": { - "executor": "nx:run-commands" - }, + "prepare-build-builders": {}, + "build-builders": {}, + "lint": {}, "test": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@o3r/pipeline/jest.config.js" - } + "executor": "@nx/jest:jest" }, - "test-int": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@o3r/pipeline/testing/jest.config.it.js" - } - }, - "prepare-publish": { - "executor": "nx:run-script", - "options": { - "script": "prepare:publish" - } - }, - "publish": { - "executor": "nx:run-commands", - "options": { - "command": "npm publish packages/@o3r/pipeline/dist" - } - }, - "documentation": { - "executor": "nx:run-script", - "options": { - "script": "compodoc" - } - } + "test-int": {}, + "prepare-publish": {}, + "publish": {}, + "documentation": {} }, "tags": [] } diff --git a/packages/@o3r/routing/project.json b/packages/@o3r/routing/project.json index 1da5e5281c..fe8844f026 100644 --- a/packages/@o3r/routing/project.json +++ b/packages/@o3r/routing/project.json @@ -21,48 +21,14 @@ "tsConfig": "packages/@o3r/routing/tsconfig.build.json" } }, - "prepare": { - "executor": "nx:run-script" - }, - "lint": { - "executor": "nx:run-commands" - }, - "test": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@o3r/routing/jest.config.js" - } - }, - "prepare-publish": { - "executor": "nx:run-script", - "options": { - "script": "prepare:publish" - } - }, - "publish": { - "executor": "nx:run-commands", - "options": { - "command": "npm publish packages/@o3r/routing/dist" - } - }, - "prepare-build-builders": { - "executor": "nx:run-script", - "options": { - "script": "prepare:build:builders" - } - }, - "build-builders": { - "executor": "nx:run-script", - "options": { - "script": "build:builders" - } - }, - "documentation": { - "executor": "nx:run-script", - "options": { - "script": "compodoc" - } - } + "prepare": {}, + "lint": {}, + "test": {}, + "publish": {}, + "prepare-publish": {}, + "prepare-build-builders": {}, + "build-builders": {}, + "documentation": {} }, "tags": [] } diff --git a/packages/@o3r/rules-engine/project.json b/packages/@o3r/rules-engine/project.json index e9ce8c310a..cc097ac567 100644 --- a/packages/@o3r/rules-engine/project.json +++ b/packages/@o3r/rules-engine/project.json @@ -28,12 +28,8 @@ "tsConfig": "packages/@o3r/rules-engine/tsconfig.build.json" } }, - "expose-schemas": { - "executor": "nx:run-script" - }, - "prepare": { - "executor": "nx:run-script" - }, + "expose-schemas": {}, + "prepare": {}, "extract-rules-engine": { "executor": "@o3r/rules-engine:extractor", "options": { @@ -64,18 +60,8 @@ "script": "build:fixtures:jasmine" } }, - "prepare-build-builders": { - "executor": "nx:run-script", - "options": { - "script": "prepare:build:builders" - } - }, - "build-builders": { - "executor": "nx:run-script", - "options": { - "script": "build:builders" - } - }, + "prepare-build-builders": {}, + "build-builders": {}, "lint": { "executor": "nx:run-commands", "options": { @@ -88,36 +74,11 @@ } } }, - "test": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@o3r/rules-engine/jest.config.js" - } - }, - "test-int": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@o3r/rules-engine/testing/jest.config.it.js" - } - }, - "prepare-publish": { - "executor": "nx:run-script", - "options": { - "script": "prepare:publish" - } - }, - "publish": { - "executor": "nx:run-commands", - "options": { - "command": "npm publish packages/@o3r/rules-engine/dist" - } - }, - "documentation": { - "executor": "nx:run-script", - "options": { - "script": "compodoc" - } - } + "test": {}, + "test-int": {}, + "prepare-publish": {}, + "publish": {}, + "documentation": {} }, "tags": [] } diff --git a/packages/@o3r/schematics/project.json b/packages/@o3r/schematics/project.json index 09eb668f31..959ec62dc7 100644 --- a/packages/@o3r/schematics/project.json +++ b/packages/@o3r/schematics/project.json @@ -18,57 +18,20 @@ "build-cli" ] }, - "prepare-build-builders": { - "executor": "nx:run-script", - "options": { - "script": "prepare:build:builders" - } - }, - "build-builders": { - "executor": "nx:run-script", - "options": { - "script": "build:builders" - } - }, - "build-cli": { - "executor": "nx:run-script", - "options": { - "script": "build:cli" - } - }, + "prepare-build-builders": {}, + "build-builders": {}, + "build-cli": {}, "compile": { "executor": "nx:run-script", "options": { "script": "build:source" } }, - "lint": { - "executor": "nx:run-commands" - }, - "test": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@o3r/schematics/jest.config.js" - } - }, - "prepare-publish": { - "executor": "nx:run-script", - "options": { - "script": "prepare:publish" - } - }, - "publish": { - "executor": "nx:run-commands", - "options": { - "command": "npm publish packages/@o3r/schematics/dist" - } - }, - "documentation": { - "executor": "nx:run-script", - "options": { - "script": "compodoc" - } - } + "lint": {}, + "test": {}, + "prepare-publish": {}, + "publish": {}, + "documentation": {} }, "tags": [] } diff --git a/packages/@o3r/store-sync/project.json b/packages/@o3r/store-sync/project.json index 072f9dc45a..cd2f80192e 100644 --- a/packages/@o3r/store-sync/project.json +++ b/packages/@o3r/store-sync/project.json @@ -16,39 +16,14 @@ "tsConfig": "packages/@o3r/store-sync/tsconfig.build.json" } }, - "prepare-build-builders": { - "executor": "nx:run-script", - "options": { - "script": "prepare:build:builders" - } - }, - "build-builders": { - "executor": "nx:run-script", - "options": { - "script": "build:builders" - } - }, - "lint": { - "executor": "nx:run-commands" - }, + "prepare-build-builders": {}, + "build-builders": {}, + "lint": {}, "test": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@o3r/store-sync/jest.config.js" - } + "executor": "@nx/jest:jest" }, - "prepare-publish": { - "executor": "nx:run-script", - "options": { - "script": "prepare:publish" - } - }, - "publish": { - "executor": "nx:run-commands", - "options": { - "command": "npm publish packages/@o3r/store-sync/dist" - } - } + "prepare-publish": {}, + "publish": {} }, "tags": [] } diff --git a/packages/@o3r/storybook/project.json b/packages/@o3r/storybook/project.json index a747480c79..e0c68dbc44 100644 --- a/packages/@o3r/storybook/project.json +++ b/packages/@o3r/storybook/project.json @@ -9,18 +9,8 @@ "executor": "nx:noop", "dependsOn": ["build-builders", "compile", "build-wrapper", "build-react"] }, - "prepare-build-builders": { - "executor": "nx:run-script", - "options": { - "script": "prepare:build:builders" - } - }, - "build-builders": { - "executor": "nx:run-script", - "options": { - "script": "build:builders" - } - }, + "prepare-build-builders": {}, + "build-builders": {}, "compile": { "executor": "nx:run-script", "options": { @@ -51,33 +41,11 @@ }, "dependsOn": ["compile"] }, - "lint": { - "executor": "nx:run-commands" - }, - "test": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@o3r/storybook/jest.config.js" - } - }, - "prepare-publish": { - "executor": "nx:run-script", - "options": { - "script": "prepare:publish" - } - }, - "publish": { - "executor": "nx:run-commands", - "options": { - "command": "npm publish packages/@o3r/storybook/dist" - } - }, - "documentation": { - "executor": "nx:run-script", - "options": { - "script": "compodoc" - } - } + "lint": {}, + "test": {}, + "prepare-publish": {}, + "publish": {}, + "documentation": {} }, "tags": [] } diff --git a/packages/@o3r/stylelint-plugin/project.json b/packages/@o3r/stylelint-plugin/project.json index e2e6dcdc60..d14e4107d5 100644 --- a/packages/@o3r/stylelint-plugin/project.json +++ b/packages/@o3r/stylelint-plugin/project.json @@ -13,18 +13,8 @@ }, "dependsOn": ["compile", "build-builders"] }, - "prepare-build-builders": { - "executor": "nx:run-script", - "options": { - "script": "prepare:build:builders" - } - }, - "build-builders": { - "executor": "nx:run-script", - "options": { - "script": "build:builders" - } - }, + "prepare-build-builders": {}, + "build-builders": {}, "compile": { "executor": "nx:run-script", "outputs": [ @@ -37,39 +27,12 @@ }, "dependsOn": ["^build"] }, - "lint": { - "executor": "nx:run-commands" - }, - "test": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@o3r/stylelint-plugin/jest.config.js" - } - }, - "test-int": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@o3r/stylelint-plugin/testing/jest.config.it.js" - } - }, - "prepare-publish": { - "executor": "nx:run-script", - "options": { - "script": "prepare:publish" - } - }, - "publish": { - "executor": "nx:run-commands", - "options": { - "command": "npm publish packages/@o3r/stylelint-plugin/dist" - } - }, - "documentation": { - "executor": "nx:run-script", - "options": { - "script": "compodoc" - } - } + "lint": {}, + "test": {}, + "test-int": {}, + "prepare-publish": {}, + "publish": {}, + "documentation": {} }, "tags": [] } diff --git a/packages/@o3r/styling/project.json b/packages/@o3r/styling/project.json index ff90d3b00b..f1f54d35a1 100644 --- a/packages/@o3r/styling/project.json +++ b/packages/@o3r/styling/project.json @@ -16,51 +16,16 @@ "tsConfig": "packages/@o3r/styling/tsconfig.build.json" } }, - "prepare-build-builders": { - "executor": "nx:run-script", - "options": { - "script": "prepare:build:builders" - } - }, - "build-builders": { - "executor": "nx:run-script", - "options": { - "script": "build:builders" - } - }, - "lint": { - "executor": "nx:run-commands" - }, + "prepare-build-builders": {}, + "build-builders": {}, + "lint": {}, "test": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@o3r/styling/jest.config.js" - } - }, - "test-int": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@o3r/styling/testing/jest.config.it.js" - } - }, - "prepare-publish": { - "executor": "nx:run-script", - "options": { - "script": "prepare:publish" - } + "executor": "@nx/jest:jest" }, - "publish": { - "executor": "nx:run-commands", - "options": { - "command": "npm publish packages/@o3r/styling/dist" - } - }, - "documentation": { - "executor": "nx:run-script", - "options": { - "script": "compodoc" - } - } + "test-int": {}, + "prepare-publish": {}, + "publish": {}, + "documentation": {} }, "tags": [] } diff --git a/packages/@o3r/telemetry/project.json b/packages/@o3r/telemetry/project.json index e2ee5291ea..bf66faca04 100644 --- a/packages/@o3r/telemetry/project.json +++ b/packages/@o3r/telemetry/project.json @@ -27,40 +27,12 @@ "script": "build:source" } }, - "prepare-build-builders": { - "executor": "nx:run-script", - "options": { - "script": "prepare:build:builders" - } - }, - "build-builders": { - "executor": "nx:run-script", - "options": { - "script": "build:builders" - } - }, - "lint": { - "executor": "nx:run-commands" - }, - "test": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@o3r/telemetry/jest.config.js", - "silent": true - } - }, - "prepare-publish": { - "executor": "nx:run-script", - "options": { - "script": "prepare:publish" - } - }, - "publish": { - "executor": "nx:run-commands", - "options": { - "command": "npm publish packages/@o3r/telemetry/dist" - } - } + "prepare-build-builders": {}, + "build-builders": {}, + "lint": {}, + "test": {}, + "prepare-publish": {}, + "publish": {} }, "tags": [] } diff --git a/packages/@o3r/test-helpers/project.json b/packages/@o3r/test-helpers/project.json index eb73dbcf1f..bb0a48ac09 100644 --- a/packages/@o3r/test-helpers/project.json +++ b/packages/@o3r/test-helpers/project.json @@ -28,27 +28,10 @@ "script": "build:source" } }, - "prepare-build-builders": { - "executor": "nx:run-script", - "options": { - "script": "prepare:build:builders" - } - }, - "build-builders": { - "executor": "nx:run-script", - "options": { - "script": "build:builders" - } - }, - "lint": { - "executor": "nx:run-commands" - }, - "test": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@o3r/test-helpers/jest.config.js" - } - } + "prepare-build-builders": {}, + "build-builders": {}, + "lint": {}, + "test": {} }, "tags": [] } diff --git a/packages/@o3r/testing/project.json b/packages/@o3r/testing/project.json index 589b96fb3a..89ab661b2b 100644 --- a/packages/@o3r/testing/project.json +++ b/packages/@o3r/testing/project.json @@ -24,12 +24,7 @@ "script": "build:source" } }, - "prepare-build-builders": { - "executor": "nx:run-script", - "options": { - "script": "prepare:build:builders" - } - }, + "prepare-build-builders": {}, "build-schematics": { "executor": "nx:run-script", "dependsOn": ["^build", "compile", "prepare-build-builders"], @@ -71,39 +66,12 @@ "compile" ] }, - "lint": { - "executor": "nx:run-commands" - }, - "test": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@o3r/testing/jest.config.js" - } - }, - "test-int": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@o3r/testing/testing/jest.config.it.js" - } - }, - "prepare-publish": { - "executor": "nx:run-script", - "options": { - "script": "prepare:publish" - } - }, - "publish": { - "executor": "nx:run-commands", - "options": { - "command": "npm publish packages/@o3r/testing/dist" - } - }, - "documentation": { - "executor": "nx:run-script", - "options": { - "script": "compodoc" - } - } + "lint": {}, + "test": {}, + "test-int": {}, + "prepare-publish": {}, + "publish": {}, + "documentation": {} }, "tags": [] } diff --git a/packages/@o3r/third-party/project.json b/packages/@o3r/third-party/project.json index 10a0a8b8c5..1d1807fca6 100644 --- a/packages/@o3r/third-party/project.json +++ b/packages/@o3r/third-party/project.json @@ -17,51 +17,14 @@ "tsConfig": "packages/@o3r/third-party/tsconfig.build.json" } }, - "lint": { - "executor": "nx:run-commands" - }, - "test-int": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@o3r/third-party/testing/jest.config.it.js" - } - }, - "test": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@o3r/third-party/jest.config.js" - } - }, - "prepare-publish": { - "executor": "nx:run-script", - "options": { - "script": "prepare:publish" - } - }, - "publish": { - "executor": "nx:run-commands", - "options": { - "command": "npm publish packages/@o3r/third-party/dist" - } - }, - "prepare-build-builders": { - "executor": "nx:run-script", - "options": { - "script": "prepare:build:builders" - } - }, - "build-builders": { - "executor": "nx:run-script", - "options": { - "script": "build:builders" - } - }, - "documentation": { - "executor": "nx:run-script", - "options": { - "script": "compodoc" - } - } + "lint": {}, + "test-int": {}, + "test": {}, + "prepare-publish": {}, + "publish": {}, + "prepare-build-builders": {}, + "build-builders": {}, + "documentation": {} }, "tags": [] } diff --git a/packages/@o3r/workspace/project.json b/packages/@o3r/workspace/project.json index df5f2706cd..fb7c001f7f 100644 --- a/packages/@o3r/workspace/project.json +++ b/packages/@o3r/workspace/project.json @@ -16,12 +16,7 @@ }, "dependsOn": ["compile", "build-builders"] }, - "prepare-build-builders": { - "executor": "nx:run-script", - "options": { - "script": "prepare:build:builders" - } - }, + "prepare-build-builders": {}, "compile": { "executor": "nx:run-script", "options": { @@ -36,33 +31,13 @@ "inputs": ["builders", "schematics", "middlewares", "source", "^source"], "outputs": ["{projectRoot}/dist"] }, - "lint": { - "executor": "nx:run-commands" - }, + "lint": {}, "test": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@o3r/workspace/jest.config.js" - } - }, - "test-int": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "packages/@o3r/workspace/testing/jest.config.it.js" - } - }, - "prepare-publish": { - "executor": "nx:run-script", - "options": { - "script": "prepare:publish" - } + "executor": "@nx/jest:jest" }, - "publish": { - "executor": "nx:run-commands", - "options": { - "command": "npm publish packages/@o3r/workspace/dist" - } - } + "test-int": {}, + "prepare-publish": {}, + "publish": {} }, "tags": [] } diff --git a/tools/@o3r/build-helpers/package.json b/tools/@o3r/build-helpers/package.json index 9c81eefa49..2779eddf28 100644 --- a/tools/@o3r/build-helpers/package.json +++ b/tools/@o3r/build-helpers/package.json @@ -26,7 +26,6 @@ "prepare-doc-root-menu-template": "./scripts/prepare-doc-root-menu-template.mjs", "prepare-publish": "./scripts/prepare-publish.mjs", "update-doc-summary": "./scripts/update-doc-summary.mjs", - "update-package": "./scripts/update-package.mjs", "write-git-hash": "./scripts/write-git-hash.mjs" }, "dependencies": { diff --git a/tools/@o3r/build-helpers/project.json b/tools/@o3r/build-helpers/project.json index 5b2e8c7f35..88c4c61a4d 100644 --- a/tools/@o3r/build-helpers/project.json +++ b/tools/@o3r/build-helpers/project.json @@ -1,13 +1,14 @@ { "name": "build-helpers", "$schema": "https://raw.githubusercontent.com/nrwl/nx/master/packages/nx/schemas/project-schema.json", + "implicitDependencies": [ + "!eslint-plugin" + ], "projectType": "library", "sourceRoot": "packages/@o3r/build-helpers/scripts", "tags": [], "targets": { - "lint": { - "executor": "nx:run-commands" - }, + "lint": {}, "build": { "executor": "nx:noop", "dependsOn": [] diff --git a/tools/@o3r/build-helpers/scripts/prepare-publish.mjs b/tools/@o3r/build-helpers/scripts/prepare-publish.mjs index fa759803e0..14f9871100 100644 --- a/tools/@o3r/build-helpers/scripts/prepare-publish.mjs +++ b/tools/@o3r/build-helpers/scripts/prepare-publish.mjs @@ -22,19 +22,19 @@ import { import minimist from 'minimist'; const argv = minimist(process.argv.slice(2)); +const appendPath = argv.dist || argv.appendPath; const root = argv.root ? resolve(process.cwd(), argv.root) : process.cwd(); const /** @type { string[] } */ fields = argv.fields?.split(',') || ['contributors', 'bugs', 'repository', 'license', 'homepage']; -const appendPath = argv.append && normalize(argv.append); /** - * Find Private package.json + * Find the workspace package.json * @param {string} currentFolder */ -const findPrivatePackage = (currentFolder) => { +const findWorkspacePackage = (currentFolder) => { const inspectedPackage = resolve(currentFolder, 'package.json'); if (existsSync(inspectedPackage)) { const pck = JSON.parse(readFileSync(inspectedPackage, { encoding: 'utf8' })); - if (pck.private) { + if (pck.private && pck.workspaces) { return { content: pck, path: inspectedPackage @@ -46,7 +46,7 @@ const findPrivatePackage = (currentFolder) => { if (!parent || currentFolder === parent) { return null; } - return findPrivatePackage(parent); + return findWorkspacePackage(parent); }; /** @@ -75,7 +75,7 @@ const findReadme = (currentFolder) => { * @param {string} packageJsonPath */ function preparePublish(rootPath, distPath, packageJsonPath) { - const privatePackageJson = findPrivatePackage(rootPath); + const privatePackageJson = findWorkspacePackage(rootPath); const distPackageJson = resolve(rootPath, packageJsonPath); if (!packageJsonPath || !existsSync(distPackageJson)) { @@ -109,7 +109,7 @@ function preparePublish(rootPath, distPath, packageJsonPath) { const distPaths = argv._.length > 0 ? argv._ .flatMap((files) => files.split(delimiter)) - .map((p) => appendPath ? join(p, appendPath) : p) + .map((p) => appendPath ? join(p, normalize(appendPath)) : p) : [resolve(process.cwd(), appendPath || 'dist')]; distPaths.forEach((distPath) => preparePublish(root, distPath, join(distPath, 'package.json'))); diff --git a/tools/@o3r/workspace-helpers/package.json b/tools/@o3r/workspace-helpers/package.json index a9f10f7786..f376372a80 100644 --- a/tools/@o3r/workspace-helpers/package.json +++ b/tools/@o3r/workspace-helpers/package.json @@ -18,7 +18,8 @@ "pr-labels": "./scripts/pr-labels.mjs", "prepare-doc-root-menu-template": "./scripts/prepare-doc-root-menu-template.mjs", "report-deprecates": "./scripts/report-deprecates.mjs", - "update-doc-summary": "./scripts/update-doc-summary.mjs" + "update-doc-summary": "./scripts/update-doc-summary.mjs", + "update-package": "./scripts/update-package.mjs" }, "dependencies": { "globby": "^14.0.0", diff --git a/tools/@o3r/build-helpers/scripts/update-package.mjs b/tools/@o3r/workspace-helpers/scripts/update-package.mjs similarity index 100% rename from tools/@o3r/build-helpers/scripts/update-package.mjs rename to tools/@o3r/workspace-helpers/scripts/update-package.mjs diff --git a/tools/github-actions/audit/project.json b/tools/github-actions/audit/project.json index 34114fca4c..583d4239aa 100644 --- a/tools/github-actions/audit/project.json +++ b/tools/github-actions/audit/project.json @@ -23,15 +23,8 @@ "script": "package" } }, - "lint": { - "executor": "nx:run-commands" - }, - "test": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "tools/github-actions/audit/jest.config.js" - } - } + "lint": {}, + "test": {} }, "tags": [] } diff --git a/tools/github-actions/cascading/project.json b/tools/github-actions/cascading/project.json index 4e9675be59..ec6fc48500 100644 --- a/tools/github-actions/cascading/project.json +++ b/tools/github-actions/cascading/project.json @@ -23,15 +23,8 @@ "script": "package" } }, - "lint": { - "executor": "nx:run-commands" - }, - "test": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "tools/github-actions/cascading/jest.config.js" - } - } + "lint": {}, + "test": {} }, "tags": [] } diff --git a/tools/github-actions/get-npm-tag/project.json b/tools/github-actions/get-npm-tag/project.json index fdccc145ac..d5f4a8feec 100644 --- a/tools/github-actions/get-npm-tag/project.json +++ b/tools/github-actions/get-npm-tag/project.json @@ -23,9 +23,7 @@ "script": "package" } }, - "lint": { - "executor": "nx:run-commands" - } + "lint": {} }, "tags": [] } diff --git a/tools/github-actions/new-version/project.json b/tools/github-actions/new-version/project.json index 67360db3a5..ae29e189d9 100644 --- a/tools/github-actions/new-version/project.json +++ b/tools/github-actions/new-version/project.json @@ -23,15 +23,8 @@ "script": "package" } }, - "lint": { - "executor": "nx:run-commands" - }, - "test": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "tools/github-actions/new-version/jest.config.js" - } - } + "lint": {}, + "test": {} }, "tags": [] } diff --git a/tools/github-actions/release/project.json b/tools/github-actions/release/project.json index bda17786c1..50246df873 100644 --- a/tools/github-actions/release/project.json +++ b/tools/github-actions/release/project.json @@ -23,9 +23,7 @@ "script": "package" } }, - "lint": { - "executor": "nx:run-commands" - } + "lint": {} }, "tags": [] } diff --git a/yarn.lock b/yarn.lock index 91381b97e7..fb73359463 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8005,7 +8005,6 @@ __metadata: prepare-doc-root-menu-template: ./scripts/prepare-doc-root-menu-template.mjs prepare-publish: ./scripts/prepare-publish.mjs update-doc-summary: ./scripts/update-doc-summary.mjs - update-package: ./scripts/update-package.mjs write-git-hash: ./scripts/write-git-hash.mjs languageName: unknown linkType: soft @@ -9348,7 +9347,6 @@ __metadata: "@nx/jest": "npm:~19.8.0" "@nx/js": "npm:~19.8.0" "@nx/workspace": "npm:~19.8.0" - "@o3r/build-helpers": "workspace:^" "@o3r/eslint-config": "workspace:^" "@o3r/eslint-plugin": "workspace:^" "@o3r/telemetry": "workspace:^" @@ -11197,6 +11195,7 @@ __metadata: prepare-doc-root-menu-template: ./scripts/prepare-doc-root-menu-template.mjs report-deprecates: ./scripts/report-deprecates.mjs update-doc-summary: ./scripts/update-doc-summary.mjs + update-package: ./scripts/update-package.mjs languageName: unknown linkType: soft @@ -25522,7 +25521,16 @@ __metadata: languageName: node linkType: hard -"is-typed-array@npm:^1.1.13, is-typed-array@npm:^1.1.14, is-typed-array@npm:^1.1.15, is-typed-array@npm:^1.1.3": +"is-typed-array@npm:^1.1.13, is-typed-array@npm:^1.1.3": + version: 1.1.13 + resolution: "is-typed-array@npm:1.1.13" + dependencies: + which-typed-array: "npm:^1.1.14" + checksum: 10/f850ba08286358b9a11aee6d93d371a45e3c59b5953549ee1c1a9a55ba5c1dd1bd9952488ae194ad8f32a9cf5e79c8fa5f0cc4d78c00720aa0bbcf238b38062d + languageName: node + linkType: hard + +"is-typed-array@npm:^1.1.14, is-typed-array@npm:^1.1.15": version: 1.1.15 resolution: "is-typed-array@npm:1.1.15" dependencies: @@ -37473,6 +37481,19 @@ __metadata: languageName: node linkType: hard +"which-typed-array@npm:^1.1.14": + version: 1.1.16 + resolution: "which-typed-array@npm:1.1.16" + dependencies: + available-typed-arrays: "npm:^1.0.7" + call-bind: "npm:^1.0.7" + for-each: "npm:^0.3.3" + gopd: "npm:^1.0.1" + has-tostringtag: "npm:^1.0.2" + checksum: 10/7106e94729632cdcedc94080442872392806b3364225156952981777f46b75d2e3b13813b5d935bdb2ac8523f8758fcf3513f7e1ed44a8e10d6c4f1029c3fa7d + languageName: node + linkType: hard + "which-typed-array@npm:^1.1.16, which-typed-array@npm:^1.1.18, which-typed-array@npm:^1.1.2": version: 1.1.18 resolution: "which-typed-array@npm:1.1.18" @@ -37853,16 +37874,7 @@ __metadata: languageName: node linkType: hard -"yaml@npm:^2.0.0, yaml@npm:^2.4.1, yaml@npm:^2.5.1": - version: 2.7.0 - resolution: "yaml@npm:2.7.0" - bin: - yaml: bin.mjs - checksum: 10/c8c314c62fbd49244a6a51b06482f6d495b37ab10fa685fcafa1bbaae7841b7233ee7d12cab087bcca5a0b28adc92868b6e437322276430c28d00f1c1732eeec - languageName: node - linkType: hard - -"yaml@npm:~2.6.1": +"yaml@npm:^2.0.0, yaml@npm:^2.4.1, yaml@npm:^2.5.1, yaml@npm:~2.6.1": version: 2.6.1 resolution: "yaml@npm:2.6.1" bin: