Merge pull request #265 from oracle/bump-jet-18.0

LeonSilva15 · web-flow · commit c7cc06c1e63c · 2025-04-21T13:01:20.000-06:00
fix(deps): bump node-jet template to jet v18.0
diff --git a/templates/node-jet/eslint.config.mjs b/templates/node-jet/eslint.config.mjs
@@ -1,6 +1,6 @@
 /*
 **
-** Copyright (c) 2024, Oracle and/or its affiliates.
+** Copyright (c) 2025, Oracle and/or its affiliates.
 ** All rights reserved
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 */
diff --git a/templates/node-jet/oraclejetconfig.json b/templates/node-jet/oraclejetconfig.json
@@ -17,13 +17,13 @@
   },
   "unversioned": true,
   "defaultBrowser": "chrome",
-  "sassVer": "9.0.0",
+  "sassVer": "1.80.5",
   "defaultTheme": "redwood",
   "fontUrl": "https://static.oracle.com/cdn/fnd/gallery/2404.0.0/images/iconfont/ojuxIconFont.min.css",
-  "typescriptLibraries": "typescript@5.4.5 yargs-parser@~13.1.2",
+  "typescriptLibraries": "typescript@5.7.2 yargs-parser@~13.1.2",
+  "jsdocLibraries": "jsdoc@3.5.5",
   "webpackLibraries": "webpack@5.76.0 @types/node@18.16.3 webpack-dev-server style-loader css-loader sass-loader sass ts-loader@8.4.0 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",
-  "mochaTestingLibraries": "karma mocha sinon chai@4.4.1 coverage karma-chai@0.1.0 karma-coverage@2.2.0 karma-chrome-launcher@3.1.1 karma-mocha@2.0.1 karma-mocha-reporter@2.2.5 karma-requirejs@1.1.0 karma-fixture@0.2.6 karma-sinon@1.0.5 karma-typescript@5.5.4 @types/chai@4.3.4 @types/karma-fixture@0.2.5 @types/mocha@10.0.1 @types/sinon@10.0.13",
-  "jestTestingLibraries": "jest@29.6.2 @testing-library/preact@3.2.3 @types/jest@29.5.3 jest-environment-jsdom@29.6.2 @oracle/oraclejet-jest-preset@~17.1.0",
-  "architecture": "vdom",
-  "watchInterval": 1000
+  "mochaTestingLibraries": "karma mocha sinon chai@4.5.0 coverage karma-chai@0.1.0 karma-coverage@2.2.0 karma-chrome-launcher@3.1.1 karma-mocha@2.0.1 karma-mocha-reporter@2.2.5 karma-requirejs@1.1.0 karma-fixture@0.2.6 karma-sinon@1.0.5 karma-typescript@5.5.4 @types/chai@4.3.4 @types/karma-fixture@0.2.5 @types/mocha@10.0.1 @types/sinon@10.0.13",
+  "jestTestingLibraries": "jest@29.6.2 @testing-library/preact@3.2.3 @types/jest@29.5.3 jest-environment-jsdom@29.6.2 @oracle/oraclejet-jest-preset@~18.0.0",
+  "architecture": "vdom"
 }
diff --git a/templates/node-jet/package.json b/templates/node-jet/package.json
@@ -4,34 +4,31 @@
   "description": "An Oracle JavaScript Extension Toolkit(JET) web app",
   "scripts": {
     "dev": "concurrently --names server,client --prefix-colors blue,yellow --success all --kill-others 'node ./server/index.cjs' 'ojet serve --server-only'",
-    "lint": "eslint --report-unused-disable-directives"
+    "lint": "eslint src/ --max-warnings 0"
   },
   "dependencies": {
-    "@oracle/oraclejet": "~17.1.0",
-    "@oracle/oraclejet-core-pack": "~17.1.0",
-    "body-parser": "^1.20.3",
+    "@oracle/oraclejet": "~18.0.0",
+    "@oracle/oraclejet-core-pack": "~18.0.0",
+    "body-parser": "^2.2.0",
     "cors": "^2.8.5",
-    "dotenv": "16.4.7",
-    "express": "4.21.2",
-    "http-proxy-middleware": "3.0.3",
-    "morgan": "1.10.0",
-    "oracledb": "6.7.1"
+    "dotenv": "^16.5.0",
+    "express": "^5.1.0",
+    "http-proxy-middleware": "^3.0.5",
+    "morgan": "^1.10.0",
+    "oracledb": "^6.8.0"
   },
   "devDependencies": {
-    "@oracle/ojet-cli": "~17.1.0",
+    "@eslint/js": "^9.24.0",
+    "@oracle/ojet-cli": "~18.0.0",
+    "concurrently": "^9.1.2",
+    "eslint": "^9.24.0",
     "extract-zip": "^1.7.0",
     "fs-extra": "^8.1.0",
     "glob": "10.4.5",
-    "typescript": "5.4.5",
+    "typescript": "5.7.2",
+    "typescript-eslint": "^8.30.1",
     "underscore": "^1.10.2",
-    "yargs-parser": "13.1.2",
-    "concurrently": "^9.1.2",
-    "eslint": "^9.18.0",
-    "@eslint/js": "^9.18.0",
-    "eslint-plugin-n": "^17.15.1",
-    "@typescript-eslint/eslint-plugin": "^8.21.0",
-    "@typescript-eslint/parser": "^8.21.0",
-    "globals": "15.14.0"
+    "yargs-parser": "13.1.2"
   },
   "engines": {
     "node": ">=16.0.0"
diff --git a/templates/node-jet/path_mapping.json b/templates/node-jet/path_mapping.json
@@ -2,12 +2,12 @@
   "use": "local",
   "cdns": {
     "jet": {
-      "prefix": "https://static.oracle.com/cdn/jet/17.1.0/default/js",
-      "css": "https://static.oracle.com/cdn/jet/17.1.0/default/css",
-      "csspreact": "https://static.oracle.com/cdn/jet/17.1.0/3rdparty/oraclejet-preact/amd",
+      "prefix": "https://static.oracle.com/cdn/jet/18.0.0/default/js",
+      "css": "https://static.oracle.com/cdn/jet/18.0.0/default/css",
+      "csspreact": "https://static.oracle.com/cdn/jet/18.0.0/3rdparty/oraclejet-preact/amd",
       "config": "bundles-config.js"
     },
-    "3rdparty": "https://static.oracle.com/cdn/jet/17.1.0/3rdparty"
+    "3rdparty": "https://static.oracle.com/cdn/jet/18.0.0/3rdparty"
   },
   "libs": {
     "knockout": {
@@ -30,12 +30,12 @@
       "debug": {
         "src": "jquery.js",
         "path": "libs/jquery/jquery-#{version}.js",
-        "cdnPath": "jquery/jquery-3.6.4"
+        "cdnPath": "jquery/jquery-3.7.1"
       },
       "release": {
         "src": "jquery.min.js",
         "path": "libs/jquery/jquery-#{version}.min.js",
-        "cdnPath": "jquery/jquery-3.6.4.min"
+        "cdnPath": "jquery/jquery-3.7.1.min"
       }
     },
     "jqueryui-amd": {
@@ -50,7 +50,7 @@
           "vendor/jquery-color/jquery.color.js"
         ],
         "path": "libs/jquery/jqueryui-amd-#{version}",
-        "cdnPath": "jquery/jqueryui-amd-1.13.2"
+        "cdnPath": "jquery/jqueryui-amd-1.14.1"
       },
       "release": {
         "src": [
@@ -61,7 +61,7 @@
           "vendor/jquery-color/jquery.color.js"
         ],
         "path": "libs/jquery/jqueryui-amd-#{version}.min",
-        "cdnPath": "jquery/jqueryui-amd-1.13.2.min"
+        "cdnPath": "jquery/jqueryui-amd-1.14.1.min"
       }
     },
     "hammerjs": {
@@ -445,12 +445,12 @@
       "debug": {
         "src": "chai.js",
         "path": "libs/chai/chai.js",
-        "cdnPath": "chai/chai-4.3.10"
+        "cdnPath": "chai/chai-4.5.0"
       },
       "release": {
         "src": "chai.js",
         "path": "libs/chai/chai.js",
-        "cdnPath": "chai/chai-4.3.10.min"
+        "cdnPath": "chai/chai-4.5.0.min"
       }
     }
   }
diff --git a/templates/node-jet/scripts/hooks/after_app_create.js b/templates/node-jet/scripts/hooks/after_app_create.js
@@ -1,5 +1,5 @@
 /**
-  Copyright (c) 2015, 2024, Oracle and/or its affiliates.
+  Copyright (c) 2015, 2025, Oracle and/or its affiliates.
   Licensed under The Universal Permissive License (UPL), Version 1.0
   as shown at https://oss.oracle.com/licenses/upl/
 
diff --git a/templates/node-jet/scripts/hooks/after_app_restore.js b/templates/node-jet/scripts/hooks/after_app_restore.js
@@ -1,5 +1,5 @@
 /**
-  Copyright (c) 2015, 2024, Oracle and/or its affiliates.
+  Copyright (c) 2015, 2025, Oracle and/or its affiliates.
   Licensed under The Universal Permissive License (UPL), Version 1.0
   as shown at https://oss.oracle.com/licenses/upl/
 
diff --git a/templates/node-jet/scripts/hooks/after_app_typescript.js b/templates/node-jet/scripts/hooks/after_app_typescript.js
@@ -1,5 +1,5 @@
 /**
-  Copyright (c) 2015, 2024, Oracle and/or its affiliates.
+  Copyright (c) 2015, 2025, Oracle and/or its affiliates.
   Licensed under The Universal Permissive License (UPL), Version 1.0
   as shown at https://oss.oracle.com/licenses/upl/
 
diff --git a/templates/node-jet/scripts/hooks/after_build.js b/templates/node-jet/scripts/hooks/after_build.js
@@ -1,5 +1,5 @@
 /**
-  Copyright (c) 2015, 2024, Oracle and/or its affiliates.
+  Copyright (c) 2015, 2025, Oracle and/or its affiliates.
   Licensed under The Universal Permissive License (UPL), Version 1.0
   as shown at https://oss.oracle.com/licenses/upl/
 
diff --git a/templates/node-jet/scripts/hooks/after_component_build.js b/templates/node-jet/scripts/hooks/after_component_build.js
@@ -1,5 +1,5 @@
 /**
-  Copyright (c) 2015, 2024, Oracle and/or its affiliates.
+  Copyright (c) 2015, 2025, Oracle and/or its affiliates.
   Licensed under The Universal Permissive License (UPL), Version 1.0
   as shown at https://oss.oracle.com/licenses/upl/
 
diff --git a/templates/node-jet/scripts/hooks/after_component_create.js b/templates/node-jet/scripts/hooks/after_component_create.js
@@ -1,5 +1,5 @@
 /**
-  Copyright (c) 2015, 2024, Oracle and/or its affiliates.
+  Copyright (c) 2015, 2025, Oracle and/or its affiliates.
   Licensed under The Universal Permissive License (UPL), Version 1.0
   as shown at https://oss.oracle.com/licenses/upl/
 
diff --git a/templates/node-jet/scripts/hooks/after_component_package.js b/templates/node-jet/scripts/hooks/after_component_package.js
@@ -1,5 +1,5 @@
 /**
-  Copyright (c) 2015, 2024, Oracle and/or its affiliates.
+  Copyright (c) 2015, 2025, Oracle and/or its affiliates.
   Licensed under The Universal Permissive License (UPL), Version 1.0
   as shown at https://oss.oracle.com/licenses/upl/
 
diff --git a/templates/node-jet/scripts/hooks/after_component_typescript.js b/templates/node-jet/scripts/hooks/after_component_typescript.js
@@ -1,5 +1,5 @@
 /**
-  Copyright (c) 2015, 2024, Oracle and/or its affiliates.
+  Copyright (c) 2015, 2025, Oracle and/or its affiliates.
   Licensed under The Universal Permissive License (UPL), Version 1.0
   as shown at https://oss.oracle.com/licenses/upl/
 
diff --git a/templates/node-jet/scripts/hooks/after_serve.js b/templates/node-jet/scripts/hooks/after_serve.js
@@ -1,5 +1,5 @@
 /**
-  Copyright (c) 2015, 2024, Oracle and/or its affiliates.
+  Copyright (c) 2015, 2025, Oracle and/or its affiliates.
   Licensed under The Universal Permissive License (UPL), Version 1.0
   as shown at https://oss.oracle.com/licenses/upl/
 
diff --git a/templates/node-jet/scripts/hooks/after_watch.js b/templates/node-jet/scripts/hooks/after_watch.js
@@ -1,5 +1,5 @@
 /**
-  Copyright (c) 2015, 2024, Oracle and/or its affiliates.
+  Copyright (c) 2015, 2025, Oracle and/or its affiliates.
   Licensed under The Universal Permissive License (UPL), Version 1.0
   as shown at https://oss.oracle.com/licenses/upl/
 
diff --git a/templates/node-jet/scripts/hooks/before_app_typescript.js b/templates/node-jet/scripts/hooks/before_app_typescript.js
@@ -1,5 +1,5 @@
 /**
-  Copyright (c) 2015, 2024, Oracle and/or its affiliates.
+  Copyright (c) 2015, 2025, Oracle and/or its affiliates.
   Licensed under The Universal Permissive License (UPL), Version 1.0
   as shown at https://oss.oracle.com/licenses/upl/
 
diff --git a/templates/node-jet/scripts/hooks/before_build.js b/templates/node-jet/scripts/hooks/before_build.js
@@ -1,5 +1,5 @@
 /**
-  Copyright (c) 2015, 2024, Oracle and/or its affiliates.
+  Copyright (c) 2015, 2025, Oracle and/or its affiliates.
   Licensed under The Universal Permissive License (UPL), Version 1.0
   as shown at https://oss.oracle.com/licenses/upl/
 
diff --git a/templates/node-jet/scripts/hooks/before_component_optimize.js b/templates/node-jet/scripts/hooks/before_component_optimize.js
@@ -1,5 +1,5 @@
 /**
-  Copyright (c) 2015, 2024, Oracle and/or its affiliates.
+  Copyright (c) 2015, 2025, Oracle and/or its affiliates.
   Licensed under The Universal Permissive License (UPL), Version 1.0
   as shown at https://oss.oracle.com/licenses/upl/
 
diff --git a/templates/node-jet/scripts/hooks/before_component_package.js b/templates/node-jet/scripts/hooks/before_component_package.js
@@ -1,5 +1,5 @@
 /**
-  Copyright (c) 2015, 2024, Oracle and/or its affiliates.
+  Copyright (c) 2015, 2025, Oracle and/or its affiliates.
   Licensed under The Universal Permissive License (UPL), Version 1.0
   as shown at https://oss.oracle.com/licenses/upl/
 
diff --git a/templates/node-jet/scripts/hooks/before_component_typescript.js b/templates/node-jet/scripts/hooks/before_component_typescript.js
@@ -1,5 +1,5 @@
 /**
-  Copyright (c) 2015, 2024, Oracle and/or its affiliates.
+  Copyright (c) 2015, 2025, Oracle and/or its affiliates.
   Licensed under The Universal Permissive License (UPL), Version 1.0
   as shown at https://oss.oracle.com/licenses/upl/
 
diff --git a/templates/node-jet/scripts/hooks/before_injection.js b/templates/node-jet/scripts/hooks/before_injection.js
@@ -1,5 +1,5 @@
 /**
-  Copyright (c) 2015, 2024, Oracle and/or its affiliates.
+  Copyright (c) 2015, 2025, Oracle and/or its affiliates.
   Licensed under The Universal Permissive License (UPL), Version 1.0
   as shown at https://oss.oracle.com/licenses/upl/
 
diff --git a/templates/node-jet/scripts/hooks/before_optimize.js b/templates/node-jet/scripts/hooks/before_optimize.js
@@ -1,5 +1,5 @@
 /**
-  Copyright (c) 2015, 2024, Oracle and/or its affiliates.
+  Copyright (c) 2015, 2025, Oracle and/or its affiliates.
   Licensed under The Universal Permissive License (UPL), Version 1.0
   as shown at https://oss.oracle.com/licenses/upl/
 
diff --git a/templates/node-jet/scripts/hooks/before_release_build.js b/templates/node-jet/scripts/hooks/before_release_build.js
@@ -1,5 +1,5 @@
 /**
-  Copyright (c) 2015, 2024, Oracle and/or its affiliates.
+  Copyright (c) 2015, 2025, Oracle and/or its affiliates.
   Licensed under The Universal Permissive License (UPL), Version 1.0
   as shown at https://oss.oracle.com/licenses/upl/
 
diff --git a/templates/node-jet/scripts/hooks/before_serve.js b/templates/node-jet/scripts/hooks/before_serve.js
@@ -1,5 +1,5 @@
 /**
-  Copyright (c) 2015, 2024, Oracle and/or its affiliates.
+  Copyright (c) 2015, 2025, Oracle and/or its affiliates.
   Licensed under The Universal Permissive License (UPL), Version 1.0
   as shown at https://oss.oracle.com/licenses/upl/
 
diff --git a/templates/node-jet/scripts/hooks/before_watch.js b/templates/node-jet/scripts/hooks/before_watch.js
@@ -1,5 +1,5 @@
 /**
-  Copyright (c) 2015, 2024, Oracle and/or its affiliates.
+  Copyright (c) 2015, 2025, Oracle and/or its affiliates.
   Licensed under The Universal Permissive License (UPL), Version 1.0
   as shown at https://oss.oracle.com/licenses/upl/
 
diff --git a/templates/node-jet/scripts/hooks/before_webpack.js b/templates/node-jet/scripts/hooks/before_webpack.js
@@ -1,5 +1,5 @@
 /**
-  Copyright (c) 2015, 2024, Oracle and/or its affiliates.
+  Copyright (c) 2015, 2025, Oracle and/or its affiliates.
   Licensed under The Universal Permissive License (UPL), Version 1.0
   as shown at https://oss.oracle.com/licenses/upl/
 
diff --git a/templates/node-jet/src/components/app.tsx b/templates/node-jet/src/components/app.tsx
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright (c) 2014, 2024, Oracle and/or its affiliates.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates.
  * Licensed under The Universal Permissive License (UPL), Version 1.0
  * as shown at https://oss.oracle.com/licenses/upl/
  * @ignore
diff --git a/templates/node-jet/src/components/content/index.tsx b/templates/node-jet/src/components/content/index.tsx
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright (c) 2014, 2024, Oracle and/or its affiliates.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates.
  * Licensed under The Universal Permissive License (UPL), Version 1.0
  * as shown at https://oss.oracle.com/licenses/upl/
  * @ignore
@@ -40,4 +40,4 @@ export function Content() {
 
     </div>
   );
-};
+};
diff --git a/templates/node-jet/src/components/footer.tsx b/templates/node-jet/src/components/footer.tsx
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright (c) 2014, 2024, Oracle and/or its affiliates.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates.
  * Licensed under The Universal Permissive License (UPL), Version 1.0
  * as shown at https://oss.oracle.com/licenses/upl/
  * @ignore
@@ -60,7 +60,7 @@ export function Footer({ links = _DEFAULT_LINKS } : Props ) {
         </ul>
       </div>
       <div class="oj-web-applayout-footer-item oj-web-applayout-max-width oj-text-color-secondary oj-typography-body-sm">
-        Copyright © 2014, 2024 Oracle and/or its affiliates All rights reserved.
+        Copyright © 2014, 2025 Oracle and/or its affiliates All rights reserved.
       </div>
     </footer>
   );
diff --git a/templates/node-jet/src/components/header.tsx b/templates/node-jet/src/components/header.tsx
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright (c) 2014, 2024, Oracle and/or its affiliates.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates.
  * Licensed under The Universal Permissive License (UPL), Version 1.0
  * as shown at https://oss.oracle.com/licenses/upl/
  * @ignore
@@ -43,11 +43,9 @@ export function Header({ appName, userLogin }: Props) {
     <header role="banner" class="oj-web-applayout-header">
       <div class="oj-web-applayout-max-width oj-flex-bar oj-sm-align-items-center">
         <div class="oj-flex-bar-middle oj-sm-align-items-baseline">
-          <span
-            role="img"
-            class="oj-icon demo-oracle-icon"
-            title="Oracle Logo"
-            alt="Oracle Logo"></span>
+        <img class="oj-icon demo-oracle-icon"
+              title="Oracle Logo"
+              alt="Oracle Logo"/>
           <h1
             class="oj-sm-only-hide oj-web-applayout-header-title"
             title="Application Name">
diff --git a/templates/node-jet/src/index.html b/templates/node-jet/src/index.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!--
- Copyright (c) 2014, 2024, Oracle and/or its affiliates.
+ Copyright (c) 2014, 2025, Oracle and/or its affiliates.
  Licensed under The Universal Permissive License (UPL), Version 1.0
  as shown at https://oss.oracle.com/licenses/upl/
  -->
diff --git a/templates/node-jet/src/index.ts b/templates/node-jet/src/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright (c) 2014, 2024, Oracle and/or its affiliates.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates.
  * Licensed under The Universal Permissive License (UPL), Version 1.0
  * as shown at https://oss.oracle.com/licenses/upl/
  * @ignore
diff --git a/templates/node-jet/src/main.js b/templates/node-jet/src/main.js
diff --git a/templates/node-jet/src/styles/app.css b/templates/node-jet/src/styles/app.css

-Original file line number
+Diff line change
   },
   "unversioned": true,
   "defaultBrowser": "chrome",
 -  "sassVer": "9.0.0",
 +  "sassVer": "1.80.5",
   "defaultTheme": "redwood",
   "fontUrl": "https://static.oracle.com/cdn/fnd/gallery/2404.0.0/images/iconfont/ojuxIconFont.min.css",
 -  "typescriptLibraries": "[email protected] yargs-parser@~13.1.2",
 +  "typescriptLibraries": "[email protected] yargs-parser@~13.1.2",
 +  "jsdocLibraries": "[email protected]",
   "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",
 -  "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]",
 -  "jestTestingLibraries": "[email protected] @testing-library/[email protected] @types/[email protected] [email protected] @oracle/oraclejet-jest-preset@~17.1.0",
 -  "architecture": "vdom",
 -  "watchInterval": 1000
 +  "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]",
 +  "jestTestingLibraries": "[email protected] @testing-library/[email protected] @types/[email protected] [email protected] @oracle/oraclejet-jest-preset@~18.0.0",
 +  "architecture": "vdom"
+}