.circleci/config.yml

@@ -12,14 +12,10 @@ version: 2.1
 # Variables
 
 ## IMPORTANT
-# If you change the cache key prefix, also sync the fallback_cache_key fallback to match.
-# Keep the static part of the cache key as prefix to enable correct fallbacks.
 # Windows needs its own cache key because binaries in node_modules are different.
 # See https://circleci.com/docs/2.0/caching/#restoring-cache for how prefixes work in CircleCI.
-var_1: &cache_key angular_devkit-0.12.0-{{ checksum "yarn.lock" }}
-var_2: &cache_key_fallback angular_devkit-0.12.0
-var_1_win: &cache_key_win angular_devkit-win-0.12.0-{{ checksum "yarn.lock" }}
-var_2_win: &cache_key_fallback_win angular_devkit-win-0.12.0
+var_1: &cache_key angular_devkit-12.9-{{ checksum "yarn.lock" }}
+var_1_win: &cache_key_win angular_devkit-win-12.9-{{ checksum "yarn.lock" }}
 var_3: &default_nodeversion "12.9"
 # Workspace initially persisted by the `setup` job, and then enhanced by `setup-and-build-win`.
 # https://circleci.com/docs/2.0/workflows/#using-workspaces-to-share-data-among-jobs
@@ -133,7 +129,6 @@ jobs:
       - restore_cache:
           keys:
             - *cache_key
-            - *cache_key_fallback
       - run: yarn install --frozen-lockfile
       - persist_to_workspace:
           root: *workspace_location
@@ -308,7 +303,6 @@ jobs:
       - restore_cache:
           keys:
             - *cache_key_win
-            - *cache_key_fallback_win
       - run: yarn install --frozen-lockfile
       - run: yarn build
       - save_cache:

packages/angular/cli/commands/analytics.json

@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/schema",
   "$id": "ng-cli://commands/analytics.json",
-  "description": "Configures the gathering of Angular CLI usage metrics. See https://v8.angular.io/cli/usage-analytics-gathering.",
+  "description": "Configures the gathering of Angular CLI usage metrics. See https://angular.io/cli/usage-analytics-gathering.",
   "$longDescription": "./analytics-long.md",
 
   "$aliases": [],

packages/angular_devkit/build_angular/src/angular-cli-files/plugins/optimize-css-webpack-plugin.ts

@@ -77,7 +77,10 @@ export class OptimizeCssWebpackPlugin {
           }
 
           const cssNanoOptions: cssNano.CssNanoOptions = {
-            preset: 'default',
+            preset: ['default', {
+              // Disable SVG optimization, as this can cause optimizations which are not compatible in all browsers.
+              svgo: false,
+            }],
           };
 
           const postCssOptions: ProcessOptions = {

packages/angular_devkit/core/src/utils/object.ts

@@ -6,9 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export function mapObject<T, V>(obj: {[k: string]: T},
-                                mapper: (k: string, v: T) => V): {[k: string]: V} {
-  return Object.keys(obj).reduce((acc: {[k: string]: V}, k: string) => {
+export function mapObject<T, V>(obj: { [k: string]: T },
+                                mapper: (k: string, v: T) => V): { [k: string]: V } {
+  return Object.keys(obj).reduce((acc: { [k: string]: V }, k: string) => {
     acc[k] = mapper(k, obj[k]);
 
     return acc;
@@ -19,24 +19,33 @@ export function mapObject<T, V>(obj: {[k: string]: T},
 const copySymbol = Symbol();
 
 // tslint:disable-next-line:no-any
-export function deepCopy<T extends any> (value: T): T {
+export function deepCopy<T extends any>(value: T): T {
   if (Array.isArray(value)) {
-    return value.map((o: T) => deepCopy(o));
+    // tslint:disable-next-line:no-any
+    return value.map((o: any) => deepCopy(o)) as unknown as T;
   } else if (value && typeof value === 'object') {
-    if (value[copySymbol]) {
+    const valueCasted = value as {
+      [copySymbol]?: T,
+      toJSON?: () => string,
+      // tslint:disable-next-line:no-any
+      [key: string]: any,
+    };
+
+    if (valueCasted[copySymbol]) {
       // This is a circular dependency. Just return the cloned value.
-      return value[copySymbol];
+      return valueCasted[copySymbol] as T;
     }
-    if (value['toJSON']) {
-      return JSON.parse((value['toJSON'] as () => string)());
+
+    if (valueCasted['toJSON']) {
+      return JSON.parse(valueCasted['toJSON']());
     }
 
-    const copy = new (Object.getPrototypeOf(value).constructor)();
-    value[copySymbol] = copy;
-    for (const key of Object.getOwnPropertyNames(value)) {
-      copy[key] = deepCopy(value[key]);
+    const copy = new (Object.getPrototypeOf(valueCasted).constructor)();
+    valueCasted[copySymbol] = copy;
+    for (const key of Object.getOwnPropertyNames(valueCasted)) {
+      copy[key] = deepCopy(valueCasted[key]);
     }
-    value[copySymbol] = undefined;
+    valueCasted[copySymbol] = undefined;
 
     return copy;
   } else {

packages/ngtools/webpack/src/compiler_host.ts

@@ -361,7 +361,7 @@ export class WebpackCompilerHost implements ts.CompilerHost {
   getCanonicalFileName(fileName: string): string {
     const path = this.resolve(fileName);
 
-    return this.useCaseSensitiveFileNames ? path : path.toLowerCase();
+    return this.useCaseSensitiveFileNames() ? path : path.toLowerCase();
   }
 
   useCaseSensitiveFileNames(): boolean {

packages/ngtools/webpack/src/transformers/replace_resources.ts

@@ -17,7 +17,7 @@ export function replaceResources(
   return (context: ts.TransformationContext) => {
     const typeChecker = getTypeChecker();
 
-    const visitNode: ts.Visitor = (node: ts.Decorator) => {
+    const visitNode: ts.Visitor = (node: ts.Node) => {
       if (ts.isClassDeclaration(node)) {
         const decorators = ts.visitNodes(
           node.decorators,

packages/schematics/angular/app-shell/app-shell-long.md

@@ -7,7 +7,7 @@ Use this command with a routing app that is accompanied by a Universal server-si
 To create an app shell, use the following command.
 
 <code-example format="." language="bash">
- ng generate app-shell --client-project my-app --universal-project server-app
+ ng generate app-shell my-app
 </code-example>
 
 * `my-app` is the name of your client application
@@ -44,4 +44,4 @@ To verify the that the app has been built with the default shell content:
 
 1. Open `dist/app-shell/index.html` in your browser.
 
-The default text "app-shell works!" verifies that the app-shell route was rendered as part of the output.
+The default text "app-shell works!" verifies that the app-shell route was rendered as part of the output.

packages/schematics/angular/utility/latest-versions.ts

@@ -8,7 +8,7 @@
 
 export const latestVersions = {
   // These versions should be kept up to date with latest Angular peer dependencies.
-  Angular: '~9.1.3',
+  Angular: '~9.1.4',
   RxJs: '~6.5.4',
   ZoneJs: '~0.10.2',
   TypeScript: '~3.8.3',
@@ -18,9 +18,9 @@ export const 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.901.3',
-  DevkitBuildNgPackagr: '~0.901.3',
-  DevkitBuildWebpack: '~0.901.3',
+  DevkitBuildAngular: '~0.901.4',
+  DevkitBuildNgPackagr: '~0.901.4',
+  DevkitBuildWebpack: '~0.901.4',
 
   ngPackagr: '^9.0.0',
 };