Release 14.1.0

Author: benm071

README.md

@@ -1,12 +1,12 @@
-# @oracle/oraclejet-tooling 14.0.0
+# @oracle/oraclejet-tooling 14.1.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=jet1400&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=jet1410&id=homepage).
 
 ## [Contributing](https://github.com/oracle/oraclejet-tooling/blob/master/CONTRIBUTING.md)
 Oracle JET is an open source project.  Pull Requests are currently not being accepted. See 

RELEASENOTES.md

@@ -1,6 +1,6 @@
 ## Release Notes for oraclejet-tooling ##
 
-### 14.0.0
+### 14.1.0
 
 ### 11.0.0
 * oraclejet-tooling now requires node 12.21 or later

lib/buildCommon.js

@@ -36,9 +36,9 @@ function _copyFileToStaging(fileList) {
       const destDir = fileList[i].dest;
       const srcDir = fileList[i].src;
       if (_isSvgFile(srcDir)) {
-        fs.copySync(srcDir, destDir, { overwrite: false, errorOnExist: false });
+        fs.copySync(srcDir, destDir, { overwrite: false, errorOnExist: false, dereference: true });
       } else {
-        fs.copySync(srcDir, destDir, { overwrite: true });
+        fs.copySync(srcDir, destDir, { overwrite: true, dereference: true });
       }
     }
     return Promise.resolve();
@@ -94,7 +94,7 @@ function _copyThemeCommonToStaging(theme, stagingPath) {
         resolve();
       } else {
         try {
-          fs.copySync(src, dest);
+          fs.copySync(src, dest, { dereference: true });
           resolve();
         } catch (error) {
           reject(error);
@@ -117,10 +117,10 @@ function _copyDefaultResourcesToStaging(theme, stagingPath, themeName) {
   if (config('defaultTheme') === CONSTANTS.DEFAULT_THEME && themeName !== CONSTANTS.DEFAULT_PCSS_THEME && themeName !== CONSTANTS.DEFAULT_STABLE_THEME) {
     const commonSrc = path.join(srcBase, CONSTANTS.COMMON_THEME_DIRECTORY);
     const commonDest = path.join(destBase, CONSTANTS.COMMON_THEME_DIRECTORY);
-    fs.copySync(commonSrc, commonDest);
+    fs.copySync(commonSrc, commonDest, { dereference: true });
   }
-  fs.copySync(defaultFontsSrc, defaultFontsDest);
-  fs.copySync(defaultImagesSrc, defaultImagesDest);
+  fs.copySync(defaultFontsSrc, defaultFontsDest, { dereference: true });
+  fs.copySync(defaultImagesSrc, defaultImagesDest, { dereference: true });
 }
 
 function _copyExchangeComponentsToStaging({ context, componentsSource }) {
@@ -148,7 +148,7 @@ function _copyExchangeComponentsToStaging({ context, componentsSource }) {
               root: context.opts.stagingPath,
               scripts: configPaths.src.javascript
             });
-            fs.copySync(componentDirPath, destPath);
+            fs.copySync(componentDirPath, destPath, { dereference: true });
           }
           return Promise.resolve();
         }
@@ -176,7 +176,7 @@ function _copyFilesExcludeScss(srcBase, destBase) {
         const fileStat = fs.statSync(path.join(srcBase, file));
         // if file is not scss file, copy to themes
         if (fileStat.isDirectory() || !/scss/.test(path.extname(file))) {
-          fs.copySync(path.join(srcBase, file), path.join(destBase, file));
+          fs.copySync(path.join(srcBase, file), path.join(destBase, file), { dereference: true });
         }
       });
     }
@@ -212,13 +212,13 @@ function _copyMultiThemesToStaging(opts, stagingPath, livereload) {
 
       const src = path.join(srcBase, singleTheme.name, themePlatform);
       const dest = util.destPath(path.join(stagingPath, config('paths').src.styles, singleTheme.name, singleTheme.version, themePlatform, '/'));
-      fs.copySync(src, dest);
+      fs.copySync(src, dest, { dereference: true });
 
       // copy common dir
       const commonSrc = `${srcBase}/${singleTheme.name}/${CONSTANTS.COMMON_THEME_DIRECTORY}`;
       const commonDest = util.destPath(path.join(stagingPath, config('paths').src.styles, singleTheme.name, singleTheme.version, CONSTANTS.COMMON_THEME_DIRECTORY));
       if (util.fsExistsSync(commonSrc)) {
-        fs.copySync(commonSrc, commonDest);
+        fs.copySync(commonSrc, commonDest, { dereference: true });
       }
     });
   }
@@ -248,15 +248,15 @@ function _copyThemesToStaging(context) {
   if ((opts.theme.cssGeneratedType === 'add-on' && opts.theme.basetheme === CONSTANTS.DEFAULT_PCSS_THEME) || (opts.themes && opts.themes.length > 1)) {
     const rwsrc = _getThemeSrcPath(rwood, ext, livereload);
     const rwdest = _getThemeDestPath(rwood, stgPath, ext, livereload, platform, opts.destination);
-    fs.copySync(rwsrc, rwdest);
+    fs.copySync(rwsrc, rwdest, { dereference: true });
   }
 
   const stable = Object.assign({},
     { name: 'stable', platform: 'web', compile: false, version: util.getJETVersion() });
   if ((opts.theme.cssGeneratedType === 'add-on' && opts.theme.basetheme === CONSTANTS.DEFAULT_STABLE_THEME) || (opts.themes && opts.themes.length > 1)) {
     const stsrc = _getThemeSrcPath(stable, ext, livereload);
     const stdest = _getThemeDestPath(stable, stgPath, ext, livereload, platform, opts.destination);
-    fs.copySync(stsrc, stdest);
+    fs.copySync(stsrc, stdest, { dereference: true });
   }
   // copy to themes
   if ((theme.name !== CONSTANTS.DEFAULT_THEME || theme.name !== CONSTANTS.DEFAULT_PCSS_THEME ||
@@ -291,10 +291,10 @@ function _copyThemesToStaging(context) {
   fs.copySync(src, dest);
   // Copy preact theme if present
   if (fs.existsSync(preactSrc)) {
-    fs.copySync(preactSrc, preactDest);
+    fs.copySync(preactSrc, preactDest, { dereference: true });
     if (buildType === 'release') {
       // Preact images need to be a peer of the code bundle.js
-      fs.copySync(path.join(preactSrc, 'images'), path.join(stgPath, 'images'));
+      fs.copySync(path.join(preactSrc, 'images'), path.join(stgPath, 'images'), { dereference: true });
     }
   }
 
@@ -310,7 +310,7 @@ function _renameNlsDirs() {
   match.forEach((file) => {
     const src = path.join(srcBase, file);
     const dest = path.join(srcBase, `locale_${file}`);
-    fs.copySync(src, dest, { overwrite: true });
+    fs.copySync(src, dest, { overwrite: true, dereference: true });
     fs.removeSync(src);
   });
 }
@@ -702,7 +702,7 @@ module.exports = {
         });
       if (paths.length) {
         paths.forEach(([src, dest]) => {
-          fs.copySync(src, dest);
+          fs.copySync(src, dest, { dereference: true });
         });
         util.log('Copied local resource components');
       }
@@ -852,9 +852,9 @@ module.exports = {
           const destNpmpckgDirPath = `${destBasePath}/${npmPckgName}/${npmPckgInitFileName}`;
 
           if (util.fsExistsSync(npmPckgSrcPath)) {
-            fs.copySync(npmPckgSrcPath, destNpmpckgDirPath);
+            fs.copySync(npmPckgSrcPath, destNpmpckgDirPath, { dereference: true });
           } else if (util.fsExistsSync(npmPckgSrcPath.concat('.js'))) {
-            fs.copySync(npmPckgSrcPath.concat('.js'), destNpmpckgDirPath.concat('.js'));
+            fs.copySync(npmPckgSrcPath.concat('.js'), destNpmpckgDirPath.concat('.js'), { dereference: true });
           }
         }
       }

lib/buildCommon/compileTypescript.js

@@ -413,10 +413,11 @@ function _runTypescriptCompilation({ context, pack, component }) {
     }
     // For component(s) in a pack, the version number is between the pack and component:
     if (apiDocDir && !context.opts[CONSTANTS.OMIT_COMPONENT_VERSION_FLAG]) {
-      const componentVersion = util.getComponentVersion({ pack, component });
       if (component && pack) {
-        apiDocDir = path.join(components, pack, componentVersion, component);
+        const packVersion = util.getComponentVersion({ component: pack });
+        apiDocDir = path.join(components, pack, packVersion, component);
       } else if (component) {
+        const componentVersion = util.getComponentVersion({ component });
         apiDocDir = path.join(apiDocDir, componentVersion);
       }
     }
@@ -517,9 +518,11 @@ function _copyTypescriptComponentFilesToJSFolder({ context, pack, component }) {
       files.forEach((file) => {
         fs.copySync(
           path.join(componentSrc, file),
-          path.join(componentDest, file)
+          path.join(componentDest, file),
+          { dereference: true }
         );
       });
+      _ensureMonoPackInfoDefaultIntoCCAComponent(files, componentDest);
       util.log(`Copied ${componentName} runtime resources from ${componentSrc} to ${componentDest}`);
     }
   }
@@ -560,15 +563,43 @@ function _copyTypescriptApplicationFilesToJSFolder({ context }) {
       files.forEach((file) => {
         fs.copySync(
           path.join(applicationSrc, file),
-          path.join(applicationDest, file)
+          path.join(applicationDest, file),
+          { dereference: true }
         );
       });
+      _ensureMonoPackInfoDefaultIntoCCAComponent(files, applicationDest);
       util.log(`Copied runtime resources from /${typescriptFolder} to /${javascriptFolder}`);
     }
   }
   return Promise.resolve(context);
 }
 
+/**
+ * ## _ensureMonoPackInfoDefaultIntoCCAComponent
+ *
+ * This method ensures that mono-pack version and jetVersion are properly
+ * propagated to its CCA components. This is done so because on creating the
+ * component in the pack, these details are left out.
+ *
+ * @private
+ * @param {Array} files a list of files to copy to js folder
+ * @param {string} destPath staging js path
+ */
+function _ensureMonoPackInfoDefaultIntoCCAComponent(files, destPath) {
+  const jsonFiles = files.filter(file => file.endsWith('component.json'));
+  jsonFiles.forEach((jsonFile) => {
+    const json = fs.readJSONSync(path.join(destPath, jsonFile));
+    if (json.pack) {
+      const { componentJson } = util.getComponentsCache()[json.pack];
+      if (componentJson.type === 'mono-pack') {
+        json.version = componentJson.version;
+        json.jetVersion = componentJson.jetVersion;
+        fs.writeJSONSync(path.join(destPath, jsonFile), json);
+      }
+    }
+  });
+}
+
 /**
  * ## _copyVComponentComponentJsonToJs
  *

lib/buildCommon/stripLocalComponentJson.js

@@ -227,7 +227,8 @@ function isNeededSubAttribute(subAttribute) {
     'name',
     'default',
     'transform',
-    'extension'
+    'extension',
+    'implicitBusyContext'
   ]);
   if (requiredSubAttributes.has(subAttribute)) {
     return true;

lib/scopes/component.js

@@ -925,8 +925,8 @@ component.publish = function (componentName, options) {
         built: hadBeenBuiltBefore
       });
 
-      // Is it a component of a type 'pack'?
-      if ((componentMetadata.type === 'pack' || componentMetadata.type === 'pack') &&
+      // Is it a component of a type 'pack' or 'mono-pack'?
+      if ((componentMetadata.type === CONSTANTS.PACK_TYPE.MONO_PACK || componentMetadata.type === 'pack') &&
         // Pack content is already known, avoid infinite loop. Loop explanation:
         // Under the hood packaging of a pack calls component.package() but with a known content.
         !util.hasProperty(opts, '_contentToArchive')

lib/serveWebFileChangeHandler.js

@@ -43,12 +43,12 @@ module.exports = function (filePath, buildContext) {
     let buildPromise = Promise.resolve(buildContext);
     /* Copies file over for the watch events */
     if (_isIndexHtml(filePath)) {
-      fs.copySync(filePath, defaultDest);
+      fs.copySync(filePath, defaultDest, { dereference: true });
       buildPromise = buildCommon.injectTheme(buildContext)
         .then(buildCommon.injectLocalhostCspRule)
         .then(buildCommon.injectScripts);
     } else if (_isMainJs(filePath)) {
-      fs.copySync(filePath, defaultDest);
+      fs.copySync(filePath, defaultDest, { dereference: true });
       buildPromise = buildCommon.injectPaths(buildContext);
     } else if (util.isPathCCA(path.join(pathComponents.mid, pathComponents.end))) {
       const { pack, component } = util.getComponentInformationFromFilePath({
@@ -76,7 +76,8 @@ module.exports = function (filePath, buildContext) {
       );
       fs.copySync(
         filePath,
-        filePathDest
+        filePathDest,
+        { dereference: true }
       );
       if (isTypescriptFile) {
         // is a typescript file so have to run the compiler
@@ -115,11 +116,12 @@ module.exports = function (filePath, buildContext) {
         );
         fs.copySync(
           filePath,
-          filePathDestJs
+          filePathDestJs,
+          { dereference: true }
         );
       }
     } else if (isTypescriptFile) {
-      fs.copySync(filePath, defaultDest);
+      fs.copySync(filePath, defaultDest, { dereference: true });
       // eslint-disable-next-line no-param-reassign
       buildContext.serving = true;
       // provide path to file so that we only compile the file that changed
@@ -131,7 +133,7 @@ module.exports = function (filePath, buildContext) {
       buildPromise = buildCommon.compileApplicationTypescript(buildContext);
     } else if (inTypescriptFolder) {
       // copy to web/ts to prevent override during post-typescript copy
-      fs.copySync(filePath, defaultDest);
+      fs.copySync(filePath, defaultDest, { dereference: true });
       // copy to web/js since post-typescript copy not run
       const relativePathToFile = path.relative(
         path.join(path.sep, configPaths.src.typescript),
@@ -145,10 +147,11 @@ module.exports = function (filePath, buildContext) {
       );
       fs.copySync(
         filePath,
-        filePathDest
+        filePathDest,
+        { dereference: true }
       );
     } else {
-      fs.copySync(filePath, defaultDest);
+      fs.copySync(filePath, defaultDest, { dereference: true });
     }
     buildPromise
       .then(resolve)

lib/templates/pack/component.json

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

lib/templates/typescript/tsconfig.json

@@ -14,7 +14,7 @@
             "ojs/*": ["./node_modules/@oracle/oraclejet/dist/types/*"],
             "@oracle/oraclejet-preact/*": ["./node_modules/@oracle/oraclejet-preact/*"],
             "oj-c/*": ["./node_modules/@oracle/oraclejet-core-pack/oj-c/types/*"],
-            "preact": ["./node_modules/@oracle/oraclejet/dist/js/libs/preact"]
+            "preact": ["./node_modules/preact"]
         },
         "declaration": true,
         "noEmitOnError": true,

lib/utils.exchange.js

@@ -664,7 +664,7 @@ exchangeUtils.uploadToExchange = function (componentOrPackName, options) {
   return new Promise((resolve, reject) => {
     const opts = options || {};
 
-    createMultipartData(componentOrPackName)
+    createMultipartData(componentOrPackName, opts)
       .then((data) => {
         util.log(`Uploading '${componentOrPackName}' into Exchange.`);
         return util.request({
@@ -676,7 +676,7 @@ exchangeUtils.uploadToExchange = function (componentOrPackName, options) {
             const response = responseData.response;
             return exchangeUtils.validateAuthenticationOfRequest(
               response,
-              () => { return exchangeUtils.uploadToExchange(componentName, opts); }, // eslint-disable-line
+              () => { return exchangeUtils.uploadToExchange(componentOrPackName, opts); }, // eslint-disable-line
               () => {
                 util.checkForHttpErrors(response, responseData.responseBody, () => {
                   if (!opts.path) {
@@ -714,8 +714,9 @@ function createMultipartData(componentOrPackName, options) {
     let i = 0;
     function fn() {
       if (i < archivesToPublish.length) {
-        const readStream = fs.createReadStream(path.join(CONSTANTS.PUBLISH_TEMP_DIRECTORY,
-          archivesToPublish[i]));
+        const readStream = opts.path ? fs.createReadStream(opts.path) :
+          fs.createReadStream(path.join(CONSTANTS.PUBLISH_TEMP_DIRECTORY,
+            archivesToPublish[i]));
         readStream.on('open', () => {
           multipart.append('file', readStream);
           util.log(`'${archivesToPublish[i]}' file is ok.`);