@angular/cli 12.1.0-next.6 → 12.1.0

package/commands/e2e-impl.d.ts

@@ -11,6 +11,6 @@ import { Schema as E2eCommandSchema } from './e2e';
 export declare class E2eCommand extends ArchitectCommand<E2eCommandSchema> {
     readonly target = "e2e";
     readonly multiTarget = true;
-    readonly missingTargetError = "\nCannot find \"e2e\" target for the specified project.\n\nYou should add a package that implements end-to-end testing capabilities.\n\nFor example:\n  Cypress: ng add @cypress/schematic\n  WebdriverIO: ng add @wdio/schematics\n\nMore options will be added to the list as they become available.\n";
+    readonly missingTargetError = "\nCannot find \"e2e\" target for the specified project.\n\nYou should add a package that implements end-to-end testing capabilities.\n\nFor example:\n  Cypress: ng add @cypress/schematic\n  Nightwatch: ng add @nightwatch/schematics\n  WebdriverIO: ng add @wdio/schematics\n\nMore options will be added to the list as they become available.\n";
     initialize(options: E2eCommandSchema & Arguments): Promise<number | void>;
 }

package/commands/e2e-impl.js

@@ -21,6 +21,7 @@ You should add a package that implements end-to-end testing capabilities.
 
 For example:
   Cypress: ng add @cypress/schematic
+  Nightwatch: ng add @nightwatch/schematics
   WebdriverIO: ng add @wdio/schematics
 
 More options will be added to the list as they become available.

package/commands/new-impl.js

@@ -9,6 +9,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NewCommand = void 0;
 const schematic_command_1 = require("../models/schematic-command");
+const version_1 = require("../models/version");
 class NewCommand extends schematic_command_1.SchematicCommand {
     constructor() {
         super(...arguments);
@@ -21,8 +22,7 @@ class NewCommand extends schematic_command_1.SchematicCommand {
     }
     async run(options) {
         // Register the version of the CLI in the registry.
-        const packageJson = require('../package.json');
-        const version = packageJson.version;
+        const version = version_1.VERSION.full;
         this._workflow.registry.addSmartDefaultProvider('ng-cli-version', () => version);
         return this.runSchematic({
             collectionName: this.collectionName,

package/commands/update-impl.js

@@ -36,6 +36,7 @@ const semver = __importStar(require("semver"));
 const workspace_schema_1 = require("../lib/config/workspace-schema");
 const command_1 = require("../models/command");
 const schematic_engine_host_1 = require("../models/schematic-engine-host");
+const version_1 = require("../models/version");
 const color_1 = require("../utilities/color");
 const install_package_1 = require("../utilities/install-package");
 const log_file_1 = require("../utilities/log-file");
@@ -653,7 +654,7 @@ class UpdateCommand extends command_1.Command {
      * @returns `true` when the installed version is older.
      */
     async checkCLILatestVersion(verbose = false, next = false) {
-        const { version: installedCLIVersion } = require('../package.json');
+        const installedCLIVersion = version_1.VERSION.full;
         const LatestCLIManifest = await package_metadata_1.fetchPackageManifest(`@angular/cli@${next ? 'next' : 'latest'}`, this.logger, {
             verbose,
             usingYarn: this.packageManager === workspace_schema_1.PackageManager.Yarn,

package/lib/config/schema.json

@@ -844,14 +844,15 @@
           ]
         },
         "style": {
-          "description": "The file extension or preprocessor to use for style files.",
+          "description": "The file extension or preprocessor to use for style files, or 'none' to skip generating the style file.",
           "type": "string",
           "default": "css",
           "enum": [
             "css",
             "scss",
             "sass",
-            "less"
+            "less",
+            "none"
           ],
           "x-user-analytics": 5
         },

package/lib/config/workspace-schema.d.ts

@@ -150,7 +150,7 @@ export interface AngularApplicationOptionsSchema {
     /**
      * The file extension or preprocessor to use for style files.
      */
-    style?: Style;
+    style?: SchematicsAngularApplicationStyle;
     /**
      * The view encapsulation strategy to use in the new app.
      */
@@ -159,7 +159,7 @@ export interface AngularApplicationOptionsSchema {
 /**
  * The file extension or preprocessor to use for style files.
  */
-export declare enum Style {
+export declare enum SchematicsAngularApplicationStyle {
     Css = "css",
     Less = "less",
     Sass = "sass",
@@ -280,9 +280,10 @@ export interface AngularComponentOptionsSchema {
      */
     skipTests?: boolean;
     /**
-     * The file extension or preprocessor to use for style files.
+     * The file extension or preprocessor to use for style files, or 'none' to skip generating
+     * the style file.
      */
-    style?: Style;
+    style?: SchematicsAngularComponentStyle;
     /**
      * Adds a developer-defined type to the filename, in the format "name.type.ts".
      */
@@ -299,6 +300,17 @@ export declare enum ChangeDetection {
     Default = "Default",
     OnPush = "OnPush"
 }
+/**
+ * The file extension or preprocessor to use for style files, or 'none' to skip generating
+ * the style file.
+ */
+export declare enum SchematicsAngularComponentStyle {
+    Css = "css",
+    Less = "less",
+    None = "none",
+    Sass = "sass",
+    Scss = "scss"
+}
 /**
  * Creates a new, generic directive definition in the given or default project.
  */
@@ -596,7 +608,7 @@ export interface AngularNgNewOptionsSchema {
     /**
      * The file extension or preprocessor to use for style files.
      */
-    style?: Style;
+    style?: SchematicsAngularApplicationStyle;
     /**
      * The version of the Angular CLI to use.
      */

package/lib/config/workspace-schema.js

@@ -2,7 +2,7 @@
 // THIS FILE IS AUTOMATICALLY GENERATED. TO UPDATE THIS FILE YOU NEED TO CHANGE THE
 // CORRESPONDING JSON SCHEMA FILE, THEN RUN devkit-admin build (or bazel build ...).
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Implement = exports.ChangeDetection = exports.ViewEncapsulation = exports.Style = exports.PackageManager = void 0;
+exports.Implement = exports.SchematicsAngularComponentStyle = exports.ChangeDetection = exports.ViewEncapsulation = exports.SchematicsAngularApplicationStyle = exports.PackageManager = void 0;
 /**
  * Specify which package manager tool to use.
  *
@@ -18,13 +18,13 @@ var PackageManager;
 /**
  * The file extension or preprocessor to use for style files.
  */
-var Style;
-(function (Style) {
-    Style["Css"] = "css";
-    Style["Less"] = "less";
-    Style["Sass"] = "sass";
-    Style["Scss"] = "scss";
-})(Style = exports.Style || (exports.Style = {}));
+var SchematicsAngularApplicationStyle;
+(function (SchematicsAngularApplicationStyle) {
+    SchematicsAngularApplicationStyle["Css"] = "css";
+    SchematicsAngularApplicationStyle["Less"] = "less";
+    SchematicsAngularApplicationStyle["Sass"] = "sass";
+    SchematicsAngularApplicationStyle["Scss"] = "scss";
+})(SchematicsAngularApplicationStyle = exports.SchematicsAngularApplicationStyle || (exports.SchematicsAngularApplicationStyle = {}));
 /**
  * The view encapsulation strategy to use in the new app.
  *
@@ -46,6 +46,18 @@ var ChangeDetection;
     ChangeDetection["Default"] = "Default";
     ChangeDetection["OnPush"] = "OnPush";
 })(ChangeDetection = exports.ChangeDetection || (exports.ChangeDetection = {}));
+/**
+ * The file extension or preprocessor to use for style files, or 'none' to skip generating
+ * the style file.
+ */
+var SchematicsAngularComponentStyle;
+(function (SchematicsAngularComponentStyle) {
+    SchematicsAngularComponentStyle["Css"] = "css";
+    SchematicsAngularComponentStyle["Less"] = "less";
+    SchematicsAngularComponentStyle["None"] = "none";
+    SchematicsAngularComponentStyle["Sass"] = "sass";
+    SchematicsAngularComponentStyle["Scss"] = "scss";
+})(SchematicsAngularComponentStyle = exports.SchematicsAngularComponentStyle || (exports.SchematicsAngularComponentStyle = {}));
 var Implement;
 (function (Implement) {
     Implement["CanActivate"] = "CanActivate";

package/lib/init.js

@@ -28,35 +28,12 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 require("symbol-observable");
 // symbol polyfill must go first
-const fs = __importStar(require("fs"));
+const fs_1 = require("fs");
 const path = __importStar(require("path"));
 const semver_1 = require("semver");
+const version_1 = require("../models/version");
 const color_1 = require("../utilities/color");
 const config_1 = require("../utilities/config");
-// Check if we need to profile this CLI run.
-if (process.env['NG_CLI_PROFILING']) {
-    let profiler;
-    try {
-        profiler = require('v8-profiler-node8'); // eslint-disable-line import/no-extraneous-dependencies
-    }
-    catch (err) {
-        throw new Error(`Could not require 'v8-profiler-node8'. You must install it separetely with ` +
-            `'npm install v8-profiler-node8 --no-save'.\n\nOriginal error:\n\n${err}`);
-    }
-    profiler.startProfiling();
-    const exitHandler = (options) => {
-        if (options.cleanup) {
-            const cpuProfile = profiler.stopProfiling();
-            fs.writeFileSync(path.resolve(process.cwd(), process.env.NG_CLI_PROFILING || '') + '.cpuprofile', JSON.stringify(cpuProfile));
-        }
-        if (options.exit) {
-            process.exit();
-        }
-    };
-    process.on('exit', () => exitHandler({ cleanup: true }));
-    process.on('SIGINT', () => exitHandler({ exit: true }));
-    process.on('uncaughtException', () => exitHandler({ exit: true }));
-}
 (async () => {
     var _a;
     /**
@@ -83,13 +60,13 @@ if (process.env['NG_CLI_PROFILING']) {
         // version of ng-cli you have installed in a local package.json
         const projectLocalCli = require.resolve('@angular/cli', { paths: [process.cwd()] });
         cli = await Promise.resolve().then(() => __importStar(require(projectLocalCli)));
-        const globalVersion = new semver_1.SemVer(require('../package.json').version);
+        const globalVersion = new semver_1.SemVer(version_1.VERSION.full);
         // Older versions might not have the VERSION export
         let localVersion = (_a = cli.VERSION) === null || _a === void 0 ? void 0 : _a.full;
         if (!localVersion) {
             try {
-                localVersion = require(path.join(path.dirname(projectLocalCli), '../../package.json'))
-                    .version;
+                const localPackageJson = await fs_1.promises.readFile(path.join(path.dirname(projectLocalCli), '../../package.json'), 'utf-8');
+                localVersion = JSON.parse(localPackageJson).version;
             }
             catch (error) {
                 // eslint-disable-next-line  no-console

package/models/analytics.js

@@ -34,6 +34,7 @@ const core_1 = require("@angular-devkit/core");
 const debug_1 = __importDefault(require("debug"));
 const inquirer = __importStar(require("inquirer"));
 const uuid_1 = require("uuid");
+const version_1 = require("../models/version");
 const color_1 = require("../utilities/color");
 const config_1 = require("../utilities/config");
 const tty_1 = require("../utilities/tty");
@@ -48,7 +49,7 @@ exports.AnalyticsProperties = {
         if (_defaultAngularCliPropertyCache) {
             return _defaultAngularCliPropertyCache;
         }
-        const v = require('../package.json').version;
+        const v = version_1.VERSION.full;
         // The logic is if it's a full version then we should use the prod GA property.
         if (/^\d+\.\d+\.\d+$/.test(v) && v !== '0.0.0') {
             _defaultAngularCliPropertyCache = exports.AnalyticsProperties.AngularCliProd;

package/models/schematic-engine-host.js

@@ -6,6 +6,9 @@
  * 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 __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SchematicEngineHost = void 0;
@@ -13,6 +16,7 @@ const schematics_1 = require("@angular-devkit/schematics");
 const tools_1 = require("@angular-devkit/schematics/tools");
 const fs_1 = require("fs");
 const jsonc_parser_1 = require("jsonc-parser");
+const module_1 = __importDefault(require("module"));
 const path_1 = require("path");
 const vm_1 = require("vm");
 /**
@@ -97,8 +101,7 @@ const legacyModules = {
  * @param exportName An optional name of a specific export to return. Otherwise, return all exports.
  */
 function wrap(schematicFile, schematicDirectory, moduleCache, exportName) {
-    const { createRequire } = require('module');
-    const scopedRequire = createRequire(schematicFile);
+    const scopedRequire = module_1.default.createRequire(schematicFile);
     const customRequire = function (id) {
         if (legacyModules[id]) {
             // Provide compatibility modules for older versions of @angular/cdk

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/cli",
-  "version": "12.1.0-next.6",
+  "version": "12.1.0",
   "description": "CLI tool for Angular",
   "main": "lib/cli/index.js",
   "bin": {
@@ -28,10 +28,10 @@
   },
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
-    "@angular-devkit/architect": "0.1201.0-next.6",
-    "@angular-devkit/core": "12.1.0-next.6",
-    "@angular-devkit/schematics": "12.1.0-next.6",
-    "@schematics/angular": "12.1.0-next.6",
+    "@angular-devkit/architect": "0.1201.0",
+    "@angular-devkit/core": "12.1.0",
+    "@angular-devkit/schematics": "12.1.0",
+    "@schematics/angular": "12.1.0",
     "@yarnpkg/lockfile": "1.1.0",
     "ansi-colors": "4.1.1",
     "debug": "4.3.1",
@@ -40,7 +40,7 @@
     "jsonc-parser": "3.0.0",
     "npm-package-arg": "8.1.5",
     "npm-pick-manifest": "6.1.1",
-    "open": "8.2.0",
+    "open": "8.2.1",
     "ora": "5.4.1",
     "pacote": "11.3.4",
     "resolve": "1.20.0",
@@ -51,12 +51,12 @@
   "ng-update": {
     "migrations": "@schematics/angular/migrations/migration-collection.json",
     "packageGroup": {
-      "@angular/cli": "12.1.0-next.6",
-      "@angular-devkit/architect": "0.1201.0-next.6",
-      "@angular-devkit/build-angular": "12.1.0-next.6",
-      "@angular-devkit/build-webpack": "0.1201.0-next.6",
-      "@angular-devkit/core": "12.1.0-next.6",
-      "@angular-devkit/schematics": "12.1.0-next.6"
+      "@angular/cli": "12.1.0",
+      "@angular-devkit/architect": "0.1201.0",
+      "@angular-devkit/build-angular": "12.1.0",
+      "@angular-devkit/build-webpack": "0.1201.0",
+      "@angular-devkit/core": "12.1.0",
+      "@angular-devkit/schematics": "12.1.0"
     }
   },
   "engines": {