@o3r/create 10.1.0-prerelease.26 → 10.1.0-prerelease.28

package/README.md

@@ -34,3 +34,4 @@ The generator accepts all the configurations from Angular `ng new` command, find
 On top of them, the following options can be provided to the initializer:
 
 - `--yarn-version` : specify the version of yarn to use (default: `latest`)
+- `--exact-o3r-version` : use a pinned version for [otter packages](https://github.com/AmadeusITGroup/otter/blob/main/docs/README.md).

package/index.js

@@ -88,6 +88,7 @@ if (packageManagerEnv && ['npm', 'yarn'].includes(packageManagerEnv)) {
     defaultPackageManager = packageManagerEnv;
 }
 const packageManager = argv['package-manager'] || defaultPackageManager;
+const exactO3rVersion = !!argv['exact-o3r-version'];
 if (argv._.length === 0) {
     // eslint-disable-next-line no-console
     console.error('The project name is mandatory');
@@ -149,6 +150,22 @@ const prepareWorkspace = (relativeDirectory = '.', projectPackageManager = 'npm'
     mandatoryDependencies.forEach((dep) => {
         packageJson.devDependencies[dep] = dependencies?.[dep] || devDependencies?.[dep] || 'latest';
     });
+    if (exactO3rVersion) {
+        const o3rPackages = ['@o3r/core', '@o3r/schematics', '@o3r/workspace'];
+        const resolutions = {};
+        o3rPackages.forEach((pkg) => {
+            if (packageJson.devDependencies?.[pkg]) {
+                packageJson.devDependencies[pkg] = version;
+            }
+            resolutions[pkg] = version;
+        });
+        if (projectPackageManager === 'yarn') {
+            packageJson.resolutions = resolutions;
+        }
+        else {
+            packageJson.overrides = resolutions;
+        }
+    }
     (0, node_fs_1.writeFileSync)(packageJsonPath, JSON.stringify(packageJson, null, 2));
     if (projectPackageManager === 'yarn') {
         exitProcessIfErrorInSpawnSync(2, (0, node_child_process_1.spawnSync)(runner, ['set', 'version', argv['yarn-version'] || 'stable'], {
@@ -166,9 +183,14 @@ const addOtterFramework = (relativeDirectory = '.', projectPackageManager = 'npm
     const runner = process.platform === 'win32' ? `${projectPackageManager}.cmd` : projectPackageManager;
     const options = schematicsCliOptions
         .flat();
-    exitProcessIfErrorInSpawnSync(3, (0, node_child_process_1.spawnSync)(runner, ['exec', 'ng', 'add', `@o3r/core@~${version}`, ...(projectPackageManager === 'npm' ? ['--'] : []), ...options], {
+    exitProcessIfErrorInSpawnSync(3, (0, node_child_process_1.spawnSync)(runner, ['exec', 'ng', 'add', `@o3r/core@${exactO3rVersion ? '' : '~'}${version}`, ...(projectPackageManager === 'npm' ? ['--'] : []), ...options], {
         stdio: 'inherit',
-        cwd
+        cwd,
+        env: exactO3rVersion && projectPackageManager === 'npm' ? {
+            ...process.env,
+            // eslint-disable-next-line @typescript-eslint/naming-convention, camelcase
+            NPM_CONFIG_SAVE_EXACT: 'true'
+        } : undefined
     }));
 };
 const projectFolder = argv._[0]?.replaceAll(' ', '-').toLowerCase() || '.';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/create",
-  "version": "10.1.0-prerelease.26",
+  "version": "10.1.0-prerelease.28",
   "publishConfig": {
     "access": "public"
   },
@@ -34,11 +34,11 @@
     "@nx/eslint-plugin": "~18.0.2",
     "@nx/jest": "~18.0.2",
     "@nx/js": "~18.0.2",
-    "@o3r/build-helpers": "^10.1.0-prerelease.26",
-    "@o3r/eslint-config-otter": "^10.1.0-prerelease.26",
-    "@o3r/eslint-plugin": "^10.1.0-prerelease.26",
-    "@o3r/schematics": "^10.1.0-prerelease.26",
-    "@o3r/test-helpers": "^10.1.0-prerelease.26",
+    "@o3r/build-helpers": "^10.1.0-prerelease.28",
+    "@o3r/eslint-config-otter": "^10.1.0-prerelease.28",
+    "@o3r/eslint-plugin": "^10.1.0-prerelease.28",
+    "@o3r/schematics": "^10.1.0-prerelease.28",
+    "@o3r/test-helpers": "^10.1.0-prerelease.28",
     "@stylistic/eslint-plugin-ts": "^1.5.4",
     "@types/jest": "~29.5.2",
     "@types/minimist": "^1.2.2",