Expose normalizePath helper

Author: marvinhagemeister

.changeset/new-falcons-approve.md

@@ -0,0 +1,7 @@
+---
+'@wmr-plugins/directory-import': patch
+'@wmr-plugins/service-worker': patch
+'wmr': patch
+---
+
+Expose `normalizePath` function from `wmr` to ensure normalization is applied the same way across plugins and core.

packages/directory-plugin/src/index.js

@@ -1,8 +1,7 @@
 import { promises as fs } from 'fs';
+import { normalizePath } from 'wmr';
 import path from 'path';
 
-const pathToPosix = p => p.split(path.sep).join(path.posix.sep);
-
 /**
  * @param {object} [options]
  * @param {string} [options.cwd]
@@ -17,7 +16,7 @@ function directoryPlugin(options) {
 			const resolved = await this.resolve(id.slice(4) + '\0', importer, { skipSelf: true });
 
 			if (resolved) {
-				return '\0dir:' + pathToPosix(resolved.id).replace(/\0$/, '');
+				return '\0dir:' + normalizePath(resolved.id).replace(/\0$/, '');
 			}
 		},
 		async load(id) {

packages/sw-plugin/src/index.js

@@ -1,7 +1,6 @@
 import path from 'path';
 import { request } from 'http';
-
-const pathToPosix = p => p.split(path.sep).join(path.posix.sep);
+import { normalizePath } from 'wmr';
 
 /**
  * Service Worker plugin for WMR.
@@ -19,7 +18,7 @@ export default function swPlugin(options) {
 
 	const wmrProxyPlugin = {
 		resolveId(id) {
-			const normalizedId = id[1] + id[2] === ':\\' ? pathToPosix(id.slice(2)) : id;
+			const normalizedId = id[1] + id[2] === ':\\' ? normalizePath(id.slice(2)) : id;
 			if (id.startsWith('/@npm/')) return id;
 			if (!/^\.*\//.test(normalizedId)) return '/@npm/' + id;
 		},
@@ -49,7 +48,7 @@ export default function swPlugin(options) {
 		async resolveId(id, importer) {
 			if (!id.startsWith('sw:')) return;
 			const resolved = await this.resolve(id.slice(3), importer);
-			if (resolved) return `\0sw:${pathToPosix(resolved.id)}`;
+			if (resolved) return `\0sw:${normalizePath(resolved.id)}`;
 		},
 		async load(id) {
 			if (!id.startsWith('\0sw:')) return;

packages/wmr/package.json

@@ -2,6 +2,7 @@
 	"name": "wmr",
 	"version": "1.3.2",
 	"bin": "wmr.cjs",
+	"main": "./src/index.js",
 	"type": "module",
 	"scripts": {
 		"demo": "cd demo && node --experimental-modules ../src/cli.js 2>&1",

packages/wmr/src/bundler.js

@@ -1,9 +1,10 @@
-import { relative, sep, posix, resolve, dirname } from 'path';
+import { relative, posix, resolve, dirname } from 'path';
 import * as rollup from 'rollup';
 import htmPlugin from './plugins/htm-plugin.js';
 import sucrasePlugin from './plugins/sucrase-plugin.js';
 import wmrPlugin from './plugins/wmr/plugin.js';
 import wmrStylesPlugin from './plugins/wmr/styles-plugin.js';
+import { normalizePath } from './utils.js';
 import sassPlugin from './plugins/sass-plugin.js';
 import terser from './plugins/fast-minify.js';
 import npmPlugin from './plugins/npm-plugin/index.js';
@@ -24,9 +25,6 @@ import copyAssetsPlugin from './plugins/copy-assets-plugin.js';
 import nodeBuiltinsPlugin from './plugins/node-builtins-plugin.js';
 import dynamicImportVars from '@rollup/plugin-dynamic-import-vars';
 
-/** @param {string} p */
-const pathToPosix = p => p.split(sep).join(posix.sep);
-
 /** @typedef {import('rollup').OutputOptions} OutputOptions */
 /** @typedef {OutputOptions | ((opts: OutputOptions) => OutputOptions)} Output */
 
@@ -84,7 +82,7 @@ export async function bundleProd({
 	await totalist(cwd, (rel, abs) => {
 		if (ignore.test(abs)) return;
 		if (!/\.html?/.test(rel)) return;
-		input.push('./' + pathToPosix(relative(root, abs)));
+		input.push('./' + normalizePath(relative(root, abs)));
 	});
 
 	const bundle = await rollup.rollup({
@@ -150,7 +148,7 @@ export async function bundleProd({
 		plugins: [minify && terser({ compress: true, sourcemap })],
 		sourcemap,
 		sourcemapPathTransform(p, mapPath) {
-			let url = pathToPosix(relative(cwd, resolve(dirname(mapPath), p)));
+			let url = normalizePath(relative(cwd, resolve(dirname(mapPath), p)));
 			// strip leading relative path
 			url = url.replace(/^\.\//g, '');
 			// replace internal npm prefix

packages/wmr/src/index.js

@@ -0,0 +1 @@
+export { normalizePath } from './utils.js';

packages/wmr/src/utils.js

@@ -0,0 +1,8 @@
+import path from 'path';
+
+/**
+ * Normalize a file path across OSes.
+ * @param {string} file
+ * @returns {string}
+ */
+export const normalizePath = file => file.split(path.sep).join(path.posix.sep);

packages/wmr/types.d.ts

@@ -32,6 +32,8 @@ declare module 'wmr' {
 		output: OutputOption[];
 		features: Features;
 	}
+
+	export function normalizePath(path: string): string;
 }
 
 // Declarations used by WMR-based applications