Release 5.0.0

Author: benm071

README.md

@@ -1,12 +1,12 @@
-# @oracle/oraclejet-tooling 4.2.0
+# @oracle/oraclejet-tooling 5.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=jet420).
+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=jet500&id=homepage).
 
 ## [Contributing](https://github.com/oracle/oraclejet-tooling/tree/master/CONTRIBUTING.md)
 Oracle JET is an open source project.  Pull Requests are currently not being accepted. See 

RELEASENOTES.md

@@ -1,5 +1,8 @@
 ## Release Notes for oraclejet-tooling ##
 
+### 5.0.0
+* No changes
+
 ### 4.2.0
 * No changes
 

hooks/jetInjector.js

@@ -111,7 +111,9 @@ function _getIndexHtmlPath(platform, external) {
   const prefix = external ? `${process.env.cordovaDirectory}/` : '';
 
   if (platform === 'android') {
+    const android700Path = `${prefix}platforms/android/app/src/main/assets/www/`;
     root = `${prefix}platforms/android/assets/www/`;
+    root = fs.existsSync(root) ? root : android700Path;
   } else if (platform === 'ios') {
     root = `${prefix}platforms/ios/www/`;
   } else if (platform === 'windows') {

lib/build.js

@@ -6,7 +6,6 @@
 
 const buildWeb = require('./buildWeb');
 const buildHybrid = require('./buildHybrid');
-const util = require('./util');
 const valid = require('./validations');
 const config = require('./config');
 /**
@@ -32,12 +31,11 @@ const config = require('./config');
 * @returns {Promise}
 */
 module.exports = function build(platform, options) {
-  util.logModuleName();
   config.loadOraclejetConfig(platform);
   const validPlatform = valid.platform(platform);
   const validOptions = valid.buildOptions(options, validPlatform);
   const validBuildType = valid.buildType(validOptions);
-
+  config.set('platform', validPlatform);
   if (platform === 'web') {
     return buildWeb(validBuildType, validOptions);
   }

lib/buildCommon.js

@@ -13,11 +13,11 @@ const requirejs = require('requirejs');
 const util = require('./util');
 const config = require('./config');
 
-const npmCopy = require('./npmCopyConfig');
+const npmCopy = require('./npmCopy');
 const mainJsInjector = require('./mainJsInjector');
 const indexHtmlInjector = require('./indexHtmlInjector');
-const CONSTANTS = require('./constants');
 const svg = require('./svg');
+const CONSTANTS = require('./constants');
 
 function _getUglyCode(file, uglifyOptions) {
   const code = fs.readFileSync(file, 'utf-8');
@@ -138,7 +138,7 @@ function _copyFilesExcludeScss(srcBase, destBase) {
       });
     }
   } catch (err) {
-    console.log(err);
+    util.log(err);
   }
 }
 
@@ -228,7 +228,7 @@ function _renameNlsDirs() {
 
 module.exports = {
   clean: function _clean(context) {
-    console.log('cleaning staging path.....');
+    util.log('Cleaning staging path.');
     const opts = context.opts;
     const stagingPath = opts.stagingPath;
     const filePath = util.destPath(stagingPath);
@@ -242,83 +242,95 @@ module.exports = {
   },
 
   copy: function _copySrcToStaging(context) {
-    console.log('copy files to staging directory.....');
+    util.log('Copy files to staging directory.');
     const fileResult = util.getFileList(context.buildType, context.opts.copySrcToStaging.fileList);
     return _copyFileToStaging(fileResult)
       .then(() => {
-        console.log('copy finished...');
+        util.log('Copy finished.');
         return context;
       });
   },
 
   copyLibs: function _copyLibsToStaging(context) {
-    console.log('copy library files to staging directory.....');
+    util.log('Copy library files to staging directory.');
     const opts = context.opts;
     const buildType = context.buildType;
     const platform = context.platform;
-    const ojetLibs = npmCopy.getCopyLibFileList(platform, buildType);
-    const thirdPartyLibs = util.getFileList(buildType, opts.copyLibsToStaging.fileList);
+    const pathMappingLibs = util.getFileList(buildType,
+      npmCopy.getMappingLibsList(buildType, platform));
+    const nonMappingLibs = npmCopy.getNonMappingFileList(buildType, platform);
     const customLibs = util.getFileList(buildType, opts.copyCustomLibsToStaging.fileList);
-    return _copyFileToStaging(ojetLibs.concat(thirdPartyLibs, customLibs))
+    return _copyFileToStaging(nonMappingLibs.concat(pathMappingLibs, customLibs))
       .then(() => {
-        console.log('copy finished...');
+        util.log('Copy finished.');
         npmCopy.renameAltaThemeFiles(config('paths'));
         return context;
       });
   },
 
   injectPaths: function _injectMainPaths(context) {
-    console.log('running injection task.....');
+    util.log('Running injection tasks.');
     return new Promise((resolve, reject) => {
       mainJsInjector.injectPaths(context)
         .then(() => {
-          console.log('mainJs paths injection finished..');
+          util.log('Task main.js paths injection finished.');
           resolve(context);
         })
         .catch(err => reject(err));
     });
   },
 
   injectLocalhostCspRule: function _injectLocalhostCspRule(context) {
-    console.log('running localhost csp rule injection task.....');
+    util.log('Running localhost csp rule injection task.');
 
     return new Promise((resolve, reject) => {
       indexHtmlInjector.injectLocalhostCspRule(context)
         .then(() => {
-          console.log('indexHtml localhost csp rule injection finished..');
+          util.log('Task index.html localhost csp rule injection finished.');
+          resolve(context);
+        })
+        .catch(err => reject(err));
+    });
+  },
+
+  injectCdnBundleScript: function _injectCdnBundleScript(context) {
+    return new Promise((resolve, reject) => {
+      indexHtmlInjector.injectCdnBundleScript(context)
+        .then(() => {
+          util.log('Task index.html cdn bundle injection finished.');
           resolve(context);
         })
         .catch(err => reject(err));
     });
   },
 
   injectTheme: function _injectTheme(context) {
-    console.log('running theme injection task.....');
+    util.log('Running theme injection task.');
 
     return new Promise((resolve, reject) => {
       indexHtmlInjector.injectThemePath(context)
         .then(() => {
-          console.log('indexHtml theme path injection finished..');
+          util.log('Task index.html theme path injection finished.');
           resolve(context);
         })
         .catch(err => reject(err));
     });
   },
 
   copyThemes: function _copyThemes(context) {
-    console.log('running theme copy task.....');
+    util.log('Running theme copy task.');
     return new Promise((resolve, reject) => {
       _copyThemesToStaging(context)
         .then(() => {
-          console.log('theme copy finished...');
+          util.log('Theme copy task finished.');
           resolve(context);
         })
         .catch(err => reject(err));
     });
   },
 
   uglify: function _uglify(context) {
-    console.log('running uglify tasks.....');
+    util.log('Running uglify task.');
 
     const opts = context.opts;
     const buildType = context.buildType;
@@ -329,44 +341,44 @@ module.exports = {
     return new Promise((resolve, reject) => {
       _writeUglyCodeToFile(fileResult, uglifyConfig.options)
         .then(() => {
-          console.log('uglify finished...');
+          util.log('Task uglify finished.');
           resolve(context);
         })
         .catch(err => reject(err));
     });
   },
 
   requireJs: function _requireJs(context) {
-    console.log('running requirejs tasks.....');
+    util.log('Running requirejs task.');
 
     const opts = context.opts;
     const requireConfig = opts.requireJs;
 
     return new Promise((resolve, reject) => {
       requirejs.optimize(requireConfig, () => {
-        console.log('requireJs finished...');
+        util.log('Task requirejs finished.');
         resolve(context);
       }, (err) => {
-        console.log(err);
+        util.log(err);
         reject(err);
       });
     });
   },
 
   sass: function _compileSass(context) {
-    console.log('compiling sass....');
+    util.log('Compiling sass.');
 
     return new Promise((resolve, reject) => {
       if (context.opts.sassCompile === false && svg !== true) {
-        console.log('sass compile skipped...');
+        util.log('Sass compile skipped.');
         resolve(context);
       } else {
         // require sass here to avoid depency error if node-sass is not installed
         const sass = require('./sass'); // eslint-disable-line global-require
         const sassPromises = sass.getPromises(context);
         Promise.all(sassPromises)
         .then(() => {
-          console.log('sass compile finished...');
+          util.log('Sass compile finished.');
           resolve(context);
         })
         .catch(err => reject(err));
@@ -375,7 +387,7 @@ module.exports = {
   },
 
   cleanTemp: function _cleanTemp(context) {
-    console.log('cleaning mainTemp.....');
+    util.log('Cleaning mainTemp.');
     const opts = context.opts;
     let tempPath = opts.stagingPath;
     let tempName = opts.injectPaths;
@@ -387,18 +399,18 @@ module.exports = {
       fs.remove(filePath, (err) => {
         if (err) reject(err);
       });
-      console.log('cleanMainTemp task finished...');
+      util.log('Task cleanMainTemp finished.');
       resolve(context);
     });
   },
 
   spriteSvg: function _spriteSvg(context) {
-    console.log('optimizing svg into SVG sprites.....');
+    util.log('Optimizing svg into SVG sprites.');
     return new Promise((resolve, reject) => {
       svg.spriteSvg(context, (err) => {
         if (err) reject(err);
       });
-      console.log('svg task finished...');
+      util.log('Svg optimisation task finished.');
       resolve(context);
     });
   },

lib/buildHybrid.js

@@ -8,17 +8,18 @@ const CONSTANTS = require('./constants');
 const exec = require('child_process').exec;
 const indexHtmlInjector = require('./indexHtmlInjector');
 const buildCommon = require('./buildCommon');
+const hookRunner = require('./hookRunner');
 const path = require('path');
 const util = require('./util');
 const fs = require('fs-extra');
 
 function _injectScriptTags(context) {
-  console.log('injecting index.html with cordova script...');
+  console.log('Injecting index.html with cordova script.');
   return indexHtmlInjector.injectScriptTags(context);
 }
 
 function _invokeCordovaPrepare(context) {
-  console.log('invoke cordova prepare.....');
+  console.log('Invoke cordova prepare.');
   const platform = context.platform;
   let cwd = context.opts.stagingPath;
   cwd = path.resolve(cwd, '..');
@@ -31,7 +32,7 @@ function _invokeCordovaPrepare(context) {
         console.log(error);
         reject(error);
       }
-      console.log('cordova prepare finished....');
+      console.log('Cordova prepare finished.');
       resolve(context);
     });
 
@@ -68,7 +69,7 @@ function _getCordovaPlatformOptions(platformOptions) {
 }
 
 function _invokeCordovaCompile(context) {
-  console.log('invoke cordova compile.....');
+  console.log('Invoke cordova compile.');
   const platform = context.platform;
   const opts = context.opts;
   let cwd = opts.stagingPath;
@@ -86,7 +87,7 @@ function _invokeCordovaCompile(context) {
     const cmdOpts = { cwd: util.destPath(cwd), stdio: ['pipe', 'pipe', 'pipe'], maxBuffer: 1024 * 20000 };
     const cordova = exec(cmd, cmdOpts, (error) => {
       if (error) reject(error);
-      console.log('Cordova compile finished....');
+      console.log('Cordova compile finished.');
       resolve(context);
     });
 
@@ -102,7 +103,8 @@ function _runCordovaBuildTasks(context) {
     if (opts.buildForServe) {
       resolve(context);
     } else {
-      _invokeCordovaPrepare(context)
+      hookRunner('before_release_build', context)
+      .then(_invokeCordovaPrepare)
       .then(_invokeCordovaCompile)
       .then(data => resolve(data))
       .catch(err => reject(err));
@@ -113,16 +115,19 @@ function _runCordovaBuildTasks(context) {
 function _runCommonBuildTasks(context) {
   return new Promise((resolve, reject) => {
     buildCommon.clean(context)
-      .then(buildCommon.copy)
-      .then(buildCommon.copyLibs)
-      .then(buildCommon.spriteSvg)
-      .then(buildCommon.sass)
-      .then(buildCommon.copyThemes)
-      .then(buildCommon.injectTheme)
-      .then(_injectScriptTags)
-      .then(buildCommon.injectPaths)
-      .then(data => resolve(data))
-      .catch(err => reject(err));
+    .then(hookRunner('before_build', context))
+    .then(buildCommon.clean)
+    .then(buildCommon.copy)
+    .then(buildCommon.copyLibs)
+    .then(buildCommon.spriteSvg)
+    .then(buildCommon.sass)
+    .then(buildCommon.injectCdnBundleScript)
+    .then(buildCommon.copyThemes)
+    .then(buildCommon.injectTheme)
+    .then(_injectScriptTags)
+    .then(buildCommon.injectPaths)
+    .then(data => resolve(data))
+    .catch(err => reject(err));
   });
 }
 
@@ -132,7 +137,8 @@ function _runReleaseBuildTasks(context) {
     if (opts.buildType !== 'release') {
       resolve(context);
     } else {
-      buildCommon.uglify(context)
+      hookRunner('before_release', context)
+      .then(buildCommon.uglify)
         .then(buildCommon.requireJs)
         .then(buildCommon.cleanTemp)
         .then(data => resolve(data))
@@ -157,7 +163,10 @@ module.exports = function buildHybrid(buildType, platform, opts) {
       .then(_runWindowsLocaleFix)
       .then(_runReleaseBuildTasks)
       .then(_runCordovaBuildTasks)
-      .then(data => resolve(data))
+      .then((data) => {
+        hookRunner('after_build', data);
+        resolve(data);
+      })
       .catch(err => reject(err));
   });
 };