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/jest.config.js b/apps/showcase/jest.config.js index ca79901a1a..dded6128a3 100644 --- a/apps/showcase/jest.config.js +++ b/apps/showcase/jest.config.js @@ -1,4 +1,4 @@ -const { getJestModuleNameMapper } = require('@o3r/dev-tools'); +const { getJestModuleNameMapper } = require('@o3r/workspace'); /** @type {import('ts-jest/dist/types').InitialOptionsTsJest} */ module.exports = { diff --git a/apps/showcase/package.json b/apps/showcase/package.json index cbd5ad8117..ae9138d091 100644 --- a/apps/showcase/package.json +++ b/apps/showcase/package.json @@ -76,10 +76,10 @@ "@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:^", + "@o3r/workspace": "workspace:^", "@playwright/test": "~1.39.0", "@schematics/angular": "~16.2.0", "@types/bootstrap": "^5.2.6", 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/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/jest.config.ut.js b/jest.config.ut.js index dee39be001..36ee6d8240 100644 --- a/jest.config.ut.js +++ b/jest.config.ut.js @@ -1,4 +1,4 @@ -const { getJestModuleNameMapper } = require('@o3r/dev-tools'); +const { getJestModuleNameMapper } = require('@o3r/workspace'); globalThis.ngJest = { skipNgcc: true diff --git a/package.json b/package.json index 539f02eb0f..9e569266d1 100644 --- a/package.json +++ b/package.json @@ -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..c4c575bcea 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", diff --git a/packages/@ama-sdk/create/package.json b/packages/@ama-sdk/create/package.json index 0148d9dccf..7d1eb1eb0f 100644 --- a/packages/@ama-sdk/create/package.json +++ b/packages/@ama-sdk/create/package.json @@ -32,10 +32,10 @@ "@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:^", + "@o3r/workspace": "workspace:^", "@types/jest": "~29.5.2", "@types/minimist": "^1.2.2", "@types/node": "^18.0.0", diff --git a/packages/@ama-sdk/create/testing/jest.config.it.js b/packages/@ama-sdk/create/testing/jest.config.it.js index 93d642517b..17b6acb8b3 100644 --- a/packages/@ama-sdk/create/testing/jest.config.it.js +++ b/packages/@ama-sdk/create/testing/jest.config.it.js @@ -1,5 +1,5 @@ const { resolve } = require('node:path'); -const { getJestModuleNameMapper } = require('@o3r/dev-tools'); +const { getJestModuleNameMapper } = require('@o3r/workspace'); /** @type {import('ts-jest/dist/types').JestConfigWithTsJest} */ module.exports = { diff --git a/packages/@ama-sdk/schematics/package.json b/packages/@ama-sdk/schematics/package.json index 1d5a1868bf..7372e95cce 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", @@ -70,6 +69,7 @@ "@o3r/build-helpers": "workspace:^", "@o3r/eslint-plugin": "workspace:^", "@o3r/schematics": "workspace:^", + "@o3r/workspace": "workspace:^", "@openapitools/openapi-generator-cli": "~2.7.0", "@schematics/angular": "~16.2.0", "@types/jest": "~29.5.2", 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..86a480ada2 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 @@ -55,7 +55,6 @@ ] }, "dependencies": { - "@o3r/dev-tools": "~<%= sdkCoreVersion %>", "@swc/helpers": "^0.5.0", "tslib": "<%= versions['tslib'] %>" }, diff --git a/packages/@ama-sdk/schematics/testing/jest.config.it.js b/packages/@ama-sdk/schematics/testing/jest.config.it.js index 93d642517b..17b6acb8b3 100644 --- a/packages/@ama-sdk/schematics/testing/jest.config.it.js +++ b/packages/@ama-sdk/schematics/testing/jest.config.it.js @@ -1,5 +1,5 @@ const { resolve } = require('node:path'); -const { getJestModuleNameMapper } = require('@o3r/dev-tools'); +const { getJestModuleNameMapper } = require('@o3r/workspace'); /** @type {import('ts-jest/dist/types').JestConfigWithTsJest} */ module.exports = { diff --git a/packages/@ama-sdk/showcase-sdk/package.json b/packages/@ama-sdk/showcase-sdk/package.json index 42275c36dc..fb928635cf 100644 --- a/packages/@ama-sdk/showcase-sdk/package.json +++ b/packages/@ama-sdk/showcase-sdk/package.json @@ -34,17 +34,15 @@ "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": "amasdk-files-pack", "test": "jest --passWithNoTests", "publish:package": "npm publish ./dist", "generate:mock": "schematics @ama-sdk/schematics:mock", @@ -52,7 +50,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..b97305b8a9 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,9 +75,9 @@ "@nx/linter": "~16.10.0", "@o3r/build-helpers": "workspace:^", "@o3r/core": "workspace:^", - "@o3r/dev-tools": "workspace:^", "@o3r/eslint-plugin": "workspace:^", "@o3r/test-helpers": "workspace:^", + "@o3r/workspace": "workspace:^", "@schematics/angular": "~16.2.0", "@types/jasmine": "~4.6.0", "@types/jest": "~29.5.2", diff --git a/packages/@o3r/analytics/testing/jest.config.it.js b/packages/@o3r/analytics/testing/jest.config.it.js index 647d4247bd..98fb2659c2 100644 --- a/packages/@o3r/analytics/testing/jest.config.it.js +++ b/packages/@o3r/analytics/testing/jest.config.it.js @@ -1,5 +1,5 @@ const { resolve } = require('node:path'); -const { getJestModuleNameMapper } = require('@o3r/dev-tools'); +const { getJestModuleNameMapper } = require('@o3r/workspace'); /** @type {import('ts-jest/dist/types').JestConfigWithTsJest} */ module.exports = { diff --git a/packages/@o3r/apis-manager/package.json b/packages/@o3r/apis-manager/package.json index b42972f458..04597daf84 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,10 +59,10 @@ "@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:^", + "@o3r/workspace": "workspace:^", "@schematics/angular": "~16.2.0", "@types/jest": "~29.5.2", "@types/node": "^18.0.0", diff --git a/packages/@o3r/apis-manager/testing/jest.config.it.js b/packages/@o3r/apis-manager/testing/jest.config.it.js index 647d4247bd..98fb2659c2 100644 --- a/packages/@o3r/apis-manager/testing/jest.config.it.js +++ b/packages/@o3r/apis-manager/testing/jest.config.it.js @@ -1,5 +1,5 @@ const { resolve } = require('node:path'); -const { getJestModuleNameMapper } = require('@o3r/dev-tools'); +const { getJestModuleNameMapper } = require('@o3r/workspace'); /** @type {import('ts-jest/dist/types').JestConfigWithTsJest} */ module.exports = { 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..060620b71b 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:^", @@ -103,6 +101,7 @@ "@o3r/schematics": "workspace:^", "@o3r/test-helpers": "workspace:^", "@o3r/testing": "workspace:^", + "@o3r/workspace": "workspace:^", "@schematics/angular": "~16.2.0", "@types/jest": "~29.5.2", "@types/node": "^18.0.0", diff --git a/packages/@o3r/components/testing/jest.config.it.js b/packages/@o3r/components/testing/jest.config.it.js index 647d4247bd..98fb2659c2 100644 --- a/packages/@o3r/components/testing/jest.config.it.js +++ b/packages/@o3r/components/testing/jest.config.it.js @@ -1,5 +1,5 @@ const { resolve } = require('node:path'); -const { getJestModuleNameMapper } = require('@o3r/dev-tools'); +const { getJestModuleNameMapper } = require('@o3r/workspace'); /** @type {import('ts-jest/dist/types').JestConfigWithTsJest} */ module.exports = { diff --git a/packages/@o3r/configuration/package.json b/packages/@o3r/configuration/package.json index 4195cc9adb..b41d2a40c4 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,12 +89,12 @@ "@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:^", "@o3r/test-helpers": "workspace:^", "@o3r/testing": "workspace:^", + "@o3r/workspace": "workspace:^", "@schematics/angular": "~16.2.0", "@types/jasmine": "~4.6.0", "@types/jest": "~29.5.2", diff --git a/packages/@o3r/configuration/testing/jest.config.it.js b/packages/@o3r/configuration/testing/jest.config.it.js index 647d4247bd..98fb2659c2 100644 --- a/packages/@o3r/configuration/testing/jest.config.it.js +++ b/packages/@o3r/configuration/testing/jest.config.it.js @@ -1,5 +1,5 @@ const { resolve } = require('node:path'); -const { getJestModuleNameMapper } = require('@o3r/dev-tools'); +const { getJestModuleNameMapper } = require('@o3r/workspace'); /** @type {import('ts-jest/dist/types').JestConfigWithTsJest} */ module.exports = { diff --git a/packages/@o3r/core/package.json b/packages/@o3r/core/package.json index 3f1a21b014..ac1006a61e 100644 --- a/packages/@o3r/core/package.json +++ b/packages/@o3r/core/package.json @@ -97,9 +97,9 @@ "@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:^", + "@o3r/workspace": "workspace:^", "@schematics/angular": "~16.2.0", "@types/jest": "~29.5.2", "@types/minimist": "^1.2.2", diff --git a/packages/@o3r/core/testing/jest.config.it.js b/packages/@o3r/core/testing/jest.config.it.js index 93d642517b..17b6acb8b3 100644 --- a/packages/@o3r/core/testing/jest.config.it.js +++ b/packages/@o3r/core/testing/jest.config.it.js @@ -1,5 +1,5 @@ const { resolve } = require('node:path'); -const { getJestModuleNameMapper } = require('@o3r/dev-tools'); +const { getJestModuleNameMapper } = require('@o3r/workspace'); /** @type {import('ts-jest/dist/types').JestConfigWithTsJest} */ module.exports = { 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..4e0169e622 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 expose 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 expose 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..8450f3f577 100644 --- a/packages/@o3r/dev-tools/src/utils/is-package-installed.ts +++ b/packages/@o3r/dev-tools/src/utils/is-package-installed.ts @@ -2,7 +2,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 expose 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 002f7ef850..50798d7cee 100644 --- a/packages/@o3r/dev-tools/src/utils/jest.helpers.ts +++ b/packages/@o3r/dev-tools/src/utils/jest.helpers.ts @@ -1,69 +1,23 @@ -import { sync as globbySync } from 'globby'; -import { existsSync } from 'node:fs'; -import { dirname, normalize, posix, relative, resolve } from 'node:path'; +import { + getJestModuleNameMapper as workspaceGetJestModuleNameMapper, + 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, '/')); -}; - -/** - * Find the closest package.json file containing workspace definition in the parent directories - * - * @param directory Current directory to search for - * @param rootDir First directory of the recursion - */ -const findParentPackageJson = (directory: string, rootDir?: string): string | undefined => { - const parentFolder = dirname(directory); - rootDir ||= directory; - if (parentFolder === directory) { - return undefined; - } - const packageJsonPath = resolve(parentFolder, 'package.json'); - if (!existsSync(packageJsonPath) || !(require(packageJsonPath).workspaces)) { - return findParentPackageJson(parentFolder, rootDir); - } - return globbySync(require(packageJsonPath).workspaces, { cwd: parentFolder, onlyFiles: false, absolute: true}) - .some((workspacePath) => normalize(workspacePath) === rootDir) ? packageJsonPath : findParentPackageJson(parentFolder, rootDir); -}; +export const getJestProjects = workspaceGetJestProjects; /** * Get the list of modules mapping - * + * @deprecated Please use the one exposed in `@o3r/workspace`, will be removed in Otter v12. * @param rootDir Root directory of the jest project * @param testingTsconfigPath Path to the tsconfig.json used for test mapping files * @returns */ -export const getJestModuleNameMapper = (rootDir: string, testingTsconfigPath?: string) => { - const workspacePackageJsonPath = findParentPackageJson(rootDir); - const workspacePath = workspacePackageJsonPath ? dirname(workspacePackageJsonPath) : process.cwd(); - testingTsconfigPath ||= resolve(workspacePath, 'tsconfig.base.json'); - - if (!existsSync(testingTsconfigPath)) { - console.warn(`${testingTsconfigPath} not found`); - return {}; - } - const { compilerOptions } = require(testingTsconfigPath) as { compilerOptions: { paths: { [key: string]: string[] } } }; - const relativePath = relative(rootDir, workspacePath); - return Object.entries(compilerOptions.paths).reduce>((acc, [keyPath, mapPaths]) => { - const relativeModulePath = mapPaths.map((mapPath) => `/${relativePath.replace(/\\+/g, '/') || ''}/${mapPath.replace(/[*]/g, '$1')}`.replace(/\/{2,}/g, '/')); - acc['^' + keyPath.replace(/[*]/g, '(.*)') + '$'] = relativeModulePath; - return acc; - }, {}); -}; +export const getJestModuleNameMapper = workspaceGetJestModuleNameMapper; diff --git a/packages/@o3r/dev-tools/src/utils/package-manager.ts b/packages/@o3r/dev-tools/src/utils/package-manager.ts index 745b6e61ae..422ea1aa10 100644 --- a/packages/@o3r/dev-tools/src/utils/package-manager.ts +++ b/packages/@o3r/dev-tools/src/utils/package-manager.ts @@ -1,7 +1,7 @@ /** * Get package manager used in runs * Defaults to the package manager setup in process.env if no package manager set in angular.json - * @deprecated will be removed in Otter v12. + * @deprecated You can use the one expose in `@o3r/schematics`, will be removed in Otter v12. * @param angularJsonString Content of angular.json file */ export function getPackageManager(angularJsonString?: string | null) { diff --git a/packages/@o3r/dev-tools/src/utils/string.ts b/packages/@o3r/dev-tools/src/utils/string.ts index 3cb3b9495b..1d59aadca7 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 expose 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..57ea32e077 100644 --- a/packages/@o3r/extractors/package.json +++ b/packages/@o3r/extractors/package.json @@ -54,11 +54,11 @@ "@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:^", "@o3r/test-helpers": "workspace:^", + "@o3r/workspace": "workspace:^", "@types/jest": "~29.5.2", "@types/node": "^18.0.0", "@typescript-eslint/eslint-plugin": "^5.60.1", diff --git a/packages/@o3r/extractors/testing/jest.config.it.js b/packages/@o3r/extractors/testing/jest.config.it.js index 647d4247bd..98fb2659c2 100644 --- a/packages/@o3r/extractors/testing/jest.config.it.js +++ b/packages/@o3r/extractors/testing/jest.config.it.js @@ -1,5 +1,5 @@ const { resolve } = require('node:path'); -const { getJestModuleNameMapper } = require('@o3r/dev-tools'); +const { getJestModuleNameMapper } = require('@o3r/workspace'); /** @type {import('ts-jest/dist/types').JestConfigWithTsJest} */ module.exports = { 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..86a2551603 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:^", @@ -102,6 +101,7 @@ "@o3r/logger": "workspace:^", "@o3r/schematics": "workspace:^", "@o3r/test-helpers": "workspace:^", + "@o3r/workspace": "workspace:^", "@schematics/angular": "~16.2.0", "@types/jest": "~29.5.2", "@types/node": "^18.0.0", diff --git a/packages/@o3r/localization/testing/jest.config.it.js b/packages/@o3r/localization/testing/jest.config.it.js index 93d642517b..17b6acb8b3 100644 --- a/packages/@o3r/localization/testing/jest.config.it.js +++ b/packages/@o3r/localization/testing/jest.config.it.js @@ -1,5 +1,5 @@ const { resolve } = require('node:path'); -const { getJestModuleNameMapper } = require('@o3r/dev-tools'); +const { getJestModuleNameMapper } = require('@o3r/workspace'); /** @type {import('ts-jest/dist/types').JestConfigWithTsJest} */ module.exports = { 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..12fd137a7f 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:^", @@ -117,6 +115,7 @@ "@o3r/schematics": "workspace:^", "@o3r/test-helpers": "workspace:^", "@o3r/testing": "workspace:^", + "@o3r/workspace": "workspace:^", "@schematics/angular": "~16.2.0", "@types/jasmine": "~4.6.0", "@types/jest": "~29.5.2", diff --git a/packages/@o3r/rules-engine/testing/jest.config.it.js b/packages/@o3r/rules-engine/testing/jest.config.it.js index 647d4247bd..98fb2659c2 100644 --- a/packages/@o3r/rules-engine/testing/jest.config.it.js +++ b/packages/@o3r/rules-engine/testing/jest.config.it.js @@ -1,5 +1,5 @@ const { resolve } = require('node:path'); -const { getJestModuleNameMapper } = require('@o3r/dev-tools'); +const { getJestModuleNameMapper } = require('@o3r/workspace'); /** @type {import('ts-jest/dist/types').JestConfigWithTsJest} */ module.exports = { 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/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..5f75f41563 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:^", @@ -107,6 +106,7 @@ "@o3r/schematics": "workspace:^", "@o3r/styling": "workspace:^", "@o3r/test-helpers": "workspace:^", + "@o3r/workspace": "workspace:^", "@schematics/angular": "~16.2.0", "@types/jest": "~29.5.2", "@types/node": "^18.0.0", diff --git a/packages/@o3r/styling/testing/jest.config.it.js b/packages/@o3r/styling/testing/jest.config.it.js index 647d4247bd..98fb2659c2 100644 --- a/packages/@o3r/styling/testing/jest.config.it.js +++ b/packages/@o3r/styling/testing/jest.config.it.js @@ -1,5 +1,5 @@ const { resolve } = require('node:path'); -const { getJestModuleNameMapper } = require('@o3r/dev-tools'); +const { getJestModuleNameMapper } = require('@o3r/workspace'); /** @type {import('ts-jest/dist/types').JestConfigWithTsJest} */ module.exports = { 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..252c3e3a21 100644 --- a/packages/@o3r/testing/package.json +++ b/packages/@o3r/testing/package.json @@ -180,11 +180,11 @@ "@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:^", "@o3r/test-helpers": "workspace:^", + "@o3r/workspace": "workspace:^", "@playwright/test": "~1.39.0", "@schematics/angular": "~16.2.0", "@types/jest": "~29.5.2", 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/testing/schematics/ng-add/templates/workspace/jest.config.ut.js.template b/packages/@o3r/testing/schematics/ng-add/templates/workspace/jest.config.ut.js.template index dee39be001..36ee6d8240 100644 --- a/packages/@o3r/testing/schematics/ng-add/templates/workspace/jest.config.ut.js.template +++ b/packages/@o3r/testing/schematics/ng-add/templates/workspace/jest.config.ut.js.template @@ -1,4 +1,4 @@ -const { getJestModuleNameMapper } = require('@o3r/dev-tools'); +const { getJestModuleNameMapper } = require('@o3r/workspace'); globalThis.ngJest = { skipNgcc: true diff --git a/packages/@o3r/testing/testing/jest.config.it.js b/packages/@o3r/testing/testing/jest.config.it.js index 647d4247bd..98fb2659c2 100644 --- a/packages/@o3r/testing/testing/jest.config.it.js +++ b/packages/@o3r/testing/testing/jest.config.it.js @@ -1,5 +1,5 @@ const { resolve } = require('node:path'); -const { getJestModuleNameMapper } = require('@o3r/dev-tools'); +const { getJestModuleNameMapper } = 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/package.json b/packages/@o3r/workspace/package.json index b07d8bb114..b45b1c5ef7 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", @@ -67,8 +66,6 @@ "@nx/js": "~16.10.0", "@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/library/templates/ng/jest.config.js.template b/packages/@o3r/workspace/schematics/library/templates/ng/jest.config.js.template index e29daa17d0..2b8252c272 100644 --- a/packages/@o3r/workspace/schematics/library/templates/ng/jest.config.js.template +++ b/packages/@o3r/workspace/schematics/library/templates/ng/jest.config.js.template @@ -1,4 +1,4 @@ -const { getJestModuleNameMapper } = require('@o3r/dev-tools'); +const { getJestModuleNameMapper } = require('@o3r/workspace'); globalThis.ngJest = { skipNgcc: true diff --git a/packages/@o3r/workspace/schematics/library/templates/nx/jest.config.js.template b/packages/@o3r/workspace/schematics/library/templates/nx/jest.config.js.template index ec956beded..324eba5824 100644 --- a/packages/@o3r/workspace/schematics/library/templates/nx/jest.config.js.template +++ b/packages/@o3r/workspace/schematics/library/templates/nx/jest.config.js.template @@ -1,4 +1,4 @@ -const { getJestModuleNameMapper } = require('@o3r/dev-tools'); +const { getJestModuleNameMapper } = require('@o3r/workspace'); globalThis.ngJest = { skipNgcc: true 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..002f7ef850 --- /dev/null +++ b/packages/@o3r/workspace/src/utils/jest.helpers.ts @@ -0,0 +1,69 @@ +import { sync as globbySync } from 'globby'; +import { existsSync } from 'node:fs'; +import { dirname, normalize, posix, relative, 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, '/')); +}; + +/** + * Find the closest package.json file containing workspace definition in the parent directories + * + * @param directory Current directory to search for + * @param rootDir First directory of the recursion + */ +const findParentPackageJson = (directory: string, rootDir?: string): string | undefined => { + const parentFolder = dirname(directory); + rootDir ||= directory; + if (parentFolder === directory) { + return undefined; + } + const packageJsonPath = resolve(parentFolder, 'package.json'); + if (!existsSync(packageJsonPath) || !(require(packageJsonPath).workspaces)) { + return findParentPackageJson(parentFolder, rootDir); + } + return globbySync(require(packageJsonPath).workspaces, { cwd: parentFolder, onlyFiles: false, absolute: true}) + .some((workspacePath) => normalize(workspacePath) === rootDir) ? packageJsonPath : findParentPackageJson(parentFolder, rootDir); +}; + +/** + * Get the list of modules mapping + * + * @param rootDir Root directory of the jest project + * @param testingTsconfigPath Path to the tsconfig.json used for test mapping files + * @returns + */ +export const getJestModuleNameMapper = (rootDir: string, testingTsconfigPath?: string) => { + const workspacePackageJsonPath = findParentPackageJson(rootDir); + const workspacePath = workspacePackageJsonPath ? dirname(workspacePackageJsonPath) : process.cwd(); + testingTsconfigPath ||= resolve(workspacePath, 'tsconfig.base.json'); + + if (!existsSync(testingTsconfigPath)) { + console.warn(`${testingTsconfigPath} not found`); + return {}; + } + const { compilerOptions } = require(testingTsconfigPath) as { compilerOptions: { paths: { [key: string]: string[] } } }; + const relativePath = relative(rootDir, workspacePath); + return Object.entries(compilerOptions.paths).reduce>((acc, [keyPath, mapPaths]) => { + const relativeModulePath = mapPaths.map((mapPath) => `/${relativePath.replace(/\\+/g, '/') || ''}/${mapPath.replace(/[*]/g, '$1')}`.replace(/\/{2,}/g, '/')); + acc['^' + keyPath.replace(/[*]/g, '(.*)') + '$'] = relativeModulePath; + return acc; + }, {}); +}; diff --git a/packages/@o3r/workspace/testing/jest.config.it.js b/packages/@o3r/workspace/testing/jest.config.it.js index 93d642517b..17b6acb8b3 100644 --- a/packages/@o3r/workspace/testing/jest.config.it.js +++ b/packages/@o3r/workspace/testing/jest.config.it.js @@ -1,5 +1,5 @@ const { resolve } = require('node:path'); -const { getJestModuleNameMapper } = require('@o3r/dev-tools'); +const { getJestModuleNameMapper } = require('@o3r/workspace'); /** @type {import('ts-jest/dist/types').JestConfigWithTsJest} */ module.exports = { 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..4d941646c4 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 @@ -167,10 +166,10 @@ __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:^" + "@o3r/workspace": "workspace:^" "@openapitools/openapi-generator-cli": ~2.7.0 "@schematics/angular": ~16.2.0 "@types/jest": ~29.5.2 @@ -218,9 +217,9 @@ __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:^" + "@o3r/workspace": "workspace:^" "@openapitools/openapi-generator-cli": ~2.7.0 "@schematics/angular": ~16.2.0 "@types/jest": ~29.5.2 @@ -295,7 +294,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 +399,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 +461,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 +500,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 +6279,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 +6313,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 +6350,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 +6388,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,9 +6439,9 @@ __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:^" + "@o3r/workspace": "workspace:^" "@schematics/angular": ~16.2.0 "@types/jasmine": ~4.6.0 "@types/jest": ~29.5.2 @@ -6487,7 +6478,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,10 +6518,10 @@ __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:^" + "@o3r/workspace": "workspace:^" "@schematics/angular": ~16.2.0 "@types/jest": ~29.5.2 "@types/node": ^18.0.0 @@ -6562,7 +6552,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 +6589,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 +6621,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 +6792,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 +6860,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:^" @@ -6882,6 +6867,7 @@ __metadata: "@o3r/schematics": "workspace:^" "@o3r/test-helpers": "workspace:^" "@o3r/testing": "workspace:^" + "@o3r/workspace": "workspace:^" "@schematics/angular": ~16.2.0 "@types/jest": ~29.5.2 "@types/node": ^18.0.0 @@ -6922,7 +6908,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,12 +6962,12 @@ __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:^" "@o3r/test-helpers": "workspace:^" "@o3r/testing": "workspace:^" + "@o3r/workspace": "workspace:^" "@schematics/angular": ~16.2.0 "@types/jasmine": ~4.6.0 "@types/jest": ~29.5.2 @@ -7016,7 +7001,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:^" @@ -7072,10 +7056,10 @@ __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:^" + "@o3r/workspace": "workspace:^" "@schematics/angular": ~16.2.0 "@types/jest": ~29.5.2 "@types/minimist": ^1.2.2 @@ -7164,7 +7148,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 @@ -7195,7 +7178,7 @@ __metadata: languageName: unknown linkType: soft -"@o3r/dev-tools@workspace:^, @o3r/dev-tools@workspace:packages/@o3r/dev-tools": +"@o3r/dev-tools@workspace:packages/@o3r/dev-tools": version: 0.0.0-use.local resolution: "@o3r/dev-tools@workspace:packages/@o3r/dev-tools" dependencies: @@ -7211,6 +7194,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 +7276,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 +7309,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,11 +7478,11 @@ __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:^" "@o3r/test-helpers": "workspace:^" + "@o3r/workspace": "workspace:^" "@types/jest": ~29.5.2 "@types/node": ^18.0.0 "@typescript-eslint/eslint-plugin": ^5.60.1 @@ -7569,7 +7551,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 +7583,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 +7625,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 +7707,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 +7769,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:^" @@ -7798,6 +7776,7 @@ __metadata: "@o3r/logger": "workspace:^" "@o3r/schematics": "workspace:^" "@o3r/test-helpers": "workspace:^" + "@o3r/workspace": "workspace:^" "@schematics/angular": ~16.2.0 "@types/jest": ~29.5.2 "@types/node": ^18.0.0 @@ -7895,7 +7874,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 +7956,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 +8045,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 +8081,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 +8123,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:^" @@ -8158,6 +8132,7 @@ __metadata: "@o3r/schematics": "workspace:^" "@o3r/test-helpers": "workspace:^" "@o3r/testing": "workspace:^" + "@o3r/workspace": "workspace:^" "@schematics/angular": ~16.2.0 "@types/jasmine": ~4.6.0 "@types/jest": ~29.5.2 @@ -8206,7 +8181,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 +8238,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 +8324,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:^" @@ -8361,6 +8333,7 @@ __metadata: "@o3r/rules-engine": "workspace:^" "@o3r/schematics": "workspace:^" "@o3r/testing": "workspace:^" + "@o3r/workspace": "workspace:^" "@playwright/test": ~1.39.0 "@popperjs/core": ^2.11.5 "@schematics/angular": ~16.2.0 @@ -8422,7 +8395,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 +8428,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 +8468,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 +8600,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:^" @@ -8638,6 +8607,7 @@ __metadata: "@o3r/schematics": "workspace:^" "@o3r/styling": "workspace:^" "@o3r/test-helpers": "workspace:^" + "@o3r/workspace": "workspace:^" "@schematics/angular": ~16.2.0 "@types/jest": ~29.5.2 "@types/node": ^18.0.0 @@ -8711,7 +8681,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,11 +8748,11 @@ __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:^" "@o3r/test-helpers": "workspace:^" + "@o3r/workspace": "workspace:^" "@playwright/test": ~1.39.0 "@schematics/angular": ~16.2.0 "@types/jest": ~29.5.2 @@ -8891,7 +8860,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 +8902,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 @@ -8961,8 +8928,6 @@ __metadata: "@nx/js": ~16.10.0 "@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 +13888,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 +23686,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 +24692,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