Merge pull request #91 from mataha/fix/trailing-newline

Trim leading and trailing newlines

fixup.cjs

@@ -0,0 +1,22 @@
+#!/usr/bin/env node
+
+const fs = require("node:fs")
+const path = require("node:path")
+
+function main(/* {string} */ project) {
+    const types = {
+        cjs: "commonjs",
+        esm: "module",
+    }
+
+    for (const [distribution, type] of Object.entries(types)) {
+        fs.writeFileSync(
+            path.join(project, "dist", distribution, "package.json"),
+            JSON.stringify({ type: type }, null, "\t")
+        )
+    }
+}
+
+if (require.main === module) {
+    main(path.dirname(require.main.filename))
+}

package.json

@@ -20,9 +20,9 @@
 		"node": ">18.0.0"
 	},
 	"scripts": {
-		"dev": "rimraf dist && tsc -w --p tsconfig.json",
+		"dev": "rimraf dist && tsc -w -p tsconfig.json",
 		"prepare": "npm run build",
-		"build": "rimraf dist && tsc -p tsconfig.json && tsc -p tsconfig-cjs.json && ./fixup",
+		"build": "rimraf dist && tsc -p tsconfig.json && tsc -p tsconfig-cjs.json && node fixup.cjs",
 		"test": "vitest",
 		"test:watch": "vitest watch",
 		"lint": "eslint src/index.ts"

src/index.ts

@@ -28,14 +28,14 @@ export function replaceScript(html: string, scriptFilename: string, scriptCode:
 	const reScript = new RegExp(`<script([^>]*?) src="[./]*${scriptFilename}"([^>]*)></script>`)
 	const preloadMarker = /"?__VITE_PRELOAD__"?/g
 	const newCode = scriptCode.replace(preloadMarker, "void 0").replace(/(<)(\/script>|!--)/g, '\\x3C$2')
-	const inlined = html.replace(reScript, (_, beforeSrc, afterSrc) => `<script${beforeSrc}${afterSrc}>${newCode}</script>`)
+	const inlined = html.replace(reScript, (_, beforeSrc, afterSrc) => `<script${beforeSrc}${afterSrc}>${newCode.trim()}</script>`)
 	return removeViteModuleLoader ? _removeViteModuleLoader(inlined) : inlined
 }
 
 export function replaceCss(html: string, scriptFilename: string, scriptCode: string): string {
 	const reStyle = new RegExp(`<link([^>]*?) href="[./]*${scriptFilename}"([^>]*?)>`)
-	const legacyCharSetDeclaration = /@charset "UTF-8";/
-	const inlined = html.replace(reStyle, (_, beforeSrc, afterSrc) => `<style${beforeSrc}${afterSrc}>${scriptCode.replace(legacyCharSetDeclaration, "")}</style>`);
+	const newCode = scriptCode.replace(`@charset "UTF-8";`, "")
+	const inlined = html.replace(reStyle, (_, beforeSrc, afterSrc) => `<style${beforeSrc}${afterSrc}>${newCode.trim()}</style>`);
 	return inlined
 }
 

tsconfig-base.json

@@ -7,9 +7,7 @@
 		"declarationMap": false,
 		"esModuleInterop": true,
 		"inlineSourceMap": false,
-		// es2020 is what Node.JS v14 supports
-		// see https://github.com/tsconfig/bases/blob/main/bases/node14.json
-		"lib": ["es2020", "dom"],
+		"lib": ["es2021", "dom"],
 		"listEmittedFiles": false,
 		"moduleResolution": "node",
 		"noUnusedLocals": true,

tsconfig-cjs.json

@@ -4,6 +4,6 @@
 		"declarationDir": "dist/cjs/declarations",
 		"module": "commonjs",
 		"outDir": "dist/cjs",
-		"target": "es2015"
+		"target": "es2021"
 	}
 }