Release 6.0.0

Author: benm071

README.md

@@ -1,12 +1,12 @@
-# @oracle/oraclejet-tooling 5.2.0
+# @oracle/oraclejet-tooling 6.0.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=jet520&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=jet600&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,44 +1,46 @@
-## Release Notes for oraclejet-tooling ##
-
-### 5.2.0
-* No changes
-
-### 5.1.0
-* No changes
-
-### 5.0.0
-* No changes
-
-### 4.2.0
-* No changes
-
-### 4.1.0
-* No changes
-
-### 4.0.0
-* Moved module into @oracle scope, changing the name to @oracle/oraclejet-tooling
-
-### 3.2.0
-* No changes
-
-### 3.1.0
-* No changes
-
-### 3.0.0
-* Replaced bower with npm
-* SASS tasks now run in CCA directories also
-* Added --destination=server-only option for web apps
-* Removed --destination=deviceOrEmulatorName option
-* Added ability to cutomize serve tasks such as watching additional files
-* Added gap://ready to inserted CSP meta tag for iOS 10 compatibility
-
-### 2.3.0
-* No changes
-
-### 2.2.0
-* Allow developers to configure release paths
-* Provide help page for tooling tasks
-* 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
+## Release Notes for oraclejet-tooling ##
+
+### 6.0.0
+* No changes
+
+### 5.2.0
+* No changes
+
+### 5.1.0
+* No changes
+
+### 5.0.0
+* No changes
+
+### 4.2.0
+* No changes
+
+### 4.1.0
+* No changes
+
+### 4.0.0
+* Moved module into @oracle scope, changing the name to @oracle/oraclejet-tooling
+
+### 3.2.0
+* No changes
+
+### 3.1.0
+* No changes
+
+### 3.0.0
+* Replaced bower with npm
+* SASS tasks now run in CCA directories also
+* Added --destination=server-only option for web apps
+* Removed --destination=deviceOrEmulatorName option
+* Added ability to cutomize serve tasks such as watching additional files
+* Added gap://ready to inserted CSP meta tag for iOS 10 compatibility
+
+### 2.3.0
+* No changes
+
+### 2.2.0
+* Allow developers to configure release paths
+* Provide help page for tooling tasks
+* Allow multiple themes to be included in a built app
+* Grunt serve to specific iOS emulator fails
+* no-build option missing from grunt serve

lib/build.js

@@ -6,6 +6,7 @@
 
 const buildWeb = require('./buildWeb');
 const buildHybrid = require('./buildHybrid');
+const buildComponent = require('./buildComponent');
 const valid = require('./validations');
 const config = require('./config');
 /**
@@ -31,6 +32,10 @@ const config = require('./config');
 * @returns {Promise}
 */
 module.exports = function build(platform, options) {
+  if (Object.prototype.hasOwnProperty.call(options, 'component')) {
+    config.loadOraclejetConfig('web');
+    return buildComponent(options.component);
+  }
   config.loadOraclejetConfig(platform);
   const validPlatform = valid.platform(platform);
   const validOptions = valid.buildOptions(options, validPlatform);

lib/buildCommon.js

@@ -453,4 +453,30 @@ module.exports = {
       return resolve(context);
     });
   },
+  copyReferenceCca(context) {
+    return new Promise((resolve) => {
+      util.log('Copy reference components to staging directory.');
+      const componentList = util.getDirectories(`./${CONSTANTS.JET_COMPONENTS_DIRECTORY}`);
+      componentList.forEach((component) => {
+        const componentDirPath = `./${CONSTANTS.JET_COMPONENTS_DIRECTORY}/${component}/${CONSTANTS.JET_COMPONENT_JSON}`;
+        const componentJson = util.readJsonAndReturnObject(`${componentDirPath}`);
+        if (componentJson.type === 'reference') {
+          const npmPckgName = componentJson.package;
+          const npmPckgInitFileRelativePath = componentJson.paths.npm[context.buildType === 'release' ? 'min' : 'debug'];
+
+          // Get only the file name
+          const npmPckgInitFileNameArray = npmPckgInitFileRelativePath.split('/');
+          const npmPckgInitFileName = npmPckgInitFileNameArray[npmPckgInitFileNameArray.length - 1];
+
+          // Copy
+          const npmPckgSrcPath = `./${CONSTANTS.NODE_MODULES_DIRECTORY}/${npmPckgName}/${npmPckgInitFileRelativePath}`;
+          const destBasePath = path.join(config('paths').staging.stagingPath, config('paths').src.javascript, 'libs');
+          const destNpmpckgDirPath = `${destBasePath}/${npmPckgName}/${npmPckgInitFileName}`;
+          fs.copySync(npmPckgSrcPath, destNpmpckgDirPath);
+        }
+      });
+      util.log('Copy finished.');
+      resolve(context);
+    });
+  }
 };

lib/buildComponent.js

@@ -0,0 +1,84 @@
+/**
+  Copyright (c) 2015, 2018, Oracle and/or its affiliates.
+  The Universal Permissive License (UPL), Version 1.0
+*/
+'use strict';
+
+const UglifyJS = require('uglify-es');
+const config = require('./config');
+const path = require('path');
+const util = require('./util');
+const fs = require('fs-extra');
+const glob = require('glob');
+const defaultOption = require('./defaultconfig');
+
+function _uglifyComponent(componentPath) {
+  return new Promise((resolve, reject) => {
+    try {
+      const destPath = _getComponentDest(componentPath);
+      const files = glob.sync('**/*.js', { cwd: destPath });
+      const uglifyOptions = defaultOption.build.uglify(config('paths')).options;
+      files.forEach((file) => {
+        const dest = path.join(destPath, file);
+        const data = _getUglyCode(dest, uglifyOptions);
+        if (data.error) reject(data.error);
+        fs.writeFileSync(dest, data.code);
+      });
+      resolve();
+    } catch (error) {
+      reject(error);
+    }
+  });
+}
+
+function _getComponentDest(componentPath) {
+  return path.join(componentPath, 'min');
+}
+
+function _getUglyCode(file, uglifyOptions) {
+  const code = fs.readFileSync(file, 'utf-8');
+  return UglifyJS.minify(code, uglifyOptions);
+}
+
+function _copyScriptsToDest(componentPath) {
+  const destPath = _getComponentDest(componentPath);
+  fs.removeSync(destPath);
+  // avoid recursively copy the min directory
+  const filter = function (src) {
+    return !/min/.test(src);
+  };
+
+  fs.copySync(componentPath, destPath, { filter });
+}
+
+function _getComponentPath(component) {
+  const basePath = path.join(config('paths').src.common,
+    config('paths').src.javascript, config('paths').composites);
+  const componentPath = path.join(basePath, component);
+  if (!util.fsExistsSync(componentPath)) {
+    util.log.error(`The component ${component} is not found`);
+  }
+  return componentPath;
+}
+
+function _copyToStaging(component) {
+  const componentPath = _getComponentPath(component);
+  const destPath = path.join(config('paths').staging.web,
+    config('paths').src.javascript, config('paths').composites, component);
+  console.log(destPath);
+  fs.copySync(componentPath, destPath);
+}
+
+module.exports = function buildComponent(component) {
+  return new Promise((resolve, reject) => {
+    const componentPath = _getComponentPath(component);
+    _copyScriptsToDest(componentPath);
+    _uglifyComponent(componentPath)
+      .then(() => {
+        _copyToStaging(component);
+        util.log(`Component ${component} build is finished.`);
+        resolve();
+      })
+      .catch(err => reject(err));
+  });
+};

lib/buildHybrid.js

@@ -119,6 +119,7 @@ function _runCommonBuildTasks(context) {
     .then(buildCommon.clean)
     .then(buildCommon.copy)
     .then(buildCommon.copyLibs)
+    .then(buildCommon.copyReferenceCca)
     .then(buildCommon.copyLocalCca)
     .then(buildCommon.spriteSvg)
     .then(buildCommon.sass)

lib/buildWeb.js

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

lib/constants.js

@@ -16,11 +16,12 @@ module.exports = {
   COMMON_THEME_DIRECTORY: 'common',
   JET_COMPOSITE_DIRECTORY: 'jet-composites',
   JET_COMPONENTS_DIRECTORY: 'jet_components',
+  NODE_MODULES_DIRECTORY: 'node_modules',
   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'],
-  SUPPORTED_BROWSERS: ['chrome', 'firefox', 'edge', 'ie', 'opera', 'safari'],
+  SUPPORTED_BROWSERS: ['chrome', 'firefox', 'edge', 'ie', 'safari'],
   SUPPORTED_WEB_PLATFORMS: ['web'],
 
   CORDOVA_CONFIG_XML: 'config.xml',
@@ -47,6 +48,7 @@ module.exports = {
   API_TASKS: {
     ADD: 'add',
     CONFIGURE: 'configure',
+    CREATE: 'create',
     LIST: 'list',
     PUBLISH: 'publish',
     REMOVE: 'remove',

lib/create.js

@@ -0,0 +1,32 @@
+#! /usr/bin/env node
+/**
+  Copyright (c) 2015, 2018, Oracle and/or its affiliates.
+  The Universal Permissive License (UPL), Version 1.0
+*/
+
+'use strict';
+
+/**
+ * ## Dependencies
+ */
+const CONSTANTS = require('./constants');
+const pack = require('./scopes/pack');
+const util = require('./util');
+
+/**
+ * # Switch for 'ojet.create()'
+ *
+ * @public
+ * @param {string} scope
+ * @param {string} parameter
+ * @returns {Promise}
+ */
+module.exports = function (scope, parameter) {
+  switch (scope) {
+    case (CONSTANTS.API_SCOPES.PACK):
+      return pack.create(parameter);
+    default:
+      util.log.error(`Please specify ojet.${CONSTANTS.API_TASKS.CREATE}() 'scope' parameter.`);
+      return false;
+  }
+};