Skip to content

BACKLOG-23333: Pack from dist/build/ and deploy dist/*.tgz #279

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 8, 2024
Merged

BACKLOG-23333: Pack from dist/build/ and deploy dist/*.tgz #279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 7 additions & 4 deletions packages/scripts/deploy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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...');
Expand All @@ -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'}));
}
12 changes: 7 additions & 5 deletions packages/scripts/pack-project.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'}));
}
}

Expand Down