diff --git a/bin/app-inspector.js b/bin/app-inspector.js index 6740177..e36b696 100755 --- a/bin/app-inspector.js +++ b/bin/app-inspector.js @@ -23,11 +23,11 @@ const options = { const EOL = require('os').EOL; program - .option('-p, --port ', 'port to use (5678 default)') - .option('-u, --udid ', 'udid of device') - .option('-s, --silent', 'start without opening browser') - .option('--verbose', 'show more debugging information') - .option('-v, --versions', 'output version infomation') + .option('-p, --port ', 'port to use (5678 default)') + .option('-u, --udid ', 'udid of device') + .option('-s, --silent', 'start without opening browser') + .option('--verbose', 'show more debugging information') + .option('-v, --versions', 'output version infomation') .usage(''); program.parse(process.argv); @@ -48,6 +48,7 @@ var printInfo = function(lines) { console.log(chalk.white(`${EOL}${res.join(EOL)}${EOL}`)); }; +// eslint-disable-next-line handle-callback-err function init(error, data) { if (data && data.version && pkg.version !== data.version) { printInfo([`version ${pkg.version} is outdate`, `run: npm i -g ${pkg.name}@${data.version}`]); diff --git a/package.json b/package.json index dd2aa12..374de16 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ }, "devDependencies": { "babel-core": "^6.13.2", - "babel-loader": "^6.2.5", + "babel-loader": "^7.1.5", "babel-preset-es2015": "^6.13.2", "babel-preset-react": "^6.11.1", "command-line-test": "^1.0.5", @@ -46,7 +46,7 @@ "json-loader": "^0.5.4", "koa-webpack-dev-middleware": "^1.2.2", "less": "^2.7.1", - "less-loader": "^2.2.3", + "less-loader": "^4.1.0", "macaca-ecosystem": "*", "mocha": "*", "nyc": "^11.8.0", @@ -55,14 +55,16 @@ "react-dom": "^15.2.1", "react-github-button": "0.1.11", "style-loader": "^0.13.1", + "terser": "^3.14.1", "vuepress": "^0.14.8", "webpack": "^4.28.2", + "webpack-cli": "^3.2.1", "whatwg-fetch": "^1.0.0" }, "scripts": { "test": "nyc --reporter=lcov --reporter=text mocha", "lint": "eslint --fix .", - "start": "APP_INSPECTOR=dev ./bin/app-inspector -u UID --verbose", + "start": "APP_INSPECTOR=dev ./bin/app-inspector.js -u UID --verbose", "build": "webpack -p", "watch": "webpack --watch", "prepublish": "npm run build", diff --git a/webpack.config.js b/webpack.config.js index 92f2fef..aff8cf0 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -12,7 +12,7 @@ module.exports = { filename: '[name].js' }, resolve: { - extensions: ['', '.jsx', '.js'] + extensions: ['.jsx', '.js'] }, externals: [ { @@ -21,23 +21,18 @@ module.exports = { } ], module: { - loaders: [ + rules: [ { test: /\.css/, - loader: 'style!css' + loader: 'style-loader!css-loader' }, { test: /\.less$/, - loader: 'style!css!less' + loader: 'style-loader!css-loader!less-loader' }, { test: /\.jsx?$/, - loader: 'babel', - exclude: /node_modules/ - }, - { - test: /\.json$/, - loader: 'json', + loader: 'babel-loader', exclude: /node_modules/ } ]