From 4b6372700611eb1536b9dfcd94c8fad0ba8cb810 Mon Sep 17 00:00:00 2001 From: Benjamin Staneck Date: Tue, 2 Jun 2020 14:30:57 +0200 Subject: [PATCH 1/4] Fixed Webpack config to allow multiple asset replacements (#1739) * Allow multiple template replacements * double quotes! --- webpack.config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webpack.config.ts b/webpack.config.ts index 2613224d1..733d01753 100644 --- a/webpack.config.ts +++ b/webpack.config.ts @@ -304,7 +304,7 @@ export default (_env: never, args: Configuration): Configuration[] => { const manifest = require("./material/assets/manifest.json") const template = toPairs(manifest) .reduce((content, [from, to]) => { - return content.replace(from, to) + return content.replace(new RegExp(from, "g"), to) }, fs.readFileSync("material/base.html", "utf8")) /* Save template with replaced assets */ From 2d452868184b6875d1c220274ad8985cbc2c84a8 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 1 Jun 2020 06:09:06 +0000 Subject: [PATCH 2/4] Bump @types/node from 14.0.5 to 14.0.6 Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 14.0.5 to 14.0.6. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 382880399..9a7b9ff20 100644 --- a/package-lock.json +++ b/package-lock.json @@ -482,9 +482,9 @@ "dev": true }, "@types/node": { - "version": "14.0.5", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.0.5.tgz", - "integrity": "sha512-90hiq6/VqtQgX8Sp0EzeIsv3r+ellbGj4URKj5j30tLlZvRUpnAe9YbYnjl3pJM93GyXU0tghHhvXHq+5rnCKA==", + "version": "14.0.6", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.0.6.tgz", + "integrity": "sha512-FbNmu4F67d3oZMWBV6Y4MaPER+0EpE9eIYf2yaHhCWovc1dlXCZkqGX4NLHfVVr6umt20TNBdRzrNJIzIKfdbw==", "dev": true }, "@types/normalize-package-data": { diff --git a/package.json b/package.json index 29ac838cf..cf2b7f4c1 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "@types/html-minifier": "^3.5.3", "@types/lunr": "^2.3.3", "@types/mini-css-extract-plugin": "^0.9.1", - "@types/node": "^14.0.5", + "@types/node": "^14.0.6", "@types/ramda": "^0.27.6", "@types/resize-observer-browser": "^0.1.3", "@types/webpack": "^4.41.13", From 855b0db9773bfbd4857c7f1cce3354e38923a4de Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 1 Jun 2020 06:09:36 +0000 Subject: [PATCH 3/4] Bump @types/webpack from 4.41.13 to 4.41.16 Bumps [@types/webpack](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/webpack) from 4.41.13 to 4.41.16. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/webpack) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9a7b9ff20..9485d6587 100644 --- a/package-lock.json +++ b/package-lock.json @@ -580,9 +580,9 @@ } }, "@types/webpack": { - "version": "4.41.13", - "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.13.tgz", - "integrity": "sha512-RYmIHOWSxnTTa765N6jJBVE45pd2SYNblEYshVDduLw6RhocazNmRzE5/ytvBD8IkDMH6DI+bcrqxh8NILimBA==", + "version": "4.41.16", + "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.16.tgz", + "integrity": "sha512-w80nXwCcXwwgv7rkTXb8lET6nWPNNUJxa36lrA2DEkD5TcPpHrlGAPrjdpZnkFX/FXSSuN5IIxCYowAB1Vobtw==", "dev": true, "requires": { "@types/anymatch": "*", diff --git a/package.json b/package.json index cf2b7f4c1..31fea7b8e 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "@types/node": "^14.0.6", "@types/ramda": "^0.27.6", "@types/resize-observer-browser": "^0.1.3", - "@types/webpack": "^4.41.13", + "@types/webpack": "^4.41.16", "@types/webpack-assets-manifest": "^3.0.1", "autoprefixer": "^9.8.0", "copy-webpack-plugin": "^6.0.1", From 6fcdcc50a42649b08dcec9383d381c7a3ca7d9ae Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 5 Jun 2020 10:44:49 +0000 Subject: [PATCH 4/4] Bump @types/webpack from 4.41.16 to 4.41.17 Bumps [@types/webpack](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/webpack) from 4.41.16 to 4.41.17. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/webpack) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 22 +++++++++++++++------- package.json | 2 +- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9485d6587..c39fb2e21 100644 --- a/package-lock.json +++ b/package-lock.json @@ -580,9 +580,9 @@ } }, "@types/webpack": { - "version": "4.41.16", - "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.16.tgz", - "integrity": "sha512-w80nXwCcXwwgv7rkTXb8lET6nWPNNUJxa36lrA2DEkD5TcPpHrlGAPrjdpZnkFX/FXSSuN5IIxCYowAB1Vobtw==", + "version": "4.41.17", + "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.17.tgz", + "integrity": "sha512-6FfeCidTSHozwKI67gIVQQ5Mp0g4X96c2IXxX75hYEQJwST/i6NyZexP//zzMOBb+wG9jJ7oO8fk9yObP2HWAw==", "dev": true, "requires": { "@types/anymatch": "*", @@ -604,14 +604,22 @@ } }, "@types/webpack-sources": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-0.1.7.tgz", - "integrity": "sha512-XyaHrJILjK1VHVC4aVlKsdNN5KBTwufMb43cQs+flGxtPAf/1Qwl8+Q0tp5BwEGaI8D6XT1L+9bSWXckgkjTLw==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-1.4.0.tgz", + "integrity": "sha512-c88dKrpSle9BtTqR6ifdaxu1Lvjsl3C5OsfvuUbUwdXymshv1TkufUAXBajCCUM/f/TmnkZC/Esb03MinzSiXQ==", "dev": true, "requires": { "@types/node": "*", "@types/source-list-map": "*", - "source-map": "^0.6.1" + "source-map": "^0.7.3" + }, + "dependencies": { + "source-map": { + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", + "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", + "dev": true + } } }, "@webassemblyjs/ast": { diff --git a/package.json b/package.json index 31fea7b8e..429235e09 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "@types/node": "^14.0.6", "@types/ramda": "^0.27.6", "@types/resize-observer-browser": "^0.1.3", - "@types/webpack": "^4.41.16", + "@types/webpack": "^4.41.17", "@types/webpack-assets-manifest": "^3.0.1", "autoprefixer": "^9.8.0", "copy-webpack-plugin": "^6.0.1",