Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: angular/angular-cli
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v9.1.11
Choose a base ref
...
head repository: angular/angular-cli
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v9.1.12
Choose a head ref
  • 3 commits
  • 7 files changed
  • 2 contributors

Commits on Jul 15, 2020

  1. test: move app-shell tests to flake jail

    App-shell builder imports zone.js, which patches the global promises. In some cases this will causes flakiness in tests that run after this one.
    
    With this change we move the app-shell tests to the flake jail and force them to be run at the very last.
    
    Successful runs when disabling app-shell tests from test-large
    https://circleci.com/workflow-run/4afb40f2-19ec-46ab-bb94-4153d448e6ad
    
    (cherry picked from commit 7cb470f)
    alan-agius4 authored and clydin committed Jul 15, 2020
    Copy the full SHA
    c7b77c5 View commit details

Commits on Jul 22, 2020

  1. Copy the full SHA
    0c6d05f View commit details
  2. release: v9.1.12

    Keen Yee Liau committed Jul 22, 2020
    Copy the full SHA
    c97528e View commit details
2 changes: 2 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -252,6 +252,8 @@ jobs:
- run: yarn webdriver-update
- run: yarn test-large --full --flakey --ve
- run: yarn test-large --full --flakey
- run: yarn test-large --full --glob packages/angular_devkit/build_angular/test/app-shell/app-shell_spec_large_disabled.ts --ve
- run: yarn test-large --full --glob packages/angular_devkit/build_angular/test/app-shell/app-shell_spec_large_disabled.ts

build-bazel:
executor: action-executor
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -101,7 +101,7 @@
"@types/webpack-dev-server": "^3.1.7",
"@types/webpack-sources": "^0.1.5",
"@yarnpkg/lockfile": "1.1.0",
"ajv": "6.12.0",
"ajv": "6.12.3",
"ansi-colors": "4.1.1",
"common-tags": "^1.8.0",
"conventional-changelog": "^3.0.0",
2 changes: 1 addition & 1 deletion packages/angular_devkit/build_angular/package.json
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@
"@babel/template": "7.8.6",
"@jsdevtools/coverage-istanbul-loader": "3.0.3",
"@ngtools/webpack": "0.0.0",
"ajv": "6.12.0",
"ajv": "6.12.3",
"autoprefixer": "9.7.4",
"babel-loader": "8.0.6",
"browserslist": "^4.9.1",
Original file line number Diff line number Diff line change
@@ -5,12 +5,21 @@
* 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
*/
// tslint:disable-next-line: no-global-tslint-disable
// tslint:disable:no-big-function
import { Architect } from '@angular-devkit/architect/src/architect';
import { getSystemPath, join, normalize, virtualFs } from '@angular-devkit/core';
import * as express from 'express'; // tslint:disable-line:no-implicit-dependencies
import { createArchitect, host } from '../utils';

// This test is excluded by default and will need to be run explicitly.
// This is because App-Shell builder uses zone.js which patched the global Promise
// Currently there is no clean way to unload zone.js which causes tests that run after
// this to be extremly flaky.

// To run this test use:
// yarn test-large --full --glob packages/angular_devkit/build_angular/test/app-shell/app-shell_spec_large_disabled.ts

describe('AppShell Builder', () => {
const target = { project: 'app', target: 'app-shell' };
let architect: Architect;
2 changes: 1 addition & 1 deletion packages/angular_devkit/core/package.json
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@
"core"
],
"dependencies": {
"ajv": "6.12.0",
"ajv": "6.12.3",
"fast-json-stable-stringify": "2.1.0",
"magic-string": "0.25.7",
"rxjs": "6.5.4",
6 changes: 3 additions & 3 deletions packages/schematics/angular/utility/latest-versions.ts
Original file line number Diff line number Diff line change
@@ -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.11',
DevkitBuildNgPackagr: '~0.901.11',
DevkitBuildWebpack: '~0.901.11',
DevkitBuildAngular: '~0.901.12',
DevkitBuildNgPackagr: '~0.901.12',
DevkitBuildWebpack: '~0.901.12',

ngPackagr: '^9.0.0',
};
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
@@ -2003,10 +2003,10 @@ ajv-keywords@^3.1.0, ajv-keywords@^3.4.1:
resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz#ef916e271c64ac12171fd8384eaae6b2345854da"
integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==

ajv@6.12.0:
version "6.12.0"
resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.0.tgz#06d60b96d87b8454a5adaba86e7854da629db4b7"
integrity sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==
ajv@6.12.3:
version "6.12.3"
resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.3.tgz#18c5af38a111ddeb4f2697bd78d68abc1cabd706"
integrity sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==
dependencies:
fast-deep-equal "^3.1.1"
fast-json-stable-stringify "^2.0.0"