Fix replacement of templateContent

TobitSoftware · Nov 15, 2022 · 32edadd · 32edadd
1 parent bf6741a
commit 32edadd
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/.npmrc b/.npmrc
@@ -1 +1,2 @@
-legacy-peer-deps = true
+legacy-peer-deps = true
+registry=https://registry.npmjs.org
diff --git a/src/commands/buildCommand.ts b/src/commands/buildCommand.ts
@@ -51,11 +51,20 @@ export function buildCommand({ analyze }: BuildOptions): (stepParams: StepParams
 			)
 				return webpackPlugin
 			// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-			if (webpackPlugin.userOptions?.templateContent || webpackPlugin.userOptions?.template) {
+			if (webpackPlugin.userOptions?.template) {
 				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-member-access,no-param-reassign
 				webpackPlugin.userOptions.templateParameters = {
 					CHAYNS_TOOLKIT_CSS_TAG: `<script>(${loadCss.toString()})()</script>`,
 				}
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+			} else if (webpackPlugin.userOptions?.templateContent) {
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access,no-param-reassign,@typescript-eslint/no-unsafe-assignment
+				webpackPlugin.userOptions.templateContent =
+					// eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
+					webpackPlugin.userOptions.templateContent.replace(
+						"<%= CHAYNS_TOOLKIT_CSS_TAG %>",
+						`<script>(${loadCss.toString()})()</script>`
+					)
 			}
 			// eslint-disable-next-line @typescript-eslint/no-unsafe-return
 			return webpackPlugin

diff --git a/src/commands/devCommand.ts b/src/commands/devCommand.ts
@@ -57,11 +57,20 @@ export function devCommand({
 			)
 				return webpackPlugin
 			// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-			if (webpackPlugin.userOptions?.templateContent || webpackPlugin.userOptions?.template) {
+			if (webpackPlugin.userOptions?.template) {
 				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-member-access,no-param-reassign
 				webpackPlugin.userOptions.templateParameters = {
 					CHAYNS_TOOLKIT_CSS_TAG: `<script>(${loadCss.toString()})()</script>`,
 				}
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+			} else if (webpackPlugin.userOptions?.templateContent) {
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access,no-param-reassign,@typescript-eslint/no-unsafe-assignment
+				webpackPlugin.userOptions.templateContent =
+					// eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
+					webpackPlugin.userOptions.templateContent.replace(
+						"<%= CHAYNS_TOOLKIT_CSS_TAG %>",
+						`<script>(${loadCss.toString()})()</script>`
+					)
 			}
 			// eslint-disable-next-line @typescript-eslint/no-unsafe-return
 			return webpackPlugin