From 90e9350f4e54f9677cf1bf7cf6cb59931fb25d2a Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Tue, 14 Feb 2023 16:26:23 -0500 Subject: [PATCH 1/2] revert #9022 --- packages/kit/package.json | 2 +- packages/kit/src/exports/vite/index.js | 6 ++---- packages/kit/src/internal.d.ts | 6 ------ packages/kit/src/runtime/app/paths.js | 2 +- packages/kit/src/runtime/client/client.js | 2 +- packages/kit/src/runtime/client/utils.js | 2 +- packages/kit/src/runtime/server/fetch.js | 2 +- packages/kit/src/runtime/server/page/render.js | 2 +- packages/kit/src/runtime/server/respond.js | 2 +- packages/kit/src/runtime/shared.js | 2 +- packages/kit/types/ambient.d.ts | 7 +++++++ sites/kit.svelte.dev/src/lib/docs/server/render.js | 2 +- 12 files changed, 18 insertions(+), 19 deletions(-) delete mode 100644 packages/kit/src/internal.d.ts diff --git a/packages/kit/package.json b/packages/kit/package.json index b1fb8cf02396..52bb88be155a 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/**/*.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", diff --git a/packages/kit/src/exports/vite/index.js b/packages/kit/src/exports/vite/index.js index b31d2ae84b3a..871611f3e2c0 100644 --- a/packages/kit/src/exports/vite/index.js +++ b/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'}; diff --git a/packages/kit/src/internal.d.ts b/packages/kit/src/internal.d.ts deleted file mode 100644 index 6e9e1f37c16c..000000000000 --- a/packages/kit/src/internal.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -/** 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 50b72033cf85..31d76ad8d7f8 100644 --- a/packages/kit/src/runtime/app/paths.js +++ b/packages/kit/src/runtime/app/paths.js @@ -1 +1 @@ -export { base, assets } from '@sveltejs/kit/paths'; +export { base, assets } from '$internal/paths'; diff --git a/packages/kit/src/runtime/client/client.js b/packages/kit/src/runtime/client/client.js index b37c5e438ef3..1ff4b14c1780 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 '@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'; diff --git a/packages/kit/src/runtime/client/utils.js b/packages/kit/src/runtime/client/utils.js index 75efa8d09d03..1c3c392af649 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 '@sveltejs/kit/paths'; +import { assets } from '$internal/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 db54ba522ec4..ebde07df2b66 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 '@sveltejs/kit/paths'; +import * as paths from '$internal/paths'; /** * @param {{ diff --git a/packages/kit/src/runtime/server/page/render.js b/packages/kit/src/runtime/server/page/render.js index 454e1f4cbc60..12a49c4b4ecb 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 '@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'; diff --git a/packages/kit/src/runtime/server/respond.js b/packages/kit/src/runtime/server/respond.js index 19f90328dcdb..658b9b25d801 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 '@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'; diff --git a/packages/kit/src/runtime/shared.js b/packages/kit/src/runtime/shared.js index e633d337d7c0..40c372a51b45 100644 --- a/packages/kit/src/runtime/shared.js +++ b/packages/kit/src/runtime/shared.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 = ''; diff --git a/packages/kit/types/ambient.d.ts b/packages/kit/types/ambient.d.ts index fd6e11558361..5573b72ce59d 100644 --- a/packages/kit/types/ambient.d.ts +++ b/packages/kit/types/ambient.d.ts @@ -438,3 +438,10 @@ 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 e295909e2cff..d31435c50ec3 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) { + 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))); From f6d08ca531d012fd8dd94bd3086254da6b0c5462 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Tue, 14 Feb 2023 16:27:20 -0500 Subject: [PATCH 2/2] changeset --- .changeset/sixty-foxes-boil.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/sixty-foxes-boil.md diff --git a/.changeset/sixty-foxes-boil.md b/.changeset/sixty-foxes-boil.md new file mode 100644 index 000000000000..d1db8dafac23 --- /dev/null +++ b/.changeset/sixty-foxes-boil.md @@ -0,0 +1,5 @@ +--- +'@sveltejs/kit': patch +--- + +fix: revert internal alias change