From 43c5f2ccec0e702e245d8d90c939e2bfe8efafc7 Mon Sep 17 00:00:00 2001 From: Bjorn Lu Date: Fri, 10 Nov 2023 01:35:07 +0800 Subject: [PATCH] chore: update types resolution setup (#10997) Co-authored-by: Ben McCann <322311+benmccann@users.noreply.github.com> --- packages/adapter-auto/tsconfig.json | 5 +- packages/adapter-cloudflare-workers/index.js | 2 +- .../adapter-cloudflare-workers/tsconfig.json | 5 +- packages/adapter-cloudflare/index.js | 6 +-- .../{placeholders.ts => placeholders.d.ts} | 0 packages/adapter-cloudflare/tsconfig.json | 7 +-- packages/adapter-netlify/index.js | 2 +- packages/adapter-netlify/src/serverless.js | 2 +- packages/adapter-netlify/tsconfig.json | 4 +- packages/adapter-node/index.js | 2 +- packages/adapter-node/package.json | 4 +- packages/adapter-node/tsconfig.json | 7 ++- packages/adapter-static/index.js | 4 +- packages/adapter-static/platforms.js | 2 +- packages/adapter-static/tsconfig.json | 4 +- packages/adapter-vercel/tsconfig.json | 4 +- packages/create-svelte/index.js | 16 +++--- packages/create-svelte/tsconfig.json | 9 ++-- packages/create-svelte/types/index.d.ts | 2 +- packages/kit/src/core/config/options.js | 2 +- .../core/sync/create_manifest_data/index.js | 2 +- .../src/exports/vite/build/build_server.js | 2 +- .../src/exports/vite/graph_analysis/index.js | 2 +- .../exports/vite/graph_analysis/index.spec.js | 2 +- packages/kit/src/exports/vite/index.js | 8 +-- .../kit/src/exports/vite/preview/index.js | 5 +- packages/kit/src/runtime/client/client.js | 54 +++++++++---------- packages/kit/src/runtime/client/parse.js | 2 +- packages/kit/src/runtime/client/singletons.js | 4 +- packages/kit/src/runtime/client/start.js | 4 +- packages/kit/src/runtime/client/types.d.ts | 4 +- packages/kit/src/runtime/server/cookie.js | 4 +- packages/kit/src/runtime/server/page/csp.js | 4 +- packages/kit/src/runtime/server/page/index.js | 2 +- .../kit/src/runtime/server/page/load_data.js | 4 +- .../kit/src/runtime/server/page/render.js | 4 +- .../runtime/server/page/respond_with_error.js | 2 +- packages/kit/src/runtime/server/respond.js | 2 +- packages/kit/src/types/internal.d.ts | 2 +- .../tsconfig.json | 1 - .../apps/private-dynamic-env/tsconfig.json | 1 - .../tsconfig.json | 1 - .../apps/private-static-env/tsconfig.json | 1 - .../tsconfig.json | 1 - .../apps/server-only-folder/tsconfig.json | 1 - .../tsconfig.json | 1 - .../apps/server-only-module/tsconfig.json | 1 - .../apps/syntax-error/tsconfig.json | 1 - packages/kit/tsconfig.json | 8 +-- packages/migrate/tsconfig.json | 6 +-- packages/package/src/cli.js | 2 +- packages/package/src/config.js | 2 +- packages/package/src/index.js | 12 ++--- packages/package/src/typescript.js | 2 +- packages/package/src/utils.js | 4 +- packages/package/src/validate.js | 4 +- packages/package/test/index.js | 2 +- packages/package/tsconfig.json | 6 +-- pnpm-lock.yaml | 20 +++---- .../src/lib/server/docs/index.js | 12 ++--- sites/kit.svelte.dev/tsconfig.json | 1 + 61 files changed, 143 insertions(+), 149 deletions(-) rename packages/adapter-cloudflare/{placeholders.ts => placeholders.d.ts} (100%) diff --git a/packages/adapter-auto/tsconfig.json b/packages/adapter-auto/tsconfig.json index d42c1c9c4b32..c1f396b255ce 100644 --- a/packages/adapter-auto/tsconfig.json +++ b/packages/adapter-auto/tsconfig.json @@ -4,9 +4,8 @@ "checkJs": true, "noEmit": true, "noImplicitAny": true, - "module": "esnext", - "target": "esnext", - "skipLibCheck": true, + "target": "es2022", + "module": "node16", "moduleResolution": "node16", "baseUrl": "." }, diff --git a/packages/adapter-cloudflare-workers/index.js b/packages/adapter-cloudflare-workers/index.js index 6ab595989024..78ed40939dc2 100644 --- a/packages/adapter-cloudflare-workers/index.js +++ b/packages/adapter-cloudflare-workers/index.js @@ -14,7 +14,7 @@ import { fileURLToPath } from 'node:url'; * }} WranglerConfig */ -/** @type {import('.').default} */ +/** @type {import('./index.js').default} */ export default function ({ config = 'wrangler.toml' } = {}) { return { name: '@sveltejs/adapter-cloudflare-workers', diff --git a/packages/adapter-cloudflare-workers/tsconfig.json b/packages/adapter-cloudflare-workers/tsconfig.json index f4c98fd3be96..1cb740d0614c 100644 --- a/packages/adapter-cloudflare-workers/tsconfig.json +++ b/packages/adapter-cloudflare-workers/tsconfig.json @@ -4,8 +4,9 @@ "checkJs": true, "noEmit": true, "noImplicitAny": true, - "module": "es2020", - "moduleResolution": "node", + "target": "es2022", + "module": "node16", + "moduleResolution": "node16", "allowSyntheticDefaultImports": true, "baseUrl": ".", "paths": { diff --git a/packages/adapter-cloudflare/index.js b/packages/adapter-cloudflare/index.js index 1dd0abd06470..a9e3f98405c1 100644 --- a/packages/adapter-cloudflare/index.js +++ b/packages/adapter-cloudflare/index.js @@ -3,7 +3,7 @@ import * as path from 'node:path'; import { fileURLToPath } from 'node:url'; import * as esbuild from 'esbuild'; -/** @type {import('.').default} */ +/** @type {import('./index.js').default} */ export default function (options = {}) { return { name: '@sveltejs/adapter-cloudflare', @@ -67,8 +67,8 @@ export default function (options = {}) { /** * @param {import('@sveltejs/kit').Builder} builder * @param {string[]} assets - * @param {import('./index').AdapterOptions['routes']} routes - * @returns {import('.').RoutesJSONSpec} + * @param {import('./index.js').AdapterOptions['routes']} routes + * @returns {import('./index.js').RoutesJSONSpec} */ function get_routes_json(builder, assets, { include = ['/*'], exclude = [''] }) { if (!Array.isArray(include) || !Array.isArray(exclude)) { diff --git a/packages/adapter-cloudflare/placeholders.ts b/packages/adapter-cloudflare/placeholders.d.ts similarity index 100% rename from packages/adapter-cloudflare/placeholders.ts rename to packages/adapter-cloudflare/placeholders.d.ts diff --git a/packages/adapter-cloudflare/tsconfig.json b/packages/adapter-cloudflare/tsconfig.json index 4a37ad69ac8c..7ebf502ced9e 100644 --- a/packages/adapter-cloudflare/tsconfig.json +++ b/packages/adapter-cloudflare/tsconfig.json @@ -4,12 +4,13 @@ "checkJs": true, "noEmit": true, "noImplicitAny": true, - "module": "es2020", - "moduleResolution": "node", + "target": "es2022", + "module": "node16", + "moduleResolution": "node16", "baseUrl": ".", "paths": { "@sveltejs/kit": ["../kit/types/index"] } }, - "include": ["index.js", "placeholders.ts", "src/worker.js"] + "include": ["index.js", "placeholders.d.ts", "src/worker.js"] } diff --git a/packages/adapter-netlify/index.js b/packages/adapter-netlify/index.js index 3307a730935e..fafcecfea75a 100644 --- a/packages/adapter-netlify/index.js +++ b/packages/adapter-netlify/index.js @@ -35,7 +35,7 @@ const edge_set_in_env_var = const FUNCTION_PREFIX = 'sveltekit-'; -/** @type {import('.').default} */ +/** @type {import('./index.js').default} */ export default function ({ split = false, edge = edge_set_in_env_var } = {}) { return { name: '@sveltejs/adapter-netlify', diff --git a/packages/adapter-netlify/src/serverless.js b/packages/adapter-netlify/src/serverless.js index f898796b8902..db394a888302 100644 --- a/packages/adapter-netlify/src/serverless.js +++ b/packages/adapter-netlify/src/serverless.js @@ -1,6 +1,6 @@ import './shims'; import { Server } from '0SERVER'; -import { split_headers } from './headers'; +import { split_headers } from './headers.js'; /** * @param {import('@sveltejs/kit').SSRManifest} manifest diff --git a/packages/adapter-netlify/tsconfig.json b/packages/adapter-netlify/tsconfig.json index 0a6b886c8407..050c14d467ea 100644 --- a/packages/adapter-netlify/tsconfig.json +++ b/packages/adapter-netlify/tsconfig.json @@ -4,8 +4,10 @@ "checkJs": true, "noEmit": true, "noImplicitAny": true, - "module": "es2022", "target": "es2022", + "module": "es2022", + // `@netlify/function` > `@netlify/serverless-functions-api` types are not compatible, + // so using this moduleResolution for now "moduleResolution": "node", "allowSyntheticDefaultImports": true, "baseUrl": ".", diff --git a/packages/adapter-node/index.js b/packages/adapter-node/index.js index 8d5c1629a4cf..2d34cfb22d29 100644 --- a/packages/adapter-node/index.js +++ b/packages/adapter-node/index.js @@ -7,7 +7,7 @@ import json from '@rollup/plugin-json'; const files = fileURLToPath(new URL('./files', import.meta.url).href); -/** @type {import('.').default} */ +/** @type {import('./index.js').default} */ export default function (opts = {}) { const { out = 'build', precompress, envPrefix = '', polyfill = true } = opts; diff --git a/packages/adapter-node/package.json b/packages/adapter-node/package.json index 6b13c7272a30..3588e72581fa 100644 --- a/packages/adapter-node/package.json +++ b/packages/adapter-node/package.json @@ -33,11 +33,11 @@ "prepublishOnly": "pnpm build" }, "devDependencies": { - "@polka/url": "^1.0.0-next.21", + "@polka/url": "^1.0.0-next.23", "@sveltejs/kit": "workspace:^", "@types/node": "^16.18.6", "c8": "^8.0.0", - "polka": "^1.0.0-next.22", + "polka": "^1.0.0-next.23", "sirv": "^2.0.3", "typescript": "^4.9.4", "vitest": "^0.34.5" diff --git a/packages/adapter-node/tsconfig.json b/packages/adapter-node/tsconfig.json index 63ea97316689..7d320c09f70c 100644 --- a/packages/adapter-node/tsconfig.json +++ b/packages/adapter-node/tsconfig.json @@ -5,9 +5,12 @@ "noEmit": true, "noImplicitAny": true, "allowSyntheticDefaultImports": true, - "moduleResolution": "node", + "target": "es2022", "module": "es2022", - "target": "es2017", + // Can't use moduleResolution: node16 because of these issues: + // https://github.com/rollup/plugins/issues/1329 + // https://github.com/lukeed/polka/issues/199 + "moduleResolution": "node", "baseUrl": ".", "paths": { "@sveltejs/kit": ["../kit/types/index"] diff --git a/packages/adapter-static/index.js b/packages/adapter-static/index.js index 96ccf731dd98..4b4fb8465924 100644 --- a/packages/adapter-static/index.js +++ b/packages/adapter-static/index.js @@ -1,7 +1,7 @@ import path from 'node:path'; import { platforms } from './platforms.js'; -/** @type {import('.').default} */ +/** @type {import('./index.js').default} */ export default function (options) { return { name: '@sveltejs/adapter-static', @@ -56,7 +56,7 @@ See https://kit.svelte.dev/docs/page-options#prerender for more details` assets = pages, fallback, precompress - } = options ?? platform?.defaults ?? /** @type {import('./index').AdapterOptions} */ ({}); + } = options ?? platform?.defaults ?? /** @type {import('./index.js').AdapterOptions} */ ({}); builder.rimraf(assets); builder.rimraf(pages); diff --git a/packages/adapter-static/platforms.js b/packages/adapter-static/platforms.js index 189865b106b8..908e74b29a86 100644 --- a/packages/adapter-static/platforms.js +++ b/packages/adapter-static/platforms.js @@ -4,7 +4,7 @@ import fs from 'node:fs'; * @typedef {{ * name: string; * test: () => boolean; - * defaults: import('./index').AdapterOptions; + * defaults: import('./index.js').AdapterOptions; * done: (builder: import('@sveltejs/kit').Builder) => void; * }} * Platform */ diff --git a/packages/adapter-static/tsconfig.json b/packages/adapter-static/tsconfig.json index 7953ec985e76..1723393334d7 100644 --- a/packages/adapter-static/tsconfig.json +++ b/packages/adapter-static/tsconfig.json @@ -4,9 +4,9 @@ "checkJs": true, "noEmit": true, "noImplicitAny": true, - "module": "es2022", "target": "es2022", - "moduleResolution": "node", + "module": "node16", + "moduleResolution": "node16", "allowSyntheticDefaultImports": true, "baseUrl": ".", "paths": { diff --git a/packages/adapter-vercel/tsconfig.json b/packages/adapter-vercel/tsconfig.json index f93d6d1bbcc8..8aa63e3d2a76 100644 --- a/packages/adapter-vercel/tsconfig.json +++ b/packages/adapter-vercel/tsconfig.json @@ -5,9 +5,9 @@ "strict": true, "noEmit": true, "noImplicitAny": true, - "module": "es2022", - "moduleResolution": "node", "target": "es2022", + "module": "node16", + "moduleResolution": "node16", "allowSyntheticDefaultImports": true, "baseUrl": ".", "paths": { diff --git a/packages/create-svelte/index.js b/packages/create-svelte/index.js index d6888950c337..74eab9b63e8d 100755 --- a/packages/create-svelte/index.js +++ b/packages/create-svelte/index.js @@ -2,7 +2,7 @@ import fs from 'node:fs'; import path from 'node:path'; import { mkdirp, copy, dist } from './utils.js'; -/** @type {import('./types/index').create} */ +/** @type {import('./types/index.js').create} */ export async function create(cwd, options) { mkdirp(cwd); @@ -22,7 +22,7 @@ function write_template_files(template, types, name, cwd) { copy(`${dir}/package.json`, `${cwd}/package.json`); const manifest = `${dir}/files.types=${types}.json`; - const files = /** @type {import('./types/internal').File[]} */ ( + const files = /** @type {import('./types/internal.js').File[]} */ ( JSON.parse(fs.readFileSync(manifest, 'utf-8')) ); @@ -37,12 +37,12 @@ function write_template_files(template, types, name, cwd) { /** * * @param {string} cwd - * @param {import('./types/internal').Options} options + * @param {import('./types/internal.js').Options} options * @param {string} name */ function write_common_files(cwd, options, name) { const shared = dist('shared.json'); - const { files } = /** @type {import('./types/internal').Common} */ ( + const { files } = /** @type {import('./types/internal.js').Common} */ ( JSON.parse(fs.readFileSync(shared, 'utf-8')) ); @@ -73,8 +73,8 @@ function write_common_files(cwd, options, name) { } /** - * @param {import('./types/internal').Condition} condition - * @param {import('./types/internal').Options} options + * @param {import('./types/internal.js').Condition} condition + * @param {import('./types/internal.js').Options} options * @returns {boolean} */ function matches_condition(condition, options) { @@ -134,8 +134,8 @@ function sort_keys(obj) { * Sort files so that those which apply more generically come first so they * can be overwritten by files for more precise cases later. * - * @param files {import('./types/internal').Common['files']} - * */ + * @param {import('./types/internal.js').Common['files']} files + */ function sort_files(files) { return files.sort((f1, f2) => { const f1_more_generic = diff --git a/packages/create-svelte/tsconfig.json b/packages/create-svelte/tsconfig.json index a5d5c18dc879..41f0745444fe 100644 --- a/packages/create-svelte/tsconfig.json +++ b/packages/create-svelte/tsconfig.json @@ -3,12 +3,11 @@ "allowJs": true, "checkJs": true, "noEmit": true, - "target": "esnext", - "module": "esnext", - "moduleResolution": "node", + "target": "es2022", + "module": "node16", + "moduleResolution": "node16", "allowSyntheticDefaultImports": true, - "strict": true, - "skipLibCheck": true + "strict": true }, "include": ["./scripts/**/*", "./test/*.js", "./*.js"] } diff --git a/packages/create-svelte/types/index.d.ts b/packages/create-svelte/types/index.d.ts index ef78af4797b1..1f1a4a6191bc 100644 --- a/packages/create-svelte/types/index.d.ts +++ b/packages/create-svelte/types/index.d.ts @@ -1,4 +1,4 @@ -import { Options } from './internal'; +import { Options } from './internal.js'; /** * Create a new SvelteKit project. diff --git a/packages/kit/src/core/config/options.js b/packages/kit/src/core/config/options.js index 7d7351023e61..2d0c928d9290 100644 --- a/packages/kit/src/core/config/options.js +++ b/packages/kit/src/core/config/options.js @@ -1,6 +1,6 @@ import { join } from 'node:path'; -/** @typedef {import('./types').Validator} Validator */ +/** @typedef {import('./types.js').Validator} Validator */ const directives = object({ 'child-src': string_array(), diff --git a/packages/kit/src/core/sync/create_manifest_data/index.js b/packages/kit/src/core/sync/create_manifest_data/index.js index 9ca662b78f58..5d72686db746 100644 --- a/packages/kit/src/core/sync/create_manifest_data/index.js +++ b/packages/kit/src/core/sync/create_manifest_data/index.js @@ -444,7 +444,7 @@ function create_routes_and_nodes(cwd, config, fallback) { * @param {string} file * @param {string[]} component_extensions * @param {string[]} module_extensions - * @returns {import('./types').RouteFile} + * @returns {import('./types.js').RouteFile} */ function analyze(project_relative, file, component_extensions, module_extensions) { const component_extension = component_extensions.find((ext) => file.endsWith(ext)); diff --git a/packages/kit/src/exports/vite/build/build_server.js b/packages/kit/src/exports/vite/build/build_server.js index cebe5f7f6c2b..f13c29872e38 100644 --- a/packages/kit/src/exports/vite/build/build_server.js +++ b/packages/kit/src/exports/vite/build/build_server.js @@ -10,7 +10,7 @@ import { normalizePath } from 'vite'; * @param {import('types').ManifestData} manifest_data * @param {import('vite').Manifest} server_manifest * @param {import('vite').Manifest | null} client_manifest - * @param {import('rollup').OutputAsset[] | null} css + * @param {import('vite').Rollup.OutputAsset[] | null} css */ export function build_server_nodes(out, kit, manifest_data, server_manifest, client_manifest, css) { mkdirp(`${out}/server/nodes`); diff --git a/packages/kit/src/exports/vite/graph_analysis/index.js b/packages/kit/src/exports/vite/graph_analysis/index.js index 63d807669ce7..6dc6860a0a3c 100644 --- a/packages/kit/src/exports/vite/graph_analysis/index.js +++ b/packages/kit/src/exports/vite/graph_analysis/index.js @@ -25,7 +25,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 {import('vite').Rollup.PluginContext} context * @param {{ cwd: string; lib: string }} paths */ export function module_guard(context, { cwd, lib }) { diff --git a/packages/kit/src/exports/vite/graph_analysis/index.spec.js b/packages/kit/src/exports/vite/graph_analysis/index.spec.js index 292de805944f..d149111f36af 100644 --- a/packages/kit/src/exports/vite/graph_analysis/index.spec.js +++ b/packages/kit/src/exports/vite/graph_analysis/index.spec.js @@ -8,7 +8,7 @@ import { module_guard } from './index.js'; */ function check(graph, expected_error) { // @ts-expect-error - const context = /** @type {import('rollup').PluginContext} */ ({ + const context = /** @type {import('vite').Rollup.PluginContext} */ ({ /** @param {string} id */ getModuleInfo(id) { return { diff --git a/packages/kit/src/exports/vite/index.js b/packages/kit/src/exports/vite/index.js index fcbf4c3401c3..a7a886d6d745 100644 --- a/packages/kit/src/exports/vite/index.js +++ b/packages/kit/src/exports/vite/index.js @@ -30,7 +30,7 @@ export { vitePreprocess } from '@sveltejs/vite-plugin-svelte'; const cwd = process.cwd(); -/** @type {import('./types').EnforcedConfig} */ +/** @type {import('./types.js').EnforcedConfig} */ const enforced_config = { appType: true, base: true, @@ -702,7 +702,7 @@ function kit({ svelte_config }) { secondary_build_started = true; - const { output } = /** @type {import('rollup').RollupOutput} */ ( + const { output } = /** @type {import('vite').Rollup.RollupOutput} */ ( await vite.build({ configFile: vite_config.configFile, // CLI args @@ -742,7 +742,7 @@ function kit({ svelte_config }) { }; const css = output.filter( - /** @type {(value: any) => value is import('rollup').OutputAsset} */ + /** @type {(value: any) => value is import('vite').Rollup.OutputAsset} */ (value) => value.type === 'asset' && value.fileName.endsWith('.css') ); @@ -863,7 +863,7 @@ function warn_overridden_config(config, resolved_config) { /** * @param {Record} config * @param {Record} resolved_config - * @param {import('./types').EnforcedConfig} enforced_config + * @param {import('./types.js').EnforcedConfig} enforced_config * @param {string} path * @param {string[]} out used locally to compute the return value */ diff --git a/packages/kit/src/exports/vite/preview/index.js b/packages/kit/src/exports/vite/preview/index.js index 445334635d2c..b6a849093909 100644 --- a/packages/kit/src/exports/vite/preview/index.js +++ b/packages/kit/src/exports/vite/preview/index.js @@ -15,10 +15,7 @@ import { not_found } from '../utils.js'; /** @typedef {(req: Req, res: Res, next: () => void) => void} Handler */ /** - * @param {{ - * middlewares: import('connect').Server; - * httpServer: import('http').Server; - * }} vite + * @param {{ middlewares: import('connect').Server }} vite * @param {import('vite').ResolvedConfig} vite_config * @param {import('types').ValidatedConfig} svelte_config */ diff --git a/packages/kit/src/runtime/client/client.js b/packages/kit/src/runtime/client/client.js index 852b09a7446e..80abcfd65742 100644 --- a/packages/kit/src/runtime/client/client.js +++ b/packages/kit/src/runtime/client/client.js @@ -56,9 +56,9 @@ function update_scroll_positions(index) { } /** - * @param {import('./types').SvelteKitApp} app + * @param {import('./types.js').SvelteKitApp} app * @param {HTMLElement} target - * @returns {import('./types').Client} + * @returns {import('./types.js').Client} */ export function create_client(app, target) { const routes = parse(app); @@ -83,7 +83,7 @@ export function create_client(app, target) { */ const components = []; - /** @type {{id: string, promise: Promise} | null} */ + /** @type {{id: string, promise: Promise} | null} */ let load_cache = null; const callbacks = { @@ -97,7 +97,7 @@ export function create_client(app, target) { after_navigate: [] }; - /** @type {import('./types').NavigationState} */ + /** @type {import('./types.js').NavigationState} */ let current = { branch: [], error: null, @@ -248,7 +248,7 @@ export function create_client(app, target) { }); } - /** @param {import('./types').NavigationIntent} intent */ + /** @param {import('./types.js').NavigationIntent} intent */ async function preload_data(intent) { load_cache = { id: intent.id, @@ -275,7 +275,7 @@ export function create_client(app, target) { await Promise.all(promises); } - /** @param {import('./types').NavigationFinished} result */ + /** @param {import('./types.js').NavigationFinished} result */ function initialize(result) { if (DEV && result.state.error && document.querySelector('vite-error-overlay')) return; @@ -316,7 +316,7 @@ export function create_client(app, target) { * @param {{ * url: URL; * params: Record; - * branch: Array; + * branch: Array; * status: number; * error: App.Error | null; * route: import('types').CSRRoute | null; @@ -341,7 +341,7 @@ export function create_client(app, target) { // eslint-disable-next-line url.search = url.search; // turn `/?` into `/` - /** @type {import('./types').NavigationFinished} */ + /** @type {import('./types.js').NavigationFinished} */ const result = { type: 'loaded', state: { @@ -418,9 +418,9 @@ export function create_client(app, target) { * url: URL; * params: Record; * route: { id: string | null }; - * server_data_node: import('./types').DataNode | null; + * server_data_node: import('./types.js').DataNode | null; * }} options - * @returns {Promise} + * @returns {Promise} */ async function load_node({ loader, parent, url, params, route, server_data_node }) { /** @type {Record | null} */ @@ -590,8 +590,8 @@ export function create_client(app, target) { /** * @param {import('types').ServerDataNode | import('types').ServerDataSkippedNode | null} node - * @param {import('./types').DataNode | null} [previous] - * @returns {import('./types').DataNode | null} + * @param {import('./types.js').DataNode | null} [previous] + * @returns {import('./types.js').DataNode | null} */ function create_data_node(node, previous) { if (node?.type === 'data') return node; @@ -600,8 +600,8 @@ export function create_client(app, target) { } /** - * @param {import('./types').NavigationIntent} intent - * @returns {Promise} + * @param {import('./types.js').NavigationIntent} intent + * @returns {Promise} */ async function load_route({ id, invalidating, url, params, route }) { if (load_cache?.id === id) { @@ -665,7 +665,7 @@ export function create_client(app, target) { const branch_promises = loaders.map(async (loader, i) => { if (!loader) return; - /** @type {import('./types').BranchNode | undefined} */ + /** @type {import('./types.js').BranchNode | undefined} */ const previous = current.branch[i]; const server_data_node = server_data_nodes?.[i]; @@ -708,7 +708,7 @@ export function create_client(app, target) { // if we don't do this, rejections will be unhandled for (const p of branch_promises) p.catch(() => {}); - /** @type {Array} */ + /** @type {Array} */ const branch = []; for (let i = 0; i < loaders.length; i += 1) { @@ -782,9 +782,9 @@ export function create_client(app, target) { /** * @param {number} i Start index to backtrack from - * @param {Array} branch Branch to backtrack + * @param {Array} branch Branch to backtrack * @param {Array} errors All error pages for this branch - * @returns {Promise<{idx: number; node: import('./types').BranchNode} | undefined>} + * @returns {Promise<{idx: number; node: import('./types.js').BranchNode} | undefined>} */ async function load_nearest_error_page(i, branch, errors) { while (i--) { @@ -816,7 +816,7 @@ export function create_client(app, target) { * url: URL; * route: { id: string | null } * }} opts - * @returns {Promise} + * @returns {Promise} */ async function load_root_error_page({ status, error, url, route }) { /** @type {Record} */ @@ -859,7 +859,7 @@ export function create_client(app, target) { server_data_node: create_data_node(server_data_node) }); - /** @type {import('./types').BranchNode} */ + /** @type {import('./types.js').BranchNode} */ const root_error = { node: await default_error_loader(), loader: default_error_loader, @@ -892,7 +892,7 @@ export function create_client(app, target) { if (params) { const id = url.pathname + url.search; - /** @type {import('./types').NavigationIntent} */ + /** @type {import('./types.js').NavigationIntent} */ const intent = { id, invalidating, route, params: decode_params(params), url }; return intent; } @@ -908,7 +908,7 @@ export function create_client(app, target) { * @param {{ * url: URL; * type: import('@sveltejs/kit').Navigation["type"]; - * intent?: import('./types').NavigationIntent; + * intent?: import('./types.js').NavigationIntent; * delta?: number; * }} opts */ @@ -1171,7 +1171,7 @@ export function create_client(app, target) { * @param {{ id: string | null }} route * @param {App.Error} error * @param {number} status - * @returns {Promise} + * @returns {Promise} */ async function server_fallback(url, route, error, status) { if (url.origin === origin && url.pathname === location.pathname && !hydrated) { @@ -1766,7 +1766,7 @@ export function create_client(app, target) { ({ params = {}, route = { id: null } } = get_navigation_intent(url, false) || {}); } - /** @type {import('./types').NavigationFinished | undefined} */ + /** @type {import('./types.js').NavigationFinished | undefined} */ let result; try { @@ -1793,7 +1793,7 @@ export function create_client(app, target) { }); }); - /** @type {Array} */ + /** @type {Array} */ const branch = await Promise.all(branch_promises); const parsed_route = routes.find(({ id }) => id === route.id); @@ -2019,8 +2019,8 @@ function reset_focus() { } /** - * @param {import('./types').NavigationState} current - * @param {import('./types').NavigationIntent | undefined} intent + * @param {import('./types.js').NavigationState} current + * @param {import('./types.js').NavigationIntent | undefined} intent * @param {URL | null} url * @param {Exclude} type */ diff --git a/packages/kit/src/runtime/client/parse.js b/packages/kit/src/runtime/client/parse.js index d148b2888c72..5abf1a7e38d3 100644 --- a/packages/kit/src/runtime/client/parse.js +++ b/packages/kit/src/runtime/client/parse.js @@ -1,7 +1,7 @@ import { exec, parse_route_id } from '../../utils/routing.js'; /** - * @param {import('./types').SvelteKitApp} app + * @param {import('./types.js').SvelteKitApp} app * @returns {import('types').CSRRoute[]} */ export function parse({ nodes, server_loads, dictionary, matchers }) { diff --git a/packages/kit/src/runtime/client/singletons.js b/packages/kit/src/runtime/client/singletons.js index 2d2d15095f1b..e6bf5808eef9 100644 --- a/packages/kit/src/runtime/client/singletons.js +++ b/packages/kit/src/runtime/client/singletons.js @@ -2,12 +2,12 @@ import { writable } from 'svelte/store'; import { create_updated_store, notifiable_store } from './utils.js'; import { BROWSER } from 'esm-env'; -/** @type {import('./types').Client} */ +/** @type {import('./types.js').Client} */ export let client; /** * @param {{ - * client: import('./types').Client; + * client: import('./types.js').Client; * }} opts */ export function init(opts) { diff --git a/packages/kit/src/runtime/client/start.js b/packages/kit/src/runtime/client/start.js index 70e0d73476f8..0ef12e627131 100644 --- a/packages/kit/src/runtime/client/start.js +++ b/packages/kit/src/runtime/client/start.js @@ -3,9 +3,9 @@ import { create_client } from './client.js'; import { init } from './singletons.js'; /** - * @param {import('./types').SvelteKitApp} app + * @param {import('./types.js').SvelteKitApp} app * @param {HTMLElement} target - * @param {Parameters[0]} [hydrate] + * @param {Parameters[0]} [hydrate] */ export async function start(app, target, hydrate) { if (DEV && target === document.body) { diff --git a/packages/kit/src/runtime/client/types.d.ts b/packages/kit/src/runtime/client/types.d.ts index af8619c54862..6466bd916447 100644 --- a/packages/kit/src/runtime/client/types.d.ts +++ b/packages/kit/src/runtime/client/types.d.ts @@ -1,4 +1,4 @@ -import { applyAction } from '../app/forms'; +import { applyAction } from '../app/forms.js'; import { afterNavigate, beforeNavigate, @@ -8,7 +8,7 @@ import { invalidateAll, preloadCode, preloadData -} from '../app/navigation'; +} from '../app/navigation.js'; import { SvelteComponent } from 'svelte'; import { ClientHooks, CSRPageNode, CSRPageNodeLoader, CSRRoute, TrailingSlash, Uses } from 'types'; import { Page, ParamMatcher } from '@sveltejs/kit'; diff --git a/packages/kit/src/runtime/server/cookie.js b/packages/kit/src/runtime/server/cookie.js index 644e41b733e3..90fb9e7c126e 100644 --- a/packages/kit/src/runtime/server/cookie.js +++ b/packages/kit/src/runtime/server/cookie.js @@ -27,7 +27,7 @@ export function get_cookies(request, url, trailing_slash) { // Emulate browser-behavior: if the cookie is set at '/foo/bar', its path is '/foo' const default_path = normalized_url.split('/').slice(0, -1).join('/') || '/'; - /** @type {Record} */ + /** @type {Record} */ const new_cookies = {}; /** @type {import('cookie').CookieSerializeOptions} */ @@ -232,7 +232,7 @@ export function path_matches(path, constraint) { /** * @param {Headers} headers - * @param {import('./page/types').Cookie[]} cookies + * @param {import('./page/types.js').Cookie[]} cookies */ export function add_cookies_to_headers(headers, cookies) { for (const new_cookie of cookies) { diff --git a/packages/kit/src/runtime/server/page/csp.js b/packages/kit/src/runtime/server/page/csp.js index 77cde16c9ef4..a1a530d9d62e 100644 --- a/packages/kit/src/runtime/server/page/csp.js +++ b/packages/kit/src/runtime/server/page/csp.js @@ -223,8 +223,8 @@ export class Csp { report_only_provider; /** - * @param {import('./types').CspConfig} config - * @param {import('./types').CspOpts} opts + * @param {import('./types.js').CspConfig} config + * @param {import('./types.js').CspOpts} opts */ constructor({ mode, directives, reportOnly }, { prerender }) { const use_hashes = mode === 'hash' || (mode === 'auto' && prerender); diff --git a/packages/kit/src/runtime/server/page/index.js b/packages/kit/src/runtime/server/page/index.js index f99391b1365f..dbc3b29905f5 100644 --- a/packages/kit/src/runtime/server/page/index.js +++ b/packages/kit/src/runtime/server/page/index.js @@ -96,7 +96,7 @@ export async function render_page(event, page, options, manifest, state, resolve // inherit the prerender option of the page state.prerender_default = should_prerender; - /** @type {import('./types').Fetched[]} */ + /** @type {import('./types.js').Fetched[]} */ const fetched = []; if (get_option(nodes, 'ssr') === false && !state.prerendering) { diff --git a/packages/kit/src/runtime/server/page/load_data.js b/packages/kit/src/runtime/server/page/load_data.js index bcc2443aede6..1dbabbe2766c 100644 --- a/packages/kit/src/runtime/server/page/load_data.js +++ b/packages/kit/src/runtime/server/page/load_data.js @@ -144,7 +144,7 @@ export async function load_server_data({ * Calls the user's `load` function. * @param {{ * event: import('@sveltejs/kit').RequestEvent; - * fetched: import('./types').Fetched[]; + * fetched: import('./types.js').Fetched[]; * node: import('types').SSRNode | undefined; * parent: () => Promise>; * resolve_opts: import('types').RequiredResolveOptions; @@ -192,7 +192,7 @@ export async function load_data({ /** * @param {Pick} event * @param {import('types').SSRState} state - * @param {import('./types').Fetched[]} fetched + * @param {import('./types.js').Fetched[]} fetched * @param {boolean} csr * @param {Pick, 'filterSerializedResponseHeaders'>} resolve_opts */ diff --git a/packages/kit/src/runtime/server/page/render.js b/packages/kit/src/runtime/server/page/render.js index 102a61204754..dbc558151fd2 100644 --- a/packages/kit/src/runtime/server/page/render.js +++ b/packages/kit/src/runtime/server/page/render.js @@ -26,8 +26,8 @@ const encoder = new TextEncoder(); /** * Creates the HTML response. * @param {{ - * branch: Array; - * fetched: Array; + * branch: Array; + * fetched: Array; * options: import('types').SSROptions; * manifest: import('@sveltejs/kit').SSRManifest; * state: import('types').SSRState; diff --git a/packages/kit/src/runtime/server/page/respond_with_error.js b/packages/kit/src/runtime/server/page/respond_with_error.js index f1475cc5bb76..59e3697896e1 100644 --- a/packages/kit/src/runtime/server/page/respond_with_error.js +++ b/packages/kit/src/runtime/server/page/respond_with_error.js @@ -33,7 +33,7 @@ export async function respond_with_error({ return static_error_page(options, status, /** @type {Error} */ (error).message); } - /** @type {import('./types').Fetched[]} */ + /** @type {import('./types.js').Fetched[]} */ const fetched = []; try { diff --git a/packages/kit/src/runtime/server/respond.js b/packages/kit/src/runtime/server/respond.js index 7967658c77f1..44b0e19a6975 100644 --- a/packages/kit/src/runtime/server/respond.js +++ b/packages/kit/src/runtime/server/respond.js @@ -134,7 +134,7 @@ export async function respond(request, options, manifest, state) { /** @type {Record} */ const headers = {}; - /** @type {Record} */ + /** @type {Record} */ let cookies_to_add = {}; /** @type {import('@sveltejs/kit').RequestEvent} */ diff --git a/packages/kit/src/types/internal.d.ts b/packages/kit/src/types/internal.d.ts index 84ffcd4bc4ef..ea3023245503 100644 --- a/packages/kit/src/types/internal.d.ts +++ b/packages/kit/src/types/internal.d.ts @@ -414,5 +414,5 @@ export type ValidatedConfig = RecursiveRequired; export type ValidatedKitConfig = RecursiveRequired; -export * from '../exports/index'; +export * from '../exports/index.js'; export * from './private.js'; diff --git a/packages/kit/test/build-errors/apps/private-dynamic-env-dynamic-import/tsconfig.json b/packages/kit/test/build-errors/apps/private-dynamic-env-dynamic-import/tsconfig.json index c7b5481da90e..f183bec09bb0 100644 --- a/packages/kit/test/build-errors/apps/private-dynamic-env-dynamic-import/tsconfig.json +++ b/packages/kit/test/build-errors/apps/private-dynamic-env-dynamic-import/tsconfig.json @@ -6,7 +6,6 @@ "esModuleInterop": true, "forceConsistentCasingInFileNames": true, "resolveJsonModule": true, - "skipLibCheck": true, "sourceMap": true, "strict": true, "noEmit": true, diff --git a/packages/kit/test/build-errors/apps/private-dynamic-env/tsconfig.json b/packages/kit/test/build-errors/apps/private-dynamic-env/tsconfig.json index c7b5481da90e..f183bec09bb0 100644 --- a/packages/kit/test/build-errors/apps/private-dynamic-env/tsconfig.json +++ b/packages/kit/test/build-errors/apps/private-dynamic-env/tsconfig.json @@ -6,7 +6,6 @@ "esModuleInterop": true, "forceConsistentCasingInFileNames": true, "resolveJsonModule": true, - "skipLibCheck": true, "sourceMap": true, "strict": true, "noEmit": true, diff --git a/packages/kit/test/build-errors/apps/private-static-env-dynamic-import/tsconfig.json b/packages/kit/test/build-errors/apps/private-static-env-dynamic-import/tsconfig.json index c7b5481da90e..f183bec09bb0 100644 --- a/packages/kit/test/build-errors/apps/private-static-env-dynamic-import/tsconfig.json +++ b/packages/kit/test/build-errors/apps/private-static-env-dynamic-import/tsconfig.json @@ -6,7 +6,6 @@ "esModuleInterop": true, "forceConsistentCasingInFileNames": true, "resolveJsonModule": true, - "skipLibCheck": true, "sourceMap": true, "strict": true, "noEmit": true, diff --git a/packages/kit/test/build-errors/apps/private-static-env/tsconfig.json b/packages/kit/test/build-errors/apps/private-static-env/tsconfig.json index c7b5481da90e..f183bec09bb0 100644 --- a/packages/kit/test/build-errors/apps/private-static-env/tsconfig.json +++ b/packages/kit/test/build-errors/apps/private-static-env/tsconfig.json @@ -6,7 +6,6 @@ "esModuleInterop": true, "forceConsistentCasingInFileNames": true, "resolveJsonModule": true, - "skipLibCheck": true, "sourceMap": true, "strict": true, "noEmit": true, diff --git a/packages/kit/test/build-errors/apps/server-only-folder-dynamic-import/tsconfig.json b/packages/kit/test/build-errors/apps/server-only-folder-dynamic-import/tsconfig.json index 3688e97000b5..c35fe0130e1e 100644 --- a/packages/kit/test/build-errors/apps/server-only-folder-dynamic-import/tsconfig.json +++ b/packages/kit/test/build-errors/apps/server-only-folder-dynamic-import/tsconfig.json @@ -6,7 +6,6 @@ "esModuleInterop": true, "forceConsistentCasingInFileNames": true, "resolveJsonModule": true, - "skipLibCheck": true, "sourceMap": true, "strict": true, "noEmit": true, diff --git a/packages/kit/test/build-errors/apps/server-only-folder/tsconfig.json b/packages/kit/test/build-errors/apps/server-only-folder/tsconfig.json index 3688e97000b5..c35fe0130e1e 100644 --- a/packages/kit/test/build-errors/apps/server-only-folder/tsconfig.json +++ b/packages/kit/test/build-errors/apps/server-only-folder/tsconfig.json @@ -6,7 +6,6 @@ "esModuleInterop": true, "forceConsistentCasingInFileNames": true, "resolveJsonModule": true, - "skipLibCheck": true, "sourceMap": true, "strict": true, "noEmit": true, diff --git a/packages/kit/test/build-errors/apps/server-only-module-dynamic-import/tsconfig.json b/packages/kit/test/build-errors/apps/server-only-module-dynamic-import/tsconfig.json index 3688e97000b5..c35fe0130e1e 100644 --- a/packages/kit/test/build-errors/apps/server-only-module-dynamic-import/tsconfig.json +++ b/packages/kit/test/build-errors/apps/server-only-module-dynamic-import/tsconfig.json @@ -6,7 +6,6 @@ "esModuleInterop": true, "forceConsistentCasingInFileNames": true, "resolveJsonModule": true, - "skipLibCheck": true, "sourceMap": true, "strict": true, "noEmit": true, diff --git a/packages/kit/test/build-errors/apps/server-only-module/tsconfig.json b/packages/kit/test/build-errors/apps/server-only-module/tsconfig.json index 3688e97000b5..c35fe0130e1e 100644 --- a/packages/kit/test/build-errors/apps/server-only-module/tsconfig.json +++ b/packages/kit/test/build-errors/apps/server-only-module/tsconfig.json @@ -6,7 +6,6 @@ "esModuleInterop": true, "forceConsistentCasingInFileNames": true, "resolveJsonModule": true, - "skipLibCheck": true, "sourceMap": true, "strict": true, "noEmit": true, diff --git a/packages/kit/test/build-errors/apps/syntax-error/tsconfig.json b/packages/kit/test/build-errors/apps/syntax-error/tsconfig.json index 3688e97000b5..c35fe0130e1e 100644 --- a/packages/kit/test/build-errors/apps/syntax-error/tsconfig.json +++ b/packages/kit/test/build-errors/apps/syntax-error/tsconfig.json @@ -6,7 +6,6 @@ "esModuleInterop": true, "forceConsistentCasingInFileNames": true, "resolveJsonModule": true, - "skipLibCheck": true, "sourceMap": true, "strict": true, "noEmit": true, diff --git a/packages/kit/tsconfig.json b/packages/kit/tsconfig.json index a8546e14e52c..8425dc63819c 100644 --- a/packages/kit/tsconfig.json +++ b/packages/kit/tsconfig.json @@ -4,15 +4,15 @@ "checkJs": true, "noEmit": true, "strict": true, - "target": "es2020", - "module": "es2022", - "moduleResolution": "node", + "target": "es2022", + "module": "node16", + "moduleResolution": "node16", "allowSyntheticDefaultImports": true, "paths": { "@sveltejs/kit": ["./src/exports/public.d.ts"], "@sveltejs/kit/node": ["./src/exports/node/index.js"], // internal use only - "types": ["./src/types/internal"] + "types": ["./src/types/internal.d.ts"] }, "noUnusedLocals": true, "noUnusedParameters": true diff --git a/packages/migrate/tsconfig.json b/packages/migrate/tsconfig.json index 1bd4194a49b1..26ec8077781d 100644 --- a/packages/migrate/tsconfig.json +++ b/packages/migrate/tsconfig.json @@ -4,9 +4,9 @@ "checkJs": true, "noEmit": true, "strict": true, - "target": "esnext", - "module": "esnext", - "moduleResolution": "node", + "target": "es2022", + "module": "node16", + "moduleResolution": "node16", "allowSyntheticDefaultImports": true }, "include": ["./migrations/**/*", "./utils.js", "./bin.js"] diff --git a/packages/package/src/cli.js b/packages/package/src/cli.js index 6c0239c6d455..cc464eddfe33 100644 --- a/packages/package/src/cli.js +++ b/packages/package/src/cli.js @@ -37,7 +37,7 @@ prog const packaging = await import('./index.js'); - /** @type {import('./types').Options} */ + /** @type {import('./types.js').Options} */ const options = { cwd: process.cwd(), input: args.input ?? config.kit?.files?.lib ?? 'src/lib', diff --git a/packages/package/src/config.js b/packages/package/src/config.js index 4483c303948d..81d9756d7772 100644 --- a/packages/package/src/config.js +++ b/packages/package/src/config.js @@ -5,7 +5,7 @@ import url from 'node:url'; /** * Loads and validates svelte.config.js * @param {{ cwd?: string }} options - * @returns {Promise} + * @returns {Promise} */ export async function load_config({ cwd = process.cwd() } = {}) { const config_file = path.join(cwd, 'svelte.config.js'); diff --git a/packages/package/src/index.js b/packages/package/src/index.js index 8e0165513323..1970464779bc 100644 --- a/packages/package/src/index.js +++ b/packages/package/src/index.js @@ -9,7 +9,7 @@ import { emit_dts, transpile_ts } from './typescript.js'; import { create_validator } from './validate.js'; /** - * @param {import('./types').Options} options + * @param {import('./types.js').Options} options */ export async function build(options) { const { analyse_code, validate } = create_validator(options); @@ -18,7 +18,7 @@ export async function build(options) { } /** - * @param {import('./types').Options} options + * @param {import('./types.js').Options} options * @param {(name: string, code: string) => void} analyse_code */ async function do_build(options, analyse_code) { @@ -53,7 +53,7 @@ async function do_build(options, analyse_code) { } /** - * @param {import('./types').Options} options + * @param {import('./types.js').Options} options */ export async function watch(options) { const { analyse_code, validate } = create_validator(options); @@ -68,7 +68,7 @@ export async function watch(options) { console.log(message); - /** @type {Array<{ file: import('./types').File, type: string }>} */ + /** @type {Array<{ file: import('./types.js').File, type: string }>} */ const pending = []; /** @type {Array<(value?: any) => void>} */ @@ -159,7 +159,7 @@ export async function watch(options) { } /** - * @param {import('./types').Options} options + * @param {import('./types.js').Options} options */ function normalize_options(options) { const input = path.resolve(options.cwd, options.input); @@ -188,7 +188,7 @@ function normalize_options(options) { /** * @param {string} input * @param {string} output - * @param {import('./types').File} file + * @param {import('./types.js').File} file * @param {import('svelte/types/compiler/preprocess').PreprocessorGroup | undefined} preprocessor * @param {Record} aliases * @param {(name: string, code: string) => void} analyse_code diff --git a/packages/package/src/typescript.js b/packages/package/src/typescript.js index ff43e5be035e..7c02e63ffc5a 100644 --- a/packages/package/src/typescript.js +++ b/packages/package/src/typescript.js @@ -16,7 +16,7 @@ import { load_pkg_json } from './config.js'; * @param {string} output * @param {string} cwd * @param {Record} alias - * @param {import('./types').File[]} files + * @param {import('./types.js').File[]} files */ export async function emit_dts(input, output, cwd, alias, files) { const tmp = `${output}/__package_types_tmp__`; diff --git a/packages/package/src/utils.js b/packages/package/src/utils.js index 26605fbbdee7..e299509e78b5 100644 --- a/packages/package/src/utils.js +++ b/packages/package/src/utils.js @@ -63,7 +63,7 @@ export function write(file, contents) { /** * @param {string} input * @param {string[]} extensions - * @returns {import('./types').File[]} + * @returns {import('./types.js').File[]} */ export function scan(input, extensions) { return walk(input).map((file) => analyze(file, extensions)); @@ -72,7 +72,7 @@ export function scan(input, extensions) { /** * @param {string} file * @param {string[]} extensions - * @returns {import('./types').File} + * @returns {import('./types.js').File} */ export function analyze(file, extensions) { const name = posixify(file); diff --git a/packages/package/src/validate.js b/packages/package/src/validate.js index c0276aef7d90..808e99c01fdd 100644 --- a/packages/package/src/validate.js +++ b/packages/package/src/validate.js @@ -3,7 +3,7 @@ import { join } from 'node:path'; import colors from 'kleur'; /** - * @param {import("./types").Options} options + * @param {import("./types.js").Options} options */ export function create_validator(options) { const { analyse_code, validate } = _create_validator(options); @@ -38,7 +38,7 @@ export function create_validator(options) { }; } /** - * @param {import("./types").Options} options + * @param {import("./types.js").Options} options */ export function _create_validator(options) { /** @type {Set} */ diff --git a/packages/package/test/index.js b/packages/package/test/index.js index 2048bcf3a4e2..1dafa5da097b 100644 --- a/packages/package/test/index.js +++ b/packages/package/test/index.js @@ -16,7 +16,7 @@ const __dirname = join(__filename, '..'); /** * @param {string} path - * @param {Partial} [options] + * @param {Partial} [options] */ async function test_make_package(path, options) { const cwd = join(__dirname, 'fixtures', path); diff --git a/packages/package/tsconfig.json b/packages/package/tsconfig.json index 50f204450e75..c9e5965e3660 100644 --- a/packages/package/tsconfig.json +++ b/packages/package/tsconfig.json @@ -4,9 +4,9 @@ "checkJs": true, "noEmit": true, "strict": true, - "target": "es2020", - "module": "es2022", - "moduleResolution": "node", + "target": "es2022", + "module": "node16", + "moduleResolution": "node16", "allowSyntheticDefaultImports": true, "paths": { // internal use only diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a9e8258a5689..2432619a3f17 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -182,8 +182,8 @@ importers: version: 3.29.4 devDependencies: '@polka/url': - specifier: ^1.0.0-next.21 - version: 1.0.0-next.21 + specifier: ^1.0.0-next.23 + version: 1.0.0-next.23 '@sveltejs/kit': specifier: workspace:^ version: link:../kit @@ -194,8 +194,8 @@ importers: specifier: ^8.0.0 version: 8.0.0 polka: - specifier: ^1.0.0-next.22 - version: 1.0.0-next.22 + specifier: ^1.0.0-next.23 + version: 1.0.0-next.23 sirv: specifier: ^2.0.3 version: 2.0.3 @@ -1913,8 +1913,8 @@ packages: playwright-core: 1.30.0 dev: true - /@polka/url@1.0.0-next.21: - resolution: {integrity: sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==} + /@polka/url@1.0.0-next.23: + resolution: {integrity: sha512-C16M+IYz0rgRhWZdCmK+h58JMv8vijAA61gmz2rspCSwKwzBebpdcsiUmwrtJRdphuY30i6BSLEOP8ppbNLyLg==} /@rollup/plugin-commonjs@25.0.0(rollup@3.29.4): resolution: {integrity: sha512-hoho2Kay9TZrLu0bnDsTTCaj4Npa+THk9snajP/XDNb9a9mmjTjh52EQM9sKl3HD1LsnihX7js+eA2sd2uKAhw==} @@ -4996,11 +4996,11 @@ packages: engines: {node: '>=4'} dev: true - /polka@1.0.0-next.22: - resolution: {integrity: sha512-a7tsZy5gFbJr0aUltZS97xCkbPglXuD67AMvTyZX7BTDBH384FWf0ZQF6rPvdutSxnO1vUlXM2zSLf5tCKk5RA==} + /polka@1.0.0-next.23: + resolution: {integrity: sha512-19z2ny2aGdx+dns3icsQy6G7sWe0Dg7QTqSGE4B010EFbxvGzjjn37gBBjM8T0K2p6rthZ6+oXoBF3DcFceOPA==} engines: {node: '>=8'} dependencies: - '@polka/url': 1.0.0-next.21 + '@polka/url': 1.0.0-next.23 trouter: 3.2.1 dev: true @@ -5520,7 +5520,7 @@ packages: resolution: {integrity: sha512-O9jm9BsID1P+0HOi81VpXPoDxYP374pkOLzACAoyUQ/3OUVndNpsz6wMnY2z+yOxzbllCKZrM+9QrWsv4THnyA==} engines: {node: '>= 10'} dependencies: - '@polka/url': 1.0.0-next.21 + '@polka/url': 1.0.0-next.23 mrmime: 1.0.1 totalist: 3.0.1 diff --git a/sites/kit.svelte.dev/src/lib/server/docs/index.js b/sites/kit.svelte.dev/src/lib/server/docs/index.js index eac02fb567ce..d78eba9b767b 100644 --- a/sites/kit.svelte.dev/src/lib/server/docs/index.js +++ b/sites/kit.svelte.dev/src/lib/server/docs/index.js @@ -13,7 +13,7 @@ import { CONTENT_BASE_PATHS } from '../../../constants.js'; import { render_content } from '../renderer'; /** - * @param {import('./types').DocsData} docs_data + * @param {import('./types.js').DocsData} docs_data * @param {string} slug */ export async function get_parsed_docs(docs_data, slug) { @@ -29,9 +29,9 @@ export async function get_parsed_docs(docs_data, slug) { } } -/** @return {Promise} */ +/** @return {Promise} */ export async function get_docs_data(base = CONTENT_BASE_PATHS.DOCS) { - /** @type {import('./types').DocsData} */ + /** @type {import('./types.js').DocsData} */ const docs_data = []; for (const category_dir of await readdir(base)) { @@ -47,7 +47,7 @@ export async function get_docs_data(base = CONTENT_BASE_PATHS.DOCS) { if (draft === 'true') continue; - /** @type {import('./types').Category} */ + /** @type {import('./types.js').Category} */ const category = { title: category_title, slug: category_slug, @@ -88,7 +88,7 @@ export async function get_docs_data(base = CONTENT_BASE_PATHS.DOCS) { return docs_data; } -/** @param {import('./types').DocsData} docs_data */ +/** @param {import('./types.js').DocsData} docs_data */ export function get_docs_list(docs_data) { return docs_data.map((category) => ({ title: category.title, @@ -102,7 +102,7 @@ export function get_docs_list(docs_data) { /** @param {string} markdown */ async function get_sections(markdown) { const headingRegex = /^##\s+(.*)$/gm; - /** @type {import('./types').Section[]} */ + /** @type {import('./types.js').Section[]} */ const secondLevelHeadings = []; let match; diff --git a/sites/kit.svelte.dev/tsconfig.json b/sites/kit.svelte.dev/tsconfig.json index db9370bd28e1..b7507e5607cf 100644 --- a/sites/kit.svelte.dev/tsconfig.json +++ b/sites/kit.svelte.dev/tsconfig.json @@ -4,6 +4,7 @@ "allowJs": true, "checkJs": true, "allowSyntheticDefaultImports": true, + "module": "es2022", "moduleResolution": "bundler", "outDir": "build" }