Release 5.0.0

Author: benm071

README.md

@@ -1,4 +1,4 @@
-# @oracle/generator-oraclejet 4.2.0
+# @oracle/generator-oraclejet 5.0.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. 

RELEASENOTES.md

@@ -1,5 +1,8 @@
 ## Release Notes for generator-oraclejet ##
 
+### 5.0.0
+* No changes
+
 ### 4.2.0
 * No changes
 

common/component.js

@@ -37,6 +37,8 @@ module.exports =
         }
         fs.ensureDirSync(destDirectory);
         fs.copySync(templateSrc, destDirectory);
+
+        _renamePrefix(generator);
         _replaceComponentTemplateToken(generator);
       }
 
@@ -46,7 +48,20 @@ module.exports =
 };
 
 function _replaceComponentTemplateToken(generator) {
-  const componentName = generator.componentName || generator.options.component;
+  const componentName = _getComponentName(generator);
+
+  const base = _getBasePath(generator);
+
+  fs.readdirSync(base).forEach((file) => {
+    if (path.extname(file).length !== 0) {
+      const fileContent = fs.readFileSync(path.join(base, file), 'utf-8');
+      fs.outputFileSync(path.join(base, file), fileContent.replace(new RegExp('@component@', 'g'), componentName));
+    }
+  });
+}
+
+function _getBasePath(generator) {
+  const componentName = _getComponentName(generator);
 
   const appDir = generator.appDir === undefined
     ? process.cwd() : generator.destinationPath(generator.appDir);
@@ -57,8 +72,32 @@ function _replaceComponentTemplateToken(generator) {
   const base = path.join(appDir, _configPaths.source,
     _configPaths.sourceJavascript, CONSTANTS.JET_COMPOSITES, componentName);
 
-  CONSTANTS.COMPONENT_FILES.forEach((file) => {
-    const fileContent = fs.readFileSync(path.join(base, file), 'utf-8');
-    fs.outputFileSync(path.join(base, file), fileContent.replace(new RegExp('@component@', 'g'), componentName));
+  return base;
+}
+
+function _getComponentName(generator) {
+  return generator.componentName || generator.options.component;
+}
+
+function _renamePrefix(generator) {
+  let base = _getBasePath(generator);
+  const componentName = _getComponentName(generator);
+  fs.readdirSync(base).forEach((file) => {
+    if (/@component@/.test(file)) _renamePrefixFile(generator, base, file, componentName);
   });
+
+  base = path.join(base, 'resources/nls');
+  if (fs.existsSync(base)) {
+    fs.readdirSync(base).forEach((file) => {
+      if (/@component@/.test(file)) _renamePrefixFile(generator, base, file, componentName);
+    });
+  }
+}
+
+// replace prefix to include the component name
+function _renamePrefixFile(generator, fileDir, file, componentName) {
+  const oldPath = path.join(fileDir, file);
+  let newPath = file.replace('@component@', componentName);
+  newPath = path.join(fileDir, newPath);
+  fs.renameSync(oldPath, newPath);
 }

common/messages.js

@@ -28,14 +28,14 @@ module.exports =
 };
 
 function _getScaffoldComplete() {
-  return _appendSuccessPrefix('Your app structure is generated. Continuing with library install...');
+  return _appendSuccessPrefix('Your app structure is generated. Continuing with library install.');
 }
 
 function _getRestoreComplete(invokedByRestore, appDir) {
   if (invokedByRestore) {
-    return _appendSuccessPrefix('Your app restore finished successfully...');
+    return _appendSuccessPrefix('\x1b[32mYour app restore finished successfully.\x1b[0m');
   }
-  return _appendSuccessPrefix(`Your app is ready! Change to your new app directory ${appDir} and try ojet build and serve...`);
+  return _appendSuccessPrefix(`\x1b[32mYour app is ready! Change to your new app directory '${appDir}' and try 'ojet build' and 'ojet serve'.\x1b[0m`);
 }
 
 function _getPrefixError(error) {
@@ -60,9 +60,9 @@ function _getError(error, task) {
 }
 
 function _appendSuccessPrefix(message) {
-  return `Oracle JET: ${message}`;
+  return `${message}`;
 }
 
 function _appendErrorPrefix(message) {
-  return `Oracle JET Error: ${message}`;
+  return `${message}`;
 }

common/restore.js

@@ -21,20 +21,20 @@ module.exports =
     const configPath = path.resolve(destinationRoot, ORACLE_JET_CONFIG_FILE);
 
     return new Promise((resolve) => {
-      generator.log('Writing ', ORACLE_JET_CONFIG_FILE);
+      generator.log('Writing:', ORACLE_JET_CONFIG_FILE);
 
     // need to place the oracletjetconfig.json at origDestRoot
 
       fs.stat(configPath, (err) => {
         const generatorVersion = _getOracleJetGeneratorVersion(generator);
         if (err) {
-          generator.log(`${commonMessages.appendJETPrefix()}No config file...writing the default config...`);
+          generator.log(`${commonMessages.appendJETPrefix()}No config file. Writing the default config.`);
           fs.writeJSONSync(configPath, { generatorVersion });
         } else {
           const configJson = fs.readJSONSync(configPath);
           configJson.generatorVersion = generatorVersion;
           fs.writeJSONSync(configPath, configJson);
-          generator.log(`${commonMessages.appendJETPrefix() + ORACLE_JET_CONFIG_FILE} file exists...checking config...`);
+          generator.log(`${commonMessages.appendJETPrefix() + ORACLE_JET_CONFIG_FILE} file exists. Checking config.`);
         }
         resolve(context);
       });
@@ -44,7 +44,7 @@ module.exports =
   npmInstall: function _npmInstall(context) {
     return new Promise((resolve, reject) => {
       Promise.all([
-        common.gruntSpawnCommandPromise(context, 'npm', ['install'], 'Invoking npm install')
+        common.gruntSpawnCommandPromise(context, 'npm', ['install'], 'Invoking npm install.')
       ])
         .then(() => {
           // rejection will be handled by each promise which will

common/template/index.js

@@ -17,7 +17,7 @@ const _WEB = 'web';
 
 const BLANK_TEMPLATE = blankTemplate.BLANK_TEMPLATE;
 
-const _TEMPLATES_NPM_URL = '@oracle/oraclejet-templates@~4.2.0';
+const _TEMPLATES_NPM_URL = '@oracle/oraclejet-templates@~5.0.0';
 
 const _TEMPLATES = [BLANK_TEMPLATE, 'basic', 'navbar', 'navdrawer'];
 
@@ -26,7 +26,7 @@ module.exports =
 {
   handleTemplate: function _handleTemplate(generator, templateDestDirectory) {
     const template = generator.options.template || BLANK_TEMPLATE;
-    generator.log('Processing template...', template);
+    generator.log('Processing template:', template);
     const templateHandler = _getHandler(generator, template, templateDestDirectory);
     return commonTemplate.handle(templateHandler);
   }

common/test.js

@@ -30,11 +30,13 @@ module.exports =
           path.join(appDir, _configPaths.source, _configPaths.sourceTests));
 
         // avoid overwrite test
-        if (fs.existsSync(destDirectory)) resolve(generator);
-
-        fs.ensureDirSync(destDirectory);
-        fs.copySync(templateSrc, destDirectory);
-        _replaceTestHTMLToken(generator);
+        if (fs.existsSync(destDirectory)) {
+          resolve(generator);
+        } else {
+          fs.ensureDirSync(destDirectory);
+          fs.copySync(templateSrc, destDirectory);
+          _replaceTestHTMLToken(generator);
+        }
       }
       return resolve(generator);
     });

generators/add-component/index.js

@@ -64,9 +64,9 @@ const OracleJetAddComponentGenerator = generators.Base.extend(
       if (!isApp) {
         this.composeWith('@oracle/oraclejet:app', { options: this.options });
       } else {
-        console.log(commonMessages.appendJETPrefix(`add component ${this.componentName} finished.`));
+        console.log(commonMessages.appendJETPrefix(`Add component ${this.componentName} finished.`));
       }
-      if (isApp) process.exit(1);
+      if (isApp) process.exit(0);
     }
 
   });
@@ -77,6 +77,6 @@ function _validateComponentName(generator) {
   const name = generator.componentName;
   if (name !== name.toLowerCase() || name.indexOf('-') < 0 || !/^[a-z]/.test(name)) {
     const message = 'Invalid component name. Must be all lowercase letters and contain at least one hyphen.';
-    throw `\x1b[31m${new Error(message)}\x1b[0m`; //eslint-disable-line
+    generator.env.error(`\x1b[31m${new Error(message)}\x1b[0m`); //eslint-disable-line
   }
 }

generators/add-sass/index.js

@@ -45,7 +45,7 @@ const OracleJetAddSassGenerator = generators.Base.extend(
 
     end: function() { //eslint-disable-line
       console.log(commonMessages.appendJETPrefix('add-sass finished.'));
-      process.exit(1);
+      process.exit(0);
     }
 
   });
@@ -55,7 +55,7 @@ module.exports = OracleJetAddSassGenerator;
 
 function _npmInstallNodeSass(generator) {
   try {
-    generator.npmInstall(['node-sass@4.5.3'], { saveDev: true });
+    generator.npmInstall(['node-sass@4.7.2'], { saveDev: true });
     return Promise.resolve(generator);
   } catch (err) {
     return Promise.reject(commonMessages.error(err, 'install node-sass'));

generators/add-theme/index.js

@@ -64,7 +64,7 @@ const OracleJetAddThemeGenerator = generators.Base.extend(
 
     end: function () {  //eslint-disable-line
       this.log(commonMessages.appendJETPrefix(`${this.themeName} theme added.`));
-      process.exit(1);
+      process.exit(0);
     }
 
   });