From 89ea7a478f1a7f4ced2b91bd3ba6830e4f5e82e0 Mon Sep 17 00:00:00 2001
From: agrozyme <agrozyme@gmail.com>
Date: Thu, 3 Dec 2020 13:48:10 +0800
Subject: [PATCH 1/2] add support @nuxt/typescript-runtime@2.0.0

---
 .gitignore                                    |  4 +
 examples/_template/ts/main/background.ts      |  9 +--
 .../ts/main/helpers/create-window.ts          | 74 +++++++++----------
 .../ts/main/helpers/exit-on-change.ts         |  2 +-
 examples/_template/ts/main/helpers/index.ts   |  5 +-
 examples/with-typescript/package.json         | 13 ++--
 .../with-typescript/renderer/assets/README.md |  7 ++
 .../renderer/components/Logo.vue              | 26 +++++++
 .../renderer/components/README.md             |  7 ++
 .../renderer/layouts/README.md                |  7 ++
 .../renderer/layouts/default.vue              | 59 +++++++++++++++
 .../renderer/middleware/README.md             |  8 ++
 .../with-typescript/renderer/nuxt.config.js   | 10 ---
 .../with-typescript/renderer/nuxt.config.ts   | 15 ++++
 .../with-typescript/renderer/pages/README.md  |  6 ++
 .../with-typescript/renderer/pages/about.vue  | 44 +++++------
 .../with-typescript/renderer/pages/home.vue   | 42 ++++++-----
 .../renderer/plugins/README.md                |  7 ++
 .../with-typescript/renderer/static/README.md | 11 +++
 .../with-typescript/renderer/store/README.md  | 10 +++
 .../with-typescript/renderer/tsconfig.json    | 36 +++++++++
 lib/nuxtron-build.ts                          | 30 +++++---
 lib/nuxtron-dev.ts                            | 40 +++++-----
 lib/nuxtron-init.ts                           | 12 +--
 lib/nuxtron-list.ts                           |  8 +-
 lib/nuxtron.ts                                | 32 +++++---
 lib/webpack/build.production.ts               |  8 +-
 lib/webpack/helpers.ts                        | 20 ++---
 lib/webpack/webpack.config.ts                 | 35 +++++----
 package.json                                  | 28 +++----
 30 files changed, 422 insertions(+), 193 deletions(-)
 create mode 100644 examples/with-typescript/renderer/assets/README.md
 create mode 100644 examples/with-typescript/renderer/components/Logo.vue
 create mode 100644 examples/with-typescript/renderer/components/README.md
 create mode 100644 examples/with-typescript/renderer/layouts/README.md
 create mode 100644 examples/with-typescript/renderer/layouts/default.vue
 create mode 100644 examples/with-typescript/renderer/middleware/README.md
 delete mode 100644 examples/with-typescript/renderer/nuxt.config.js
 create mode 100644 examples/with-typescript/renderer/nuxt.config.ts
 create mode 100644 examples/with-typescript/renderer/pages/README.md
 create mode 100644 examples/with-typescript/renderer/plugins/README.md
 create mode 100644 examples/with-typescript/renderer/static/README.md
 create mode 100644 examples/with-typescript/renderer/store/README.md
 create mode 100644 examples/with-typescript/renderer/tsconfig.json

diff --git a/.gitignore b/.gitignore
index a7bac68..6f71286 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,7 @@ pnpm-lock.yaml
 # nuxtron dev output
 bin
 workspace
+
+# ide
+.vscode/
+.idea/
diff --git a/examples/_template/ts/main/background.ts b/examples/_template/ts/main/background.ts
index 29ac34a..01965a9 100644
--- a/examples/_template/ts/main/background.ts
+++ b/examples/_template/ts/main/background.ts
@@ -1,11 +1,8 @@
 import { app } from 'electron';
 import serve from 'electron-serve';
-import {
-  createWindow,
-  exitOnChange,
-} from './helpers';
+import { createWindow, exitOnChange } from './helpers';
 
-const isProd: boolean = process.env.NODE_ENV === 'production';
+const isProd: boolean = 'production' === process.env.NODE_ENV;
 
 if (isProd) {
   serve({ directory: 'app' });
@@ -19,7 +16,7 @@ if (isProd) {
 
   const mainWindow = createWindow('main', {
     width: 1000,
-    height: 600,
+    height: 600
   });
 
   if (isProd) {
diff --git a/examples/_template/ts/main/helpers/create-window.ts b/examples/_template/ts/main/helpers/create-window.ts
index 2713e99..1b846da 100644
--- a/examples/_template/ts/main/helpers/create-window.ts
+++ b/examples/_template/ts/main/helpers/create-window.ts
@@ -1,79 +1,79 @@
-import {
-  screen,
-  BrowserWindow,
-  BrowserWindowConstructorOptions,
-  Rectangle,
-} from 'electron';
+import { BrowserWindow, BrowserWindowConstructorOptions, Rectangle, screen } from 'electron';
 import Store from 'electron-store';
 
 export default (windowName: string, options: BrowserWindowConstructorOptions): BrowserWindow => {
   const key = 'window-state';
   const name = `window-state-${windowName}`;
   const store = new Store({ name });
-  const defaultSize = {
-    width: options.width,
-    height: options.height,
+  const bounds = screen.getPrimaryDisplay().bounds;
+  const defaultSize: Rectangle = {
+    width: options.width ?? bounds.width,
+    height: options.height ?? bounds.height,
+    x: options.x ?? bounds.x,
+    y: options.y ?? bounds.y
   };
-  let state = {};
+
   let win: BrowserWindow;
 
-  const restore = () => store.get(key, defaultSize);
+  const restore = () => <Rectangle>store.get(key, defaultSize);
 
-  const getCurrentPosition = () => {
+  const getCurrentPosition = (): Rectangle => {
     const position = win.getPosition();
     const size = win.getSize();
     return {
       x: position[0],
       y: position[1],
       width: size[0],
-      height: size[1],
+      height: size[1]
     };
   };
 
   const windowWithinBounds = (windowState: Rectangle, bounds: Rectangle) => {
-    return (
-      windowState.x >= bounds.x &&
-      windowState.y >= bounds.y &&
-      windowState.x + windowState.width <= bounds.x + bounds.width &&
+    let test = true;
+
+    const items = [
+      windowState.x >= bounds.x,
+      windowState.y >= bounds.y,
+      windowState.x + windowState.width <= bounds.x + bounds.width,
       windowState.y + windowState.height <= bounds.y + bounds.height
-    );
+    ];
+
+    items.forEach(item => {
+      test = test && item;
+    });
+
+    return test;
   };
 
-  const resetToDefaults = () => {
+  const resetToDefaults = (): Rectangle => {
     const bounds = screen.getPrimaryDisplay().bounds;
     return Object.assign({}, defaultSize, {
       x: (bounds.width - defaultSize.width) / 2,
-      y: (bounds.height - defaultSize.height) / 2,
+      y: (bounds.height - defaultSize.height) / 2
     });
   };
 
   const ensureVisibleOnSomeDisplay = (windowState: Rectangle) => {
-    const visible = screen.getAllDisplays().some(display => {
-      return windowWithinBounds(windowState, display.bounds);
-    });
-    if (!visible) {
-      // Window is partially or fully not visible now.
-      // Reset it to safe defaults.
-      return resetToDefaults();
-    }
-    return windowState;
+    const visible = screen.getAllDisplays().some(display => windowWithinBounds(windowState, display.bounds));
+
+    // Window is partially or fully not visible now.
+    // Reset it to safe defaults.
+    return visible ? windowState : resetToDefaults();
   };
 
   const saveState = () => {
-    if (!win.isMinimized() && !win.isMaximized()) {
-      Object.assign(state, getCurrentPosition());
-    }
-    store.set(key, state);
+    const target = (!win.isMinimized() && !win.isMaximized()) ? Object.assign(state, getCurrentPosition()) : state;
+    store.set(key, target);
   };
 
-  state = ensureVisibleOnSomeDisplay(restore());
+  const state = ensureVisibleOnSomeDisplay(restore());
 
   const browserOptions: BrowserWindowConstructorOptions = {
-    ...options,
-    ...state,
+    ...options, ...state,
     webPreferences: {
       nodeIntegration: true,
-    },
+      contextIsolation: true
+    }
   };
   win = new BrowserWindow(browserOptions);
 
diff --git a/examples/_template/ts/main/helpers/exit-on-change.ts b/examples/_template/ts/main/helpers/exit-on-change.ts
index e831994..a9072e8 100644
--- a/examples/_template/ts/main/helpers/exit-on-change.ts
+++ b/examples/_template/ts/main/helpers/exit-on-change.ts
@@ -1,6 +1,6 @@
+import { app } from 'electron';
 import { watchFile } from 'fs';
 import { join } from 'path';
-import { app } from 'electron';
 
 export default function exitOnChange(): void {
   watchFile(join(process.cwd(), 'app/background.js'), () => {
diff --git a/examples/_template/ts/main/helpers/index.ts b/examples/_template/ts/main/helpers/index.ts
index 36f451b..5ddd8dd 100644
--- a/examples/_template/ts/main/helpers/index.ts
+++ b/examples/_template/ts/main/helpers/index.ts
@@ -1,7 +1,4 @@
 import createWindow from './create-window';
 import exitOnChange from './exit-on-change';
 
-export {
-  createWindow,
-  exitOnChange,
-};
+export { createWindow, exitOnChange };
diff --git a/examples/with-typescript/package.json b/examples/with-typescript/package.json
index 4154d85..191326c 100644
--- a/examples/with-typescript/package.json
+++ b/examples/with-typescript/package.json
@@ -14,12 +14,13 @@
     "electron-store": "^6.0.1"
   },
   "devDependencies": {
-    "@nuxt/typescript": "^2.8.1",
-    "@types/node": "^12.7.12",
-    "electron": "^10.1.5",
+    "@nuxt/types": "^2.14.9",
+    "@nuxt/typescript-build": "^2.0.3",
+    "@nuxt/typescript-runtime": "^2.0.0",
+    "core-js": "^3.8.0",
+    "electron": "^11.0.3",
     "electron-builder": "^22.9.1",
-    "nuxt": "^2.14.7",
-    "nuxtron": "^0.3.1",
-    "typescript": "^3.6.4"
+    "nuxt": "^2.14.9",
+    "nuxtron": "^0.3.1"
   }
 }
diff --git a/examples/with-typescript/renderer/assets/README.md b/examples/with-typescript/renderer/assets/README.md
new file mode 100644
index 0000000..34766f9
--- /dev/null
+++ b/examples/with-typescript/renderer/assets/README.md
@@ -0,0 +1,7 @@
+# ASSETS
+
+**This directory is not required, you can delete it if you don't want to use it.**
+
+This directory contains your un-compiled assets such as LESS, SASS, or JavaScript.
+
+More information about the usage of this directory in [the documentation](https://nuxtjs.org/guide/assets#webpacked).
diff --git a/examples/with-typescript/renderer/components/Logo.vue b/examples/with-typescript/renderer/components/Logo.vue
new file mode 100644
index 0000000..543ddcd
--- /dev/null
+++ b/examples/with-typescript/renderer/components/Logo.vue
@@ -0,0 +1,26 @@
+<template lang='html'>
+  <svg class='NuxtLogo' height='180' viewBox='0 0 452 342' width='245' xmlns='http://www.w3.org/2000/svg'>
+    <path
+      d='M139 330l-1-2c-2-4-2-8-1-13H29L189 31l67 121 22-16-67-121c-1-2-9-14-22-14-6 0-15 2-22 15L5 303c-1 3-8 16-2 27 4 6 10 12 24 12h136c-14 0-21-6-24-12z'
+      fill='#00C58E' />
+    <path
+      d='M447 304L317 70c-2-2-9-15-22-15-6 0-15 3-22 15l-17 28v54l39-67 129 230h-49a23 23 0 0 1-2 14l-1 1c-6 11-21 12-23 12h76c3 0 17-1 24-12 3-5 5-14-2-26z'
+      fill='#108775' />
+    <path
+      d='M376 330v-1l1-2c1-4 2-8 1-12l-4-12-102-178-15-27h-1l-15 27-102 178-4 12a24 24 0 0 0 2 15c4 6 10 12 24 12h190c3 0 18-1 25-12zM256 152l93 163H163l93-163z'
+      fill='#2F495E' />
+  </svg>
+</template>
+
+<style lang='css'>
+.NuxtLogo {
+  animation: 1s appear;
+  margin: auto;
+}
+
+@keyframes appear {
+  0% {
+    opacity: 0;
+  }
+}
+</style>
diff --git a/examples/with-typescript/renderer/components/README.md b/examples/with-typescript/renderer/components/README.md
new file mode 100644
index 0000000..a079f10
--- /dev/null
+++ b/examples/with-typescript/renderer/components/README.md
@@ -0,0 +1,7 @@
+# COMPONENTS
+
+**This directory is not required, you can delete it if you don't want to use it.**
+
+The components directory contains your Vue.js Components.
+
+_Nuxt.js doesn't supercharge these components._
diff --git a/examples/with-typescript/renderer/layouts/README.md b/examples/with-typescript/renderer/layouts/README.md
new file mode 100644
index 0000000..cad1ad5
--- /dev/null
+++ b/examples/with-typescript/renderer/layouts/README.md
@@ -0,0 +1,7 @@
+# LAYOUTS
+
+**This directory is not required, you can delete it if you don't want to use it.**
+
+This directory contains your Application Layouts.
+
+More information about the usage of this directory in [the documentation](https://nuxtjs.org/guide/views#layouts).
diff --git a/examples/with-typescript/renderer/layouts/default.vue b/examples/with-typescript/renderer/layouts/default.vue
new file mode 100644
index 0000000..570aba2
--- /dev/null
+++ b/examples/with-typescript/renderer/layouts/default.vue
@@ -0,0 +1,59 @@
+<template lang='html'>
+  <div>
+    <Nuxt />
+  </div>
+</template>
+
+<style lang='css'>
+html {
+  box-sizing: border-box;
+  font-family: 'Source Sans Pro',
+  -apple-system,
+  BlinkMacSystemFont,
+  'Segoe UI',
+  Roboto,
+  'Helvetica Neue',
+  Arial,
+  sans-serif;
+  font-size: 16px;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  -ms-text-size-adjust: 100%;
+  -webkit-text-size-adjust: 100%;
+  word-spacing: 1px;
+}
+
+*, *::before, *::after {
+  box-sizing: border-box;
+  margin: 0;
+}
+
+.button--green {
+  border: 1px solid #3b8070;
+  border-radius: 4px;
+  color: #3b8070;
+  display: inline-block;
+  padding: 10px 30px;
+  text-decoration: none;
+}
+
+.button--green:hover {
+  background-color: #3b8070;
+  color: #ffffff;
+}
+
+.button--grey {
+  border: 1px solid #35495e;
+  border-radius: 4px;
+  color: #35495e;
+  display: inline-block;
+  margin-left: 15px;
+  padding: 10px 30px;
+  text-decoration: none;
+}
+
+.button--grey:hover {
+  background-color: #35495e;
+  color: #ffffff;
+}
+</style>
diff --git a/examples/with-typescript/renderer/middleware/README.md b/examples/with-typescript/renderer/middleware/README.md
new file mode 100644
index 0000000..01595de
--- /dev/null
+++ b/examples/with-typescript/renderer/middleware/README.md
@@ -0,0 +1,8 @@
+# MIDDLEWARE
+
+**This directory is not required, you can delete it if you don't want to use it.**
+
+This directory contains your application middleware.
+Middleware let you define custom functions that can be run before rendering either a page or a group of pages.
+
+More information about the usage of this directory in [the documentation](https://nuxtjs.org/guide/routing#middleware).
diff --git a/examples/with-typescript/renderer/nuxt.config.js b/examples/with-typescript/renderer/nuxt.config.js
deleted file mode 100644
index 8410978..0000000
--- a/examples/with-typescript/renderer/nuxt.config.js
+++ /dev/null
@@ -1,10 +0,0 @@
-export default {
-  head: {
-    title: 'Nuxtron (with-typescript)',
-  },
-  build: {
-    extend: (config) => {
-      config.target = 'electron-renderer';
-    },
-  },
-}
diff --git a/examples/with-typescript/renderer/nuxt.config.ts b/examples/with-typescript/renderer/nuxt.config.ts
new file mode 100644
index 0000000..de9f184
--- /dev/null
+++ b/examples/with-typescript/renderer/nuxt.config.ts
@@ -0,0 +1,15 @@
+import { NuxtConfig } from '@nuxt/types';
+
+const config: NuxtConfig = {
+  head: {
+    title: 'Nuxtron (with-typescript)'
+  },
+  buildModules: ['@nuxt/typescript-build'],
+  build: {
+    extend: (config) => {
+      config.target = 'electron-renderer';
+    }
+  }
+};
+
+export default config;
diff --git a/examples/with-typescript/renderer/pages/README.md b/examples/with-typescript/renderer/pages/README.md
new file mode 100644
index 0000000..1d5d48b
--- /dev/null
+++ b/examples/with-typescript/renderer/pages/README.md
@@ -0,0 +1,6 @@
+# PAGES
+
+This directory contains your Application Views and Routes.
+The framework reads all the `*.vue` files inside this directory and creates the router of your application.
+
+More information about the usage of this directory in [the documentation](https://nuxtjs.org/guide/routing).
diff --git a/examples/with-typescript/renderer/pages/about.vue b/examples/with-typescript/renderer/pages/about.vue
index 6b11125..53c5771 100644
--- a/examples/with-typescript/renderer/pages/about.vue
+++ b/examples/with-typescript/renderer/pages/about.vue
@@ -1,40 +1,42 @@
-<template>
-  <div class="container">
-    <img src="/nuxt-black.png">
+<template lang='html'>
+  <div class='container'>
+    <img src='/nuxt-black.png'>
     <h2>Thank you for testing Nuxtron</h2>
     <p>Loaded from the {{ name }}</p>
     <p>
-      <NuxtLink to="/home">
-        Back home
-      </NuxtLink>
+      <NuxtLink to='/home'>Back home</NuxtLink>
     </p>
   </div>
 </template>
 
-<script>
-export default {
-  asyncData ({ req }) {
-    return {
-      name: process.static ? 'static' : (process.server ? 'server' : 'client'),
-    }
+<script lang='ts'>
+import { Context } from '@nuxt/types/app';
+import Vue from 'vue';
+
+export default Vue.extend({
+  asyncData(context: Context) {
+    const server = process.server ? 'server' : 'client';
+    const name = process.static ? 'static' : server;
+    return { name };
   }
-}
+});
 </script>
 
-<style scoped>
+<style lang='css' scoped>
 .container {
-  position: absolute;
-  top: 0;
-  left: 0;
-  height: 100%;
-  width: 100%;
   background: black;
   color: white;
-  font-family: "Lucida Console", Monaco, monospace;
+  font-family: 'Lucida Console', Monaco, monospace;
+  height: 100%;
+  left: 0;
   padding-top: 100px;
+  position: absolute;
   text-align: center;
+  top: 0;
+  width: 100%;
 }
+
 a {
   color: white;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/examples/with-typescript/renderer/pages/home.vue b/examples/with-typescript/renderer/pages/home.vue
index d9af460..a929db8 100644
--- a/examples/with-typescript/renderer/pages/home.vue
+++ b/examples/with-typescript/renderer/pages/home.vue
@@ -1,39 +1,41 @@
-<template>
-  <div class="container">
-    <img src="/nuxt.png">
+<template lang='html'>
+  <div class='container'>
+    <img src='/nuxt.png'>
     <h2>Hello Nuxtron.</h2>
     <p>Loaded from the {{ name }}</p>
     <p>
-      <NuxtLink to="/about">
-        About
-      </NuxtLink>
+      <NuxtLink to='/about'>About</NuxtLink>
     </p>
   </div>
 </template>
 
-<script>
-export default {
-  asyncData ({ req }) {
-    return {
-      name: process.static ? 'static' : (process.server ? 'server' : 'client'),
-    }
+<script lang='ts'>
+import { Context } from '@nuxt/types/app';
+import Vue from 'vue';
+
+export default Vue.extend({
+  asyncData(context: Context) {
+    const server = process.server ? 'server' : 'client';
+    const name = process.static ? 'static' : server;
+    return { name };
   }
-}
+});
 </script>
 
-<style scoped>
+<style lang='css' scoped>
 .container {
-  position: absolute;
-  top: 0;
-  left: 0;
-  height: 100%;
-  width: 100%;
   background: white;
   color: black;
-  font-family: "Lucida Console", Monaco, monospace;
+  font-family: 'Lucida Console', Monaco, monospace;
+  height: 100%;
+  left: 0;
   padding-top: 100px;
+  position: absolute;
   text-align: center;
+  top: 0;
+  width: 100%;
 }
+
 a {
   color: black;
 }
diff --git a/examples/with-typescript/renderer/plugins/README.md b/examples/with-typescript/renderer/plugins/README.md
new file mode 100644
index 0000000..ca1f9d8
--- /dev/null
+++ b/examples/with-typescript/renderer/plugins/README.md
@@ -0,0 +1,7 @@
+# PLUGINS
+
+**This directory is not required, you can delete it if you don't want to use it.**
+
+This directory contains Javascript plugins that you want to run before mounting the root Vue.js application.
+
+More information about the usage of this directory in [the documentation](https://nuxtjs.org/guide/plugins).
diff --git a/examples/with-typescript/renderer/static/README.md b/examples/with-typescript/renderer/static/README.md
new file mode 100644
index 0000000..cf00435
--- /dev/null
+++ b/examples/with-typescript/renderer/static/README.md
@@ -0,0 +1,11 @@
+# STATIC
+
+**This directory is not required, you can delete it if you don't want to use it.**
+
+This directory contains your static files.
+Each file inside this directory is mapped to `/`.
+Thus you'd want to delete this README.md before deploying to production.
+
+Example: `/static/robots.txt` is mapped as `/robots.txt`.
+
+More information about the usage of this directory in [the documentation](https://nuxtjs.org/guide/assets#static).
diff --git a/examples/with-typescript/renderer/store/README.md b/examples/with-typescript/renderer/store/README.md
new file mode 100644
index 0000000..1972d27
--- /dev/null
+++ b/examples/with-typescript/renderer/store/README.md
@@ -0,0 +1,10 @@
+# STORE
+
+**This directory is not required, you can delete it if you don't want to use it.**
+
+This directory contains your Vuex Store files.
+Vuex Store option is implemented in the Nuxt.js framework.
+
+Creating a file in this directory automatically activates the option in the framework.
+
+More information about the usage of this directory in [the documentation](https://nuxtjs.org/guide/vuex-store).
diff --git a/examples/with-typescript/renderer/tsconfig.json b/examples/with-typescript/renderer/tsconfig.json
new file mode 100644
index 0000000..e744814
--- /dev/null
+++ b/examples/with-typescript/renderer/tsconfig.json
@@ -0,0 +1,36 @@
+{
+  "compilerOptions": {
+    "target": "ES2018",
+    "module": "ESNext",
+    "moduleResolution": "Node",
+    "lib": [
+      "ESNext",
+      "ESNext.AsyncIterable",
+      "DOM"
+    ],
+    "esModuleInterop": true,
+    "allowJs": true,
+    "sourceMap": true,
+    "strict": true,
+    "noEmit": true,
+    "experimentalDecorators": true,
+    "baseUrl": ".",
+    "paths": {
+      "@/*": [
+        "./*"
+      ],
+      "~/*": [
+        "./*"
+      ]
+    },
+    "types": [
+      "@types/node",
+      "@nuxt/types"
+    ]
+  },
+  "exclude": [
+    "node_modules",
+    ".nuxt",
+    "dist"
+  ]
+}
diff --git a/lib/nuxtron-build.ts b/lib/nuxtron-build.ts
index c2a68cd..76a4a42 100644
--- a/lib/nuxtron-build.ts
+++ b/lib/nuxtron-build.ts
@@ -1,11 +1,11 @@
-import fs from 'fs-extra';
-import path from 'path';
-import { SpawnSyncOptions } from 'child_process';
 import arg from 'arg';
 import chalk from 'chalk';
+import { SpawnSyncOptions } from 'child_process';
 import spawn from 'cross-spawn';
-import { getNuxtronConfig } from './webpack/helpers';
+import fs from 'fs-extra';
+import path from 'path';
 import log from './logger';
+import { getNuxtronConfig } from './webpack/helpers';
 
 const args = arg({
   '--help': Boolean,
@@ -24,7 +24,7 @@ const args = arg({
   '-w': '--win',
   '-m': '--mac',
   '-l': '--linux',
-  '-c': '--config',
+  '-c': '--config'
 });
 
 if (args['--help']) {
@@ -53,9 +53,11 @@ if (args['--help']) {
 }
 
 const cwd = process.cwd();
+const nuxt = fs.existsSync(path.join(cwd, 'tsconfig.json')) ? 'nuxt-ts' : 'nuxt';
+
 const spawnOptions: SpawnSyncOptions = {
   cwd,
-  stdio: 'inherit',
+  stdio: 'inherit'
 };
 
 async function build() {
@@ -73,8 +75,14 @@ async function build() {
     log('Building renderer process');
     const outdir = path.join(cwd, rendererSrcDir, 'dist');
     const appdir = path.join(cwd, 'app');
-    spawn.sync('nuxt', ['build', path.join(cwd, rendererSrcDir)], spawnOptions);
-    spawn.sync('nuxt', ['generate', path.join(cwd, rendererSrcDir)], spawnOptions);
+    spawn.sync(nuxt, [
+      'build',
+      path.join(cwd, rendererSrcDir)
+    ], spawnOptions);
+    spawn.sync(nuxt, [
+      'generate',
+      path.join(cwd, rendererSrcDir)
+    ], spawnOptions);
     fs.copySync(outdir, appdir);
     fs.removeSync(outdir);
 
@@ -85,11 +93,11 @@ async function build() {
     spawn.sync('electron-builder', createBuilderArgs(), spawnOptions);
 
     log('See `dist` directory');
-  } catch (err) {
+  } catch (error) {
     console.log(chalk`
 
 {bold.red Cannot build electron packages:}
-{bold.yellow ${err}}
+{bold.yellow ${error}}
 `);
     process.exit(1);
   }
@@ -122,4 +130,4 @@ function createArchArgs() {
   return archArgs;
 }
 
-build();
+(async () => await build())();
diff --git a/lib/nuxtron-dev.ts b/lib/nuxtron-dev.ts
index f8e91f5..64a5b8e 100644
--- a/lib/nuxtron-dev.ts
+++ b/lib/nuxtron-dev.ts
@@ -1,16 +1,12 @@
-import {
-  ChildProcess,
-  SpawnSyncOptions,
-} from 'child_process';
 import arg from 'arg';
 import chalk from 'chalk';
+import { ChildProcess, SpawnSyncOptions } from 'child_process';
 import spawn from 'cross-spawn';
 import delay from 'delay';
+import fs from 'fs-extra';
+import path from 'path';
 import webpack from 'webpack';
-import {
-  getNuxtronConfig,
-  getWebpackConfig,
-} from './webpack/helpers';
+import { getNuxtronConfig, getWebpackConfig } from './webpack/helpers';
 
 const args = arg({
   '--help': Boolean,
@@ -20,7 +16,7 @@ const args = arg({
   '-h': '--help',
   '-v': '--version',
   '-p': '--port',
-  '-c': '--custom-server',
+  '-c': '--custom-server'
 });
 
 if (args['--help']) {
@@ -44,10 +40,10 @@ const rendererPort = args['--port'] || 8888;
 
 const spawnOptions: SpawnSyncOptions = {
   cwd: process.cwd(),
-  stdio: 'inherit',
+  stdio: 'inherit'
 };
 
-async function dev() {
+async function development() {
   const { rendererSrcDir } = getNuxtronConfig();
 
   let firstCompile = true;
@@ -56,15 +52,24 @@ async function dev() {
   let rendererProcess: ChildProcess;
 
   const startMainProcess = () => {
-    mainProcess = spawn('electron', ['.', `${rendererPort}`], {
-      detached: true,
-      ...spawnOptions,
+    mainProcess = spawn('electron', [
+      '.',
+      `${rendererPort}`
+    ], {
+      detached: true, ...spawnOptions
+
     });
     mainProcess.unref();
   };
 
   const startRendererProcess = () => {
-    const child = spawn('nuxt', ['-p', rendererPort, rendererSrcDir || 'renderer'], spawnOptions);
+    const cwd = process.cwd();
+    const nuxt = fs.existsSync(path.join(cwd, 'tsconfig.json')) ? 'nuxt-ts' : 'nuxt';
+    const child = spawn(nuxt, [
+      '-p',
+      rendererPort,
+      rendererSrcDir || 'renderer'
+    ], spawnOptions);
     child.on('close', () => {
       process.exit(0);
     });
@@ -73,7 +78,8 @@ async function dev() {
 
   const killWholeProcess = () => {
     if (watching) {
-      watching.close(() => {});
+      watching.close(() => {
+      });
     }
     if (mainProcess) {
       mainProcess.kill();
@@ -117,4 +123,4 @@ async function dev() {
   });
 }
 
-dev();
+(async () => await development())();
diff --git a/lib/nuxtron-init.ts b/lib/nuxtron-init.ts
index 021dc31..3b11d80 100644
--- a/lib/nuxtron-init.ts
+++ b/lib/nuxtron-init.ts
@@ -1,8 +1,8 @@
-import fs from 'fs-extra';
-import path from 'path';
-import { execSync } from 'child_process';
 import arg from 'arg';
 import chalk from 'chalk';
+import { execSync } from 'child_process';
+import fs from 'fs-extra';
+import path from 'path';
 import log from './logger';
 
 const cwd = process.cwd();
@@ -15,7 +15,7 @@ const args = arg({
   '-h': '--help',
   '-v': '--version',
   '-t': '--template',
-  '-e': '--template',
+  '-e': '--template'
 });
 
 if (args['--version']) {
@@ -84,10 +84,10 @@ function init(name: string) {
   const pkg = path.resolve(cwd, `${name}/package.json`);
   const content = fs.readJSONSync(pkg);
   content.name = name;
-  if (process.env.NODE_ENV === 'testing') {
+  if ('testing' === process.env.NODE_ENV) {
     content.devDependencies.nuxtron = cwd;
   }
-  fs.writeJSONSync(pkg, {...content}, {spaces: 2});
+  fs.writeJSONSync(pkg, { ...content }, { spaces: 2 });
 
   let cmd: string;
   const pm = detectPackageManager();
diff --git a/lib/nuxtron-list.ts b/lib/nuxtron-list.ts
index 77f72c5..1f2e637 100644
--- a/lib/nuxtron-list.ts
+++ b/lib/nuxtron-list.ts
@@ -1,13 +1,13 @@
-import fs from 'fs';
-import path from 'path';
 import arg from 'arg';
 import chalk from 'chalk';
+import fs from 'fs';
+import path from 'path';
 
 const args = arg({
   '--help': Boolean,
   '--version': Boolean,
   '-h': '--help',
-  '-v': '--version',
+  '-v': '--version'
 });
 
 if (args['--version']) {
@@ -34,7 +34,7 @@ if (args['--help']) {
 }
 
 let names = fs.readdirSync(path.resolve(__dirname, '../examples'));
-names = names.filter(name => name.toLowerCase() !== '_template' && name.toLowerCase() !== '.ds_store');
+names = names.filter(name => '_template' !== name.toLowerCase() && '.ds_store' !== name.toLowerCase());
 
 console.log(chalk`
   {bold.cyan Available examples (${names.length.toString()}):}
diff --git a/lib/nuxtron.ts b/lib/nuxtron.ts
index be39430..665b8cf 100644
--- a/lib/nuxtron.ts
+++ b/lib/nuxtron.ts
@@ -1,26 +1,32 @@
-import path from 'path';
 import chalk from 'chalk';
 import spawn from 'cross-spawn';
+import path from 'path';
 
 const defaultCommand = 'dev';
 const commands = new Set([
   'list',
   'init',
   'build',
-  defaultCommand,
+  defaultCommand
 ]);
 
 let cmd = process.argv[2];
 let args: string[] = [];
 let nodeArgs: string[] = [];
 
-if (new Set(['--version', '-v']).has(cmd)) {
+if (new Set([
+  '--version',
+  '-v'
+]).has(cmd)) {
   const pkg = require(path.resolve(__dirname, '../package.json'));
   console.log(`nuxtron v${pkg.version}`);
   process.exit(0);
 }
 
-if (new Set(['--help', '-h']).has(cmd)) {
+if (new Set([
+  '--help',
+  '-h'
+]).has(cmd)) {
   console.log(chalk`
     {bold.cyan nuxtron} - ⚡ Electron + Nuxt.js ⚡
     {bold USAGE}
@@ -43,19 +49,25 @@ if (commands.has(cmd)) {
   args = process.argv.slice(2);
 }
 
-const defaultEnv = cmd === 'dev' ? 'development' : 'production';
+const defaultEnv = 'dev' === cmd ? 'development' : 'production';
 process.env.NODE_ENV = process.env.NODE_ENV || defaultEnv;
 
 const cli = path.join(__dirname, `nuxtron-${cmd}`);
 
 const startProcess = () => {
-  const proc = spawn('node', [...nodeArgs, cli, ...args], { stdio: 'inherit' });
+  const proc = spawn('node', [
+    ...nodeArgs,
+    cli,
+    ...args
+  ], {
+    stdio: 'inherit'
+  });
   proc.on('close', (code: number, signal: string) => {
-    if (code !== null) {
+    if (null !== code) {
       process.exit(code);
     }
     if (signal) {
-      if (signal === 'SIGKILL') {
+      if ('SIGKILL' === signal) {
         process.exit(137);
       }
       process.exit(1);
@@ -67,7 +79,7 @@ const startProcess = () => {
     process.exit(1);
   });
   return proc;
-}
+};
 
 const proc = startProcess();
 
@@ -75,7 +87,7 @@ const wrapper = () => {
   if (proc) {
     proc.kill();
   }
-}
+};
 process.on('SIGINT', wrapper);
 process.on('SIGTERM', wrapper);
 process.on('exit', wrapper);
diff --git a/lib/webpack/build.production.ts b/lib/webpack/build.production.ts
index 8b0f741..26ed18a 100644
--- a/lib/webpack/build.production.ts
+++ b/lib/webpack/build.production.ts
@@ -3,7 +3,9 @@ import { getWebpackConfig } from './helpers';
 
 const compiler = webpack(getWebpackConfig('production'));
 
-compiler.run((err: Error, stats: webpack.Stats) => {
-  err && console.error(err.stack || err);
+const callback = (error: Error, stats: webpack.Stats) => {
+  error && console.error(error.stack || error);
   stats.hasErrors() && console.error(stats.toString());
-});
+};
+
+compiler.run(<any>callback);
diff --git a/lib/webpack/helpers.ts b/lib/webpack/helpers.ts
index 0a99d37..c2191da 100644
--- a/lib/webpack/helpers.ts
+++ b/lib/webpack/helpers.ts
@@ -7,7 +7,7 @@ const cwd = process.cwd();
 const ext = fs.existsSync(path.join(cwd, 'tsconfig.json')) ? '.ts' : '.js';
 
 const getNuxtronConfig = () => {
-  const configPath = path.join(cwd, 'nuxtron.config.js');
+  const configPath = path.join(cwd, `nuxtron.config${ext}`);
   if (fs.existsSync(configPath)) {
     return require(configPath);
   } else {
@@ -16,26 +16,26 @@ const getNuxtronConfig = () => {
 };
 
 const getWebpackConfig = (env: 'development' | 'production') => {
-  const { mainSrcDir, webpack } = getNuxtronConfig();
+  const {
+    mainSrcDir,
+    webpack
+  } = getNuxtronConfig();
   const userConfig = merge(configure(env), {
     entry: {
-      background: path.join(cwd, mainSrcDir || 'main', `background${ext}`),
+      background: path.join(cwd, mainSrcDir || 'main', `background${ext}`)
     },
     output: {
       filename: '[name].js',
-      path: path.join(cwd, 'app'),
-    },
+      path: path.join(cwd, 'app')
+    }
   });
 
   const userWebpack = webpack || {};
-  if (typeof userWebpack === 'function') {
+  if ('function' === typeof userWebpack) {
     return userWebpack(userConfig, env);
   } else {
     return merge(userConfig, userWebpack);
   }
 };
 
-export {
-  getNuxtronConfig,
-  getWebpackConfig,
-};
+export { getNuxtronConfig, getWebpackConfig };
diff --git a/lib/webpack/webpack.config.ts b/lib/webpack/webpack.config.ts
index cdbf582..3725763 100644
--- a/lib/webpack/webpack.config.ts
+++ b/lib/webpack/webpack.config.ts
@@ -9,16 +9,25 @@ export default (env: 'development' | 'production'): webpack.Configuration => ({
   target: 'electron-main',
   node: {
     __dirname: false,
-    __filename: false,
+    __filename: false
   },
   externals: [...Object.keys(externals || {})],
   devtool: 'source-map',
   resolve: {
-    extensions: ['.js', '.jsx', '.json', '.ts', '.tsx'],
-    modules: [path.join(cwd, 'app'), 'node_modules'],
+    extensions: [
+      '.js',
+      '.jsx',
+      '.json',
+      '.ts',
+      '.tsx'
+    ],
+    modules: [
+      path.join(cwd, 'app'),
+      'node_modules'
+    ]
   },
   output: {
-    libraryTarget: 'commonjs2',
+    libraryTarget: 'commonjs2'
   },
   module: {
     rules: [
@@ -28,19 +37,19 @@ export default (env: 'development' | 'production'): webpack.Configuration => ({
           loader: 'babel-loader',
           options: {
             cacheDirectory: true,
-            presets: ['@babel/preset-typescript'],
-          },
+            presets: ['@babel/preset-typescript']
+          }
         },
         exclude: [
           /node_modules/,
-          path.join(cwd, 'renderer'),
-        ],
-      },
-    ],
+          path.join(cwd, 'renderer')
+        ]
+      }
+    ]
   },
   plugins: [
     new webpack.EnvironmentPlugin({
-      NODE_ENV: env,
-    }),
-  ],
+      NODE_ENV: env
+    })
+  ]
 });
diff --git a/package.json b/package.json
index 192952b..25da237 100644
--- a/package.json
+++ b/package.json
@@ -35,32 +35,32 @@
     "prepublishOnly": "cross-env NODE_ENV=production npm run build"
   },
   "dependencies": {
-    "@babel/core": "^7.12.3",
-    "@babel/preset-typescript": "^7.12.1",
-    "arg": "^4.1.3",
-    "babel-loader": "^8.1.0",
+    "@babel/core": "^7.12.9",
+    "@babel/preset-typescript": "^7.12.7",
+    "arg": "^5.0.0",
+    "babel-loader": "^8.2.2",
     "chalk": "^4.1.0",
     "cross-spawn": "^7.0.3",
     "delay": "^4.4.0",
     "fs-extra": "^9.0.1",
-    "webpack": "^5.2.0",
-    "webpack-merge": "^5.2.0"
+    "webpack": "^5.9.0",
+    "webpack-merge": "^5.4.0"
   },
   "devDependencies": {
     "@babel/plugin-proposal-class-properties": "^7.12.1",
     "@babel/plugin-proposal-object-rest-spread": "^7.12.1",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-    "@rollup/plugin-babel": "^5.2.1",
-    "@rollup/plugin-commonjs": "^16.0.0",
-    "@rollup/plugin-node-resolve": "^10.0.0",
+    "@rollup/plugin-babel": "^5.2.2",
+    "@rollup/plugin-commonjs": "^17.0.0",
+    "@rollup/plugin-node-resolve": "^11.0.0",
     "@types/cross-spawn": "^6.0.2",
-    "@types/fs-extra": "^9.0.2",
-    "@types/node": "^14.14.5",
-    "cross-env": "^7.0.2",
+    "@types/fs-extra": "^9.0.4",
+    "@types/node": "^14.14.10",
+    "cross-env": "^7.0.3",
     "rimraf": "^3.0.2",
-    "rollup": "^2.32.1",
+    "rollup": "^2.34.0",
     "rollup-plugin-auto-external": "^2.0.0",
     "rollup-plugin-terser": "^7.0.2",
-    "typescript": "^4.0.5"
+    "typescript": "^4.1.2"
   }
 }

From 142d908e6d5256aaa540dd76cc3b1f6bbe22cfe6 Mon Sep 17 00:00:00 2001
From: agrozyme <agrozyme@gmail.com>
Date: Thu, 3 Dec 2020 16:53:49 +0800
Subject: [PATCH 2/2] add postinstall

---
 examples/with-typescript/package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/examples/with-typescript/package.json b/examples/with-typescript/package.json
index 191326c..3745256 100644
--- a/examples/with-typescript/package.json
+++ b/examples/with-typescript/package.json
@@ -7,7 +7,8 @@
   "main": "app/background.js",
   "scripts": {
     "dev": "nuxtron",
-    "build": "nuxtron build"
+    "build": "nuxtron build",
+    "postinstall": "electron-builder install-app-deps"
   },
   "dependencies": {
     "electron-serve": "^1.0.0",