@sveltejs/kit 1.0.0-next.559 → 1.0.0-next.560

package/package.json

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

package/src/core/config/options.js

@@ -238,7 +238,10 @@ const options = object(
 					(keypath) =>
 						`${keypath} has been removed. You can set it inside the top level +layout.js instead. See the PR for more information: https://github.com/sveltejs/kit/pull/6197`
 				),
-				enabled: boolean(true),
+				enabled: error(
+					(keypath) =>
+						`${keypath} has been removed. You can wrap any code that should not be executed during build in a \`if (!building) {...}\` block. See the discussion for more information: https://github.com/sveltejs/kit/discussions/7716`
+				),
 				entries: validate(['*'], (input, keypath) => {
 					if (!Array.isArray(input) || !input.every((page) => typeof page === 'string')) {
 						throw new Error(`${keypath} must be an array of strings`);

package/src/core/prerender/prerender.js

@@ -77,11 +77,6 @@ export async function prerender() {
 	/** @type {import('types').ValidatedKitConfig} */
 	const config = (await load_config()).kit;
 
-	if (!config.prerender.enabled) {
-		output_and_exit({ prerendered, prerender_map });
-		return;
-	}
-
 	/** @type {import('types').Logger} */
 	const log = logger({
 		verbose: verbose === 'true'
@@ -111,8 +106,8 @@ export async function prerender() {
 	const manifest = (await import(pathToFileURL(manifest_path).href)).manifest;
 
 	override({
+		building: true,
 		paths: config.paths,
-		prerendering: true,
 		read: (file) => readFileSync(join(config.files.assets, file))
 	});
 

package/src/exports/vite/build/build_server.js

@@ -27,7 +27,7 @@ const server_template = ({ config, hooks, has_service_worker, runtime, template,
 import root from '__GENERATED__/root.svelte';
 import { respond } from '${runtime}/server/index.js';
 import { set_paths, assets, base } from '${runtime}/paths.js';
-import { set_prerendering, set_version } from '${runtime}/env.js';
+import { set_building, set_version } from '${runtime}/env.js';
 import { set_private_env } from '${runtime}/env-private.js';
 import { set_public_env } from '${runtime}/env-public.js';
 
@@ -53,7 +53,7 @@ let default_protocol = 'https';
 export function override(settings) {
 	default_protocol = settings.protocol || default_protocol;
 	set_paths(settings.paths);
-	set_prerendering(settings.prerendering);
+	set_building(settings.building);
 	read = settings.read;
 }
 

package/src/exports/vite/graph_analysis/index.js

@@ -22,7 +22,7 @@ export function is_illegal(id, dirs) {
 /**
  * Creates a guard that checks that no id imports a module that is not allowed to be imported into client-side code.
  * @param {import('rollup').PluginContext} context
- * @param {{ cwd: string, lib: string }} paths
+ * @param {{ cwd: string; lib: string }} paths
  */
 export function module_guard(context, { cwd, lib }) {
 	/** @type {Set<string>} */
@@ -37,7 +37,7 @@ export function module_guard(context, { cwd, lib }) {
 
 	/**
 	 * @param {string} id
-	 * @param {Array<{ id: string, dynamic: boolean }>} chain
+	 * @param {Array<{ id: string; dynamic: boolean }>} chain
 	 */
 	function follow(id, chain) {
 		if (seen.has(id)) return;
@@ -51,8 +51,8 @@ export function module_guard(context, { cwd, lib }) {
 				chain.map(({ id, dynamic }, i) => {
 					id = normalize_id(id, lib, cwd);
 
-					return `${repeat(' ', i * 2)}- ${id} ${dynamic ? 'dynamically imports' : 'imports'}\n`;
-				}) + `${repeat(' ', chain.length)}- ${id}`;
+					return `${' '.repeat(i * 2)}- ${id} ${dynamic ? 'dynamically imports' : 'imports'}\n`;
+				}) + `${' '.repeat(chain.length)}- ${id}`;
 
 			const message = `Cannot import ${id} into client-side code:\n${pyramid}`;
 
@@ -97,11 +97,3 @@ export function normalize_id(id, lib, cwd) {
 
 	return posixify(id);
 }
-
-/**
- * @param {string} str
- * @param {number} times
- */
-function repeat(str, times) {
-	return new Array(times + 1).join(str);
-}

package/src/exports/vite/preview/index.js

@@ -39,7 +39,7 @@ export async function preview(vite, vite_config, svelte_config) {
 
 	override({
 		paths: { base, assets },
-		prerendering: false,
+		building: false,
 		protocol,
 		read: (file) => fs.readFileSync(join(svelte_config.kit.files.assets, file))
 	});

package/src/runtime/app/environment.js

@@ -8,4 +8,4 @@ export const browser = !import.meta.env.SSR;
  */
 export const dev = __SVELTEKIT_DEV__;
 
-export { prerendering, version } from '../env.js';
+export { building, version } from '../env.js';

package/src/runtime/env.js

@@ -1,9 +1,9 @@
-export let prerendering = false;
+export let building = false;
 export let version = '';
 
 /** @param {boolean} value */
-export function set_prerendering(value) {
-	prerendering = value;
+export function set_building(value) {
+	building = value;
 }
 
 /** @param {string} value */

package/types/ambient.d.ts

@@ -67,7 +67,7 @@ declare namespace App {
 
 /**
  * ```ts
- * import { browser, dev, prerendering } from '$app/environment';
+ * import { browser, building, dev, version } from '$app/environment';
  * ```
  */
 declare module '$app/environment' {
@@ -77,17 +77,17 @@ declare module '$app/environment' {
 	export const browser: boolean;
 
 	/**
-	 * Whether the dev server is running. This is not guaranteed to correspond to `NODE_ENV` or `MODE`.
+	 * SvelteKit analyses your app during the `build` step by running it. During this process, `building` is `true`. This also applies during prerendering.
 	 */
-	export const dev: boolean;
+	export const building: boolean;
 
 	/**
-	 * `true` when prerendering, `false` otherwise.
+	 * Whether the dev server is running. This is not guaranteed to correspond to `NODE_ENV` or `MODE`.
 	 */
-	export const prerendering: boolean;
+	export const dev: boolean;
 
 	/**
-	 * The value of `config.kit.version.name`
+	 * The value of `config.kit.version.name`.
 	 */
 	export const version: string;
 }

package/types/index.d.ts

@@ -213,7 +213,6 @@ export interface KitConfig {
 		concurrency?: number;
 		crawl?: boolean;
 		default?: boolean;
-		enabled?: boolean;
 		entries?: Array<'*' | `/${string}`>;
 		handleHttpError?: PrerenderHttpErrorHandlerValue;
 		handleMissingId?: PrerenderMissingIdHandlerValue;

package/types/internal.d.ts

@@ -29,11 +29,11 @@ export interface ServerModule {
 	Server: typeof InternalServer;
 
 	override(options: {
+		building: boolean;
 		paths: {
 			base: string;
 			assets: string;
 		};
-		prerendering: boolean;
 		protocol?: 'http' | 'https';
 		read(file: string): Buffer;
 	}): void;