revert #9022

Author: Rich-Harris

packages/kit/package.json

@@ -57,7 +57,7 @@
 		"postinstall.js"
 	],
 	"scripts": {
-		"lint": "prettier --check . --config ../../.prettierrc --ignore-path .gitignore && eslint src/**/*.js",
+		"lint": "prettier --check . --config ../../.prettierrc --ignore-path .gitignore && eslint src/**",
 		"check": "tsc",
 		"check:all": "tsc && pnpm -r --filter=\"./**\" check",
 		"format": "prettier --write . --config ../../.prettierrc --ignore-path .gitignore",

packages/kit/src/exports/vite/index.js

@@ -324,7 +324,7 @@ function kit({ svelte_config }) {
 
 		async resolveId(id) {
 			// treat $env/static/[public|private] as virtual
-			if (id.startsWith('$env/') || id === '@sveltejs/kit/paths' || id === '$service-worker') {
+			if (id.startsWith('$env/') || id === '$internal/paths' || id === '$service-worker') {
 				return `\0${id}`;
 			}
 		},
@@ -362,9 +362,7 @@ function kit({ svelte_config }) {
 					);
 				case '\0$service-worker':
 					return create_service_worker_module(svelte_config);
-				// for internal use only. it's published as $app/paths externally
-				// we use this alias so that we won't collide with user aliases
-				case '\0@sveltejs/kit/paths':
+				case '\0$internal/paths':
 					const { assets, base } = svelte_config.kit.paths;
 					return `export const base = ${s(base)};
 export let assets = ${assets ? s(assets) : 'base'};

packages/kit/src/internal.d.ts

@@ -1 +1 @@
-export { base, assets } from '@sveltejs/kit/paths';
+export { base, assets } from '$internal/paths';

packages/kit/src/runtime/app/paths.js

@@ -27,7 +27,7 @@ import { parse } from './parse.js';
 
 import Root from '__GENERATED__/root.svelte';
 import { nodes, server_loads, dictionary, matchers, hooks } from '__CLIENT__/manifest.js';
-import { base } from '@sveltejs/kit/paths';
+import { base } from '$internal/paths';
 import { HttpError, Redirect } from '../control.js';
 import { stores } from './singletons.js';
 import { unwrap_promises } from '../../utils/promises.js';

packages/kit/src/runtime/client/client.js

@@ -1,6 +1,6 @@
 import { BROWSER, DEV } from 'esm-env';
 import { writable } from 'svelte/store';
-import { assets } from '@sveltejs/kit/paths';
+import { assets } from '$internal/paths';
 import { version } from '../shared.js';
 import { PRELOAD_PRIORITIES } from './constants.js';
 

packages/kit/src/runtime/client/utils.js

@@ -1,6 +1,6 @@
 import * as set_cookie_parser from 'set-cookie-parser';
 import { respond } from './respond.js';
-import * as paths from '@sveltejs/kit/paths';
+import * as paths from '$internal/paths';
 
 /**
  * @param {{

packages/kit/src/runtime/server/fetch.js

@@ -1,7 +1,7 @@
 import * as devalue from 'devalue';
 import { readable, writable } from 'svelte/store';
 import { DEV } from 'esm-env';
-import { assets, base } from '@sveltejs/kit/paths';
+import { assets, base } from '$internal/paths';
 import { hash } from '../../hash.js';
 import { serialize_data } from './serialize_data.js';
 import { s } from '../../../utils/misc.js';

packages/kit/src/runtime/server/page/render.js

@@ -1,5 +1,5 @@
 import { DEV } from 'esm-env';
-import { base } from '@sveltejs/kit/paths';
+import { base } from '$internal/paths';
 import { is_endpoint_request, render_endpoint } from './endpoint.js';
 import { render_page } from './page/index.js';
 import { render_response } from './page/render.js';

packages/kit/src/runtime/server/respond.js

@@ -1,4 +1,4 @@
-export { set_assets } from '@sveltejs/kit/paths';
+export { set_assets } from '$internal/paths';
 
 export let building = false;
 export let version = '';

packages/kit/src/runtime/shared.js

@@ -438,3 +438,10 @@ declare module '@sveltejs/kit/vite' {
 	export function sveltekit(): Promise<Plugin[]>;
 	export { vitePreprocess } from '@sveltejs/vite-plugin-svelte';
 }
+
+/** Internal version of $app/paths */
+declare module '$internal/paths' {
+	export const base: `/${string}`;
+	export let assets: `https://${string}` | `http://${string}`;
+	export function set_assets(path: string): void;
+}

packages/kit/types/ambient.d.ts

@@ -69,7 +69,7 @@ export function replace_placeholders(content) {
 
 					let import_block = '';
 
-					if (module.exports.length > 0) {
+					if (module.exports.length > 0 && !module.name.startsWith('$internal')) {
 						// deduplication is necessary for now, because of `error()` overload
 						const exports = Array.from(new Set(module.exports.map((x) => x.name)));