Skip to content

Commit c7cc06c

Browse files
LeonSilva15LeonSilva15
authored
Merge pull request #265 from oracle/bump-jet-18.0
fix(deps): bump node-jet template to jet v18.0
2 parents 2b57639 + 3da7ce1 commit c7cc06c

33 files changed

+73
-81
lines changed

‎templates/node-jet/eslint.config.mjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
**
3-
** Copyright (c) 2024, Oracle and/or its affiliates.
3+
** Copyright (c) 2025, Oracle and/or its affiliates.
44
** All rights reserved
55
** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
66
*/

‎templates/node-jet/oraclejetconfig.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
},
1818
"unversioned": true,
1919
"defaultBrowser": "chrome",
20-
"sassVer": "9.0.0",
20+
"sassVer": "1.80.5",
2121
"defaultTheme": "redwood",
2222
"fontUrl": "https://static.oracle.com/cdn/fnd/gallery/2404.0.0/images/iconfont/ojuxIconFont.min.css",
23-
"typescriptLibraries": "[email protected] yargs-parser@~13.1.2",
23+
"typescriptLibraries": "[email protected] yargs-parser@~13.1.2",
24+
"jsdocLibraries": "[email protected]",
2425
"webpackLibraries": "[email protected] @types/[email protected] webpack-dev-server style-loader css-loader sass-loader sass [email protected] raw-loader noop-loader html-webpack-plugin html-replace-webpack-plugin copy-webpack-plugin @prefresh/webpack @prefresh/babel-plugin webpack-merge compression-webpack-plugin mini-css-extract-plugin clean-webpack-plugin css-fix-url-loader",
25-
"mochaTestingLibraries": "karma mocha sinon [email protected] coverage [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] @types/[email protected] @types/[email protected] @types/[email protected] @types/[email protected]",
26-
"jestTestingLibraries": "[email protected] @testing-library/[email protected] @types/[email protected] [email protected] @oracle/oraclejet-jest-preset@~17.1.0",
27-
"architecture": "vdom",
28-
"watchInterval": 1000
26+
"mochaTestingLibraries": "karma mocha sinon [email protected] coverage [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] @types/[email protected] @types/[email protected] @types/[email protected] @types/[email protected]",
27+
"jestTestingLibraries": "[email protected] @testing-library/[email protected] @types/[email protected] [email protected] @oracle/oraclejet-jest-preset@~18.0.0",
28+
"architecture": "vdom"
2929
}

‎templates/node-jet/package.json

+16-19
Original file line numberDiff line numberDiff line change
@@ -4,34 +4,31 @@
44
"description": "An Oracle JavaScript Extension Toolkit(JET) web app",
55
"scripts": {
66
"dev": "concurrently --names server,client --prefix-colors blue,yellow --success all --kill-others 'node ./server/index.cjs' 'ojet serve --server-only'",
7-
"lint": "eslint --report-unused-disable-directives"
7+
"lint": "eslint src/ --max-warnings 0"
88
},
99
"dependencies": {
10-
"@oracle/oraclejet": "~17.1.0",
11-
"@oracle/oraclejet-core-pack": "~17.1.0",
12-
"body-parser": "^1.20.3",
10+
"@oracle/oraclejet": "~18.0.0",
11+
"@oracle/oraclejet-core-pack": "~18.0.0",
12+
"body-parser": "^2.2.0",
1313
"cors": "^2.8.5",
14-
"dotenv": "16.4.7",
15-
"express": "4.21.2",
16-
"http-proxy-middleware": "3.0.3",
17-
"morgan": "1.10.0",
18-
"oracledb": "6.7.1"
14+
"dotenv": "^16.5.0",
15+
"express": "^5.1.0",
16+
"http-proxy-middleware": "^3.0.5",
17+
"morgan": "^1.10.0",
18+
"oracledb": "^6.8.0"
1919
},
2020
"devDependencies": {
21-
"@oracle/ojet-cli": "~17.1.0",
21+
"@eslint/js": "^9.24.0",
22+
"@oracle/ojet-cli": "~18.0.0",
23+
"concurrently": "^9.1.2",
24+
"eslint": "^9.24.0",
2225
"extract-zip": "^1.7.0",
2326
"fs-extra": "^8.1.0",
2427
"glob": "10.4.5",
25-
"typescript": "5.4.5",
28+
"typescript": "5.7.2",
29+
"typescript-eslint": "^8.30.1",
2630
"underscore": "^1.10.2",
27-
"yargs-parser": "13.1.2",
28-
"concurrently": "^9.1.2",
29-
"eslint": "^9.18.0",
30-
"@eslint/js": "^9.18.0",
31-
"eslint-plugin-n": "^17.15.1",
32-
"@typescript-eslint/eslint-plugin": "^8.21.0",
33-
"@typescript-eslint/parser": "^8.21.0",
34-
"globals": "15.14.0"
31+
"yargs-parser": "13.1.2"
3532
},
3633
"engines": {
3734
"node": ">=16.0.0"

‎templates/node-jet/path_mapping.json

+10-10
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
"use": "local",
33
"cdns": {
44
"jet": {
5-
"prefix": "https://static.oracle.com/cdn/jet/17.1.0/default/js",
6-
"css": "https://static.oracle.com/cdn/jet/17.1.0/default/css",
7-
"csspreact": "https://static.oracle.com/cdn/jet/17.1.0/3rdparty/oraclejet-preact/amd",
5+
"prefix": "https://static.oracle.com/cdn/jet/18.0.0/default/js",
6+
"css": "https://static.oracle.com/cdn/jet/18.0.0/default/css",
7+
"csspreact": "https://static.oracle.com/cdn/jet/18.0.0/3rdparty/oraclejet-preact/amd",
88
"config": "bundles-config.js"
99
},
10-
"3rdparty": "https://static.oracle.com/cdn/jet/17.1.0/3rdparty"
10+
"3rdparty": "https://static.oracle.com/cdn/jet/18.0.0/3rdparty"
1111
},
1212
"libs": {
1313
"knockout": {
@@ -30,12 +30,12 @@
3030
"debug": {
3131
"src": "jquery.js",
3232
"path": "libs/jquery/jquery-#{version}.js",
33-
"cdnPath": "jquery/jquery-3.6.4"
33+
"cdnPath": "jquery/jquery-3.7.1"
3434
},
3535
"release": {
3636
"src": "jquery.min.js",
3737
"path": "libs/jquery/jquery-#{version}.min.js",
38-
"cdnPath": "jquery/jquery-3.6.4.min"
38+
"cdnPath": "jquery/jquery-3.7.1.min"
3939
}
4040
},
4141
"jqueryui-amd": {
@@ -50,7 +50,7 @@
5050
"vendor/jquery-color/jquery.color.js"
5151
],
5252
"path": "libs/jquery/jqueryui-amd-#{version}",
53-
"cdnPath": "jquery/jqueryui-amd-1.13.2"
53+
"cdnPath": "jquery/jqueryui-amd-1.14.1"
5454
},
5555
"release": {
5656
"src": [
@@ -61,7 +61,7 @@
6161
"vendor/jquery-color/jquery.color.js"
6262
],
6363
"path": "libs/jquery/jqueryui-amd-#{version}.min",
64-
"cdnPath": "jquery/jqueryui-amd-1.13.2.min"
64+
"cdnPath": "jquery/jqueryui-amd-1.14.1.min"
6565
}
6666
},
6767
"hammerjs": {
@@ -445,12 +445,12 @@
445445
"debug": {
446446
"src": "chai.js",
447447
"path": "libs/chai/chai.js",
448-
"cdnPath": "chai/chai-4.3.10"
448+
"cdnPath": "chai/chai-4.5.0"
449449
},
450450
"release": {
451451
"src": "chai.js",
452452
"path": "libs/chai/chai.js",
453-
"cdnPath": "chai/chai-4.3.10.min"
453+
"cdnPath": "chai/chai-4.5.0.min"
454454
}
455455
}
456456
}

‎templates/node-jet/scripts/hooks/after_app_create.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
Copyright (c) 2015, 2024, Oracle and/or its affiliates.
2+
Copyright (c) 2015, 2025, Oracle and/or its affiliates.
33
Licensed under The Universal Permissive License (UPL), Version 1.0
44
as shown at https://oss.oracle.com/licenses/upl/
55

‎templates/node-jet/scripts/hooks/after_app_restore.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
Copyright (c) 2015, 2024, Oracle and/or its affiliates.
2+
Copyright (c) 2015, 2025, Oracle and/or its affiliates.
33
Licensed under The Universal Permissive License (UPL), Version 1.0
44
as shown at https://oss.oracle.com/licenses/upl/
55

‎templates/node-jet/scripts/hooks/after_app_typescript.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
Copyright (c) 2015, 2024, Oracle and/or its affiliates.
2+
Copyright (c) 2015, 2025, Oracle and/or its affiliates.
33
Licensed under The Universal Permissive License (UPL), Version 1.0
44
as shown at https://oss.oracle.com/licenses/upl/
55

‎templates/node-jet/scripts/hooks/after_build.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
Copyright (c) 2015, 2024, Oracle and/or its affiliates.
2+
Copyright (c) 2015, 2025, Oracle and/or its affiliates.
33
Licensed under The Universal Permissive License (UPL), Version 1.0
44
as shown at https://oss.oracle.com/licenses/upl/
55

‎templates/node-jet/scripts/hooks/after_component_build.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
Copyright (c) 2015, 2024, Oracle and/or its affiliates.
2+
Copyright (c) 2015, 2025, Oracle and/or its affiliates.
33
Licensed under The Universal Permissive License (UPL), Version 1.0
44
as shown at https://oss.oracle.com/licenses/upl/
55

‎templates/node-jet/scripts/hooks/after_component_create.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
Copyright (c) 2015, 2024, Oracle and/or its affiliates.
2+
Copyright (c) 2015, 2025, Oracle and/or its affiliates.
33
Licensed under The Universal Permissive License (UPL), Version 1.0
44
as shown at https://oss.oracle.com/licenses/upl/
55

‎templates/node-jet/scripts/hooks/after_component_package.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
Copyright (c) 2015, 2024, Oracle and/or its affiliates.
2+
Copyright (c) 2015, 2025, Oracle and/or its affiliates.
33
Licensed under The Universal Permissive License (UPL), Version 1.0
44
as shown at https://oss.oracle.com/licenses/upl/
55

‎templates/node-jet/scripts/hooks/after_component_typescript.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
Copyright (c) 2015, 2024, Oracle and/or its affiliates.
2+
Copyright (c) 2015, 2025, Oracle and/or its affiliates.
33
Licensed under The Universal Permissive License (UPL), Version 1.0
44
as shown at https://oss.oracle.com/licenses/upl/
55

‎templates/node-jet/scripts/hooks/after_serve.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
Copyright (c) 2015, 2024, Oracle and/or its affiliates.
2+
Copyright (c) 2015, 2025, Oracle and/or its affiliates.
33
Licensed under The Universal Permissive License (UPL), Version 1.0
44
as shown at https://oss.oracle.com/licenses/upl/
55

‎templates/node-jet/scripts/hooks/after_watch.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
Copyright (c) 2015, 2024, Oracle and/or its affiliates.
2+
Copyright (c) 2015, 2025, Oracle and/or its affiliates.
33
Licensed under The Universal Permissive License (UPL), Version 1.0
44
as shown at https://oss.oracle.com/licenses/upl/
55

‎templates/node-jet/scripts/hooks/before_app_typescript.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
Copyright (c) 2015, 2024, Oracle and/or its affiliates.
2+
Copyright (c) 2015, 2025, Oracle and/or its affiliates.
33
Licensed under The Universal Permissive License (UPL), Version 1.0
44
as shown at https://oss.oracle.com/licenses/upl/
55

‎templates/node-jet/scripts/hooks/before_build.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
Copyright (c) 2015, 2024, Oracle and/or its affiliates.
2+
Copyright (c) 2015, 2025, Oracle and/or its affiliates.
33
Licensed under The Universal Permissive License (UPL), Version 1.0
44
as shown at https://oss.oracle.com/licenses/upl/
55

‎templates/node-jet/scripts/hooks/before_component_optimize.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
Copyright (c) 2015, 2024, Oracle and/or its affiliates.
2+
Copyright (c) 2015, 2025, Oracle and/or its affiliates.
33
Licensed under The Universal Permissive License (UPL), Version 1.0
44
as shown at https://oss.oracle.com/licenses/upl/
55

‎templates/node-jet/scripts/hooks/before_component_package.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
Copyright (c) 2015, 2024, Oracle and/or its affiliates.
2+
Copyright (c) 2015, 2025, Oracle and/or its affiliates.
33
Licensed under The Universal Permissive License (UPL), Version 1.0
44
as shown at https://oss.oracle.com/licenses/upl/
55

‎templates/node-jet/scripts/hooks/before_component_typescript.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
Copyright (c) 2015, 2024, Oracle and/or its affiliates.
2+
Copyright (c) 2015, 2025, Oracle and/or its affiliates.
33
Licensed under The Universal Permissive License (UPL), Version 1.0
44
as shown at https://oss.oracle.com/licenses/upl/
55

‎templates/node-jet/scripts/hooks/before_injection.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
Copyright (c) 2015, 2024, Oracle and/or its affiliates.
2+
Copyright (c) 2015, 2025, Oracle and/or its affiliates.
33
Licensed under The Universal Permissive License (UPL), Version 1.0
44
as shown at https://oss.oracle.com/licenses/upl/
55

‎templates/node-jet/scripts/hooks/before_optimize.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
Copyright (c) 2015, 2024, Oracle and/or its affiliates.
2+
Copyright (c) 2015, 2025, Oracle and/or its affiliates.
33
Licensed under The Universal Permissive License (UPL), Version 1.0
44
as shown at https://oss.oracle.com/licenses/upl/
55

‎templates/node-jet/scripts/hooks/before_release_build.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
Copyright (c) 2015, 2024, Oracle and/or its affiliates.
2+
Copyright (c) 2015, 2025, Oracle and/or its affiliates.
33
Licensed under The Universal Permissive License (UPL), Version 1.0
44
as shown at https://oss.oracle.com/licenses/upl/
55

‎templates/node-jet/scripts/hooks/before_serve.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
Copyright (c) 2015, 2024, Oracle and/or its affiliates.
2+
Copyright (c) 2015, 2025, Oracle and/or its affiliates.
33
Licensed under The Universal Permissive License (UPL), Version 1.0
44
as shown at https://oss.oracle.com/licenses/upl/
55

‎templates/node-jet/scripts/hooks/before_watch.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
Copyright (c) 2015, 2024, Oracle and/or its affiliates.
2+
Copyright (c) 2015, 2025, Oracle and/or its affiliates.
33
Licensed under The Universal Permissive License (UPL), Version 1.0
44
as shown at https://oss.oracle.com/licenses/upl/
55

‎templates/node-jet/scripts/hooks/before_webpack.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
Copyright (c) 2015, 2024, Oracle and/or its affiliates.
2+
Copyright (c) 2015, 2025, Oracle and/or its affiliates.
33
Licensed under The Universal Permissive License (UPL), Version 1.0
44
as shown at https://oss.oracle.com/licenses/upl/
55

‎templates/node-jet/src/components/app.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @license
3-
* Copyright (c) 2014, 2024, Oracle and/or its affiliates.
3+
* Copyright (c) 2014, 2025, Oracle and/or its affiliates.
44
* Licensed under The Universal Permissive License (UPL), Version 1.0
55
* as shown at https://oss.oracle.com/licenses/upl/
66
* @ignore

‎templates/node-jet/src/components/content/index.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @license
3-
* Copyright (c) 2014, 2024, Oracle and/or its affiliates.
3+
* Copyright (c) 2014, 2025, Oracle and/or its affiliates.
44
* Licensed under The Universal Permissive License (UPL), Version 1.0
55
* as shown at https://oss.oracle.com/licenses/upl/
66
* @ignore
@@ -40,4 +40,4 @@ export function Content() {
4040

4141
</div>
4242
);
43-
};
43+
};

‎templates/node-jet/src/components/footer.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @license
3-
* Copyright (c) 2014, 2024, Oracle and/or its affiliates.
3+
* Copyright (c) 2014, 2025, Oracle and/or its affiliates.
44
* Licensed under The Universal Permissive License (UPL), Version 1.0
55
* as shown at https://oss.oracle.com/licenses/upl/
66
* @ignore
@@ -60,7 +60,7 @@ export function Footer({ links = _DEFAULT_LINKS } : Props ) {
6060
</ul>
6161
</div>
6262
<div class="oj-web-applayout-footer-item oj-web-applayout-max-width oj-text-color-secondary oj-typography-body-sm">
63-
Copyright © 2014, 2024 Oracle and/or its affiliates All rights reserved.
63+
Copyright © 2014, 2025 Oracle and/or its affiliates All rights reserved.
6464
</div>
6565
</footer>
6666
);

‎templates/node-jet/src/components/header.tsx

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @license
3-
* Copyright (c) 2014, 2024, Oracle and/or its affiliates.
3+
* Copyright (c) 2014, 2025, Oracle and/or its affiliates.
44
* Licensed under The Universal Permissive License (UPL), Version 1.0
55
* as shown at https://oss.oracle.com/licenses/upl/
66
* @ignore
@@ -43,11 +43,9 @@ export function Header({ appName, userLogin }: Props) {
4343
<header role="banner" class="oj-web-applayout-header">
4444
<div class="oj-web-applayout-max-width oj-flex-bar oj-sm-align-items-center">
4545
<div class="oj-flex-bar-middle oj-sm-align-items-baseline">
46-
<span
47-
role="img"
48-
class="oj-icon demo-oracle-icon"
49-
title="Oracle Logo"
50-
alt="Oracle Logo"></span>
46+
<img class="oj-icon demo-oracle-icon"
47+
title="Oracle Logo"
48+
alt="Oracle Logo"/>
5149
<h1
5250
class="oj-sm-only-hide oj-web-applayout-header-title"
5351
title="Application Name">

‎templates/node-jet/src/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!DOCTYPE html>
22
<!--
3-
Copyright (c) 2014, 2024, Oracle and/or its affiliates.
3+
Copyright (c) 2014, 2025, Oracle and/or its affiliates.
44
Licensed under The Universal Permissive License (UPL), Version 1.0
55
as shown at https://oss.oracle.com/licenses/upl/
66
-->

‎templates/node-jet/src/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @license
3-
* Copyright (c) 2014, 2024, Oracle and/or its affiliates.
3+
* Copyright (c) 2014, 2025, Oracle and/or its affiliates.
44
* Licensed under The Universal Permissive License (UPL), Version 1.0
55
* as shown at https://oss.oracle.com/licenses/upl/
66
* @ignore

0 commit comments

Comments
 (0)