Merge pull request #280 from angular/master

Pass LLVM linker flags to librustc_llvm build

Author: GulajavaMinistudio

.circleci/config.yml

@@ -28,7 +28,7 @@ anchor_1_win: &defaults_win
   resource_class: windows.medium
   shell: powershell.exe -ExecutionPolicy Bypass
   machine:
-    image: windows-server-2019  
+    image: windows-server-2019
 
 # After checkout, rebase on top of target branch.
 anchor_2: &post_checkout
@@ -37,8 +37,8 @@ anchor_2: &post_checkout
     command: >
       if [[ -n "${CIRCLE_PR_NUMBER}" ]]; then
         # User is required for rebase.
-        git config user.name "angular-ci"	
-        git config user.email "angular-ci"      
+        git config user.name "angular-ci"
+        git config user.email "angular-ci"
         # Rebase PR on top of target branch.
         node tools/rebase-pr.js angular/angular-cli ${CIRCLE_PR_NUMBER}
       else
@@ -67,7 +67,7 @@ anchor_5: &env_win
     name: Setup windows node environment
     command: ./.circleci/windows-env.ps1
 anchor_6: &ignore_pull_requests
-  filters:  
+  filters:
     branches:
       ignore:
         - /pull\/.*/
@@ -200,8 +200,11 @@ jobs:
       - attach_workspace: *attach_options
       - run:
           name: Decrypt Credentials
+          # Note: when changing the image, you might have to re-encrypt the credentials with a 
+          # matching version of openssl.
+          # See https://stackoverflow.com/a/43847627/2116927 for more info.
           command: |
-            openssl aes-256-cbc -d -in .circleci/github_token -k "${KEY}" -out ~/github_token
+            openssl aes-256-cbc -d -in .circleci/github_token -k "${KEY}" -out ~/github_token -md md5
       - run:
           name: Deployment to Snapshot
           command: |
@@ -225,9 +228,9 @@ jobs:
   # Docs: https://github.com/CircleCI-Public/windows-preview-docs
   test-win:
     <<: *defaults_win
-    # Skipping cache and workspace for now because it takes 10x longer than on linux. 
+    # Skipping cache and workspace for now because it takes 10x longer than on linux.
     # TODO: when/if CircleCI makes them faster, use cache and workspaces fully.
-    # Notes: 
+    # Notes:
     # - windows needs its own cache key because binaries in node_modules are different.
     # - windows might need its own workspace for the same reason.
     # - get cache dir on windows via `yarn cache dir` (was `C:\Users\circleci\AppData\Local\Yarn\Cache\v4` last time)
@@ -240,10 +243,10 @@ jobs:
       - run: yarn install --frozen-lockfile
       # Build and test should be on their own jobs, but restoring workspaces is too slow
       # so we do it here.
-      - run: yarn admin -- build  
-      - run: yarn test -- --full        
+      - run: yarn admin -- build
+      - run: yarn test -- --full
       # Run partial e2e suite on PRs only. Master will run the full e2e suite with sharding.
-      - run: if (Test-Path env:CIRCLE_PR_NUMBER) { node tests\legacy-cli\run_e2e.js "--glob=tests/{basic,ivy}/**" }            
+      - run: if (Test-Path env:CIRCLE_PR_NUMBER) { node tests\legacy-cli\run_e2e.js "--glob=tests/{basic,ivy}/**" }
 
   e2e-cli-win:
     <<: *defaults_win
@@ -256,8 +259,8 @@ jobs:
       - run: node --version
       - run: yarn --version
       - run: yarn install --frozen-lockfile
-      - run: yarn admin -- build  
-      - run: node tests\legacy-cli\run_e2e.js --nb-shards=$env:CIRCLE_NODE_TOTAL --shard=$env:CIRCLE_NODE_INDEX             
+      - run: yarn admin -- build
+      - run: node tests\legacy-cli\run_e2e.js --nb-shards=$env:CIRCLE_NODE_TOTAL --shard=$env:CIRCLE_NODE_INDEX
 
 workflows:
   version: 2

package.json

@@ -79,16 +79,16 @@
     "typescript": "3.4.5"
   },
   "devDependencies": {
-    "@angular/compiler": "^8.0.0-beta.14",
-    "@angular/compiler-cli": "^8.0.0-beta.14",
+    "@angular/compiler": "~8.1.0-next.1",
+    "@angular/compiler-cli": "~8.1.0-next.1",
     "@bazel/bazel": "0.24.1",
     "@bazel/buildifier": "^0.22.0",
     "@bazel/jasmine": "~0.26.0",
     "@bazel/karma": "~0.26.0",
     "@bazel/typescript": "~0.26.0",
     "@ngtools/json-schema": "^1.1.0",
     "@types/browserslist": "^4.4.0",
-    "@types/caniuse-api": "^3.0.0",
+    "@types/caniuse-lite": "^1.0.0",
     "@types/copy-webpack-plugin": "^4.4.1",
     "@types/express": "^4.16.0",
     "@types/glob": "^7.0.0",

packages/angular/cli/commands/build-long.md

@@ -1,14 +1,18 @@
-Uses the [webpack](https://webpack.js.org/) build tool, with default configuration options specified in the workspace configuration file (`angular.json`) or with a named alternative configuration. 
-A "production" configuration is created by default when you use the CLI to create the project, and you can use that configuration by specifying the `--prod` option.
+The command can be used to build a project of type "application" or "library".
+When used to build a library, a different builder is invoked, and only the `ts-config`, `configuration`, and `watch` options are applied.
+All other options apply only to building applications.
+
+The application builder uses the [webpack](https://webpack.js.org/) build tool, with default configuration options specified in the workspace configuration file (`angular.json`) or with a named alternative configuration.
+A "production" configuration is created by default when you use the CLI to create the project, and you can use that configuration by specifying the `--configuration="production"` or the `--prod="true"` option.
 
 The configuration options generally correspond to the command options.
-You can override individual configuration defaults by specifying the corresponding options on the command line. 
+You can override individual configuration defaults by specifying the corresponding options on the command line.
 The command can accept option names given in either dash-case or camelCase.
 Note that in the configuration file, you must specify names in camelCase.
 
 Some additional options can only be set through the configuration file,
 either by direct editing or with the `ng config` command.
-These include `assets`, `styles`, and `scripts` objects that provide runtime-global resources to include in the project. 
+These include `assets`, `styles`, and `scripts` objects that provide runtime-global resources to include in the project.
 Resources in CSS, such as images and fonts, are automatically written and fingerprinted at the root of the output folder.
 
 For further details, see [Workspace Configuration](guide/workspace-config).

packages/angular/cli/commands/update-impl.ts

@@ -346,10 +346,24 @@ export class UpdateCommand extends SchematicCommand<UpdateCommandSchema> {
   checkCleanGit() {
     try {
       const result = execSync('git status --porcelain', { encoding: 'utf8', stdio: 'pipe' });
+      if (result.trim().length === 0) {
+        return true;
+      }
 
-      return result.trim().length === 0;
-    } catch {
-      return true;
-    }
+      // Only files inside the workspace root are relevant
+      for (const entry of result.split('\n')) {
+        const relativeEntry = path.relative(
+          path.resolve(this.workspace.root),
+          path.resolve(entry.slice(3).trim()),
+        );
+
+        if (!relativeEntry.startsWith('..') && !path.isAbsolute(relativeEntry)) {
+          return false;
+        }
+      }
+
+    } catch { }
+
+    return true;
   }
 }

packages/angular_devkit/architect/node/node-modules-architect-host.ts

@@ -104,8 +104,11 @@ export class WorkspaceNodeModulesArchitectHost implements ArchitectHost<NodeModu
     if (targetSpec === undefined) {
       return null;
     }
-    if (target.configuration && !targetSpec['configurations']) {
-      throw new Error('Configuration not set in the workspace.');
+    if (
+      target.configuration
+      && !(targetSpec['configurations'] && targetSpec['configurations'][target.configuration])
+    ) {
+      throw new Error(`Configuration '${target.configuration}' is not set in the workspace.`);
     }
 
     return {

packages/angular_devkit/architect/src/architect.ts

@@ -361,7 +361,8 @@ export class Architect {
     options: json.JsonObject,
     scheduleOptions: ScheduleOptions = {},
   ): Promise<BuilderRun> {
-    if (!/^[^:]+:[^:]+$/.test(name)) {
+    // The below will match 'project:target:configuration'
+    if (!/^[^:]+:[^:]+(:[^:]+)?$/.test(name)) {
       throw new Error('Invalid builder name: ' + JSON.stringify(name));
     }
 

packages/angular_devkit/architect/src/index_spec.ts

@@ -106,6 +106,15 @@ describe('architect', () => {
     await run.stop();
   });
 
+  it(`errors when target configuration doesn't exists`, async () => {
+    try {
+      await architect.scheduleBuilder('test:test:invalid', {});
+      throw new Error('should have thrown');
+    } catch (err) {
+      expect(err.message).toContain('Job name "test:test:invalid" does not exist.');
+    }
+  });
+
   it('errors when builder cannot be resolved', async () => {
     try {
       await architect.scheduleBuilder('non:existent', {});

packages/angular_devkit/build_angular/package.json

@@ -14,8 +14,8 @@
     "@ngtools/webpack": "0.0.0",
     "ajv": "6.10.0",
     "autoprefixer": "9.6.0",
-    "browserslist": "4.6.1",
-    "caniuse-api": "3.0.0",
+    "browserslist": "4.6.2",
+    "caniuse-lite": "1.0.30000974",
     "circular-dependency-plugin": "5.0.2",
     "clean-css": "4.2.1",
     "copy-webpack-plugin": "5.0.3",
@@ -57,18 +57,18 @@
     "worker-plugin": "3.1.0"
   },
   "devDependencies": {
-    "@angular/animations": "^8.0.0-beta.14",
-    "@angular/cdk": "^7.3.4",
-    "@angular/common": "^8.0.0-beta.14",
-    "@angular/compiler": "^8.0.0-beta.14",
-    "@angular/compiler-cli": "^8.0.0-beta.14",
-    "@angular/core": "^8.0.0-beta.14",
-    "@angular/material": "^7.3.4",
-    "@angular/platform-browser": "^8.0.0-beta.14",
-    "@angular/platform-browser-dynamic": "^8.0.0-beta.14",
-    "@angular/platform-server": "^8.0.0-beta.14",
-    "@angular/router": "^8.0.0-beta.14",
-    "@angular/service-worker": "^8.0.0-beta.14",
+    "@angular/animations": "~8.1.0-next.1",
+    "@angular/cdk": "^8.0.0",
+    "@angular/common": "~8.1.0-next.1",
+    "@angular/compiler": "~8.1.0-next.1",
+    "@angular/compiler-cli": "~8.1.0-next.1",
+    "@angular/core": "~8.1.0-next.1",
+    "@angular/material": "^8.0.0",
+    "@angular/platform-browser": "~8.1.0-next.1",
+    "@angular/platform-browser-dynamic": "~8.1.0-next.1",
+    "@angular/platform-server": "~8.1.0-next.1",
+    "@angular/router": "~8.1.0-next.1",
+    "@angular/service-worker": "~8.1.0-next.1",
     "codelyzer": "^5.0.0",
     "bootstrap": "^4.0.0",
     "font-awesome": "^4.7.0",

packages/angular_devkit/build_angular/src/angular-cli-files/models/safari-nomodule.js

@@ -1,22 +1,8 @@
-/**
- * Safari 10.1 supports modules, but does not support the `nomodule` attribute - it will
- * load <script nomodule> anyway. This snippet solve this problem, but only for script
- * tags that load external code, e.g.: <script nomodule src="nomodule.js"></script>
- *
- * Again: this will **not** prevent inline script, e.g.:
- * <script nomodule>alert('no modules');</script>.
- *
- * This workaround is possible because Safari supports the non-standard 'beforeload' event.
- * This allows us to trap the module and nomodule load.
- *
- * Note also that `nomodule` is supported in later versions of Safari - it's just 10.1 that
- * omits this attribute.
- */
-(function() {
+(function () {
   var check = document.createElement('script');
   if (!('noModule' in check) && 'onbeforeload' in check) {
     var support = false;
-    document.addEventListener('beforeload', function(e) {
+    document.addEventListener('beforeload', function (e) {
       if (e.target === check) {
         support = true;
       } else if (!e.target.hasAttribute('nomodule') || !support) {
@@ -30,4 +16,4 @@
     document.head.appendChild(check);
     check.remove();
   }
-}());
+}());

packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts

@@ -18,8 +18,8 @@ import {
   debug,
 } from 'webpack';
 import { RawSource } from 'webpack-sources';
-import { AssetPatternClass } from '../../../browser/schema';
-import { isEs5SupportNeeded } from '../../../utils/differential-loading';
+import { AssetPatternClass, ExtraEntryPoint } from '../../../browser/schema';
+import { BuildBrowserFeatures } from '../../../utils/build-browser-features';
 import { BundleBudgetPlugin } from '../../plugins/bundle-budget';
 import { CleanCssWebpackPlugin } from '../../plugins/cleancss-webpack-plugin';
 import { NamedLazyChunksPlugin } from '../../plugins/named-chunks-plugin';
@@ -40,7 +40,7 @@ export const buildOptimizerLoader: string = g['_DevKitIsLocal']
 
 // tslint:disable-next-line:no-big-function
 export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
-  const { root, projectRoot, buildOptions } = wco;
+  const { root, projectRoot, buildOptions, tsConfig } = wco;
   const { styles: stylesOptimization, scripts: scriptsOptimization } = buildOptions.optimization;
   const {
     styles: stylesSourceMap,
@@ -67,25 +67,39 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
   }
 
   if (wco.buildOptions.platform !== 'server') {
-    const es5Polyfills = path.join(__dirname, '..', 'es5-polyfills.js');
-    const es5JitPolyfills = path.join(__dirname, '..', 'es5-jit-polyfills.js');
-    if (targetInFileName) {
-      // For differential loading we don't need to have 2 polyfill bundles
-      if (buildOptions.scriptTargetOverride === ScriptTarget.ES2015) {
-        entryPoints['polyfills'] = [path.join(__dirname, '..', 'safari-nomodule.js')];
-      } else {
-        entryPoints['polyfills'] = [es5Polyfills];
-        if (!buildOptions.aot) {
-          entryPoints['polyfills'].push(es5JitPolyfills);
+    const buildBrowserFeatures = new BuildBrowserFeatures(
+      projectRoot,
+      tsConfig.options.target || ScriptTarget.ES5,
+    );
+    if ((buildOptions.scriptTargetOverride || tsConfig.options.target) === ScriptTarget.ES5) {
+      if (buildOptions.es5BrowserSupport ||
+        (
+          buildOptions.es5BrowserSupport === undefined &&
+          buildBrowserFeatures.isEs5SupportNeeded()
+        )
+      ) {
+        // The nomodule polyfill needs to be inject prior to any script and be
+        // outside of webpack compilation because otherwise webpack will cause the
+        // script to be wrapped in window["webpackJsonp"] which causes this to fail.
+        if (buildBrowserFeatures.isNoModulePolyfillNeeded()) {
+          const noModuleScript: ExtraEntryPoint = {
+            bundleName: 'polyfills-nomodule-es5',
+            input: path.join(__dirname, '..', 'safari-nomodule.js'),
+          };
+          buildOptions.scripts = buildOptions.scripts
+            ? [...buildOptions.scripts, noModuleScript]
+            : [noModuleScript];
         }
-      }
-    } else {
-      // For NON differential loading we want to have 2 polyfill bundles
-      if (buildOptions.es5BrowserSupport
-        || (buildOptions.es5BrowserSupport === undefined && isEs5SupportNeeded(projectRoot))) {
-        entryPoints['polyfills-es5'] = [es5Polyfills];
+
+         // For differential loading we don't need to generate a seperate polyfill file
+        // because they will be loaded exclusivly based on module and nomodule
+        const polyfillsChunkName = buildBrowserFeatures.isDifferentialLoadingNeeded()
+          ? 'polyfills'
+          : 'polyfills-es5';
+
+        entryPoints[polyfillsChunkName] = [path.join(__dirname, '..', 'es5-polyfills.js')];
         if (!buildOptions.aot) {
-          entryPoints['polyfills-es5'].push(es5JitPolyfills);
+          entryPoints[polyfillsChunkName].push(path.join(__dirname, '..', 'es5-jit-polyfills.js'));
         }
       }
     }

packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/utils.ts

@@ -8,16 +8,11 @@
 // tslint:disable
 // TODO: cleanup this file, it's copied as is from Angular CLI.
 
-import * as path from 'path';
 import { basename, normalize } from '@angular-devkit/core';
 import { ExtraEntryPoint, ExtraEntryPointClass } from '../../../browser/schema';
 import { SourceMapDevToolPlugin } from 'webpack';
 import { ScriptTarget } from 'typescript';
 
-export const ngAppResolve = (resolvePath: string): string => {
-  return path.resolve(process.cwd(), resolvePath);
-};
-
 export interface HashFormat {
   chunk: string;
   extract: string;

packages/angular_devkit/build_angular/src/angular-cli-files/utilities/package-chunk-sort.ts

@@ -26,6 +26,7 @@ export function generateEntryPoints(
   };
 
   const entryPoints = [
+    'polyfills-nomodule-es5',
     'polyfills-es5',
     'polyfills',
     'sw-register',

packages/angular_devkit/build_angular/src/browser/index.ts

@@ -57,7 +57,7 @@ import {
   statsWarningsToString,
 } from '../angular-cli-files/utilities/stats';
 import { ExecutionTransformer } from '../transforms';
-import { deleteOutputDir, isEs5SupportNeeded } from '../utils';
+import { BuildBrowserFeatures, deleteOutputDir } from '../utils';
 import { Version } from '../utils/version';
 import { generateBrowserWebpackConfigFromContext } from '../utils/webpack-browser-config';
 import { Schema as BrowserBuilderSchema } from './schema';
@@ -202,9 +202,13 @@ export function buildWebpackBrowser(
       const tsConfigPath = path.resolve(getSystemPath(workspace.root), options.tsConfig);
       const tsConfig = readTsconfig(tsConfigPath);
 
-      if (isEs5SupportNeeded(projectRoot) &&
-          tsConfig.options.target !== ScriptTarget.ES5 &&
-          tsConfig.options.target !== ScriptTarget.ES2015) {
+      const target = tsConfig.options.target || ScriptTarget.ES5;
+      const buildBrowserFeatures = new BuildBrowserFeatures(
+        getSystemPath(projectRoot),
+        target,
+      );
+
+      if (target > ScriptTarget.ES2015 && buildBrowserFeatures.isDifferentialLoadingNeeded()) {
         context.logger.warn(tags.stripIndent`
           WARNING: Using differential loading with targets ES5 and ES2016 or higher may
           cause problems. Browsers with support for ES2015 will load the ES2016+ scripts