@angular-devkit/schematics 12.1.0-next.3 → 12.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular-devkit/schematics",
-  "version": "12.1.0-next.3",
+  "version": "12.1.0",
   "description": "Angular Schematics - Library",
   "main": "src/index.js",
   "typings": "src/index.d.ts",
@@ -18,8 +18,8 @@
     "schematics"
   ],
   "dependencies": {
-    "@angular-devkit/core": "12.1.0-next.3",
-    "ora": "5.4.0",
+    "@angular-devkit/core": "12.1.0",
+    "ora": "5.4.1",
     "rxjs": "6.6.7"
   },
   "repository": {
@@ -27,7 +27,7 @@
     "url": "https://github.com/angular/angular-cli.git"
   },
   "engines": {
-    "node": "^12.14.1 || ^14.0.0",
+    "node": "^12.14.1 || >=14.0.0",
     "npm": "^6.11.0 || ^7.5.6",
     "yarn": ">= 1.13.0"
   },

package/src/index.js

@@ -13,16 +13,28 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     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;
+};
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Tree = exports.workflow = exports.formats = exports.SchematicsException = void 0;
-const formats = require("./formats/index");
+const formats = __importStar(require("./formats/index"));
 exports.formats = formats;
 const interface_1 = require("./tree/interface");
 const static_1 = require("./tree/static");
-const workflow = require("./workflow/index");
+const workflow = __importStar(require("./workflow/index"));
 exports.workflow = workflow;
 var exception_1 = require("./exception/exception");
 Object.defineProperty(exports, "SchematicsException", { enumerable: true, get: function () { return exception_1.SchematicsException; } });

package/src/sink/host.js

@@ -29,15 +29,18 @@ class HostSink extends sink_1.SimpleSinkBase {
         if (this._filesToCreate.has(p) || this._filesToUpdate.has(p)) {
             return rxjs_1.of(true);
         }
-        else if (this._filesToDelete.has(p)) {
+        if (this._filesToDelete.has(p)) {
             return rxjs_1.of(false);
         }
-        else if ([...this._filesToRename.values()].some(([from]) => from == p)) {
-            return rxjs_1.of(false);
-        }
-        else {
-            return this._host.exists(p);
+        for (const [from, to] of this._filesToRename.values()) {
+            switch (p) {
+                case from:
+                    return rxjs_1.of(false);
+                case to:
+                    return rxjs_1.of(true);
+            }
         }
+        return this._host.exists(p);
     }
     _overwriteFile(path, content) {
         this._filesToUpdate.set(path, new update_buffer_1.UpdateBuffer(content));

package/tasks/node/index.js

@@ -6,6 +6,25 @@
  * 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.BuiltinTaskExecutor = void 0;
 const options_1 = require("../package-manager/options");
@@ -17,18 +36,18 @@ class BuiltinTaskExecutor {
 exports.BuiltinTaskExecutor = BuiltinTaskExecutor;
 BuiltinTaskExecutor.NodePackage = {
     name: options_1.NodePackageName,
-    create: (options) => Promise.resolve().then(() => require('../package-manager/executor')).then((mod) => mod.default(options)),
+    create: (options) => Promise.resolve().then(() => __importStar(require('../package-manager/executor'))).then((mod) => mod.default(options)),
 };
 BuiltinTaskExecutor.RepositoryInitializer = {
     name: options_2.RepositoryInitializerName,
-    create: (options) => Promise.resolve().then(() => require('../repo-init/executor')).then((mod) => mod.default(options)),
+    create: (options) => Promise.resolve().then(() => __importStar(require('../repo-init/executor'))).then((mod) => mod.default(options)),
 };
 BuiltinTaskExecutor.RunSchematic = {
     name: options_3.RunSchematicName,
-    create: () => Promise.resolve().then(() => require('../run-schematic/executor')).then((mod) => mod.default()),
+    create: () => Promise.resolve().then(() => __importStar(require('../run-schematic/executor'))).then((mod) => mod.default()),
 };
 /** @deprecated since version 11. Use `ng lint --fix` directly instead. */
 BuiltinTaskExecutor.TslintFix = {
     name: options_4.TslintFixName,
-    create: () => Promise.resolve().then(() => require('../tslint-fix/executor')).then((mod) => mod.default()),
+    create: () => Promise.resolve().then(() => __importStar(require('../tslint-fix/executor'))).then((mod) => mod.default()),
 };

package/tasks/package-manager/executor.js

@@ -6,12 +6,34 @@
  * 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;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UnknownPackageManagerException = void 0;
 const core_1 = require("@angular-devkit/core");
 const child_process_1 = require("child_process");
-const ora = require("ora");
-const path = require("path");
+const ora_1 = __importDefault(require("ora"));
+const path = __importStar(require("path"));
 const rxjs_1 = require("rxjs");
 const src_1 = require("../../src");
 const packageManagers = {
@@ -92,7 +114,7 @@ function default_1(factoryOptions = {}) {
         }
         return new rxjs_1.Observable((obs) => {
             var _a, _b;
-            const spinner = ora({
+            const spinner = ora_1.default({
                 text: `Installing packages (${taskPackageManagerName})...`,
                 // Workaround for https://github.com/sindresorhus/ora/issues/136.
                 discardStdin: process.platform != 'win32',

package/tasks/repo-init/executor.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 });
 const core_1 = require("@angular-devkit/core");
 const child_process_1 = require("child_process");
-const path = require("path");
+const path = __importStar(require("path"));
 function default_1(factoryOptions = {}) {
     const rootDirectory = factoryOptions.rootDirectory || process.cwd();
     return async (options = {}, context) => {

package/tasks/tslint-fix/executor.js

@@ -6,9 +6,28 @@
  * 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 fs = require("fs");
-const path = require("path");
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
 function _loadConfiguration(Configuration, options, root, file) {
     if (options.tslintConfig) {
         return Configuration.parseConfigFile(options.tslintConfig, root);
@@ -64,7 +83,7 @@ function _listAllFiles(root) {
 function default_1() {
     return async (options = {}, context) => {
         const root = process.cwd();
-        const tslint = await Promise.resolve().then(() => require('tslint')); // eslint-disable-line import/no-extraneous-dependencies
+        const tslint = await Promise.resolve().then(() => __importStar(require('tslint'))); // eslint-disable-line import/no-extraneous-dependencies
         const includes = Array.isArray(options.includes)
             ? options.includes
             : options.includes

package/tasks/tslint-fix/test/custom-rule.js

@@ -6,9 +6,28 @@
  * 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 tasks_1 = require("@angular-devkit/schematics/tasks"); // eslint-disable-line import/no-extraneous-dependencies
-const path = require("path");
+const path = __importStar(require("path"));
 function default_1(options) {
     return (_, context) => {
         context.addTask(new tasks_1.TslintFixTask({

package/tools/file-system-engine-host.js

@@ -6,6 +6,25 @@
  * 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.FileSystemEngineHost = void 0;
 const fs_1 = require("fs");
@@ -83,7 +102,8 @@ class FileSystemEngineHost extends file_system_engine_host_base_1.FileSystemEngi
         if (!super.hasTaskExecutor(name)) {
             try {
                 const path = require.resolve(path_1.join(this._root, name));
-                return rxjs_1.from(Promise.resolve().then(() => require(path)).then((mod) => mod.default())).pipe(operators_1.catchError(() => rxjs_1.throwError(new src_1.UnregisteredTaskException(name))));
+                // Default handling code is for old tasks that incorrectly export `default` with non-ESM module
+                return rxjs_1.from(Promise.resolve().then(() => __importStar(require(path))).then((mod) => { var _a; return (((_a = mod.default) === null || _a === void 0 ? void 0 : _a.default) || mod.default)(); })).pipe(operators_1.catchError(() => rxjs_1.throwError(new src_1.UnregisteredTaskException(name))));
             }
             catch { }
         }