Release 4.0.0

Author: benm071

CONTRIBUTING.md

@@ -8,5 +8,5 @@ The Universal Permissive License (UPL), Version 1.0*
 We plan to provide this functionality in the future. At that time, you will need to follow [The Oracle Contributor Agreement](https://www.oracle.com/technetwork/community/oca-486395.html)
 (OCA).
 
-If you have ideas, comments, or issues related to generator, swing on by the [Oracle JET discussion forum.](https://community.oracle.com/community/development_tools/oracle-jet/generators)
+If you have ideas, comments, or issues to discuss, swing on by the [Oracle JET discussion forum.](https://community.oracle.com/community/development_tools/oracle-jet/generators)
 

Gruntfile.js

@@ -1,15 +1,12 @@
-# oraclejet-tooling 3.2.0
+# @oracle/oraclejet-tooling 4.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
-The oraclejet-tooling API will be automatically installed if you scaffold a web or hybrid mobile app following the [Oracle JET Developers Guide](http://docs.oracle.com/middleware/jet320/jet/).
-
-## Usage
-The oraclejet-tooling API contains a build API that will build the app with dev or release mode, and other options. It also contains a serve API that serves up your app to browser/simulator/device. Please refer to the source code for details on how to invoke and use the API methods. 
+This module will be automatically installed when you scaffold a web or hybrid mobile app following the [Oracle JET Developers Guide](http://docs.oracle.com/middleware/jet400/jet/).
 
 ## [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 
@@ -18,4 +15,4 @@ for details.
 
 ## [License](https://github.com/oracle/oraclejet-tooling/tree/master/LICENSE.md)
 Copyright (c) 2014, 2017 Oracle and/or its affiliates
-The Universal Permissive License (UPL), Version 1.0
+The Universal Permissive License (UPL), Version 1.0

README.md

@@ -1,5 +1,8 @@
 ## Release Notes for oraclejet-tooling ##
 
+### 4.0.0
+* Moved module into @oracle scope, changing the name to @oracle/oraclejet-tooling
+
 ### 3.2.0
 * No changes
 

RELEASENOTES.md

@@ -1,5 +1,5 @@
 /**
-  Copyright (c) 2015, 2017, Oracle and/or its affiliates.
+  Copyright (c) 2015, 2017, Oracle and/or its affiliates.
   The Universal Permissive License (UPL), Version 1.0
 */
 //

config/eslintcustom.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
-  Copyright (c) 2015, 2017, Oracle and/or its affiliates.
+  Copyright (c) 2015, 2017, Oracle and/or its affiliates.
   The Universal Permissive License (UPL), Version 1.0
 */
 

hooks/jetAfterPrepare.js

@@ -1,5 +1,5 @@
 /**
-  Copyright (c) 2015, 2017, Oracle and/or its affiliates.
+  Copyright (c) 2015, 2017, Oracle and/or its affiliates.
   The Universal Permissive License (UPL), Version 1.0
 */
 'use strict';
@@ -53,6 +53,7 @@ module.exports =
       content = fs.readFileSync(indexHtmlPath, 'utf-8');
 
       content = _addPlatformStyleClasses(content, platform);
+      content = _updateCspGapReady(content);
       if (_isLiveReloadEnabled()) {
         content = _updateCspForLiveReload(content, platform);
         content = _addLiveReloadElement(content, platform);
@@ -177,16 +178,16 @@ function _addPlatformStyleClasses(content, platform) {
  */
 function _addPlatformStyleClassesIfMissing(classStr, classesToAdd) {
   const classes = (classesToAdd instanceof Array) ? classesToAdd : [classesToAdd];
-
+  let newClassStr = classStr;
   for (let i = 0; i < classes.length; i++) {
-    if (classStr.indexOf(classes[i]) < 0) {
-      if (classStr.length > 0) {
-        classStr += ' ';
+    if (newClassStr.indexOf(classes[i]) < 0) {
+      if (newClassStr.length > 0) {
+        newClassStr += ' ';
       }
-      classStr += classes[i];
+      newClassStr += classes[i];
     }
   }
-  return classStr;
+  return newClassStr;
 }
 
 /**
@@ -259,6 +260,23 @@ function _injectCspRule(content, category, cspRule) {
   return newContent;
 }
 
+/**
+ * ## _updateCspGapReady
+ * Updates Content Security Policy for livereload
+ *
+ * @private
+ * @param {string} content      - Original content
+ * @returns {string} newContent - Updated content
+ */
+
+function _updateCspGapReady(content) {
+  let newContent = content;
+  // Must have for iOS10
+  newContent = _injectCspRule(newContent, 'connect-src', 'ws: *');
+  newContent = _injectCspRule(newContent, 'default-src', 'gap://ready');
+  return newContent;
+}
+
 /**
  * ## _updateCspForLiveReload
  * Updates Content Security Policy for livereload
@@ -284,10 +302,6 @@ function _updateCspForLiveReload(content, platform) {
 
   newContent = _injectCspRule(newContent, 'script-src', liveReloadSrc);
 
-  // Must have for iOS10
-  newContent = _injectCspRule(newContent, 'connect-src', 'ws: *');
-  newContent = _injectCspRule(newContent, 'default-src', 'gap://ready');
-
   return newContent;
 }
 

hooks/jetInjector.js

@@ -1,5 +1,5 @@
 /**
-  Copyright (c) 2015, 2017, Oracle and/or its affiliates.
+  Copyright (c) 2015, 2017, Oracle and/or its affiliates.
   The Universal Permissive License (UPL), Version 1.0
 */
 'use strict';

lib/build.js

@@ -1,5 +1,5 @@
 /**
-  Copyright (c) 2015, 2017, Oracle and/or its affiliates.
+  Copyright (c) 2015, 2017, Oracle and/or its affiliates.
   The Universal Permissive License (UPL), Version 1.0
 */
 'use strict';
@@ -234,7 +234,7 @@ module.exports = {
     const opts = context.opts;
     const buildType = context.buildType;
     const platform = context.platform;
-    const ojetLibs = npmCopy.getCopyLibFileList(platform);
+    const ojetLibs = npmCopy.getCopyLibFileList(platform, buildType);
     const thirdPartyLibs = util.getFileList(buildType, opts.copyLibsToStaging.fileList);
     const customLibs = util.getFileList(buildType, opts.copyCustomLibsToStaging.fileList);
     return _copyFileToStaging(ojetLibs.concat(thirdPartyLibs, customLibs))

lib/buildCommon.js

@@ -1,5 +1,5 @@
 /**
-  Copyright (c) 2015, 2017, Oracle and/or its affiliates.
+  Copyright (c) 2015, 2017, Oracle and/or its affiliates.
   The Universal Permissive License (UPL), Version 1.0
 */
 'use strict';

lib/buildHybrid.js

@@ -1,5 +1,5 @@
 /**
-  Copyright (c) 2015, 2017, Oracle and/or its affiliates.
+  Copyright (c) 2015, 2017, Oracle and/or its affiliates.
   The Universal Permissive License (UPL), Version 1.0
 */
 'use strict';

lib/buildWeb.js

@@ -1,5 +1,5 @@
 /**
-  Copyright (c) 2015, 2017, Oracle and/or its affiliates.
+  Copyright (c) 2015, 2017, Oracle and/or its affiliates.
   The Universal Permissive License (UPL), Version 1.0
 */
 'use strict';

lib/clean.js

@@ -1,5 +1,5 @@
 /**
-  Copyright (c) 2015, 2017, Oracle and/or its affiliates.
+  Copyright (c) 2015, 2017, Oracle and/or its affiliates.
   The Universal Permissive License (UPL), Version 1.0
 */
 
@@ -10,12 +10,13 @@ const util = require('./util');
 const CONSTANTS = require('./constants');
 const path = require('path');
 
-const config = module.exports = function (prop, value) {
+const config = function (prop, value) {
   if (arguments.length === 2) {
     return config.set(prop, value);
   }
   return config.get(prop);
 };
+module.exports = config;
 
 config.data = {};
 
@@ -58,6 +59,7 @@ config.getConfiguredPaths = (platform) => {
   src.javascript = srcConfig.javascript ? path.normalize(srcConfig.javascript) : 'js';
   src.styles = srcConfig.styles ? path.normalize(srcConfig.styles) : 'css';
   src.themes = srcConfig.themes ? path.normalize(srcConfig.themes) : 'themes';
+  src.tests = srcConfig.tests ? path.normalize(srcConfig.tests) : 'tests';
   src.web = srcConfig.web ? path.normalize(srcConfig.web) : CONSTANTS.APP_SRC_WEB_DIRECTORY;
   src.hybrid = srcConfig.hybrid ? path.normalize(srcConfig.hybrid) :
         CONSTANTS.APP_SRC_HYBRID_DIRECTORY;

lib/config.js

@@ -1,5 +1,5 @@
 /**
-  Copyright (c) 2015, 2017, Oracle and/or its affiliates.
+  Copyright (c) 2015, 2017, Oracle and/or its affiliates.
   The Universal Permissive License (UPL), Version 1.0
 */
 'use strict';

lib/constants.js

@@ -1,5 +1,5 @@
 /**
-  Copyright (c) 2015, 2017, Oracle and/or its affiliates.
+  Copyright (c) 2015, 2017, Oracle and/or its affiliates.
   The Universal Permissive License (UPL), Version 1.0
 */
 'use strict';
@@ -179,8 +179,11 @@ module.exports = {
         files: [
           `${paths.src.common}/${paths.src.styles}/!(libs)/**/*.css`,
           `${paths.src.common}/${paths.src.javascript}/!(libs)/**/*.js`,
+          `${paths.src.common}/${paths.src.javascript}/!(libs)/**/*.json`,
           `${paths.src.common}/${paths.src.javascript}/{,*/}*.js`,
           `${paths.src.common}/${paths.src.styles}/{,*/}*.css`,
+          `${paths.src.common}/${paths.src.tests}/{,*/}*.css`,
+          `${paths.src.common}/${paths.src.tests}/{,*/}*.js`,
           `${paths.src.common}/**/*.html`,
         ],
         options:

lib/defaultconfig.js

@@ -1,5 +1,5 @@
 /**
-  Copyright (c) 2015, 2017, Oracle and/or its affiliates.
+  Copyright (c) 2015, 2017, Oracle and/or its affiliates.
   The Universal Permissive License (UPL), Version 1.0
 */
 'use strict';

lib/indexHtmlInjector.js

@@ -1,5 +1,5 @@
 /**
-  Copyright (c) 2015, 2017, Oracle and/or its affiliates.
+  Copyright (c) 2015, 2017, Oracle and/or its affiliates.
   The Universal Permissive License (UPL), Version 1.0
 */
 'use strict';

lib/injectorUtil.js

@@ -1,5 +1,5 @@
 /**
-  Copyright (c) 2015, 2017, Oracle and/or its affiliates.
+  Copyright (c) 2015, 2017, Oracle and/or its affiliates.
   The Universal Permissive License (UPL), Version 1.0
 */
 'use strict';
@@ -86,7 +86,7 @@ function _writeRequirePathToFile(context) {
  */
 function _injectWindowsResourcePaths(content) {
   const lineEnding = /\r\n/.test(String(content)) ? '\r\n' : '\n';
-  const translationsPattern = /([\t ]*)('|")ojtranslations['"]\s*:\s*['"](.*?)['"],/gi;
+  const translationsPattern = /([\t ]*)('|")?ojtranslations['"]?\s*:\s*['"](.*?)['"],/gi;
 
   const result = translationsPattern.exec(content);
 
@@ -97,7 +97,7 @@ function _injectWindowsResourcePaths(content) {
 
   const translationsEntry = result[0];
   const indentStr = result[1];
-  const stringChar = result[2];
+  const stringChar = result[2] || "'";
   const resourcesPath = result[3];
 
   const resourceEntries = `${translationsEntry + lineEnding