Release 6.2.0

oracle · Mar 21, 2019 · 6dfa1f9 · 6dfa1f9
1 parent f4f9507
commit 6dfa1f9
Show file tree

Hide file tree

Showing 18 changed files with 62 additions and 34 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# @oracle/generator-oraclejet 6.1.0
+# @oracle/generator-oraclejet 6.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. 

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
@@ -1,9 +1,6 @@
 ## Release Notes for generator-oraclejet ##
 
-### 6.1.0
-* No changes
-
-### 6.0.0
+### 6.2.0
 * No changes
 
 ### 5.2.0

diff --git a/common/hookRunner.js b/common/hookRunner.js
@@ -29,6 +29,27 @@ module.exports = {
   }
 };
 
+module.exports = {
+  runAfterComponentCreateHook() {
+    return new Promise((resolve, reject) => {
+      // Get hooks config
+      const hooksConfig = _getHooksConfigObj();
+      // Get after_app_prepare hook's path
+      const hookPath = hooksConfig.after_component_create;
+      if (hookPath && fs.existsSync(path.resolve(hookPath))) {
+        const hook = require(path.resolve(hookPath)); // eslint-disable-line
+        // Execute hook
+        hook()
+          .then(() => resolve())
+          .catch(err => reject(err));
+      } else {
+        console.warn('Hook \'after_component_create\' not defined.');
+        resolve();
+      }
+    });
+  }
+};
+
 /**
  * ## _getHooksConfigObj
  * Reads the hooks.json file

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@~6.1.0';
+const _TEMPLATES_NPM_URL = '@oracle/oraclejet-templates@~6.2.0';
 
 const _TEMPLATES = [BLANK_TEMPLATE, 'basic', 'navbar', 'navdrawer'];
 

diff --git a/generators/add-component/index.js b/generators/add-component/index.js
@@ -2,16 +2,12 @@
   Copyright (c) 2015, 2019, Oracle and/or its affiliates.
   The Universal Permissive License (UPL), Version 1.0
 */
-/**
-  Copyright (c) 2015, 2017, Oracle and/or its affiliates.
-  The Universal Permissive License (UPL), Version 1.0
-*/
-
 'use strict';
 
 const generators = require('yeoman-generator');
 const common = require('../../common');
 const commonComponent = require('../../common/component');
+const commonHookRunner = require('../../common/hookRunner');
 const commonMessages = require('../../common/messages');
 const commonTest = require('../../common/test');
 const fs2 = require('fs');
@@ -48,6 +44,7 @@ const OracleJetAddComponentGenerator = generators.Base.extend(
       this.options.component = this.componentName;
       commonComponent.writeComponentTemplate(this)
       .then(commonTest.writeTestTemplate)
+      .then(commonHookRunner.runAfterComponentCreateHook)
       .then(() => {
         done();
       })

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/v6.1.0/alta/oj-alta-min.css" id="css" />
+    <link rel="stylesheet" href="css/libs/oj/v6.2.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/v6.1.0/debug',
-      'ojL10n': 'libs/oj/v6.1.0/ojL10n',
-      'ojtranslations': 'libs/oj/v6.1.0/resources',
+      'ojs': 'libs/oj/v6.2.0/debug',
+      'ojL10n': 'libs/oj/v6.2.0/ojL10n',
+      'ojtranslations': 'libs/oj/v6.2.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
@@ -3,8 +3,8 @@
   "use": "local",
 
   "cdns": {
-    "jet": "https://static.oracle.com/cdn/jet/v6.1.0/default/js",
-    "3rdparty": "https://static.oracle.com/cdn/jet/v6.1.0/3rdparty"
+    "jet": "https://static.oracle.com/cdn/jet/v6.2.0/default/js",
+    "3rdparty": "https://static.oracle.com/cdn/jet/v6.2.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": "~6.1.0"
+    "@oracle/oraclejet": "~6.2.0"
   },
   "devDependencies": {
     "grunt": "^1.0.1",
-    "@oracle/grunt-oraclejet": "~6.1.0",
+    "@oracle/grunt-oraclejet": "~6.2.0",
     "load-grunt-config": "0.19.2",
-    "@oracle/oraclejet-tooling": "~6.1.0",
+    "@oracle/oraclejet-tooling": "~6.2.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
@@ -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/v6.1.0/alta/oj-alta-min.css" id="css" />
+    <link rel="stylesheet" href="css/libs/oj/v6.2.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/v6.1.0/debug',
-      'ojL10n': 'libs/oj/v6.1.0/ojL10n',
-      'ojtranslations': 'libs/oj/v6.1.0/resources',
+      'ojs': 'libs/oj/v6.2.0/debug',
+      'ojL10n': 'libs/oj/v6.2.0/ojL10n',
+      'ojtranslations': 'libs/oj/v6.2.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
@@ -3,8 +3,8 @@
   "use": "local",
 
   "cdns": {
-    "jet": "https://static.oracle.com/cdn/jet/v6.1.0/default/js",
-    "3rdparty": "https://static.oracle.com/cdn/jet/v6.1.0/3rdparty"
+    "jet": "https://static.oracle.com/cdn/jet/v6.2.0/default/js",
+    "3rdparty": "https://static.oracle.com/cdn/jet/v6.2.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": "~6.1.0"
+    "@oracle/oraclejet": "~6.2.0"
   },
   "devDependencies": {
     "fs-extra": "0.30.0",
     "grunt": "^1.0.1",
-    "@oracle/grunt-oraclejet": "~6.1.0",
+    "@oracle/grunt-oraclejet": "~6.2.0",
     "load-grunt-config": "0.19.2",
-    "@oracle/oraclejet-tooling": "~6.1.0",
+    "@oracle/oraclejet-tooling": "~6.2.0",
     "qunit-reporter-junit": "^1.1.1",
     "qunit": "^2.4.1"
   },

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oracle/generator-oraclejet",
-  "version": "6.1.0",
+  "version": "6.2.0",
   "license": "UPL-1.0",
   "description": "Yeoman generator for Oracle JET web and mobile applications",
   "homepage": "http://oraclejet.org",

diff --git a/template/common/scripts/hooks/after_component_create.js b/template/common/scripts/hooks/after_component_create.js
@@ -0,0 +1,12 @@
+/**
+  Copyright (c) 2015, 2019, Oracle and/or its affiliates.
+  The Universal Permissive License (UPL), Version 1.0
+*/
+'use strict';
+
+module.exports = function () {
+  return new Promise((resolve) => {
+    console.log('Running after_component_create hook.');
+    resolve();
+  });
+};
diff --git a/template/common/scripts/hooks/hooks.json b/template/common/scripts/hooks/hooks.json
@@ -3,6 +3,7 @@
     "hooks": {
         "after_app_create": "scripts/hooks/after_app_create.js",
         "after_app_restore": "scripts/hooks/after_app_restore.js",
+        "after_component_create": "scripts/hooks/after_component_create.js",
         "before_build": "scripts/hooks/before_build.js",
         "before_release": "scripts/hooks/before_release.js",
         "after_build": "scripts/hooks/after_build.js",

diff --git a/template/component/component.json b/template/component/component.json
@@ -1,7 +1,7 @@
 {
   "name": "@component@",
   "version": "1.0.0",
-  "jetVersion": "^6.1.0",
+  "jetVersion": "^6.2.0",
   "displayName": "A user friendly, translatable name of the pack.",
   "description": "A translatable high-level description for the pack.",
   "properties": {

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/v6.1.0/debug',
-          'ojL10n' : 'libs/oj/v6.1.0/ojL10n',
-          'ojtranslations' : 'libs/oj/v6.1.0/resources',
+          'ojs' : 'libs/oj/v6.2.0/debug',
+          'ojL10n' : 'libs/oj/v6.2.0/ojL10n',
+          'ojtranslations' : 'libs/oj/v6.2.0/resources',
           'text' : 'libs/require/text',
           'css' : 'libs/require-css/css',
           'signals' : 'libs/js-signals/signals',