@sveltejs/kit 1.0.0-next.382 → 1.0.0-next.385

package/dist/vite.js

@@ -7,7 +7,7 @@ import * as vite from 'vite';
 import { loadConfigFromFile } from 'vite';
 import { p as posixify, m as mkdirp, r as rimraf } from './chunks/write_tsconfig.js';
 import { g as get_runtime_directory, s, i as init, a as get_runtime_prefix, u as update, b as get_mime_lookup, p as parse_route_id, c as all, l as logger } from './chunks/sync.js';
-import { pathToFileURL, URL as URL$1 } from 'url';
+import { URL as URL$1, pathToFileURL } from 'url';
 import { installPolyfills } from './node/polyfills.js';
 import * as qs from 'querystring';
 import { getRequest, setResponse } from './node.js';
@@ -22,11 +22,9 @@ import 'perf_hooks';
 import 'util/types';
 import 'events';
 import 'tls';
-import './chunks/_commonjsHelpers.js';
 import 'async_hooks';
 import 'console';
 import 'zlib';
-import 'crypto';
 import 'node:http';
 import 'node:https';
 import 'node:zlib';
@@ -37,6 +35,7 @@ import 'node:url';
 import 'node:net';
 import 'node:fs';
 import 'node:path';
+import 'crypto';
 
 /**
  * @param {import('vite').ConfigEnv} config_env
@@ -47,7 +46,7 @@ async function get_vite_config(config_env) {
 	if (!config) {
 		throw new Error('Could not load Vite config');
 	}
-	return config;
+	return { ...config, mode: config_env.mode };
 }
 
 /**
@@ -282,7 +281,8 @@ const get_default_config = function ({ config, input, ssr, outDir }) {
 			__SVELTEKIT_ADAPTER_NAME__: JSON.stringify(config.kit.adapter?.name),
 			__SVELTEKIT_APP_VERSION__: JSON.stringify(config.kit.version.name),
 			__SVELTEKIT_APP_VERSION_FILE__: JSON.stringify(`${config.kit.appDir}/version.json`),
-			__SVELTEKIT_APP_VERSION_POLL_INTERVAL__: JSON.stringify(config.kit.version.pollInterval)
+			__SVELTEKIT_APP_VERSION_POLL_INTERVAL__: JSON.stringify(config.kit.version.pollInterval),
+			__SVELTEKIT_DEV__: 'false'
 		},
 		// prevent Vite copying the contents of `config.kit.files.assets`,
 		// if it happens to be 'public' instead of 'static'
@@ -435,9 +435,9 @@ export class Server {
 /**
  * @param {{
  *   cwd: string;
- *   config: import('types').ValidatedConfig
- *   vite_config_env: import('vite').ConfigEnv
- *   manifest_data: import('types').ManifestData
+ *   config: import('types').ValidatedConfig;
+ *   vite_config_env: import('vite').ConfigEnv;
+ *   manifest_data: import('types').ManifestData;
  *   build_dir: string;
  *   output_dir: string;
  *   service_worker_entry_file: string | null;
@@ -1112,28 +1112,39 @@ function escape_html_attr(str) {
 
 /**
  * @typedef {import('types').PrerenderErrorHandler} PrerenderErrorHandler
- * @typedef {import('types').PrerenderOnErrorValue} OnError
  * @typedef {import('types').Logger} Logger
  */
 
-/** @type {(details: Parameters<PrerenderErrorHandler>[0] ) => string} */
-function format_error({ status, path, referrer, referenceType }) {
-	return `${status} ${path}${referrer ? ` (${referenceType} from ${referrer})` : ''}`;
+/**
+ * @param {Parameters<PrerenderErrorHandler>[0]} details
+ * @param {import('types').ValidatedKitConfig} config
+ */
+function format_error({ status, path, referrer, referenceType }, config) {
+	const message =
+		status === 404 && !path.startsWith(config.paths.base)
+			? `${path} does not begin with \`base\`, which is configured in \`paths.base\` and can be imported from \`$app/paths\``
+			: path;
+
+	return `${status} ${message}${referrer ? ` (${referenceType} from ${referrer})` : ''}`;
 }
 
-/** @type {(log: Logger, onError: OnError) => PrerenderErrorHandler} */
-function normalise_error_handler(log, onError) {
-	switch (onError) {
+/**
+ * @param {Logger} log
+ * @param {import('types').ValidatedKitConfig} config
+ * @returns {PrerenderErrorHandler}
+ */
+function normalise_error_handler(log, config) {
+	switch (config.prerender.onError) {
 		case 'continue':
 			return (details) => {
-				log.error(format_error(details));
+				log.error(format_error(details, config));
 			};
 		case 'fail':
 			return (details) => {
-				throw new Error(format_error(details));
+				throw new Error(format_error(details, config));
 			};
 		default:
-			return onError;
+			return config.prerender.onError;
 	}
 }
 
@@ -1162,6 +1173,58 @@ async function prerender({ config, entries, files, log }) {
 	}
 
 	installPolyfills();
+	const { fetch } = globalThis;
+	globalThis.fetch = async (info, init) => {
+		/** @type {string} */
+		let url;
+
+		/** @type {RequestInit} */
+		let opts = {};
+
+		if (info instanceof Request) {
+			url = info.url;
+
+			opts = {
+				method: info.method,
+				headers: info.headers,
+				body: info.body,
+				mode: info.mode,
+				credentials: info.credentials,
+				cache: info.cache,
+				redirect: info.redirect,
+				referrer: info.referrer,
+				integrity: info.integrity
+			};
+		} else {
+			url = info.toString();
+		}
+
+		if (url.startsWith(config.prerender.origin + '/')) {
+			const request = new Request(url, opts);
+			const response = await server.respond(request, {
+				getClientAddress,
+				prerendering: {
+					dependencies: new Map()
+				}
+			});
+
+			const decoded = new URL$1(url).pathname;
+
+			save(
+				'dependencies',
+				response,
+				Buffer.from(await response.clone().arrayBuffer()),
+				decoded,
+				encodeURI(decoded),
+				null,
+				'fetched'
+			);
+
+			return response;
+		}
+
+		return fetch(info, init);
+	};
 
 	const server_root = join(config.outDir, 'output');
 
@@ -1177,7 +1240,7 @@ async function prerender({ config, entries, files, log }) {
 
 	const server = new Server(manifest);
 
-	const error = normalise_error_handler(log, config.prerender.onError);
+	const error = normalise_error_handler(log, config);
 
 	const q = queue(config.prerender.concurrency);
 
@@ -1231,7 +1294,7 @@ async function prerender({ config, entries, files, log }) {
 		/** @type {Map<string, import('types').PrerenderDependency>} */
 		const dependencies = new Map();
 
-		const response = await server.respond(new Request(`http://sveltekit-prerender${encoded}`), {
+		const response = await server.respond(new Request(config.prerender.origin + encoded), {
 			getClientAddress,
 			prerendering: {
 				dependencies
@@ -1367,7 +1430,7 @@ async function prerender({ config, entries, files, log }) {
 		await q.done();
 	}
 
-	const rendered = await server.respond(new Request('http://sveltekit-prerender/[fallback]'), {
+	const rendered = await server.respond(new Request(config.prerender.origin + '/[fallback]'), {
 		getClientAddress,
 		prerendering: {
 			fallback: true,
@@ -2977,6 +3040,7 @@ function kit() {
 					}
 				},
 				define: {
+					__SVELTEKIT_DEV__: 'true',
 					__SVELTEKIT_APP_VERSION_POLL_INTERVAL__: '0'
 				},
 				resolve: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.0.0-next.382",
+  "version": "1.0.0-next.385",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",
@@ -87,7 +87,7 @@
     "lint": "prettier --check . --config ../../.prettierrc --ignore-path .gitignore",
     "check": "tsc",
     "check:all": "tsc && pnpm -r --filter=\"./**\" check",
-    "format": "npm run check-format -- --write",
+    "format": "npm run lint -- --write",
     "test": "npm run test:unit && npm run test:typings && npm run test:packaging && npm run test:integration",
     "test:integration": "pnpm run -r --workspace-concurrency 1 --filter=\"./test/**\" test",
     "test:unit": "uvu src \"(spec\\.js|test[\\\\/]index\\.js)\" -i packaging",

package/types/ambient.d.ts

@@ -65,7 +65,7 @@ declare namespace App {
 
 /**
  * ```ts
- * import { browser, dev, mode, prerendering, prod, server } from '$app/env';
+ * import { browser, dev, prerendering } from '$app/env';
  * ```
  */
 declare module '$app/env' {
@@ -75,31 +75,14 @@ declare module '$app/env' {
 	export const browser: boolean;
 
 	/**
-	 * `true` in development mode, `false` in production.
+	 * Whether the dev server is running. This is not guaranteed to correspond to `NODE_ENV` or `MODE`.
 	 */
 	export const dev: boolean;
 
-	/**
-	 * The Vite.js mode the app is running in. Configure in [`vite.config.js`](https://vitejs.dev/config/shared-options.html#mode).
-	 * Vite.js loads the dotenv file associated with the provided mode, `.env.[mode]` or `.env.[mode].local`.
-	 * By default, `vite dev` runs with `mode=development` and `vite build` runs with `mode=production`.
-	 */
-	export const mode: string;
-
 	/**
 	 * `true` when prerendering, `false` otherwise.
 	 */
 	export const prerendering: boolean;
-
-	/**
-	 * `true` in production mode, `false` in development.
-	 */
-	export const prod: boolean;
-
-	/**
-	 * `true` if the app is running on the server.
-	 */
-	export const server: boolean;
 }
 
 /**

package/types/index.d.ts

@@ -135,6 +135,7 @@ export interface KitConfig {
 		enabled?: boolean;
 		entries?: Array<'*' | `/${string}`>;
 		onError?: PrerenderOnErrorValue;
+		origin?: string;
 	};
 	routes?: (filepath: string) => boolean;
 	serviceWorker?: {

package/types/internal.d.ts

@@ -323,4 +323,5 @@ declare global {
 	const __SVELTEKIT_APP_VERSION__: string;
 	const __SVELTEKIT_APP_VERSION_FILE__: string;
 	const __SVELTEKIT_APP_VERSION_POLL_INTERVAL__: number;
+	const __SVELTEKIT_DEV__: boolean;
 }

package/dist/chunks/_commonjsHelpers.js

@@ -1,3 +0,0 @@
-var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
-
-export { commonjsGlobal as c };