@sveltejs/kit 1.0.0-next.554 → 1.0.0-next.555

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.0.0-next.554",
+  "version": "1.0.0-next.555",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",

package/src/core/sync/write_client_manifest.js

@@ -1,5 +1,4 @@
-import { relative } from 'path';
-import { posixify, resolve_entry } from '../../utils/filesystem.js';
+import { relative_path, resolve_entry } from '../../utils/filesystem.js';
 import { s } from '../../utils/misc.js';
 import { trim, write_if_changed } from './utils.js';
 
@@ -20,14 +19,16 @@ export function write_client_manifest(config, manifest_data, output) {
 
 		if (node.shared) {
 			declarations.push(
-				`import * as shared from ${s(relative(`${output}/nodes`, node.shared))};`,
+				`import * as shared from ${s(relative_path(`${output}/nodes`, node.shared))};`,
 				`export { shared };`
 			);
 		}
 
 		if (node.component) {
 			declarations.push(
-				`export { default as component } from ${s(relative(`${output}/nodes`, node.component))};`
+				`export { default as component } from ${s(
+					relative_path(`${output}/nodes`, node.component)
+				)};`
 			);
 		}
 
@@ -86,7 +87,7 @@ export function write_client_manifest(config, manifest_data, output) {
 	write_if_changed(
 		`${output}/client-manifest.js`,
 		trim(`
-			${hooks_file ? `import * as client_hooks from '${posixify(relative(output, hooks_file))}';` : ''}
+			${hooks_file ? `import * as client_hooks from '${relative_path(output, hooks_file)}';` : ''}
 
 			export { matchers } from './client-matchers.js';
 

package/src/core/sync/write_matchers.js

@@ -1,5 +1,5 @@
-import path from 'path';
 import { s } from '../../utils/misc.js';
+import { relative_path } from '../../utils/filesystem.js';
 import { write_if_changed } from './utils.js';
 
 /**
@@ -13,7 +13,7 @@ export function write_matchers(manifest_data, output) {
 	for (const key in manifest_data.matchers) {
 		const src = manifest_data.matchers[key];
 
-		imports.push(`import { match as ${key} } from ${s(path.relative(output, src))};`);
+		imports.push(`import { match as ${key} } from ${s(relative_path(output, src))};`);
 		matchers.push(key);
 	}
 

package/src/utils/filesystem.js

@@ -113,7 +113,7 @@ export function posixify(str) {
 }
 
 /**
- * Like `path.join`, but posixified and with a leading ./ if necessary
+ * Like `path.join`, but posixified and with a leading `./` if necessary
  * @param {string[]} str
  */
 export function join_relative(...str) {
@@ -124,6 +124,17 @@ export function join_relative(...str) {
 	return result;
 }
 
+/**
+ * Like `path.relative`, but always posixified and with a leading `./` if necessary.
+ * Useful for JS imports so the path can safely reside inside of `node_modules`.
+ * Otherwise paths could be falsely interpreted as package paths.
+ * @param {string} from
+ * @param {string} to
+ */
+export function relative_path(from, to) {
+	return join_relative(path.relative(from, to));
+}
+
 /**
  * Prepend given path with `/@fs` prefix
  * @param {string} str