Release 16.0.0

CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # Contributing to oraclejet-tooling
 
-*Copyright (c) 2014, 2023 Oracle and/or its affiliates
+*Copyright (c) 2014, 2024 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) 2023 Oracle and/or its affiliates.
+Copyright (c) 2024 Oracle and/or its affiliates.
 
 The Universal Permissive License (UPL), Version 1.0
 

README.md

@@ -1,12 +1,12 @@
-# @oracle/oraclejet-tooling 15.1.0
+# @oracle/oraclejet-tooling 16.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=jet1510&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=jet1600&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) 2023 Oracle and/or its affiliates and released  under the 
+Copyright (c) 2024 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,6 @@
 ## Release Notes for oraclejet-tooling ##
 
-### 15.1.0
+### 16.0.0
 
 ### 11.0.0
 * oraclejet-tooling now requires node 12.21 or later

config/eslintcustom.js

@@ -1,5 +1,5 @@
 /**
-  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
+  Copyright (c) 2015, 2024, 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, 2023, Oracle and/or its affiliates.
+  Copyright (c) 2015, 2024, 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,28 +1,28 @@
-#! /usr/bin/env node
+#! /usr/bin/env node
 /**
-  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
+  Copyright (c) 2015, 2024, Oracle and/or its affiliates.
   Licensed under The Universal Permissive License (UPL), Version 1.0
   as shown at https://oss.oracle.com/licenses/upl/
 
 */
-
-'use strict';
-
-/**
- * ## Dependencies
- */
-const util = require('./util');
-
-/**
- * # 'addJsdoc'
- *
- * @public
- * @param {Object} options
- * @returns {Promise}
- */
-module.exports = function (options) {
-  util.log('Installing jsdoc');
-  const installer = util.getInstallerCommand({ options });
-
-  return util.spawn(installer.installer, [installer.verbs.install, '[email protected]', '--save-dev=true', '--save-exact']);
-};
+
+'use strict';
+
+/**
+ * ## Dependencies
+ */
+const util = require('./util');
+
+/**
+ * # 'addJsdoc'
+ *
+ * @public
+ * @param {Object} options
+ * @returns {Promise}
+ */
+module.exports = function (options) {
+  util.log('Installing jsdoc');
+  const installer = util.getInstallerCommand({ options });
+
+  return util.spawn(installer.installer, [installer.verbs.install, '[email protected]', installer.flags.save, installer.flags.exact]);
+};

lib/addpcss.js

@@ -1,35 +1,35 @@
-#! /usr/bin/env node
+#! /usr/bin/env node
 /**
-  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
+  Copyright (c) 2015, 2024, Oracle and/or its affiliates.
   Licensed under The Universal Permissive License (UPL), Version 1.0
   as shown at https://oss.oracle.com/licenses/upl/
 
 */
-
-'use strict';
-
-/**
- * ## Dependencies
- */
-const util = require('./util');
-const config = require('./config');
-
-/**
- * # 'addPcss'
- *
- * @public
- * @param {Object} options
- * @returns {Promise}
- */
-module.exports = function (options) {
-  const installer = util.getInstallerCommand({ options });
-  util.log('Installing sass and pcss');
-  config.loadOraclejetConfig();
-  const sassVer = config.data.sassVer;
-
-  return util.spawn(installer.installer, [installer.verbs.install,
-    `node-sass@${sassVer}`,
-    '[email protected]',
-    '[email protected]',
-    '--save-dev=true']);
-};
+
+'use strict';
+
+/**
+ * ## Dependencies
+ */
+const util = require('./util');
+const config = require('./config');
+
+/**
+ * # 'addPcss'
+ *
+ * @public
+ * @param {Object} options
+ * @returns {Promise}
+ */
+module.exports = function (options) {
+  const installer = util.getInstallerCommand({ options });
+  util.log('Installing sass and pcss');
+  config.loadOraclejetConfig();
+  const sassVer = config.data.sassVer;
+
+  return util.spawn(installer.installer, [installer.verbs.install,
+    `node-sass@${sassVer}`,
+    '[email protected]',
+    '[email protected]',
+    installer.flags.save]);
+};

lib/addpwa.js

@@ -1,6 +1,6 @@
 #! /usr/bin/env node
 /**
-  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
+  Copyright (c) 2015, 2024, 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,31 +1,31 @@
-#! /usr/bin/env node
+#! /usr/bin/env node
 /**
-  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
+  Copyright (c) 2015, 2024, Oracle and/or its affiliates.
   Licensed under The Universal Permissive License (UPL), Version 1.0
   as shown at https://oss.oracle.com/licenses/upl/
 
 */
-
-'use strict';
-
-/**
- * ## Dependencies
- */
-const util = require('./util');
-const config = require('./config');
-
-/**
- * # 'addSass'
- *
- * @public
- * @param {Object} options
- * @returns {Promise}
- */
-module.exports = function (options) {
-  config.loadOraclejetConfig();
-  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}`, '--save-dev=true']);
-};
+
+'use strict';
+
+/**
+ * ## Dependencies
+ */
+const util = require('./util');
+const config = require('./config');
+
+/**
+ * # 'addSass'
+ *
+ * @public
+ * @param {Object} options
+ * @returns {Promise}
+ */
+module.exports = function (options) {
+  config.loadOraclejetConfig();
+  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]);
+};

lib/addtesting.js

@@ -1,5 +1,5 @@
 /**
-  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
+  Copyright (c) 2015, 2024, Oracle and/or its affiliates.
   Licensed under The Universal Permissive License (UPL), Version 1.0
   as shown at https://oss.oracle.com/licenses/upl/
 
@@ -31,7 +31,7 @@ function installTestLibraries(options) {
   }
   const command = `
     ${installer.installer} ${installer.verbs.install} ${testingLibraries}
-    --save-dev --save-exact
+    ${installer.flags.save} ${installer.flags.exact}
   `.replace(/\n/g, '').replace(/\s+/g, ' ');
   return util.exec(command);
 }

lib/addtypescript.js

@@ -1,6 +1,6 @@
 #! /usr/bin/env node
 /**
-  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
+  Copyright (c) 2015, 2024, Oracle and/or its affiliates.
   Licensed under The Universal Permissive License (UPL), Version 1.0
   as shown at https://oss.oracle.com/licenses/upl/
 
@@ -38,7 +38,7 @@ function installTypescipt(options) {
   config.loadOraclejetConfig();
   const typescriptLibraries = config.data.typescriptLibraries;
 
-  const command = `${installer.installer} ${installer.verbs.install} ${typescriptLibraries} --save-dev --save-exact`;
+  const command = `${installer.installer} ${installer.verbs.install} ${typescriptLibraries} ${installer.flags.save} ${installer.flags.exact}`;
   return util.exec(command);
 }
 
@@ -101,6 +101,10 @@ function updateTypescriptConfig() {
  * @returns {Promise}
  */
 module.exports = function (options) {
+  if (options.template === 'webdriver-ts') {
+    return installTypescipt(options)
+      .catch(util.log.error);
+  }
   return installTypescipt(options)
     .then(injectTypescriptConfig)
     .then(updateTypescriptConfig)

lib/addwebpack.js

@@ -1,50 +1,50 @@
 /**
-  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
+  Copyright (c) 2015, 2024, Oracle and/or its affiliates.
   Licensed under The Universal Permissive License (UPL), Version 1.0
   as shown at https://oss.oracle.com/licenses/upl/
 
 */
-const path = require('path');
-const CONSTANTS = require('./constants');
-const util = require('./util');
-const config = require('./config');
-
-/**
- * ## injectOjetConfig
- *
- * Inject default ojet.config file into the application
- *
- * @private
- * @returns {Promise}
- */
-function injectOJetConfig() {
-  return util.injectFileIntoApplication({
-    name: CONSTANTS.OJET_CONFIG,
-    src: path.join(util.getToolingPath(), CONSTANTS.PATH_TO_OJET_CONFIG_TEMPLATE),
-    dest: CONSTANTS.OJET_CONFIG
-  });
-}
-
-/**
- * Install webpack and required loaders from NPM
- * @param {Object} options
- * @returns
- */
-function installWebpack(options) {
-  util.log('Installing webpack and required dependencies');
-  const installer = util.getInstallerCommand({ options });
-  config.loadOraclejetConfig();
-  const webpackLibraries = config.data.webpackLibraries;
-
-  const command = `
-    ${installer.installer} ${installer.verbs.install} ${webpackLibraries} 
-    --save-dev --save-exact
-  `.replace(/\n/g, '').replace(/\s+/g, ' ');
-  return util.exec(command);
-}
-
-module.exports = function (options) {
-  return installWebpack(options)
-    .then(injectOJetConfig)
-    .catch(util.log.error);
-};
+const path = require('path');
+const CONSTANTS = require('./constants');
+const util = require('./util');
+const config = require('./config');
+
+/**
+ * ## injectOjetConfig
+ *
+ * Inject default ojet.config file into the application
+ *
+ * @private
+ * @returns {Promise}
+ */
+function injectOJetConfig() {
+  return util.injectFileIntoApplication({
+    name: CONSTANTS.OJET_CONFIG,
+    src: path.join(util.getToolingPath(), CONSTANTS.PATH_TO_OJET_CONFIG_TEMPLATE),
+    dest: CONSTANTS.OJET_CONFIG
+  });
+}
+
+/**
+ * Install webpack and required loaders from NPM
+ * @param {Object} options
+ * @returns
+ */
+function installWebpack(options) {
+  util.log('Installing webpack and required dependencies');
+  const installer = util.getInstallerCommand({ options });
+  config.loadOraclejetConfig();
+  const webpackLibraries = config.data.webpackLibraries;
+
+  const command = `
+    ${installer.installer} ${installer.verbs.install} ${webpackLibraries} 
+    ${installer.flags.save} ${installer.flags.exact}
+  `.replace(/\n/g, '').replace(/\s+/g, ' ');
+  return util.exec(command);
+}
+
+module.exports = function (options) {
+  return installWebpack(options)
+    .then(injectOJetConfig)
+    .catch(util.log.error);
+};

lib/build.js

@@ -1,5 +1,5 @@
 /**
-  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
+  Copyright (c) 2015, 2024, Oracle and/or its affiliates.
   Licensed under The Universal Permissive License (UPL), Version 1.0
   as shown at https://oss.oracle.com/licenses/upl/