v2: prepare to move

v2/lib/commands/build.js

@@ -0,0 +1,77 @@
+const webpack = require('webpack');
+const path = require('path');
+const chalk = require('chalk');
+const fs = require('fs-extra');
+const globby = require('globby');
+const load = require('../load');
+const createServerConfig = require('../webpack/server');
+const createClientConfig = require('../webpack/client');
+const {applyConfigureWebpack} = require('../webpack/utils');
+
+function compile(config) {
+  return new Promise((resolve, reject) => {
+    webpack(config, (err, stats) => {
+      if (err) {
+        reject(err);
+      }
+      if (stats.hasErrors()) {
+        stats.toJson().errors.forEach(e => {
+          console.error(e);
+        });
+        reject(new Error(`Failed to compile with errors.`));
+      }
+      if (stats.hasWarnings()) {
+        stats.toJson().warnings.forEach(warning => {
+          console.warn(warning);
+        });
+      }
+      resolve(stats.toJson({modules: false}));
+    });
+  });
+}
+
+module.exports = async function build(siteDir, cliOptions = {}) {
+  process.env.NODE_ENV = 'production';
+  console.log('Build command invoked ...');
+  console.log(cliOptions);
+
+  const props = await load(siteDir);
+
+  let serverConfig = createServerConfig(props).toConfig();
+  let clientConfig = createClientConfig(props).toConfig();
+
+  // apply user webpack config
+  const {
+    siteConfig: {configureWebpack}
+  } = props;
+  clientConfig = applyConfigureWebpack(configureWebpack, clientConfig, false);
+  serverConfig = applyConfigureWebpack(configureWebpack, serverConfig, true);
+
+  // Build the client bundles first.
+  // We cannot run them in parallel because the server need to pickup the correct client bundle name
+  await compile(clientConfig);
+
+  // Build the server bundles (render the static HTML and pick client bundle)
+  await compile(serverConfig);
+
+  // copy static files
+  const {outDir} = props;
+  const staticDir = path.resolve(siteDir, 'static');
+  const staticFiles = await globby(['**'], {
+    cwd: staticDir
+  });
+  await Promise.all(
+    staticFiles.map(async source => {
+      const fromPath = path.resolve(staticDir, source);
+      const toPath = path.resolve(outDir, source);
+      return fs.copy(fromPath, toPath);
+    })
+  );
+
+  const relativeDir = path.relative(process.cwd(), outDir);
+  console.log(
+    `\n${chalk.green('Success!')} Generated static files in ${chalk.cyan(
+      relativeDir
+    )}.\n`
+  );
+};

v2/lib/commands/eject.js

@@ -0,0 +1,16 @@
+const fs = require('fs-extra');
+const chalk = require('chalk');
+const path = require('path');
+
+module.exports = async function eject(siteDir) {
+  const defaultTheme = path.resolve(__dirname, '..', 'theme');
+  const customTheme = path.resolve(siteDir, 'theme');
+  await fs.copy(defaultTheme, customTheme);
+
+  const relativeDir = path.relative(process.cwd(), customTheme);
+  console.log(
+    `\n${chalk.green('Success!')} Copied default theme files to ${chalk.cyan(
+      relativeDir
+    )}.\n`
+  );
+};

v2/lib/commands/init.js

@@ -0,0 +1,7 @@
+module.exports = async function init(projectDir, cliOptions = {}) {
+  console.log('Init command invoked ...');
+  console.log(projectDir);
+  console.log(cliOptions);
+
+  // TODO
+};

v2/lib/commands/start.js

@@ -0,0 +1,124 @@
+const path = require('path');
+const fs = require('fs-extra');
+const chalk = require('chalk');
+const webpack = require('webpack');
+const chokidar = require('chokidar');
+const convert = require('koa-connect');
+const range = require('koa-range');
+const mount = require('koa-mount');
+const serveStatic = require('koa-static');
+const history = require('connect-history-api-fallback');
+const portfinder = require('portfinder');
+const serve = require('webpack-serve');
+const HtmlWebpackPlugin = require('html-webpack-plugin');
+const load = require('../load');
+const createClientConfig = require('../webpack/client');
+const {applyConfigureWebpack} = require('../webpack/utils');
+
+function getHost(reqHost) {
+  return reqHost || 'localhost';
+}
+
+async function getPort(reqPort) {
+  portfinder.basePort = parseInt(reqPort, 10) || 3000;
+  const port = await portfinder.getPortPromise();
+  return port;
+}
+
+module.exports = async function start(siteDir, cliOptions = {}) {
+  console.log('Start command invoked ...');
+  console.log(cliOptions);
+
+  // Process all related files as a prop
+  const props = await load(siteDir);
+
+  // Reload files processing
+  if (!cliOptions.noWatch) {
+    const reload = () => {
+      load(siteDir).catch(err => {
+        console.error(chalk.red(err.stack));
+      });
+    };
+    const docsRelativeDir = props.siteConfig.customDocsPath;
+    const fsWatcher = chokidar.watch(
+      [`../${docsRelativeDir}/**/*.md`, 'blog/**/*.md', 'siteConfig.js'],
+      {
+        cwd: siteDir,
+        ignoreInitial: true
+      }
+    );
+    fsWatcher.on('add', reload);
+    fsWatcher.on('change', reload);
+    fsWatcher.on('unlink', reload);
+    fsWatcher.on('addDir', reload);
+    fsWatcher.on('unlinkDir', reload);
+  }
+
+  const port = await getPort(cliOptions.port);
+  const hotPort = await getPort(port + 1);
+  const host = getHost(cliOptions.host);
+  const {baseUrl} = props;
+
+  // create compiler from generated webpack config
+  let config = createClientConfig(props);
+
+  const {siteConfig} = props;
+  config.plugin('html-webpack-plugin').use(HtmlWebpackPlugin, [
+    {
+      inject: false,
+      hash: true,
+      template: path.resolve(__dirname, '../core/devTemplate.ejs'),
+      filename: 'index.html',
+      title: siteConfig.title
+    }
+  ]);
+  config = config.toConfig();
+
+  // apply user webpack config
+  const {
+    siteConfig: {configureWebpack}
+  } = props;
+  config = applyConfigureWebpack(configureWebpack, config, false);
+
+  const compiler = webpack(config);
+
+  // webpack-serve
+  setTimeout(async () => {
+    await serve(
+      {},
+      {
+        compiler,
+        open: true,
+        devMiddleware: {
+          logLevel: 'silent'
+        },
+        hotClient: {
+          port: hotPort,
+          logLevel: 'error'
+        },
+        logLevel: 'error',
+        port,
+        host,
+        add: app => {
+          // serve static files
+          const staticDir = path.resolve(siteDir, 'static');
+          if (fs.existsSync(staticDir)) {
+            app.use(mount(baseUrl, serveStatic(staticDir)));
+          }
+
+          // enable HTTP range requests
+          app.use(range);
+
+          // rewrite request to `/` since dev is only a SPA
+          app.use(
+            convert(
+              history({
+                rewrites: [{from: /\.html$/, to: '/'}]
+              })
+            )
+          );
+        }
+      }
+    );
+  }, 1000);
+};