From 857c995627fb00d64a5395cb40ec5692a6eb7b94 Mon Sep 17 00:00:00 2001 From: Alan Agius Date: Fri, 21 Feb 2020 11:30:17 +0100 Subject: [PATCH] build: update tslib to 1.11.0 Spec helper change is related to https://github.com/microsoft/tslib/pull/90 --- packages/angular_devkit/build_angular/package.json | 2 +- .../ngtools/webpack/src/transformers/spec_helpers.ts | 5 +++-- yarn.lock | 9 ++++++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json index 2ba7511c942c..a5ce41158b5e 100644 --- a/packages/angular_devkit/build_angular/package.json +++ b/packages/angular_devkit/build_angular/package.json @@ -96,7 +96,7 @@ "karma-jasmine-html-reporter": "^1.4.0", "popper.js": "^1.14.1", "protractor": "~5.4.0", - "tslib": "~1.10.0", + "tslib": "~1.11.0", "zone.js": "^0.10.0" }, "peerDependencies": { diff --git a/packages/ngtools/webpack/src/transformers/spec_helpers.ts b/packages/ngtools/webpack/src/transformers/spec_helpers.ts index 5a4cafdd0f02..c2c3ba06c852 100644 --- a/packages/ngtools/webpack/src/transformers/spec_helpers.ts +++ b/packages/ngtools/webpack/src/transformers/spec_helpers.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ import { virtualFs } from '@angular-devkit/core'; -import { readFileSync, readdirSync } from 'fs'; +import { readFileSync, readdirSync, statSync } from 'fs'; import { dirname, join } from 'path'; import * as ts from 'typescript'; import { WebpackCompilerHost } from '../compiler_host'; @@ -126,7 +126,8 @@ function loadTypeScriptLibFiles(): Record { function loadTsLibFiles(): Record { const libFolderPath = dirname(require.resolve('tslib/package.json')); - const libFolderFiles = readdirSync(libFolderPath); + const libFolderFiles = readdirSync(libFolderPath) + .filter(p => statSync(join(libFolderPath, p)).isFile()); // Return a map of the lib names to their content. const libs: Record = {}; diff --git a/yarn.lock b/yarn.lock index 866db4917d97..67a516bf2eb9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5073,7 +5073,6 @@ fsevents@^1.2.7: dependencies: bindings "^1.5.0" nan "^2.12.1" - node-pre-gyp "*" fsevents@~2.1.2: version "2.1.2" @@ -10059,7 +10058,6 @@ sass@1.25.0, sass@^1.23.0: "sauce-connect-proxy@https://saucelabs.com/downloads/sc-4.5.4-linux.tar.gz": version "0.0.0" - uid dc5efcd2be24ddb099a85b923d6e754754651fa8 resolved "https://saucelabs.com/downloads/sc-4.5.4-linux.tar.gz#dc5efcd2be24ddb099a85b923d6e754754651fa8" saucelabs@^1.5.0: @@ -11333,11 +11331,16 @@ ts-node@^5.0.0: source-map-support "^0.5.3" yn "^2.0.0" -tslib@1.10.0, tslib@^1.10.0, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0, tslib@~1.10.0: +tslib@1.10.0, tslib@^1.10.0, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0: version "1.10.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a" integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ== +tslib@~1.11.0: + version "1.11.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.0.tgz#f1f3528301621a53220d58373ae510ff747a66bc" + integrity sha512-BmndXUtiTn/VDDrJzQE7Mm22Ix3PxgLltW9bSNLoeCY31gnG2OPx0QqJnuc9oMIKioYrz487i6K9o4Pdn0j+Kg== + tslint-no-circular-imports@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/tslint-no-circular-imports/-/tslint-no-circular-imports-0.7.0.tgz#9df0a15654d66b172e0b7843eed073fa5ae99b5f"