Skip to content

Commit c72600a

Browse files
Bump ejs-loader from 0.3.7 to 0.5.0 (#1403)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Leah <[email protected]>
1 parent fce7e7a commit c72600a

File tree

5 files changed

+10
-14
lines changed

5 files changed

+10
-14
lines changed

packages/cli/lib/lib/webpack/render-html-plugin.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ module.exports = async function (config) {
5757
const { url, title, ...routeData } = values;
5858
return Object.assign(values, {
5959
filename: resolve(dest, url.substring(1), 'index.html'),
60-
template: `!!ejs-loader!${template}`,
60+
template: `!!ejs-loader?esModule=false!${template}`,
6161
minify: isProd && {
6262
collapseWhitespace: true,
6363
removeScriptTypeAttributes: true,

packages/cli/lib/lib/webpack/transform-config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ class WebpackConfigHelpers {
288288
} catch (e) {}
289289

290290
let templatePath = isPath
291-
? `!!ejs-loader!${resolve(this._cwd, template)}`
291+
? `!!ejs-loader?esModule=false!${resolve(this._cwd, template)}`
292292
: template;
293293
let { plugin: htmlWebpackPlugin } = this.getPluginsByName(
294294
config,

packages/cli/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
"critters-webpack-plugin": "^2.5.0",
9292
"cross-spawn-promise": "^0.10.1",
9393
"css-loader": "^3.1.0",
94-
"ejs-loader": "^0.3.3",
94+
"ejs-loader": "^0.5.0",
9595
"envinfo": "^7.3.1",
9696
"esm": "^3.2.25",
9797
"fast-async": "^6.3.7",

packages/cli/tests/subjects/custom-webpack/preact.config.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,5 @@ const path = require('path');
22

33
module.exports = function (config, env, helpers) {
44
if (env.ssr) return;
5-
let { plugin } = helpers.getPluginsByName(config, 'HtmlWebpackPlugin')[0];
6-
plugin.options.template = `!!ejs-loader!${path.resolve(
7-
__dirname,
8-
'./template.html'
9-
)}`;
5+
helpers.setHtmlTemplate(config, path.resolve(__dirname, './template.html'));
106
};

yarn.lock

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5559,12 +5559,12 @@ [email protected]:
55595559
resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
55605560
integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
55615561

5562-
ejs-loader@^0.3.3:
5563-
version "0.3.7"
5564-
resolved "https://registry.yarnpkg.com/ejs-loader/-/ejs-loader-0.3.7.tgz#82d3cd0a3d3f64d519332b95f9b8a7897c9fcaf4"
5565-
integrity sha512-K1HBDWXQZkcIAnP5h65kWsD7o7NABvHswOH49rVHX7POGaTM2kYQfkFZVn4ZQeiRnzqbtf07LxSitOVRdR98GA==
5562+
ejs-loader@^0.5.0:
5563+
version "0.5.0"
5564+
resolved "https://registry.yarnpkg.com/ejs-loader/-/ejs-loader-0.5.0.tgz#ebed0afaedd0a58c07fcc810cf001df3c24d6399"
5565+
integrity sha512-iirFqlP3tiFoedNZ7dQcjvechunl054VbW6Ki38T/pabgXMAncduSE0ZXLeVGn1NbmcUJF9Z5TC0EvQ4RIpP9Q==
55665566
dependencies:
5567-
loader-utils "^0.2.7"
5567+
loader-utils "^2.0.0"
55685568
lodash "^4.17.15"
55695569

55705570
ejs@^2.6.1:
@@ -9086,7 +9086,7 @@ loader-runner@^2.4.0:
90869086
resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357"
90879087
integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==
90889088

9089-
loader-utils@^0.2.16, loader-utils@^0.2.7:
9089+
loader-utils@^0.2.16:
90909090
version "0.2.17"
90919091
resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
90929092
integrity sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=

0 commit comments

Comments
 (0)