@schematics/angular 12.1.0-next.3 → 12.1.0

package/universal/index.js

@@ -6,11 +6,30 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
 const tasks_1 = require("@angular-devkit/schematics/tasks");
-const ts = require("../third_party/github.com/Microsoft/TypeScript/lib/typescript");
+const ts = __importStar(require("../third_party/github.com/Microsoft/TypeScript/lib/typescript"));
 const ast_utils_1 = require("../utility/ast-utils");
 const change_1 = require("../utility/change");
 const dependencies_1 = require("../utility/dependencies");

package/utility/ast-utils.js

@@ -6,10 +6,29 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addRouteDeclarationToModule = exports.getRouterModuleDeclaration = exports.getEnvironmentExportName = exports.isImported = exports.addBootstrapToModule = exports.addExportToModule = exports.addProviderToModule = exports.addImportToModule = exports.addDeclarationToModule = exports.addSymbolToNgModuleMetadata = exports.getMetadataField = exports.getDecoratorMetadata = exports.insertAfterLastOccurrence = exports.findNode = exports.getSourceNodes = exports.findNodes = exports.insertImport = void 0;
 const core_1 = require("@angular-devkit/core");
-const ts = require("../third_party/github.com/Microsoft/TypeScript/lib/typescript");
+const ts = __importStar(require("../third_party/github.com/Microsoft/TypeScript/lib/typescript"));
 const change_1 = require("./change");
 /**
  * Add Import `import { symbolName } from fileName` if the import doesn't exit

package/utility/latest-versions.js

@@ -10,14 +10,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.latestVersions = void 0;
 exports.latestVersions = {
     // These versions should be kept up to date with latest Angular peer dependencies.
-    Angular: '~12.1.0-next.3',
+    Angular: '~12.1.0',
     RxJs: '~6.6.0',
     ZoneJs: '~0.11.4',
-    TypeScript: '~4.2.3',
-    TsLib: '^2.1.0',
+    TypeScript: '~4.3.2',
+    TsLib: '^2.2.0',
     // Since @angular-devkit/build-angular and @schematics/angular are always
     // published together from the same monorepo, and they are both
     // non-experimental, they will always have the same version.
     DevkitBuildAngular: '~' + require('../package.json')['version'],
-    ngPackagr: '^12.0.0-next.8',
+    ngPackagr: '^12.1.0-next.0',
 };

package/utility/ng-ast-utils.js

@@ -6,12 +6,31 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAppModulePath = exports.findBootstrapModulePath = exports.findBootstrapModuleCall = void 0;
 const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
 const path_1 = require("path");
-const ts = require("../third_party/github.com/Microsoft/TypeScript/lib/typescript");
+const ts = __importStar(require("../third_party/github.com/Microsoft/TypeScript/lib/typescript"));
 const ast_utils_1 = require("../utility/ast-utils");
 function findBootstrapModuleCall(host, mainPath) {
     const mainBuffer = host.read(mainPath);

package/utility/workspace.js

@@ -68,7 +68,7 @@ async function createDefaultPath(tree, projectName) {
     const workspace = await getWorkspace(tree);
     const project = workspace.projects.get(projectName);
     if (!project) {
-        throw new Error('Specified project does not exist.');
+        throw new Error(`Project "${projectName}" does not exist.`);
     }
     return buildDefaultPath(project);
 }

package/web-worker/index.js

@@ -9,34 +9,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
-const json_file_1 = require("../utility/json-file");
 const parse_name_1 = require("../utility/parse-name");
 const paths_1 = require("../utility/paths");
 const workspace_1 = require("../utility/workspace");
-function addConfig(options, root, tsConfigPath) {
-    return (host, context) => {
-        context.logger.debug('updating project configuration.');
-        // Add worker glob exclusion to tsconfig.app.json.
-        // Projects pre version 8 should to have tsconfig.app.json inside their application
-        const isInSrc = core_1.dirname(core_1.normalize(tsConfigPath)).endsWith('src');
-        const workerGlob = `${isInSrc ? '' : 'src/'}**/*.worker.ts`;
-        try {
-            const json = new json_file_1.JSONFile(host, tsConfigPath);
-            const exclude = json.get(['exclude']);
-            if (exclude && Array.isArray(exclude) && !exclude.includes(workerGlob)) {
-                json.modify(['exclude'], [...exclude, workerGlob]);
-            }
-        }
-        catch { }
-        return schematics_1.mergeWith(schematics_1.apply(schematics_1.url('./files/worker-tsconfig'), [
-            schematics_1.applyTemplates({
-                ...options,
-                relativePathToWorkspaceRoot: paths_1.relativePathToWorkspaceRoot(root),
-            }),
-            schematics_1.move(root),
-        ]));
-    };
-}
 function addSnippet(options) {
     return (host, context) => {
         context.logger.debug('Updating appmodule');
@@ -82,9 +57,6 @@ function default_1(options) {
         if (!options.project) {
             throw new schematics_1.SchematicsException('Option "project" is required.');
         }
-        if (!options.target) {
-            throw new schematics_1.SchematicsException('Option "target" is required.');
-        }
         const project = workspace.projects.get(options.project);
         if (!project) {
             throw new schematics_1.SchematicsException(`Invalid project name (${options.project})`);
@@ -93,36 +65,47 @@ function default_1(options) {
         if (projectType !== 'application') {
             throw new schematics_1.SchematicsException(`Web Worker requires a project type of "application".`);
         }
-        const projectTarget = project.targets.get(options.target);
-        if (!projectTarget) {
-            throw new Error(`Target is not defined for this project.`);
-        }
-        const projectTargetOptions = (projectTarget.options ||
-            {});
         if (options.path === undefined) {
             options.path = workspace_1.buildDefaultPath(project);
         }
         const parsedPath = parse_name_1.parseName(options.path, options.name);
         options.name = parsedPath.name;
         options.path = parsedPath.path;
-        const root = project.root || '';
-        const needWebWorkerConfig = !projectTargetOptions.webWorkerTsConfig;
-        if (needWebWorkerConfig) {
-            const workerConfigPath = core_1.join(core_1.normalize(root), 'tsconfig.worker.json');
-            projectTargetOptions.webWorkerTsConfig = workerConfigPath;
-        }
-        const templateSource = schematics_1.apply(schematics_1.url('./files/worker'), [
+        const templateSourceWorkerCode = schematics_1.apply(schematics_1.url('./files/worker'), [
             schematics_1.applyTemplates({ ...options, ...core_1.strings }),
             schematics_1.move(parsedPath.path),
         ]);
+        const root = project.root || '';
+        const templateSourceWorkerConfig = schematics_1.apply(schematics_1.url('./files/worker-tsconfig'), [
+            schematics_1.applyTemplates({
+                ...options,
+                relativePathToWorkspaceRoot: paths_1.relativePathToWorkspaceRoot(root),
+            }),
+            schematics_1.move(root),
+        ]);
         return schematics_1.chain([
             // Add project configuration.
-            needWebWorkerConfig ? addConfig(options, root, projectTargetOptions.tsConfig) : schematics_1.noop(),
-            needWebWorkerConfig ? workspace_1.updateWorkspace(workspace) : schematics_1.noop(),
+            workspace_1.updateWorkspace((workspace) => {
+                var _a, _b, _c, _d;
+                var _e, _f;
+                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                const project = workspace.projects.get(options.project);
+                const buildTarget = project.targets.get('build');
+                const testTarget = project.targets.get('test');
+                if (!buildTarget) {
+                    throw new Error(`Build target is not defined for this project.`);
+                }
+                const workerConfigPath = core_1.join(core_1.normalize(root), 'tsconfig.worker.json');
+                (_b = (_e = ((_a = buildTarget.options) !== null && _a !== void 0 ? _a : (buildTarget.options = {}))).webWorkerTsConfig) !== null && _b !== void 0 ? _b : (_e.webWorkerTsConfig = workerConfigPath);
+                if (testTarget) {
+                    (_d = (_f = ((_c = testTarget.options) !== null && _c !== void 0 ? _c : (testTarget.options = {}))).webWorkerTsConfig) !== null && _d !== void 0 ? _d : (_f.webWorkerTsConfig = workerConfigPath);
+                }
+            }),
             // Create the worker in a sibling module.
             options.snippet ? addSnippet(options) : schematics_1.noop(),
             // Add the worker.
-            schematics_1.mergeWith(templateSource),
+            schematics_1.mergeWith(templateSourceWorkerCode),
+            schematics_1.mergeWith(templateSourceWorkerConfig),
         ]);
     };
 }

package/web-worker/schema.d.ts

@@ -20,6 +20,7 @@ export interface Schema {
     snippet?: boolean;
     /**
      * The target to apply web worker to.
+     * @deprecated No longer has an effect.
      */
     target?: string;
 }

package/web-worker/schema.json

@@ -22,7 +22,8 @@
     "target": {
       "type": "string",
       "description": "The target to apply web worker to.",
-      "default": "build"
+      "default": "build",
+      "x-deprecated": "No longer has an effect."
     },
     "name": {
       "type": "string",