Skip to content
This repository was archived by the owner on Jul 2, 2020. It is now read-only.

Commit 65283dd

Browse files
benm071benm071
committed
Release 5.1.0
1 parent 69c9767 commit 65283dd

File tree

20 files changed

+59
-44
lines changed

20 files changed

+59
-44
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# @oracle/generator-oraclejet 5.0.2
1+
# @oracle/generator-oraclejet 5.1.0
22

33
## About the generator
44
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.

‎RELEASENOTES.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
## Release Notes for generator-oraclejet ##
22

3-
### 5.0.2
3+
### 5.1.0
4+
* No changes
5+
6+
### 5.0.0
47
* No changes
58

69
### 4.2.0

‎common/component.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,12 @@ module.exports =
4949

5050
function _replaceComponentTemplateToken(generator) {
5151
const componentName = _getComponentName(generator);
52-
5352
const base = _getBasePath(generator);
53+
_replaceComponentTokenInFileList(base, componentName);
54+
_replaceComponentTokenInFileList(path.join(base, 'resources/nls'), componentName);
55+
}
5456

57+
function _replaceComponentTokenInFileList(base, componentName) {
5558
fs.readdirSync(base).forEach((file) => {
5659
if (path.extname(file).length !== 0) {
5760
const fileContent = fs.readFileSync(path.join(base, file), 'utf-8');

‎common/index.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,9 @@ module.exports =
127127
const SUPPORTED_FLAGS = CONSTANTS.SUPPORTED_FLAGS(flags.namespace);
128128
Object.keys(flags).forEach((key) => {
129129
if (SUPPORTED_FLAGS.indexOf(key) === -1) {
130+
if (['platforms', 'platform', 'appid', 'appname'].indexOf(key) !== -1) {
131+
reject(commonMessages.error(`Invalid flag: ${key} without flag --hybrid`, 'validateFlags'));
132+
}
130133
reject(commonMessages.error(`Invalid flag: ${key}`, 'validateFlags'));
131134
}
132135
});

‎common/template/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const _WEB = 'web';
1717

1818
const BLANK_TEMPLATE = blankTemplate.BLANK_TEMPLATE;
1919

20-
const _TEMPLATES_NPM_URL = '@oracle/oraclejet-templates@~5.0.0';
20+
const _TEMPLATES_NPM_URL = '@oracle/oraclejet-templates@~5.1.0';
2121

2222
const _TEMPLATES = [BLANK_TEMPLATE, 'basic', 'navbar', 'navdrawer'];
2323

‎generators/app/templates/blank/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<meta name="apple-mobile-web-app-title" content="Oracle JET">
3333

3434
<!-- injector:theme -->
35-
<link rel="stylesheet" href="css/libs/oj/v5.0.0/alta/oj-alta-min.css" id="css" />
35+
<link rel="stylesheet" href="css/libs/oj/v5.1.0/alta/oj-alta-min.css" id="css" />
3636
<!-- endinjector -->
3737

3838
</head>

‎generators/app/templates/blank/js/main.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ requirejs.config(
2424
'promise': 'libs/es6-promise/es6-promise',
2525
'hammerjs': 'libs/hammer/hammer-2.0.8',
2626
'ojdnd': 'libs/dnd-polyfill/dnd-polyfill-1.0.0',
27-
'ojs': 'libs/oj/v5.0.0/debug',
28-
'ojL10n': 'libs/oj/v5.0.0/ojL10n',
29-
'ojtranslations': 'libs/oj/v5.0.0/resources',
27+
'ojs': 'libs/oj/v5.1.0/debug',
28+
'ojL10n': 'libs/oj/v5.1.0/ojL10n',
29+
'ojtranslations': 'libs/oj/v5.1.0/resources',
3030
'text': 'libs/require/text',
3131
'signals': 'libs/js-signals/signals',
3232
'customElements': 'libs/webcomponents/custom-elements.min',

‎generators/app/templates/blank/js/path_mapping.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
"cdns": {
66
"jet": {
7-
"prefix": "https://static.oracle.com/cdn/jet/v5.0.0/default/js",
7+
"prefix": "https://static.oracle.com/cdn/jet/v5.1.0/default/js",
88
"config": "bundles-config.js"
99
},
10-
"3rdparty": "https://static.oracle.com/cdn/jet/v5.0.0/3rdparty"
10+
"3rdparty": "https://static.oracle.com/cdn/jet/v5.1.0/3rdparty"
1111
},
1212

1313
"libs": {

‎generators/app/templates/common/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
"version": "1.0.0",
44
"description": "An Oracle JavaScript Extension Toolkit(JET) web app",
55
"dependencies": {
6-
"@oracle/oraclejet": "~5.0.0"
6+
"@oracle/oraclejet": "~5.1.0"
77
},
88
"devDependencies": {
99
"grunt": "^1.0.1",
10-
"@oracle/grunt-oraclejet": "~5.0.0",
10+
"@oracle/grunt-oraclejet": "~5.1.0",
1111
"load-grunt-config": "0.19.2",
12-
"@oracle/oraclejet-tooling": "~5.0.0",
12+
"@oracle/oraclejet-tooling": "~5.1.0",
1313
"qunit-reporter-junit": "^1.1.1",
1414
"qunit": "^2.4.1"
1515
},

‎generators/hybrid/templates/blank/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@
2525
<head>
2626
<title>Oracle JET Starter Template - Hybrid Mobile Blank</title>
2727
<meta charset="UTF-8">
28-
<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:">
28+
<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:">
2929
<meta name="viewport" content="viewport-fit=cover, width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"/>
3030
<link rel="icon" href="css/images/favicon.ico" type="image/x-icon" />
3131

3232
<!-- injector:theme -->
33-
<link rel="stylesheet" href="css/libs/oj/v5.0.0/alta/oj-alta-min.css" id="css" />
33+
<link rel="stylesheet" href="css/libs/oj/v5.1.0/alta/oj-alta-min.css" id="css" />
3434
<!-- endinjector -->
3535

3636
</head>

‎generators/hybrid/templates/blank/js/main.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ requirejs.config(
2424
'promise': 'libs/es6-promise/es6-promise',
2525
'hammerjs': 'libs/hammer/hammer-2.0.8',
2626
'ojdnd': 'libs/dnd-polyfill/dnd-polyfill-1.0.0',
27-
'ojs': 'libs/oj/v5.0.0/debug',
28-
'ojL10n': 'libs/oj/v5.0.0/ojL10n',
29-
'ojtranslations': 'libs/oj/v5.0.0/resources',
27+
'ojs': 'libs/oj/v5.1.0/debug',
28+
'ojL10n': 'libs/oj/v5.1.0/ojL10n',
29+
'ojtranslations': 'libs/oj/v5.1.0/resources',
3030
'text': 'libs/require/text',
3131
'signals': 'libs/js-signals/signals',
3232
'customElements': 'libs/webcomponents/custom-elements.min',

‎generators/hybrid/templates/blank/js/path_mapping.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
"cdns": {
66
"jet": {
7-
"prefix": "https://static.oracle.com/cdn/jet/v5.0.0/default/js",
7+
"prefix": "https://static.oracle.com/cdn/jet/v5.1.0/default/js",
88
"config": "bundles-config.js"
99
},
10-
"3rdparty": "https://static.oracle.com/cdn/jet/v5.0.0/3rdparty"
10+
"3rdparty": "https://static.oracle.com/cdn/jet/v5.1.0/3rdparty"
1111
},
1212

1313
"libs": {

‎generators/hybrid/templates/common/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
"version": "1.0.0",
44
"description": "An Oracle JavaScript Extension Toolkit (JET) mobile app",
55
"dependencies": {
6-
"@oracle/oraclejet": "~5.0.0"
6+
"@oracle/oraclejet": "~5.1.0"
77
},
88
"devDependencies": {
99
"fs-extra": "0.30.0",
1010
"grunt": "^1.0.1",
11-
"@oracle/grunt-oraclejet": "~5.0.0",
11+
"@oracle/grunt-oraclejet": "~5.1.0",
1212
"load-grunt-config": "0.19.2",
13-
"@oracle/oraclejet-tooling": "~5.0.0",
13+
"@oracle/oraclejet-tooling": "~5.1.0",
1414
"qunit-reporter-junit": "^1.1.1",
1515
"qunit": "^2.4.1"
1616
},

‎hybrid/index.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,14 @@ function _addWindowsPreferences(document) {
240240
preference.setAttribute('name', 'windows-target-version');
241241
preference.setAttribute('value', '10.0');
242242
windowsPlatformElem.appendChild(preference);
243+
const preference2 = document.createElement('preference');
244+
preference2.setAttribute('name', 'SplashScreenDelay');
245+
preference2.setAttribute('value', '0');
246+
windowsPlatformElem.appendChild(preference2);
247+
const preference3 = document.createElement('preference');
248+
preference3.setAttribute('name', 'SplashScreenBackgroundColor');
249+
preference3.setAttribute('value', '');
250+
windowsPlatformElem.appendChild(preference3);
243251
}
244252

245253
function _getWindowsPreferencesSection(document) {

‎package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@oracle/generator-oraclejet",
3-
"version": "5.0.2",
3+
"version": "5.1.0",
44
"license": "UPL-1.0",
55
"description": "Yeoman generator for Oracle JET web and mobile applications",
66
"homepage": "http://oraclejet.org",
@@ -18,7 +18,7 @@
1818
],
1919
"dependencies": {
2020
"yeoman-generator": "^0.24.1",
21-
"adm-zip": "^0.4.7",
21+
"adm-zip": "0.4.7",
2222
"fs-extra": "^1.0.0",
2323
"xmldom": "^0.1.27",
2424
"request": "^2.79.0"
@@ -44,6 +44,6 @@
4444
"yeoman-test": "^1.5.1"
4545
},
4646
"preferGlobal": true,
47-
"jetversion": "5.0.0",
48-
"jetdocversion": "500"
47+
"jetversion": "5.1.0",
48+
"jetdocversion": "510"
4949
}

‎template/component/@component@-viewModel.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*/
55
'use strict';
66
define(
7-
['ojs/ojcore', 'knockout', 'jquery', 'ojL10n!./resources/nls/@component@-strings'], function (oj, ko, $) {
7+
['ojs/ojcore', 'knockout', 'jquery', 'ojL10n!./resources/nls/@component@-strings'], function (oj, ko, $, componentStrings) {
88

99

1010
function ExampleComponentModel(context) {
@@ -19,7 +19,8 @@ define(
1919

2020
//Example observable
2121
self.messageText = ko.observable('Hello from Example Component');
22-
22+
self.properties = context.properties;
23+
self.res = componentStrings['@component@'];
2324
// Example for parsing context properties
2425
// if (context.properties.name) {
2526
// parse the context properties here
@@ -33,13 +34,13 @@ define(
3334
//ExampleComponentModel.prototype.activated = function(context){
3435
//};
3536

36-
//ExampleComponentModel.prototype.attached = function(context){
37+
//ExampleComponentModel.prototype.connected = function(context){
3738
//};
3839

3940
//ExampleComponentModel.prototype.bindingsApplied = function(context){
4041
//};
4142

42-
//ExampleComponentModel.prototype.detached = function(context){
43+
//ExampleComponentModel.prototype.disconnect = function(context){
4344
//};
4445

4546
//ExampleComponentModel.prototype.propertyChanged = function(context){

‎template/component/component.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"displayName": "@component@",
44
"description": "Describe your component here",
55
"version": "1.0.0",
6-
"jetVersion": "5.0.0",
6+
"jetVersion": "5.1.0",
77
"properties": {
88
},
99
"methods": {

‎template/component/loader.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
define(['ojs/ojcore', 'text!./@component@-view.html', './@component@-viewModel', 'text!./component.json', 'css!./@component@-styles', 'ojs/ojcomposite'],
66
function(oj, view, viewModel, metadata) {
77
oj.Composite.register('@component@', {
8-
view: {inline: view},
9-
viewModel: {inline: viewModel},
10-
metadata: {inline: JSON.parse(metadata)}
8+
view: view,
9+
viewModel: viewModel,
10+
metadata: JSON.parse(metadata)
1111
});
1212
}
1313
);

‎template/component/resources/nls/@component@-strings.js

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,8 @@
44
*/
55
define({
66
"root": {
7-
"ojsampleVisualizationExporter" : {
8-
"notDvtComponentError":"The requested export component does not appear to be a data visualization element",
9-
"notDvtComponentErrorDetail":"Ensure you pass the element ID of a valid component",
10-
"noComponentError":"The requested component to export cannot be found",
11-
"noComponentErrorDetail":"The supplied component id was {id}"
12-
}
7+
"@component@" : {
8+
"sampleString": "The strings file can be used to manage translatable resources"
139
}
10+
}
1411
});

‎template/test/js/main.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ requirejs.config(
1616
'promise' : 'libs/es6-promise/es6-promise',
1717
'hammerjs' : 'libs/hammer/hammer-2.0.8',
1818
'ojdnd' : 'libs/dnd-polyfill/dnd-polyfill-1.0.0',
19-
'ojs' : 'libs/oj/v5.0.0/debug',
20-
'ojL10n' : 'libs/oj/v5.0.0/ojL10n',
21-
'ojtranslations' : 'libs/oj/v5.0.0/resources',
19+
'ojs' : 'libs/oj/v5.1.0/debug',
20+
'ojL10n' : 'libs/oj/v5.1.0/ojL10n',
21+
'ojtranslations' : 'libs/oj/v5.1.0/resources',
2222
'text' : 'libs/require/text',
2323
'css' : 'libs/require-css/css',
2424
'signals' : 'libs/js-signals/signals',

0 commit comments

Comments
 (0)