fix(#2758): set exact-o3r-version as default for all schematics if pr…

…ovided when adding @o3r/core
AmadeusITGroup · Jan 31, 2025 · 5c3b77c · 5c3b77c
1 parent 54aabbb
commit 5c3b77c
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 5 deletions.
diff --git a/packages/@o3r/application/schematics/ng-add/index.ts b/packages/@o3r/application/schematics/ng-add/index.ts
@@ -24,10 +24,13 @@ function ngAddFn(options: NgAddSchematicsSchema): Rule {
       getWorkspaceConfig,
       insertImportToModuleFile,
       setupDependencies,
+      getDefaultOptionsForSchematic,
       getO3rPeerDeps,
       getProjectNewDependenciesTypes,
       getPackageInstallConfig
     } = await import('@o3r/schematics');
+    options = {...getDefaultOptionsForSchematic(getWorkspaceConfig(tree), '@o3r/application', 'ng-add', options), ...options};
+
     const { isImported } = await import('@schematics/angular/utility/ast-utils');
     const ts = await import('typescript');
     const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');

diff --git a/packages/@o3r/application/schematics/ng-add/schema.json b/packages/@o3r/application/schematics/ng-add/schema.json
@@ -13,8 +13,7 @@
     },
     "exactO3rVersion": {
       "type": "boolean",
-      "description": "Use a pinned version for otter packages",
-      "default": false
+      "description": "Use a pinned version for otter packages"
     }
   },
   "additionalProperties": true,

diff --git a/packages/@o3r/core/schematics/ng-add/index.ts b/packages/@o3r/core/schematics/ng-add/index.ts
@@ -59,6 +59,8 @@ function ngAddFn(options: NgAddSchematicsSchema): Rule {
     return chain([
       // eslint-disable-next-line @typescript-eslint/naming-convention
       setupSchematicsParamsForProject({ '*:ng-add': { registerDevtool: options.withDevtool } }, options.projectName),
+      // eslint-disable-next-line @typescript-eslint/naming-convention
+      options.exactO3rVersion ? setupSchematicsParamsForProject({ '*:*': { exactO3rVersion: true } }, options.projectName) : noop(),
       options.projectName ? prepareProject(options, dependenciesSetupConfig) : noop(),
       registerPackageCollectionSchematics(corePackageJsonContent),
       async (t, c) => {

diff --git a/packages/@o3r/create/src/index.it.spec.ts b/packages/@o3r/create/src/index.it.spec.ts
@@ -87,7 +87,7 @@ describe('Create new otter project command', () => {
     expect(() => packageManagerInstall(execInAppOptions)).not.toThrow();
 
     const appName = 'test-application';
-    expect(() => packageManagerExec({ script: 'ng', args: ['g', 'application', appName, '--exact-o3r-version'] }, execInAppOptions)).not.toThrow();
+    expect(() => packageManagerExec({ script: 'ng', args: ['g', 'application', appName] }, execInAppOptions)).not.toThrow();
     expect(existsSync(path.join(inProjectPath, 'project'))).toBe(false);
     expect(() => packageManagerRunOnProject(appName, true, { script: 'build' }, execInAppOptions)).not.toThrow();
 
@@ -98,8 +98,9 @@ describe('Create new otter project command', () => {
     [
       ...Object.entries(rootPackageJson.dependencies), ...Object.entries(rootPackageJson.devDependencies), ...Object.entries(resolutions),
       ...Object.entries(appPackageJson.dependencies), ...Object.entries(appPackageJson.devDependencies)
-    ].filter(([dep]) => dep.startsWith('@o3r/') || dep.startsWith('@ama-sdk/')).forEach(([,version]) => {
-      expect(version).toBe(o3rExactVersion);
+    ].filter(([dep]) => dep.startsWith('@o3r/') || dep.startsWith('@ama-sdk/')).forEach(([dep, version]) => {
+      // Adding `dep` to simplify the debug
+      expect(`${dep}=${version as string}`).toBe(`${dep}=${o3rExactVersion}`);
     });
   });
 });
diff --git a/tools/github-actions/new-version/packaged-action/LICENSE.txt b/tools/github-actions/new-version/packaged-action/LICENSE.txt