Release 3.2.0

benm071 · benm071 · commit 5e06cb248d27 · 2017-07-14T17:37:26.000-07:00
diff --git a/README.md b/README.md
@@ -1,18 +1,18 @@
-# generator-oraclejet 3.1.0
+# generator-oraclejet 3.2.0
 
 ## About the generator
 This Yeoman generator for Oracle JET lets you quickly set up a project for use as a web application or hybrid mobile application for Android, iOS or Windows 10. 
 
 This is an open source project maintained by Oracle Corp.
 
 ## Installation
-For step-by-step instructions on using Yeoman and this generator to build an Oracle JET application, including possible pre-requisites for installation, please see the [Oracle JET Developers Guide](http://docs.oracle.com/middleware/jet310/jet/)
+For step-by-step instructions on using Yeoman and this generator to build an Oracle JET application, including possible pre-requisites for installation, please see the [Oracle JET Developers Guide](http://docs.oracle.com/middleware/jet320/jet/)
 ```bash
 npm install -g generator-oraclejet
 ```
 
 ## Usage
-Once you have the generator installed, the following commands will scaffold up a JET based application. See the [Oracle JET Developers Guide](http://docs.oracle.com/middleware/jet310/jet/) for information about all of the available command line options as well as details on pre-requisites for installation.
+Once you have the generator installed, the following commands will scaffold up a JET based application. See the [Oracle JET Developers Guide](http://docs.oracle.com/middleware/jet320/jet/) for information about all of the available command line options as well as details on pre-requisites for installation.
 
 ```bash
 # Generate a web application with default blank template
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
@@ -1,7 +1,9 @@
 ## Release Notes for generator-oraclejet ##
 
-### 3.1.0
+### 3.2.0
+* No changes
 
+### 3.1.0
 * No changes
 
 ### 3.0.0
diff --git a/common/template/index.js b/common/template/index.js
@@ -18,7 +18,7 @@ const _WEB = 'web';
 
 const BLANK_TEMPLATE = blankTemplate.BLANK_TEMPLATE;
 
-const _TEMPLATES_NPM_URL = 'oraclejet-templates@~3.1.0';
+const _TEMPLATES_NPM_URL = 'oraclejet-templates@~3.2.0';
 
 const _TEMPLATES = [BLANK_TEMPLATE, 'basic', 'navbar', 'navdrawer'];
 
@@ -101,7 +101,9 @@ function _validateTemplateType(templateType) {
 }
 
 function _getLocalFileAbsolutePath(generator, templatePath) {
-  const absolutePath = path.isAbsolute(templatePath) ? templatePath
-                      : path.resolve(process.cwd(), templatePath);
+  const tempPath = (templatePath[0] !== '~') ? templatePath
+                      : path.join(process.env.HOME, templatePath.slice(1));
+  const absolutePath = path.isAbsolute(tempPath) ? tempPath
+                      : path.resolve(process.cwd(), tempPath);
   return util.fsExistsSync(absolutePath) ? absolutePath : null;
 }
diff --git a/generators/add-hybrid/index.js b/generators/add-hybrid/index.js
@@ -4,6 +4,7 @@
 */
 'use strict';
 
+const childProcess = require('child_process');
 const generators = require('yeoman-generator');
 const fs = require('fs-extra');
 const path = require('path');
@@ -46,6 +47,7 @@ const OracleJetAddHybridGenerator = generators.Base.extend(
       const done = this.async();
       _setConfigPaths(paths.getConfiguredPaths(this.destinationPath()));
       common.validateArgs(this)
+      .then(_checkIfCordovaIsInstalled)
       .then(common.validateFlags)
       .then(_validateAppDirForAddHybrid)
       .then(() => {
@@ -94,6 +96,18 @@ const OracleJetAddHybridGenerator = generators.Base.extend(
 
   });
 
+function _checkIfCordovaIsInstalled(generator) {
+  return new Promise((resolve, reject) => {
+    childProcess.exec('cordova', (error) => {
+      if (error) {
+        reject('Cordova not installed. Please install by: "npm install -g cordova"');
+      } else {
+        resolve(generator);
+      }
+    });
+  });
+}
+
 function _setConfigPaths(configPathObj) {
   Object.keys(configPathObj).forEach((key) => {
     _configPaths[key] = configPathObj[key];
diff --git a/generators/app/templates/blank/index.html b/generators/app/templates/blank/index.html
@@ -32,7 +32,7 @@
     <meta name="apple-mobile-web-app-title" content="Oracle JET">
 
     <!-- injector:theme -->
-    <link rel="stylesheet" href="css/libs/oj/v3.1.0/alta/oj-alta-min.css" id="css" />
+    <link rel="stylesheet" href="css/libs/oj/v3.2.0/alta/oj-alta-min.css" id="css" />
     <!-- endinjector -->
 
     <!-- This is where you would add any app specific styling -->
diff --git a/generators/app/templates/blank/js/main-release-paths.json b/generators/app/templates/blank/js/main-release-paths.json
@@ -5,9 +5,9 @@
   "promise": "libs/es6-promise/es6-promise.min",
   "hammerjs": "libs/hammer/hammer-2.0.8.min",
   "ojdnd": "libs/dnd-polyfill/dnd-polyfill-1.0.0.min",
-  "ojs": "libs/oj/v3.1.0/min",
-  "ojL10n": "libs/oj/v3.1.0/ojL10n",
-  "ojtranslations": "libs/oj/v3.1.0/resources",
+  "ojs": "libs/oj/v3.2.0/min",
+  "ojL10n": "libs/oj/v3.2.0/ojL10n",
+  "ojtranslations": "libs/oj/v3.2.0/resources",
   "text": "libs/require/text",
   "signals": "libs/js-signals/signals.min",
   "customElements": "libs/webcomponents/CustomElements.min",
diff --git a/generators/app/templates/blank/js/main.js b/generators/app/templates/blank/js/main.js
@@ -23,9 +23,9 @@ requirejs.config(
     'promise': 'libs/es6-promise/es6-promise',
     'hammerjs': 'libs/hammer/hammer-2.0.8',
     'ojdnd': 'libs/dnd-polyfill/dnd-polyfill-1.0.0',
-    'ojs': 'libs/oj/v3.1.0/debug',
-    'ojL10n': 'libs/oj/v3.1.0/ojL10n',
-    'ojtranslations': 'libs/oj/v3.1.0/resources',
+    'ojs': 'libs/oj/v3.2.0/debug',
+    'ojL10n': 'libs/oj/v3.2.0/ojL10n',
+    'ojtranslations': 'libs/oj/v3.2.0/resources',
     'text': 'libs/require/text',
     'signals': 'libs/js-signals/signals',
     'customElements': 'libs/webcomponents/CustomElements',
diff --git a/generators/app/templates/common/package.json b/generators/app/templates/common/package.json
@@ -7,13 +7,13 @@
     "homepage": "http://www.oraclejet.org"
   },
   "dependencies": {
-    "oraclejet": "~3.1.0"
+    "oraclejet": "~3.2.0"
   },
   "devDependencies": {
     "grunt": "^1.0.1",
-    "grunt-oraclejet": "~3.1.0",
+    "grunt-oraclejet": "~3.2.0",
     "load-grunt-config": "0.19.2",
-    "oraclejet-tooling": "~3.1.0"
+    "oraclejet-tooling": "~3.2.0"
   },
   "engines": {
     "node": ">=0.10.0"
diff --git a/generators/hybrid/templates/blank/index.html b/generators/hybrid/templates/blank/index.html
@@ -30,7 +30,7 @@
     <link rel="icon" href="css/images/favicon.ico" type="image/x-icon" />
 
     <!-- injector:theme -->
-    <link rel="stylesheet" href="css/libs/oj/v3.1.0/alta/oj-alta-min.css" id="css" />
+    <link rel="stylesheet" href="css/libs/oj/v3.2.0/alta/oj-alta-min.css" id="css" />
     <!-- endinjector -->
     
     <!-- This is where you would add any app specific styling -->
diff --git a/generators/hybrid/templates/blank/js/main-debug-paths-windows.json b/generators/hybrid/templates/blank/js/main-debug-paths-windows.json
@@ -5,12 +5,12 @@
   "promise": "libs/es6-promise/es6-promise",
   "hammerjs": "libs/hammer/hammer-2.0.8",
   "ojdnd": "libs/dnd-polyfill/dnd-polyfill-1.0.0",
-  "ojs": "libs/oj/v3.1.0/debug",
-  "ojL10n": "libs/oj/v3.1.0/ojL10n",
-  "ojtranslations": "libs/oj/v3.1.0/resources",
-  "ojtranslations/nls/ojtranslations": "libs/oj/v3.1.0/resources/root/ojtranslations",
-  "ojtranslations/nls/localeElements": "libs/oj/v3.1.0/resources/root/localeElements",
-  "ojtranslations/nls/timezoneData": "libs/oj/v3.1.0/resources/root/timezoneData",
+  "ojs": "libs/oj/v3.2.0/debug",
+  "ojL10n": "libs/oj/v3.2.0/ojL10n",
+  "ojtranslations": "libs/oj/v3.2.0/resources",
+  "ojtranslations/nls/ojtranslations": "libs/oj/v3.2.0/resources/root/ojtranslations",
+  "ojtranslations/nls/localeElements": "libs/oj/v3.2.0/resources/root/localeElements",
+  "ojtranslations/nls/timezoneData": "libs/oj/v3.2.0/resources/root/timezoneData",
   "text": "libs/require/text",
   "signals": "libs/js-signals/signals",
   "customElements": "libs/webcomponents/CustomElements.min",
diff --git a/generators/hybrid/templates/blank/js/main-release-paths-windows.json b/generators/hybrid/templates/blank/js/main-release-paths-windows.json
@@ -5,12 +5,12 @@
   "promise": "libs/es6-promise/es6-promise.min",
   "hammerjs": "libs/hammer/hammer-2.0.8.min",
   "ojdnd": "libs/dnd-polyfill/dnd-polyfill-1.0.0.min",
-  "ojs": "libs/oj/v3.1.0/min",
-  "ojL10n": "libs/oj/v3.1.0/ojL10n",
-  "ojtranslations": "libs/oj/v3.1.0/resources",
-  "ojtranslations/nls/ojtranslations": "libs/oj/v3.1.0/resources/root/ojtranslations",
-  "ojtranslations/nls/localeElements": "libs/oj/v3.1.0/resources/root/localeElements",
-  "ojtranslations/nls/timezoneData": "libs/oj/v3.1.0/resources/root/timezoneData",
+  "ojs": "libs/oj/v3.2.0/min",
+  "ojL10n": "libs/oj/v3.2.0/ojL10n",
+  "ojtranslations": "libs/oj/v3.2.0/resources",
+  "ojtranslations/nls/ojtranslations": "libs/oj/v3.2.0/resources/root/ojtranslations",
+  "ojtranslations/nls/localeElements": "libs/oj/v3.2.0/resources/root/localeElements",
+  "ojtranslations/nls/timezoneData": "libs/oj/v3.2.0/resources/root/timezoneData",
   "text": "libs/require/text",
   "signals": "libs/js-signals/signals.min",
   "customElements": "libs/webcomponents/CustomElements.min",
diff --git a/generators/hybrid/templates/blank/js/main-release-paths.json b/generators/hybrid/templates/blank/js/main-release-paths.json
@@ -5,9 +5,9 @@
   "promise": "libs/es6-promise/es6-promise.min",
   "hammerjs": "libs/hammer/hammer-2.0.8.min",
   "ojdnd": "libs/dnd-polyfill/dnd-polyfill-1.0.0.min",
-  "ojs": "libs/oj/v3.1.0/min",
-  "ojL10n": "libs/oj/v3.1.0/ojL10n",
-  "ojtranslations": "libs/oj/v3.1.0/resources",
+  "ojs": "libs/oj/v3.2.0/min",
+  "ojL10n": "libs/oj/v3.2.0/ojL10n",
+  "ojtranslations": "libs/oj/v3.2.0/resources",
   "text": "libs/require/text",
   "signals": "libs/js-signals/signals.min",
   "customElements": "libs/webcomponents/CustomElements.min",
diff --git a/generators/hybrid/templates/blank/js/main.js b/generators/hybrid/templates/blank/js/main.js
@@ -17,20 +17,20 @@ requirejs.config(
     paths:
   //injector:mainReleasePaths
     {
-      knockout: 'libs/knockout/knockout-3.4.0.debug',
-      jquery: 'libs/jquery/jquery-3.1.1',
+      'knockout': 'libs/knockout/knockout-3.4.0.debug',
+      'jquery': 'libs/jquery/jquery-3.1.1',
       'jqueryui-amd': 'libs/jquery/jqueryui-amd-1.12.0',
-      promise: 'libs/es6-promise/es6-promise',
-      hammerjs: 'libs/hammer/hammer-2.0.8',
-      ojdnd: 'libs/dnd-polyfill/dnd-polyfill-1.0.0',
-      ojs: 'libs/oj/v3.1.0/debug',
-      ojL10n: 'libs/oj/v3.1.0/ojL10n',
-      ojtranslations: 'libs/oj/v3.1.0/resources',
-      text: 'libs/require/text',
-      signals: 'libs/js-signals/signals',
-      customElements: 'libs/webcomponents/CustomElements',
-      proj4: 'libs/proj4js/dist/proj4-src',
-      css: 'libs/require-css/css'
+      'promise': 'libs/es6-promise/es6-promise',
+      'hammerjs': 'libs/hammer/hammer-2.0.8',
+      'ojdnd': 'libs/dnd-polyfill/dnd-polyfill-1.0.0',
+      'ojs': 'libs/oj/v3.2.0/debug',
+      'ojL10n': 'libs/oj/v3.2.0/ojL10n',
+      'ojtranslations': 'libs/oj/v3.2.0/resources',
+      'text': 'libs/require/text',
+      'signals': 'libs/js-signals/signals',
+      'customElements': 'libs/webcomponents/CustomElements',
+      'proj4': 'libs/proj4js/dist/proj4-src',
+      'css': 'libs/require-css/css'
     }
     //endinjector
     ,
diff --git a/generators/hybrid/templates/common/package.json b/generators/hybrid/templates/common/package.json
@@ -7,14 +7,14 @@
     "homepage": "http://www.oraclejet.org"
   },
   "dependencies": {
-    "oraclejet": "~3.1.0"
+    "oraclejet": "~3.2.0"
   },
   "devDependencies": {
     "fs-extra": "0.30.0",
     "grunt": "^1.0.1",
-    "grunt-oraclejet": "~3.1.0",
+    "grunt-oraclejet": "~3.2.0",
     "load-grunt-config": "0.19.2",
-    "oraclejet-tooling": "~3.1.0"
+    "oraclejet-tooling": "~3.2.0"
   },
   "engines": {
     "node": ">=0.10.0"
diff --git a/generators/restore-hybrid/index.js b/generators/restore-hybrid/index.js
@@ -4,12 +4,15 @@
 */
 'use strict';
 
+const exec = require('child_process').exec;
 const generators = require('yeoman-generator');
 const common = require('../../common');
 const commonHybrid = require('../../hybrid');
 const commonMessages = require('../../common/messages');
 const commonRestore = require('../../common/restore');
 const path = require('path');
+const paths = require('../../util/paths');
+const fs = require('fs-extra');
 
 /*
  * Generator for the restore step
@@ -40,7 +43,9 @@ const OracleJetHybridRestoreGenerator = generators.Base.extend(
 
       commonRestore.npmInstall({ generator: this })
       .then(commonHybrid.copyHooks)
+      .then(commonHybrid.copyResources)
       .then(commonRestore.writeOracleJetConfigFile)
+      .then(_invokeCordovaPrepare)
       .then(() => {
         done();
       })
@@ -59,4 +64,23 @@ const OracleJetHybridRestoreGenerator = generators.Base.extend(
 
   });
 
+function _invokeCordovaPrepare(context) {
+  const generator = context.generator || context;
+  if (!generator.options.invokedByRestore) return Promise.resolve(context);
+  const cwd = paths.getConfiguredPaths(generator.destinationPath()).stagingHybrid;
+  fs.ensureDirSync(path.join(cwd, 'www'));
+  console.log('Restoring hybrid plugins and platforms....');
+  return new Promise((resolve, reject) => {
+    const cmd = 'cordova prepare';
+    const cmdOpts = { cwd, stdio: [0, 'pipe', 'pipe'], maxBuffer: 1024 * 20000 };
+    exec(cmd, cmdOpts, (error) => {
+      // When www/index.html files are missing, cordova reports error
+      if (error && !/index\.html/.test(error)) {
+        reject(error);
+      }
+      resolve(context);
+    });
+  });
+}
+
 module.exports = OracleJetHybridRestoreGenerator;
diff --git a/hybrid/index.js b/hybrid/index.js
@@ -67,17 +67,19 @@ module.exports =
     });
   },
 
-  copyResources: function _copyResources(generator) {
+  copyResources: function _copyResources(context) {
+    const generator = context.generator || context;
     const source = generator.templatePath('../../hybrid/templates/common/res');
     const dest = _getHybridPath(generator, 'res/');
 
     return new Promise((resolve, reject) => {
-      fs.copy(source, dest, (err) => {
+      // do not overwrite existing icons
+      fs.copy(source, dest, { overwrite: false }, (err) => {
         if (err) {
           reject(err);
           return;
         }
-        resolve(generator);
+        resolve(context);
       });
     });
   },
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "generator-oraclejet",
-  "version": "3.1.0",
+  "version": "3.2.0",
   "license": "UPL-1.0",
   "description": "Yeoman generator for Oracle JET web and mobile applications",
   "homepage": "http://oraclejet.org",
@@ -43,6 +43,6 @@
     "yeoman-test": "^1.5.1"
   },
   "preferGlobal": true,
-  "jetversion": "3.1.0",
-  "jetdocversion": "310"
+  "jetversion": "3.2.0",
+  "jetdocversion": "320"
 }
diff --git a/template/scripts/grunt/config/oraclejet-build.js b/template/scripts/grunt/config/oraclejet-build.js
@@ -34,8 +34,14 @@ module.exports = function (grunt) {
  * Example: {cwd: 'app', src: ['**', '!test.js'], dest: 'staging',  rename: function (dest, file) {return renamed path}}
  */
     // copyCustomLibsToStaging: {
-    //   fileList: []
-    // },
+    //  fileList: [
+    //   {
+    //     cwd:'node_modules/oraclejet/',
+    //     src: ['*'],
+    //     dest: 'web/js/libs/oraclejet'
+    //   }
+    //  ]
+    // }
 
 /**
  * # copySrcToStaging
@@ -111,15 +117,31 @@ module.exports = function (grunt) {
  * The web specific configurations will override the general configuration. 
  */
     web: {
-
+    // copyCustomLibsToStaging: {
+    //  fileList: [
+    //   {
+    //     cwd:'node_modules/oraclejet/',
+    //     src: ['*'],
+    //     dest: 'web/js/libs/oraclejet'
+    //   }
+    //  ]
+    // }
     }, 
 
 /**
  * This is the hybrid specific configuration. You can specify configurations targeted only hybrid apps. 
  * The hybrid specific configurations will override the general configuration. 
  */
     hybrid: {
-
+    // copyCustomLibsToStaging: {
+    //  fileList: [
+    //   {
+    //     cwd:'node_modules/oraclejet/',
+    //     src: ['*'],
+    //     dest: 'hybrid/www/js/libs/oraclejet'
+    //   }
+    //  ]
+    // }
     }
   };
 };
