From 8f6135edf46584f009633fa82436ed16037f6cc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=96=E7=8C=A9?= Date: Wed, 6 Mar 2019 20:54:07 +0800 Subject: [PATCH] fix: ets not found (#124) --- .gitignore | 1 + .travis.yml | 1 + appveyor.yml | 1 + bin/ets.js | 5 +++++ package.json | 3 ++- test/ets-bin.test.js | 29 +++++++++++++++++++++++++++++ 6 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 bin/ets.js create mode 100644 test/ets-bin.test.js diff --git a/.gitignore b/.gitignore index 6a505f28..2d4a0d45 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ test/fixtures/example-ts-ets/typings/ *.log package-lock.json .nyc_output +yarn.lock \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 7212f2a9..924dff05 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ language: node_js node_js: - '6' - '8' + - '10' env: - EGG_VERSION=1 - EGG_VERSION=2 diff --git a/appveyor.yml b/appveyor.yml index c274b7d3..981e82b0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,7 @@ environment: matrix: - nodejs_version: '8' + - nodejs_version: '10' install: - ps: Install-Product node $env:nodejs_version diff --git a/bin/ets.js b/bin/ets.js new file mode 100644 index 00000000..ef248191 --- /dev/null +++ b/bin/ets.js @@ -0,0 +1,5 @@ +#!/usr/bin/env node + +'use strict'; + +require('egg-ts-helper/dist/bin'); diff --git a/package.json b/package.json index 9c6a4c26..2f888612 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,8 @@ "main": "index.js", "bin": { "egg-bin": "bin/egg-bin.js", - "mocha": "bin/mocha.js" + "mocha": "bin/mocha.js", + "ets": "bin/ets.js" }, "dependencies": { "autod": "^3.0.1", diff --git a/test/ets-bin.test.js b/test/ets-bin.test.js new file mode 100644 index 00000000..b2491fec --- /dev/null +++ b/test/ets-bin.test.js @@ -0,0 +1,29 @@ +'use strict'; + +const path = require('path'); +const coffee = require('coffee'); +const semver = require('semver'); + +describe('test/ets-bin.test.js', () => { + const etsBin = require.resolve('../bin/ets.js'); + const cwd = path.join(__dirname, 'fixtures/example-ts-ets'); + + it('should test with ets', () => { + const higherVersion = semver.gte(process.version, '8.0.0'); + if (!higherVersion) { + // skip 6.x, egg-ts-helper only works in >=8.0.0 + return; + } + + return coffee.fork(etsBin, [], { + cwd, + env: Object.assign({}, process.env, { + ETS_SILENT: 'false', + }), + }) + // .debug() + .expect('stdout', /\[egg-ts-helper\] create/) + .expect('code', 0) + .end(); + }); +});