Skip to content

Commit

Permalink
yarn: update js plugin and remove setup.sh
Browse files Browse the repository at this point in the history
  • Loading branch information
@catsout
catsout committed Mar 6, 2024
1 parent ff88d3a commit f55e1b6
Show file tree
Hide file tree
Showing 2 changed files with 153 additions and 166 deletions.
302 changes: 151 additions & 151 deletions node/flatpak_node_generator/flatpak-yarn.js
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
const PackageManager = {
Yarn1 : `Yarn Classic`,
Yarn2 : `Yarn`,
Npm : `npm`,
Pnpm : `pnpm`,
Yarn1: `Yarn Classic`,
Yarn2: `Yarn`,
Npm: `npm`,
Pnpm: `pnpm`,
}

module.exports = {
name: `flatpak-builder`,
factory: require => {
const { BaseCommand } = require(`@yarnpkg/cli`);
const { parseSyml } = require('@yarnpkg/parsers');
const { Configuration, Manifest, scriptUtils, structUtils, tgzUtils, execUtils, miscUtils, hashUtils } = require('@yarnpkg/core')
const { Filename, ZipFS, npath, ppath, PortablePath, xfs } = require('@yarnpkg/fslib');
const { getLibzipPromise } = require('@yarnpkg/libzip');
Expand All @@ -20,157 +21,158 @@ module.exports = {

// from https://github.com/yarnpkg/berry/blob/%40yarnpkg/shell/3.2.3/packages/plugin-essentials/sources/commands/set/version.ts#L194
async function setPackageManager(projectCwd) {
const bundleVersion = YarnVersion;
const bundleVersion = YarnVersion;

const manifest = (await Manifest.tryFind(projectCwd)) || new Manifest();

if(bundleVersion && miscUtils.isTaggedYarnVersion(bundleVersion)) {
manifest.packageManager = `yarn@${bundleVersion}`;
const data = {};
manifest.exportTo(data);
const manifest = (await Manifest.tryFind(projectCwd)) || new Manifest();

const path = ppath.join(projectCwd, Manifest.fileName);
const content = `${JSON.stringify(data, null, manifest.indent)}\n`;
if (bundleVersion && miscUtils.isTaggedYarnVersion(bundleVersion)) {
manifest.packageManager = `yarn@${bundleVersion}`;
const data = {};
manifest.exportTo(data);

await xfs.changeFilePromise(path, content, {
automaticNewlines: true,
});
}
const path = ppath.join(projectCwd, Manifest.fileName);
const content = `${JSON.stringify(data, null, manifest.indent)}\n`;

await xfs.changeFilePromise(path, content, {
automaticNewlines: true,
});
}
}

// func from https://github.com/yarnpkg/berry/blob/%40yarnpkg/shell/3.2.3/packages/yarnpkg-core/sources/scriptUtils.ts#L215
async function prepareExternalProject(cwd, outputPath , {configuration, locator, stdout, yarn_v1, workspace=null}) {
const devirtualizedLocator = locator && structUtils.isVirtualLocator(locator)
? structUtils.devirtualizeLocator(locator)
: locator;

const name = devirtualizedLocator
? structUtils.stringifyLocator(devirtualizedLocator)
: `an external project`;

const stderr = stdout;

stdout.write(`Packing ${name} from sources\n`);

const packageManagerSelection = await scriptUtils.detectPackageManager(cwd);
let effectivePackageManager;
if (packageManagerSelection !== null) {
stdout.write(`Using ${packageManagerSelection.packageManager} for bootstrap. Reason: ${packageManagerSelection.reason}\n\n`);
effectivePackageManager = packageManagerSelection.packageManager;
} else {
stdout.write(`No package manager configuration detected; defaulting to Yarn\n\n`);
effectivePackageManager = PackageManager.Yarn2;
}
if (effectivePackageManager === PackageManager.Pnpm) {
effectivePackageManager = PackageManager.Npm;
}
async function prepareExternalProject(cwd, outputPath, { configuration, locator, stdout, yarn_v1, workspace = null }) {
const devirtualizedLocator = locator && structUtils.isVirtualLocator(locator)
? structUtils.devirtualizeLocator(locator)
: locator;

const name = devirtualizedLocator
? structUtils.stringifyLocator(devirtualizedLocator)
: `an external project`;

const stderr = stdout;

stdout.write(`Packing ${name} from sources\n`);

const packageManagerSelection = await scriptUtils.detectPackageManager(cwd);
let effectivePackageManager;
if (packageManagerSelection !== null) {
stdout.write(`Using ${packageManagerSelection.packageManager} for bootstrap. Reason: ${packageManagerSelection.reason}\n\n`);
effectivePackageManager = packageManagerSelection.packageManager;
} else {
stdout.write(`No package manager configuration detected; defaulting to Yarn\n\n`);
effectivePackageManager = PackageManager.Yarn2;
}
if (effectivePackageManager === PackageManager.Pnpm) {
effectivePackageManager = PackageManager.Npm;
}

const workflows = new Map([
[PackageManager.Yarn1, async () => {
const workspaceCli = workspace !== null
? [`workspace`, workspace]
: [];
const workflows = new Map([
[PackageManager.Yarn1, async () => {
const workspaceCli = workspace !== null
? [`workspace`, workspace]
: [];

await setPackageManager(cwd);
await setPackageManager(cwd);

await Configuration.updateConfiguration(cwd, {
yarnPath: yarn_v1,
});
await Configuration.updateConfiguration(cwd, {
yarnPath: yarn_v1,
});

await xfs.appendFilePromise(ppath.join(cwd, `.npmignore`), `/.yarn\n`);

const pack = await execUtils.pipevp(`yarn`, [...workspaceCli, `pack`, `--filename`, npath.fromPortablePath(outputPath)], {cwd, stdout, stderr});
if (pack.code !== 0)
return pack.code;

return 0;
}],
[PackageManager.Yarn2, async () => {
const workspaceCli = workspace !== null
? [`workspace`, workspace]
: [];
const lockfilePath = ppath.join(cwd, Filename.lockfile);
if (!(await xfs.existsPromise(lockfilePath)))
await xfs.writeFilePromise(lockfilePath, ``);
const pack = await execUtils.pipevp(`yarn`, [...workspaceCli, `pack`, `--filename`, npath.fromPortablePath(outputPath)], {cwd, stdout, stderr});
if (pack.code !== 0)
return pack.code;
return 0;
}],
[PackageManager.Npm, async () => {
const workspaceCli = workspace !== null
? [`--workspace`, workspace]
: [];
const packStream = new PassThrough();
const packPromise = miscUtils.bufferStream(packStream);
const pack = await execUtils.pipevp(`npm`, [`pack`, `--silent`, ...workspaceCli], {cwd, stdout: packStream, stderr});
if (pack.code !== 0)
return pack.code;
const packOutput = (await packPromise).toString().trim().replace(/^.*\n/s, ``);
const packTarget = ppath.resolve(cwd, npath.toPortablePath(packOutput));
await xfs.renamePromise(packTarget, outputPath);
return 0;
}],
]);
const workflow = workflows.get(effectivePackageManager);
const code = await workflow();
if (code === 0 || typeof code === `undefined`)
return;
else
throw `Packing the package failed (exit code ${code})`;
await xfs.appendFilePromise(ppath.join(cwd, `.npmignore`), `/.yarn\n`);

const pack = await execUtils.pipevp(`yarn`, [...workspaceCli, `pack`, `--filename`, npath.fromPortablePath(outputPath)], { cwd, stdout, stderr });
if (pack.code !== 0)
return pack.code;

return 0;
}],
[PackageManager.Yarn2, async () => {
const workspaceCli = workspace !== null
? [`workspace`, workspace]
: [];
const lockfilePath = ppath.join(cwd, Filename.lockfile);
if (!(await xfs.existsPromise(lockfilePath)))
await xfs.writeFilePromise(lockfilePath, ``);

const pack = await execUtils.pipevp(`yarn`, [...workspaceCli, `pack`, `--filename`, npath.fromPortablePath(outputPath)], { cwd, stdout, stderr });
if (pack.code !== 0)
return pack.code;
return 0;
}],
[PackageManager.Npm, async () => {
const workspaceCli = workspace !== null
? [`--workspace`, workspace]
: [];
const packStream = new PassThrough();
const packPromise = miscUtils.bufferStream(packStream);
const pack = await execUtils.pipevp(`npm`, [`pack`, `--silent`, ...workspaceCli], { cwd, stdout: packStream, stderr });
if (pack.code !== 0)
return pack.code;

const packOutput = (await packPromise).toString().trim().replace(/^.*\n/s, ``);
const packTarget = ppath.resolve(cwd, npath.toPortablePath(packOutput));
await xfs.renamePromise(packTarget, outputPath);
return 0;
}],
]);
const workflow = workflows.get(effectivePackageManager);
const code = await workflow();
if (code === 0 || typeof code === `undefined`)
return;
else
throw `Packing the package failed (exit code ${code})`;
}

class convertToZipCommand extends BaseCommand {
static paths = [[`convertToZip`]];
yarn_v1 = Option.String({required: true});
yarn_v1 = Option.String({ required: true });

async execute() {
const configuration = await Configuration.find(this.context.cwd,
this.context.plugins);
//const lockfile = configuration.get('lockfileFilename');
const cacheFolder = configuration.get('cacheFolder');
const lockfilePath = ppath.join(this.context.cwd, configuration.get(`lockfileFilename`));
const cacheFolder = `${configuration.get('globalFolder')}/cache`;
const locatorFolder = `${cacheFolder}/locator`;

const compressionLevel = configuration.get(`compressionLevel`);
const stdout = this.context.stdout;
const gitChecksumPatches = []; // {name:, oriHash:, newHash:}

async function patchLockfileChecksum(cwd, configuration, patches) {
const lockfilePath = ppath.join(cwd, configuration.get(`lockfileFilename`));
async function patchLockfileChecksum(lockfilePath, patches) {
let currentContent = ``;
try {
currentContent = await xfs.readFilePromise(lockfilePath, `utf8`);
} catch (error) {
}
const newContent = patches.reduce((acc, item, i) => {
stdout.write(`patch '${item.name}' checksum:\n-${item.oriHash}\n+${item.newHash}\n\n\n`);
const regex = new RegExp(item.oriHash, "g");
return acc.replace(regex, item.newHash);
}, currentContent);

let currentContent = ``;
try {
currentContent = await xfs.readFilePromise(lockfilePath, `utf8`);
} catch (error) {
}
const newContent = patches.reduce((acc, item, i) => {
stdout.write(`patch '${item.name}' checksum:\n-${item.oriHash}\n+${item.newHash}\n\n\n`);
const regex = new RegExp(item.oriHash, "g");
return acc.replace(regex, item.newHash);
}, currentContent);

await xfs.writeFilePromise(lockfilePath, newContent);
await xfs.writeFilePromise(lockfilePath, newContent);
}

async function getLockFileMeta(lockfilePath) {
const content = await xfs.readFilePromise(lockfilePath, `utf8`);
const parsed = parseSyml(content);
return parsed.__metadata;
}

stdout.write(`yarn cacheFolder: ${cacheFolder}\n`);
const lockMeta = await getLockFileMeta(lockfilePath);
stdout.write(`yarn lock: ${lockfilePath}\n`);
stdout.write(`yarn lock version: ${lockMeta.version}\n`);
stdout.write(`yarn lock cacheKey: ${lockMeta.cacheKey}\n`);

const convertToZip = async (tgz, target, opts) => {
const { compressionLevel, ...bufferOpts } = opts;
const zipFs = new ZipFS(target, {
create: true,
libzip: await getLibzipPromise(),
level: compressionLevel
});
const tgzBuffer = fs.readFileSync(tgz);
await tgzUtils.extractArchiveTo(tgzBuffer, zipFs,
bufferOpts);
zipFs.saveAndClose();
const tgzBuf = await xfs.readFilePromise(tgz);
const fs = await tgzUtils.convertToZip(tgzBuf, opts);
fs.discardAndClose();
await xfs.copyFilePromise(fs.path, target);
await xfs.unlinkPromise(fs.path);
}

stdout.write(`converting cache to zip\n`);
stdout.write(`converting tgz to zip: ${cacheFolder}\n`);

const files = fs.readdirSync(locatorFolder);
const tasks = []
Expand All @@ -187,11 +189,11 @@ module.exports = {
const sha = match[2];
let checksum;

if(entry_type === 'tgz') {
if (entry_type === 'tgz') {
resolution = Buffer.from(match[1], 'base64').toString();
locator = structUtils.parseLocator(resolution, true);
}
else if(entry_type === 'git') {
else if (entry_type === 'git') {
const gitJson = JSON.parse(fs.readFileSync(tgzFile, 'utf8'));

resolution = gitJson.resolution;
Expand All @@ -201,24 +203,25 @@ module.exports = {
const repoPathRel = gitJson.repo_dir_rel;

const cloneTarget = `${cacheFolder}/${repoPathRel}`;

const repoUrlParts = gitUtils.splitRepoUrl(locator.reference);
const packagePath = ppath.join(cloneTarget, `package.tgz`);

await prepareExternalProject(cloneTarget, packagePath, {
configuration: configuration,
stdout,
workspace: repoUrlParts.extra.workspace,
locator,
yarn_v1: this.yarn_v1,
configuration: configuration,
stdout,
workspace: repoUrlParts.extra.workspace,
locator,
yarn_v1: this.yarn_v1,
});

tgzFile = packagePath;

}
const filename =
`${structUtils.slugifyLocator(locator)}-${sha}.zip`;
`${structUtils.slugifyLocator(locator)}-${lockMeta.cacheKey}.zip`;
const targetFile = `${cacheFolder}/${filename}`

tasks.push(async () => {
await convertToZip(tgzFile, targetFile, {
compressionLevel: compressionLevel,
Expand All @@ -227,28 +230,26 @@ module.exports = {
});

if (entry_type === 'git') {
const file_checksum = await hashUtils.checksumFile(targetFile);

if (file_checksum !== checksum) {
const newSha = file_checksum.slice(0, 10);
const newTarget = `${cacheFolder}/${structUtils.slugifyLocator(locator)}-${newSha}.zip`;
fs.renameSync(targetFile, newTarget);

gitChecksumPatches.push({
name: locator.name,
oriHash: checksum,
newHash: file_checksum,
});
}
const file_checksum = await hashUtils.checksumFile(targetFile);

if (file_checksum !== checksum) {
const newSha = file_checksum.slice(0, 10);
const newTarget = `${cacheFolder}/${structUtils.slugifyLocator(locator)}-${lockMeta.cacheKey}.zip`;
fs.renameSync(targetFile, newTarget);

gitChecksumPatches.push({
name: locator.name,
oriHash: checksum,
newHash: file_checksum,
});
}
}
});
}

while (tasks.length) {
await Promise.all(tasks.splice(0, 128).map(t => t()));
}

patchLockfileChecksum(this.context.cwd, configuration, gitChecksumPatches);
await Promise.all(tasks.map(t => t()));

patchLockfileChecksum(lockfilePath, gitChecksumPatches);
stdout.write(`converting finished\n`);
}
}
Expand All @@ -259,4 +260,3 @@ module.exports = {
};
}
};

Loading

0 comments on commit f55e1b6

Please sign in to comment.