Skip to content

Commit 296c5e0

Browse files
authored
Merge pull request #204 from oracle/bump-vue-deps
Bump node-vue dependencies and migrated to ESLint flat config
2 parents a67c6ce + 9f32cde commit 296c5e0

File tree

5 files changed

+64
-54
lines changed

5 files changed

+64
-54
lines changed

templates/node-vue/.eslintrc.cjs

-37
This file was deleted.

templates/node-vue/eslint.config.mjs

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
import globals from "globals";
2+
import js from "@eslint/js";
3+
import nodePlugin from "eslint-plugin-n";
4+
import vuePlugin from "eslint-plugin-vue"
5+
6+
export default [
7+
js.configs.recommended,
8+
...vuePlugin.configs["flat/recommended"],
9+
{
10+
files: ["src/**/*.[js,cjs]","src/**/*.vue"]
11+
},
12+
{
13+
files: ["server/**/*.js", "server/**/*.cjs"],
14+
languageOptions: {
15+
ecmaVersion: 2022,
16+
sourceType: "module",
17+
globals: {
18+
...globals.node,
19+
}
20+
},
21+
plugins: {
22+
n: nodePlugin
23+
},
24+
rules: {
25+
...js.configs.recommended.rules,
26+
...nodePlugin.configs["flat/recommended-script"].rules
27+
}
28+
}
29+
];

templates/node-vue/package.json

+14-12
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,26 @@
66
"scripts": {
77
"dev": "concurrently --names server,client --prefix-colors blue,yellow --success all --kill-others 'node ./server/index.cjs' 'vite'",
88
"build": "vite build",
9-
"lint": "eslint . --ext js,jsx,vue --report-unused-disable-directives",
9+
"lint": "eslint --report-unused-disable-directives",
1010
"preview": "vite preview"
1111
},
1212
"dependencies": {
13-
"body-parser": "^1.20.2",
13+
"body-parser": "^1.20.3",
1414
"cors": "^2.8.5",
15-
"dotenv": "^16.3.1",
16-
"express": "^4.18.2",
15+
"dotenv": "^16.4.7",
16+
"express": "^4.21.2",
1717
"morgan": "^1.10.0",
18-
"oracledb": "^6.2.0",
19-
"vue": "^3.3.11"
18+
"oracledb": "^6.7.1",
19+
"vue": "^3.5.13"
2020
},
2121
"devDependencies": {
22-
"@vitejs/plugin-vue": "^4.5.2",
23-
"concurrently": "^8.2.2",
24-
"eslint": "^9.9.1",
25-
"eslint-plugin-node": "^11.1.0",
26-
"eslint-plugin-vue": "^9.22.0",
27-
"vite": "^5.0.8"
22+
"@vitejs/plugin-vue": "^5.2.1",
23+
"concurrently": "^9.1.2",
24+
"eslint": "^9.18.0",
25+
"@eslint/js": "^9.18.0",
26+
"eslint-plugin-n": "^17.15.1",
27+
"eslint-plugin-vue": "^9.32.0",
28+
"globals": "15.14.0",
29+
"vite": "^6.0.11"
2830
}
2931
}

templates/node-vue/src/App.vue

+18-4
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,25 @@ onMounted(async () => {
2424

2525
<template>
2626
<div>
27-
<a href="https://www.oracle.com/uk/database/" target="_blank">
28-
<img src="./assets/ORCL.svg" class="logo" alt="Oracle logo" />
27+
<a
28+
href="https://www.oracle.com/database/"
29+
target="_blank"
30+
>
31+
<img
32+
src="./assets/ORCL.svg"
33+
class="logo"
34+
alt="Oracle logo"
35+
>
2936
</a>
30-
<a href="https://vuejs.org/" target="_blank">
31-
<img src="./assets/vue.svg" class="logo vue" alt="Vue logo" />
37+
<a
38+
href="https://vuejs.org/"
39+
target="_blank"
40+
>
41+
<img
42+
src="./assets/vue.svg"
43+
class="logo vue"
44+
alt="Vue logo"
45+
>
3246
</a>
3347
</div>
3448
<HelloWorld :status="isConnected" />

templates/node-vue/src/components/HelloWorld.vue

+3-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ const props = defineProps({
3030
</p>
3131
</div>
3232

33-
<p class="read-the-docs">Click on the Oracle and Vue logos to learn more</p>
33+
<p class="read-the-docs">
34+
Click on the Oracle and Vue logos to learn more
35+
</p>
3436
</template>
3537

3638
<style scoped>

0 commit comments

Comments
 (0)