igniteui-angular 17.1.0-beta.3 → 17.1.0

package/schematics/utils/dependency-handler.js

@@ -25,20 +25,20 @@ const schematicsPackage = '@igniteui/angular-schematics';
  */
 exports.DEPENDENCIES_MAP = [
     // dependencies
-    { name: 'hammerjs', target: PackageTarget.REGULAR },
     { name: 'fflate', target: PackageTarget.REGULAR },
     { name: 'tslib', target: PackageTarget.NONE },
-    { name: '@types/hammerjs', target: PackageTarget.DEV },
     { name: 'igniteui-trial-watermark', target: PackageTarget.NONE },
     { name: 'lodash-es', target: PackageTarget.NONE },
     { name: 'uuid', target: PackageTarget.NONE },
     { name: '@igniteui/material-icons-extended', target: PackageTarget.REGULAR },
+    { name: 'igniteui-theming', target: PackageTarget.NONE },
     // peerDependencies
     { name: '@angular/forms', target: PackageTarget.NONE },
     { name: '@angular/common', target: PackageTarget.NONE },
     { name: '@angular/core', target: PackageTarget.NONE },
     { name: '@angular/animations', target: PackageTarget.NONE },
-    { name: 'igniteui-theming', target: PackageTarget.NONE },
+    { name: 'hammerjs', target: PackageTarget.REGULAR },
+    { name: '@types/hammerjs', target: PackageTarget.DEV },
     // igxDevDependencies
     { name: '@igniteui/angular-schematics', target: PackageTarget.DEV }
 ];
@@ -95,7 +95,7 @@ const addDependencies = (options) => (tree, context) => __awaiter(void 0, void 0
     const pkgJson = require('../../package.json');
     const workspaceHost = (0, util_1.createHost)(tree);
     const { workspace } = yield core_1.workspaces.readWorkspace(tree.root.path, workspaceHost);
-    yield includeDependencies(workspaceHost, workspace, pkgJson, context, tree);
+    yield includeDependencies(workspaceHost, workspace, pkgJson, context, tree, options);
     yield (0, exports.includeStylePreprocessorOptions)(workspaceHost, workspace, context, tree);
     (0, exports.addPackageToPkgJson)(tree, schematicsPackage, pkgJson.igxDevDependencies[schematicsPackage], PackageTarget.DEV);
 });
@@ -185,9 +185,14 @@ const addStylePreprocessorOptions = (project, tree, config, context) => __awaite
         }
     }
 });
-const includeDependencies = (workspaceHost, workspace, pkgJson, context, tree) => __awaiter(void 0, void 0, void 0, function* () {
-    for (const pkg of Object.keys(pkgJson.dependencies)) {
-        const version = pkgJson.dependencies[pkg];
+const includeDependencies = (workspaceHost, workspace, pkgJson, context, tree, options) => __awaiter(void 0, void 0, void 0, function* () {
+    const allDeps = Object.keys(pkgJson.dependencies).concat(Object.keys(pkgJson.peerDependencies));
+    for (const pkg of allDeps) {
+        // In case of hammerjs and user prompted to not add hammer, skip
+        if (pkg === 'hammerjs' && !options.addHammer) {
+            continue;
+        }
+        const version = pkgJson.dependencies[pkg] || pkgJson.peerDependencies[pkg];
         const entry = exports.DEPENDENCIES_MAP.find(e => e.name === pkg);
         if (!entry || entry.target === PackageTarget.NONE) {
             continue;