Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions packages/scripts/deploy.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@
require('dotenv').config();
const {execSync} = require('child_process');
const pack = require('./pack-project');
const {getPackageFilename} = require("./pack-utility");
const fs = require('fs');
const path = require("path");

const args = process.argv.slice(2);
const deployMethod = process.env.JAHIA_DEPLOY_METHOD;
const cleanPackageName = process.env.npm_package_name.replace(/@/g, '').replace(/\//g, '-');
const packageFileName = `${cleanPackageName}-v${process.env.npm_package_version}.tgz`;
const packageFileName = getPackageFilename(path.join(process.cwd(), 'package.json'), process.env.npm_package_name, process.env.npm_package_version);

if (!fs.existsSync(packageFileName)) {
console.log('Package hasn\'t been built previously, packing now using jahia-pack...');
Expand Down
8 changes: 6 additions & 2 deletions packages/scripts/pack-project.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@
const {execSync} = require('child_process');
const semver = require('semver');
const path = require('path');
const {getPackageFilename} = require("./pack-utility");



function pack() {
console.log('Node version detected:', process.versions.node);
const yarnVersion = execSync('yarn --version', {encoding: 'utf8'});
console.log('Yarn version:', yarnVersion);
const cleanPackageName = process.env.npm_package_name.replace(/@/g, '').replace(/\//g, '-');

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');
console.log(execSync(`yarn pack --out ${cleanPackageName}-v${process.env.npm_package_version}.tgz`, {encoding: 'utf8'}));
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'}));
}
}

Expand Down
10 changes: 10 additions & 0 deletions packages/scripts/pack-utility.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import fs from "fs";

function getPackageFilename(packageJsonPath, packageName, packageVersion) {
const packageJsonContent = fs.readFileSync(packageJsonPath, { encoding: 'utf8' });
const packageJson = JSON.parse(packageJsonContent);
const cleanPackageName = packageName.replace(/@/g, '').replace(/\//g, '-');
const snapshotUsed = packageJson?.jahia?.snapshot?.toString().toLowerCase() === 'true';
return `${cleanPackageName}-v${packageVersion}${snapshotUsed ? '-SNAPSHOT' : ''}.tgz`;
}
module.exports = { getPackageFilename };