feat: doc 使用 ts进行配置

imsunhao · Jun 27, 2019 · 065e43b · 065e43b
1 parent e7ebf50
commit 065e43b
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 75 deletions.
diff --git a/doc/build.config.ts b/doc/build.config.ts
@@ -5,17 +5,20 @@ import getBase from './build/webpack.base.conf.babel'
 import getDll from './build/webpack.dll.conf.babel'
 import getClient from './build/webpack.client.conf.babel'
 import getServer from './build/webpack.server.conf.babel'
-import path from 'path'
+import getExtensions from './build/webpack.extensions.conf.babel.js'
 
 export default function(inject: ConfigOptions.getOptionsInject): ConfigOptions.options {
   const config = getConfig(inject)
 
-  const base: any = getBase(config, inject)
-  const dll: any = getDll(config, inject)
-  const client: any = getClient(config, inject)
-  const server: any = getServer(config, inject)
+  const webpack: any = {
+    base: getBase(config, inject),
+    dll: getDll(config, inject),
+    client: getClient(config, inject),
+    server: getServer(config, inject),
+  }
+  const extensions: any = getExtensions(config, inject)
 
-  const { port } = config
+  const { port, render, statics, proxyTable } = config
 
   return {
     env: ['SERVER_ENV', 'ENV', 'NODE_ENV'],
@@ -33,20 +36,10 @@ export default function(inject: ConfigOptions.getOptionsInject): ConfigOptions.o
         ],
       ],
     },
-    render: config.render,
-    statics: config.statics,
-    proxyTable: config.proxyTable,
-    extensions: {
-      entry: {
-        extensions: inject.resolve('./server/index.js'),
-      },
-      path: path.resolve(base.output.path),
-    },
-    webpack: {
-      dll,
-      base,
-      client,
-      server,
-    },
+    render,
+    statics,
+    proxyTable,
+    extensions,
+    webpack,
   }
 }
diff --git a/doc/build/utils.js b/doc/build/utils.js
diff --git a/doc/build/webpack.extensions.conf.babel.js b/doc/build/webpack.extensions.conf.babel.js
@@ -0,0 +1,8 @@
+export default function(config, { resolve }) {
+  return {
+    entry: {
+      extensions: resolve('./server/index.js'),
+    },
+    path: config.assetRoot
+  }
+}
diff --git a/doc/config/dev.env.js → doc/config/dev.env.ts b/doc/config/dev.env.js → doc/config/dev.env.ts
diff --git a/doc/config/index.js → doc/config/index.ts b/doc/config/index.js → doc/config/index.ts
@@ -1,3 +1,5 @@
+import { ConfigOptions } from '@bestminr/build'
+
 import path from 'path'
 import ProdEnv from './prod.env'
 import DevEnv from './dev.env'
@@ -46,11 +48,11 @@ export function baseConfig(inject) {
       statics: {
         '/service-worker.js': {
           path: resolve('./dist/service-worker.js'),
-          maxAge: getStaticsMaxAge({ cache: false, isProd: true }),
+          maxAge: 0,
         },
         '/manifest.json': {
           path: resolve('./manifest.json'),
-          maxAge: getStaticsMaxAge({ cache: false, isProd: false }),
+          maxAge: 0,
         },
       },
       render: {
@@ -71,23 +73,23 @@ export function baseConfig(inject) {
       statics: {
         '/dist': {
           path: resolve('./dist'),
-          maxAge: getStaticsMaxAge({ cache: true, isProd: false }),
+          maxAge: 0,
         },
         '/common-assets': {
           path: resolve('./common-assets'),
-          maxAge: getStaticsMaxAge({ cache: true, isProd: false }),
+          maxAge: 0,
         },
         '/public': {
           path: resolve('./public'),
-          maxAge: getStaticsMaxAge({ cache: true, isProd: false }),
+          maxAge: 0,
         },
         '/service-worker.js': {
           path: resolve('./dist/service-worker.js'),
-          maxAge: getStaticsMaxAge({ cache: false, isProd: false }),
+          maxAge: 0,
         },
         '/manifest.json': {
           path: resolve('./manifest.json'),
-          maxAge: getStaticsMaxAge({ cache: false, isProd: false }),
+          maxAge: 0,
         },
       },
       proxyTable: getProxyTable(inject),
@@ -101,7 +103,7 @@ export function baseConfig(inject) {
   }
 }
 
-export function getConfig(inject, opts = {}) {
+export function getConfig(inject: ConfigOptions.getOptionsInject, opts = {}) {
   const config = baseConfig(inject)
   const { resolve } = inject
   let resultConfig
@@ -115,15 +117,15 @@ export function getConfig(inject, opts = {}) {
         ...resultConfig.statics,
         '/dist': {
           path: resolve('./dist'),
-          maxAge: getStaticsMaxAge({ cache: true, isProd: false }),
+          maxAge: 0,
         },
         '/common-assets': {
           path: resolve('./common-assets'),
-          maxAge: getStaticsMaxAge({ cache: true, isProd: false }),
+          maxAge: 0,
         },
         [`${outputPath}public`]: {
           path: resolve('./public'),
-          maxAge: getStaticsMaxAge({ cache: true, isProd: false }),
+          maxAge: 0,
         },
       }
       resultConfig.proxyTable = getProxyTable(inject)
@@ -133,7 +135,3 @@ export function getConfig(inject, opts = {}) {
   }
   return resultConfig
 }
-
-function getStaticsMaxAge(options) {
-  return options.cache && options.isProd ? STATICS_MAX_AGE : 0
-}
diff --git a/doc/config/prod.env.js → doc/config/prod.env.ts b/doc/config/prod.env.js → doc/config/prod.env.ts
diff --git a/src/utils/compiler.webpack.ts b/src/utils/compiler.webpack.ts
@@ -296,13 +296,17 @@ function prodCompilerExtensions(options: ConfigOptions.options) {
 
     compiler.run((err, stats) => {
       {
-        consola.log(
-          stats.toString({
-            all: false,
-            assets: true
-          })
-        )
-        showError(stats)
+        if (err) {
+          consola.fatal(err)
+        } else {
+          consola.log(
+            stats.toString({
+              all: false,
+              assets: true
+            })
+          )
+          showError(stats)
+        }
       }
     })
   })