From 6b1cf04ef65f303ef52fe18f3259ddde7a253fef Mon Sep 17 00:00:00 2001 From: matthieu-crouzet Date: Tue, 31 Oct 2023 16:15:26 +0100 Subject: [PATCH] chore: move monorepo jest helper to the workspace package --- .github/workflows/code-check.yml | 2 + apps/chrome-devtools/package.json | 1 - apps/github-cascading-app/package.json | 1 - apps/showcase/package.json | 1 - apps/vscode-extension/package.json | 1 - docs/dev-tools/DEV_TOOLS.md | 10 +-- jest.config.js | 2 +- package.json | 6 +- packages/@ama-sdk/core/package.json | 5 +- packages/@ama-sdk/create/package.json | 1 - .../@ama-sdk/create/testing/jest.config.it.js | 3 +- packages/@ama-sdk/schematics/package.json | 2 +- .../schematics/schematics/ng-add/index.ts | 2 +- .../templates/base/package.json.template | 4 +- packages/@ama-sdk/showcase-sdk/package.json | 10 +-- packages/@ama-terasu/cli/package.json | 1 - packages/@ama-terasu/core/package.json | 1 - packages/@ama-terasu/schematics/package.json | 1 - .../amaterasu/amaterasu-api-spec/package.json | 1 - .../amaterasu/amaterasu-dodo/package.json | 1 - .../amaterasu/amaterasu-otter/package.json | 1 - .../@o3r/amaterasu/amaterasu-sdk/package.json | 1 - packages/@o3r/analytics/package.json | 2 - packages/@o3r/apis-manager/package.json | 2 - packages/@o3r/application/package.json | 2 - packages/@o3r/components/package.json | 2 - packages/@o3r/configuration/package.json | 2 - packages/@o3r/core/package.json | 6 -- packages/@o3r/core/schematics/ng-add/index.ts | 2 +- .../rule-factories/o3r-basic-updates/index.ts | 2 - packages/@o3r/create/package.json | 1 - packages/@o3r/dev-tools/package.json | 1 + .../dev-tools/src/utils/check-peer-deps.ts | 4 +- .../src/utils/is-package-installed.ts | 3 +- .../@o3r/dev-tools/src/utils/jest.helpers.ts | 18 ++---- packages/@o3r/dev-tools/src/utils/string.ts | 3 +- packages/@o3r/dynamic-content/package.json | 2 - packages/@o3r/extractors/package.json | 1 - packages/@o3r/forms/package.json | 2 - packages/@o3r/localization/package.json | 1 - packages/@o3r/logger/package.json | 1 - packages/@o3r/mobile/package.json | 1 - packages/@o3r/routing/package.json | 2 - packages/@o3r/rules-engine/package.json | 2 - packages/@o3r/schematics/package.json | 1 - .../schematics/src/utility/matching-peers.ts | 11 +++- packages/@o3r/store-sync/package.json | 2 - packages/@o3r/storybook/package.json | 1 - packages/@o3r/styling/package.json | 1 - packages/@o3r/test-helpers/package.json | 1 - packages/@o3r/testing/package.json | 1 - .../workspace/jest.config.js.template | 2 +- packages/@o3r/third-party/package.json | 1 - packages/@o3r/workspace/README.md | 2 +- packages/@o3r/workspace/package.json | 2 - .../schematics/library/rules/shared.ts | 2 - .../@o3r/workspace/schematics/sdk/index.ts | 5 +- packages/@o3r/workspace/src/public_api.ts | 2 +- packages/@o3r/workspace/src/utils/index.ts | 1 + .../@o3r/workspace/src/utils/jest.helpers.ts | 23 +++++++ tools/github-actions/cascading/package.json | 1 - tools/github-actions/new-version/package.json | 1 - tsconfig.base.json | 3 - tsconfig.build.json | 1 - yarn.lock | 63 ++----------------- 65 files changed, 75 insertions(+), 172 deletions(-) create mode 100644 packages/@o3r/workspace/src/utils/index.ts create mode 100644 packages/@o3r/workspace/src/utils/jest.helpers.ts diff --git a/.github/workflows/code-check.yml b/.github/workflows/code-check.yml index 3b06b5e929..626c6433cd 100644 --- a/.github/workflows/code-check.yml +++ b/.github/workflows/code-check.yml @@ -50,6 +50,8 @@ jobs: ${{ runner.os }}-jest-${{ env.hash }} ${{ runner.os }}-jest ${{ runner.os }} + - name: Build swagger generator + 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'}} diff --git a/apps/chrome-devtools/package.json b/apps/chrome-devtools/package.json index 39f64b70b3..8bac7b9c99 100644 --- a/apps/chrome-devtools/package.json +++ b/apps/chrome-devtools/package.json @@ -39,7 +39,6 @@ "@nx/eslint-plugin": "~16.10.0", "@nx/jest": "~16.10.0", "@o3r/build-helpers": "workspace:^", - "@o3r/dev-tools": "workspace:^", "@o3r/eslint-config-otter": "workspace:^", "@o3r/eslint-plugin": "workspace:^", "@o3r/localization": "workspace:^", diff --git a/apps/github-cascading-app/package.json b/apps/github-cascading-app/package.json index 1eb2d14e38..fc9550df5d 100644 --- a/apps/github-cascading-app/package.json +++ b/apps/github-cascading-app/package.json @@ -34,7 +34,6 @@ "@nx/jest": "~16.10.0", "@nx/js": "~16.10.0", "@nx/linter": "~16.10.0", - "@o3r/dev-tools": "workspace:^", "@o3r/eslint-config-otter": "workspace:^", "@o3r/eslint-plugin": "workspace:^", "@types/ejs": "^3.1.2", diff --git a/apps/showcase/package.json b/apps/showcase/package.json index cbd5ad8117..41a4395940 100644 --- a/apps/showcase/package.json +++ b/apps/showcase/package.json @@ -76,7 +76,6 @@ "@angular/compiler-cli": "~16.2.0", "@ng-bootstrap/ng-bootstrap": "^15.1.1", "@nx/eslint-plugin": "~16.10.0", - "@o3r/dev-tools": "workspace:^", "@o3r/eslint-config-otter": "workspace:^", "@o3r/eslint-plugin": "workspace:^", "@o3r/schematics": "workspace:^", diff --git a/apps/vscode-extension/package.json b/apps/vscode-extension/package.json index 39af57df64..1a8a39723f 100644 --- a/apps/vscode-extension/package.json +++ b/apps/vscode-extension/package.json @@ -325,7 +325,6 @@ "@nx/jest": "~16.10.0", "@o3r/build-helpers": "workspace:^", "@o3r/core": "workspace:^", - "@o3r/dev-tools": "workspace:^", "@o3r/eslint-plugin": "workspace:^", "@o3r/schematics": "workspace:^", "@types/eslint": "^8.42.0", diff --git a/docs/dev-tools/DEV_TOOLS.md b/docs/dev-tools/DEV_TOOLS.md index 4c4aafffbd..0bbf4d9749 100644 --- a/docs/dev-tools/DEV_TOOLS.md +++ b/docs/dev-tools/DEV_TOOLS.md @@ -99,11 +99,11 @@ Options: ## Set Version Replace the packages version in a monorepo - + ### Usage ```shell -Usage: set-version [options] +Usage: o3r-set-version [options] Replace the packages version in a monorepos @@ -163,7 +163,7 @@ Example : yarn o3r-pr-artifact-cleaner -b thisismybase64tokenwithuserandencrypte ## Peer dependencies updater -Update a package.json with the given dependencies versions and their respective peer dependencies. +Update a package.json with the given dependencies versions and their respective peer dependencies. Relies on `npm info` to retrieve package information. ### Usage @@ -179,7 +179,7 @@ Options: --verbose Display debug log message --silent Do not exit with error in case of metadata fetch error -Example : peer-dependencies-updater "@random/package@~2.21.0" "@o3r/core" +Example : peer-dependencies-updater "@random/package@~2.21.0" "@o3r/core" ``` ## Scripts @@ -199,7 +199,7 @@ This is used to edit the package.json version of a yarn workspaces packages. ### Usage ```bash -Usage: set-version [options] +Usage: o3r-set-version [options] Replace the packages version in a monorepos diff --git a/jest.config.js b/jest.config.js index 08042b5c1f..ebd914fe09 100644 --- a/jest.config.js +++ b/jest.config.js @@ -1,4 +1,4 @@ -const { getJestProjects } = require('@o3r/dev-tools'); +const { getJestProjects } = require('@o3r/workspace'); /** @type {import('ts-jest/dist/types').JestConfigWithTsJest} */ module.exports = { diff --git a/package.json b/package.json index 539f02eb0f..025fe6bc44 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "get:current-dir": "node -e 'process.stdout.write(process.cwd());'", "build": "yarn nx run-many --target=build --parallel $(yarn get:cpus-number)", "build:affected": "yarn nx affected --target=build --parallel $(yarn get:cpus-number) --output-style stream", - "build:tools": "yarn nx run-many --target=build --projects=eslint-plugin,dev-tools --parallel $(yarn get:cpus-number)", + "build:tools": "yarn nx run-many --target=build --projects=eslint-plugin,workspace --parallel $(yarn get:cpus-number)", "build:swagger-gen": "yarn nx run-many --target=build-swagger --parallel $(yarn get:cpus-number)", "prepare:publish": "prepare-publish $(yarn workspaces:list | shx sed \"s/^(.+)\\$/\\$1\\/dist/\")", "publish": "yarn run prepare:publish && yarn nx run-many --target=publish --parallel $(yarn get:cpus-number) --nx-bail --access=public", @@ -25,7 +25,7 @@ "postinstall": "husky install && yarn build:tools && yarn harmonize:version", "build:storybook": "yarn doc:generate:json && yarn ng run storybook:extract-style && build-storybook", "clear": "rimraf -g './{packages,tools,apps}/{@*/,}{amaterasu/,}*/{dist,build,dist-*}/'", - "set:version": "yarn set-version --placeholder 0.0.0-placeholder --include '{apps,packages}/**/dist/package.json'", + "set:version": "yarn o3r-set-version --placeholder 0.0.0-placeholder --include '{apps,packages}/**/dist/package.json'", "harmonize:version": "eslint '**/package.json*' --quiet --fix", "doc:packages": "yarn nx run-many --target=documentation --parallel $(yarn get:cpus-number)", "doc:root": "yarn prepare-doc-root-menu-template && yarn update-doc-summary ./docs && yarn compodoc", @@ -165,9 +165,9 @@ "@nx/linter": "~16.10.0", "@nx/workspace": "~16.10.0", "@o3r/build-helpers": "workspace:^", - "@o3r/dev-tools": "workspace:^", "@o3r/eslint-config-otter": "workspace:^", "@o3r/eslint-plugin": "workspace:^", + "@o3r/workspace": "workspace:^", "@schematics/angular": "~16.2.0", "@swc-node/register": "^1.6.7", "@swc/core": "^1.3.85", diff --git a/packages/@ama-sdk/core/package.json b/packages/@ama-sdk/core/package.json index b2faaa56a6..70c69d3868 100644 --- a/packages/@ama-sdk/core/package.json +++ b/packages/@ama-sdk/core/package.json @@ -101,7 +101,6 @@ "@nx/eslint-plugin": "~16.10.0", "@nx/jest": "~16.10.0", "@o3r/build-helpers": "workspace:^", - "@o3r/dev-tools": "workspace:^", "@o3r/eslint-plugin": "workspace:^", "@schematics/angular": "~16.2.0", "@swc/cli": "^0.1.57", @@ -141,7 +140,7 @@ }, "schematics": "./collection.json", "bin": { - "amasdk-clear-index": "./cli/clear-index.cjs", - "amasdk-files-pack": "./cli/files-pack.cjs" + "amasdk-clear-index": "./dist/cli/clear-index.cjs", + "amasdk-files-pack": "./dist/cli/files-pack.cjs" } } diff --git a/packages/@ama-sdk/create/package.json b/packages/@ama-sdk/create/package.json index 0148d9dccf..6a6c7e597c 100644 --- a/packages/@ama-sdk/create/package.json +++ b/packages/@ama-sdk/create/package.json @@ -32,7 +32,6 @@ "@nx/js": "~16.10.0", "@nx/linter": "~16.10.0", "@o3r/build-helpers": "workspace:^", - "@o3r/dev-tools": "workspace:^", "@o3r/eslint-config-otter": "workspace:^", "@o3r/eslint-plugin": "workspace:^", "@o3r/test-helpers": "workspace:^", diff --git a/packages/@ama-sdk/create/testing/jest.config.it.js b/packages/@ama-sdk/create/testing/jest.config.it.js index 4f880a0dbb..693a6db125 100644 --- a/packages/@ama-sdk/create/testing/jest.config.it.js +++ b/packages/@ama-sdk/create/testing/jest.config.it.js @@ -1,7 +1,8 @@ +const { dirname } = require('node:path'); const getJestConfig = require('../../../../jest.config.it').getJestConfig; /** @type {import('ts-jest/dist/types').JestConfigWithTsJest} */ module.exports = { - ...getJestConfig(__dirname), + ...getJestConfig(dirname(__dirname)), displayName: require('../package.json').name }; diff --git a/packages/@ama-sdk/schematics/package.json b/packages/@ama-sdk/schematics/package.json index 1d5a1868bf..84ef12fae1 100644 --- a/packages/@ama-sdk/schematics/package.json +++ b/packages/@ama-sdk/schematics/package.json @@ -52,7 +52,6 @@ "dependencies": { "@angular-devkit/core": "~16.2.0", "@angular-devkit/schematics": "~16.2.0", - "@o3r/dev-tools": "workspace:^", "js-yaml": "^4.1.0", "minimatch": "~9.0.3", "rxjs": "^7.8.1", @@ -68,6 +67,7 @@ "@nx/eslint-plugin": "~16.10.0", "@nx/jest": "~16.10.0", "@o3r/build-helpers": "workspace:^", + "@o3r/dev-tools": "workspace:^", "@o3r/eslint-plugin": "workspace:^", "@o3r/schematics": "workspace:^", "@openapitools/openapi-generator-cli": "~2.7.0", diff --git a/packages/@ama-sdk/schematics/schematics/ng-add/index.ts b/packages/@ama-sdk/schematics/schematics/ng-add/index.ts index 2b2bea4a66..c3e52dbd50 100644 --- a/packages/@ama-sdk/schematics/schematics/ng-add/index.ts +++ b/packages/@ama-sdk/schematics/schematics/ng-add/index.ts @@ -140,7 +140,7 @@ const registerPackageSchematics = async (tree: Tree, context: SchematicContext) } const amaSdkSchematicsPackageJsonContent = JSON.parse(readFileSync(path.resolve(__dirname, '..', '..', 'package.json'), {encoding: 'utf-8'})) as PackageJson; const amaSdkSchematicsVersion = amaSdkSchematicsPackageJsonContent.version?.replace(/^v/, ''); - const schematicsDependencies = ['@o3r/dev-tools', '@o3r/schematics']; + const schematicsDependencies = ['@o3r/schematics']; for (const dependency of schematicsDependencies) { context.addTask(new DevInstall({ packageName: dependency + (amaSdkSchematicsVersion ? `@${amaSdkSchematicsVersion}` : ''), diff --git a/packages/@ama-sdk/schematics/schematics/typescript/shell/templates/base/package.json.template b/packages/@ama-sdk/schematics/schematics/typescript/shell/templates/base/package.json.template index 8fd3c3a8e1..2728fafc10 100644 --- a/packages/@ama-sdk/schematics/schematics/typescript/shell/templates/base/package.json.template +++ b/packages/@ama-sdk/schematics/schematics/typescript/shell/templates/base/package.json.template @@ -37,7 +37,7 @@ "build:cjs": "swc src -d dist/cjs -C module.type=commonjs -q", "build:esm2015": "swc src -d dist/esm2015 -C module.type=es6 -q", "build:esm2020": "tsc -b tsconfigs/esm2020", - "set:version": "set-version --placeholder 0.0.0-placeholder", + "set:version": "o3r-set-version --placeholder 0.0.0-placeholder", "resolve": "node -e 'process.stdout.write(require.resolve(process.argv[1]));'", "generate": "schematics @ama-sdk/schematics:typescript-core --spec-path ./swagger-spec.yaml", "spec:regen": "<%=packageManager%> run generate && amasdk-clear-index", @@ -55,7 +55,6 @@ ] }, "dependencies": { - "@o3r/dev-tools": "~<%= sdkCoreVersion %>", "@swc/helpers": "^0.5.0", "tslib": "<%= versions['tslib'] %>" }, @@ -80,6 +79,7 @@ "@o3r/schematics": "^<%= sdkCoreVersion %>", "@o3r/eslint-config-otter": "^<%= sdkCoreVersion %>", "@o3r/eslint-plugin": "^<%= sdkCoreVersion %>", + "@o3r/workspace": "^<%= sdkCoreVersion %>", "@openapitools/openapi-generator-cli": "<%= versions['@openapitools/openapi-generator-cli'] %>", "@swc/cli": "^0.1.57", "@swc/core": "^1.3.85", diff --git a/packages/@ama-sdk/showcase-sdk/package.json b/packages/@ama-sdk/showcase-sdk/package.json index 42275c36dc..04cde822b5 100644 --- a/packages/@ama-sdk/showcase-sdk/package.json +++ b/packages/@ama-sdk/showcase-sdk/package.json @@ -34,17 +34,14 @@ "lint:ci": "eslint '**/*[jt]s' --quiet --format junit --output-file ./dist-lint/result.xml", "lint": "eslint '**/*[jt]s' --cache", "start": "tsc-watch -b tsconfigs/esm2020 --noClear --onFirstSuccess \"yarn run files:pack --watch\"", - "build": "yarn run build:cjs && yarn run build:esm2015 && yarn run build:esm2020 && yarn run build:entries", + "build": "yarn run build:cjs && yarn run build:esm2015 && yarn run build:esm2020 && yarn run files:pack", "build:cjs": "swc src -d dist/cjs -C module.type=commonjs -q", "build:esm2015": "swc src -d dist/esm2015 -C module.type=es6 -q", "build:esm2020": "tsc -b tsconfigs/esm2020", - "build:entries": "yarn run files:pack && yarn exec generate-package-exports", - "set:version": "set-version --placeholder 0.0.0-placeholder", "resolve": "node -e 'process.stdout.write(require.resolve(process.argv[1]));'", "generate": "schematics ../schematics/dist:typescript-core --spec-path ./swagger-spec.yaml", - "spec:regen": "yarn run generate --no-dry-run && yarn exec clear-index", - "clear-index": "node scripts/clear-index.js", - "files:pack": "node scripts/files-pack.js", + "spec:regen": "yarn run generate --no-dry-run && amasdk-clear-index", + "files:pack": "yarn amasdk-files-pack", "test": "jest --passWithNoTests", "publish:package": "npm publish ./dist", "generate:mock": "schematics @ama-sdk/schematics:mock", @@ -52,7 +49,6 @@ "tools:changelog": "standard-version" }, "dependencies": { - "@o3r/dev-tools": "workspace:^", "@swc/helpers": "^0.5.0", "tslib": "^2.5.3" }, diff --git a/packages/@ama-terasu/cli/package.json b/packages/@ama-terasu/cli/package.json index ead87a0338..fd3d03d38f 100644 --- a/packages/@ama-terasu/cli/package.json +++ b/packages/@ama-terasu/cli/package.json @@ -26,7 +26,6 @@ "@o3r/amaterasu-otter": "workspace:^", "@o3r/amaterasu-sdk": "workspace:^", "@o3r/build-helpers": "workspace:^", - "@o3r/dev-tools": "workspace:^", "@o3r/eslint-plugin": "workspace:^", "@types/jest": "~29.5.2", "@types/minimist": "^1.2.2", diff --git a/packages/@ama-terasu/core/package.json b/packages/@ama-terasu/core/package.json index fadd89f245..4b8e419e23 100644 --- a/packages/@ama-terasu/core/package.json +++ b/packages/@ama-terasu/core/package.json @@ -16,7 +16,6 @@ "@nx/eslint-plugin": "~16.10.0", "@nx/jest": "~16.10.0", "@o3r/build-helpers": "workspace:^", - "@o3r/dev-tools": "workspace:^", "@o3r/eslint-plugin": "workspace:^", "@types/jest": "~29.5.2", "@types/minimist": "^1.2.2", diff --git a/packages/@ama-terasu/schematics/package.json b/packages/@ama-terasu/schematics/package.json index 599775f59c..403ecdffef 100644 --- a/packages/@ama-terasu/schematics/package.json +++ b/packages/@ama-terasu/schematics/package.json @@ -26,7 +26,6 @@ "@nx/eslint-plugin": "~16.10.0", "@nx/jest": "~16.10.0", "@o3r/build-helpers": "workspace:^", - "@o3r/dev-tools": "workspace:^", "@o3r/eslint-plugin": "workspace:^", "@types/jest": "~29.5.2", "@types/node": "^18.0.0", diff --git a/packages/@o3r/amaterasu/amaterasu-api-spec/package.json b/packages/@o3r/amaterasu/amaterasu-api-spec/package.json index 6661b1eb34..1f743476ef 100644 --- a/packages/@o3r/amaterasu/amaterasu-api-spec/package.json +++ b/packages/@o3r/amaterasu/amaterasu-api-spec/package.json @@ -22,7 +22,6 @@ "@nx/eslint-plugin": "~16.10.0", "@nx/jest": "~16.10.0", "@o3r/build-helpers": "workspace:^", - "@o3r/dev-tools": "workspace:^", "@o3r/eslint-plugin": "workspace:^", "@types/jest": "~29.5.2", "@types/js-yaml": "^4.0.5", diff --git a/packages/@o3r/amaterasu/amaterasu-dodo/package.json b/packages/@o3r/amaterasu/amaterasu-dodo/package.json index fb596b8753..86eaec1daf 100644 --- a/packages/@o3r/amaterasu/amaterasu-dodo/package.json +++ b/packages/@o3r/amaterasu/amaterasu-dodo/package.json @@ -32,7 +32,6 @@ "@nx/eslint-plugin": "~16.10.0", "@nx/jest": "~16.10.0", "@o3r/build-helpers": "workspace:^", - "@o3r/dev-tools": "workspace:^", "@o3r/eslint-plugin": "workspace:^", "@types/jest": "~29.5.2", "@types/node": "^18.0.0", diff --git a/packages/@o3r/amaterasu/amaterasu-otter/package.json b/packages/@o3r/amaterasu/amaterasu-otter/package.json index b18b04e001..19fc1064bf 100644 --- a/packages/@o3r/amaterasu/amaterasu-otter/package.json +++ b/packages/@o3r/amaterasu/amaterasu-otter/package.json @@ -31,7 +31,6 @@ "@nx/eslint-plugin": "~16.10.0", "@nx/jest": "~16.10.0", "@o3r/build-helpers": "workspace:^", - "@o3r/dev-tools": "workspace:^", "@o3r/eslint-plugin": "workspace:^", "@types/jest": "~29.5.2", "@types/js-yaml": "^4.0.5", diff --git a/packages/@o3r/amaterasu/amaterasu-sdk/package.json b/packages/@o3r/amaterasu/amaterasu-sdk/package.json index 7489a52aa8..72ec6ea7e3 100644 --- a/packages/@o3r/amaterasu/amaterasu-sdk/package.json +++ b/packages/@o3r/amaterasu/amaterasu-sdk/package.json @@ -22,7 +22,6 @@ "@nx/eslint-plugin": "~16.10.0", "@nx/jest": "~16.10.0", "@o3r/build-helpers": "workspace:^", - "@o3r/dev-tools": "workspace:^", "@o3r/eslint-plugin": "workspace:^", "@types/jest": "~29.5.2", "@types/js-yaml": "^4.0.5", diff --git a/packages/@o3r/analytics/package.json b/packages/@o3r/analytics/package.json index cbdf906825..8783fb1dae 100644 --- a/packages/@o3r/analytics/package.json +++ b/packages/@o3r/analytics/package.json @@ -29,7 +29,6 @@ "@angular/router": "~16.2.0", "@ngrx/store": "~16.3.0", "@o3r/core": "workspace:^", - "@o3r/dev-tools": "workspace:^", "@o3r/schematics": "workspace:^", "@schematics/angular": "~16.2.0", "jasmine": "^5.0.0", @@ -76,7 +75,6 @@ "@nx/linter": "~16.10.0", "@o3r/build-helpers": "workspace:^", "@o3r/core": "workspace:^", - "@o3r/dev-tools": "workspace:^", "@o3r/eslint-plugin": "workspace:^", "@o3r/test-helpers": "workspace:^", "@schematics/angular": "~16.2.0", diff --git a/packages/@o3r/apis-manager/package.json b/packages/@o3r/apis-manager/package.json index b42972f458..3de64808a3 100644 --- a/packages/@o3r/apis-manager/package.json +++ b/packages/@o3r/apis-manager/package.json @@ -20,7 +20,6 @@ "@angular-devkit/schematics": "~16.2.0", "@angular/common": "~16.2.0", "@angular/core": "~16.2.0", - "@o3r/dev-tools": "workspace:^", "@o3r/schematics": "workspace:^", "@schematics/angular": "~16.2.0", "rxjs": "^7.8.1", @@ -60,7 +59,6 @@ "@nx/js": "~16.10.0", "@nx/linter": "~16.10.0", "@o3r/build-helpers": "workspace:^", - "@o3r/dev-tools": "workspace:^", "@o3r/eslint-plugin": "workspace:^", "@o3r/schematics": "workspace:^", "@o3r/test-helpers": "workspace:^", diff --git a/packages/@o3r/application/package.json b/packages/@o3r/application/package.json index cc3f7b821c..2640c132ed 100644 --- a/packages/@o3r/application/package.json +++ b/packages/@o3r/application/package.json @@ -25,7 +25,6 @@ "@angular/common": "~16.2.0", "@angular/core": "~16.2.0", "@o3r/core": "workspace:^", - "@o3r/dev-tools": "workspace:^", "@o3r/logger": "workspace:^", "@o3r/routing": "workspace:^", "@o3r/schematics": "workspace:^", @@ -68,7 +67,6 @@ "@nx/linter": "~16.10.0", "@o3r/build-helpers": "workspace:^", "@o3r/core": "workspace:^", - "@o3r/dev-tools": "workspace:^", "@o3r/eslint-plugin": "workspace:^", "@o3r/logger": "workspace:^", "@o3r/routing": "workspace:^", diff --git a/packages/@o3r/components/package.json b/packages/@o3r/components/package.json index a16b2c5a4a..4a64e92e6f 100644 --- a/packages/@o3r/components/package.json +++ b/packages/@o3r/components/package.json @@ -30,7 +30,6 @@ "@ngrx/store": "~16.3.0", "@o3r/configuration": "workspace:^", "@o3r/core": "workspace:^", - "@o3r/dev-tools": "workspace:^", "@o3r/extractors": "workspace:^", "@o3r/logger": "workspace:^", "@o3r/schematics": "workspace:^", @@ -95,7 +94,6 @@ "@o3r/build-helpers": "workspace:^", "@o3r/configuration": "workspace:^", "@o3r/core": "workspace:^", - "@o3r/dev-tools": "workspace:^", "@o3r/eslint-plugin": "workspace:^", "@o3r/extractors": "workspace:^", "@o3r/localization": "workspace:^", diff --git a/packages/@o3r/configuration/package.json b/packages/@o3r/configuration/package.json index 4195cc9adb..a694587b1b 100644 --- a/packages/@o3r/configuration/package.json +++ b/packages/@o3r/configuration/package.json @@ -34,7 +34,6 @@ "@ngrx/entity": "~16.3.0", "@ngrx/store": "~16.3.0", "@o3r/core": "workspace:^", - "@o3r/dev-tools": "workspace:^", "@o3r/logger": "workspace:^", "@o3r/schematics": "workspace:^", "@o3r/testing": "workspace:^", @@ -90,7 +89,6 @@ "@nx/linter": "~16.10.0", "@o3r/build-helpers": "workspace:^", "@o3r/core": "workspace:^", - "@o3r/dev-tools": "workspace:^", "@o3r/eslint-plugin": "workspace:^", "@o3r/logger": "workspace:^", "@o3r/schematics": "workspace:^", diff --git a/packages/@o3r/core/package.json b/packages/@o3r/core/package.json index 3f1a21b014..6b53e6e9db 100644 --- a/packages/@o3r/core/package.json +++ b/packages/@o3r/core/package.json @@ -20,7 +20,6 @@ "types": "./src/public_api.d.ts", "peerDependencies": { "@ama-sdk/core": "workspace:^", - "@ama-sdk/schematics": "workspace:^", "@angular-devkit/architect": "~0.1602.0", "@angular-devkit/core": "~16.2.0", "@angular-devkit/schematics": "~16.2.0", @@ -43,9 +42,6 @@ "typescript": "~5.1.6" }, "peerDependenciesMeta": { - "@ama-sdk/schematics": { - "optional": true - }, "@angular/cli": { "optional": true }, @@ -72,7 +68,6 @@ }, "devDependencies": { "@ama-sdk/core": "workspace:^", - "@ama-sdk/schematics": "workspace:^", "@angular-devkit/architect": "~0.1602.0", "@angular-devkit/build-angular": "~16.2.0", "@angular-devkit/core": "~16.2.0", @@ -97,7 +92,6 @@ "@nx/js": "~16.10.0", "@nx/linter": "~16.10.0", "@o3r/build-helpers": "workspace:^", - "@o3r/dev-tools": "workspace:^", "@o3r/eslint-plugin": "workspace:^", "@o3r/test-helpers": "workspace:^", "@schematics/angular": "~16.2.0", diff --git a/packages/@o3r/core/schematics/ng-add/index.ts b/packages/@o3r/core/schematics/ng-add/index.ts index 644b1ae194..5d7a7741da 100644 --- a/packages/@o3r/core/schematics/ng-add/index.ts +++ b/packages/@o3r/core/schematics/ng-add/index.ts @@ -16,7 +16,7 @@ import { prepareProject } from './project-setup/index'; export function ngAdd(options: NgAddSchematicsSchema): Rule { const corePackageJsonContent = JSON.parse(fs.readFileSync(path.resolve(__dirname, '..', '..', 'package.json'), {encoding: 'utf-8'})) as PackageJson; const o3rCoreVersion = corePackageJsonContent.version ? `@${corePackageJsonContent.version}` : ''; - const schematicsDependencies = ['@o3r/dev-tools', '@o3r/schematics']; + const schematicsDependencies = ['@o3r/schematics']; return async (tree: Tree, context: SchematicContext): Promise => { // check if the workspace package is installed, if not installed and we are in workspace context, we install diff --git a/packages/@o3r/core/schematics/rule-factories/o3r-basic-updates/index.ts b/packages/@o3r/core/schematics/rule-factories/o3r-basic-updates/index.ts index 17e4ed30e4..ec4d08a7a1 100644 --- a/packages/@o3r/core/schematics/rule-factories/o3r-basic-updates/index.ts +++ b/packages/@o3r/core/schematics/rule-factories/o3r-basic-updates/index.ts @@ -5,8 +5,6 @@ import type { PackageJson } from 'type-fest'; /** * Package.json updates to include o3r ng update script - * Install of dev-tools and schematics packages - * * @param pName project name * @param o3rCoreVersion * @param _o3rCoreVersion diff --git a/packages/@o3r/create/package.json b/packages/@o3r/create/package.json index ce4aa2a6ea..63b399b561 100644 --- a/packages/@o3r/create/package.json +++ b/packages/@o3r/create/package.json @@ -27,7 +27,6 @@ "@nx/js": "~16.10.0", "@nx/linter": "~16.10.0", "@o3r/build-helpers": "workspace:^", - "@o3r/dev-tools": "workspace:^", "@o3r/eslint-config-otter": "workspace:^", "@o3r/eslint-plugin": "workspace:^", "@types/jest": "~29.5.2", diff --git a/packages/@o3r/dev-tools/package.json b/packages/@o3r/dev-tools/package.json index 2982cea834..28c1ac20ae 100644 --- a/packages/@o3r/dev-tools/package.json +++ b/packages/@o3r/dev-tools/package.json @@ -34,6 +34,7 @@ "dependencies": { "@o3r/artifactory-tools": "workspace:^", "@o3r/azure-tools": "workspace:^", + "@o3r/workspace": "workspace:^", "@types/request-promise-native": "^1.0.18", "azure-devops-node-api": "^12.0.0", "chalk": "^4.1.2", diff --git a/packages/@o3r/dev-tools/src/utils/check-peer-deps.ts b/packages/@o3r/dev-tools/src/utils/check-peer-deps.ts index 738ebb846f..98b1e9d6b5 100644 --- a/packages/@o3r/dev-tools/src/utils/check-peer-deps.ts +++ b/packages/@o3r/dev-tools/src/utils/check-peer-deps.ts @@ -4,7 +4,7 @@ import { satisfies } from 'semver'; /** * Interface containing a npm package name, needed version and optionally found version - * @deprecated will be removed in Otter v12. + * @deprecated You can use the one exposed in `@o3r/schematics`, will be removed in Otter v12. */ export interface PackageVersion { /** Npm package name */ @@ -18,7 +18,7 @@ export interface PackageVersion { /** * Check if the first level of peer deps of a given package are installed. * List all not installed packages or packages with version mismatch - * @deprecated will be removed in Otter v12. + * @deprecated You can use the one exposed in `@o3r/schematics`, will be removed in Otter v12. * @param packageName */ export function getPackagesToInstallOrUpdate(packageName: string) { diff --git a/packages/@o3r/dev-tools/src/utils/is-package-installed.ts b/packages/@o3r/dev-tools/src/utils/is-package-installed.ts index ff2d641345..0e91599188 100644 --- a/packages/@o3r/dev-tools/src/utils/is-package-installed.ts +++ b/packages/@o3r/dev-tools/src/utils/is-package-installed.ts @@ -1,8 +1,7 @@ /** * Check if an npm package is installed - * * @param packageName The package to check - * @deprecated will be removed in Otter v12. + * @deprecated You can use the one exposed in `@o3r/schematics`, will be removed in Otter v12. */ export function isPackageInstalled(packageName: string) { try { diff --git a/packages/@o3r/dev-tools/src/utils/jest.helpers.ts b/packages/@o3r/dev-tools/src/utils/jest.helpers.ts index 9c1ea1773d..b158d79cba 100644 --- a/packages/@o3r/dev-tools/src/utils/jest.helpers.ts +++ b/packages/@o3r/dev-tools/src/utils/jest.helpers.ts @@ -1,27 +1,17 @@ import { sync as globbySync } from 'globby'; import { existsSync } from 'node:fs'; -import { dirname, normalize, posix, relative, resolve } from 'node:path'; +import { dirname, normalize, relative, resolve } from 'node:path'; +import { getJestProjects as workspaceGetJestProjects } from '@o3r/workspace'; /** * Get the list of Jest Projects in the workspace - * + * @deprecated Please use the one exposed in `@o3r/workspace`, will be removed in Otter v12. * @param rootPackageJson Path to the root package.json * @param rootDir * @param jestConfigPattern Pattern to the jest config files * @returns list of Jest projects */ -export const getJestProjects = (rootDir = process.cwd(), jestConfigPattern = 'jest.config.{j,t}s') => { - const rootPackageJson = resolve(rootDir, 'package.json'); - if (!existsSync(rootPackageJson)) { - console.warn(`No package.json found in ${rootDir}`); - return []; - } - const jestConfigPatterns: string[] | undefined = require(rootPackageJson).workspaces?.map((packagePath: string) => posix.join(packagePath, jestConfigPattern)); - const jestConfigFileLists = jestConfigPatterns?.map((pattern) => globbySync(pattern, { cwd: rootDir })); - return jestConfigFileLists - ?.flat() - .map((jestConfigFile) => posix.join('', jestConfigFile.replace(/jest\.config\.[jt]s$/, '')).replace(/\\+/g, '/')); -}; +export const getJestProjects = workspaceGetJestProjects; /** * Find the closest package.json file containing workspace definition in the parent directories diff --git a/packages/@o3r/dev-tools/src/utils/string.ts b/packages/@o3r/dev-tools/src/utils/string.ts index 3cb3b9495b..3c5faa71cb 100644 --- a/packages/@o3r/dev-tools/src/utils/string.ts +++ b/packages/@o3r/dev-tools/src/utils/string.ts @@ -1,7 +1,6 @@ /** * Specific padding for number - * @deprecated will be removed in Otter v12. - * + * @deprecated You can use the one exposed in `@ama-sdk/core`, will be removed in Otter v12. * @param val * @param digits */ diff --git a/packages/@o3r/dynamic-content/package.json b/packages/@o3r/dynamic-content/package.json index f56cb2fd40..ff6b3aa938 100644 --- a/packages/@o3r/dynamic-content/package.json +++ b/packages/@o3r/dynamic-content/package.json @@ -32,7 +32,6 @@ "@angular/platform-browser-dynamic": "~16.2.0", "@ngrx/store": "~16.3.0", "@o3r/core": "workspace:^", - "@o3r/dev-tools": "workspace:^", "@o3r/schematics": "workspace:^", "cheerio": "^1.0.0-rc.10", "express-interceptor": "^1.2.0", @@ -78,7 +77,6 @@ "@nx/linter": "~16.10.0", "@o3r/build-helpers": "workspace:^", "@o3r/core": "workspace:^", - "@o3r/dev-tools": "workspace:^", "@o3r/eslint-config-otter": "workspace:^", "@o3r/eslint-plugin": "workspace:^", "@o3r/schematics": "workspace:^", diff --git a/packages/@o3r/extractors/package.json b/packages/@o3r/extractors/package.json index c4be52b7de..a207581253 100644 --- a/packages/@o3r/extractors/package.json +++ b/packages/@o3r/extractors/package.json @@ -54,7 +54,6 @@ "@nx/linter": "~16.10.0", "@o3r/build-helpers": "workspace:^", "@o3r/core": "workspace:^", - "@o3r/dev-tools": "workspace:^", "@o3r/eslint-config-otter": "workspace:^", "@o3r/eslint-plugin": "workspace:^", "@o3r/schematics": "workspace:^", diff --git a/packages/@o3r/forms/package.json b/packages/@o3r/forms/package.json index 5f06e5592d..be05f6d7ad 100644 --- a/packages/@o3r/forms/package.json +++ b/packages/@o3r/forms/package.json @@ -23,7 +23,6 @@ "@ngrx/entity": "~16.3.0", "@ngrx/store": "~16.3.0", "@o3r/core": "workspace:^", - "@o3r/dev-tools": "workspace:^", "@o3r/schematics": "workspace:^", "rxjs": "^7.8.1" }, @@ -59,7 +58,6 @@ "@nx/linter": "~16.10.0", "@o3r/build-helpers": "workspace:^", "@o3r/core": "workspace:^", - "@o3r/dev-tools": "workspace:^", "@o3r/eslint-config-otter": "workspace:^", "@o3r/eslint-plugin": "workspace:^", "@o3r/schematics": "workspace:^", diff --git a/packages/@o3r/localization/package.json b/packages/@o3r/localization/package.json index 2771908226..4bc4195a71 100644 --- a/packages/@o3r/localization/package.json +++ b/packages/@o3r/localization/package.json @@ -94,7 +94,6 @@ "@nx/linter": "~16.10.0", "@o3r/build-helpers": "workspace:^", "@o3r/core": "workspace:^", - "@o3r/dev-tools": "workspace:^", "@o3r/dynamic-content": "workspace:^", "@o3r/eslint-config-otter": "workspace:^", "@o3r/eslint-plugin": "workspace:^", diff --git a/packages/@o3r/logger/package.json b/packages/@o3r/logger/package.json index 69f661e3c0..8b78ba959b 100644 --- a/packages/@o3r/logger/package.json +++ b/packages/@o3r/logger/package.json @@ -70,7 +70,6 @@ "@nx/linter": "~16.10.0", "@o3r/build-helpers": "workspace:^", "@o3r/core": "workspace:^", - "@o3r/dev-tools": "workspace:^", "@o3r/eslint-config-otter": "workspace:^", "@o3r/eslint-plugin": "workspace:^", "@o3r/schematics": "workspace:^", diff --git a/packages/@o3r/mobile/package.json b/packages/@o3r/mobile/package.json index e27b2fe07f..a6706ae7a2 100644 --- a/packages/@o3r/mobile/package.json +++ b/packages/@o3r/mobile/package.json @@ -84,7 +84,6 @@ "@nx/linter": "~16.10.0", "@o3r/build-helpers": "workspace:^", "@o3r/core": "workspace:^", - "@o3r/dev-tools": "workspace:^", "@o3r/eslint-plugin": "workspace:^", "@o3r/logger": "workspace:^", "@o3r/schematics": "workspace:^", diff --git a/packages/@o3r/routing/package.json b/packages/@o3r/routing/package.json index 32bbf39ee0..e66dfcacd9 100644 --- a/packages/@o3r/routing/package.json +++ b/packages/@o3r/routing/package.json @@ -29,7 +29,6 @@ "@ngrx/router-store": "~16.3.0", "@ngrx/store": "~16.3.0", "@o3r/core": "workspace:^", - "@o3r/dev-tools": "workspace:^", "@o3r/routing": "workspace:^", "@o3r/schematics": "workspace:^", "jasmine": "^5.0.0", @@ -71,7 +70,6 @@ "@nx/linter": "~16.10.0", "@o3r/build-helpers": "workspace:^", "@o3r/core": "workspace:^", - "@o3r/dev-tools": "workspace:^", "@o3r/eslint-config-otter": "workspace:^", "@o3r/eslint-plugin": "workspace:^", "@o3r/routing": "workspace:^", diff --git a/packages/@o3r/rules-engine/package.json b/packages/@o3r/rules-engine/package.json index 14e4981cea..da4d76de45 100644 --- a/packages/@o3r/rules-engine/package.json +++ b/packages/@o3r/rules-engine/package.json @@ -34,7 +34,6 @@ "@o3r/components": "workspace:^", "@o3r/configuration": "workspace:^", "@o3r/core": "workspace:^", - "@o3r/dev-tools": "workspace:^", "@o3r/dynamic-content": "workspace:^", "@o3r/extractors": "workspace:^", "@o3r/localization": "workspace:^", @@ -107,7 +106,6 @@ "@o3r/components": "workspace:^", "@o3r/configuration": "workspace:^", "@o3r/core": "workspace:^", - "@o3r/dev-tools": "workspace:^", "@o3r/dynamic-content": "workspace:^", "@o3r/eslint-config-otter": "workspace:^", "@o3r/eslint-plugin": "workspace:^", diff --git a/packages/@o3r/schematics/package.json b/packages/@o3r/schematics/package.json index 9116d6882e..0d0716f506 100644 --- a/packages/@o3r/schematics/package.json +++ b/packages/@o3r/schematics/package.json @@ -64,7 +64,6 @@ "@nx/js": "~16.10.0", "@nx/linter": "~16.10.0", "@o3r/build-helpers": "workspace:^", - "@o3r/dev-tools": "workspace:^", "@o3r/eslint-plugin": "workspace:^", "@schematics/angular": "~16.2.0", "@types/jest": "~29.5.2", diff --git a/packages/@o3r/schematics/src/utility/matching-peers.ts b/packages/@o3r/schematics/src/utility/matching-peers.ts index 1c4763c8a1..ea4a11b108 100644 --- a/packages/@o3r/schematics/src/utility/matching-peers.ts +++ b/packages/@o3r/schematics/src/utility/matching-peers.ts @@ -21,11 +21,18 @@ export function getPeerDepWithPattern(packageJsonPath: string, pattern = /^@(ott return { packageName, packageVersion, matchingPackages }; } +const basicsPackageName = new Set([ + '@o3r/core', + '@o3r/schematics', + '@o3r/dev-tools', + '@o3r/workspace' +]); + /** * Get the list of o3r peer deps from a given package.json file * * @param packageJsonPath The package json on which we search for o3r peer deps - * @param filterBasics If activated it will remove the basic peer deps (o3r/core, o3r/dev-tools and o3r/schematics) from the list of results + * @param filterBasics If activated it will remove the basic peer deps (o3r/core, o3r/dev-tools, o3r/workspace and o3r/schematics) from the list of results * @param packagePattern Pattern of the package name to look in the packages peer dependencies. */ export function getO3rPeerDeps(packageJsonPath: string, filterBasics = true, packagePattern = /^@(?:o3r|ama-sdk)/) { @@ -34,7 +41,7 @@ export function getO3rPeerDeps(packageJsonPath: string, filterBasics = true, pac packageName: depsInfo.packageName, packageVersion: depsInfo.packageVersion, o3rPeerDeps: filterBasics ? - depsInfo.matchingPackages.filter(peerDep => peerDep !== '@o3r/core' && peerDep !== '@o3r/schematics' && peerDep !== '@o3r/dev-tools') + depsInfo.matchingPackages.filter((peerDep) => !basicsPackageName.has(peerDep)) : depsInfo.matchingPackages }; diff --git a/packages/@o3r/store-sync/package.json b/packages/@o3r/store-sync/package.json index 81faf11c58..a601a7ac9e 100644 --- a/packages/@o3r/store-sync/package.json +++ b/packages/@o3r/store-sync/package.json @@ -24,7 +24,6 @@ "@ngrx/entity": "~16.3.0", "@ngrx/store": "~16.3.0", "@o3r/core": "workspace:^", - "@o3r/dev-tools": "workspace:^", "@o3r/logger": "workspace:^", "@o3r/schematics": "workspace:^", "fast-deep-equal": "^3.1.3", @@ -62,7 +61,6 @@ "@nx/linter": "~16.10.0", "@o3r/build-helpers": "workspace:^", "@o3r/core": "workspace:^", - "@o3r/dev-tools": "workspace:^", "@o3r/eslint-config-otter": "workspace:^", "@o3r/eslint-plugin": "workspace:^", "@o3r/logger": "workspace:^", diff --git a/packages/@o3r/storybook/package.json b/packages/@o3r/storybook/package.json index f58054e9af..30665d6f1a 100644 --- a/packages/@o3r/storybook/package.json +++ b/packages/@o3r/storybook/package.json @@ -93,7 +93,6 @@ "@o3r/components": "workspace:^", "@o3r/configuration": "workspace:^", "@o3r/core": "workspace:^", - "@o3r/dev-tools": "workspace:^", "@o3r/eslint-config-otter": "workspace:^", "@o3r/eslint-plugin": "workspace:^", "@o3r/localization": "workspace:^", diff --git a/packages/@o3r/styling/package.json b/packages/@o3r/styling/package.json index 48bbe4f010..bd59341298 100644 --- a/packages/@o3r/styling/package.json +++ b/packages/@o3r/styling/package.json @@ -99,7 +99,6 @@ "@nx/linter": "~16.10.0", "@o3r/build-helpers": "workspace:^", "@o3r/core": "workspace:^", - "@o3r/dev-tools": "workspace:^", "@o3r/dynamic-content": "workspace:^", "@o3r/eslint-config-otter": "workspace:^", "@o3r/eslint-plugin": "workspace:^", diff --git a/packages/@o3r/test-helpers/package.json b/packages/@o3r/test-helpers/package.json index b61c4c2f3c..5b5320f5c3 100644 --- a/packages/@o3r/test-helpers/package.json +++ b/packages/@o3r/test-helpers/package.json @@ -24,7 +24,6 @@ "@angular-devkit/schematics": "~16.2.0", "@angular-eslint/eslint-plugin": "~16.2.0", "@nx/eslint-plugin": "~16.10.0", - "@o3r/dev-tools": "workspace:^", "@o3r/eslint-plugin": "workspace:^", "@o3r/schematics": "workspace:^", "@schematics/angular": "~16.2.0", diff --git a/packages/@o3r/testing/package.json b/packages/@o3r/testing/package.json index 6ba0cbad91..6904af4da7 100644 --- a/packages/@o3r/testing/package.json +++ b/packages/@o3r/testing/package.json @@ -180,7 +180,6 @@ "@nx/jest": "~16.10.0", "@o3r/build-helpers": "workspace:^", "@o3r/core": "workspace:^", - "@o3r/dev-tools": "workspace:^", "@o3r/eslint-plugin": "workspace:^", "@o3r/localization": "workspace:^", "@o3r/schematics": "workspace:^", diff --git a/packages/@o3r/testing/schematics/ng-add/templates/workspace/jest.config.js.template b/packages/@o3r/testing/schematics/ng-add/templates/workspace/jest.config.js.template index 08042b5c1f..ebd914fe09 100644 --- a/packages/@o3r/testing/schematics/ng-add/templates/workspace/jest.config.js.template +++ b/packages/@o3r/testing/schematics/ng-add/templates/workspace/jest.config.js.template @@ -1,4 +1,4 @@ -const { getJestProjects } = require('@o3r/dev-tools'); +const { getJestProjects } = require('@o3r/workspace'); /** @type {import('ts-jest/dist/types').JestConfigWithTsJest} */ module.exports = { diff --git a/packages/@o3r/third-party/package.json b/packages/@o3r/third-party/package.json index e446b3bf50..9b129b3f9f 100644 --- a/packages/@o3r/third-party/package.json +++ b/packages/@o3r/third-party/package.json @@ -56,7 +56,6 @@ "@nx/jest": "~16.10.0", "@o3r/build-helpers": "workspace:^", "@o3r/core": "workspace:^", - "@o3r/dev-tools": "workspace:^", "@o3r/eslint-config-otter": "workspace:^", "@o3r/eslint-plugin": "workspace:^", "@o3r/schematics": "workspace:^", diff --git a/packages/@o3r/workspace/README.md b/packages/@o3r/workspace/README.md index 7a22997fe7..96a6bc2b95 100644 --- a/packages/@o3r/workspace/README.md +++ b/packages/@o3r/workspace/README.md @@ -29,7 +29,7 @@ This packages exposes the following Command Line Interfaces: Replaces the value of the `version` field of the `JSON` files matched by the pattern provided to the `--include` options. ```shell -Usage: set-version [options] +Usage: o3r-set-version [options] Replace the packages version in a monorepos diff --git a/packages/@o3r/workspace/package.json b/packages/@o3r/workspace/package.json index b07d8bb114..3b2d54877d 100644 --- a/packages/@o3r/workspace/package.json +++ b/packages/@o3r/workspace/package.json @@ -44,7 +44,6 @@ "winston": "^3.8.2" }, "devDependencies": { - "@ama-sdk/schematics": "workspace:^", "@angular-devkit/architect": "~0.1602.0", "@angular-devkit/build-angular": "~16.2.0", "@angular-devkit/core": "~16.2.0", @@ -68,7 +67,6 @@ "@nx/linter": "~16.10.0", "@o3r/build-helpers": "workspace:^", "@o3r/core": "workspace:^", - "@o3r/dev-tools": "workspace:^", "@o3r/eslint-plugin": "workspace:^", "@o3r/schematics": "workspace:^", "@o3r/test-helpers": "workspace:^", diff --git a/packages/@o3r/workspace/schematics/library/rules/shared.ts b/packages/@o3r/workspace/schematics/library/rules/shared.ts index 6c06116fb2..a2060d8734 100644 --- a/packages/@o3r/workspace/schematics/library/rules/shared.ts +++ b/packages/@o3r/workspace/schematics/library/rules/shared.ts @@ -26,7 +26,6 @@ export function updatePackageDependenciesFactory( packageJson.scripts['prepare:build:builders'] = `${runner} cpy 'collection.json' dist && ${runner} cpy 'schematics/**/*.json' dist/schematics`; packageJson.scripts['build:builders'] = 'tsc -b tsconfig.builders.json --pretty'; packageJson.peerDependencies ||= {}; - packageJson.peerDependencies['@o3r/dev-tools'] = otterVersion; packageJson.peerDependencies['@o3r/core'] = otterVersion; packageJson.peerDependencies['@o3r/schematics'] = otterVersion; packageJson.devDependencies ||= {}; @@ -47,7 +46,6 @@ export function updatePackageDependenciesFactory( '@angular/platform-browser': packageJson.peerDependencies['@angular/common'], '@angular/platform-browser-dynamic': packageJson.peerDependencies['@angular/common'], '@o3r/core': otterVersion, - '@o3r/dev-tools': otterVersion, '@o3r/eslint-plugin': otterVersion, '@schematics/angular': o3rCorePackageJson.peerDependencies!['@schematics/angular'], '@types/jest': o3rCorePackageJson.generatorDependencies!['@types/jest'], diff --git a/packages/@o3r/workspace/schematics/sdk/index.ts b/packages/@o3r/workspace/schematics/sdk/index.ts index 184ee300d9..ee22557b50 100644 --- a/packages/@o3r/workspace/schematics/sdk/index.ts +++ b/packages/@o3r/workspace/schematics/sdk/index.ts @@ -2,7 +2,6 @@ import { apply, chain, externalSchematic, MergeStrategy, mergeWith, move, noop, import * as path from 'node:path'; import { getPackageManager, getPackagesBaseRootFolder, getWorkspaceConfig, isNxContext, O3rCliError } from '@o3r/schematics'; import { NgGenerateSdkSchema } from './schema'; -import type { NgGenerateTypescriptSDKCoreSchematicsSchema, NgGenerateTypescriptSDKShellSchematicsSchema } from '@ama-sdk/schematics'; import { ngRegisterProjectTasks } from './rules/rules.ng'; import { nxRegisterProjectTasks } from './rules/rules.nx'; import { updateTsConfig } from './rules/update-ts-paths.rule'; @@ -44,7 +43,7 @@ export function generateSdk(options: NgGenerateSdkSchema): Rule { const yarnrcBeforeSdkGeneration = tree.exists(yarnrcPath) ? tree.readText(yarnrcPath) : ''; return chain([ - externalSchematic('@ama-sdk/schematics', 'typescript-shell', { + externalSchematic('@ama-sdk/schematics', 'typescript-shell', { ...options, package: projectName, name: scope, @@ -68,7 +67,7 @@ export function generateSdk(options: NgGenerateSdkSchema): Rule { addModuleSpecificFiles(), options.specPath ? (_host: Tree, c: SchematicContext) => { const installTaskId = c.addTask(new NodePackageInstallTask()); - c.addTask(new RunSchematicTask>('@ama-sdk/schematics', 'typescript-core', { + c.addTask(new RunSchematicTask('@ama-sdk/schematics', 'typescript-core', { ...options, specPath: options.specPath, directory: targetPath, diff --git a/packages/@o3r/workspace/src/public_api.ts b/packages/@o3r/workspace/src/public_api.ts index e4ea7770cb..c6cc604478 100644 --- a/packages/@o3r/workspace/src/public_api.ts +++ b/packages/@o3r/workspace/src/public_api.ts @@ -1 +1 @@ -export type {}; +export * from './utils/index'; diff --git a/packages/@o3r/workspace/src/utils/index.ts b/packages/@o3r/workspace/src/utils/index.ts new file mode 100644 index 0000000000..db3d5b6400 --- /dev/null +++ b/packages/@o3r/workspace/src/utils/index.ts @@ -0,0 +1 @@ +export * from './jest.helpers'; diff --git a/packages/@o3r/workspace/src/utils/jest.helpers.ts b/packages/@o3r/workspace/src/utils/jest.helpers.ts new file mode 100644 index 0000000000..20184ab13f --- /dev/null +++ b/packages/@o3r/workspace/src/utils/jest.helpers.ts @@ -0,0 +1,23 @@ +import { sync as globbySync } from 'globby'; +import { existsSync } from 'node:fs'; +import { posix, resolve } from 'node:path'; + +/** + * Get the list of Jest Projects in the workspace + * @param rootPackageJson Path to the root package.json + * @param rootDir + * @param jestConfigPattern Pattern to the jest config files + * @returns list of Jest projects + */ +export const getJestProjects = (rootDir = process.cwd(), jestConfigPattern = 'jest.config.{j,t}s') => { + const rootPackageJson = resolve(rootDir, 'package.json'); + if (!existsSync(rootPackageJson)) { + console.warn(`No package.json found in ${rootDir}`); + return []; + } + const jestConfigPatterns: string[] | undefined = require(rootPackageJson).workspaces?.map((packagePath: string) => posix.join(packagePath, jestConfigPattern)); + const jestConfigFileLists = jestConfigPatterns?.map((pattern) => globbySync(pattern, { cwd: rootDir })); + return jestConfigFileLists + ?.flat() + .map((jestConfigFile) => posix.join('', jestConfigFile.replace(/jest\.config\.[jt]s$/, '')).replace(/\\+/g, '/')); +}; diff --git a/tools/github-actions/cascading/package.json b/tools/github-actions/cascading/package.json index 34754ebc49..00e5bef520 100644 --- a/tools/github-actions/cascading/package.json +++ b/tools/github-actions/cascading/package.json @@ -22,7 +22,6 @@ "devDependencies": { "@angular-eslint/eslint-plugin": "~16.2.0", "@nx/eslint-plugin": "~16.10.0", - "@o3r/dev-tools": "workspace:^", "@o3r/eslint-config-otter": "workspace:~", "@o3r/eslint-plugin": "workspace:~", "@types/jest": "~29.5.2", diff --git a/tools/github-actions/new-version/package.json b/tools/github-actions/new-version/package.json index 550cdbb0c0..45763bad5e 100644 --- a/tools/github-actions/new-version/package.json +++ b/tools/github-actions/new-version/package.json @@ -23,7 +23,6 @@ "devDependencies": { "@angular-eslint/eslint-plugin": "~16.2.0", "@nx/eslint-plugin": "~16.10.0", - "@o3r/dev-tools": "workspace:^", "@o3r/eslint-config-otter": "workspace:~", "@o3r/eslint-plugin": "workspace:~", "@types/jest": "~29.5.2", diff --git a/tsconfig.base.json b/tsconfig.base.json index 1508b9ef40..bc04f98eae 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -98,9 +98,6 @@ "@o3r/core": [ "packages/@o3r/core/src/public_api" ], - "@o3r/dev-tools": [ - "packages/@o3r/dev-tools/src/public_api" - ], "@o3r/dynamic-content": [ "packages/@o3r/dynamic-content/src/public_api" ], diff --git a/tsconfig.build.json b/tsconfig.build.json index ecebe0549f..9c30bcb4a0 100644 --- a/tsconfig.build.json +++ b/tsconfig.build.json @@ -24,7 +24,6 @@ "@o3r/components": ["packages/@o3r/components/dist", "packages/@o3r/components/src/public_api"], "@o3r/configuration": ["packages/@o3r/configuration/dist", "packages/@o3r/configuration/src/public_api"], "@o3r/core": ["packages/@o3r/core/dist", "packages/@o3r/core/src/public_api"], - "@o3r/dev-tools": ["packages/@o3r/dev-tools/dist", "packages/@o3r/dev-tools/src/public_api"], "@o3r/dynamic-content": ["packages/@o3r/dynamic-content/dist", "packages/@o3r/dynamic-content/src/public_api"], "@o3r/eslint-config-otter": ["packages/@o3r/eslint-config-otter"], "@o3r/eslint-plugin": ["packages/@o3r/eslint-plugin/dist", "packages/@o3r/eslint-plugin/src/public_api"], diff --git a/yarn.lock b/yarn.lock index 5f00d41509..a90974017b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -78,7 +78,6 @@ __metadata: "@nx/eslint-plugin": ~16.10.0 "@nx/jest": ~16.10.0 "@o3r/build-helpers": "workspace:^" - "@o3r/dev-tools": "workspace:^" "@o3r/eslint-plugin": "workspace:^" "@schematics/angular": ~16.2.0 "@swc/cli": ^0.1.57 @@ -146,8 +145,8 @@ __metadata: typescript: optional: true bin: - amasdk-clear-index: ./cli/clear-index.cjs - amasdk-files-pack: ./cli/files-pack.cjs + amasdk-clear-index: ./dist/cli/clear-index.cjs + amasdk-files-pack: ./dist/cli/files-pack.cjs languageName: unknown linkType: soft @@ -167,7 +166,6 @@ __metadata: "@nx/js": ~16.10.0 "@nx/linter": ~16.10.0 "@o3r/build-helpers": "workspace:^" - "@o3r/dev-tools": "workspace:^" "@o3r/eslint-config-otter": "workspace:^" "@o3r/eslint-plugin": "workspace:^" "@o3r/test-helpers": "workspace:^" @@ -295,7 +293,6 @@ __metadata: "@commitlint/config-conventional": ^17.0.0 "@nx/eslint-plugin": ~16.10.0 "@nx/jest": ~16.10.0 - "@o3r/dev-tools": "workspace:^" "@o3r/eslint-config-otter": "workspace:^" "@o3r/eslint-plugin": "workspace:^" "@openapitools/openapi-generator-cli": ~2.7.0 @@ -401,7 +398,6 @@ __metadata: "@o3r/amaterasu-otter": "workspace:^" "@o3r/amaterasu-sdk": "workspace:^" "@o3r/build-helpers": "workspace:^" - "@o3r/dev-tools": "workspace:^" "@o3r/eslint-plugin": "workspace:^" "@o3r/schematics": "workspace:^" "@types/jest": ~29.5.2 @@ -464,7 +460,6 @@ __metadata: "@nx/eslint-plugin": ~16.10.0 "@nx/jest": ~16.10.0 "@o3r/build-helpers": "workspace:^" - "@o3r/dev-tools": "workspace:^" "@o3r/eslint-plugin": "workspace:^" "@types/jest": ~29.5.2 "@types/minimist": ^1.2.2 @@ -504,7 +499,6 @@ __metadata: "@nx/eslint-plugin": ~16.10.0 "@nx/jest": ~16.10.0 "@o3r/build-helpers": "workspace:^" - "@o3r/dev-tools": "workspace:^" "@o3r/eslint-plugin": "workspace:^" "@o3r/schematics": "workspace:^" "@types/jest": ~29.5.2 @@ -6284,7 +6278,6 @@ __metadata: "@nx/eslint-plugin": ~16.10.0 "@nx/jest": ~16.10.0 "@o3r/build-helpers": "workspace:^" - "@o3r/dev-tools": "workspace:^" "@o3r/eslint-plugin": "workspace:^" "@types/jest": ~29.5.2 "@types/js-yaml": ^4.0.5 @@ -6319,7 +6312,6 @@ __metadata: "@nx/eslint-plugin": ~16.10.0 "@nx/jest": ~16.10.0 "@o3r/build-helpers": "workspace:^" - "@o3r/dev-tools": "workspace:^" "@o3r/eslint-plugin": "workspace:^" "@types/jest": ~29.5.2 "@types/node": ^18.0.0 @@ -6357,7 +6349,6 @@ __metadata: "@nx/eslint-plugin": ~16.10.0 "@nx/jest": ~16.10.0 "@o3r/build-helpers": "workspace:^" - "@o3r/dev-tools": "workspace:^" "@o3r/eslint-plugin": "workspace:^" "@types/jest": ~29.5.2 "@types/js-yaml": ^4.0.5 @@ -6396,7 +6387,6 @@ __metadata: "@nx/eslint-plugin": ~16.10.0 "@nx/jest": ~16.10.0 "@o3r/build-helpers": "workspace:^" - "@o3r/dev-tools": "workspace:^" "@o3r/eslint-plugin": "workspace:^" "@types/jest": ~29.5.2 "@types/js-yaml": ^4.0.5 @@ -6448,7 +6438,6 @@ __metadata: "@nx/linter": ~16.10.0 "@o3r/build-helpers": "workspace:^" "@o3r/core": "workspace:^" - "@o3r/dev-tools": "workspace:^" "@o3r/eslint-plugin": "workspace:^" "@o3r/test-helpers": "workspace:^" "@schematics/angular": ~16.2.0 @@ -6487,7 +6476,6 @@ __metadata: "@angular/router": ~16.2.0 "@ngrx/store": ~16.3.0 "@o3r/core": "workspace:^" - "@o3r/dev-tools": "workspace:^" "@o3r/schematics": "workspace:^" "@schematics/angular": ~16.2.0 jasmine: ^5.0.0 @@ -6528,7 +6516,6 @@ __metadata: "@nx/js": ~16.10.0 "@nx/linter": ~16.10.0 "@o3r/build-helpers": "workspace:^" - "@o3r/dev-tools": "workspace:^" "@o3r/eslint-plugin": "workspace:^" "@o3r/schematics": "workspace:^" "@o3r/test-helpers": "workspace:^" @@ -6562,7 +6549,6 @@ __metadata: "@angular-devkit/schematics": ~16.2.0 "@angular/common": ~16.2.0 "@angular/core": ~16.2.0 - "@o3r/dev-tools": "workspace:^" "@o3r/schematics": "workspace:^" "@schematics/angular": ~16.2.0 rxjs: ^7.8.1 @@ -6600,7 +6586,6 @@ __metadata: "@nx/linter": ~16.10.0 "@o3r/build-helpers": "workspace:^" "@o3r/core": "workspace:^" - "@o3r/dev-tools": "workspace:^" "@o3r/eslint-plugin": "workspace:^" "@o3r/logger": "workspace:^" "@o3r/routing": "workspace:^" @@ -6633,7 +6618,6 @@ __metadata: "@angular/common": ~16.2.0 "@angular/core": ~16.2.0 "@o3r/core": "workspace:^" - "@o3r/dev-tools": "workspace:^" "@o3r/logger": "workspace:^" "@o3r/routing": "workspace:^" "@o3r/schematics": "workspace:^" @@ -6805,7 +6789,6 @@ __metadata: "@o3r/components": "workspace:^" "@o3r/configuration": "workspace:^" "@o3r/core": "workspace:^" - "@o3r/dev-tools": "workspace:^" "@o3r/eslint-config-otter": "workspace:^" "@o3r/eslint-plugin": "workspace:^" "@o3r/localization": "workspace:^" @@ -6874,7 +6857,6 @@ __metadata: "@o3r/build-helpers": "workspace:^" "@o3r/configuration": "workspace:^" "@o3r/core": "workspace:^" - "@o3r/dev-tools": "workspace:^" "@o3r/eslint-plugin": "workspace:^" "@o3r/extractors": "workspace:^" "@o3r/localization": "workspace:^" @@ -6922,7 +6904,6 @@ __metadata: "@ngrx/store": ~16.3.0 "@o3r/configuration": "workspace:^" "@o3r/core": "workspace:^" - "@o3r/dev-tools": "workspace:^" "@o3r/extractors": "workspace:^" "@o3r/logger": "workspace:^" "@o3r/schematics": "workspace:^" @@ -6977,7 +6958,6 @@ __metadata: "@nx/linter": ~16.10.0 "@o3r/build-helpers": "workspace:^" "@o3r/core": "workspace:^" - "@o3r/dev-tools": "workspace:^" "@o3r/eslint-plugin": "workspace:^" "@o3r/logger": "workspace:^" "@o3r/schematics": "workspace:^" @@ -7016,7 +6996,6 @@ __metadata: "@ngrx/entity": ~16.3.0 "@ngrx/store": ~16.3.0 "@o3r/core": "workspace:^" - "@o3r/dev-tools": "workspace:^" "@o3r/logger": "workspace:^" "@o3r/schematics": "workspace:^" "@o3r/testing": "workspace:^" @@ -7047,7 +7026,6 @@ __metadata: resolution: "@o3r/core@workspace:packages/@o3r/core" dependencies: "@ama-sdk/core": "workspace:^" - "@ama-sdk/schematics": "workspace:^" "@angular-devkit/architect": ~0.1602.0 "@angular-devkit/build-angular": ~16.2.0 "@angular-devkit/core": ~16.2.0 @@ -7072,7 +7050,6 @@ __metadata: "@nx/js": ~16.10.0 "@nx/linter": ~16.10.0 "@o3r/build-helpers": "workspace:^" - "@o3r/dev-tools": "workspace:^" "@o3r/eslint-plugin": "workspace:^" "@o3r/schematics": "workspace:^" "@o3r/test-helpers": "workspace:^" @@ -7113,7 +7090,6 @@ __metadata: zone.js: ~0.13.1 peerDependencies: "@ama-sdk/core": "workspace:^" - "@ama-sdk/schematics": "workspace:^" "@angular-devkit/architect": ~0.1602.0 "@angular-devkit/core": ~16.2.0 "@angular-devkit/schematics": ~16.2.0 @@ -7135,8 +7111,6 @@ __metadata: semver: ^7.5.2 typescript: ~5.1.6 peerDependenciesMeta: - "@ama-sdk/schematics": - optional: true "@angular/cli": optional: true "@nrwl/devkit": @@ -7164,7 +7138,6 @@ __metadata: "@nx/js": ~16.10.0 "@nx/linter": ~16.10.0 "@o3r/build-helpers": "workspace:^" - "@o3r/dev-tools": "workspace:^" "@o3r/eslint-config-otter": "workspace:^" "@o3r/eslint-plugin": "workspace:^" "@schematics/angular": ~16.2.0 @@ -7211,6 +7184,7 @@ __metadata: "@o3r/azure-tools": "workspace:^" "@o3r/build-helpers": "workspace:^" "@o3r/eslint-plugin": "workspace:^" + "@o3r/workspace": "workspace:^" "@types/fs-extra": ^11.0.0 "@types/glob": ^8.0.0 "@types/jest": ~29.5.2 @@ -7292,7 +7266,6 @@ __metadata: "@nx/linter": ~16.10.0 "@o3r/build-helpers": "workspace:^" "@o3r/core": "workspace:^" - "@o3r/dev-tools": "workspace:^" "@o3r/eslint-config-otter": "workspace:^" "@o3r/eslint-plugin": "workspace:^" "@o3r/schematics": "workspace:^" @@ -7326,7 +7299,6 @@ __metadata: "@angular/platform-browser-dynamic": ~16.2.0 "@ngrx/store": ~16.3.0 "@o3r/core": "workspace:^" - "@o3r/dev-tools": "workspace:^" "@o3r/schematics": "workspace:^" cheerio: ^1.0.0-rc.10 express-interceptor: ^1.2.0 @@ -7496,7 +7468,6 @@ __metadata: "@nx/linter": ~16.10.0 "@o3r/build-helpers": "workspace:^" "@o3r/core": "workspace:^" - "@o3r/dev-tools": "workspace:^" "@o3r/eslint-config-otter": "workspace:^" "@o3r/eslint-plugin": "workspace:^" "@o3r/schematics": "workspace:^" @@ -7569,7 +7540,6 @@ __metadata: "@nx/linter": ~16.10.0 "@o3r/build-helpers": "workspace:^" "@o3r/core": "workspace:^" - "@o3r/dev-tools": "workspace:^" "@o3r/eslint-config-otter": "workspace:^" "@o3r/eslint-plugin": "workspace:^" "@o3r/schematics": "workspace:^" @@ -7602,7 +7572,6 @@ __metadata: "@ngrx/entity": ~16.3.0 "@ngrx/store": ~16.3.0 "@o3r/core": "workspace:^" - "@o3r/dev-tools": "workspace:^" "@o3r/schematics": "workspace:^" rxjs: ^7.8.1 peerDependenciesMeta: @@ -7645,9 +7614,9 @@ __metadata: "@nx/linter": ~16.10.0 "@nx/workspace": ~16.10.0 "@o3r/build-helpers": "workspace:^" - "@o3r/dev-tools": "workspace:^" "@o3r/eslint-config-otter": "workspace:^" "@o3r/eslint-plugin": "workspace:^" + "@o3r/workspace": "workspace:^" "@schematics/angular": ~16.2.0 "@swc-node/register": ^1.6.7 "@swc/core": ^1.3.85 @@ -7727,7 +7696,6 @@ __metadata: "@nx/jest": ~16.10.0 "@nx/js": ~16.10.0 "@nx/linter": ~16.10.0 - "@o3r/dev-tools": "workspace:^" "@o3r/eslint-config-otter": "workspace:^" "@o3r/eslint-plugin": "workspace:^" "@types/ejs": ^3.1.2 @@ -7790,7 +7758,6 @@ __metadata: "@nx/linter": ~16.10.0 "@o3r/build-helpers": "workspace:^" "@o3r/core": "workspace:^" - "@o3r/dev-tools": "workspace:^" "@o3r/dynamic-content": "workspace:^" "@o3r/eslint-config-otter": "workspace:^" "@o3r/eslint-plugin": "workspace:^" @@ -7895,7 +7862,6 @@ __metadata: "@nx/linter": ~16.10.0 "@o3r/build-helpers": "workspace:^" "@o3r/core": "workspace:^" - "@o3r/dev-tools": "workspace:^" "@o3r/eslint-config-otter": "workspace:^" "@o3r/eslint-plugin": "workspace:^" "@o3r/schematics": "workspace:^" @@ -7978,7 +7944,6 @@ __metadata: "@nx/linter": ~16.10.0 "@o3r/build-helpers": "workspace:^" "@o3r/core": "workspace:^" - "@o3r/dev-tools": "workspace:^" "@o3r/eslint-plugin": "workspace:^" "@o3r/logger": "workspace:^" "@o3r/schematics": "workspace:^" @@ -8068,7 +8033,6 @@ __metadata: "@nx/linter": ~16.10.0 "@o3r/build-helpers": "workspace:^" "@o3r/core": "workspace:^" - "@o3r/dev-tools": "workspace:^" "@o3r/eslint-config-otter": "workspace:^" "@o3r/eslint-plugin": "workspace:^" "@o3r/routing": "workspace:^" @@ -8105,7 +8069,6 @@ __metadata: "@ngrx/router-store": ~16.3.0 "@ngrx/store": ~16.3.0 "@o3r/core": "workspace:^" - "@o3r/dev-tools": "workspace:^" "@o3r/routing": "workspace:^" "@o3r/schematics": "workspace:^" jasmine: ^5.0.0 @@ -8148,7 +8111,6 @@ __metadata: "@o3r/components": "workspace:^" "@o3r/configuration": "workspace:^" "@o3r/core": "workspace:^" - "@o3r/dev-tools": "workspace:^" "@o3r/dynamic-content": "workspace:^" "@o3r/eslint-config-otter": "workspace:^" "@o3r/eslint-plugin": "workspace:^" @@ -8206,7 +8168,6 @@ __metadata: "@o3r/components": "workspace:^" "@o3r/configuration": "workspace:^" "@o3r/core": "workspace:^" - "@o3r/dev-tools": "workspace:^" "@o3r/dynamic-content": "workspace:^" "@o3r/extractors": "workspace:^" "@o3r/localization": "workspace:^" @@ -8264,7 +8225,6 @@ __metadata: "@nx/js": ~16.10.0 "@nx/linter": ~16.10.0 "@o3r/build-helpers": "workspace:^" - "@o3r/dev-tools": "workspace:^" "@o3r/eslint-plugin": "workspace:^" "@schematics/angular": ~16.2.0 "@types/jest": ~29.5.2 @@ -8351,7 +8311,6 @@ __metadata: "@o3r/components": "workspace:^" "@o3r/configuration": "workspace:^" "@o3r/core": "workspace:^" - "@o3r/dev-tools": "workspace:^" "@o3r/dynamic-content": "workspace:^" "@o3r/eslint-config-otter": "workspace:^" "@o3r/eslint-plugin": "workspace:^" @@ -8422,7 +8381,6 @@ __metadata: "@nx/linter": ~16.10.0 "@o3r/build-helpers": "workspace:^" "@o3r/core": "workspace:^" - "@o3r/dev-tools": "workspace:^" "@o3r/eslint-config-otter": "workspace:^" "@o3r/eslint-plugin": "workspace:^" "@o3r/logger": "workspace:^" @@ -8456,7 +8414,6 @@ __metadata: "@ngrx/entity": ~16.3.0 "@ngrx/store": ~16.3.0 "@o3r/core": "workspace:^" - "@o3r/dev-tools": "workspace:^" "@o3r/logger": "workspace:^" "@o3r/schematics": "workspace:^" fast-deep-equal: ^3.1.3 @@ -8497,7 +8454,6 @@ __metadata: "@o3r/components": "workspace:^" "@o3r/configuration": "workspace:^" "@o3r/core": "workspace:^" - "@o3r/dev-tools": "workspace:^" "@o3r/eslint-config-otter": "workspace:^" "@o3r/eslint-plugin": "workspace:^" "@o3r/localization": "workspace:^" @@ -8630,7 +8586,6 @@ __metadata: "@nx/linter": ~16.10.0 "@o3r/build-helpers": "workspace:^" "@o3r/core": "workspace:^" - "@o3r/dev-tools": "workspace:^" "@o3r/dynamic-content": "workspace:^" "@o3r/eslint-config-otter": "workspace:^" "@o3r/eslint-plugin": "workspace:^" @@ -8711,7 +8666,6 @@ __metadata: "@angular-devkit/schematics": ~16.2.0 "@angular-eslint/eslint-plugin": ~16.2.0 "@nx/eslint-plugin": ~16.10.0 - "@o3r/dev-tools": "workspace:^" "@o3r/eslint-plugin": "workspace:^" "@o3r/schematics": "workspace:^" "@schematics/angular": ~16.2.0 @@ -8779,7 +8733,6 @@ __metadata: "@nx/jest": ~16.10.0 "@o3r/build-helpers": "workspace:^" "@o3r/core": "workspace:^" - "@o3r/dev-tools": "workspace:^" "@o3r/eslint-plugin": "workspace:^" "@o3r/localization": "workspace:^" "@o3r/schematics": "workspace:^" @@ -8891,7 +8844,6 @@ __metadata: "@nx/jest": ~16.10.0 "@o3r/build-helpers": "workspace:^" "@o3r/core": "workspace:^" - "@o3r/dev-tools": "workspace:^" "@o3r/eslint-config-otter": "workspace:^" "@o3r/eslint-plugin": "workspace:^" "@o3r/schematics": "workspace:^" @@ -8934,11 +8886,10 @@ __metadata: languageName: unknown linkType: soft -"@o3r/workspace@workspace:packages/@o3r/workspace": +"@o3r/workspace@workspace:^, @o3r/workspace@workspace:packages/@o3r/workspace": version: 0.0.0-use.local resolution: "@o3r/workspace@workspace:packages/@o3r/workspace" dependencies: - "@ama-sdk/schematics": "workspace:^" "@angular-devkit/architect": ~0.1602.0 "@angular-devkit/build-angular": ~16.2.0 "@angular-devkit/core": ~16.2.0 @@ -8962,7 +8913,6 @@ __metadata: "@nx/linter": ~16.10.0 "@o3r/build-helpers": "workspace:^" "@o3r/core": "workspace:^" - "@o3r/dev-tools": "workspace:^" "@o3r/eslint-plugin": "workspace:^" "@o3r/schematics": "workspace:^" "@o3r/test-helpers": "workspace:^" @@ -13923,7 +13873,6 @@ __metadata: "@actions/github": ^5.1.1 "@angular-eslint/eslint-plugin": ~16.2.0 "@nx/eslint-plugin": ~16.10.0 - "@o3r/dev-tools": "workspace:^" "@o3r/eslint-config-otter": "workspace:~" "@o3r/eslint-plugin": "workspace:~" "@types/jest": ~29.5.2 @@ -23722,7 +23671,6 @@ __metadata: "@actions/github": ^5.1.1 "@angular-eslint/eslint-plugin": ~16.2.0 "@nx/eslint-plugin": ~16.10.0 - "@o3r/dev-tools": "workspace:^" "@o3r/eslint-config-otter": "workspace:~" "@o3r/eslint-plugin": "workspace:~" "@types/jest": ~29.5.2 @@ -24729,7 +24677,6 @@ __metadata: "@nx/jest": ~16.10.0 "@o3r/build-helpers": "workspace:^" "@o3r/core": "workspace:^" - "@o3r/dev-tools": "workspace:^" "@o3r/eslint-plugin": "workspace:^" "@o3r/schematics": "workspace:^" "@types/eslint": ^8.42.0