Skip to content

Commit c3eeeef

Browse files
committed
Fix remaining scaffold-vue merge conflicts
1 parent 4a8d212 commit c3eeeef

File tree

4 files changed

+0
-106
lines changed

4 files changed

+0
-106
lines changed

scaffold-vue/package.json

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,5 @@
11
{
22
"name": "scaffold-vue",
3-
<<<<<<< HEAD
4-
"private": true,
5-
"version": "0.0.0",
6-
"type": "module",
7-
"scripts": {
8-
"dev": "vite",
9-
"build": "vue-tsc && vite build",
10-
"build:dev": "vue-tsc && vite build --mode development",
11-
"lint": "eslint .",
12-
"preview": "vite preview"
13-
},
14-
"dependencies": {
15-
"vue": "^3.4.0",
16-
"axios": "^1.7.0",
17-
"leaflet": "^1.9.4",
18-
"@vue-leaflet/vue-leaflet": "^0.10.1"
19-
},
20-
"devDependencies": {
21-
"@vitejs/plugin-vue": "^5.1.0",
22-
"@vue/tsconfig": "^0.5.1",
23-
"autoprefixer": "^10.4.20",
24-
"eslint": "^9.9.0",
25-
"postcss": "^8.4.47",
26-
"tailwindcss": "^3.4.11",
27-
"tailwindcss-animate": "^1.0.7",
28-
"typescript": "^5.5.3",
29-
"vite": "^6.3.4",
30-
"vue-tsc": "^2.0.13"
31-
}
32-
}
33-
=======
343
"version": "0.0.0",
354
"private": true,
365
"type": "module",
@@ -65,4 +34,3 @@
6534
"vue-tsc": "^3.1.0"
6635
}
6736
}
68-
>>>>>>> release/v0.0.5

scaffold-vue/tsconfig.app.json

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,4 @@
11
{
2-
<<<<<<< HEAD
3-
"compilerOptions": {
4-
"target": "ES2020",
5-
"useDefineForClassFields": true,
6-
"lib": ["ES2020", "DOM", "DOM.Iterable"],
7-
"module": "ESNext",
8-
"skipLibCheck": true,
9-
10-
/* Bundler mode */
11-
"moduleResolution": "bundler",
12-
"allowImportingTsExtensions": true,
13-
"isolatedModules": true,
14-
"moduleDetection": "force",
15-
"noEmit": true,
16-
17-
/* Linting */
18-
"strict": false,
19-
"noUnusedLocals": false,
20-
"noUnusedParameters": false,
21-
"noImplicitAny": false,
22-
"noFallthroughCasesInSwitch": false,
23-
24-
"baseUrl": ".",
25-
"paths": {
26-
"@/*": ["./src/*"]
27-
}
28-
},
29-
"include": ["src"]
30-
}
31-
=======
322
"extends": "@vue/tsconfig/tsconfig.dom.json",
333
"include": ["env.d.ts", "src/**/*", "src/**/*.vue"],
344
"exclude": ["src/**/__tests__/*"],
@@ -40,4 +10,3 @@
4010
}
4111
}
4212
}
43-
>>>>>>> release/v0.0.5

scaffold-vue/tsconfig.json

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,6 @@
11
{
22
"files": [],
33
"references": [
4-
<<<<<<< HEAD
5-
{ "path": "./tsconfig.app.json" },
6-
{ "path": "./tsconfig.node.json" }
7-
],
8-
"compilerOptions": {
9-
"baseUrl": ".",
10-
"paths": {
11-
"@/*": ["./src/*"]
12-
},
13-
"noImplicitAny": false,
14-
"noUnusedParameters": false,
15-
"skipLibCheck": true,
16-
"allowJs": true,
17-
"noUnusedLocals": false,
18-
"strictNullChecks": false
19-
}
20-
}
21-
=======
224
{
235
"path": "./tsconfig.node.json"
246
},
@@ -27,4 +9,3 @@
279
}
2810
]
2911
}
30-
>>>>>>> release/v0.0.5

scaffold-vue/tsconfig.node.json

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,4 @@
11
{
2-
<<<<<<< HEAD
3-
"compilerOptions": {
4-
"target": "ES2022",
5-
"lib": ["ES2023"],
6-
"module": "ESNext",
7-
"skipLibCheck": true,
8-
9-
/* Bundler mode */
10-
"moduleResolution": "bundler",
11-
"allowImportingTsExtensions": true,
12-
"isolatedModules": true,
13-
"moduleDetection": "force",
14-
"noEmit": true,
15-
16-
/* Linting */
17-
"strict": true,
18-
"noUnusedLocals": false,
19-
"noUnusedParameters": false,
20-
"noFallthroughCasesInSwitch": true
21-
},
22-
"include": ["vite.config.ts"]
23-
}
24-
=======
252
"extends": "@tsconfig/node22/tsconfig.json",
263
"include": [
274
"vite.config.*",
@@ -40,4 +17,3 @@
4017
"types": ["node"]
4118
}
4219
}
43-
>>>>>>> release/v0.0.5

0 commit comments

Comments
 (0)