diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b0c3d4744f9a..938486f6909d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,7 +36,6 @@ jobs: include: - node-version: 16 os: ubuntu-latest - include: - node-version: 18 os: ubuntu-latest env: diff --git a/packages/kit/src/core/config/index.spec.js b/packages/kit/src/core/config/index.spec.js index 5ff8b142593d..eda31028f8b5 100644 --- a/packages/kit/src/core/config/index.spec.js +++ b/packages/kit/src/core/config/index.spec.js @@ -240,7 +240,7 @@ test('fails if paths.base is not root-relative', () => { } } }); - }, /^config\.kit\.paths\.base option must be a root-relative path that starts but doesn't end with '\/'. See https:\/\/kit\.svelte\.dev\/docs\/configuration#paths$/); + }, /^config\.kit\.paths\.base option must either be the empty string or a root-relative path that starts but doesn't end with '\/'. See https:\/\/kit\.svelte\.dev\/docs\/configuration#paths$/); }); test("fails if paths.base ends with '/'", () => { @@ -252,7 +252,7 @@ test("fails if paths.base ends with '/'", () => { } } }); - }, /^config\.kit\.paths\.base option must be a root-relative path that starts but doesn't end with '\/'. See https:\/\/kit\.svelte\.dev\/docs\/configuration#paths$/); + }, /^config\.kit\.paths\.base option must either be the empty string or a root-relative path that starts but doesn't end with '\/'. See https:\/\/kit\.svelte\.dev\/docs\/configuration#paths$/); }); test('fails if paths.assets is relative', () => { diff --git a/packages/kit/src/core/config/options.js b/packages/kit/src/core/config/options.js index 2700fe5adff4..47a9d221e46e 100644 --- a/packages/kit/src/core/config/options.js +++ b/packages/kit/src/core/config/options.js @@ -161,7 +161,7 @@ const options = object( if (input !== '' && (input.endsWith('/') || !input.startsWith('/'))) { throw new Error( - `${keypath} option must either be the empty string, or a root-relative path that starts but doesn't end with '/'. See https://kit.svelte.dev/docs/configuration#paths` + `${keypath} option must either be the empty string or a root-relative path that starts but doesn't end with '/'. See https://kit.svelte.dev/docs/configuration#paths` ); } diff --git a/packages/kit/test/apps/amp/svelte.config.js b/packages/kit/test/apps/amp/svelte.config.js index 5fe016e42d3d..a0902eb13f36 100644 --- a/packages/kit/test/apps/amp/svelte.config.js +++ b/packages/kit/test/apps/amp/svelte.config.js @@ -1,7 +1,14 @@ /** @type {import('@sveltejs/kit').Config} */ const config = { kit: { - amp: true + amp: true, + vite: { + server: { + // TODO: required to support ipv6, remove on vite 3 + // https://github.com/vitejs/vite/issues/7075 + host: 'localhost' + } + } } }; diff --git a/packages/kit/test/apps/basics/svelte.config.js b/packages/kit/test/apps/basics/svelte.config.js index 40df6e81dd84..68b1411a1fdc 100644 --- a/packages/kit/test/apps/basics/svelte.config.js +++ b/packages/kit/test/apps/basics/svelte.config.js @@ -17,6 +17,9 @@ const config = { include: ['cookie', 'marked'] }, server: { + // TODO: required to support ipv6, remove on vite 3 + // https://github.com/vitejs/vite/issues/7075 + host: 'localhost', fs: { allow: [path.resolve('../../../src')] } diff --git a/packages/kit/test/apps/options-2/svelte.config.js b/packages/kit/test/apps/options-2/svelte.config.js index b8c2c561074e..8160cdf0cb8f 100644 --- a/packages/kit/test/apps/options-2/svelte.config.js +++ b/packages/kit/test/apps/options-2/svelte.config.js @@ -11,6 +11,9 @@ const config = { }, vite: { server: { + // TODO: required to support ipv6, remove on vite 3 + // https://github.com/vitejs/vite/issues/7075 + host: 'localhost', fs: { allow: [path.resolve('../../../src')] } diff --git a/packages/kit/test/apps/options/svelte.config.js b/packages/kit/test/apps/options/svelte.config.js index a882a9b5664c..569ef37d3af6 100644 --- a/packages/kit/test/apps/options/svelte.config.js +++ b/packages/kit/test/apps/options/svelte.config.js @@ -28,6 +28,9 @@ const config = { }, clearScreen: false, server: { + // TODO: required to support ipv6, remove on vite 3 + // https://github.com/vitejs/vite/issues/7075 + host: 'localhost', fs: { allow: [path.resolve('../../../src')] }