@o3r/create 10.0.0-prerelease.31 → 10.0.0-prerelease.33

package/index.js

@@ -6,7 +6,7 @@ const node_path_1 = require("node:path");
 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 } = JSON.parse((0, node_fs_1.readFileSync)((0, node_path_1.resolve)(__dirname, 'package.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 logo = `
 
                         &BPPPB                    &                    &BPGB&
@@ -77,15 +77,14 @@ if (!args.some((a) => a.startsWith('--style'))) {
 if (!args.some((a) => a.startsWith('--preset'))) {
     args.push('--preset', 'basic');
 }
-const hasPackageManagerArg = args.some((a) => a.startsWith('--package-manager'));
-if (!hasPackageManagerArg) {
-    const packageManager = process.env.npm_config_user_agent?.split('/')[0];
-    if (packageManager && ['npm', 'pnpm', 'yarn', 'cnpm'].includes(packageManager)) {
-        args.push('--package-manager', packageManager);
-    }
-}
 args.push('--no-create-application');
 const argv = minimist(args);
+const packageManagerEnv = process.env.npm_config_user_agent?.split('/')[0];
+let defaultPackageManager = 'npm';
+if (packageManagerEnv && ['npm', 'yarn'].includes(packageManagerEnv)) {
+    defaultPackageManager = packageManagerEnv;
+}
+const packageManager = argv['package-manager'] || defaultPackageManager;
 if (argv._.length === 0) {
     // eslint-disable-next-line no-console
     console.error('The project name is mandatory');
@@ -116,7 +115,7 @@ const createNgProject = () => {
     const options = schematicsCliOptions
         .filter(([key]) => isNgNewOptions(key))
         .flat();
-    const { error } = (0, node_child_process_1.spawnSync)(process.execPath, [binPath, 'new', ...argv._, ...options, '--skip-install'], {
+    const { error } = (0, node_child_process_1.spawnSync)(process.execPath, [binPath, 'new', ...argv._, ...options], {
         stdio: 'inherit'
     });
     if (error) {
@@ -125,11 +124,24 @@ const createNgProject = () => {
         process.exit(1);
     }
 };
-const addOtterFramework = (relativeDirectory = '.') => {
+const addOtterFramework = (relativeDirectory = '.', projectPackageManager = 'npm') => {
+    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 { error } = (0, node_child_process_1.spawnSync)(process.execPath, [binPath, 'add', `@o3r/core@${version || 'latest'}`, ...options], {
+    const packageJsonPath = (0, node_path_1.resolve)(cwd, 'package.json');
+    const packageJson = JSON.parse((0, node_fs_1.readFileSync)(packageJsonPath, { encoding: 'utf-8' }));
+    packageJson.devDependencies ||= {};
+    mandatoryDependencies.forEach((dep) => {
+        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], {
         stdio: 'inherit',
         cwd
     });
@@ -142,4 +154,4 @@ const addOtterFramework = (relativeDirectory = '.') => {
 const projectFolder = argv._[0]?.replaceAll(' ', '-').toLowerCase() || '.';
 console.info(logo);
 createNgProject();
-addOtterFramework(projectFolder);
+addOtterFramework(projectFolder, packageManager);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/create",
-  "version": "10.0.0-prerelease.31",
+  "version": "10.0.0-prerelease.33",
   "description": "Create a new Otter based application",
   "keywords": [
     "create",
@@ -21,16 +21,19 @@
     "tslib": "^2.5.3"
   },
   "devDependencies": {
+    "@angular-devkit/architect": "~0.1700.3",
+    "@angular-devkit/core": "~17.0.3",
+    "@angular-devkit/schematics": "~17.0.3",
     "@angular-eslint/eslint-plugin": "~17.2.0",
     "@angular-eslint/eslint-plugin-template": "~17.2.0",
     "@nx/eslint": "~17.2.0",
     "@nx/eslint-plugin": "~17.2.0",
     "@nx/jest": "~17.2.0",
     "@nx/js": "~17.2.0",
-    "@o3r/build-helpers": "^10.0.0-prerelease.31",
-    "@o3r/eslint-config-otter": "^10.0.0-prerelease.31",
-    "@o3r/eslint-plugin": "^10.0.0-prerelease.31",
-    "@o3r/test-helpers": "^10.0.0-prerelease.31",
+    "@o3r/build-helpers": "^10.0.0-prerelease.33",
+    "@o3r/eslint-config-otter": "^10.0.0-prerelease.33",
+    "@o3r/eslint-plugin": "^10.0.0-prerelease.33",
+    "@o3r/test-helpers": "^10.0.0-prerelease.33",
     "@types/jest": "~29.5.2",
     "@types/minimist": "^1.2.2",
     "@types/node": "^20.0.0",