@skyux/packages 5.0.0-beta.110 → 5.0.0-beta.114

package/CHANGELOG.md

@@ -1,3 +1,19 @@
+# 5.0.0-beta.114 (2021-09-22)
+
+- `@skyux/progress-indicator@5.0.0-beta.3` [Release notes](https://github.com/blackbaud/skyux-progress-indicator/blob/5.0.0-beta.3/CHANGELOG.md)
+
+# 5.0.0-beta.113 (2021-09-21)
+
+- `@skyux/validation@5.0.0-beta.2` [Release notes](https://github.com/blackbaud/skyux-validation/blob/5.0.0-beta.2/CHANGELOG.md)
+
+# 5.0.0-beta.112 (2021-09-21)
+
+- `@skyux/ag-grid@5.0.0-beta.3` [Release notes](https://github.com/blackbaud/skyux-ag-grid/blob/5.0.0-beta.3/CHANGELOG.md)
+
+# 5.0.0-beta.111 (2021-09-16)
+
+- `@skyux/tabs@5.0.0-beta.3` [Release notes](https://github.com/blackbaud/skyux-tabs/blob/5.0.0-beta.3/CHANGELOG.md)
+
 # 5.0.0-beta.110 (2021-09-16)
 
 - Added the `ng update` schematic `setup-coverage-for-testing-module` to setup code coverage for library testing modules. [#7](https://github.com/blackbaud/skyux-packages/pull/7)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skyux/packages",
-  "version": "5.0.0-beta.110",
+  "version": "5.0.0-beta.114",
   "description": "Handles the `ng update` command for SKY UX component libraries.",
   "scripts": {
     "build": "npm run clean && tsc -p tsconfig.json",
@@ -78,9 +78,6 @@
   "peerDependencies": {
     "@angular-devkit/schematics": "^12.2.5"
   },
-  "dependencies": {
-    "jsonc-parser": "^3.0.0"
-  },
   "devDependencies": {
     "@angular-devkit/schematics": "^12.2.5",
     "@istanbuljs/nyc-config-typescript": "^1.0.1",

package/schematics/migrations/migration-collection.json

@@ -5,6 +5,11 @@
             "factory": "./noop/noop.schematic",
             "description": "Update all SKY UX component packages"
         },
+        "update-peer-dependencies": {
+            "version": "5.0.0-beta.0",
+            "factory": "./update-peer-dependencies/update-peer-dependencies.schematic",
+            "description": "Update library peer dependencies"
+        },
         "setup-coverage-for-testing-module": {
             "version": "5.0.0-beta.0",
             "factory": "./setup-coverage-for-testing-module/setup-coverage-for-testing-module.schematic",

package/schematics/migrations/setup-coverage-for-testing-module/setup-coverage-for-testing-module.schematic.js

@@ -10,58 +10,33 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const schematics_1 = require("@angular-devkit/schematics");
-const json_file_1 = require("../../utility/json-file");
+const tree_1 = require("../../utility/tree");
 const workspace_1 = require("../../utility/workspace");
-function updateLibraryTsConfig(projectName) {
+function updateSpecsEntryPoint(projectName) {
     return (tree) => {
-        const tsconfigPath = `projects/${projectName}/tsconfig.lib.json`;
-        const tsConfig = new json_file_1.JsonFile(tree, tsconfigPath);
-        const exclude = tsConfig.get(['exclude']);
-        if (!exclude.includes('testing/src/test.ts')) {
-            exclude.push('testing/src/test.ts');
-            tsConfig.modify(['exclude'], exclude);
-        }
-    };
-}
-function updateSpecTsConfig(projectName) {
-    return (tree) => {
-        const tsconfigPath = `projects/${projectName}/tsconfig.spec.json`;
-        const tsConfig = new json_file_1.JsonFile(tree, tsconfigPath);
-        const files = tsConfig.get(['files']);
-        if (!files.includes('testing/src/test.ts')) {
-            files.push('testing/src/test.ts');
-            tsConfig.modify(['files'], files);
-        }
-    };
-}
-function createTestingEntryPoint(projectName) {
-    return (tree) => {
-        const filePath = `projects/${projectName}/testing/src/test.ts`;
-        if (!tree.exists(filePath)) {
-            tree.create(filePath, `const context = (require as any).context('./', true, /\.spec\.ts$/);
-context.keys().map(context);
-`);
+        const filePath = `projects/${projectName}/src/test.ts`;
+        let contents = tree_1.readRequiredFile(tree, filePath);
+        if (!contents.includes('const testingContext')) {
+            contents += `
+// Find any tests included in the "testing" entry point.
+try {
+  const testingContext = require.context('../testing/', true, /\\.spec\\.ts$/);
+  testingContext.keys().map(testingContext);
+} catch (err) {}
+`;
+            tree.overwrite(filePath, contents);
         }
     };
 }
 function updatePackages() {
     return (tree) => __awaiter(this, void 0, void 0, function* () {
-        const { host, workspace } = yield workspace_1.getWorkspace(tree);
+        const { workspace } = yield workspace_1.getWorkspace(tree);
         const { project, projectName } = yield workspace_1.getProject(workspace, workspace.extensions.defaultProject);
         // Only run for libraries.
         if (project.extensions.projectType !== 'library') {
             return;
         }
-        const hasTestingModule = yield host.isDirectory(`projects/${projectName}/testing`);
-        // Only run if a testing module exists.
-        if (!hasTestingModule) {
-            return;
-        }
-        return schematics_1.chain([
-            updateLibraryTsConfig(projectName),
-            updateSpecTsConfig(projectName),
-            createTestingEntryPoint(projectName),
-        ]);
+        return schematics_1.chain([updateSpecsEntryPoint(projectName)]);
     });
 }
 exports.default = updatePackages;

package/schematics/migrations/setup-coverage-for-testing-module/setup-coverage-for-testing-module.schematic.js.map

@@ -1 +1 @@
-{"version":3,"file":"setup-coverage-for-testing-module.schematic.js","sourceRoot":"","sources":["../../../../src/schematics/migrations/setup-coverage-for-testing-module/setup-coverage-for-testing-module.schematic.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,2DAAyD;AAEzD,uDAAmD;AACnD,uDAAmE;AAEnE,SAAS,qBAAqB,CAAC,WAAmB;IAChD,OAAO,CAAC,IAAI,EAAE,EAAE;QACd,MAAM,YAAY,GAAG,YAAY,WAAW,oBAAoB,CAAC;QACjE,MAAM,QAAQ,GAAG,IAAI,oBAAQ,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QAClD,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;QAC1C,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAC,EAAE;YAC5C,OAAO,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;YACpC,QAAQ,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC,CAAC;SACvC;IACH,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,kBAAkB,CAAC,WAAmB;IAC7C,OAAO,CAAC,IAAI,EAAE,EAAE;QACd,MAAM,YAAY,GAAG,YAAY,WAAW,qBAAqB,CAAC;QAClE,MAAM,QAAQ,GAAG,IAAI,oBAAQ,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QAClD,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;QACtC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,qBAAqB,CAAC,EAAE;YAC1C,KAAK,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;YAClC,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC,CAAC;SACnC;IACH,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,uBAAuB,CAAC,WAAmB;IAClD,OAAO,CAAC,IAAI,EAAE,EAAE;QACd,MAAM,QAAQ,GAAG,YAAY,WAAW,sBAAsB,CAAC;QAC/D,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE;YAC1B,IAAI,CAAC,MAAM,CACT,QAAQ,EACR;;CAEP,CACM,CAAC;SACH;IACH,CAAC,CAAC;AACJ,CAAC;AAED,SAAwB,cAAc;IACpC,OAAO,CAAO,IAAI,EAAE,EAAE;QACpB,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,MAAM,wBAAY,CAAC,IAAI,CAAC,CAAC;QAErD,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,MAAM,sBAAU,CAC/C,SAAS,EACT,SAAS,CAAC,UAAU,CAAC,cAAwB,CAC9C,CAAC;QAEF,0BAA0B;QAC1B,IAAI,OAAO,CAAC,UAAU,CAAC,WAAW,KAAK,SAAS,EAAE;YAChD,OAAO;SACR;QAED,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,WAAW,CAC7C,YAAY,WAAW,UAAU,CAClC,CAAC;QAEF,uCAAuC;QACvC,IAAI,CAAC,gBAAgB,EAAE;YACrB,OAAO;SACR;QAED,OAAO,kBAAK,CAAC;YACX,qBAAqB,CAAC,WAAW,CAAC;YAClC,kBAAkB,CAAC,WAAW,CAAC;YAC/B,uBAAuB,CAAC,WAAW,CAAC;SACrC,CAAC,CAAC;IACL,CAAC,CAAA,CAAC;AACJ,CAAC;AA7BD,iCA6BC"}
+{"version":3,"file":"setup-coverage-for-testing-module.schematic.js","sourceRoot":"","sources":["../../../../src/schematics/migrations/setup-coverage-for-testing-module/setup-coverage-for-testing-module.schematic.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,2DAAyD;AAEzD,6CAAsD;AACtD,uDAAmE;AAEnE,SAAS,qBAAqB,CAAC,WAAmB;IAChD,OAAO,CAAC,IAAI,EAAE,EAAE;QACd,MAAM,QAAQ,GAAG,YAAY,WAAW,cAAc,CAAC;QACvD,IAAI,QAAQ,GAAG,uBAAgB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAChD,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,sBAAsB,CAAC,EAAE;YAC9C,QAAQ,IAAI;;;;;;CAMjB,CAAC;YACI,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;SACpC;IACH,CAAC,CAAC;AACJ,CAAC;AAED,SAAwB,cAAc;IACpC,OAAO,CAAO,IAAI,EAAE,EAAE;QACpB,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,wBAAY,CAAC,IAAI,CAAC,CAAC;QAE/C,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,MAAM,sBAAU,CAC/C,SAAS,EACT,SAAS,CAAC,UAAU,CAAC,cAAwB,CAC9C,CAAC;QAEF,0BAA0B;QAC1B,IAAI,OAAO,CAAC,UAAU,CAAC,WAAW,KAAK,SAAS,EAAE;YAChD,OAAO;SACR;QAED,OAAO,kBAAK,CAAC,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IACrD,CAAC,CAAA,CAAC;AACJ,CAAC;AAhBD,iCAgBC"}

package/schematics/migrations/setup-coverage-for-testing-module/setup-coverage-for-testing-module.schematic.spec.js

@@ -15,11 +15,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const testing_1 = require("@angular-devkit/schematics/testing");
 const path_1 = __importDefault(require("path"));
 const scaffold_1 = require("../../testing/scaffold");
-const json_file_1 = require("../../utility/json-file");
 describe('Migrations > Setup specs for testing module', () => {
     const collectionPath = path_1.default.join(__dirname, '../migration-collection.json');
     const defaultProjectName = 'my-lib';
     const schematicName = 'setup-coverage-for-testing-module';
+    const testingModuleContext = `// Find any tests included in the "testing" entry point.
+try {
+  const testingContext = require.context('../testing/', true, /\\.spec\\.ts$/);
+  testingContext.keys().map(testingContext);
+} catch (err) {}`;
     const runner = new testing_1.SchematicTestRunner('migrations', collectionPath);
     let tree;
     beforeEach(() => __awaiter(void 0, void 0, void 0, function* () {
@@ -27,10 +31,6 @@ describe('Migrations > Setup specs for testing module', () => {
             name: defaultProjectName,
         });
     }));
-    function createTestingModule() {
-        tree.create(`projects/${defaultProjectName}/testing/ng-package.json`, `{}`);
-        tree.create(`projects/${defaultProjectName}/testing/src/public-api.ts`, ``);
-    }
     function runSchematic(name) {
         return runner
             .runSchematicAsync(schematicName, {
@@ -39,46 +39,58 @@ describe('Migrations > Setup specs for testing module', () => {
             .toPromise();
     }
     function validateFiles() {
-        const entryPointContents = tree.readContent(`projects/${defaultProjectName}/testing/src/test.ts`);
+        const entryPointContents = tree.readContent(`projects/${defaultProjectName}/src/test.ts`);
         expect(entryPointContents)
-            .toEqual(`const context = (require as any).context('./', true, /.spec.ts$/);
+            .toEqual(`// This file is required by karma.conf.js and loads recursively all the .spec and framework files
+
+import 'zone.js';
+import 'zone.js/testing';
+import { getTestBed } from '@angular/core/testing';
+import {
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting
+} from '@angular/platform-browser-dynamic/testing';
+
+declare const require: {
+  context(path: string, deep?: boolean, filter?: RegExp): {
+    keys(): string[];
+    <T>(id: string): T;
+  };
+};
+
+// First, initialize the Angular testing environment.
+getTestBed().initTestEnvironment(
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting(),
+  { teardown: { destroyAfterEach: true }},
+);
+
+// Then we find all the tests.
+const context = require.context('./', true, /\\.spec\\.ts$/);
+// And load the modules.
 context.keys().map(context);
+
+${testingModuleContext}
 `);
-        const specTsConfig = new json_file_1.JsonFile(tree, `projects/${defaultProjectName}/tsconfig.spec.json`);
-        expect(specTsConfig.get(['files'])).toEqual([
-            'src/test.ts',
-            'testing/src/test.ts',
-        ]);
-        const libTsConfig = new json_file_1.JsonFile(tree, `projects/${defaultProjectName}/tsconfig.lib.json`);
-        expect(libTsConfig.get(['exclude'])).toEqual([
-            'src/test.ts',
-            '**/*.spec.ts',
-            'testing/src/test.ts',
-        ]);
     }
     it('should setup testing module for code coverage', () => __awaiter(void 0, void 0, void 0, function* () {
-        createTestingModule();
         yield runSchematic();
         validateFiles();
     }));
-    it('should abort if testing module not found', () => __awaiter(void 0, void 0, void 0, function* () {
-        const updatedTree = yield runSchematic();
-        expect(updatedTree.exists(`projects/${defaultProjectName}/testing/src/test.ts`)).toEqual(false);
-    }));
-    it('should abort if project type is application', () => __awaiter(void 0, void 0, void 0, function* () {
-        tree = yield scaffold_1.createTestApp(runner, {
-            defaultProjectName: 'my-app',
-        });
-        const updatedTree = yield runSchematic('my-app');
-        expect(updatedTree.exists('projects/my-app/testing/src/test.ts')).toEqual(false);
-    }));
     it('should abort if testing module already setup', () => __awaiter(void 0, void 0, void 0, function* () {
-        createTestingModule();
         yield runSchematic();
         validateFiles();
         // Run the schematic again.
         yield runSchematic();
         validateFiles();
     }));
+    it('should abort if project type is application', () => __awaiter(void 0, void 0, void 0, function* () {
+        tree = yield scaffold_1.createTestApp(runner, {
+            defaultProjectName: 'my-app',
+        });
+        const updatedTree = yield runSchematic('my-app');
+        const contents = updatedTree.readContent('/src/test.ts');
+        expect(contents).not.toContain(testingModuleContext);
+    }));
 });
 //# sourceMappingURL=setup-coverage-for-testing-module.schematic.spec.js.map

package/schematics/migrations/setup-coverage-for-testing-module/setup-coverage-for-testing-module.schematic.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"setup-coverage-for-testing-module.schematic.spec.js","sourceRoot":"","sources":["../../../../src/schematics/migrations/setup-coverage-for-testing-module/setup-coverage-for-testing-module.schematic.spec.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"setup-coverage-for-testing-module.schematic.spec.js","sourceRoot":"","sources":["../../../../src/schematics/migrations/setup-coverage-for-testing-module/setup-coverage-for-testing-module.schematic.spec.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,gEAG4C;AAE5C,gDAAwB;AAExB,qDAA0E;AAE1E,QAAQ,CAAC,6CAA6C,EAAE,GAAG,EAAE;IAC3D,MAAM,cAAc,GAAG,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,8BAA8B,CAAC,CAAC;IAC5E,MAAM,kBAAkB,GAAG,QAAQ,CAAC;IACpC,MAAM,aAAa,GAAG,mCAAmC,CAAC;IAE1D,MAAM,oBAAoB,GAAG;;;;iBAId,CAAC;IAEhB,MAAM,MAAM,GAAG,IAAI,6BAAmB,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;IAErE,IAAI,IAAkB,CAAC;IAEvB,UAAU,CAAC,GAAS,EAAE;QACpB,IAAI,GAAG,MAAM,4BAAiB,CAAC,MAAM,EAAE;YACrC,IAAI,EAAE,kBAAkB;SACzB,CAAC,CAAC;IACL,CAAC,CAAA,CAAC,CAAC;IAEH,SAAS,YAAY,CAAC,IAAa;QACjC,OAAO,MAAM;aACV,iBAAiB,CAChB,aAAa,EACb;YACE,kBAAkB,EAAE,IAAI,IAAI,kBAAkB;SAC/C,EACD,IAAI,CACL;aACA,SAAS,EAAE,CAAC;IACjB,CAAC;IAED,SAAS,aAAa;QACpB,MAAM,kBAAkB,GAAG,IAAI,CAAC,WAAW,CACzC,YAAY,kBAAkB,cAAc,CAC7C,CAAC;QACF,MAAM,CAAC,kBAAkB,CAAC;aACvB,OAAO,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA6Bb,oBAAoB;CACrB,CAAC,CAAC;IACD,CAAC;IAED,EAAE,CAAC,+CAA+C,EAAE,GAAS,EAAE;QAC7D,MAAM,YAAY,EAAE,CAAC;QACrB,aAAa,EAAE,CAAC;IAClB,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,8CAA8C,EAAE,GAAS,EAAE;QAC5D,MAAM,YAAY,EAAE,CAAC;QACrB,aAAa,EAAE,CAAC;QAChB,2BAA2B;QAC3B,MAAM,YAAY,EAAE,CAAC;QACrB,aAAa,EAAE,CAAC;IAClB,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,6CAA6C,EAAE,GAAS,EAAE;QAC3D,IAAI,GAAG,MAAM,wBAAa,CAAC,MAAM,EAAE;YACjC,kBAAkB,EAAE,QAAQ;SAC7B,CAAC,CAAC;QAEH,MAAM,WAAW,GAAG,MAAM,YAAY,CAAC,QAAQ,CAAC,CAAC;QAEjD,MAAM,QAAQ,GAAG,WAAW,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC;QACzD,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAAC;IACvD,CAAC,CAAA,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/schematics/migrations/update-peer-dependencies/update-peer-dependencies.schematic.d.ts

@@ -0,0 +1,2 @@
+import { Rule } from '@angular-devkit/schematics';
+export default function updateLibraryDependencies(): Rule;

package/schematics/migrations/update-peer-dependencies/update-peer-dependencies.schematic.js

@@ -0,0 +1,47 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const tree_1 = require("../../utility/tree");
+const workspace_1 = require("../../utility/workspace");
+function updateDependencySection(context, project, tree, section) {
+    const libraryPackageJsonPath = `${project.root}/package.json`;
+    const libraryPackageJson = JSON.parse(tree_1.readRequiredFile(tree, libraryPackageJsonPath));
+    const rootPackageJson = JSON.parse(tree_1.readRequiredFile(tree, 'package.json'));
+    if (libraryPackageJson[section]) {
+        for (const packageName in libraryPackageJson[section]) {
+            const rootVersion = rootPackageJson.dependencies[packageName];
+            if (rootVersion.match(/^(\^|~)/)) {
+                context.logger.warn(`Package "${packageName}@${rootVersion}" was not set to a specific version in the root 'package.json'. Skipping update to library 'package.json'.`);
+                break;
+            }
+            const rangeMatch = libraryPackageJson[section][packageName].match(/^(\^|~)/);
+            const rangeCharacter = rangeMatch ? rangeMatch[0] : '';
+            libraryPackageJson[section][packageName] = `${rangeCharacter}${rootVersion}`;
+        }
+        tree.overwrite(libraryPackageJsonPath, JSON.stringify(libraryPackageJson, undefined, 2));
+    }
+}
+function updateLibraryDependencies() {
+    return (tree, context) => __awaiter(this, void 0, void 0, function* () {
+        const { workspace } = yield workspace_1.getWorkspace(tree);
+        const { project } = yield workspace_1.getProject(workspace, workspace.extensions.defaultProject);
+        // Only run for libraries.
+        /* istanbul ignore if */
+        if (project.extensions.projectType !== 'library') {
+            context.logger.info('The default project is of type "application". Skipping.');
+            return;
+        }
+        updateDependencySection(context, project, tree, 'peerDependencies');
+        updateDependencySection(context, project, tree, 'dependencies');
+    });
+}
+exports.default = updateLibraryDependencies;
+//# sourceMappingURL=update-peer-dependencies.schematic.js.map

package/schematics/migrations/update-peer-dependencies/update-peer-dependencies.schematic.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-peer-dependencies.schematic.js","sourceRoot":"","sources":["../../../../src/schematics/migrations/update-peer-dependencies/update-peer-dependencies.schematic.ts"],"names":[],"mappings":";;;;;;;;;;;AAGA,6CAAsD;AACtD,uDAAmE;AAEnE,SAAS,uBAAuB,CAC9B,OAAyB,EACzB,OAAqC,EACrC,IAAU,EACV,OAAe;IAEf,MAAM,sBAAsB,GAAG,GAAG,OAAO,CAAC,IAAI,eAAe,CAAC;IAE9D,MAAM,kBAAkB,GAAG,IAAI,CAAC,KAAK,CACnC,uBAAgB,CAAC,IAAI,EAAE,sBAAsB,CAAC,CAC/C,CAAC;IAEF,MAAM,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,uBAAgB,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC;IAE3E,IAAI,kBAAkB,CAAC,OAAO,CAAC,EAAE;QAC/B,KAAK,MAAM,WAAW,IAAI,kBAAkB,CAAC,OAAO,CAAC,EAAE;YACrD,MAAM,WAAW,GAAG,eAAe,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;YAC9D,IAAI,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE;gBAChC,OAAO,CAAC,MAAM,CAAC,IAAI,CACjB,YAAY,WAAW,IAAI,WAAW,4GAA4G,CACnJ,CAAC;gBACF,MAAM;aACP;YAED,MAAM,UAAU,GACd,kBAAkB,CAAC,OAAO,CAAC,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YAC5D,MAAM,cAAc,GAAG,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAEvD,kBAAkB,CAAC,OAAO,CAAC,CACzB,WAAW,CACZ,GAAG,GAAG,cAAc,GAAG,WAAW,EAAE,CAAC;SACvC;QAED,IAAI,CAAC,SAAS,CACZ,sBAAsB,EACtB,IAAI,CAAC,SAAS,CAAC,kBAAkB,EAAE,SAAS,EAAE,CAAC,CAAC,CACjD,CAAC;KACH;AACH,CAAC;AAED,SAAwB,yBAAyB;IAC/C,OAAO,CAAO,IAAI,EAAE,OAAO,EAAE,EAAE;QAC7B,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,wBAAY,CAAC,IAAI,CAAC,CAAC;QAE/C,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,sBAAU,CAClC,SAAS,EACT,SAAS,CAAC,UAAU,CAAC,cAAwB,CAC9C,CAAC;QAEF,0BAA0B;QAC1B,wBAAwB;QACxB,IAAI,OAAO,CAAC,UAAU,CAAC,WAAW,KAAK,SAAS,EAAE;YAChD,OAAO,CAAC,MAAM,CAAC,IAAI,CACjB,yDAAyD,CAC1D,CAAC;YACF,OAAO;SACR;QAED,uBAAuB,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,kBAAkB,CAAC,CAAC;QACpE,uBAAuB,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;IAClE,CAAC,CAAA,CAAC;AACJ,CAAC;AArBD,4CAqBC"}

package/schematics/migrations/update-peer-dependencies/update-peer-dependencies.schematic.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/schematics/migrations/update-peer-dependencies/update-peer-dependencies.schematic.spec.js

@@ -0,0 +1,76 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const testing_1 = require("@angular-devkit/schematics/testing");
+const path_1 = __importDefault(require("path"));
+const scaffold_1 = require("../../testing/scaffold");
+describe('Migrations > Update peer dependencies', () => {
+    const collectionPath = path_1.default.join(__dirname, '../migration-collection.json');
+    const defaultProjectName = 'my-lib';
+    const schematicName = 'update-peer-dependencies';
+    const runner = new testing_1.SchematicTestRunner('migrations', collectionPath);
+    let tree;
+    beforeEach(() => __awaiter(void 0, void 0, void 0, function* () {
+        tree = yield scaffold_1.createTestLibrary(runner, {
+            name: defaultProjectName,
+        });
+    }));
+    function runSchematic(name) {
+        return runner
+            .runSchematicAsync(schematicName, {
+            defaultProjectName: name || defaultProjectName,
+        }, tree)
+            .toPromise();
+    }
+    it('should update library peer dependencies', () => __awaiter(void 0, void 0, void 0, function* () {
+        tree.overwrite('projects/my-lib/package.json', `{
+  "peerDependencies": {
+    "@angular/core": "^12.0.0"
+  },
+  "dependencies": {
+    "moment": "1.0.0",
+    "tslib": "^2.0.0"
+  }
+}`);
+        tree.overwrite('package.json', `{
+  "dependencies": {
+    "@angular/core": "12.2.5",
+    "moment": "1.2.3",
+    "tslib": "2.5.0"
+  }
+}`);
+        const updatedTree = yield runSchematic();
+        const libraryPackageJson = JSON.parse(updatedTree.readContent('projects/my-lib/package.json'));
+        expect(libraryPackageJson.peerDependencies['@angular/core']).toEqual('^12.2.5');
+        expect(libraryPackageJson.dependencies.moment).toEqual('1.2.3');
+        expect(libraryPackageJson.dependencies.tslib).toEqual('^2.5.0');
+    }));
+    it('should skip dependencies if they are not specific versions', () => __awaiter(void 0, void 0, void 0, function* () {
+        tree.overwrite('projects/my-lib/package.json', `{
+  "peerDependencies": {
+    "@angular/core": "^12.0.0"
+  }
+}`);
+        tree.overwrite('package.json', `{
+  "dependencies": {
+    "@angular/core": "~12.2.5"
+  }
+}`);
+        const updatedTree = yield runSchematic();
+        const libraryPackageJson = JSON.parse(updatedTree.readContent('projects/my-lib/package.json'));
+        expect(libraryPackageJson.peerDependencies['@angular/core']).toEqual('^12.0.0' // <-- Should be unchanged since it was skipped.
+        );
+    }));
+});
+//# sourceMappingURL=update-peer-dependencies.schematic.spec.js.map

package/schematics/migrations/update-peer-dependencies/update-peer-dependencies.schematic.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-peer-dependencies.schematic.spec.js","sourceRoot":"","sources":["../../../../src/schematics/migrations/update-peer-dependencies/update-peer-dependencies.schematic.spec.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,gEAG4C;AAE5C,gDAAwB;AAExB,qDAA2D;AAE3D,QAAQ,CAAC,uCAAuC,EAAE,GAAG,EAAE;IACrD,MAAM,cAAc,GAAG,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,8BAA8B,CAAC,CAAC;IAC5E,MAAM,kBAAkB,GAAG,QAAQ,CAAC;IACpC,MAAM,aAAa,GAAG,0BAA0B,CAAC;IAEjD,MAAM,MAAM,GAAG,IAAI,6BAAmB,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;IAErE,IAAI,IAAkB,CAAC;IAEvB,UAAU,CAAC,GAAS,EAAE;QACpB,IAAI,GAAG,MAAM,4BAAiB,CAAC,MAAM,EAAE;YACrC,IAAI,EAAE,kBAAkB;SACzB,CAAC,CAAC;IACL,CAAC,CAAA,CAAC,CAAC;IAEH,SAAS,YAAY,CAAC,IAAa;QACjC,OAAO,MAAM;aACV,iBAAiB,CAChB,aAAa,EACb;YACE,kBAAkB,EAAE,IAAI,IAAI,kBAAkB;SAC/C,EACD,IAAI,CACL;aACA,SAAS,EAAE,CAAC;IACjB,CAAC;IAED,EAAE,CAAC,yCAAyC,EAAE,GAAS,EAAE;QACvD,IAAI,CAAC,SAAS,CACZ,8BAA8B,EAC9B;;;;;;;;EAQJ,CACG,CAAC;QAEF,IAAI,CAAC,SAAS,CACZ,cAAc,EACd;;;;;;EAMJ,CACG,CAAC;QAEF,MAAM,WAAW,GAAG,MAAM,YAAY,EAAE,CAAC;QAEzC,MAAM,kBAAkB,GAAG,IAAI,CAAC,KAAK,CACnC,WAAW,CAAC,WAAW,CAAC,8BAA8B,CAAC,CACxD,CAAC;QAEF,MAAM,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,eAAe,CAAC,CAAC,CAAC,OAAO,CAClE,SAAS,CACV,CAAC;QACF,MAAM,CAAC,kBAAkB,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAChE,MAAM,CAAC,kBAAkB,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAClE,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,4DAA4D,EAAE,GAAS,EAAE;QAC1E,IAAI,CAAC,SAAS,CACZ,8BAA8B,EAC9B;;;;EAIJ,CACG,CAAC;QAEF,IAAI,CAAC,SAAS,CACZ,cAAc,EACd;;;;EAIJ,CACG,CAAC;QAEF,MAAM,WAAW,GAAG,MAAM,YAAY,EAAE,CAAC;QAEzC,MAAM,kBAAkB,GAAG,IAAI,CAAC,KAAK,CACnC,WAAW,CAAC,WAAW,CAAC,8BAA8B,CAAC,CACxD,CAAC;QAEF,MAAM,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,eAAe,CAAC,CAAC,CAAC,OAAO,CAClE,SAAS,CAAC,gDAAgD;SAC3D,CAAC;IACJ,CAAC,CAAA,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/schematics/utility/json-file.d.ts

@@ -1,23 +0,0 @@
-/**
- * The contents of this file were copied from '@schematics/angular'.
- * @see https://github.com/angular/angular-cli/blob/master/packages/schematics/angular/utility/json-file.ts
- */
-import { JsonValue } from '@angular-devkit/core';
-import { Tree } from '@angular-devkit/schematics';
-export declare type InsertionIndex = (properties: string[]) => number;
-export declare type JsonPath = (string | number)[];
-/**
- * Handles JSONC files (JSON files that include comments).
- * @internal
- */
-export declare class JsonFile {
-    private readonly host;
-    private readonly path;
-    content: string;
-    private get JsonAst();
-    private _jsonAst;
-    constructor(host: Tree, path: string);
-    get(jsonPath: JsonPath): any;
-    modify(jsonPath: JsonPath, value: JsonValue | undefined, insertInOrder?: InsertionIndex | false): void;
-    remove(jsonPath: JsonPath): void;
-}

package/schematics/utility/json-file.js

@@ -1,74 +0,0 @@
-"use strict";
-/* istanbul ignore file */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.JsonFile = void 0;
-const jsonc_parser_1 = require("jsonc-parser");
-/**
- * Handles JSONC files (JSON files that include comments).
- * @internal
- */
-class JsonFile {
-    constructor(host, path) {
-        this.host = host;
-        this.path = path;
-        const buffer = this.host.read(this.path);
-        if (buffer) {
-            this.content = buffer.toString();
-        }
-        else {
-            throw new Error(`Could not read '${path}'.`);
-        }
-    }
-    get JsonAst() {
-        if (this._jsonAst) {
-            return this._jsonAst;
-        }
-        const errors = [];
-        this._jsonAst = jsonc_parser_1.parseTree(this.content, errors, {
-            allowTrailingComma: true,
-        });
-        if (errors.length) {
-            const { error, offset } = errors[0];
-            throw new Error(`Failed to parse "${this.path}" as JSON AST Object. ${jsonc_parser_1.printParseErrorCode(error)} at location: ${offset}.`);
-        }
-        return this._jsonAst;
-    }
-    get(jsonPath) {
-        const jsonAstNode = this.JsonAst;
-        if (!jsonAstNode) {
-            return undefined;
-        }
-        if (jsonPath.length === 0) {
-            return jsonc_parser_1.getNodeValue(jsonAstNode);
-        }
-        const node = jsonc_parser_1.findNodeAtLocation(jsonAstNode, jsonPath);
-        return node === undefined ? undefined : jsonc_parser_1.getNodeValue(node);
-    }
-    modify(jsonPath, value, insertInOrder) {
-        let getInsertionIndex;
-        if (insertInOrder === undefined) {
-            const property = jsonPath.slice(-1)[0];
-            getInsertionIndex = (properties) => [...properties, property].sort().findIndex((p) => p === property);
-        }
-        else if (insertInOrder !== false) {
-            getInsertionIndex = insertInOrder;
-        }
-        const edits = jsonc_parser_1.modify(this.content, jsonPath, value, {
-            getInsertionIndex,
-            formattingOptions: {
-                insertSpaces: true,
-                tabSize: 2,
-            },
-        });
-        this.content = jsonc_parser_1.applyEdits(this.content, edits);
-        this.host.overwrite(this.path, this.content);
-        this._jsonAst = undefined;
-    }
-    remove(jsonPath) {
-        if (this.get(jsonPath) !== undefined) {
-            this.modify(jsonPath, undefined);
-        }
-    }
-}
-exports.JsonFile = JsonFile;
-//# sourceMappingURL=json-file.js.map

package/schematics/utility/json-file.js.map

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