@schematics/angular 11.1.0-next.3 → 11.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@schematics/angular",
-  "version": "11.1.0-next.3",
+  "version": "11.1.1",
   "description": "Schematics specific to Angular",
   "keywords": [
     "angular",
@@ -14,8 +14,8 @@
   ],
   "schematics": "./collection.json",
   "dependencies": {
-    "@angular-devkit/core": "11.1.0-next.3",
-    "@angular-devkit/schematics": "11.1.0-next.3",
+    "@angular-devkit/core": "11.1.1",
+    "@angular-devkit/schematics": "11.1.1",
     "jsonc-parser": "3.0.0"
   },
   "repository": {

package/utility/ast-utils.d.ts

@@ -58,15 +58,7 @@ export declare function findNode(node: ts.Node, kind: ts.SyntaxKind, text: strin
  * @throw Error if toInsert is first occurence but fall back is not set
  */
 export declare function insertAfterLastOccurrence(nodes: ts.Node[], toInsert: string, file: string, fallbackPos: number, syntaxKind?: ts.SyntaxKind): Change;
-export declare function getContentOfKeyLiteral(_source: ts.SourceFile, node: ts.Node): string | null;
 export declare function getDecoratorMetadata(source: ts.SourceFile, identifier: string, module: string): ts.Node[];
-/**
- * Given a source file with @NgModule class(es), find the name of the first @NgModule class.
- *
- * @param source source file containing one or more @NgModule
- * @returns the name of the first @NgModule, or `undefined` if none is found
- */
-export declare function getFirstNgModuleName(source: ts.SourceFile): string | undefined;
 export declare function getMetadataField(node: ts.ObjectLiteralExpression, metadataField: string): ts.ObjectLiteralElement[];
 export declare function addSymbolToNgModuleMetadata(source: ts.SourceFile, ngModulePath: string, metadataField: string, symbolName: string, importPath?: string | null): Change[];
 /**

package/utility/ast-utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addRouteDeclarationToModule = exports.getRouterModuleDeclaration = exports.getEnvironmentExportName = exports.isImported = exports.addEntryComponentToModule = exports.addBootstrapToModule = exports.addExportToModule = exports.addProviderToModule = exports.addImportToModule = exports.addDeclarationToModule = exports.addSymbolToNgModuleMetadata = exports.getMetadataField = exports.getFirstNgModuleName = exports.getDecoratorMetadata = exports.getContentOfKeyLiteral = exports.insertAfterLastOccurrence = exports.findNode = exports.getSourceNodes = exports.findNodes = exports.insertImport = void 0;
+exports.addRouteDeclarationToModule = exports.getRouterModuleDeclaration = exports.getEnvironmentExportName = exports.isImported = exports.addEntryComponentToModule = 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;
 /**
  * @license
  * Copyright Google Inc. All Rights Reserved.
@@ -167,18 +167,6 @@ function insertAfterLastOccurrence(nodes, toInsert, file, fallbackPos, syntaxKin
     return new change_1.InsertChange(file, lastItemPosition, toInsert);
 }
 exports.insertAfterLastOccurrence = insertAfterLastOccurrence;
-function getContentOfKeyLiteral(_source, node) {
-    if (node.kind == ts.SyntaxKind.Identifier) {
-        return node.text;
-    }
-    else if (node.kind == ts.SyntaxKind.StringLiteral) {
-        return node.text;
-    }
-    else {
-        return null;
-    }
-}
-exports.getContentOfKeyLiteral = getContentOfKeyLiteral;
 function _angularImportsFromNode(node, _sourceFile) {
     const ms = node.moduleSpecifier;
     let modulePath;
@@ -261,42 +249,13 @@ function getDecoratorMetadata(source, identifier, module) {
         .map(expr => expr.arguments[0]);
 }
 exports.getDecoratorMetadata = getDecoratorMetadata;
-function findClassDeclarationParent(node) {
-    if (ts.isClassDeclaration(node)) {
-        return node;
-    }
-    return node.parent && findClassDeclarationParent(node.parent);
-}
-/**
- * Given a source file with @NgModule class(es), find the name of the first @NgModule class.
- *
- * @param source source file containing one or more @NgModule
- * @returns the name of the first @NgModule, or `undefined` if none is found
- */
-function getFirstNgModuleName(source) {
-    // First, find the @NgModule decorators.
-    const ngModulesMetadata = getDecoratorMetadata(source, 'NgModule', '@angular/core');
-    if (ngModulesMetadata.length === 0) {
-        return undefined;
-    }
-    // Then walk parent pointers up the AST, looking for the ClassDeclaration parent of the NgModule
-    // metadata.
-    const moduleClass = findClassDeclarationParent(ngModulesMetadata[0]);
-    if (!moduleClass || !moduleClass.name) {
-        return undefined;
-    }
-    // Get the class name of the module ClassDeclaration.
-    return moduleClass.name.text;
-}
-exports.getFirstNgModuleName = getFirstNgModuleName;
 function getMetadataField(node, metadataField) {
     return node.properties
         .filter(ts.isPropertyAssignment)
         // Filter out every fields that's not "metadataField". Also handles string literals
         // (but not expressions).
         .filter(({ name }) => {
-        return (ts.isIdentifier(name) || ts.isStringLiteral(name))
-            && name.getText() === metadataField;
+        return (ts.isIdentifier(name) || ts.isStringLiteral(name)) && name.text === metadataField;
     });
 }
 exports.getMetadataField = getMetadataField;

package/utility/latest-versions.js

@@ -10,7 +10,7 @@ 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: '~11.1.0-next.3',
+    Angular: '~11.1.0',
     RxJs: '~6.6.0',
     ZoneJs: '~0.11.3',
     TypeScript: '~4.1.2',
@@ -19,8 +19,8 @@ exports.latestVersions = {
     // For our e2e tests, these versions must match the latest tag present on the branch.
     // During RC periods they will not match the latest RC until there's a new git tag, and
     // should not be updated.
-    DevkitBuildAngular: '~0.1101.0-next.3',
-    DevkitBuildNgPackagr: '~0.1101.0-next.3',
-    DevkitBuildWebpack: '~0.1101.0-next.3',
+    DevkitBuildAngular: '~0.1101.1',
+    DevkitBuildNgPackagr: '~0.1101.1',
+    DevkitBuildWebpack: '~0.1101.1',
     ngPackagr: '^11.0.0',
 };

package/workspace/files/package.json.template

@@ -4,9 +4,9 @@
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
-    "build": "ng build",
+    "build": "ng build"<% if (!minimal) { %>,
     "test": "ng test",
-    "lint": "ng lint"
+    "lint": "ng lint"<% } %>
   },
   "private": true,
   "dependencies": {
@@ -35,9 +35,9 @@
     "karma-coverage": "~2.0.3",
     "karma-jasmine": "~4.0.0",
     "karma-jasmine-html-reporter": "^1.5.0",
-    "protractor": "~7.0.0",<% } %>
+    "protractor": "~7.0.0",
     "ts-node": "~8.3.0",
-    "tslint": "~6.1.0",
+    "tslint": "~6.1.0",<% } %>
     "typescript": "<%= latestVersions.TypeScript %>"
   }
 }