@o3r/create 10.0.0-prerelease.99 → 10.1.0-prerelease.0

package/README.md

@@ -19,10 +19,18 @@ or
 yarn create @o3r <project-name> [...options]
 ```
 
-> **Warning** : Please notice that the command `yarn create` is **not** available for versions *>= 2.0.0* (see [Yarn cli commands](https://yarnpkg.com/cli)).
+> [!WARNING]
+> Please notice that the command `yarn create` is **not** available for versions *>= 2.0.0* (see [Yarn cli commands](https://yarnpkg.com/cli)).
 
 You can generate an environment with a specific package manager thanks to the `--package-manager` options:
 
 ```shell
 npm create @o3r <project-name> -- --package-manager=yarn [...options]
 ```
+
+## Available options
+
+The generator accepts all the configurations from Angular `ng new` command, find the list [here](https://angular.io/cli/new#options).
+On top of them, the following options can be provided to the initializer:
+
+- `--yarn-version` : specify the version of yarn to use (default: `latest`)

package/index.js

@@ -7,6 +7,9 @@ const node_fs_1 = require("node:fs");
 const minimist = require("minimist");
 const { properties } = JSON.parse((0, node_fs_1.readFileSync)(require.resolve('@schematics/angular/ng-new/schema').replace(/\.js$/, '.json'), { encoding: 'utf-8' }));
 const { version, dependencies, devDependencies } = JSON.parse((0, node_fs_1.readFileSync)((0, node_path_1.resolve)(__dirname, 'package.json'), { encoding: 'utf-8' }));
+const optionsList = [
+    'yarn-version'
+];
 const logo = `
 
                         &BPPPB                    &                    &BPGB&
@@ -104,8 +107,17 @@ const isNgNewOptions = (arg) => {
     }
     return true;
 };
+const exitProcessIfErrorInSpawnSync = (exitCode, { error, status }) => {
+    if (error || status !== 0) {
+        if (error) {
+            // eslint-disable-next-line no-console
+            console.error(error);
+        }
+        process.exit(exitCode);
+    }
+};
 const schematicsCliOptions = Object.entries(argv)
-    .filter(([key]) => key !== '_')
+    .filter(([key]) => key !== '_' && !optionsList.includes(key))
     .map(([key, value]) => value === true && [key] || value === false && key.length > 1 && [`no-${key}`] || [key, value])
     .map(([key, value]) => {
     const optionKey = key.length > 1 ? `--${key}` : `-${key}`;
@@ -115,25 +127,19 @@ const createNgProject = () => {
     const options = schematicsCliOptions
         .filter(([key]) => isNgNewOptions(key))
         .flat();
-    const { error } = (0, node_child_process_1.spawnSync)(process.execPath, [binPath, 'new', ...argv._, ...options], {
+    exitProcessIfErrorInSpawnSync(1, (0, node_child_process_1.spawnSync)(process.execPath, [binPath, 'new', ...argv._, ...options], {
         stdio: 'inherit'
-    });
-    if (error) {
-        // eslint-disable-next-line no-console
-        console.error(error);
-        process.exit(1);
-    }
+    }));
 };
-const addOtterFramework = (relativeDirectory = '.', projectPackageManager = 'npm') => {
+const prepareWorkspace = (relativeDirectory = '.', projectPackageManager = 'npm') => {
+    const cwd = (0, node_path_1.resolve)(process.cwd(), relativeDirectory);
+    const runner = process.platform === 'win32' ? `${projectPackageManager}.cmd` : projectPackageManager;
     const mandatoryDependencies = [
         '@angular-devkit/schematics',
         '@schematics/angular',
         '@angular-devkit/core',
         '@angular-devkit/architect'
     ];
-    const cwd = (0, node_path_1.resolve)(process.cwd(), relativeDirectory);
-    const options = schematicsCliOptions
-        .flat();
     const packageJsonPath = (0, node_path_1.resolve)(cwd, 'package.json');
     const packageJson = JSON.parse((0, node_fs_1.readFileSync)(packageJsonPath, { encoding: 'utf-8' })
         // Replace the ^ with ~ to use the same minor version for angular packages as @angular/cli
@@ -143,17 +149,29 @@ const addOtterFramework = (relativeDirectory = '.', projectPackageManager = 'npm
         packageJson.devDependencies[dep] = dependencies?.[dep] || devDependencies?.[dep] || 'latest';
     });
     (0, node_fs_1.writeFileSync)(packageJsonPath, JSON.stringify(packageJson, null, 2));
-    const { error } = (0, node_child_process_1.spawnSync)(process.platform === 'win32' ? `${projectPackageManager}.cmd` : projectPackageManager, ['exec', 'ng', 'add', `@o3r/core@~${version}`, ...(projectPackageManager === 'npm' ? ['--'] : []), ...options], {
+    if (projectPackageManager === 'yarn') {
+        exitProcessIfErrorInSpawnSync(2, (0, node_child_process_1.spawnSync)(runner, ['set', 'version', argv['yarn-version'] || 'stable'], {
+            stdio: 'inherit',
+            cwd
+        }));
+    }
+    exitProcessIfErrorInSpawnSync(2, (0, node_child_process_1.spawnSync)(runner, ['install'], {
         stdio: 'inherit',
         cwd
-    });
-    if (error) {
-        // eslint-disable-next-line no-console
-        console.error(error);
-        process.exit(2);
-    }
+    }));
+};
+const addOtterFramework = (relativeDirectory = '.', projectPackageManager = 'npm') => {
+    const cwd = (0, node_path_1.resolve)(process.cwd(), relativeDirectory);
+    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], {
+        stdio: 'inherit',
+        cwd
+    }));
 };
 const projectFolder = argv._[0]?.replaceAll(' ', '-').toLowerCase() || '.';
 console.info(logo);
 createNgProject();
+prepareWorkspace(projectFolder, packageManager);
 addOtterFramework(projectFolder, packageManager);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/create",
-  "version": "10.0.0-prerelease.99",
+  "version": "10.1.0-prerelease.0",
   "publishConfig": {
     "access": "public"
   },
@@ -34,10 +34,10 @@
     "@nx/eslint-plugin": "~18.0.2",
     "@nx/jest": "~18.0.2",
     "@nx/js": "~18.0.2",
-    "@o3r/build-helpers": "^10.0.0-prerelease.99",
-    "@o3r/eslint-config-otter": "^10.0.0-prerelease.99",
-    "@o3r/eslint-plugin": "^10.0.0-prerelease.99",
-    "@o3r/test-helpers": "^10.0.0-prerelease.99",
+    "@o3r/build-helpers": "^10.1.0-prerelease.0",
+    "@o3r/eslint-config-otter": "^10.1.0-prerelease.0",
+    "@o3r/eslint-plugin": "^10.1.0-prerelease.0",
+    "@o3r/test-helpers": "^10.1.0-prerelease.0",
     "@stylistic/eslint-plugin-ts": "^1.5.4",
     "@types/jest": "~29.5.2",
     "@types/minimist": "^1.2.2",
@@ -48,7 +48,7 @@
     "eslint": "^8.42.0",
     "eslint-import-resolver-node": "^0.3.4",
     "eslint-plugin-jest": "~27.9.0",
-    "eslint-plugin-jsdoc": "~48.1.0",
+    "eslint-plugin-jsdoc": "~48.2.0",
     "eslint-plugin-prefer-arrow": "~1.2.3",
     "eslint-plugin-unicorn": "^51.0.0",
     "jest": "~29.7.0",
@@ -59,7 +59,7 @@
     "rxjs": "^7.8.1",
     "ts-jest": "~29.1.1",
     "type-fest": "^4.10.2",
-    "typescript": "~5.2.2"
+    "typescript": "~5.3.3"
   },
   "engines": {
     "node": ">=18.0.0",