Release 5.1.0

benm071 · benm071 · commit 65283dd4082a · 2018-06-15T09:04:54.000-07:00
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# @oracle/generator-oraclejet 5.0.2
+# @oracle/generator-oraclejet 5.1.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. 
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
@@ -1,6 +1,9 @@
 ## Release Notes for generator-oraclejet ##
 
-### 5.0.2
+### 5.1.0
+* No changes
+
+### 5.0.0
 * No changes
 
 ### 4.2.0
diff --git a/common/component.js b/common/component.js
@@ -49,9 +49,12 @@ module.exports =
 
 function _replaceComponentTemplateToken(generator) {
   const componentName = _getComponentName(generator);
-
   const base = _getBasePath(generator);
+  _replaceComponentTokenInFileList(base, componentName);
+  _replaceComponentTokenInFileList(path.join(base, 'resources/nls'), componentName);
+}
 
+function _replaceComponentTokenInFileList(base, componentName) {
   fs.readdirSync(base).forEach((file) => {
     if (path.extname(file).length !== 0) {
       const fileContent = fs.readFileSync(path.join(base, file), 'utf-8');
diff --git a/common/index.js b/common/index.js
@@ -127,6 +127,9 @@ module.exports =
       const SUPPORTED_FLAGS = CONSTANTS.SUPPORTED_FLAGS(flags.namespace);
       Object.keys(flags).forEach((key) => {
         if (SUPPORTED_FLAGS.indexOf(key) === -1) {
+          if (['platforms', 'platform', 'appid', 'appname'].indexOf(key) !== -1) {
+            reject(commonMessages.error(`Invalid flag: ${key} without flag --hybrid`, 'validateFlags'));
+          }
           reject(commonMessages.error(`Invalid flag: ${key}`, 'validateFlags'));
         }
       });
diff --git a/common/template/index.js b/common/template/index.js
@@ -17,7 +17,7 @@ const _WEB = 'web';
 
 const BLANK_TEMPLATE = blankTemplate.BLANK_TEMPLATE;
 
-const _TEMPLATES_NPM_URL = '@oracle/oraclejet-templates@~5.0.0';
+const _TEMPLATES_NPM_URL = '@oracle/oraclejet-templates@~5.1.0';
 
 const _TEMPLATES = [BLANK_TEMPLATE, 'basic', 'navbar', 'navdrawer'];
 
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/v5.0.0/alta/oj-alta-min.css" id="css" />
+    <link rel="stylesheet" href="css/libs/oj/v5.1.0/alta/oj-alta-min.css" id="css" />
     <!-- endinjector -->
     
   </head>
diff --git a/generators/app/templates/blank/js/main.js b/generators/app/templates/blank/js/main.js
@@ -24,9 +24,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/v5.0.0/debug',
-      'ojL10n': 'libs/oj/v5.0.0/ojL10n',
-      'ojtranslations': 'libs/oj/v5.0.0/resources',
+      'ojs': 'libs/oj/v5.1.0/debug',
+      'ojL10n': 'libs/oj/v5.1.0/ojL10n',
+      'ojtranslations': 'libs/oj/v5.1.0/resources',
       'text': 'libs/require/text',
       'signals': 'libs/js-signals/signals',
       'customElements': 'libs/webcomponents/custom-elements.min',
diff --git a/generators/app/templates/blank/js/path_mapping.json b/generators/app/templates/blank/js/path_mapping.json
@@ -4,10 +4,10 @@
 
   "cdns": {
     "jet": {
-      "prefix": "https://static.oracle.com/cdn/jet/v5.0.0/default/js",
+      "prefix": "https://static.oracle.com/cdn/jet/v5.1.0/default/js",
       "config": "bundles-config.js"
     },
-    "3rdparty": "https://static.oracle.com/cdn/jet/v5.0.0/3rdparty"
+    "3rdparty": "https://static.oracle.com/cdn/jet/v5.1.0/3rdparty"
   },
 
   "libs": {
diff --git a/generators/app/templates/common/package.json b/generators/app/templates/common/package.json
@@ -3,13 +3,13 @@
   "version": "1.0.0",
   "description": "An Oracle JavaScript Extension Toolkit(JET) web app",
   "dependencies": {
-    "@oracle/oraclejet": "~5.0.0"
+    "@oracle/oraclejet": "~5.1.0"
   },
   "devDependencies": {
     "grunt": "^1.0.1",
-    "@oracle/grunt-oraclejet": "~5.0.0",
+    "@oracle/grunt-oraclejet": "~5.1.0",
     "load-grunt-config": "0.19.2",
-    "@oracle/oraclejet-tooling": "~5.0.0",
+    "@oracle/oraclejet-tooling": "~5.1.0",
     "qunit-reporter-junit": "^1.1.1",
     "qunit": "^2.4.1"
   },
diff --git a/generators/hybrid/templates/blank/index.html b/generators/hybrid/templates/blank/index.html
@@ -25,12 +25,12 @@
   <head>
     <title>Oracle JET Starter Template - Hybrid Mobile Blank</title>
     <meta charset="UTF-8">
-    <meta http-equiv="Content-Security-Policy" content="default-src *; script-src 'self' *.oracle.com  'unsafe-inline' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; img-src * data:">
+    <meta http-equiv="Content-Security-Policy" content="default-src *; script-src 'self' *.oracle.com 'unsafe-inline' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; img-src * data:">
     <meta name="viewport" content="viewport-fit=cover, width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"/>
     <link rel="icon" href="css/images/favicon.ico" type="image/x-icon" />
 
     <!-- injector:theme -->
-    <link rel="stylesheet" href="css/libs/oj/v5.0.0/alta/oj-alta-min.css" id="css" />
+    <link rel="stylesheet" href="css/libs/oj/v5.1.0/alta/oj-alta-min.css" id="css" />
     <!-- endinjector -->
 
   </head>
diff --git a/generators/hybrid/templates/blank/js/main.js b/generators/hybrid/templates/blank/js/main.js
@@ -24,9 +24,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/v5.0.0/debug',
-      'ojL10n': 'libs/oj/v5.0.0/ojL10n',
-      'ojtranslations': 'libs/oj/v5.0.0/resources',
+      'ojs': 'libs/oj/v5.1.0/debug',
+      'ojL10n': 'libs/oj/v5.1.0/ojL10n',
+      'ojtranslations': 'libs/oj/v5.1.0/resources',
       'text': 'libs/require/text',
       'signals': 'libs/js-signals/signals',
       'customElements': 'libs/webcomponents/custom-elements.min',
diff --git a/generators/hybrid/templates/blank/js/path_mapping.json b/generators/hybrid/templates/blank/js/path_mapping.json
@@ -4,10 +4,10 @@
 
   "cdns": {
     "jet": {
-      "prefix": "https://static.oracle.com/cdn/jet/v5.0.0/default/js",
+      "prefix": "https://static.oracle.com/cdn/jet/v5.1.0/default/js",
       "config": "bundles-config.js"
     },
-    "3rdparty": "https://static.oracle.com/cdn/jet/v5.0.0/3rdparty"
+    "3rdparty": "https://static.oracle.com/cdn/jet/v5.1.0/3rdparty"
   },
 
   "libs": {
diff --git a/generators/hybrid/templates/common/package.json b/generators/hybrid/templates/common/package.json
@@ -3,14 +3,14 @@
   "version": "1.0.0",
   "description": "An Oracle JavaScript Extension Toolkit (JET) mobile app",
   "dependencies": {
-    "@oracle/oraclejet": "~5.0.0"
+    "@oracle/oraclejet": "~5.1.0"
   },
   "devDependencies": {
     "fs-extra": "0.30.0",
     "grunt": "^1.0.1",
-    "@oracle/grunt-oraclejet": "~5.0.0",
+    "@oracle/grunt-oraclejet": "~5.1.0",
     "load-grunt-config": "0.19.2",
-    "@oracle/oraclejet-tooling": "~5.0.0",
+    "@oracle/oraclejet-tooling": "~5.1.0",
     "qunit-reporter-junit": "^1.1.1",
     "qunit": "^2.4.1"
   },
diff --git a/hybrid/index.js b/hybrid/index.js
@@ -240,6 +240,14 @@ function _addWindowsPreferences(document) {
   preference.setAttribute('name', 'windows-target-version');
   preference.setAttribute('value', '10.0');
   windowsPlatformElem.appendChild(preference);
+  const preference2 = document.createElement('preference');
+  preference2.setAttribute('name', 'SplashScreenDelay');
+  preference2.setAttribute('value', '0');
+  windowsPlatformElem.appendChild(preference2);
+  const preference3 = document.createElement('preference');
+  preference3.setAttribute('name', 'SplashScreenBackgroundColor');
+  preference3.setAttribute('value', '');
+  windowsPlatformElem.appendChild(preference3);
 }
 
 function _getWindowsPreferencesSection(document) {
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oracle/generator-oraclejet",
-  "version": "5.0.2",
+  "version": "5.1.0",
   "license": "UPL-1.0",
   "description": "Yeoman generator for Oracle JET web and mobile applications",
   "homepage": "http://oraclejet.org",
@@ -18,7 +18,7 @@
   ],
   "dependencies": {
     "yeoman-generator": "^0.24.1",
-    "adm-zip": "^0.4.7",
+    "adm-zip": "0.4.7",
     "fs-extra": "^1.0.0",
     "xmldom": "^0.1.27",
     "request": "^2.79.0"
@@ -44,6 +44,6 @@
     "yeoman-test": "^1.5.1"
   },
   "preferGlobal": true,
-  "jetversion": "5.0.0",
-  "jetdocversion": "500"
+  "jetversion": "5.1.0",
+  "jetdocversion": "510"
 }
diff --git a/template/component/@component@-viewModel.js b/template/component/@component@-viewModel.js
@@ -4,7 +4,7 @@
 */
 'use strict';
 define(
-    ['ojs/ojcore', 'knockout', 'jquery', 'ojL10n!./resources/nls/@component@-strings'], function (oj, ko, $) {
+    ['ojs/ojcore', 'knockout', 'jquery', 'ojL10n!./resources/nls/@component@-strings'], function (oj, ko, $, componentStrings) {
 
     
     function ExampleComponentModel(context) {
@@ -19,7 +19,8 @@ define(
 
         //Example observable
         self.messageText = ko.observable('Hello from Example Component');
-
+        self.properties = context.properties;
+        self.res = componentStrings['@component@'];
         // Example for parsing context properties
         // if (context.properties.name) {
         //     parse the context properties here
@@ -33,13 +34,13 @@ define(
     //ExampleComponentModel.prototype.activated = function(context){
     //};
 
-    //ExampleComponentModel.prototype.attached = function(context){
+    //ExampleComponentModel.prototype.connected = function(context){
     //};
 
     //ExampleComponentModel.prototype.bindingsApplied = function(context){
     //};
 
-    //ExampleComponentModel.prototype.detached = function(context){
+    //ExampleComponentModel.prototype.disconnect = function(context){
     //};
 
     //ExampleComponentModel.prototype.propertyChanged = function(context){
diff --git a/template/component/component.json b/template/component/component.json
@@ -3,7 +3,7 @@
   "displayName": "@component@",
   "description": "Describe your component here",
   "version": "1.0.0",
-  "jetVersion": "5.0.0",
+  "jetVersion": "5.1.0",
   "properties": {
   },
   "methods": {
diff --git a/template/component/loader.js b/template/component/loader.js
@@ -5,9 +5,9 @@
 define(['ojs/ojcore', 'text!./@component@-view.html', './@component@-viewModel', 'text!./component.json', 'css!./@component@-styles', 'ojs/ojcomposite'],
   function(oj, view, viewModel, metadata) {
     oj.Composite.register('@component@', {
-      view: {inline: view}, 
-      viewModel: {inline: viewModel}, 
-      metadata: {inline: JSON.parse(metadata)}
+      view: view, 
+      viewModel: viewModel, 
+      metadata: JSON.parse(metadata)
     });
   }
 );
diff --git a/template/component/resources/nls/@component@-strings.js b/template/component/resources/nls/@component@-strings.js
@@ -4,11 +4,8 @@
 */
 define({
   "root": {
-    "ojsampleVisualizationExporter" : {
-        "notDvtComponentError":"The requested export component does not appear to be a data visualization element",
-        "notDvtComponentErrorDetail":"Ensure you pass the element ID of a valid component",
-        "noComponentError":"The requested component to export cannot be found",
-        "noComponentErrorDetail":"The supplied component id was {id}"
-      }
+    "@component@" : {
+    		"sampleString": "The strings file can be used to manage translatable resources"
     }
+  }
 });
diff --git a/template/test/js/main.js b/template/test/js/main.js
@@ -16,9 +16,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/v5.0.0/debug',
-          'ojL10n' : 'libs/oj/v5.0.0/ojL10n',
-          'ojtranslations' : 'libs/oj/v5.0.0/resources',
+          'ojs' : 'libs/oj/v5.1.0/debug',
+          'ojL10n' : 'libs/oj/v5.1.0/ojL10n',
+          'ojtranslations' : 'libs/oj/v5.1.0/resources',
           'text' : 'libs/require/text',
           'css' : 'libs/require-css/css',
           'signals' : 'libs/js-signals/signals',

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# @oracle/generator-oraclejet 5.0.2`
	`1`	`+# @oracle/generator-oraclejet 5.1.0`
`2`	`2`
`3`	`3`	`## About the generator`
`4`	`4`	`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.`