Release 14.0.0

CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # Contributing to oraclejet-tooling
 
-*Copyright (c) 2014, 2022 Oracle and/or its affiliates
+*Copyright (c) 2014, 2023 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

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

README.md

@@ -1,18 +1,18 @@
-# @oracle/oraclejet-tooling 13.1.0
+# @oracle/oraclejet-tooling 14.0.0
 
 ## About the tooling API
 This tooling API contains methods to build and serve Oracle JET web and hybrid mobile 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 or hybrid mobile app following the [Oracle JET Developers Guide](http://www.oracle.com/pls/topic/lookup?ctx=jet1310&id=homepage).
+This module will be automatically installed when you scaffold a web or hybrid mobile app following the [Oracle JET Developers Guide](http://www.oracle.com/pls/topic/lookup?ctx=jet1400&id=homepage).
 
 ## [Contributing](https://github.com/oracle/oraclejet-tooling/blob/master/CONTRIBUTING.md)
 Oracle JET is an open source project.  Pull Requests are currently not being accepted. See 
 [CONTRIBUTING](https://github.com/oracle/oraclejet-tooling/blob/master/CONTRIBUTING.md)
 for details.
 
 ## [License](https://github.com/oracle/oraclejet-tooling/blob/master/LICENSE)
-Copyright (c) 2022 Oracle and/or its affiliates and released  under the 
+Copyright (c) 2023 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 ##
 
-### 13.1.0
+### 14.0.0
 
 ### 11.0.0
 * oraclejet-tooling now requires node 12.21 or later

config/eslintcustom.js

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

hooks/jetAfterPrepare.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
-  Copyright (c) 2015, 2022, Oracle and/or its affiliates.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
   Licensed under The Universal Permissive License (UPL), Version 1.0
   as shown at https://oss.oracle.com/licenses/upl/
 

hooks/jetInjector.js

@@ -1,5 +1,5 @@
 /**
-  Copyright (c) 2015, 2022, Oracle and/or its affiliates.
+  Copyright (c) 2015, 2023, 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, 2022, Oracle and/or its affiliates.
+  Copyright (c) 2015, 2023, 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

@@ -0,0 +1,28 @@
+#! /usr/bin/env node
+/**
+  Copyright (c) 2015, 2023, 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']);
+};

lib/addpcss.js

@@ -1,6 +1,6 @@
 #! /usr/bin/env node
 /**
-  Copyright (c) 2015, 2022, Oracle and/or its affiliates.
+  Copyright (c) 2015, 2023, 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/addpwa.js

@@ -1,6 +1,6 @@
 #! /usr/bin/env node
 /**
-  Copyright (c) 2015, 2022, Oracle and/or its affiliates.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
   Licensed under The Universal Permissive License (UPL), Version 1.0
   as shown at https://oss.oracle.com/licenses/upl/
 
@@ -24,82 +24,79 @@ const CONSTANTS = require('./constants');
  */
 
 module.exports = function () {
-  return new Promise((resolve) => {
-    // eslint-disable-next-line global-require
-    const appName = path.basename(process.cwd());
-    const appNameRegex = new RegExp('@AppName@', 'g');
-    const pathToApp = path.join('src');
-    const pathToIndexHtml = path.join(pathToApp, 'index.html');
-    const pathToServiceWorkerTemplates = path.join(util.getToolingPath(),
-      CONSTANTS.PATH_TO_PWA_TEMPLATES);
-    // 1. read index.html
-    const indexHtmlString = fs.readFileSync(
-      pathToIndexHtml,
-      { encoding: 'utf-8' }
-    );
-    // 2. read sw.txt, replace app name token and resources to cache
-    //    according to the app's architecture, and then write to app as js file
-    let swJsString;
-    if (util.isVDOMApplication()) {
-      swJsString = fs.readFileSync(
-        path.join(pathToServiceWorkerTemplates, 'sw.txt'),
-        { encoding: 'utf-8' });
-      const vdomResourcesToCache = `[
-        'index.js',
-        'index.html',
-        'bundle.js',
-        'manifest.json',
-        'components/',
-        'libs/',
-        'styles/'
-      ]`;
-      const mvvmResourcesToCache = "['index.html', 'manifest.json', 'js/', 'css/']";
-      swJsString = swJsString.replace(mvvmResourcesToCache, vdomResourcesToCache);
-    } else {
-      swJsString = fs.readFileSync(
-        path.join(pathToServiceWorkerTemplates, 'sw.txt'),
-        { encoding: 'utf-8' });
-    }
-    const pathToAppSw = path.join(pathToApp, 'sw.js');
-    if (fs.pathExistsSync(pathToAppSw)) {
-      fs.renameSync(pathToAppSw, path.join(pathToApp, 'sw_old.js'));
-    }
-    fs.outputFileSync(
-      pathToAppSw,
-      swJsString.replace(appNameRegex, appName)
-    );
-    // 3. read manifest.json, replace app name token, write to app
-    const manifestJsonString = fs.readFileSync(
-      path.join(pathToServiceWorkerTemplates, 'manifest.json'),
-      { encoding: 'utf-8' }
-    );
-    const pathToAppManifest = path.join(pathToApp, 'manifest.json');
-    if (fs.pathExistsSync(pathToAppManifest)) {
-      fs.renameSync(pathToAppManifest, path.join(pathToApp, 'manifest_old.json'));
-    }
-    fs.outputFileSync(
-      path.join(pathToApp, 'manifest.json'),
-      manifestJsonString.replace(appNameRegex, appName)
-    );
-    // 4. copy swInit.txt and add it to end of body tag index.html, add <link>
-    // to end of header tag in index.html and update
-    const swInitString = fs.readFileSync(
-      path.join(pathToServiceWorkerTemplates, 'swInit.txt'),
-      { encoding: 'utf-8' }
-    );
-    fs.outputFileSync(
-      pathToIndexHtml,
-      indexHtmlString.replace(
-        new RegExp('</head>', 'g'),
-        '<link rel="manifest" href="manifest.json">\n</head>'
-      ).replace(
-        new RegExp('</body>', 'g'),
-        `${swInitString.replace(appNameRegex, appName)}\n</body>`
-      )
-    );
-    // Copy over swinit.js
-    fs.copyFileSync(path.join(pathToServiceWorkerTemplates, 'swinit._js'),
-      path.join(pathToApp, 'swinit.js'));
-    resolve();
-  });
+  const appName = path.basename(process.cwd());
+  const appNameRegex = new RegExp('@AppName@', 'g');
+  const pathToApp = path.join('src');
+  const pathToIndexHtml = path.join(pathToApp, 'index.html');
+  const pathToServiceWorkerTemplates = path.join(util.getToolingPath(),
+    CONSTANTS.PATH_TO_PWA_TEMPLATES);
+  // 1. read index.html
+  const indexHtmlString = fs.readFileSync(
+    pathToIndexHtml,
+    { encoding: 'utf-8' }
+  );
+  // 2. read sw.txt, replace app name token and resources to cache
+  //    according to the app's architecture, and then write to app as js file
+  let swJsString;
+  if (util.isVDOMApplication()) {
+    swJsString = fs.readFileSync(
+      path.join(pathToServiceWorkerTemplates, 'sw.txt'),
+      { encoding: 'utf-8' });
+    const vdomResourcesToCache = `[
+      'index.js',
+      'index.html',
+      'bundle.js',
+      'manifest.json',
+      'components/',
+      'libs/',
+      'styles/'
+    ]`;
+    const mvvmResourcesToCache = "['index.html', 'manifest.json', 'js/', 'css/']";
+    swJsString = swJsString.replace(mvvmResourcesToCache, vdomResourcesToCache);
+  } else {
+    swJsString = fs.readFileSync(
+      path.join(pathToServiceWorkerTemplates, 'sw.txt'),
+      { encoding: 'utf-8' });
+  }
+  const pathToAppSw = path.join(pathToApp, 'sw.js');
+  if (fs.pathExistsSync(pathToAppSw)) {
+    fs.renameSync(pathToAppSw, path.join(pathToApp, 'sw_old.js'));
+  }
+  fs.outputFileSync(
+    pathToAppSw,
+    swJsString.replace(appNameRegex, appName)
+  );
+  // 3. read manifest.json, replace app name token, write to app
+  const manifestJsonString = fs.readFileSync(
+    path.join(pathToServiceWorkerTemplates, 'manifest.json'),
+    { encoding: 'utf-8' }
+  );
+  const pathToAppManifest = path.join(pathToApp, 'manifest.json');
+  if (fs.pathExistsSync(pathToAppManifest)) {
+    fs.renameSync(pathToAppManifest, path.join(pathToApp, 'manifest_old.json'));
+  }
+  fs.outputFileSync(
+    path.join(pathToApp, 'manifest.json'),
+    manifestJsonString.replace(appNameRegex, appName)
+  );
+  // 4. copy swInit.txt and add it to end of body tag index.html, add <link>
+  // to end of header tag in index.html and update
+  const swInitString = fs.readFileSync(
+    path.join(pathToServiceWorkerTemplates, 'swInit.txt'),
+    { encoding: 'utf-8' }
+  );
+  fs.outputFileSync(
+    pathToIndexHtml,
+    indexHtmlString.replace(
+      new RegExp('</head>', 'g'),
+      '<link rel="manifest" href="manifest.json">\n</head>'
+    ).replace(
+      new RegExp('</body>', 'g'),
+      `${swInitString.replace(appNameRegex, appName)}\n</body>`
+    )
+  );
+  // Copy over swinit.js
+  fs.copyFileSync(path.join(pathToServiceWorkerTemplates, 'swinit._js'),
+    path.join(pathToApp, 'swinit.js'));
+  return Promise.resolve();
 };

lib/addsass.js

@@ -1,6 +1,6 @@
 #! /usr/bin/env node
 /**
-  Copyright (c) 2015, 2022, Oracle and/or its affiliates.
+  Copyright (c) 2015, 2023, 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, 2022, Oracle and/or its affiliates.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
   Licensed under The Universal Permissive License (UPL), Version 1.0
   as shown at https://oss.oracle.com/licenses/upl/
 
@@ -16,6 +16,7 @@ const util = require('./util');
 const fs = require('fs-extra');
 const path = require('path');
 const CONSTANTS = require('./constants');
+const config = require('./config');
 
 /**
  * ## Helpers
@@ -34,8 +35,10 @@ const CONSTANTS = require('./constants');
 function installTypescipt(options) {
   util.log('Installing Typescript');
   const installer = util.getInstallerCommand({ options });
+  config.loadOraclejetConfig();
+  const typescriptLibraries = config.data.typescriptLibraries;
 
-  const command = `${installer.installer} ${installer.verbs.install} typescript@${CONSTANTS.TYPESCRIPT_VERSION} yargs-parser@~13.1.2 --save-dev --save-exact`;
+  const command = `${installer.installer} ${installer.verbs.install} ${typescriptLibraries} --save-dev --save-exact`;
   return util.exec(command);
 }