Skip to content

Commit 96ebc3e

Browse files
authored
Chore: update svelte-kit (#181)
1 parent 8e63c1b commit 96ebc3e

File tree

5 files changed

+58
-49
lines changed

5 files changed

+58
-49
lines changed

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"prepublishOnly": "yarn clean && yarn build",
4444
"pretest:base": "cross-env DEBUG=eslint-plugin-svelte*",
4545
"preversion": "yarn test && git add .",
46-
"svelte-kit": "node --experimental-loader ./svelte-kit-import-hook.mjs node_modules/@sveltejs/kit/svelte-kit.js",
46+
"svelte-kit": "node --experimental-loader ./svelte-kit-import-hook.mjs node_modules/vite/bin/vite.js --config vite.config.mjs",
4747
"test": "yarn mocha \"tests/src/**/*.ts\" --reporter dot --timeout 60000",
4848
"ts": "node -r esbuild-register",
4949
"update": "yarn ts ./tools/update.ts && yarn format-for-gen-file",
@@ -77,7 +77,7 @@
7777
"@ota-meshi/eslint-plugin": "^0.11.0",
7878
"@sindresorhus/slugify": "^2.1.0",
7979
"@sveltejs/adapter-static": "^1.0.0-next.26",
80-
"@sveltejs/kit": "1.0.0-next.358",
80+
"@sveltejs/kit": "^1.0.0-next.360",
8181
"@types/babel__core": "^7.1.19",
8282
"@types/eslint": "^8.0.0",
8383
"@types/eslint-scope": "^3.7.0",
@@ -134,6 +134,7 @@
134134
"svelte": "^3.46.1",
135135
"svelte-adapter-ghpages": "0.0.2",
136136
"typescript": "^4.5.2",
137+
"vite": "^2.9.13",
137138
"vite-plugin-svelte-md": "^0.1.3"
138139
},
139140
"publishConfig": {

renovate.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,5 @@
1313
"depTypeList": ["devDependencies"],
1414
"automerge": true
1515
}
16-
],
17-
"ignoreDeps": ["@sveltejs/kit"]
16+
]
1817
}

svelte.config.esm.mjs

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
/* global __dirname, URL -- __dirname, URL */
22
import ghpagesAdapter from "svelte-adapter-ghpages"
33
import path from "path"
4-
import svelteMd from "vite-plugin-svelte-md"
5-
import svelteMdOption from "./docs-svelte-kit/tools/vite-plugin-svelte-md-option.mjs"
6-
7-
import "./docs-svelte-kit/build-system/build.js"
84

95
const dirname =
106
typeof __dirname !== "undefined"
@@ -41,46 +37,6 @@ const config = {
4137
},
4238

4339
trailingSlash: "always",
44-
45-
vite: {
46-
server: {
47-
fs: { strict: false },
48-
},
49-
resolve: {
50-
alias: {
51-
eslint: path.join(dirname, "./docs-svelte-kit/shim/eslint.mjs"),
52-
assert: path.join(dirname, "./docs-svelte-kit/shim/assert.mjs"),
53-
"postcss-load-config": path.join(
54-
dirname,
55-
"./docs-svelte-kit/shim/postcss-load-config.mjs",
56-
),
57-
"source-map-js": path.join(
58-
dirname,
59-
"./docs-svelte-kit/shim/source-map-js.mjs",
60-
),
61-
module: path.join(dirname, "./docs-svelte-kit/shim/module.mjs"),
62-
path: path.join(dirname, "./docs-svelte-kit/shim/path.mjs"),
63-
url: path.join(dirname, "./docs-svelte-kit/shim/url.mjs"),
64-
os: path.join(dirname, "./docs-svelte-kit/shim/os.mjs"),
65-
fs: path.join(dirname, "./docs-svelte-kit/shim/fs.mjs"),
66-
globby: path.join(dirname, "./docs-svelte-kit/shim/globby.mjs"),
67-
tslib: path.join(dirname, "./node_modules/tslib/tslib.es6.js"),
68-
},
69-
},
70-
plugins: [
71-
svelteMd(
72-
svelteMdOption({
73-
baseUrl: "/eslint-plugin-svelte",
74-
root: path.join(dirname, "./docs"),
75-
}),
76-
),
77-
],
78-
build: {
79-
commonjsOptions: {
80-
ignoreDynamicRequires: true,
81-
},
82-
},
83-
},
8440
},
8541
}
8642
export default config

tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"compilerOptions": {
3-
"target": "es2015",
3+
"target": "es2020",
44
"module": "commonjs",
55
"lib": ["es2020", "dom"],
66
"allowJs": true,

vite.config.mjs

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
/* global URL -- URL */
2+
import { sveltekit } from "@sveltejs/kit/vite"
3+
import path from "path"
4+
import svelteMd from "vite-plugin-svelte-md"
5+
import svelteMdOption from "./docs-svelte-kit/tools/vite-plugin-svelte-md-option.mjs"
6+
7+
import "./docs-svelte-kit/build-system/build.js"
8+
9+
const dirname = path.dirname(new URL(import.meta.url).pathname)
10+
11+
/** @type {import('vite').UserConfig} */
12+
const config = {
13+
plugins: [
14+
svelteMd(
15+
svelteMdOption({
16+
baseUrl: "/eslint-plugin-svelte",
17+
root: path.join(dirname, "./docs"),
18+
}),
19+
),
20+
sveltekit(),
21+
],
22+
server: {
23+
fs: { strict: false },
24+
},
25+
resolve: {
26+
alias: {
27+
eslint: path.join(dirname, "./docs-svelte-kit/shim/eslint.mjs"),
28+
assert: path.join(dirname, "./docs-svelte-kit/shim/assert.mjs"),
29+
"postcss-load-config": path.join(
30+
dirname,
31+
"./docs-svelte-kit/shim/postcss-load-config.mjs",
32+
),
33+
"source-map-js": path.join(
34+
dirname,
35+
"./docs-svelte-kit/shim/source-map-js.mjs",
36+
),
37+
module: path.join(dirname, "./docs-svelte-kit/shim/module.mjs"),
38+
path: path.join(dirname, "./docs-svelte-kit/shim/path.mjs"),
39+
url: path.join(dirname, "./docs-svelte-kit/shim/url.mjs"),
40+
os: path.join(dirname, "./docs-svelte-kit/shim/os.mjs"),
41+
fs: path.join(dirname, "./docs-svelte-kit/shim/fs.mjs"),
42+
globby: path.join(dirname, "./docs-svelte-kit/shim/globby.mjs"),
43+
tslib: path.join(dirname, "./node_modules/tslib/tslib.es6.js"),
44+
},
45+
},
46+
build: {
47+
commonjsOptions: {
48+
ignoreDynamicRequires: true,
49+
},
50+
},
51+
}
52+
53+
export default config

0 commit comments

Comments
 (0)