Skip to content

Commit 5c81499

Browse files
authored
Merge pull request #202 from oracle/bump-vanilla-deps
Bump node-vanilla dependencies and migrated to ESLint flat config
2 parents fe770e6 + 97fe07f commit 5c81499

File tree

4 files changed

+53
-35
lines changed

4 files changed

+53
-35
lines changed

templates/app/index.cjs

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ app.use( '/api/<%= apiConfiguration %>', routes );
2323

2424
app.use(express.static('public'));
2525

26-
app.use((err, req, res) => {
26+
// eslint-disable-next-line no-unused-vars
27+
app.use((err, req, res, next) => {
2728
console.log(err.message);
2829
res.status(500).send({
2930
errorCode: err.code,

templates/node-vanilla/.eslintrc.cjs

-25
This file was deleted.
+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
/*
2+
**
3+
** Copyright (c) 2024, Oracle and/or its affiliates.
4+
** All rights reserved
5+
** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
6+
*/
7+
import globals from "globals";
8+
import js from "@eslint/js";
9+
import nodePlugin from "eslint-plugin-n";
10+
11+
export default [
12+
{
13+
files: ["src/**/*.js"],
14+
languageOptions: {
15+
ecmaVersion: 2022,
16+
sourceType: "module",
17+
globals: {
18+
...globals.browser,
19+
}
20+
},
21+
rules: js.configs.recommended.rules
22+
},
23+
{
24+
files: ["server/**/*.js", "server/**/*.cjs"],
25+
languageOptions: {
26+
ecmaVersion: 2022,
27+
sourceType: "module",
28+
globals: {
29+
...globals.node,
30+
}
31+
},
32+
plugins: {
33+
n: nodePlugin
34+
},
35+
rules: {
36+
...js.configs.recommended.rules,
37+
...nodePlugin.configs["flat/recommended-script"].rules
38+
}
39+
}
40+
];

templates/node-vanilla/package.json

+11-9
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,23 @@
77
"scripts": {
88
"dev": "concurrently --names server,client --prefix-colors blue,yellow --success all --kill-others 'node ./server/index.cjs' 'vite'",
99
"build": "vite build",
10-
"lint": "eslint . --ext js,jsx --report-unused-disable-directives",
10+
"lint": "eslint --report-unused-disable-directives",
1111
"preview": "vite preview"
1212
},
1313
"dependencies": {
14-
"body-parser": "^1.20.2",
14+
"body-parser": "^1.20.3",
1515
"cors": "^2.8.5",
16-
"dotenv": "^16.3.1",
17-
"eslint": "^9.9.1",
18-
"express": "^4.18.2",
16+
"dotenv": "^16.4.7",
17+
"express": "^4.21.2",
1918
"morgan": "^1.10.0",
20-
"oracledb": "^6.2.0"
19+
"oracledb": "^6.7.1"
2120
},
2221
"devDependencies": {
23-
"concurrently": "^8.2.2",
24-
"eslint-plugin-node": "^11.1.0",
25-
"vite": "^5.0.8"
22+
"concurrently": "^9.1.2",
23+
"eslint": "^9.18.0",
24+
"@eslint/js": "^9.18.0",
25+
"eslint-plugin-n": "^17.15.1",
26+
"globals": "15.14.0",
27+
"vite": "^6.0.7"
2628
}
2729
}

0 commit comments

Comments
 (0)