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 <github.leah@hrmny.sh>
preactjs · Oct 30, 2020 · c72600a · c72600a
1 parent fce7e7a
commit c72600a
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 14 deletions.
diff --git a/packages/cli/lib/lib/webpack/render-html-plugin.js b/packages/cli/lib/lib/webpack/render-html-plugin.js
@@ -57,7 +57,7 @@ module.exports = async function (config) {
 		const { url, title, ...routeData } = values;
 		return Object.assign(values, {
 			filename: resolve(dest, url.substring(1), 'index.html'),
-			template: `!!ejs-loader!${template}`,
+			template: `!!ejs-loader?esModule=false!${template}`,
 			minify: isProd && {
 				collapseWhitespace: true,
 				removeScriptTypeAttributes: true,

diff --git a/packages/cli/lib/lib/webpack/transform-config.js b/packages/cli/lib/lib/webpack/transform-config.js
@@ -288,7 +288,7 @@ class WebpackConfigHelpers {
 		} catch (e) {}
 
 		let templatePath = isPath
-			? `!!ejs-loader!${resolve(this._cwd, template)}`
+			? `!!ejs-loader?esModule=false!${resolve(this._cwd, template)}`
 			: template;
 		let { plugin: htmlWebpackPlugin } = this.getPluginsByName(
 			config,

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -91,7 +91,7 @@
 		"critters-webpack-plugin": "^2.5.0",
 		"cross-spawn-promise": "^0.10.1",
 		"css-loader": "^3.1.0",
-		"ejs-loader": "^0.3.3",
+		"ejs-loader": "^0.5.0",
 		"envinfo": "^7.3.1",
 		"esm": "^3.2.25",
 		"fast-async": "^6.3.7",

diff --git a/packages/cli/tests/subjects/custom-webpack/preact.config.js b/packages/cli/tests/subjects/custom-webpack/preact.config.js
@@ -2,9 +2,5 @@ const path = require('path');
 
 module.exports = function (config, env, helpers) {
 	if (env.ssr) return;
-	let { plugin } = helpers.getPluginsByName(config, 'HtmlWebpackPlugin')[0];
-	plugin.options.template = `!!ejs-loader!${path.resolve(
-		__dirname,
-		'./template.html'
-	)}`;
+	helpers.setHtmlTemplate(config, path.resolve(__dirname, './template.html'));
 };
diff --git a/yarn.lock b/yarn.lock
@@ -5559,12 +5559,12 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
-ejs-loader@^0.3.3:
-  version "0.3.7"
-  resolved "https://registry.yarnpkg.com/ejs-loader/-/ejs-loader-0.3.7.tgz#82d3cd0a3d3f64d519332b95f9b8a7897c9fcaf4"
-  integrity sha512-K1HBDWXQZkcIAnP5h65kWsD7o7NABvHswOH49rVHX7POGaTM2kYQfkFZVn4ZQeiRnzqbtf07LxSitOVRdR98GA==
+ejs-loader@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/ejs-loader/-/ejs-loader-0.5.0.tgz#ebed0afaedd0a58c07fcc810cf001df3c24d6399"
+  integrity sha512-iirFqlP3tiFoedNZ7dQcjvechunl054VbW6Ki38T/pabgXMAncduSE0ZXLeVGn1NbmcUJF9Z5TC0EvQ4RIpP9Q==
   dependencies:
-    loader-utils "^0.2.7"
+    loader-utils "^2.0.0"
     lodash "^4.17.15"
 
 ejs@^2.6.1:
@@ -9086,7 +9086,7 @@ loader-runner@^2.4.0:
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357"
   integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==
 
-loader-utils@^0.2.16, loader-utils@^0.2.7:
+loader-utils@^0.2.16:
   version "0.2.17"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
   integrity sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=