Release 11.0.0

Author: benm071

README.md

@@ -1,12 +1,12 @@
-# @oracle/oraclejet-tooling 10.1.0
+# @oracle/oraclejet-tooling 11.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=jet1010&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=jet1100&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 

RELEASENOTES.md

@@ -1,7 +1,7 @@
 ## Release Notes for oraclejet-tooling ##
 
-### 10.1.0
-* No changes
+### 11.0.0
+* oraclejet-tooling now requires node 12.21 or later
 
 ### 5.2.0
 * No changes

lib/addpwa.js

@@ -14,6 +14,7 @@
 
 const fs = require('fs-extra');
 const path = require('path');
+const util = require('./util');
 const CONSTANTS = require('./constants');
 /**
  * #addpwa
@@ -29,7 +30,8 @@ module.exports = function () {
     const appNameRegex = new RegExp('@AppName@', 'g');
     const pathToApp = path.join('src');
     const pathToIndexHtml = path.join(pathToApp, 'index.html');
-    const pathToServiceWorkerTemplates = CONSTANTS.PATH_TO_PWA_TEMPLATES;
+    const pathToServiceWorkerTemplates = path.join(util.getToolingPath(),
+      CONSTANTS.PATH_TO_PWA_TEMPLATES);
     // 1. read index.html
     const indexHtmlString = fs.readFileSync(
       pathToIndexHtml,

lib/addtypescript.js

@@ -96,11 +96,41 @@ function _injectFileIntoApplication({ name, src, dest }) {
 function injectTypescriptConfig() {
   return _injectFileIntoApplication({
     name: CONSTANTS.TSCONFIG,
-    src: CONSTANTS.PATH_TO_TSCONFIG_TEMPLATE,
+    src: path.join(util.getToolingPath(), CONSTANTS.PATH_TO_TSCONFIG_TEMPLATE),
     dest: CONSTANTS.TSCONFIG
   });
 }
 
+/**
+ * ## updateTypescriptConfig
+ *
+ * Update the injected tsconfig.json
+ *
+ * @public
+ * @returns {Promise}
+ */
+function updateTypescriptConfig() {
+  try {
+    const configPaths = util.getConfiguredPaths();
+    const tsconfigJson = util.readJsonAndReturnObject(CONSTANTS.TSCONFIG);
+    // set tsconfig "include" option to refernce typescript folder based
+    // on values in oraclejetconfig.json
+    tsconfigJson.include = [
+      util.pathJoin(
+        '.',
+        configPaths.src.common,
+        configPaths.src.typescript,
+        '**',
+        '*'
+      )
+    ];
+    fs.writeJSONSync(CONSTANTS.TSCONFIG, tsconfigJson, { spaces: 2 });
+    return Promise.resolve();
+  } catch (error) {
+    return Promise.reject(error);
+  }
+}
+
 /**
  * ## addTypescript
  *
@@ -112,5 +142,6 @@ function injectTypescriptConfig() {
 module.exports = function () {
   return installTypescipt()
     .then(injectTypescriptConfig)
+    .then(updateTypescriptConfig)
     .catch(util.log.error);
 };

lib/addwebpack.js

@@ -0,0 +1,54 @@
+/**
+  Copyright (c) 2015, 2021, 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 CONSTANTS = require('./constants');
+const util = require('./util');
+const exec = require('child_process').exec;
+
+/**
+ * Add "bundle" and "bundleName" properties to application's
+ * oraclejetconfig.json file
+ * @returns
+ */
+function updateOraclejetConfig() {
+  return new Promise((resolve) => {
+    util.log('Adding bundler and bundlerName properties to oraclejetconfig.json');
+    const oraclejetConfigJson = util.readJsonAndReturnObject(CONSTANTS.ORACLE_JET_CONFIG_JSON);
+    oraclejetConfigJson.bundler = 'webpack';
+    oraclejetConfigJson.bundleName = CONSTANTS.DEFAULT_BUNDLE_NAME;
+    util.writeObjectAsJsonFile(CONSTANTS.ORACLE_JET_CONFIG_JSON, oraclejetConfigJson);
+    resolve();
+  });
+}
+
+/**
+ * Install webpack and required loaders from NPM
+ * @returns
+ */
+function installWebpack() {
+  return new Promise((resolve) => {
+    util.log('Installing webpack and required loaders');
+    exec('npm i -D webpack text-loader style-loader css-loader', {
+      env: {
+        ...process.env,
+        // speed up npm install when on vpn
+        NO_UPDATE_NOTIFIER: true
+      }
+    }, (error) => {
+      if (error) {
+        util.log.error(error);
+      } else {
+        resolve();
+      }
+    });
+  });
+}
+
+module.exports = function () {
+  return Promise.resolve()
+    .then(updateOraclejetConfig)
+    .then(installWebpack);
+};

lib/build.js

@@ -46,6 +46,17 @@ module.exports = function build(platform, options) {
     // Force component builds
     config.set('platform', 'web');
   }
+  if (options.buildType === 'release' && util.bundleWithWebpack()) {
+    // when building in release mode with webpack as the bundler,
+    // we need to run a debug build so that webpack can bundle and optimize
+    // debug files (and not minified files)
+    // eslint-disable-next-line no-param-reassign
+    options.buildType = 'debug';
+    // eslint-disable-next-line no-param-reassign
+    options.release = false;
+    // eslint-disable-next-line no-param-reassign
+    options.bundler = 'webpack';
+  }
   const validPlatform = valid.platform(platformOption);
   const validOptions = valid.buildOptions(options, validPlatform);
   const validBuildType = valid.buildType(validOptions);