fix: error on missing entry

closes nexe#467

closes nexe#464

Author: calebboyd

package-lock.json

@@ -48,22 +48,22 @@
   },
   "devDependencies": {
     "@types/chai": "^4.1.2",
-    "@types/execa": "^0.8.1",
+    "@types/execa": "^0.9.0",
     "@types/globby": "^6.1.0",
     "@types/minimist": "^1.2.0",
     "@types/mkdirp": "^0.5.2",
     "@types/mocha": "^2.2.48",
-    "@types/ora": "^1.3.1",
-    "@types/pify": "3.0.0",
+    "@types/ora": "^1.3.3",
+    "@types/pify": "3.0.1",
     "@types/rimraf": "2.0.2",
     "chai": "^4.1.2",
-    "execa": "^0.9.0",
-    "mocha": "^5.0.0",
-    "prettier": "^1.10.2",
-    "ts-node": "4.1.0",
+    "execa": "^0.10.0",
+    "mocha": "^5.0.4",
+    "prettier": "^1.11.1",
+    "ts-node": "5.0.1",
     "tslint": "^5.9.1",
-    "tslint-config-prettier": "^1.7.0",
+    "tslint-config-prettier": "^1.10.0",
     "tslint-plugin-prettier": "^1.3.0",
-    "typescript": "2.7.1"
+    "typescript": "2.7.2"
   }
 }

package.json

@@ -4,8 +4,10 @@ import { isWindows, padRight } from './util'
 import { basename, extname, join, isAbsolute, relative, dirname, resolve } from 'path'
 import { getTarget, NexeTarget } from './target'
 import { EOL, homedir } from 'os'
-import c from 'chalk'
+import chalk from 'chalk'
+import { resolveFileName } from 'resolve-dependencies'
 const caw = require('caw')
+const c = process.platform === 'win32' ? chalk.constructor({ enabled: false }) : chalk
 
 export const version = '{{replace:0}}'
 
@@ -150,16 +152,6 @@ function extractCliMap(match: RegExp, options: any) {
     )
 }
 
-function tryResolveMainFileName(cwd: string) {
-  let filename
-  try {
-    const file = require.resolve(cwd)
-    filename = basename(file).replace(extname(file), '')
-  } catch (_) {}
-
-  return filename ? filename : 'nexe_' + Date.now()
-}
-
 function extractLogLevel(options: NexeOptions) {
   if (options.loglevel) return options.loglevel
   if (options.silent) return 'silent'
@@ -173,14 +165,11 @@ function isName(name: string) {
 
 function extractName(options: NexeOptions) {
   let name = options.name
+  //try and use the input filename as the output filename if its not index
   if (!isName(name) && typeof options.input === 'string') {
     name = basename(options.input).replace(extname(options.input), '')
   }
-
-  if (!isName(name)) {
-    name = tryResolveMainFileName(options.cwd)
-  }
-
+  //try and use the directory as the filename
   if (!isName(name) && basename(options.cwd)) {
     name = basename(options.cwd)
   }
@@ -189,29 +178,31 @@ function extractName(options: NexeOptions) {
 }
 
 function isEntryFile(filename?: string): filename is string {
-  return Boolean(
-    filename && !isAbsolute(filename) && filename !== 'node' && /\.(tsx?|jsx?)$/.test(filename)
-  )
+  return Boolean(filename && !isAbsolute(filename))
 }
 
 export function resolveEntry(input: string, cwd: string, maybeEntry?: string) {
   if (input === '-' || maybeEntry === '-') {
     return ''
   }
+  let result = null
   if (input) {
-    return resolve(cwd, input)
+    result = resolveFileName(cwd, input, { silent: true })
   }
   if (isEntryFile(maybeEntry)) {
-    return resolve(cwd, maybeEntry)
+    result = resolveFileName(cwd, maybeEntry, { silent: true })
   }
   if (!process.stdin.isTTY) {
     return ''
   }
-  try {
-    return require.resolve(cwd)
-  } catch (e) {
-    throw new Error('No entry file found')
+
+  if (!result || !result.absPath) {
+    result = resolveFileName(cwd, '.', { silent: true })
   }
+
+  if (!result.absPath) throw new Error(`Entry file "${input}" not found!`)
+
+  return result.absPath
 }
 
 function isCli(options?: Partial<NexeOptions>) {

src/options.ts

@@ -11,9 +11,8 @@ export default async function snapshot(compiler: NexeCompiler, next: () => Promi
   await compiler.replaceInFileAsync(
     'configure',
     'def configure_v8(o):',
-    `def configure_v8(o):\n  o['variables']['embed_script'] = '${
-      snapshotFile
-    }'\n  o['variables']['warmup_script'] = '${warmupScript || snapshotFile}'`
+    `def configure_v8(o):\n  o['variables']['embed_script'] = '${snapshotFile}'\n  o['variables']['warmup_script'] = '${warmupScript ||
+      snapshotFile}'`
   )
 
   return next()

src/patches/snapshot.ts

@@ -6,9 +6,9 @@ const { env } = process
 
 export function triggerMacBuild(release: NexeTarget, branch: string) {
   assert.ok(env.CIRCLE_TOKEN)
-  const circle = `https://circleci.com/api/v1.1/project/github/nexe/nexe/tree/${
-    branch
-  }?circle-token=${env.CIRCLE_TOKEN}`
+  const circle = `https://circleci.com/api/v1.1/project/github/nexe/nexe/tree/${branch}?circle-token=${
+    env.CIRCLE_TOKEN
+  }`
   return got(circle, {
     json: true,
     body: {

tasks/ci.ts

@@ -0,0 +1 @@
+module.exports = 'abc'

test/fixture/dependency.js

@@ -0,0 +1 @@
+console.log('hello world', require('./dependency'))

test/fixture/entry.js

@@ -1,3 +1,3 @@
 {
-  "main": "entry-file.js"
+  "main": "entry.js"
 }

test/fixture/package.json

@@ -15,15 +15,15 @@ describe('options', () => {
       expect(options.input).to.equal(path.resolve('./index.js'))
     })
     it('should resolve pathed options against cwd', () => {
-      const cwd = '/a/b/c'
+      const cwd = path.join(process.cwd(), 'test/fixture')
       const options = normalizeOptions({
         cwd,
-        input: '123.js',
+        input: 'entry',
         output: 'abc',
         temp: './d'
       })
       expect(options.temp).to.equal(path.resolve(cwd, './d'))
-      expect(options.input).to.equal(path.resolve(cwd, '123.js'))
+      expect(options.input).to.equal(path.resolve(cwd, 'entry.js'))
       expect(options.output).to.equal(path.resolve(cwd, `abc${ext}`))
     })
   })
@@ -36,9 +36,9 @@ describe('options', () => {
     })
     it('should default to the input file name if not index', () => {
       const options = normalizeOptions({
-        input: 'src/folder/app.js'
+        input: './test/fixture'
       })
-      expect(options.output).to.equal(path.resolve(`./app${ext}`))
+      expect(options.output).to.equal(path.resolve(`./entry${ext}`))
     })
     it('should default to the folder/project name if filename is index', () => {
       const options = normalizeOptions()

test/options.spec.ts

@@ -1,8 +1,8 @@
 import { padRight, isWindows } from '../src/util'
 import { expect } from 'chai'
-import { blue as b } from 'chalk'
+import chalk from 'chalk'
 import { getTarget, NexeTarget } from '../src/target'
-
+const b = chalk.blue
 const arch = process.arch === 'ia32' ? 'x86' : process.arch
 
 describe('Targets', () => {