Release 14.1.0

Author: benm071

README.md

@@ -1,4 +1,4 @@
-# @oracle/ojet-cli 14.0.0
+# @oracle/ojet-cli 14.1.0
 
 ## About the module
 This module contains a command line interface for Oracle JET web and hybrid mobile application development.
@@ -64,7 +64,7 @@ Or view help on adding a plugin:
 ojet help add plugin
 ```
 
-For more information on the Oracle JET CLI, refer to the [Oracle JET Developers Guide](http://www.oracle.com/pls/topic/lookup?ctx=jet1400&id=homepage).
+For more information on the Oracle JET CLI, refer to the [Oracle JET Developers Guide](http://www.oracle.com/pls/topic/lookup?ctx=jet1410&id=homepage).
 
 ## [Contributing](https://github.com/oracle/ojet-cli/blob/master/CONTRIBUTING.md)
 Oracle JET is an open source project.  Pull Requests are currently not being accepted. See [CONTRIBUTING](https://github.com/oracle/ojet-cli/blob/master/CONTRIBUTING.md) for details.

RELEASENOTES.md

@@ -1,6 +1,9 @@
 ## Release Notes for ojet-cli ##
 
+### 14.1.0
+
 ### 14.0.0
+
 * node-sass updated to 7.0.1
 * strict mode is now enabled by default in generated tsconfig.json files
 * oraclejet-serve.js and oraclejet-build.js are no longer read or processed.  Users should use other options in oraclejetconfig.json or the user hook system to set similar settings to what is found in oraclejet-serve.js and oraclejet-build.js.  The same configuration objects formerly found in oraclejet-serve.js and oraclejet-build.js can be found in the 'opts' section of the context object passed into the before_build and before_serve hooks.

common/component.js

@@ -40,7 +40,7 @@ module.exports = {
         utils.log.error('Cannot create a vcomponent in a Javascript application. Please run \'ojet add typescript\' to add Typescript support to your application.');
       }
       fs.ensureDirSync(componentDestDirectory);
-      fs.copySync(componentTemplateSrc, componentDestDirectory);
+      fs.copySync(componentTemplateSrc, componentDestDirectory, { dereference: true });
       // Rename loader.ts in destination directory to index.ts for loaderless
       // components--the contents are the same:
       if (_isVComponent(generator) && !_withLoader({ generator, pack })) {
@@ -68,14 +68,14 @@ module.exports = {
         fs.writeFileSync(path.join(componentDestDirectory, `index.${utils.isTypescriptApplication() ? 'ts' : 'js'}`), fileContent);
       } else {
         // Only copy theming files for none-resource components
-        fs.copySync(componentThemeTemplateSrc, componentDestDirectory);
+        fs.copySync(componentThemeTemplateSrc, componentDestDirectory, { dereference: true });
         // Copy theming template for composit components
         if (utils.validCustomProperties()) {
           const componentTemplateScssSrc = _getComponentThemeTemplatePath('pcss');
-          fs.copySync(componentTemplateScssSrc, componentDestDirectory);
+          fs.copySync(componentTemplateScssSrc, componentDestDirectory, { dereference: true });
         } else {
           const componentTemplateCssSrc = _getComponentThemeTemplatePath('css');
-          fs.copySync(componentTemplateCssSrc, componentDestDirectory);
+          fs.copySync(componentTemplateCssSrc, componentDestDirectory, { dereference: true });
         }
       }
       // replace tokens in template files and file names
@@ -400,6 +400,40 @@ function _renameComponentTemplatePrefixFile(componentDir, file, componentName) {
  * @param {string} pack name of JET pack that the component belongs to
  */
 function _updatePackInfo({ generator, pack }) {
+  if (_isMonoPack({ generator, pack })) {
+    /*
+      For mono-pack's components, three attributes ought to be
+      inherited during the build time. This can be done through
+      complete changing of the initial templates or deleting these
+      attributes. In this condition, the latter is used.
+
+      Refer to JET-55654 and JET-55655 for more info.
+    */
+    if (_isVComponent(generator)) {
+      const vComponentPath = path.join(
+        _getComponentDestPath(generator),
+        `${_getComponentName(generator)}.tsx`
+      );
+      let vComponentContent = fs.readFileSync(vComponentPath, 'utf-8');
+      let packRegex = new RegExp('@ojmetadata pack "@pack-name@"');
+      vComponentContent = vComponentContent.replace(packRegex, '');
+
+      packRegex = new RegExp('@ojmetadata version "1.0.0"');
+      vComponentContent = vComponentContent.replace(packRegex, '');
+
+      fs.outputFileSync(vComponentPath, vComponentContent);
+    } else {
+      const componentJsonPath = path.join(
+        _getComponentDestPath(generator),
+        constants.COMPONENT_JSON
+      );
+      const componentJson = fs.readJSONSync(componentJsonPath);
+      delete componentJson.version;
+      delete componentJson.jetVersion;
+      fs.writeJSONSync(componentJsonPath, componentJson, { spaces: 2 });
+    }
+    _addComponentToPackContents({ generator, pack });
+  }
   // set pack of component
   if (_isVComponent(generator)) {
     _setVComponentPack({ generator, pack });
@@ -408,10 +442,6 @@ function _updatePackInfo({ generator, pack }) {
   }
   // add component to dependencies of pack
   _addComponentToPackDependencies({ generator, pack });
-  // add component to contents if pack is mono-pack:
-  if (_isMonoPack({ generator, pack })) {
-    _addComponentToPackContents({ generator, pack });
-  }
 }
 
 /**

common/index.js

@@ -59,7 +59,7 @@ module.exports =
       return true;
     }
     try {
-      fs.copySync(templateSrc, templateDest, { filter });
+      fs.copySync(templateSrc, templateDest, { dereference: true, filter });
       return Promise.resolve();
     } catch (error) {
       return Promise.reject(error);
@@ -162,9 +162,7 @@ module.exports =
     if (generator.options.webpack) {
       return app.addwebpack(generator.options)
         .then(() => {
-          if (utils.isVDOMTemplate(generator)) {
-            _customizeVDOMTemplateForWebpack();
-          }
+          _customizeAppTemplateForWebpack(generator);
         });
     }
     return Promise.resolve();
@@ -223,9 +221,7 @@ function _customizeVDOMTemplateTsconfigForWebpack() {
   const oraclejetConfigJson = fs.readJSONSync(pathToOraclejetConfigJson);
   const pathToTsconfigJson = path.join(pathToApp, 'tsconfig.json');
   const tsconfigJson = fs.readJSONSync(pathToTsconfigJson);
-  const toolingUtil = utils.loadToolingUtil();
-  const preactPath = toolingUtil.getModulePath('./node_modules/preact', 'preact');
-  const preactCompat = path.join(preactPath, 'compat', 'src', 'index.d.ts');
+  const preactCompat = path.join('node_modules', 'preact', 'compat', 'src', 'index.d.ts');
 
   tsconfigJson.compilerOptions.rootDir = `./${oraclejetConfigJson.paths.source.common}`;
   tsconfigJson.compilerOptions.outDir = `./${oraclejetConfigJson.paths.staging.web}`;
@@ -235,15 +231,15 @@ function _customizeVDOMTemplateTsconfigForWebpack() {
   tsconfigJson.compilerOptions.removeComments = true;
   tsconfigJson.compilerOptions.strict = true;
   tsconfigJson.compilerOptions.paths.react = [
-    preactCompat
+    `./${preactCompat}`
   ];
   tsconfigJson.compilerOptions.paths['react-dom'] = [
-    preactCompat
+    `./${preactCompat}`
   ];
   fs.writeJSONSync(pathToTsconfigJson, tsconfigJson, { spaces: 2 });
 }
 
-function _customizeVDOMTemplateForWebpack() {
+function _customizeAppTemplateForWebpack(generator) {
   const pathToApp = '.';
   const pathToOraclejetConfigJson = path.join(pathToApp, 'oraclejetconfig.json');
   const oraclejetConfigJson = fs.readJSONSync(pathToOraclejetConfigJson);
@@ -254,8 +250,17 @@ function _customizeVDOMTemplateForWebpack() {
     'index.html'
   );
   let indexHtmlContent = fs.readFileSync(pathToIndexHtml, { encoding: 'utf-8' }).toString();
-  indexHtmlContent = indexHtmlContent.replace(/<!-- .* -->/gm, '').replace(/^\s*\n/gm, '');
-  indexHtmlContent = indexHtmlContent.replace(/(<meta name="description".* \/>)/, '$1\n    <!-- css:redwood -->');
+  indexHtmlContent = indexHtmlContent.replace(
+    /<link\s*rel="stylesheet"\s*href="css\/app.css"\s*type="text\/css"\s*\/>/gm,
+    ''
+  );
+  indexHtmlContent = indexHtmlContent.replace(
+    /<link\s*rel="stylesheet"\s*href="styles\/app.css"\s*type="text\/css"\s*\/>/gm,
+    ''
+  );
+  indexHtmlContent = indexHtmlContent.replace(/<!-- .* -->/gm, '');
+  indexHtmlContent = indexHtmlContent.replace(/(<meta name="description".* \/>)/, '$1\n    <!-- css:redwood | stable | custom theme -->');
+  indexHtmlContent = indexHtmlContent.replaceAll(/^\s*\n/gm, '');
   fs.outputFileSync(pathToIndexHtml, indexHtmlContent);
   // Delete ./src/main.js since webpack entry point is index.ts
   const pathToMainJs = path.join(
@@ -271,23 +276,25 @@ function _customizeVDOMTemplateForWebpack() {
   // Delete ./path_mapping.json since not used by webpack build
   const pathToPathMappingJson = path.join(pathToApp, 'path_mapping.json');
   fs.removeSync(pathToPathMappingJson);
-  // Replace ./.gitignore and replace
-  const pathToGitIgnore = path.join(pathToApp, '.gitignore');
-  const gitIgnoreContent =
-  `/node_modules
-/${oraclejetConfigJson.paths.source.exchangeComponents}
-/${oraclejetConfigJson.paths.staging.web}
-.DS_Store`.trim();
-  fs.outputFileSync(pathToGitIgnore, gitIgnoreContent);
-  // Inject ./types/components/index.ts
-  const pathToComponentTypes = path.join(pathToApp, 'types/components/index.d.ts');
-  const componentTypesContent = `
-  // Add custom element entries to preact.JSX.IntrinsicElements for custom elements
-  // used in JSX that do not have the required type definitions
-  declare namespace preact.JSX {
-    interface IntrinsicElements {
+  if (utils.isVDOMTemplate(generator)) {
+    // Replace ./.gitignore and replace
+    const pathToGitIgnore = path.join(pathToApp, '.gitignore');
+    const gitIgnoreContent =
+      `/node_modules
+      /${oraclejetConfigJson.paths.source.exchangeComponents}
+      /${oraclejetConfigJson.paths.staging.web}
+      .DS_Store`.trim();
+    fs.outputFileSync(pathToGitIgnore, gitIgnoreContent);
+    // Inject ./types/components/index.ts
+    const pathToComponentTypes = path.join(pathToApp, 'types/components/index.d.ts');
+    const componentTypesContent = `
+      // Add custom element entries to preact.JSX.IntrinsicElements for custom elements
+      // used in JSX that do not have the required type definitions
+      declare namespace preact.JSX {
+      interface IntrinsicElements {
 
-    }
-  }`;
-  fs.outputFileSync(pathToComponentTypes, componentTypesContent);
+      }
+    }`;
+    fs.outputFileSync(pathToComponentTypes, componentTypesContent);
+  }
 }

common/template/common.js

@@ -38,7 +38,8 @@ function _injectTemplateFiles({ generator, namespace }) {
   function _copyFile(file) {
     fs.copySync(
       file,
-      _getPathToFileDest(file)
+      _getPathToFileDest(file),
+      { dereference: true }
     );
   }
   const filesToCopy = utils

common/template/local.js

@@ -29,7 +29,7 @@ function _copyLocalTemplate(templatePath, destination) {
   try {
     if (fs.statSync(templatePath).isDirectory()) {
       const newTemplateFormat = fs.existsSync(path.join(templatePath, 'src'));
-      fs.copySync(templatePath, newTemplateFormat ? path.join(destination, '..') : destination);
+      fs.copySync(templatePath, newTemplateFormat ? path.join(destination, '..') : destination, { dereference: true });
     } else if (path.extname(templatePath) === '.zip') {
       commonTemplateHandler._handleZippedTemplateArchive(templatePath, destination);
     } else {

common/template/npm.js

@@ -115,7 +115,7 @@ function _copyNpmTemplate(generator, templateSpec, destination) {
     } else {
       // copy to /src
       filePathDest = path.join(destination, '..', filePathFromTemplateRoot);
-      fs.copySync(filePath, filePathDest);
+      fs.copySync(filePath, filePathDest, { dereference: true });
     }
   });
 }

common/template/url.js

@@ -32,6 +32,6 @@ function _processFetchedTemplateZip(fetchedTemplate, temp, destination) {
 
   commonTemplateHandler._handleZippedTemplateArchive(fetchedTemplate, destination);
 
-  fs.copySync(temp, destination);
+  fs.copySync(temp, destination, { dereference: true });
   fs.removeSync(temp);
 }

generators/add-pcss-theme/index.js

@@ -117,7 +117,7 @@ function _copyCssSettingsFile(addTheme, destPath, setTechnology) {
   path.join(JET_PCSS_SRC_PATH, _getJETVersion(), ALL_COMP_RW_PATH, whichTheme, srcSettings);
   const destSettingsFileName = _setSettingsFileByTech(setTechnology);
   const destSettingsPath = path.join(destPath, constants.DEFAULT_PCSS_THEME, destSettingsFileName);
-  fs.copySync(srcPath, destSettingsPath);
+  fs.copySync(srcPath, destSettingsPath, { dereference: true });
   _injectDefaultValues(whichTheme, destSettingsPath, setTechnology);
 }
 
@@ -189,7 +189,7 @@ function _addPcssTheme(addTheme) {
 
   try {
     // Copy pcss theme template to project folder under src
-    fs.copySync(source, themeDestPath);
+    fs.copySync(source, themeDestPath, { dereference: true });
     // Copy sass settings file
     _copyCssSettingsFile(addTheme, themeDestPath, 'sass');
     // Copy css vars settings file

generators/add-theme/index.js

@@ -66,7 +66,7 @@ function _addSassTheme(addTheme) {
 
   try {
     // first copy over templates
-    fs.copySync(source, themeDestPath);
+    fs.copySync(source, themeDestPath, { dereference: true });
     _copySettingsFilesFromJETSrc(themeName, themeDestPath);
     _renameFilesAllPlatforms(themeName, themeDestPath);
     return Promise.resolve(addTheme);
@@ -145,7 +145,7 @@ function _copySettingsFilesFromJETSrc(themeName, dest) {
     const destSettingFileName = _getDestSettingFileName(DEFAULT_THEME, platform);
     const destPath = path.join(dest, platform, destSettingFileName);
 
-    fs.copySync(srcPath, destPath);
+    fs.copySync(srcPath, destPath, { dereference: true });
     _injectDefaultValues(destPath);
   });
 

generators/app/templates/common/package.json

@@ -3,15 +3,15 @@
   "version": "1.0.0",
   "description": "An Oracle JavaScript Extension Toolkit(JET) web app",
   "dependencies": {
-    "@oracle/oraclejet": "~14.0.0",
-    "@oracle/oraclejet-core-pack": "~14.0.0"
+    "@oracle/oraclejet": "~14.1.0",
+    "@oracle/oraclejet-core-pack": "~14.1.0"
   },
   "devDependencies": {
     "extract-zip": "^1.7.0",
     "fs-extra": "^8.1.0",
     "glob": "7.2.0",
     "underscore": "^1.10.2",
-    "@oracle/ojet-cli": "~14.0.0"
+    "@oracle/ojet-cli": "~14.1.0"
   },
   "engines": {
     "node": ">=12.21.0"

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": "~14.0.0",
-    "@oracle/oraclejet-core-pack": "~14.0.0"
+    "@oracle/oraclejet": "~14.1.0",
+    "@oracle/oraclejet-core-pack": "~14.1.0"
   },
   "devDependencies": {
     "fs-extra": "^8.1.0",
     "glob": "7.2.0",
     "underscore": "^1.10.2",
-    "@oracle/ojet-cli": "~14.0.0"
+    "@oracle/ojet-cli": "~14.1.0"
   },
   "engines": {
     "node": ">=12.21.0"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oracle/ojet-cli",
-  "version": "14.0.0",
+  "version": "14.1.0",
   "description": "Oracle JET Command Line Interface",
   "license": "UPL-1.0",
   "homepage": "http://www.oracle.com/jet",
@@ -15,8 +15,8 @@
     "inquirer": "~8.2.2",
     "minimist": "~1.2.0",
     "@xmldom/xmldom": "0.8.6",
-    "@oracle/oraclejet-tooling": "~14.0.0",
-    "@oracle/oraclejet-templates": "~14.0.0"
+    "@oracle/oraclejet-tooling": "~14.1.0",
+    "@oracle/oraclejet-templates": "~14.1.0"
   },
   "engines": {
     "node": ">=12.21.0"

template/component/js/component.json

@@ -1,7 +1,7 @@
 {
   "name": "@component-name@",
   "version": "1.0.0",
-  "jetVersion": "^14.0.0",
+  "jetVersion": "^14.1.0",
   "displayName": "A user friendly, translatable name of the component.",
   "description": "A translatable high-level description for the component.",
   "properties": {

template/component/ts/component.json

@@ -1,7 +1,7 @@
 {
   "name": "@component-name@",
   "version": "1.0.0",
-  "jetVersion": "^14.0.0",
+  "jetVersion": "^14.1.0",
   "displayName": "A user friendly, translatable name of the component.",
   "description": "A translatable high-level description for the component.",
   "properties": {

template/component/tsx/loader.ts

@@ -3,7 +3,7 @@ export { @camelcasecomponent-name@ } from "./@component-name@";
 declare global {
 namespace preact.JSX {
       interface IntrinsicElements {
-      ['@camelcasecomponent-name@']: any;
+      '@full-component-name@': any;
       }
     }
   }

template/resource-component/component.json

@@ -2,7 +2,7 @@
     "name": "@component-name@",
     "type": "resource",
     "version": "1.0.0",
-    "jetVersion": "^14.0.0",
+    "jetVersion": "^14.1.0",
     "displayName": "A user friendly, translatable name of the component.",
     "description": "A translatable high-level description for the component.",
     "publicModules": [