Release 5.2.0

Author: benm071

README.md

@@ -1,12 +1,12 @@
-# @oracle/oraclejet-tooling 5.1.0
+# @oracle/oraclejet-tooling 5.2.0
 
 ## About the tooling API
 This tooling API contains methods to build and serve Oracle JET web and hybrid mobile apps. It is intended to be used with task running tools such as grunt or gulp. The APIs can also be invoked directly. 
 
 This is an open source project maintained by Oracle Corp.
 
 ## Installation
-This module will be automatically installed when you scaffold a web or hybrid mobile app following the [Oracle JET Developers Guide](http://www.oracle.com/pls/topic/lookup?ctx=jet510&id=homepage).
+This module will be automatically installed when you scaffold a web or hybrid mobile app following the [Oracle JET Developers Guide](http://www.oracle.com/pls/topic/lookup?ctx=jet520&id=homepage).
 
 ## [Contributing](https://github.com/oracle/oraclejet-tooling/tree/master/CONTRIBUTING.md)
 Oracle JET is an open source project.  Pull Requests are currently not being accepted. See 

RELEASENOTES.md

@@ -1,5 +1,8 @@
 ## Release Notes for oraclejet-tooling ##
 
+### 5.2.0
+* No changes
+
 ### 5.1.0
 * No changes
 
@@ -38,3 +41,4 @@
 * Allow multiple themes to be included in a built app
 * Grunt serve to specific iOS emulator fails
 * no-build option missing from grunt serve
+>>>>>>> 0f5544d... Merge branch 'master' into ListPacks

THIRDPARTYLICENSE.txt

@@ -11,6 +11,7 @@
  */
 const component = require('./scopes/component');
 const CONSTANTS = require('./constants');
+const pack = require('./scopes/pack');
 const util = require('./util');
 
 /**
@@ -19,13 +20,16 @@ const util = require('./util');
  * @public
  * @param {string} scope
  * @param {Array} parameters
+ * @param {Object} options
 
  * @returns {Promise}
  */
-module.exports = function (scope, parameters) {
+module.exports = function (scope, parameters, options) {
   switch (scope) {
     case (CONSTANTS.API_SCOPES.COMPONENT):
-      return component.add(parameters);
+      return component.add(parameters, options);
+    case (CONSTANTS.API_SCOPES.PACK):
+      return pack.add(parameters);
     default:
       util.log.error(`Please specify ojet.${CONSTANTS.API_TASKS.ADD}() 'scope' parameter.`);
       return false;

lib/add.js

@@ -17,7 +17,7 @@ const config = require('./config');
 * @param {string} [options.buildType]        - buildType 'dev' or 'release'
 * @param {string} [options.theme]            - Theme, default to alta:platform
 * @param {Array} [options.themes]            - Themes, default to first theme in the array
-* @param {string} [options.sassCompile]      - Whether to compile sass
+* @param {boolean} [options.sassCompile]     - Whether to compile sass
 * @param {string} [options.destination='emulator'] -Cordova build flag --emulator or --device
 * @param {string} [options.buildConfig]      - Path to build configuration file
 * @param {boolean} [options.buildForServe]   - Whether to invoke build just for Serve

lib/build.js

@@ -425,4 +425,32 @@ module.exports = {
       return resolve(context);
     });
   },
+  copyLocalCca: function _copyLocalCca(context) {
+    return new Promise((resolve) => {
+      const srcBase = path.join(config('paths').src.common, config('paths').src.javascript, config('paths').composites);
+      const destBase = path.join(config('paths').staging.stagingPath, config('paths').src.javascript, config('paths').composites);
+
+      const components = glob.sync('**/component.json', { cwd: srcBase });
+      components.forEach((componentPath) => {
+        const componentJson = util.readJsonAndReturnObject(path.join(srcBase, componentPath));
+        let destPath = path.join(destBase, componentPath);
+        // if the component doesn't belong to a pack
+        if (!Object.prototype.hasOwnProperty.call(componentJson, 'pack')) {
+          destPath = path.join(destPath, '..', componentJson.version);
+        } else {
+          const packName = path.dirname(path.join(componentPath, '..'));
+          const packJsonPath = path.join(srcBase, packName, 'component.json');
+          let packVersion = '1.0.0';
+          if (util.fsExistsSync(packJsonPath)) {
+            const packJson = util.readJsonAndReturnObject(packJsonPath);
+            packVersion = packJson.version;
+          }
+          destPath = path.join(destBase, packName, packVersion, componentJson.name);
+        }
+
+        fs.copySync(path.join(srcBase, componentPath, '..'), destPath);
+      });
+      return resolve(context);
+    });
+  },
 };

lib/buildCommon.js

@@ -103,7 +103,7 @@ function _runCordovaBuildTasks(context) {
     if (opts.buildForServe) {
       resolve(context);
     } else {
-      hookRunner('before_release_build', context)
+      hookRunner('before_hybrid_build', context)
       .then(_invokeCordovaPrepare)
       .then(_invokeCordovaCompile)
       .then(data => resolve(data))
@@ -119,6 +119,7 @@ function _runCommonBuildTasks(context) {
     .then(buildCommon.clean)
     .then(buildCommon.copy)
     .then(buildCommon.copyLibs)
+    .then(buildCommon.copyLocalCca)
     .then(buildCommon.spriteSvg)
     .then(buildCommon.sass)
     .then(buildCommon.injectCdnBundleScript)

lib/buildHybrid.js

@@ -29,6 +29,7 @@ function _runCommonBuildTasks(context) {
     .then(data => hookRunner('before_build', data))
     .then(buildCommon.copy)
     .then(buildCommon.copyLibs)
+    .then(buildCommon.copyLocalCca)
     .then(buildCommon.spriteSvg)
     .then(buildCommon.sass)
     .then(buildCommon.injectCdnBundleScript)

lib/buildWeb.js

@@ -73,7 +73,12 @@ config.getConfiguredPaths = (platform) => {
   const configuredPlatform = platform || config.data.platform;
   staging.stagingPath = (configuredPlatform === 'web') ? staging.web : path.join(staging.hybrid, 'www');
   src.platformSpecific = (configuredPlatform === 'web') ? src.web : src.hybrid;
-  return { src, staging };
+  return {
+    src,
+    staging,
+    components: `${CONSTANTS.JET_COMPONENTS_DIRECTORY}`,
+    composites: `${CONSTANTS.JET_COMPOSITE_DIRECTORY}`
+  };
 };
 
 function _readConfigJson() {

lib/config.js

@@ -9,7 +9,7 @@
 /**
  * ## Dependencies
  */
-const catalog = require('./scopes/catalog');
+const exchange = require('./scopes/exchange');
 const CONSTANTS = require('./constants');
 const util = require('./util');
 
@@ -22,12 +22,12 @@ const util = require('./util');
  */
 module.exports = function (scope, parameters) {
   switch (scope) {
-    case (CONSTANTS.API_SCOPES.CATALOG): {
-      const catalogUrl = CONSTANTS.CATALOG_URL_PARAM;
-      if (parameters && util.hasProperty(parameters, catalogUrl)) {
-        return catalog.configureCatalogUrl(parameters[catalogUrl]);
+    case (CONSTANTS.API_SCOPES.EXCHANGE): {
+      const exchangeUrl = CONSTANTS.EXCHANGE_URL_PARAM;
+      if (parameters && util.hasProperty(parameters, exchangeUrl)) {
+        return exchange.configureUrl(parameters[exchangeUrl]);
       }
-      util.log.error(`Please specify ojet.${CONSTANTS.API_TASKS.CONFIGURE}() '${catalogUrl}' parameter.`);
+      util.log.error(`Please specify ojet.${CONSTANTS.API_TASKS.CONFIGURE}() '${exchangeUrl}' parameter.`);
       return false;
     }
     default:

lib/configure.js

@@ -15,6 +15,8 @@ module.exports = {
   DEFAULT_BROWSER: 'chrome',
   COMMON_THEME_DIRECTORY: 'common',
   JET_COMPOSITE_DIRECTORY: 'jet-composites',
+  JET_COMPONENTS_DIRECTORY: 'jet_components',
+  JET_COMPONENT_JSON: 'component.json',
   SUPPORTED_PLATFORMS: ['android', 'ios', 'web', 'windows'],
   SUPPORTED_THEME_PLATFORMS: ['android', 'ios', 'web', 'windows', 'common'],
   SUPPORTED_HYBRID_PLATFORMS: ['android', 'ios', 'windows'],
@@ -51,8 +53,9 @@ module.exports = {
     SEARCH: 'search'
   },
   API_SCOPES: {
-    CATALOG: 'catalog',
-    COMPONENT: 'component'
+    EXCHANGE: 'exchange',
+    COMPONENT: 'component',
+    PACK: 'pack'
   },
-  CATALOG_URL_PARAM: 'catalog-url'
+  EXCHANGE_URL_PARAM: 'exchange-url'
 };

lib/constants.js

@@ -107,6 +107,7 @@ module.exports = {
             `!${paths.src.javascript}/libs/**/*debug*/**`,
             `!${paths.src.javascript}/main-release-paths.json`,
             `!${paths.staging.themes}/**`,
+            `!${paths.src.javascript}/${paths.composites}/**`,
             '!cordova.js'
           ],
           dest: paths.staging.stagingPath
@@ -116,6 +117,7 @@ module.exports = {
           cwd: paths.src.common,
           src: [
             '**',
+            `!${paths.src.javascript}/${paths.composites}/**`,
             `!${paths.src.javascript}/main-release-paths.json`,
             `!${paths.staging.themes}/**`,
           ],
@@ -137,7 +139,12 @@ module.exports = {
           cwd: `${paths.src.common}/${paths.src.themes}`,
           src: ['**', '!**/*.scss', '!**.map'],
           dest: paths.staging.themes
-        }
+        },
+        {
+          cwd: `${paths.components}`,
+          src: ['**'],
+          dest: `${paths.staging.stagingPath}/${paths.src.javascript}/${paths.composites}`
+        },
       ],
     }),
 
@@ -165,9 +172,14 @@ module.exports = {
           }
         },
         {
-          cwd: `${paths.src.common}/${paths.src.javascript}/jet-composites`,
+          cwd: `${paths.src.common}/${paths.src.javascript}/${paths.composites}`,
+          src: ['**/*.scss', '!**/_*.scss'],
+          dest: `${paths.staging.stagingPath}/${paths.src.javascript}/${paths.composites}`
+        },
+        {
+          cwd: `${paths.components}`,
           src: ['**/*.scss', '!**/_*.scss'],
-          dest: `${paths.staging.stagingPath}/${paths.src.javascript}/jet-composites`
+          dest: `${paths.staging.stagingPath}/${paths.src.javascript}/${paths.composites}`
         }
       ],
       options: {
@@ -245,7 +257,8 @@ module.exports = {
       sass: {
         files: [
           `${paths.src.common}/${paths.src.themes}/**/*`,
-          `${paths.src.common}/${paths.src.javascript}/jet-composites/**/*.scss`,
+          `${paths.components}/**/*.scss`,
+          `${paths.src.common}/${paths.src.javascript}/${paths.composites}/**/*.scss`,
         ],
         options: {
           livereload: true,

lib/defaultconfig.js

@@ -11,6 +11,7 @@
  */
 const component = require('./scopes/component');
 const CONSTANTS = require('./constants');
+const pack = require('./scopes/pack');
 const util = require('./util');
 
 /**
@@ -24,6 +25,8 @@ module.exports = function (scope) {
   switch (scope) {
     case (CONSTANTS.API_SCOPES.COMPONENT):
       return component.list();
+    case (CONSTANTS.API_SCOPES.PACK):
+      return pack.list();
     default:
       util.log.error(`Please specify ojet.${CONSTANTS.API_TASKS.LIST}() 'scope' parameter.`);
       return false;

lib/list.js

@@ -11,6 +11,7 @@
  */
 const component = require('./scopes/component');
 const CONSTANTS = require('./constants');
+const pack = require('./scopes/pack');
 const util = require('./util');
 
 /**
@@ -26,6 +27,8 @@ module.exports = function (scope, parameter, options) {
   switch (scope) {
     case (CONSTANTS.API_SCOPES.COMPONENT):
       return component.publish(parameter, options);
+    case (CONSTANTS.API_SCOPES.PACK):
+      return pack.publish(parameter, options);
     default:
       util.log.error(`Please specify ojet.${CONSTANTS.API_TASKS.PUBLISH}() 'scope' parameter.`);
       return false;

lib/publish.js

@@ -11,6 +11,7 @@
  */
 const component = require('./scopes/component');
 const CONSTANTS = require('./constants');
+const pack = require('./scopes/pack');
 const util = require('./util');
 
 /**
@@ -26,6 +27,8 @@ module.exports = function (scope, parameters, isStrip) {
   switch (scope) {
     case (CONSTANTS.API_SCOPES.COMPONENT):
       return component.remove(parameters, isStrip);
+    case (CONSTANTS.API_SCOPES.PACK):
+      return pack.remove(parameters);
     default:
       util.log.error(`Please specify ojet.${CONSTANTS.API_TASKS.REMOVE}() 'scope' parameter.`);
       return false;