Release 3.1.0

Author: benm071

Gruntfile.js

@@ -16,12 +16,12 @@ module.exports = function (grunt) {
       src : "build/*.js"
     },
     pkg: grunt.file.readJSON("package.json"),
-    tooling_project: 'Tooling_V3.0.0',
+    tooling_project: 'Tooling_V3.1.0',
     build_urls: grunt.file.readJSON("buildconf.json"),
-    jet_version_token:'3.0.0',
-    jet_doc_version_token:'300',
-    version_token:'3.0.0',
-    tooling_project_token:'Tooling_V3.0.0',
+    jet_version_token:'3.1.0',
+    jet_doc_version_token:'310',
+    version_token:'3.1.0',
+    tooling_project_token:'Tooling_V3.1.0',
     current_year_token: '2017'    
   }
   var configs = require('load-grunt-configs')(grunt, options);

README.md

@@ -1,12 +1,12 @@
-# grunt-oraclejet 3.0.0
+# grunt-oraclejet 3.1.0
 
 ## About the module
 This module contains build and serve tasks for Oracle JET web and hybrid mobile applications.
 
 This is an open source project maintained by Oracle Corp.
 
 ## Installation
-The grunt-oraclejet module will be automatically installed if you scaffold a web or hybrid mobile app following the [Oracle JET Developers Guide](http://docs.oracle.com/middleware/jet300/jet/).
+The grunt-oraclejet module will be automatically installed if you scaffold a web or hybrid mobile app following the [Oracle JET Developers Guide](http://docs.oracle.com/middleware/jet310/jet/).
 
 ### Manual installation
 This plugin requires Grunt `~1.0.1`

RELEASENOTES.md

@@ -1,4 +1,13 @@
 ## Release Notes for grunt-oraclejet ##
 
+### 3.1.0
+* No changes
+
 ### 3.0.0
 * No changes
+
+### 2.3.0
+* No changes
+
+### 2.2.0
+* No changes

package.json

@@ -1,7 +1,7 @@
 {
   "name": "grunt-oraclejet",
   "description": "Build and serve tasks for Oracle JET web and mobile applications",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "license": "UPL-1.0",
   "homepage": "http://oraclejet.org",
   "main": "tasks/build.js",  
@@ -19,7 +19,7 @@
   },
   "dependencies": 
   {
-    "oraclejet-tooling": "~3.0.0"
+    "oraclejet-tooling": "~3.1.0"
   },  
   "devDependencies": {
     "eslint": "^3.11.0",
@@ -33,5 +33,5 @@
   "keywords": [
     "gruntplugin"
   ],
-  "jetdocversion": "300"  
+  "jetdocversion": "310"  
 }

tasks/oraclejet-build.js

@@ -17,7 +17,7 @@ module.exports = function (grunt) {
 
     const done = grunt.task.current.async();
     const platform = utils.validatePlatform(grunt.option('platform'), grunt);
-    const options = grunt.config('oraclejet-build');
+    const options = grunt.config('oraclejet-build') || {};
     const buildType = target || 'dev';
     options.buildType = buildType;
     options.buildConfig = grunt.option('build-config');

tasks/oraclejet-serve.js

@@ -98,7 +98,7 @@ module.exports = (grunt) => {
 
     const serveOptions = {};
     const platform = utils.validatePlatform(grunt.option('platform'), grunt);
-    serveOptions.buildOptions = grunt.config('oraclejet-build');
+    serveOptions.buildOptions = grunt.config('oraclejet-build') || {};
     serveOptions.buildType = buildType;
     serveOptions.buildConfig = grunt.option('build-config');
     serveOptions.build = grunt.option('build');

tasks/utils.js

@@ -203,10 +203,18 @@ utils.validatePlatform = (platform, gruntAsArg) => {
 };
 
 utils.validateServeOptions = (serveOptions, targetKey, platform) => {
-  if (platform === 'web') {
-    return Object.assign({}, serveOptions[targetKey], serveOptions.web[targetKey]);
+  let customOptions = {};
+
+  if (serveOptions) {
+    if (platform === 'web' && serveOptions.web[targetKey]) {
+      customOptions = Object.assign({}, serveOptions[targetKey], serveOptions.web[targetKey]);
+    } else if (platform === 'hybrid' && serveOptions.hybrid[targetKey]) {
+      customOptions = Object.assign({}, serveOptions[targetKey], serveOptions.hybrid[targetKey]);
+    } else if (serveOptions[targetKey]) {
+      customOptions = Object.assign({}, serveOptions[targetKey]);
+    }
   }
-  return Object.assign({}, serveOptions[targetKey], serveOptions.hybrid[targetKey]);
+  return customOptions;
 };
 
 utils.validateThemes = (themeString) => {