Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix ci tests #4727

Merged
merged 8 commits into from
Apr 25, 2022
Merged

fix ci tests #4727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7100254
fix ci workflow typo
mrkishi Apr 25, 2022
d59f6a0
fix unit test assertions
mrkishi Apr 25, 2022
5d00bfa
bind ipv6 addresses on preview
mrkishi Apr 25, 2022
6d29b59
remove unnecessary default
mrkishi Apr 25, 2022
d292ec5
make 'localhost' vite's explicit host on dev tests
mrkishi Apr 25, 2022
c7e8d7f
add changeset
mrkishi Apr 25, 2022
651b603
please don't be mad
mrkishi Apr 25, 2022
e65e150
revert unrelated commits
mrkishi Apr 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ jobs:
include:
- node-version: 16
os: ubuntu-latest
include:
- node-version: 18
os: ubuntu-latest
env:
Expand Down
4 changes: 2 additions & 2 deletions packages/kit/src/core/config/index.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 '/'", () => {
Expand All @@ -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', () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/kit/src/core/config/options.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`
);
}

Expand Down
9 changes: 8 additions & 1 deletion packages/kit/test/apps/amp/svelte.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
}
}
}
};

Expand Down
3 changes: 3 additions & 0 deletions packages/kit/test/apps/basics/svelte.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')]
}
Expand Down
3 changes: 3 additions & 0 deletions packages/kit/test/apps/options-2/svelte.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')]
}
Expand Down
3 changes: 3 additions & 0 deletions packages/kit/test/apps/options/svelte.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')]
}
Expand Down