diff --git a/.changeset/long-paws-judge.md b/.changeset/long-paws-judge.md new file mode 100644 index 000000000000..de4a6d13c14d --- /dev/null +++ b/.changeset/long-paws-judge.md @@ -0,0 +1,5 @@ +--- +'@sveltejs/kit': patch +--- + +fix: use internal alias that won't collide with user aliases diff --git a/packages/kit/package.json b/packages/kit/package.json index 5dc733c3f2b7..0ccdde59d0f6 100644 --- a/packages/kit/package.json +++ b/packages/kit/package.json @@ -57,7 +57,7 @@ "postinstall.js" ], "scripts": { - "lint": "prettier --check . --config ../../.prettierrc --ignore-path .gitignore && eslint src/**", + "lint": "prettier --check . --config ../../.prettierrc --ignore-path .gitignore && eslint src/**/*.js", "check": "tsc", "check:all": "tsc && pnpm -r --filter=\"./**\" check", "format": "prettier --write . --config ../../.prettierrc --ignore-path .gitignore", diff --git a/packages/kit/src/exports/vite/index.js b/packages/kit/src/exports/vite/index.js index 8759b42e65ba..96a5bc53c22d 100644 --- a/packages/kit/src/exports/vite/index.js +++ b/packages/kit/src/exports/vite/index.js @@ -320,7 +320,7 @@ function kit({ svelte_config }) { async resolveId(id) { // treat $env/static/[public|private] as virtual - if (id.startsWith('$env/') || id === '$internal/paths' || id === '$service-worker') { + if (id.startsWith('$env/') || id === '@sveltejs/kit/paths' || id === '$service-worker') { return `\0${id}`; } }, @@ -358,7 +358,9 @@ function kit({ svelte_config }) { ); case '\0$service-worker': return create_service_worker_module(svelte_config); - case '\0$internal/paths': + // 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': const { assets, base } = svelte_config.kit.paths; return `export const base = ${s(base)}; export let assets = ${assets ? s(assets) : 'base'}; diff --git a/packages/kit/src/internal.d.ts b/packages/kit/src/internal.d.ts new file mode 100644 index 000000000000..6e9e1f37c16c --- /dev/null +++ b/packages/kit/src/internal.d.ts @@ -0,0 +1,6 @@ +/** Internal version of $app/paths */ +declare module '@sveltejs/kit/paths' { + export const base: `/${string}`; + export let assets: `https://${string}` | `http://${string}`; + export function set_assets(path: string): void; +} diff --git a/packages/kit/src/runtime/app/paths.js b/packages/kit/src/runtime/app/paths.js index 31d76ad8d7f8..50b72033cf85 100644 --- a/packages/kit/src/runtime/app/paths.js +++ b/packages/kit/src/runtime/app/paths.js @@ -1 +1 @@ -export { base, assets } from '$internal/paths'; +export { base, assets } from '@sveltejs/kit/paths'; diff --git a/packages/kit/src/runtime/client/client.js b/packages/kit/src/runtime/client/client.js index 1ff4b14c1780..b37c5e438ef3 100644 --- a/packages/kit/src/runtime/client/client.js +++ b/packages/kit/src/runtime/client/client.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 '$internal/paths'; +import { base } from '@sveltejs/kit/paths'; import { HttpError, Redirect } from '../control.js'; import { stores } from './singletons.js'; import { unwrap_promises } from '../../utils/promises.js'; diff --git a/packages/kit/src/runtime/client/utils.js b/packages/kit/src/runtime/client/utils.js index 1c3c392af649..75efa8d09d03 100644 --- a/packages/kit/src/runtime/client/utils.js +++ b/packages/kit/src/runtime/client/utils.js @@ -1,6 +1,6 @@ import { BROWSER, DEV } from 'esm-env'; import { writable } from 'svelte/store'; -import { assets } from '$internal/paths'; +import { assets } from '@sveltejs/kit/paths'; import { version } from '../shared.js'; import { PRELOAD_PRIORITIES } from './constants.js'; diff --git a/packages/kit/src/runtime/server/fetch.js b/packages/kit/src/runtime/server/fetch.js index ebde07df2b66..db54ba522ec4 100644 --- a/packages/kit/src/runtime/server/fetch.js +++ b/packages/kit/src/runtime/server/fetch.js @@ -1,6 +1,6 @@ import * as set_cookie_parser from 'set-cookie-parser'; import { respond } from './respond.js'; -import * as paths from '$internal/paths'; +import * as paths from '@sveltejs/kit/paths'; /** * @param {{ diff --git a/packages/kit/src/runtime/server/page/render.js b/packages/kit/src/runtime/server/page/render.js index 12a49c4b4ecb..454e1f4cbc60 100644 --- a/packages/kit/src/runtime/server/page/render.js +++ b/packages/kit/src/runtime/server/page/render.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 '$internal/paths'; +import { assets, base } from '@sveltejs/kit/paths'; import { hash } from '../../hash.js'; import { serialize_data } from './serialize_data.js'; import { s } from '../../../utils/misc.js'; diff --git a/packages/kit/src/runtime/server/respond.js b/packages/kit/src/runtime/server/respond.js index 658b9b25d801..19f90328dcdb 100644 --- a/packages/kit/src/runtime/server/respond.js +++ b/packages/kit/src/runtime/server/respond.js @@ -1,5 +1,5 @@ import { DEV } from 'esm-env'; -import { base } from '$internal/paths'; +import { base } from '@sveltejs/kit/paths'; import { is_endpoint_request, render_endpoint } from './endpoint.js'; import { render_page } from './page/index.js'; import { render_response } from './page/render.js'; diff --git a/packages/kit/src/runtime/shared.js b/packages/kit/src/runtime/shared.js index 40c372a51b45..e633d337d7c0 100644 --- a/packages/kit/src/runtime/shared.js +++ b/packages/kit/src/runtime/shared.js @@ -1,4 +1,4 @@ -export { set_assets } from '$internal/paths'; +export { set_assets } from '@sveltejs/kit/paths'; export let building = false; export let version = ''; diff --git a/packages/kit/types/ambient.d.ts b/packages/kit/types/ambient.d.ts index 5573b72ce59d..fd6e11558361 100644 --- a/packages/kit/types/ambient.d.ts +++ b/packages/kit/types/ambient.d.ts @@ -438,10 +438,3 @@ declare module '@sveltejs/kit/vite' { export function sveltekit(): Promise; 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; -} diff --git a/sites/kit.svelte.dev/src/lib/docs/server/render.js b/sites/kit.svelte.dev/src/lib/docs/server/render.js index d31435c50ec3..e295909e2cff 100644 --- a/sites/kit.svelte.dev/src/lib/docs/server/render.js +++ b/sites/kit.svelte.dev/src/lib/docs/server/render.js @@ -69,7 +69,7 @@ export function replace_placeholders(content) { let import_block = ''; - if (module.exports.length > 0 && !module.name.startsWith('$internal')) { + if (module.exports.length > 0) { // deduplication is necessary for now, because of `error()` overload const exports = Array.from(new Set(module.exports.map((x) => x.name)));