@sveltejs/kit 1.0.0-next.170 → 1.0.0-next.171

package/dist/chunks/index5.js

@@ -360,6 +360,9 @@ async function preview({
 				render_handler();
 			}
 		} else {
+			if (initial_url.startsWith(config.kit.paths.base)) {
+				req.url = initial_url.slice(config.kit.paths.base.length);
+			}
 			assets_handler(req, res, () => {
 				static_handler(req, res, render_handler);
 			});

package/dist/chunks/index6.js

@@ -19202,11 +19202,19 @@ const essential_files = ['README', 'LICENSE', 'CHANGELOG', '.gitignore', '.npmig
  * @param {string} cwd
  */
 async function make_package(config, cwd = process.cwd()) {
-	rimraf(path$2.join(cwd, config.kit.package.dir));
+	const abs_package_dir = path$2.join(cwd, config.kit.package.dir);
+	rimraf(abs_package_dir);
 
 	if (config.kit.package.emitTypes) {
 		// Generate type definitions first so hand-written types can overwrite generated ones
 		await emit_dts(config);
+		// Resolve aliases, TS leaves them as-is
+		const files = walk$1(abs_package_dir);
+		for (const file of files) {
+			const filename = path$2.join(abs_package_dir, file);
+			const source = fs.readFileSync(filename, 'utf8');
+			fs.writeFileSync(filename, resolve_$lib_alias(file, source, config));
+		}
 	}
 
 	const files_filter = create_filter(config.kit.package.files);
@@ -19235,7 +19243,7 @@ async function make_package(config, cwd = process.cwd()) {
 
 		if (!files_filter(file.replace(/\\/g, '/'))) {
 			const dts_file = (svelte_ext ? file : file.slice(0, -ext.length)) + '.d.ts';
-			const dts_path = path$2.join(cwd, config.kit.package.dir, dts_file);
+			const dts_path = path$2.join(abs_package_dir, dts_file);
 			if (fs.existsSync(dts_path)) fs.unlinkSync(dts_path);
 			continue;
 		}
@@ -19260,7 +19268,7 @@ async function make_package(config, cwd = process.cwd()) {
 			// TypeScript's declaration emit won't copy over the d.ts files, so we do it here
 			out_file = file;
 			out_contents = source;
-			if (fs.existsSync(path$2.join(cwd, config.kit.package.dir, out_file))) {
+			if (fs.existsSync(path$2.join(abs_package_dir, out_file))) {
 				console.warn(
 					'Found already existing file from d.ts generation for ' +
 						out_file +
@@ -19274,8 +19282,9 @@ async function make_package(config, cwd = process.cwd()) {
 			out_file = file;
 			out_contents = source;
 		}
+		out_contents = resolve_$lib_alias(out_file, out_contents, config);
 
-		write(path$2.join(cwd, config.kit.package.dir, out_file), out_contents);
+		write(path$2.join(abs_package_dir, out_file), out_contents);
 
 		if (exports_filter(file)) {
 			const original = `$lib/${file.replace(/\\/g, '/')}`;
@@ -19322,7 +19331,7 @@ async function make_package(config, cwd = process.cwd()) {
 		}
 	}
 
-	write(path$2.join(cwd, config.kit.package.dir, 'package.json'), JSON.stringify(pkg, null, '  '));
+	write(path$2.join(abs_package_dir, 'package.json'), JSON.stringify(pkg, null, '  '));
 
 	const whitelist = fs.readdirSync(cwd).filter((file) => {
 		const lowercased = file.toLowerCase();
@@ -19332,11 +19341,46 @@ async function make_package(config, cwd = process.cwd()) {
 		const full_path = path$2.join(cwd, pathname);
 		if (fs.lstatSync(full_path).isDirectory()) continue; // just to be sure
 
-		const package_path = path$2.join(cwd, config.kit.package.dir, pathname);
+		const package_path = path$2.join(abs_package_dir, pathname);
 		if (!fs.existsSync(package_path)) fs.copyFileSync(full_path, package_path);
 	}
 }
 
+/**
+ * Resolves the `$lib` alias.
+ *
+ * TODO: make this more generic to also handle other aliases the user could have defined
+ * via `kit.vite.resolve.alias`. Also investage how to do this in a more robust way
+ * (right now regex string replacement is used).
+ * For more discussion see https://github.com/sveltejs/kit/pull/2453
+ *
+ * @param {string} file Relative to the lib root
+ * @param {string} content
+ * @param {import('types/config').ValidatedConfig} config
+ * @returns {string}
+ */
+function resolve_$lib_alias(file, content, config) {
+	/**
+	 * @param {string} match
+	 * @param {string} _
+	 * @param {string} import_path
+	 */
+	const replace_import_path = (match, _, import_path) => {
+		if (!import_path.startsWith('$lib/')) {
+			return match;
+		}
+
+		const full_path = path$2.join(config.kit.files.lib, file);
+		const full_import_path = path$2.join(config.kit.files.lib, import_path.slice('$lib/'.length));
+		let resolved = path$2.relative(path$2.dirname(full_path), full_import_path).replace(/\\/g, '/');
+		resolved = resolved.startsWith('.') ? resolved : './' + resolved;
+		return match.replace(import_path, resolved);
+	};
+	content = content.replace(/from\s+('|")([^"';,]+?)\1/g, replace_import_path);
+	content = content.replace(/import\s*\(\s*('|")([^"';,]+?)\1\s*\)/g, replace_import_path);
+	return content;
+}
+
 /**
  * @param {string} filename
  * @param {string} source

package/dist/cli.js

@@ -822,7 +822,7 @@ async function launch(port, https) {
 	exec(`${cmd} ${https ? 'https' : 'http'}://localhost:${port}`);
 }
 
-const prog = sade('svelte-kit').version('1.0.0-next.170');
+const prog = sade('svelte-kit').version('1.0.0-next.171');
 
 prog
 	.command('dev')
@@ -965,7 +965,7 @@ async function check_port(port) {
 function welcome({ port, host, https, open }) {
 	if (open) launch(port, https);
 
-	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.170'}\n`));
+	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.171'}\n`));
 
 	const protocol = https ? 'https:' : 'http:';
 	const exposed = host !== 'localhost' && host !== '127.0.0.1';

package/package.json

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