BACKLOG-23333: Use dist/build folder for generated code (#279)

Update the pack-project.js script (used by yarn build) to pack the content of the dist/build/ folder into a dist/<project>-<version>.tgz file.
If the dist/build folder does not exist, fallback to the previous behaviour and pack the root directory directly.

Author: baptistegrimaud

packages/scripts/deploy.js

@@ -2,13 +2,16 @@
 require('dotenv').config();
 const {execSync} = require('child_process');
 const pack = require('./pack-project');
-const {getPackageFilename} = require("./pack-utility");
+const {getPackageFilename} = require('./pack-utility');
 const fs = require('fs');
-const path = require("path");
+const path = require('path');
 
 const args = process.argv.slice(2);
 const deployMethod = process.env.JAHIA_DEPLOY_METHOD;
 const packageFileName = getPackageFilename(path.join(process.cwd(), 'package.json'), process.env.npm_package_name, process.env.npm_package_version);
+const buildDir = path.resolve('dist/build');
+const packDir = fs.existsSync(buildDir) ? path.resolve('dist') : process.cwd();
+const packageFilePath = path.join(packDir, packageFileName);
 
 if (!fs.existsSync(packageFileName)) {
     console.log('Package hasn\'t been built previously, packing now using jahia-pack...');
@@ -20,8 +23,8 @@ if (!fs.existsSync(packageFileName)) {
 
 if (deployMethod === 'curl') {
     console.log('Deploying URL curl to Jahia bundles REST API...');
-    console.log(execSync(`curl -s --user ${process.env.JAHIA_USER} --form bundle=@./${packageFileName} --form start=true ${process.env.JAHIA_HOST}/modules/api/bundles`, {encoding: 'utf8'}));
+    console.log(execSync(`curl -s --user ${process.env.JAHIA_USER} --form bundle=@./${packageFilePath} --form start=true ${process.env.JAHIA_HOST}/modules/api/bundles`, {encoding: 'utf8'}));
 } else {
     console.log('Deploying using Docker copy...');
-    console.log(execSync(`docker cp ${packageFileName} ${process.env.JAHIA_DOCKER_NAME}:/var/jahia/modules`, {encoding: 'utf8'}));
+    console.log(execSync(`docker cp ${packageFilePath} ${process.env.JAHIA_DOCKER_NAME}:/var/jahia/modules`, {encoding: 'utf8'}));
 }

packages/scripts/pack-project.js

@@ -1,22 +1,24 @@
 const {execSync} = require('child_process');
 const semver = require('semver');
 const path = require('path');
-const {getPackageFilename} = require("./pack-utility");
-
-
+const {getPackageFilename} = require('./pack-utility');
+const fs = require('fs');
 
 function pack() {
     console.log('Node version detected:', process.versions.node);
     const yarnVersion = execSync('yarn --version', {encoding: 'utf8'});
     console.log('Yarn version:', yarnVersion);
+    const buildDir = path.resolve('dist/build');
+    const packDir = fs.existsSync(buildDir) ? buildDir : process.cwd();
+    console.log(`Packing folder ${packDir}...`);
 
     if (semver.satisfies(yarnVersion, '1.x')) {
         console.log('Yarn Classic detected');
         console.log(execSync('yarn pack', {encoding: 'utf8'}));
     } else if (semver.gte(yarnVersion, '2.0.0')) {
         console.log('Yarn Berry detected');
-        const outputFileName = getPackageFilename(path.join(process.cwd(), 'package.json'),process.env.npm_package_name,process.env.npm_package_version);
-        console.log(execSync(`yarn pack --out ${outputFileName}`, {encoding: 'utf8'}));
+        const outputFileName = getPackageFilename(path.join(process.cwd(), 'package.json'), process.env.npm_package_name, process.env.npm_package_version);
+        console.log(execSync(`cd ${packDir} && yarn pack --out ${outputFileName} && mv ${outputFileName} ..`, {encoding: 'utf8'}));
     }
 }