Skip to content

Commit e10e457

Browse files
committed
chore: cleanup deps and vite.config.ts ts issues
1 parent 01e0fc8 commit e10e457

File tree

10 files changed

+1284
-1780
lines changed

10 files changed

+1284
-1780
lines changed

docs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"gray-matter": "^4.0.3",
2020
"linkcheck-bin": "3.0.0-2",
2121
"serve-handler": "^6.1.6",
22-
"vitepress": "2.0.0-alpha.5",
22+
"vitepress": "2.0.0-alpha.12",
2323
"wait-on": "^8.0.4"
2424
}
2525
}

package-lock.json

Lines changed: 1246 additions & 1754 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

playground/Coalesce.Web.Vue3/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"vue": "^3.5.4"
2727
},
2828
"devDependencies": {
29-
"vite-plugin-inspect": "^0.8.1",
29+
"vite-plugin-inspect": "^11.3.3",
3030
"vite-plugin-vuetify": "^2.1.2"
3131
}
3232
}

src/coalesce-vue-vuetify3/package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616
"types": "./dist/index.d.ts",
1717
"default": "./dist/coalesce-vue-vuetify3.js"
1818
},
19+
"./build": {
20+
"types": "./dist/build.d.ts",
21+
"default": "./dist/build.js"
22+
},
1923
"./*": "./dist/*",
2024
"./styles": "./dist/coalesce-vue-vuetify.css",
2125
"./styles.css": "./dist/coalesce-vue-vuetify.css"
@@ -54,7 +58,7 @@
5458
},
5559
"devDependencies": {
5660
"@types/node": "^20.14.11",
57-
"@vitejs/plugin-vue-jsx": "^4.1.1",
61+
"@vitejs/plugin-vue-jsx": "^5.1.1",
5862
"coalesce-vue": "../coalesce-vue",
5963
"sass": "^1.69.7",
6064
"vue-router": "^4.4.1",
Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
22
"compilerOptions": {
3-
"target": "ES2021",
3+
"target": "es2023",
44
"module": "esnext",
55
"strict": true,
66
"jsx": "preserve",
7-
"jsxImportSource": "vue",
8-
"importHelpers": true,
9-
"moduleResolution": "node",
10-
"sourceMap": true,
7+
"moduleResolution": "bundler",
8+
"incremental": true,
9+
"tsBuildInfoFile": "./node_modules/.tsbuildinfo",
1110
"skipLibCheck": true,
12-
"resolveJsonModule": true,
11+
"forceConsistentCasingInFileNames": true,
1312
"allowSyntheticDefaultImports": true,
13+
"noEmit": true,
1414
"baseUrl": ".",
1515
"paths": {
1616
"@test/*": ["test/*"],
@@ -23,16 +23,20 @@
2323
"vue-router": ["node_modules/vue-router"],
2424
"@vue/reactivity": ["node_modules/@vue/reactivity/dist/reactivity"]
2525
},
26+
"jsxImportSource": "vue",
27+
"importHelpers": true,
28+
"sourceMap": true,
29+
"resolveJsonModule": true,
2630
"lib": ["esnext", "dom", "dom.iterable", "scripthost"],
27-
"types": ["node", "vue-router", "vuetify", "vitest/globals"]
31+
"types": ["vue-router", "vuetify", "vitest/globals"]
2832
},
2933
"include": [
30-
"vite.config.ts",
3134
"src/**/*.ts",
3235
"src/**/*.tsx",
3336
"src/**/*.vue",
3437
"test/**/*.ts",
3538
"test/**/*.tsx"
3639
],
37-
"exclude": ["node_modules"]
40+
"exclude": ["node_modules"],
41+
"references": [{ "path": "./tsconfig.node.json" }]
3842
}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"compilerOptions": {
3+
"composite": true,
4+
"allowSyntheticDefaultImports": true,
5+
"module": "nodenext",
6+
"resolveJsonModule": true,
7+
"moduleResolution": "nodenext",
8+
"types": ["node", "vitest", "vitest/config", "../../node_modules/vitest"]
9+
},
10+
"include": ["vite.config.ts"],
11+
"exclude": ["node_modules"]
12+
}

src/coalesce-vue-vuetify3/vite.config.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
import path from "path";
22
import { defineConfig } from "vite";
3+
34
import vue from "@vitejs/plugin-vue";
45
import vueJsx from "@vitejs/plugin-vue-jsx";
56

67
import Components from "unplugin-vue-components/vite";
78
import { Vuetify3Resolver } from "unplugin-vue-components/resolvers";
89

9-
import pkg from "./package.json";
10+
import pkg from "./package.json" with { type: "json" };
1011

1112
export default defineConfig({
1213
build: {

templates/Coalesce.Vue.Template/TestLocal.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ foreach ($testCase in $testCases) {
4242
dotnet restore
4343
dotnet coalesce
4444
npm i
45+
npx tsc -p ./tsconfig.node.json
4546
npm run build
4647
npm run lint:fix # ensure all lint issues are auto-fixable
4748
# CS9113: Parameter '<param>' is unread. (too annoying to fix this for every possible combination of template params)

templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/tsconfig.node.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
"compilerOptions": {
33
"composite": true,
44
"allowSyntheticDefaultImports": true,
5-
"module": "esnext",
6-
"moduleResolution": "node",
5+
"skipLibCheck": true,
6+
"module": "nodenext",
7+
"moduleResolution": "nodenext",
78
"types": ["node", "vitest"]
89
},
910
"include": ["vite.config.ts"],

templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/vite.config.ts

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -91,17 +91,6 @@ export default defineConfig({
9191
},
9292
},
9393

94-
css: {
95-
preprocessorOptions: {
96-
scss: {
97-
api: "modern",
98-
},
99-
sass: {
100-
api: "modern",
101-
},
102-
},
103-
},
104-
10594
test: {
10695
globals: true,
10796
environment: "jsdom",

0 commit comments

Comments
 (0)