diff --git a/.eslintignore b/.eslintignore index 9344d5af..a4d4e9a0 100644 --- a/.eslintignore +++ b/.eslintignore @@ -7,4 +7,5 @@ app/node_modules assets website bin -dist \ No newline at end of file +dist +target \ No newline at end of file diff --git a/.gitignore b/.gitignore index 5f971840..bc701a5b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ # build output dist app/renderer -compiled_app +target bin/cli.* # dependencies diff --git a/package.json b/package.json index 2385aaa5..163a1c12 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "repository": "zeit/hyper", "scripts": { "start": "echo 'please run `yarn run dev` in one tab and then `yarn run app` in another one'", - "app": "electron compiled_app", + "app": "electron target", "dev": "webpack -w", "build": "cross-env NODE_ENV=production webpack", "lint": "eslint . --ext .js,.jsx,.ts,.tsx", @@ -15,7 +15,7 @@ "postinstall": "electron-builder install-app-deps && yarn run rebuild-node-pty", "rebuild-node-pty": "electron-rebuild -f -w app/node_modules/node-pty -m app", "dist": - "yarn run build && cross-env BABEL_ENV=production babel --out-file compiled_app/renderer/bundle.js --no-comments --minified compiled_app/renderer/bundle.js && build", + "yarn run build && cross-env BABEL_ENV=production babel --out-file target/renderer/bundle.js --no-comments --minified target/renderer/bundle.js && build", "clean": "node ./bin/rimraf-standalone.js node_modules && node ./bin/rimraf-standalone.js ./app/node_modules && node ./bin/rimraf-standalone.js ./app/renderer" }, "eslintConfig": { diff --git a/tsconfig.json b/tsconfig.json index 9082bc22..f14eb31d 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -8,7 +8,7 @@ "lib": ["dom", "es2017"], "module": "commonjs", "moduleResolution": "node", - "outDir": "./compiled_app/", + "outDir": "./target/", "preserveConstEnums": true, "removeComments": false, "resolveJsonModule": true, diff --git a/webpack.config.js b/webpack.config.js index c9c17823..d7480dd0 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -17,7 +17,7 @@ module.exports = [ }, entry: './app/index.js', output: { - path: path.join(__dirname, 'compiled_app'), + path: path.join(__dirname, 'target'), filename: 'ignore_this.js' }, module: { @@ -58,7 +58,7 @@ module.exports = [ { apply: compiler => { compiler.hooks.afterEmit.tap('AfterEmitPlugin', () => { - exec('cp -r ./app/node_modules ./compiled_app && tsc', (err, stdout, stderr) => { + exec('cp -r ./app/node_modules ./target && tsc', (err, stdout, stderr) => { if (stdout) process.stdout.write(stdout); if (stderr) process.stderr.write(stderr); process.stdout.write('\nCompiled\n\n'); @@ -80,7 +80,7 @@ module.exports = [ devtool: isProd ? 'hidden-source-map' : 'cheap-module-source-map', entry: './lib/index.js', output: { - path: path.join(__dirname, 'compiled_app', 'renderer'), + path: path.join(__dirname, 'target', 'renderer'), filename: 'bundle.js' }, module: {