2efa4ff94f
Dependency acquisition during packaging left native wheels and packager inputs outside the pre-build cache save. Compose PM and existing providers into a preparation phase, then require builds to consume admitted inputs. Share native preparation with PM Bundle. Keep path-bound environments and signing outputs separate from reusable caches. Use read-only cache tokens for commit builds and preserve the one-command local build path. Verify pinned tools through PM, probe PTYs under the prepared Electron, and supply dmgbuild through a build-only PM package. Resolve bundled tool stores from their payload manifest so relocation preserves discovery. Validation: focused Python and JS tests, checkJs, Ruff, Windows checks, anti-slop, cache relocation, and network-denied Linux AppImage builds. Relocated runtime smoke passed with NixOS host libraries supplied. Native Windows/macOS signing and live GitHub cache behavior remain untested.
62 lines
3.2 KiB
JavaScript
62 lines
3.2 KiB
JavaScript
import assert from 'node:assert/strict'
|
|
import fs from 'node:fs'
|
|
import os from 'node:os'
|
|
import path from 'node:path'
|
|
import { afterEach, test } from 'vitest'
|
|
import * as prepared from './prepared-packaging.mjs'
|
|
import { validatePreparedBuilderArgs } from './run-electron-builder.mjs'
|
|
import { spawnSync } from 'node:child_process'
|
|
|
|
/** @type {string[]} */
|
|
const roots = []
|
|
afterEach(() => roots.splice(0).forEach(root => fs.rmSync(root, { recursive: true, force: true })))
|
|
|
|
/** @returns {{ source: string, out: string, electron: string, sevenZip: string, icons: string }} */
|
|
function fixture() {
|
|
const source = fs.mkdtempSync(path.join(os.tmpdir(), 'prepared-packager-'))
|
|
roots.push(source)
|
|
const out = path.join(source, 'work')
|
|
fs.mkdirSync(path.join(source, 'apps/desktop'), { recursive: true })
|
|
fs.writeFileSync(path.join(source, 'package-lock.json'), '{}')
|
|
fs.writeFileSync(path.join(source, 'apps/desktop/package.json'), '{}')
|
|
fs.writeFileSync(path.join(source, 'apps/desktop/electron-builder.config.cjs'), 'module.exports = {}')
|
|
const electron = path.join(out, 'electron.zip')
|
|
const sevenZip = path.join(out, 'sevenZip')
|
|
const icons = path.join(out, 'icons')
|
|
fs.mkdirSync(path.join(sevenZip, 'bin'), { recursive: true })
|
|
fs.mkdirSync(icons)
|
|
fs.writeFileSync(electron, 'verified archive fixture')
|
|
fs.writeFileSync(path.join(sevenZip, 'bin', process.platform === 'win32' ? '7za.exe' : '7za'), 'archive utility fixture')
|
|
fs.writeFileSync(path.join(icons, 'icon-tool.js'), 'icon tool fixture')
|
|
return { source, out, electron, sevenZip, icons }
|
|
}
|
|
|
|
test('a failed preparation invalidates an earlier completion claim before loading suppliers', () => {
|
|
const { source, out } = fixture()
|
|
const manifest = path.join(out, 'prepared.json')
|
|
fs.writeFileSync(manifest, '{}')
|
|
const result = spawnSync(process.execPath, [path.join(import.meta.dirname, 'prepare-packaging-tools.mjs'),
|
|
'--source', source, '--out', out, '--cache', path.join(source, 'cache')], { encoding: 'utf8' })
|
|
assert.notEqual(result.status, 0)
|
|
assert.equal(fs.existsSync(manifest), false)
|
|
assert.match(result.stderr, /lock|install|pinned/i)
|
|
})
|
|
|
|
test('prepared inputs are path-bound and reject changed or missing bytes without repair', async () => {
|
|
const inputs = fixture()
|
|
const manifest = await prepared.publishPackagingInputs({
|
|
...inputs, target: 'linux-x64', formats: ['dir'],
|
|
toolsets: { sevenZip: inputs.sevenZip, icons: inputs.icons },
|
|
})
|
|
const result = prepared.readPackagingInputs(manifest, inputs.source, 'linux-x64')
|
|
assert.equal(result.electron, inputs.electron)
|
|
assert.throws(() => validatePreparedBuilderArgs([], result), /run preparation again/)
|
|
assert.throws(() => validatePreparedBuilderArgs(['--dir', '-c.electronDist=/another.zip'], result), /run preparation again/)
|
|
validatePreparedBuilderArgs(['--dir', '-c.extraMetadata.version=1.2.3'], result)
|
|
fs.writeFileSync(inputs.electron, 'corrupt')
|
|
assert.throws(() => prepared.readPackagingInputs(manifest, inputs.source, 'linux-x64'), /run preparation again/i)
|
|
assert.equal(fs.readFileSync(inputs.electron, 'utf8'), 'corrupt')
|
|
fs.rmSync(inputs.electron)
|
|
assert.throws(() => prepared.readPackagingInputs(manifest, inputs.source, 'linux-x64'), /run preparation again/i)
|
|
})
|