@o3r/components 10.0.0-prerelease.99 → 10.0.0-rc.1

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)

package/schematics/ng-add/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"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"}

package/schematics/ng-add/schema.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../schematics/ng-add/schema.ts"],"names":[],"mappings":""}

package/schematics/ng-update/v10-0/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../schematics/ng-update/v10-0/index.ts"],"names":[],"mappings":";;;AAAA,oEAAoE;AACpE,2DAAuF;AACvF,gDAA2I;AAE3I,MAAM,mBAAmB,GAAwB;IAC/C,UAAU,EAAE;QACV,GAAG,EAAE;YACH,IAAI,EAAE,eAAe;YACrB,MAAM,EAAE,mBAAmB;SAC5B;QACD,MAAM,EAAE,sBAAsB;KAC/B;IACD,QAAQ,EAAE;QACR,GAAG,EAAE;YACH,IAAI,EAAE,aAAa;YACnB,MAAM,EAAE,iBAAiB;SAC1B;QACD,MAAM,EAAE,oBAAoB;KAC7B;IACD,cAAc,EAAE;QACd,GAAG,EAAE;YACH,IAAI,EAAE,mBAAmB;YACzB,MAAM,EAAE,uBAAuB;SAChC;QACD,MAAM,EAAE,0BAA0B;KACnC;IACD,eAAe,EAAE;QACf,GAAG,EAAE;YACH,IAAI,EAAE,oBAAoB;YAC1B,MAAM,EAAE,wBAAwB;SACjC;QACD,MAAM,EAAE,2BAA2B;KACpC;CACF,CAAC;AAEF,MAAM,8BAA8B,GAAG,yCAAyC,CAAC;AAEjF,MAAM,8BAA8B,GAAS,CAAC,IAAI,EAAE,EAAE;IACpD,MAAM,KAAK,GAAG,IAAA,4BAAe,EAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;IAChG,OAAO,IAAA,kBAAK,EACV,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,8BAA8B,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;QAC9E,CAAC,CAAC,IAAA,kBAAK,EAAC;YACN,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,8BAA8B,EAAE,cAAc,CAAC,CAAC;YAChH,IAAA,2BAAc,EAAC,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,WAAW,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;SAC9E,CAAC;QACF,CAAC,CAAC,IAAA,iBAAI,GAAE,CACT,CACF,CAAC;AACJ,CAAC,CAAC;AAEF;;GAEG;AACH,SAAS,aAAa;IACpB,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAE/C,MAAM,WAAW,GAAW;YAC1B,IAAA,wBAAW,EAAC,mBAAmB,CAAC;YAChC,8BAA8B;SAC/B,CAAC;QAEF,OAAO,IAAA,kBAAK,EAAC,WAAW,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC3C,CAAC,CAAC;AACJ,CAAC;AAED;;GAEG;AACU,QAAA,WAAW,GAAG,IAAA,kDAAqC,EAAC,aAAa,CAAC,CAAC"}