CHANGELOG.md

@@ -32,3 +32,9 @@
 |            |               | Make jest a dev dependency only (#40)                                                          |
 | 2022-07-23 | 0.11.0        | Widen version range for Vite peer dependency to support Vite 3.0 (#46, #47, thanks @valtism!)  |
 | 2022-08-06 | 0.11.1        | Check for null code due to worker URLs (#49, thanks @daniel-kun!)                              |
+| 2022-08-06 | 0.12.0        | Set config `base` to `undefined` in recommended options (#56)                                  |
+|            |               | Remove optional `type` attribute from style tags (#53, thanks @kidonng!)                       |
+|            |               | Remove all `VITE_PRELOAD` markers (#55)                                                        |
+|            |               | Point package.json to types file (#54, thanks @kidonng!)                                       |
+|            |               | Update various dependencies                                                                    |
+|            |               | Add README note about SVG (#52)                                                                |

README.md

@@ -72,6 +72,7 @@ generate a warning (same as any unrecognized assets).
 ### Caveats
 
 - `favicon` resources are not inlined by Vite, and this plugin doesn't do that either.
+- Inlining of SVG isn't supported directly by Vite, so it isn't supported directly here either. You'll need to use something like `https://github.com/jpkleemans/vite-svg-loader`, or put your SVG directly into the template.
 - There may be other situations where referenced files aren't inlined by Vite and aren't caught by this plugin either. I've done little testing so far, I just wanted to get this out there first.
 - This is my first Vite and first Rollup plugin. I have no idea what I'm doing. PRs welcome.
 - This plugin uses dual packages to support both ESM and CommonJS users. This _should_ work automatically. Details:

package.json

@@ -1,11 +1,12 @@
 {
 	"name": "vite-plugin-singlefile",
-	"version": "0.11.1",
+	"version": "0.12.0",
 	"description": "Vite plugin for inlining JavaScript and CSS resources",
 	"main": "dist/cjs/index.js",
 	"module": "dist/esm/index.js",
 	"exports": {
 		".": {
+			"types": "./dist/esm/declarations/index.d.ts",
 			"import": "./dist/esm/index.js",
 			"require": "./dist/cjs/index.js"
 		}
@@ -42,18 +43,18 @@
 		"micromatch": "^4.0.5"
 	},
 	"peerDependencies": {
-		"vite": "^2.9.13 || ^3.0.0"
+		"vite": "^3.1.3",
+		"rollup": "~2.78.0"
 	},
 	"devDependencies": {
 		"@types/jest": "^29.0.3",
 		"@types/micromatch": "^4.0.2",
-		"@types/node": ">18.7.18",
+		"@types/node": "^18.7.18",
 		"@typescript-eslint/eslint-plugin": "^5.38.0",
 		"@typescript-eslint/parser": "^5.38.0",
 		"eslint": "^8.23.1",
 		"jest": "^29.0.3",
 		"rimraf": "^3.0.2",
-		"rollup": "^2.79.0",
 		"typescript": "^4.8.3"
 	},
 	"prettier": {

src/index.ts

@@ -23,14 +23,14 @@ const defaultConfig = { useRecommendedBuildConfig: true, removeViteModuleLoader:
 export function replaceScript(html: string, scriptFilename: string, scriptCode: string, removeViteModuleLoader = false): string {
 	const reScript = new RegExp(`<script([^>]*?) src="[./]*${scriptFilename}"([^>]*)></script>`)
 	const preloadMarker = '"__VITE_PRELOAD__"'
-	const newCode = scriptCode.replace(preloadMarker, "void 0")
+	const newCode = scriptCode.replaceAll(preloadMarker, "void 0")
 	const inlined = html.replace(reScript, (_, beforeSrc, afterSrc) => `<script${beforeSrc}${afterSrc}>\n${newCode}\n</script>`)
 	return removeViteModuleLoader ? _removeViteModuleLoader(inlined) : inlined
 }
 
 export function replaceCss(html: string, scriptFilename: string, scriptCode: string): string {
 	const reCss = new RegExp(`<link[^>]*? href="[./]*${scriptFilename}"[^>]*?>`)
-	const inlined = html.replace(reCss, `<style type="text/css">\n${scriptCode}\n</style>`)
+	const inlined = html.replace(reCss, `<style>\n${scriptCode}\n</style>`)
 	return inlined
 }
 
@@ -101,6 +101,8 @@ const _useRecommendedBuildConfig = (config: UserConfig) => {
 	config.build.cssCodeSplit = false
 	// Avoids the extra step of testing Brotli compression, which isn't really pertinent to a file served locally.
 	config.build.reportCompressedSize = false
+	// Subfolder bases are not supported, and shouldn't be needed because we're embedding everything.
+	config.base = undefined
 
 	if (!config.build.rollupOptions) config.build.rollupOptions = {}
 	if (!config.build.rollupOptions.output) config.build.rollupOptions.output = {}
@@ -110,9 +112,9 @@ const _useRecommendedBuildConfig = (config: UserConfig) => {
 		out.inlineDynamicImports = true
 	}
 
-	if (!Array.isArray(config.build.rollupOptions.output)) {
-		updateOutputOptions(config.build.rollupOptions.output)
+	if (Array.isArray(config.build.rollupOptions.output)) {
+		for (const o in config.build.rollupOptions.output) updateOutputOptions(o as OutputOptions)
 	} else {
-		config.build.rollupOptions.output.forEach(updateOutputOptions)
+		updateOutputOptions(config.build.rollupOptions.output as OutputOptions)
 	}
 }