oxmc/nexe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: update resolve-dependencies

Browse Source
This commit is contained in:
calebboyd
2020-04-26 09:08:25 -05:00
parent b785b72724
commit d6ba5d193f
23 changed files with 563 additions and 387 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compiler.ts
+7 -7
View File
@@ -11,7 +11,7 @@ import {
dequote,
isWindows,
bound,
semverGt
semverGt,
} from './util'
import { NexeOptions, version } from './options'
import { NexeTarget } from './target'
@@ -151,16 +151,16 @@ export class NexeCompiler {
@bound
async readFileAsync(file: string) {
this.assertBuild()
let cachedFile = this.files.find(x => normalize(x.filename) === normalize(file))
let cachedFile = this.files.find((x) => normalize(x.filename) === normalize(file))
if (!cachedFile) {
const absPath = join(this.src, file)
cachedFile = {
absPath,
filename: file,
contents: await readFileAsync(absPath, 'utf-8').catch(x => {
contents: await readFileAsync(absPath, 'utf-8').catch((x) => {
if (x.code === 'ENOENT') return ''
throw x
})
}),
}
this.files.push(cachedFile)
}
@@ -215,7 +215,7 @@ export class NexeCompiler {
spawn(command, args, {
cwd: this.src,
env: this.env,
stdio: this.log.verbose ? 'inherit' : 'ignore'
stdio: this.log.verbose ? 'inherit' : 'ignore',
})
.once('error', (e: Error) => {
if (this.log.verbose) {
@@ -242,7 +242,7 @@ export class NexeCompiler {
}
return this._runBuildCommandAsync(this.env.PYTHON || 'python', [
this.configureScript,
...this.options.configure
...this.options.configure,
])
}
@@ -313,7 +313,7 @@ export class NexeCompiler {
binary,
toStream(startup),
this.bundle.toStream(),
toStream(Buffer.concat([Buffer.from('<nexe~~sentinel>'), lengths]))
toStream(Buffer.concat([Buffer.from('<nexe~~sentinel>'), lengths])),
])
}
}
src/fs/bundle.ts
+1 -1
View File
@@ -18,7 +18,7 @@ export function toStream(content: Buffer | string) {
read() {
this.push(content)
this.push(null)
}
},
})
return readable
}
src/fs/patch.ts
+19 -19
View File
@@ -34,7 +34,7 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
isString = (x: any): x is string => typeof x === 'string' || x instanceof String,
noop = () => {},
path = require('path'),
winPath: (key: string) => string = isWin ? upcaseDriveLetter : s => s,
winPath: (key: string) => string = isWin ? upcaseDriveLetter : (s) => s,
baseDir = winPath(path.dirname(process.execPath))
let log = (_: string) => true
@@ -63,7 +63,7 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
return winPath(key)
}
const statTime = function() {
const statTime = function () {
return {
dev: 0,
ino: 0,
@@ -80,7 +80,7 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
ctime: new Date(stat.ctime),
ctimMs: stat.ctime.getTime(),
birthtime: new Date(stat.birthtime),
birthtimeMs: stat.birthtime.getTime()
birthtimeMs: stat.birthtime.getTime(),
}
}
@@ -89,7 +89,7 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
BigInt = eval('BigInt')
} catch (ignored) {}
const createStat = function(extensions: any, options: any) {
const createStat = function (extensions: any, options: any) {
const stat = Object.assign(new fs.Stats(), binary.layout.stat, statTime(), extensions)
if (options && options.bigint && BigInt) {
for (const k in stat) {
@@ -101,7 +101,7 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
return stat
}
const ownStat = function(filepath: any, options: any) {
const ownStat = function (filepath: any, options: any) {
setupManifest()
const key = getKey(filepath)
if (directories[key]) {
@@ -124,7 +124,7 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
}
let setupManifest = () => {
Object.keys(manifest).forEach(filepath => {
Object.keys(manifest).forEach((filepath) => {
const entry = manifest[filepath]
const absolutePath = getKey(filepath)
const longPath = makeLong(absolutePath)
@@ -218,19 +218,19 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
const encoding = fileOpts(options).encoding
callback = typeof options === 'function' ? options : callback
originalFsMethods.open(blobPath, 'r', function(err: Error, fd: number) {
originalFsMethods.open(blobPath, 'r', function (err: Error, fd: number) {
if (err) return callback(err, null)
originalFsMethods.read(fd, Buffer.alloc(length), 0, length, resourceOffset, function(
originalFsMethods.read(fd, Buffer.alloc(length), 0, length, resourceOffset, function (
error: Error,
bytesRead: number,
result: Buffer
) {
if (error) {
return originalFsMethods.close(fd, function() {
return originalFsMethods.close(fd, function () {
callback(error, null)
})
}
originalFsMethods.close(fd, function(err: Error) {
originalFsMethods.close(fd, function (err: Error) {
if (err) {
return callback(err, result)
}
@@ -253,7 +253,7 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
blobPath,
Object.assign({}, opts, {
start: resourceOffset,
end: resourceOffset + length - 1
end: resourceOffset + length - 1,
})
)
},
@@ -294,11 +294,11 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
} else {
return originalFsMethods.stat.apply(fs, arguments)
}
}
},
}
if (typeof fs.exists === 'function') {
nfs.exists = function(filepath: string, cb: Function) {
nfs.exists = function (filepath: string, cb: Function) {
cb = cb || noop
const exists = nfs.existsSync(filepath)
process.nextTick(() => cb(exists))
@@ -307,7 +307,7 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
const patches = (process as any).nexe.patches || {}
delete (process as any).nexe
patches.internalModuleReadFile = function(this: any, original: any, ...args: any[]) {
patches.internalModuleReadFile = function (this: any, original: any, ...args: any[]) {
setupManifest()
const filepath = getKey(args[0])
if (manifest[filepath]) {
@@ -318,7 +318,7 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
return original.call(this, ...args)
}
patches.internalModuleReadJSON = patches.internalModuleReadFile
patches.internalModuleStat = function(this: any, original: any, ...args: any[]) {
patches.internalModuleStat = function (this: any, original: any, ...args: any[]) {
setupManifest()
const filepath = getKey(args[0])
if (manifest[filepath]) {
@@ -341,7 +341,7 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
}
if (typeof fs.exists === 'function') {
nfs.exists = function(filepath: string, cb: Function) {
nfs.exists = function (filepath: string, cb: Function) {
cb = cb || noop
const exists = nfs.existsSync(filepath)
if (!exists) {
@@ -352,7 +352,7 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
}
if (typeof fs.copyFile === 'function') {
nfs.copyFile = function(filepath: string, dest: string, flags: number, callback: Function) {
nfs.copyFile = function (filepath: string, dest: string, flags: number, callback: Function) {
setupManifest()
const entry = manifest[getKey(filepath)]
if (!entry) {
@@ -374,7 +374,7 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
})
})
}
nfs.copyFileSync = function(filepath: string, dest: string) {
nfs.copyFileSync = function (filepath: string, dest: string) {
setupManifest()
const entry = manifest[getKey(filepath)]
if (!entry) {
@@ -387,7 +387,7 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
Object.assign(fs, nfs)
lazyRestoreFs = () => {
Object.keys(nfs).forEach(key => {
Object.keys(nfs).forEach((key) => {
fs[key] = originalFsMethods[key]
})
lazyRestoreFs = () => {}
src/logger.ts
+3 -3
View File
@@ -24,7 +24,7 @@ export class Logger {
this.ora = ora({
text: 'Starting...',
color: 'blue',
spinner: 'dots'
spinner: 'dots',
})
this.ora.stop()
}
@@ -35,7 +35,7 @@ export class Logger {
flush() {
!this.silent && this.ora.succeed()
return new Promise(resolve => setTimeout(resolve, frameLength))
return new Promise((resolve) => setTimeout(resolve, frameLength))
}
_write(update: string, color = 'green') {
@@ -66,7 +66,7 @@ export class Logger {
modify: this.modify,
log: this.verbose ? this.write : this.modify,
pause: () => this.ora.stopAndPersist(),
resume: () => this.ora.start()
resume: () => this.ora.start(),
} as LogStep
}
}
src/options.ts
+12 -15
View File
@@ -70,7 +70,7 @@ const defaults = {
build: false,
bundle: true,
patches: [],
plugins: []
plugins: [],
}
const alias = {
i: 'input',
@@ -88,7 +88,7 @@ const alias = {
h: 'help',
l: 'loglevel',
'fake-argv': 'fakeArgv',
'gh-token': 'ghToken'
'gh-token': 'ghToken',
}
const argv = parseArgv(process.argv, { alias, default: { ...defaults } })
let help = `
@@ -133,7 +133,7 @@ ${c.bold('nexe <entry-file> [options]')}
help = EOL + help + EOL
function flatten(...args: any[]): string[] {
return ([] as string[]).concat(...args).filter(x => x)
return ([] as string[]).concat(...args).filter((x) => x)
}
/**
@@ -144,16 +144,13 @@ function flatten(...args: any[]): string[] {
*/
function extractCliMap(match: RegExp, options: any) {
return Object.keys(options)
.filter(x => match.test(x))
.reduce(
(map: any, option: any) => {
const key = option.split('-')[1]
map[key] = options[option]
delete options[option]
return map
},
{} as any
)
.filter((x) => match.test(x))
.reduce((map: any, option: any) => {
const key = option.split('-')[1]
map[key] = options[option]
delete options[option]
return map
}, {} as any)
}
function extractLogLevel(options: NexeOptions) {
@@ -292,8 +289,8 @@ function normalizeOptions(input?: Partial<NexeOptions>): NexeOptions {
}
Object.keys(alias)
.filter(k => k !== 'rc')
.forEach(x => delete opts[x])
.filter((k) => k !== 'rc')
.forEach((x) => delete opts[x])
return options
}
src/patches/boot-nexe.ts
+6 -6
View File
@@ -20,13 +20,13 @@ const footer = tailWindow.slice(footerPosition, footerPosition + 32),
Object.defineProperty(
process,
'__nexe',
(function() {
(function () {
let nexeHeader: any = null
return {
get: function() {
get: function () {
return nexeHeader
},
set: function(value: any) {
set: function (value: any) {
if (nexeHeader) {
throw new Error('This property is readonly')
}
@@ -37,13 +37,13 @@ Object.defineProperty(
contentSize,
contentStart,
resourceSize,
resourceStart
}
resourceStart,
},
})
Object.freeze(nexeHeader)
},
enumerable: false,
configurable: false
configurable: false,
}
})()
)
src/patches/disable-node-cli.ts
+1 -1
View File
@@ -21,7 +21,7 @@ export default async function disableNodeCli(compiler: NexeCompiler, next: () =>
'int i = v8_argc; i < v8_argc; i++'
)
let matches = 0
await compiler.replaceInFileAsync('src/node.cc', /v8_argc > 1/g, match => {
await compiler.replaceInFileAsync('src/node.cc', /v8_argc > 1/g, (match) => {
if (matches++) {
return 'false'
}
src/patches/gyp.ts
+2 -2
View File
@@ -13,8 +13,8 @@ export default async function nodeGyp(
`
${nodeGypMarker}
${files
.filter(x => x.filename.startsWith('lib'))
.map(x => `'${x.filename}'`)
.filter((x) => x.filename.startsWith('lib'))
.map((x) => `'${x.filename}'`)
.toString()},
`.trim()
)
src/patches/node-rc.ts
+2 -2
View File
@@ -8,7 +8,7 @@ export default async function nodeRc(compiler: NexeCompiler, next: () => Promise
const file = await compiler.readFileAsync('src/res/node.rc')
Object.keys(options).forEach(key => {
Object.keys(options).forEach((key) => {
let value = options[key]
const isVar = /^[A-Z_]+$/.test(value)
value = isVar ? value : `"${value}"`
@@ -17,7 +17,7 @@ export default async function nodeRc(compiler: NexeCompiler, next: () => Promise
`VALUE "${key}", ${value}`
)
})
;['PRODUCTVERSION', 'FILEVERSION'].forEach(x => {
;['PRODUCTVERSION', 'FILEVERSION'].forEach((x) => {
if (options[x]) {
file.contents = file.contents.replace(new RegExp(x + ' .*$', 'm'), `${x} ${options[x]}`)
}
src/patches/snapshot.ts
+1 -1
View File
@@ -2,7 +2,7 @@ import { resolve } from 'path'
import { NexeCompiler } from '../compiler'
import { semverGt } from '../util'
export default async function(compiler: NexeCompiler, next: () => Promise<void>) {
export default async function (compiler: NexeCompiler, next: () => Promise<void>) {
const { snapshot, warmup, cwd } = compiler.options
if (!snapshot) {
src/patches/third-party-main.ts
+1 -1
View File
@@ -42,7 +42,7 @@ export default async function main(compiler: NexeCompiler, next: () => Promise<v
next: true,
globalReturn: true,
node: true,
skipShebang: true
skipShebang: true,
}),
location = { start: { line: 0 } }
src/releases.ts
+5 -8
View File
@@ -2,7 +2,7 @@ import got = require('got')
import { platforms, architectures, NexeTarget, getTarget, targetsEqual } from './target'
export { NexeTarget }
const versionsToSkip = [0, 1, 2, 3, 4, 5, 7, 9, 11, 13, 15, 17, 19, 21, 22]
const versionsToSkip = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 13, 15, 17, 19, 21, 22]
export interface GitAsset {
name: string
url: string
@@ -28,9 +28,6 @@ function isBuildableVersion(version: string) {
if (version === '12.11.0') {
return false
}
if (version === '4.9.1') {
return true
}
return !versionsToSkip.includes(Number(version.split('.')[0]))
}
@@ -42,7 +39,7 @@ export async function getUnBuiltReleases(options?: any) {
const nodeReleases = await getJson<NodeRelease[]>(
'https://nodejs.org/download/release/index.json'
)
const existingVersions = (await getLatestGitRelease(options)).assets.map(x => getTarget(x.name))
const existingVersions = (await getLatestGitRelease(options)).assets.map((x) => getTarget(x.name))
const versionMap: { [key: string]: true } = {}
return nodeReleases
@@ -52,8 +49,8 @@ export async function getUnBuiltReleases(options?: any) {
return versions
}
versionMap[version] = true
platforms.forEach(platform => {
architectures.forEach(arch => {
platforms.forEach((platform) => {
architectures.forEach((arch) => {
if (arch === 'x86' && platform === 'mac') return
if (arch.includes('arm')) return
versions.push(getTarget({ platform, arch, version }))
@@ -61,5 +58,5 @@ export async function getUnBuiltReleases(options?: any) {
})
return versions
}, [])
.filter(x => !existingVersions.some(t => targetsEqual(t, x)))
.filter((x) => !existingVersions.some((t) => targetsEqual(t, x)))
}
src/steps/artifacts.ts
+11 -13
View File
@@ -1,29 +1,27 @@
import { join, dirname } from 'path'
import { readdir, unlink } from 'fs'
import { promises } from 'fs'
import { readFileAsync, writeFileAsync, isDirectoryAsync } from '../util'
import * as mkdirp from 'mkdirp'
import mkdirpAsync = require('mkdirp')
import { NexeCompiler } from '../compiler'
import pify = require('pify')
const mkdirpAsync = pify(mkdirp)
const unlinkAsync = pify(unlink)
const readdirAsync = pify(readdir)
const unlinkAsync = promises.unlink
const readdirAsync = promises.readdir
function readDirAsync(dir: string): Promise<string[]> {
return readdirAsync(dir).then(paths => {
return readdirAsync(dir).then((paths) => {
return Promise.all(
paths.map((file: string) => {
const path = join(dir, file)
return isDirectoryAsync(path).then(x => (x ? readDirAsync(path) : (path as any)))
return isDirectoryAsync(path).then((x) => (x ? readDirAsync(path) : (path as any)))
})
).then(result => {
).then((result) => {
return [].concat(...(result as any))
})
})
}
function maybeReadFileContentsAsync(file: string) {
return readFileAsync(file, 'utf-8').catch(e => {
return readFileAsync(file, 'utf-8').catch((e) => {
if (e.code === 'ENOENT') {
return ''
}
@@ -47,16 +45,16 @@ export default async function artifacts(compiler: NexeCompiler, next: () => Prom
const tmpFiles = await readDirAsync(temp)
await Promise.all(
tmpFiles.map(async path => {
tmpFiles.map(async (path) => {
return compiler.writeFileAsync(path.replace(temp, ''), await readFileAsync(path, 'utf-8'))
})
)
await next()
await Promise.all(tmpFiles.map(x => unlinkAsync(x)))
await Promise.all(tmpFiles.map((x) => unlinkAsync(x)))
return Promise.all(
compiler.files.map(async file => {
compiler.files.map(async (file) => {
const sourceFile = join(src, file.filename)
const tempFile = join(temp, file.filename)
const fileContents = await maybeReadFileContentsAsync(sourceFile)
src/steps/bundle.ts
+4 -4
View File
@@ -7,7 +7,7 @@ import { Readable } from 'stream'
function getStdIn(stdin: Readable): Promise<string> {
let out = ''
return new Promise(resolve => {
return new Promise((resolve) => {
stdin
.setEncoding('utf8')
.on('readable', () => {
@@ -64,18 +64,18 @@ export default async function bundle(compiler: NexeCompiler, next: any) {
const { files, warnings } = await resolveFiles(
input,
...Object.keys(compiler.bundle.index).filter(x => x.endsWith('.js')),
...Object.keys(compiler.bundle.index).filter((x) => x.endsWith('.js')),
{ cwd, expand: 'variable', loadContent: false }
)
if (
warnings.filter(x => x.startsWith('Error parsing file') && !x.includes('node_modules')).length
warnings.filter((x) => x.startsWith('Error parsing file') && !x.includes('node_modules')).length
) {
throw new NexeError('Parsing Error:\n' + warnings.join('\n'))
}
await each(Object.keys(files), (filename: string) => compiler.addResource(filename), {
concurrency: 10
concurrency: 10,
})
return next()
}
src/steps/download.ts
+2 -2
View File
@@ -11,7 +11,7 @@ function fetchNodeSourceAsync(dest: string, url: string, step: LogStep, options
.on('response', (res: IncomingMessage) => {
const total = +res.headers['content-length']!
let current = 0
res.on('data', data => {
res.on('data', (data) => {
current += data.length
setText((current / total) * 100)
if (current === total) {
@@ -32,7 +32,7 @@ async function fetchPrebuiltBinary(compiler: NexeCompiler, step: any) {
(res: IncomingMessage) => {
const total = +res.headers['content-length']!
let current = 0
res.on('data', data => {
res.on('data', (data) => {
current += data.length
step!.modify(`Downloading...${((current / total) * 100).toFixed()}%`)
})
src/steps/resource.ts
+2 -2
View File
@@ -12,9 +12,9 @@ export default async function resource(compiler: NexeCompiler, next: () => Promi
// workaround for https://github.com/sindresorhus/globby/issues/127
// and https://github.com/mrmlnc/fast-glob#pattern-syntax
const resourcesWithForwardSlashes = resources.map(r => r.replace(/\\/g, '/'))
const resourcesWithForwardSlashes = resources.map((r) => r.replace(/\\/g, '/'))
await each(globs(resourcesWithForwardSlashes, { cwd }), async file => {
await each(globs(resourcesWithForwardSlashes, { cwd }), async (file) => {
if (await isDirectoryAsync(file)) {
return
}
src/steps/shim.ts
+1 -1
View File
@@ -1,7 +1,7 @@
import { NexeCompiler } from '../compiler'
import { wrap } from '../util'
export default async function(compiler: NexeCompiler, next: () => Promise<void>) {
export default async function (compiler: NexeCompiler, next: () => Promise<void>) {
await next()
compiler.shims.push(
src/target.ts
+3 -3
View File
@@ -21,7 +21,7 @@ const prettyPlatform: { [key: string]: NodePlatform } = {
mac: 'mac',
linux: 'linux',
static: 'alpine',
alpine: 'alpine'
alpine: 'alpine',
}
const prettyArch: { [key: string]: NodeArch } = {
@@ -35,7 +35,7 @@ const prettyArch: { [key: string]: NodeArch } = {
amd64: 'x64',
ia32: 'x86',
x32: 'x86',
x64: 'x64'
x64: 'x64',
}
function isVersion(x: string) {
@@ -80,7 +80,7 @@ export function getTarget(target: string | Partial<NexeTarget> = ''): NexeTarget
target
.toLowerCase()
.split('-')
.forEach(x => {
.forEach((x) => {
if (isVersion(x)) {
version = x.replace(/v/g, '')
}
src/util.ts
+5 -5
View File
@@ -42,10 +42,10 @@ const bound: MethodDecorator = function bound<T>(
Object.defineProperty(this, propertyKey as string, {
configurable,
value,
writable: true
writable: true,
})
return value
}
},
}
}
@@ -72,13 +72,13 @@ const isWindows = process.platform === 'win32'
function pathExistsAsync(path: string) {
return statAsync(path)
.then(x => true)
.then((x) => true)
.catch(falseOnEnoent)
}
function isDirectoryAsync(path: string) {
return statAsync(path)
.then(x => x.isDirectory())
.then((x) => x.isDirectory())
.catch(falseOnEnoent)
}
/**
@@ -109,5 +109,5 @@ export {
readFileAsync,
pathExistsAsync,
isDirectoryAsync,
writeFileAsync
writeFileAsync,
}