Release 18.0.0

Author: benm071

CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # Contributing to oraclejet-tooling
 
-*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/*
 

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2024 Oracle and/or its affiliates.
+Copyright (c) 2025 Oracle and/or its affiliates.
 
 The Universal Permissive License (UPL), Version 1.0
 

README.md

@@ -1,12 +1,12 @@
-# @oracle/oraclejet-tooling 17.1.0
+# @oracle/oraclejet-tooling 18.0.0
 
 ## About the tooling API
 This tooling API contains methods to build and serve Oracle JET web apps. It is intended to be used with task running tools such as grunt or gulp. The APIs can also be invoked directly. 
 
 This is an open source project maintained by Oracle Corp.
 
 ## Installation
-This module will be automatically installed when you scaffold a web app following the [Oracle JET Developers Guide](http://www.oracle.com/pls/topic/lookup?ctx=jet1710&id=homepage).
+This module will be automatically installed when you scaffold a web app following the [Oracle JET Developers Guide](http://www.oracle.com/pls/topic/lookup?ctx=jet1800&id=homepage).
 
 ## Contributing
 This project is not accepting external contributions at this time. For bugs or enhancement requests, please file a GitHub issue unless it’s security related. When filing a bug remember that the better written the bug is, the more likely it is to be fixed. If you think you’ve found a security vulnerability, do not raise a GitHub issue and follow the instructions in our [security policy](./SECURITY.md).
@@ -16,5 +16,5 @@ This project is not accepting external contributions at this time. For bugs or e
 Please consult the [security guide](./SECURITY.md) for our responsible security vulnerability disclosure process
 
 ## License
-Copyright (c) 2024 Oracle and/or its affiliates and released  under the 
+Copyright (c) 2025 Oracle and/or its affiliates and released  under the 
 [Universal Permissive License (UPL)](https://oss.oracle.com/licenses/upl/), Version 1.0

RELEASENOTES.md

@@ -1,6 +1,7 @@
 ## Release Notes for oraclejet-tooling ##
 
-### 17.1.0
+### 18.0.0
+* Switch to chokidar from gaze
 
 ### 11.0.0
 * oraclejet-tooling now requires node 12.21 or later

THIRDPARTYLICENSE.txt

@@ -13,15 +13,10 @@ THIRD-PARTY COMPONENT                                                 LICENSE
 --------------------------------------------------------------------------------
 node_modules/fs-extra/                                                  MIT
 node_modules/glob/                                                      ISC
-node_modules/lodash.difference/                                         MIT
-node_modules/lodash.escaperegexp/                                       MIT
-node_modules/lodash.isfunction/                                         MIT
-node_modules/lodash.remove/                                             MIT
-node_modules/lodash.union/                                              MIT
 node_modules/lodash.mergewith/                                          MIT
 node_modules/requirejs/                                                 MIT
 node_modules/terser/                                                BSD-2-Clause
-node_modules/gaze/                                                      MIT
+node_modules/chokidar/                                                  MIT
 node_modules/connect/                                                   MIT
 node_modules/connect-livereload/                                        MIT
 node_moduels/tiny-lr/                                                   MIT

config/eslintcustom.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/
 

lib/add.js

@@ -1,6 +1,6 @@
 #! /usr/bin/env node
 /**
-  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/
 

lib/addjsdoc.js

@@ -1,6 +1,6 @@
 #! /usr/bin/env node
 /**
-  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/
 
@@ -12,6 +12,7 @@
  * ## Dependencies
  */
 const util = require('./util');
+const config = require('./config');
 
 /**
  * # 'addJsdoc'
@@ -23,6 +24,15 @@ const util = require('./util');
 module.exports = function (options) {
   util.log('Installing jsdoc');
   const installer = util.getInstallerCommand({ options });
+  const jsdocLibraries = config.data.jsdocLibraries;
 
-  return util.spawn(installer.installer, [installer.verbs.install, 'jsdoc@3.5.5', installer.flags.save, installer.flags.exact]);
+  return util.spawn(
+    installer.installer,
+    [
+      installer.verbs.install,
+      jsdocLibraries,
+      installer.flags.save,
+      installer.flags.exact
+    ]
+  );
 };

lib/addpcss.js

@@ -1,6 +1,6 @@
 #! /usr/bin/env node
 /**
-  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/
 
@@ -28,7 +28,7 @@ module.exports = function (options) {
   const sassVer = config.data.sassVer;
 
   return util.spawn(installer.installer, [installer.verbs.install,
-    `node-sass@${sassVer}`,
+    `sass@${sassVer}`,
     'postcss-calc@6.0.1',
     'autoprefixer@9.1.5',
     installer.flags.save]);

lib/addpwa.js

@@ -1,6 +1,6 @@
 #! /usr/bin/env node
 /**
-  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/
 

lib/addsass.js

@@ -1,6 +1,6 @@
 #! /usr/bin/env node
 /**
-  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/
 
@@ -26,6 +26,6 @@ module.exports = function (options) {
   const sassVer = config.data.sassVer;
   const installer = util.getInstallerCommand({ options });
 
-  util.log('Installing node-sass');
-  return util.spawn(installer.installer, [installer.verbs.install, `node-sass@${sassVer}`, installer.flags.save]);
+  util.log('Installing sass');
+  return util.spawn(installer.installer, [installer.verbs.install, `sass@${sassVer}`, installer.flags.save]);
 };

lib/addtesting.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/
 

lib/addtypescript.js

@@ -1,6 +1,6 @@
 #! /usr/bin/env node
 /**
-  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/
 

lib/addwebpack.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/
 

lib/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/
 

lib/buildCommon.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/
 
@@ -365,6 +365,104 @@ function _requireJsInvoker(context) {
   });
 }
 
+/**
+ * ## _restoreOjcssPluginReference
+ *
+ * Restores the ojcss plugin reference in the paths.
+ *
+ * @private
+ * @param {object} context build context
+ * @returns {Promise} promise
+ */
+function _restoreOjcssPluginReference(context) {
+  try {
+    const importsAndFilePathsArray = context.importsAndFilePathsArray || [];
+    if (importsAndFilePathsArray.length > 0) {
+      importsAndFilePathsArray.forEach((item) => {
+        if (item.matches.length > 0) {
+          let fileContent = fs.readFileSync(item.file, { encoding: 'utf-8' });
+          item.matches.forEach((match) => {
+            fileContent = fileContent.replace(match.replace('ojcss!', ''), match);
+          });
+          util.writeFileSync(item.file, fileContent);
+        }
+      });
+    }
+
+    if (context.importsAndFilePathsArray) {
+      // eslint-disable-next-line no-param-reassign
+      delete context.importsAndFilePathsArray;
+    }
+
+    return Promise.resolve(context);
+  } catch (error) {
+    util.log.error(error);
+    return Promise.reject(error);
+  }
+}
+
+/**
+ * ## _removeOjcssPluginReference
+ *
+ * Removes the ojcss reference in the paths before invoking requirejs.
+ *
+ * @private
+ * @param {object} context build context
+ * @returns {Promise} promise
+ */
+function _removeOjcssPluginReference(context) {
+  try {
+    const importsAndFilePathsArray = [];
+    const isVDOMApplication = util.isVDOMApplication();
+    const configPaths = util.getConfiguredPaths();
+    const pattern = util.posixPattern(path.join(
+      util.destPath(),
+      configPaths.staging.web,
+      isVDOMApplication ? configPaths.components : configPaths.src.javascript,
+      '**/*.js'
+    ));
+    const excludeLibsPattern = util.posixPattern(path.join(
+      util.destPath(),
+      configPaths.staging.web,
+      configPaths.src.javascript,
+      'libs',
+      '**/*.js'
+    ));
+    const srcFiles = isVDOMApplication ? glob.sync(pattern) :
+      glob.sync(pattern, { ignore: excludeLibsPattern });
+
+    // Remove any ojcss! that exists in the files:
+    srcFiles.forEach((file) => {
+      const fileContent = util.readFileSync(file, { encoding: 'utf-8' });
+      const ojCssRegex = /ojcss!/g;
+      if (ojCssRegex.test(fileContent)) {
+        const matches = [];
+        const pathRegex = /ojcss![^'"\s]*\.css/g;
+        let match = pathRegex.exec(fileContent);
+
+        while (match !== null) {
+          matches.push(match[0]);
+          match = pathRegex.exec(fileContent);
+        }
+
+        const updatedFileContent = fileContent.replace(ojCssRegex, '');
+
+        util.writeFileSync(file, updatedFileContent);
+
+        if (matches.length > 0) {
+          importsAndFilePathsArray.push({ file, matches });
+        }
+      }
+    });
+
+    // eslint-disable-next-line no-param-reassign
+    context.importsAndFilePathsArray = importsAndFilePathsArray;
+    return Promise.resolve(context);
+  } catch (error) {
+    util.log.error(error);
+    return Promise.reject(error);
+  }
+}
 
 /**
  * ## _requireJsSetup
@@ -576,7 +674,9 @@ module.exports = {
     const promiseFuncRJS = [
       () => _requireJsSetup(context),
       () => hookRunner('before_optimize', context),
-      () => _requireJsInvoker(context)
+      () => _removeOjcssPluginReference(context),
+      () => _requireJsInvoker(context),
+      () => _restoreOjcssPluginReference(context)
     ];
     return util.runPromisesInSeries(promiseFuncRJS);
   },
@@ -595,7 +695,7 @@ module.exports = {
           util.log('pcss compile skipped.');
           resolve(context);
         } else {
-          // require pcss here to avoid depency error if node-sass is not installed
+          // require pcss here to avoid depency error if sass is not installed
           const pcss = require('./pcss'); // eslint-disable-line global-require
           const pcssPromise = pcss.getPromises(context);
           Promise.all(pcssPromise)
@@ -615,10 +715,10 @@ module.exports = {
           util.log('Sass compile skipped.');
           resolve(context);
         } else if (!util.validateSassInstall()) {
-          util.log.warning('Sass compile skipped: node-sass is not installed. To install it, run ojet add sass.');
+          util.log.warning('Sass compile skipped: sass (or node-sass) is not installed. To install it, run ojet add sass.');
           resolve(context);
         } else {
-          // require sass here to avoid depency error if node-sass is not installed
+          // require sass here to avoid depency error if sass is not installed
           const sass = require('./sass'); // eslint-disable-line global-require
           const sassPromises = sass.getPromises(context);
           Promise.all(sassPromises)