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

package/schematics/ng-add/index.js

@@ -8,6 +8,7 @@ const path = tslib_1.__importStar(require("node:path"));
 const fs = tslib_1.__importStar(require("node:fs"));
 const cms_adapter_1 = require("../cms-adapter");
 const devtools_registration_1 = require("./helpers/devtools-registration");
+const schematics_3 = require("@o3r/schematics");
 /**
  * Add Otter components to an Angular Project
  * @param options
@@ -16,7 +17,7 @@ function ngAddFn(options) {
     /* ng add rules */
     return async (tree, context) => {
         try {
-            const { getDefaultOptionsForSchematic, getO3rPeerDeps, getProjectNewDependenciesType, getWorkspaceConfig, ngAddPackages, ngAddPeerDependencyPackages, removePackages, registerPackageCollectionSchematics } = await Promise.resolve().then(() => tslib_1.__importStar(require('@o3r/schematics')));
+            const { getDefaultOptionsForSchematic, getO3rPeerDeps, getProjectNewDependenciesTypes, getWorkspaceConfig, setupDependencies, removePackages, registerPackageCollectionSchematics } = await Promise.resolve().then(() => tslib_1.__importStar(require('@o3r/schematics')));
             // eslint-disable-next-line @typescript-eslint/naming-convention
             const { NodeDependencyType } = await Promise.resolve().then(() => tslib_1.__importStar(require('@schematics/angular/utility/dependencies')));
             options = { ...getDefaultOptionsForSchematic(getWorkspaceConfig(tree), '@o3r/components', 'ng-add', options), ...options };
@@ -27,19 +28,33 @@ function ngAddFn(options) {
                 depsInfo.o3rPeerDeps = [...depsInfo.o3rPeerDeps, '@o3r/extractors'];
             }
             const workspaceProject = options.projectName ? getWorkspaceConfig(tree)?.projects[options.projectName] : undefined;
-            const workingDirectory = workspaceProject?.root || '.';
-            const dependencyType = getProjectNewDependenciesType(workspaceProject);
+            const dependencies = depsInfo.o3rPeerDeps.reduce((acc, dep) => {
+                acc[dep] = {
+                    inManifest: [{
+                            range: `~${depsInfo.packageVersion}`,
+                            types: getProjectNewDependenciesTypes(workspaceProject)
+                        }]
+                };
+                return acc;
+            }, (0, schematics_3.getPackageInstallConfig)(packageJsonPath, tree, options.projectName));
+            const devDependencies = {
+                chokidar: {
+                    inManifest: [{
+                            range: packageJson.peerDependencies.chokidar,
+                            types: [NodeDependencyType.Dev]
+                        }]
+                }
+            };
             const rule = (0, schematics_1.chain)([
                 removePackages(['@otter/components']),
-                ngAddPackages(depsInfo.o3rPeerDeps, {
-                    skipConfirmation: true,
-                    version: depsInfo.packageVersion,
-                    parentPackageInfo: depsInfo.packageName,
+                setupDependencies({
                     projectName: options.projectName,
-                    dependencyType,
-                    workingDirectory
+                    dependencies: {
+                        ...dependencies,
+                        ...devDependencies
+                    },
+                    ngAddToRun: depsInfo.o3rPeerDeps
                 }),
-                ngAddPeerDependencyPackages(['chokidar'], packageJsonPath, NodeDependencyType.Dev, { ...options, workingDirectory, skipNgAddSchematicRun: true }, '@o3r/components - install builder dependency'),
                 registerPackageCollectionSchematics(packageJson),
                 ...(options.enableMetadataExtract ? [(0, cms_adapter_1.updateCmsAdapter)(options)] : []),
                 await (0, devtools_registration_1.registerDevtools)(options)