Release 2.3.0

Author: oraclejet

CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # Contributing to oraclejet-tooling
 
-*Copyright (c) 2014,2016 Oracle and/or its affiliates
+*Copyright (c) 2014, 2017 Oracle and/or its affiliates
 The Universal Permissive License (UPL), Version 1.0*
 
 **Pull requests are currently not being accepted for the Oracle JET project.**  

Gruntfile.js

@@ -1,5 +1,5 @@
 /**
-  Copyright (c) 2015, 2016, Oracle and/or its affiliates.
+  Copyright (c) 2015, 2017, Oracle and/or its affiliates.
   The Universal Permissive License (UPL), Version 1.0
 */
 module.exports = function (grunt) {
@@ -16,9 +16,11 @@ module.exports = function (grunt) {
       src : "build/*.js"
     },
     pkg: grunt.file.readJSON("package.json"),
-    jet_version_token:'2.2.0',
-    jet_doc_version_token:'undefined',
-    version_token:'2.2.0'
+    build_urls: grunt.file.readJSON("buildconf.json"),
+    jet_version_token:'2.3.0',
+    jet_doc_version_token:'230',
+    version_token:'2.3.0',
+    current_year_token: '2017'
   }
   var configs = require('load-grunt-configs')(grunt, options);
   grunt.config.merge(configs);

LICENSE.md

@@ -17,7 +17,7 @@ limitations under the License.
 
 
 ```
-Copyright (c) 2014, 2016 Oracle and/or its affiliates
+Copyright (c) 2014, 2017 Oracle and/or its affiliates
 The Universal Permissive License (UPL), Version 1.0
 
 Subject to the condition set forth below, permission is hereby granted to any person obtaining

README.md

@@ -1,14 +1,12 @@
-# oraclejet-tooling 2.2.0
-
-> Programmatic API to build and serve Oracle JET web and mobile applications
+# oraclejet-tooling 2.3.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/jet220/jet/).
+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/jet230/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. 
@@ -19,5 +17,5 @@ Oracle JET is an open source project.  Pull Requests are currently not being acc
 for details.
 
 ## [License](https://github.com/oracle/oraclejet-tooling/tree/master/LICENSE.md)
-Copyright (c) 2014, 2016 Oracle and/or its affiliates
+Copyright (c) 2014, 2017 Oracle and/or its affiliates
 The Universal Permissive License (UPL), Version 1.0

RELEASENOTES.md

@@ -1,8 +1,4 @@
 ## Release Notes for oraclejet-tooling ##
 
-### 2.2.0 (Oct 21, 2016)
-* Allow developers to configure release paths
-* Provide help page for tooling tasks
-* Allow multiple themes to be included in a built app
-* Grunt serve to specific iOS emulator fails
-* no-build option missing from grunt serve
+### 2.3.0
+* No changes - refer to generator-oraclejet RELEASENOTES.md

hooks/jetAfterPrepare.js

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

hooks/jetInjector.js

@@ -1,5 +1,5 @@
 /**
-  Copyright (c) 2015, 2016, 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, 2016, 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/buildCommon.js

@@ -1,5 +1,5 @@
 /**
-  Copyright (c) 2015, 2016, 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, 2016, Oracle and/or its affiliates.
+  Copyright (c) 2015, 2017, Oracle and/or its affiliates.
   The Universal Permissive License (UPL), Version 1.0
 */
 'use strict';
@@ -42,7 +42,7 @@ function _invokeCordovaPrepare(context) {
 }
 
 function _getCordovaBuildType(target) {
-  return (target === 'release') ? CONSTANTS.RELEASE_BUILD_TYPE : CONSTANTS.DEBUG_BUILD_TYPE;
+  return (target === 'release') ? CONSTANTS.RELEASE_FLAG : CONSTANTS.DEBUG_FLAG;
 }
 
 function _getCordovaBuildConfig(bConfig) {
@@ -63,23 +63,26 @@ function _getCordovaBuildDestination(destination) {
   return `--${destination}`;
 }
 
+function _getCordovaPlatformOptions(platformOptions) {
+  return (platformOptions) ? `-- ${platformOptions}` : '';
+}
+
 function _invokeCordovaCompile(context) {
   console.log('invoke cordova compile.....');
   const platform = context.platform;
   const opts = context.opts;
   let cwd = opts.stagingPath;
   cwd = path.resolve(cwd, '..');
 
-  let buildType = context.buildType;
-  let buildConfig = opts.buildConfig;
-  let buildDestination = opts.destination;
-  buildType = _getCordovaBuildType(buildType);
-  buildConfig = _getCordovaBuildConfig(buildConfig);
-  buildDestination = _getCordovaBuildDestination(buildDestination);
+  const buildType = _getCordovaBuildType(context.buildType);
+  const buildConfig = _getCordovaBuildConfig(opts.buildConfig);
+  const buildDestination = _getCordovaBuildDestination(opts.destination);
+  const platformOptions = _getCordovaPlatformOptions(opts.platformOptions);
 
   return new Promise((resolve, reject) => {
     let cmd = `cordova compile ${platform} ${buildType} ${buildDestination}`;
     if (buildConfig) cmd += ` ${buildConfig}`;
+    if (platformOptions) cmd += ` ${platformOptions}`;
     const cmdOpts = { cwd: util.destPath(cwd), stdio: ['pipe', 'pipe', 'pipe'], maxBuffer: 1024 * 20000 };
     const cordova = exec(cmd, cmdOpts, (error) => {
       if (error) reject(error);

lib/buildWeb.js

@@ -1,5 +1,5 @@
 /**
-  Copyright (c) 2015, 2016, 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, 2016, 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/config.js

@@ -1,77 +1,89 @@
 /**
-  Copyright (c) 2015, 2016, Oracle and/or its affiliates.
+  Copyright (c) 2015, 2017, Oracle and/or its affiliates.
   The Universal Permissive License (UPL), Version 1.0
 */
-
-'use strict';
-
-const fs = require("fs-extra");
-const util = require("./util");
-const CONSTANTS = require("./constants");
-const path = require("path");
-
-var config = module.exports = function(prop, value) {
-  if (arguments.length === 2) {
-    return config.set(prop, value);
-  } else {
-    return config.get(prop);
-  }
-};
-
-config.data = {};
-
-/**
- * Get the config value
- * @param  {String} prop property to get
- * @returns {String} return 
- */
-config.get = function(prop) {
-  if (prop) {
-    return config.data[prop];
-  } else {
-    return config.data;
-  }
-};
-
-/**
- * Set the config value
- * @param  {String} prop property to set
- * @param  {*} value value to set
- * @returns {String} return 
- */
-config.set = function(prop, value) {
-  return config.data[prop] = value;
-};
-
-/**
- * Create a new config 
- * @param  {Object} value to set the config.data to
- * @returns {String} return 
- */
-config.init = function(obj) {
-  _loadOraclejetConfig();
-  return (config.data = obj || {});
-};
-
-config.loadOraclejetConfig = () => {
-  const configJson = _readConfigJson();
-  let src = {};
-  let staging = {};      
-  src.common = path.normalize(configJson.paths.source.common) || CONSTANTS.APP_SRC_DIRECTORY;
-  src.javascript = path.normalize(configJson.paths.source.javascript) || "js";
-  src.styles = path.normalize(configJson.paths.source.styles) || "css";
-  src.themes = path.normalize(configJson.paths.source.themes) || "themes";
-  src.web = path.normalize(configJson.paths.source.web) || CONSTANTS.APP_SRC_WEB_DIRECTORY;
-  src.hybrid = path.normalize(configJson.paths.source.hybrid) || CONSTANTS.APP_SRC_HYBRID_DIRECTORY;
-  staging.web = path.normalize(configJson.paths.staging.web) || CONSTANTS.WEB_DIRECTORY;
-  staging.hybrid = path.normalize(configJson.paths.staging.hybrid) || CONSTANTS.CORDOVA_DIRECTORY;
-  staging.themes = path.normalize(configJson.paths.staging.themes) || CONSTANTS.APP_THEMES_DIRECTORY;   
-  config.data.paths = {src, staging};
-  return {src, staging};
-};
-
-function _readConfigJson(){
-  const configPath = util.destPath(CONSTANTS.ORACLE_JET_CONFIG_JSON);
-  return util.fsExistsSync(configPath) ? fs.readJsonSync(configPath) : undefined; 
-};
-
+
+'use strict';
+
+const fs = require('fs-extra');
+const util = require('./util');
+const CONSTANTS = require('./constants');
+const path = require('path');
+
+const config = module.exports = function (prop, value) {
+  if (arguments.length === 2) {
+    return config.set(prop, value);
+  } else {
+    return config.get(prop);
+  }
+};
+
+config.data = {};
+
+/**
+ * Get the config value
+ * @param  {String} prop property to get
+ * @returns {String} return
+ */
+config.get = function (prop) {
+  if (prop) {
+    return config.data[prop];
+  } else {
+    return config.data;
+  }
+};
+
+/**
+ * Set the config value
+ * @param  {String} prop property to set
+ * @param  {*} value value to set
+ * @returns {String} return
+ */
+config.set = function (prop, value) {
+  return config.data[prop] = value;
+};
+
+/**
+ * Create a new config
+ * @param  {Object} value to set the config.data to
+ * @returns {String} return
+ */
+config.init = function (obj) {
+  _loadOraclejetConfig();
+  return (config.data = obj || {});
+};
+
+config.loadOraclejetConfig = () => _loadOraclejetConfig();
+
+config.getConfiguredPaths = () => _getConfiguredPaths();
+
+function _loadOraclejetConfig() {
+  config.data.paths = _getConfiguredPaths();
+}
+
+function _getConfiguredPaths() {
+  const configJson = _readConfigJson();
+  const src = {};
+  const staging = {};
+  const srcConfig = configJson.paths ? configJson.paths.source : {};
+  const stagingConfig = configJson.paths ? configJson.paths.staging : {};
+
+  src.common = srcConfig.common ? path.normalize(srcConfig.common) : CONSTANTS.APP_SRC_DIRECTORY;
+  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.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;
+
+  staging.web = stagingConfig.web ? path.normalize(stagingConfig.web) : CONSTANTS.WEB_DIRECTORY;
+  staging.hybrid = stagingConfig.hybrid ? path.normalize(stagingConfig.hybrid) : CONSTANTS.CORDOVA_DIRECTORY;
+  staging.themes = stagingConfig.themes ? path.normalize(stagingConfig.themes) : CONSTANTS.APP_THEMES_DIRECTORY;
+  return { src, staging };
+}
+
+function _readConfigJson() {
+  const configPath = util.destPath(CONSTANTS.ORACLE_JET_CONFIG_JSON);
+  const configJson = util.fsExistsSync(configPath) ? fs.readJsonSync(configPath) : null;
+  config.set('defaultBrowser', configJson.defaultBrowser || CONSTANTS.DEFAULT_BROWSER);
+  return configJson;
+}