fix: adapt new doc version

Author: plainheart

bin/echarts-offline-doc.js

@@ -17,6 +17,7 @@ program
   .option('-c, --cnpm', '使用 `cnpm` 安装依赖')
   .option('-s, --serve', '开启一个 HTTP Server 查看离线文档')
   .option('-l, --local', '本地查看离线文档')
+  .option('--verbose', '输出调试日志')
   .parse(process.argv)
 
 const options = program.opts()

build/modify.js

@@ -6,9 +6,9 @@ const {
   PATH_REPO_DOC_ASSETS,
   PATH_REPO_DOC_PUBLIC,
   PATH_REPO_DOC_SRC,
+  PATH_REPO_DOC_BUILD,
   PATH_REPO_DOC_BUILD_ENTRY,
   URL_ECHARTS_FAVICON,
-  PATH_REPO_DOC
 } = require('../config')
 
 function getRelativePath(assetPath) {
@@ -42,7 +42,11 @@ async function modify(assetsMapping) {
   })
 
   // rewrite the URLs in source files
-  const relativePathRoot = getRelativePath(require(PATH_REPO_DOC_BUILD_ENTRY).output.path) + '/'
+  let webpackConfig = require(PATH_REPO_DOC_BUILD_ENTRY)
+  if (typeof webpackConfig === 'function') {
+    webpackConfig = await webpackConfig('asf', 'production')
+  }
+  const relativePathRoot = getRelativePath(webpackConfig.output.path) + '/'
   const files = await globby('**/*.{js,vue}', {
     cwd: PATH_REPO_DOC_SRC,
     ignore: '**/documents/**',
@@ -58,7 +62,7 @@ async function modify(assetsMapping) {
     fs.writeFileSync(file, content, 'utf8')
   }
 
-  const buildScriptPath = path.resolve(PATH_REPO_DOC, 'build.js')
+  const buildScriptPath = path.resolve(PATH_REPO_DOC_BUILD, 'build-doc.js')
   const buildScriptContent = fs.readFileSync(buildScriptPath, 'utf8')
   fs.writeFileSync(
     buildScriptPath,

config/env.local.js config/env.asf-override.jsconfig/env.local.js renamed to config/env.asf-override.js

@@ -11,7 +11,8 @@ const PATH_REPO_DOC_CONFIG = path.resolve(PATH_REPO_DOC, './config')
 const PATH_REPO_DOC_SRC = path.resolve(PATH_REPO_DOC, './src')
 const PATH_REPO_DOC_PUBLIC = path.resolve(PATH_REPO_DOC, './public')
 const PATH_REPO_DOC_ASSETS = path.resolve(PATH_REPO_DOC_PUBLIC, './assets')
-const PATH_REPO_DOC_BUILD_ENTRY = path.resolve(PATH_REPO_DOC, './build/webpack.config.js')
+const PATH_REPO_DOC_BUILD = path.resolve(PATH_REPO_DOC, './build')
+const PATH_REPO_DOC_BUILD_ENTRY = path.resolve(PATH_REPO_DOC_BUILD, './webpack.config.js')
 
 const URL_ECHARTS_LOGO = 'https://echarts.apache.org/zh/images/logo.png'
 const URL_ECHARTS_FAVICON = 'https://echarts.apache.org/zh/images/favicon.png'
@@ -28,6 +29,7 @@ module.exports = {
   PATH_REPO_DOC_SRC,
   PATH_REPO_DOC_PUBLIC,
   PATH_REPO_DOC_ASSETS,
+  PATH_REPO_DOC_BUILD,
   PATH_REPO_DOC_BUILD_ENTRY,
 
   URL_ECHARTS_LOGO,

config/index.js

@@ -1,4 +1,4 @@
-const { officialWebsitePath } = require('./env.local')
+const { officialWebsitePath } = require('./env.asf-override')
 
 module.exports = function() {
   return /* html */`

config/view-online.js

@@ -5,6 +5,8 @@ const chalk = require('chalk')
 const globby = require('globby')
 const Spinnies = require('spinnies')
 
+const isVerbose = process.argv.includes('--verbose')
+
 const {
   PATH_DIST,
   PATH_TMP,
@@ -34,7 +36,7 @@ function createSpawn(command, args, cwd, processName) {
       command, args,
       {
         cwd,
-        stdio: 'ignore',
+        stdio: isVerbose ? 'inherit' : 'ignore',
         windowsHide: true,
         detached: false
       }
@@ -161,7 +163,7 @@ async function build() {
 
   await fs.remove(PATH_DIST)
 
-  const configFileName = 'env.local.js'
+  const configFileName = 'env.asf-override.js'
   // copy config
   await fs.copy(
     path.resolve(__dirname, `./config/${configFileName}`),
@@ -185,7 +187,7 @@ async function build() {
     )
 
     await createSpawn(
-      'node', ['build.js', '--env', 'local'],
+      'node', ['build.js', '--env', 'asf'],
       PATH_REPO_DOC,
       processName
     )
@@ -264,11 +266,15 @@ async function cleanup(suppressError) {
 }
 
 process.on('uncaughtException', e => {
-  console.error(chalk.red('An uncaught error occurred'))
-  console.error(chalk.red(e))
+  console.error(chalk.red('An uncaught error occurred:\n' + e.stack))
   process.exit(-2)
 })
 
+process.on('unhandledRejection', (reason) => {
+  console.error(chalk.red('An unhandled promise rejection occurred:\n' + (reason.stack || reason)))
+  process.exit(-3)
+})
+
 module.exports = async function run() {
   try {
     // cleanup first
@@ -291,8 +297,8 @@ module.exports = async function run() {
     // build
     await build()
   } catch (e) {
-    console.error(chalk.red(e))
+    console.error(chalk.red(e.stack))
   } finally {
-    await cleanup(true)
+    await cleanup(!isVerbose)
   }
 }