From 27a41f2615580c0acf1a8ef8c65c45a501e2d965 Mon Sep 17 00:00:00 2001 From: Alan Agius Date: Tue, 30 Mar 2021 10:13:12 +0200 Subject: [PATCH] build: update to critters 0.0.10 --- package.json | 2 +- .../angular_devkit/build_angular/package.json | 2 +- .../utils/index-file/inline-critical-css.ts | 6 +++--- yarn.lock | 18 +++++------------- 4 files changed, 10 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index d013651cd5..a965ea476f 100644 --- a/package.json +++ b/package.json @@ -138,7 +138,7 @@ "conventional-commits-parser": "^3.0.0", "copy-webpack-plugin": "6.3.2", "core-js": "3.9.1", - "critters": "0.0.9", + "critters": "0.0.10", "css-loader": "5.0.2", "cssnano": "4.1.10", "debug": "^4.1.1", diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json index b945094399..d0cb421254 100644 --- a/packages/angular_devkit/build_angular/package.json +++ b/packages/angular_devkit/build_angular/package.json @@ -29,7 +29,7 @@ "circular-dependency-plugin": "5.2.2", "copy-webpack-plugin": "6.3.2", "core-js": "3.9.1", - "critters": "0.0.9", + "critters": "0.0.10", "css-loader": "5.0.2", "cssnano": "4.1.10", "find-cache-dir": "3.3.1", diff --git a/packages/angular_devkit/build_angular/src/utils/index-file/inline-critical-css.ts b/packages/angular_devkit/build_angular/src/utils/index-file/inline-critical-css.ts index 52a2867945..dd835688bc 100644 --- a/packages/angular_devkit/build_angular/src/utils/index-file/inline-critical-css.ts +++ b/packages/angular_devkit/build_angular/src/utils/index-file/inline-critical-css.ts @@ -19,6 +19,7 @@ export interface InlineCriticalCssProcessorOptions { deployUrl?: string; readAsset?: (path: string) => Promise; } + class CrittersExtended extends Critters { readonly warnings: string[] = []; readonly errors: string[] = []; @@ -28,9 +29,9 @@ class CrittersExtended extends Critters { logger: { warn: (s: string) => this.warnings.push(s), error: (s: string) => this.errors.push(s), - log: () => { }, info: () => { }, }, + logLevel: 'warn', path: optionsExtended.outputPath, publicPath: optionsExtended.deployUrl, compress: !!optionsExtended.minify, @@ -40,8 +41,7 @@ class CrittersExtended extends Critters { preload: 'media', noscriptFallback: true, inlineFonts: true, - // tslint:disable-next-line: no-any - } as any); + }); } protected readFile(path: string): Promise { diff --git a/yarn.lock b/yarn.lock index c043b1eb13..1751f102df 100644 --- a/yarn.lock +++ b/yarn.lock @@ -87,7 +87,6 @@ "@angular/dev-infra-private@https://github.com/angular/dev-infra-private-builds.git#13f30f059363c0bc111cecee94b230dcba3b1957": version "0.0.0" - uid "13f30f059363c0bc111cecee94b230dcba3b1957" resolved "https://github.com/angular/dev-infra-private-builds.git#13f30f059363c0bc111cecee94b230dcba3b1957" dependencies: "@angular/benchpress" "0.2.1" @@ -4376,10 +4375,10 @@ create-require@^1.1.0: resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333" integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ== -critters@0.0.9: - version "0.0.9" - resolved "https://registry.yarnpkg.com/critters/-/critters-0.0.9.tgz#1a000ad42527ee5fdd08905dafdb15ded8c906f2" - integrity sha512-8aMHzByeuPiNi8mtx6CwPAHm9TIJHfB3en4VylqRhMVegnTL3A+BJssrmSiGTj8B0DQGWlafq3Q31GLElpBVBw== +critters@0.0.10: + version "0.0.10" + resolved "https://registry.yarnpkg.com/critters/-/critters-0.0.10.tgz#edd0e962fc5af6c4adb6dbf1a71bae2d3f917000" + integrity sha512-p5VKhP1803+f+0Jq5P03w1SbiHtpAKm+1EpJHkiPxQPq0Vu9QLZHviJ02GRrWi0dlcJqrmzMWInbwp4d22RsGw== dependencies: chalk "^4.1.0" css "^3.0.0" @@ -11344,14 +11343,7 @@ semver-dsl@^1.0.1: dependencies: semver "^5.3.0" -semver-intersect@1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/semver-intersect/-/semver-intersect-1.4.0.tgz#bdd9c06bedcdd2fedb8cd352c3c43ee8c61321f3" - integrity sha512-d8fvGg5ycKAq0+I6nfWeCx6ffaWJCsBYU0H2Rq56+/zFePYfT8mXkB3tWBSjR5BerkHNZ5eTPIk1/LBYas35xQ== - dependencies: - semver "^5.0.0" - -"semver@2 >=2.2.1 || 3.x || 4 || 5", "semver@2 || 3 || 4 || 5", semver@^5.0.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.6.0: +"semver@2 >=2.2.1 || 3.x || 4 || 5", "semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.6.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==