Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(@angular-devkit/build-angular): replace istanbul-instrumenter-loa… #16609

Merged
merged 2 commits into from
Jan 9, 2020
Merged

fix(@angular-devkit/build-angular): replace istanbul-instrumenter-loa… #16609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98e244b
fix(@angular-devkit/build-angular): replace istanbul-instrumenter-loa…
alan-agius4 Jan 9, 2020
af0e02c
ci: use windows-server-2019-vs2019:stable
alan-agius4 Jan 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,9 @@ executors:
resource_class: windows.medium
shell: powershell.exe -ExecutionPolicy Bypass
machine:
image: windows-server-2019
# Contents of this image:
# https://circleci.com/docs/2.0/hello-world-windows/#software-pre-installed-in-the-windows-image
image: windows-server-2019-vs2019:stable

# Command Definitions
# https://circleci.com/docs/2.0/reusing-config/#authoring-reusable-commands
Expand All @@ -72,11 +74,10 @@ commands:
- attach_workspace:
at: *workspace_location
setup_windows:
steps:
- run:
# Need to install node and yarn before to ensure correct versions.
name: Setup windows node environment
command: ./.circleci/windows-env.ps1
steps:
- run: nvm install 12.1.0
- run: nvm use 12.1.0
- run: npm install -g [email protected]
- run: node --version
- run: yarn --version

Expand Down
9 changes: 0 additions & 9 deletions .circleci/windows-env.ps1
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion packages/angular_devkit/build_angular/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@
"caniuse-lite": "1.0.30001019",
"circular-dependency-plugin": "5.2.0",
"clean-css": "4.2.1",
"coverage-istanbul-loader": "2.0.3",
"copy-webpack-plugin": "5.1.1",
"core-js": "3.2.1",
"file-loader": "4.2.0",
"find-cache-dir": "3.0.0",
"glob": "7.1.4",
"istanbul-instrumenter-loader": "3.0.1",
"jest-worker": "24.9.0",
"karma-source-map-support": "1.4.0",
"less": "3.9.0",
Expand Down
5 changes: 2 additions & 3 deletions packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ export function getTestConfig(
const extraRules: webpack.Rule[] = [];
const extraPlugins: webpack.Plugin[] = [];

// if (buildOptions.codeCoverage && CliConfig.fromProject()) {
if (buildOptions.codeCoverage) {
const codeCoverageExclude = buildOptions.codeCoverageExclude;
const exclude: (string | RegExp)[] = [
Expand All @@ -47,8 +46,8 @@ export function getTestConfig(
}

extraRules.push({
test: /\.(js|ts)$/,
loader: 'istanbul-instrumenter-loader',
test: /\.(jsx?|tsx?)$/,
loader: require.resolve('coverage-istanbul-loader'),
options: { esModules: true },
enforce: 'post',
exclude,
Expand Down
Loading