Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| d2756a5f75 | |||
| 255f3887c7 |
@@ -1,6 +1,7 @@
|
|||||||
.DS_Store
|
.DS_Store
|
||||||
temp/
|
temp/
|
||||||
coverage
|
coverage
|
||||||
|
nexe
|
||||||
node_modules
|
node_modules
|
||||||
*.log
|
*.log
|
||||||
*.exe
|
*.exe
|
||||||
|
|||||||
Generated
+31
-19
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "nexe",
|
"name": "nexe",
|
||||||
"version": "3.0.2",
|
"version": "3.0.3",
|
||||||
"lockfileVersion": 1,
|
"lockfileVersion": 1,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
@@ -183,9 +183,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"@types/semver": {
|
"@types/semver": {
|
||||||
"version": "5.5.0",
|
"version": "6.0.0",
|
||||||
"resolved": "https://registry.npmjs.org/@types/semver/-/semver-5.5.0.tgz",
|
"resolved": "https://registry.npmjs.org/@types/semver/-/semver-6.0.0.tgz",
|
||||||
"integrity": "sha512-41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ==",
|
"integrity": "sha512-OO0srjOGH99a4LUN2its3+r6CBYcplhJ466yLqs+zvAWgphCpS8hYZEZ797tRDP/QKcqTdb/YCN6ifASoAWkrQ==",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"@types/tough-cookie": {
|
"@types/tough-cookie": {
|
||||||
@@ -710,9 +710,9 @@
|
|||||||
"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
|
"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
|
||||||
},
|
},
|
||||||
"commander": {
|
"commander": {
|
||||||
"version": "2.19.0",
|
"version": "2.20.0",
|
||||||
"resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
|
"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz",
|
||||||
"integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==",
|
"integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"component-emitter": {
|
"component-emitter": {
|
||||||
@@ -1526,13 +1526,13 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"globby": {
|
"globby": {
|
||||||
"version": "9.1.0",
|
"version": "9.2.0",
|
||||||
"resolved": "https://registry.npmjs.org/globby/-/globby-9.1.0.tgz",
|
"resolved": "https://registry.npmjs.org/globby/-/globby-9.2.0.tgz",
|
||||||
"integrity": "sha512-VtYjhHr7ncls724Of5W6Kaahz0ag7dB4G62/2HsN+xEKG6SrPzM1AJMerGxQTwJGnN9reeyxdvXbuZYpfssCvg==",
|
"integrity": "sha512-ollPHROa5mcxDEkwg6bPt3QbEf4pDQSNtd6JPL1YvOvAo/7/0VAm9TccUeoTmarjPw4pfUthSCqcyfNB1I3ZSg==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"@types/glob": "^7.1.1",
|
"@types/glob": "^7.1.1",
|
||||||
"array-union": "^1.0.2",
|
"array-union": "^1.0.2",
|
||||||
"dir-glob": "^2.2.1",
|
"dir-glob": "^2.2.2",
|
||||||
"fast-glob": "^2.2.6",
|
"fast-glob": "^2.2.6",
|
||||||
"glob": "^7.1.3",
|
"glob": "^7.1.3",
|
||||||
"ignore": "^4.0.3",
|
"ignore": "^4.0.3",
|
||||||
@@ -2463,15 +2463,15 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"ora": {
|
"ora": {
|
||||||
"version": "3.2.0",
|
"version": "3.4.0",
|
||||||
"resolved": "https://registry.npmjs.org/ora/-/ora-3.2.0.tgz",
|
"resolved": "https://registry.npmjs.org/ora/-/ora-3.4.0.tgz",
|
||||||
"integrity": "sha512-XHMZA5WieCbtg+tu0uPF8CjvwQdNzKCX6BVh3N6GFsEXH40mTk5dsw/ya1lBTUGJslcEFJFQ8cBhOgkkZXQtMA==",
|
"integrity": "sha512-eNwHudNbO1folBP3JsZ19v9azXWtQZjICdr3Q0TDPIaeBQ3mXLrh54wM+er0+hSp+dWKf+Z8KM58CYzEyIYxYg==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"chalk": "^2.4.2",
|
"chalk": "^2.4.2",
|
||||||
"cli-cursor": "^2.1.0",
|
"cli-cursor": "^2.1.0",
|
||||||
"cli-spinners": "^2.0.0",
|
"cli-spinners": "^2.0.0",
|
||||||
"log-symbols": "^2.2.0",
|
"log-symbols": "^2.2.0",
|
||||||
"strip-ansi": "^5.0.0",
|
"strip-ansi": "^5.2.0",
|
||||||
"wcwidth": "^1.0.1"
|
"wcwidth": "^1.0.1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -3255,9 +3255,9 @@
|
|||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"tslint": {
|
"tslint": {
|
||||||
"version": "5.14.0",
|
"version": "5.15.0",
|
||||||
"resolved": "https://registry.npmjs.org/tslint/-/tslint-5.14.0.tgz",
|
"resolved": "https://registry.npmjs.org/tslint/-/tslint-5.15.0.tgz",
|
||||||
"integrity": "sha512-IUla/ieHVnB8Le7LdQFRGlVJid2T/gaJe5VkjzRVSRR6pA2ODYrnfR1hmxi+5+au9l50jBwpbBL34txgv4NnTQ==",
|
"integrity": "sha512-6bIEujKR21/3nyeoX2uBnE8s+tMXCQXhqMmaIPJpHmXJoBJPTLcI7/VHRtUwMhnLVdwLqqY3zmd8Dxqa5CVdJA==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"babel-code-frame": "^6.22.0",
|
"babel-code-frame": "^6.22.0",
|
||||||
@@ -3266,13 +3266,25 @@
|
|||||||
"commander": "^2.12.1",
|
"commander": "^2.12.1",
|
||||||
"diff": "^3.2.0",
|
"diff": "^3.2.0",
|
||||||
"glob": "^7.1.1",
|
"glob": "^7.1.1",
|
||||||
"js-yaml": "^3.7.0",
|
"js-yaml": "^3.13.0",
|
||||||
"minimatch": "^3.0.4",
|
"minimatch": "^3.0.4",
|
||||||
"mkdirp": "^0.5.1",
|
"mkdirp": "^0.5.1",
|
||||||
"resolve": "^1.3.2",
|
"resolve": "^1.3.2",
|
||||||
"semver": "^5.3.0",
|
"semver": "^5.3.0",
|
||||||
"tslib": "^1.8.0",
|
"tslib": "^1.8.0",
|
||||||
"tsutils": "^2.29.0"
|
"tsutils": "^2.29.0"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"js-yaml": {
|
||||||
|
"version": "3.13.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.0.tgz",
|
||||||
|
"integrity": "sha512-pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ==",
|
||||||
|
"dev": true,
|
||||||
|
"requires": {
|
||||||
|
"argparse": "^1.0.7",
|
||||||
|
"esprima": "^4.0.0"
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"tslint-config-prettier": {
|
"tslint-config-prettier": {
|
||||||
|
|||||||
+5
-5
@@ -2,7 +2,7 @@
|
|||||||
"name": "nexe",
|
"name": "nexe",
|
||||||
"description": "Create a single executable out of your Node.js application",
|
"description": "Create a single executable out of your Node.js application",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"version": "3.0.2",
|
"version": "3.0.3",
|
||||||
"contributors": [
|
"contributors": [
|
||||||
"Craig Condon <craig.j.condon@gmail.com> (http://crcn.io)",
|
"Craig Condon <craig.j.condon@gmail.com> (http://crcn.io)",
|
||||||
"Jared Allard <jaredallard@outlook.com>",
|
"Jared Allard <jaredallard@outlook.com>",
|
||||||
@@ -39,12 +39,12 @@
|
|||||||
"chalk": "^2.4.2",
|
"chalk": "^2.4.2",
|
||||||
"cherow": "1.6.9",
|
"cherow": "1.6.9",
|
||||||
"download": "^7.1.0",
|
"download": "^7.1.0",
|
||||||
"globby": "^9.1.0",
|
"globby": "^9.2.0",
|
||||||
"got": "^9.6.0",
|
"got": "^9.6.0",
|
||||||
"minimist": "^1.2.0",
|
"minimist": "^1.2.0",
|
||||||
"mkdirp": "^0.5.1",
|
"mkdirp": "^0.5.1",
|
||||||
"multistream": "^2.1.1",
|
"multistream": "^2.1.1",
|
||||||
"ora": "^3.2.0",
|
"ora": "^3.4.0",
|
||||||
"pify": "^4.0.1",
|
"pify": "^4.0.1",
|
||||||
"resolve-dependencies": "^2.2.2",
|
"resolve-dependencies": "^2.2.2",
|
||||||
"rimraf": "^2.6.3"
|
"rimraf": "^2.6.3"
|
||||||
@@ -62,13 +62,13 @@
|
|||||||
"@types/ora": "^3.2.0",
|
"@types/ora": "^3.2.0",
|
||||||
"@types/pify": "3.0.2",
|
"@types/pify": "3.0.2",
|
||||||
"@types/rimraf": "2.0.2",
|
"@types/rimraf": "2.0.2",
|
||||||
"@types/semver": "^5.5.0",
|
"@types/semver": "^6.0.0",
|
||||||
"chai": "^4.2.0",
|
"chai": "^4.2.0",
|
||||||
"execa": "^1.0.0",
|
"execa": "^1.0.0",
|
||||||
"mocha": "^6.0.2",
|
"mocha": "^6.0.2",
|
||||||
"prettier": "^1.16.4",
|
"prettier": "^1.16.4",
|
||||||
"ts-node": "^8.0.3",
|
"ts-node": "^8.0.3",
|
||||||
"tslint": "^5.14.0",
|
"tslint": "^5.15.0",
|
||||||
"tslint-config-prettier": "^1.18.0",
|
"tslint-config-prettier": "^1.18.0",
|
||||||
"tslint-plugin-prettier": "^2.0.1",
|
"tslint-plugin-prettier": "^2.0.1",
|
||||||
"typescript": "^3.4.1"
|
"typescript": "^3.4.1"
|
||||||
|
|||||||
@@ -37,11 +37,7 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
|
|||||||
notAFile = '!@#$%^&*',
|
notAFile = '!@#$%^&*',
|
||||||
isWin = process.platform.startsWith('win'),
|
isWin = process.platform.startsWith('win'),
|
||||||
isString = (x: any): x is string => typeof x === 'string' || x instanceof String,
|
isString = (x: any): x is string => typeof x === 'string' || x instanceof String,
|
||||||
isNotFile = () => false,
|
|
||||||
isNotDirectory = isNotFile,
|
|
||||||
isFile = () => true,
|
|
||||||
noop = () => {},
|
noop = () => {},
|
||||||
isDirectory = isFile,
|
|
||||||
path = require('path')
|
path = require('path')
|
||||||
|
|
||||||
let log = (text: string) => true
|
let log = (text: string) => true
|
||||||
|
|||||||
+13
-5
@@ -1,7 +1,7 @@
|
|||||||
import { NexeCompiler, NexeError } from '../compiler'
|
import { NexeCompiler, NexeError } from '../compiler'
|
||||||
import { resolve, relative } from 'path'
|
import { resolve, relative } from 'path'
|
||||||
import { each } from '@calebboyd/semaphore'
|
import { each } from '@calebboyd/semaphore'
|
||||||
import resolveFiles from 'resolve-dependencies'
|
import resolveFiles, { resolveFileNameSync } from 'resolve-dependencies'
|
||||||
import { dequote, STDIN_FLAG } from '../util'
|
import { dequote, STDIN_FLAG } from '../util'
|
||||||
import { Readable } from 'stream'
|
import { Readable } from 'stream'
|
||||||
|
|
||||||
@@ -16,12 +16,13 @@ function getStdIn(stdin: Readable): Promise<string> {
|
|||||||
out += current
|
out += current
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.on('end', () => resolve(out))
|
.on('end', () => resolve(out.trim()))
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
export default async function bundle(compiler: NexeCompiler, next: any) {
|
export default async function bundle(compiler: NexeCompiler, next: any) {
|
||||||
const { bundle, cwd, input } = compiler.options
|
const { bundle, cwd, input: inputPath } = compiler.options
|
||||||
|
let input = inputPath
|
||||||
compiler.entrypoint = './' + relative(cwd, input)
|
compiler.entrypoint = './' + relative(cwd, input)
|
||||||
compiler.startup = ';require("module").runMain();'
|
compiler.startup = ';require("module").runMain();'
|
||||||
|
|
||||||
@@ -35,14 +36,21 @@ export default async function bundle(compiler: NexeCompiler, next: any) {
|
|||||||
code = await require(bundle).createBundle(compiler.options)
|
code = await require(bundle).createBundle(compiler.options)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (input === STDIN_FLAG) {
|
if (input === STDIN_FLAG && (code = code || dequote(await getStdIn(process.stdin)))) {
|
||||||
compiler.stdinUsed = true
|
compiler.stdinUsed = true
|
||||||
compiler.entrypoint = './__nexe_stdin.js'
|
compiler.entrypoint = './__nexe_stdin.js'
|
||||||
code = code || dequote(await getStdIn(process.stdin))
|
|
||||||
await compiler.addResource(resolve(cwd, compiler.entrypoint), code)
|
await compiler.addResource(resolve(cwd, compiler.entrypoint), code)
|
||||||
return next()
|
return next()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (input === STDIN_FLAG) {
|
||||||
|
const maybeInput = resolveFileNameSync(cwd, '.')
|
||||||
|
if (!maybeInput) {
|
||||||
|
throw new NexeError('No valid input detected')
|
||||||
|
}
|
||||||
|
input = maybeInput.absPath
|
||||||
|
}
|
||||||
|
|
||||||
const { files, warnings } = await resolveFiles(
|
const { files, warnings } = await resolveFiles(
|
||||||
input,
|
input,
|
||||||
...Object.keys(compiler.bundle.index).filter(x => x.endsWith('.js')),
|
...Object.keys(compiler.bundle.index).filter(x => x.endsWith('.js')),
|
||||||
|
|||||||
Reference in New Issue
Block a user