refactor(v2): cli and loads (#1317)

* refactor(v2): cli, load

* nits

packages/docusaurus/bin/docusaurus.js

@@ -42,13 +42,11 @@ program
   .command('build [siteDir]')
   .description('Build website')
   .option(
-    '-sic, --skip-image-compression <skipImageCompression>',
-    'Skip compression of image assets (default: false)',
+    '--skip-next-release',
+    'Skip documents from next release (default = false)',
   )
-  .option('--skip-next-release', 'Skip documents from next release')
-  .action((siteDir = '.', {skipImageCompression, skipNextRelease}) => {
+  .action((siteDir = '.', {skipNextRelease}) => {
     wrapCommand(build)(path.resolve(siteDir), {
-      skipImageCompression,
       skipNextRelease,
     });
   });

packages/docusaurus/lib/commands/build.js

@@ -38,11 +38,11 @@ function compile(config) {
   });
 }
 
-module.exports = async function build(siteDir, options) {
+module.exports = async function build(siteDir, cliOptions = {}) {
   process.env.NODE_ENV = 'production';
   console.log('Build command invoked ...');
 
-  const props = await load(siteDir, options.skipNextRelease);
+  const props = await load(siteDir, cliOptions);
 
   // Apply user webpack config.
   const {outDir, plugins} = props;

packages/docusaurus/lib/load/docs/index.js

@@ -12,10 +12,13 @@ const createOrder = require('./order');
 const loadSidebars = require('./sidebars');
 const processMetadata = require('./metadata');
 
-async function loadDocs(
-  {siteDir, docsDir, env, siteConfig},
+async function loadDocs({
+  siteDir,
+  docsDir,
+  env,
+  siteConfig,
   skipNextRelease = false,
-) {
+}) {
   // @tested - load all sidebars including versioned sidebars
   const docsSidebars = loadSidebars({siteDir, env});
 

packages/docusaurus/lib/load/index.js

@@ -17,7 +17,7 @@ const loadRoutes = require('./routes');
 const loadPlugins = require('./plugins');
 const constants = require('../constants');
 
-module.exports = async function load(siteDir, skipNextRelease = false) {
+module.exports = async function load(siteDir, cliOptions = {}) {
   const generatedFilesDir = path.resolve(
     siteDir,
     constants.GENERATED_FILES_DIR_NAME,
@@ -42,15 +42,14 @@ module.exports = async function load(siteDir, skipNextRelease = false) {
 
   // Docs
   const docsDir = path.resolve(siteDir, '..', siteConfig.customDocsPath);
-  const {docsMetadatas, docsSidebars} = await loadDocs(
-    {
+  const {skipNextRelease} = cliOptions;
+  const {docsMetadatas, docsSidebars} = await loadDocs({
     siteDir,
     docsDir,
     env,
     siteConfig,
-    },
     skipNextRelease,
-  );
+  });
   await generate(
     generatedFilesDir,
     'docsMetadatas.js',

packages/docusaurus/test/load/docs/index.test.js

@@ -177,10 +177,13 @@ describe('loadDocs', () => {
   test('versioned website with skip next release', async () => {
     const props = await loadSetup('versioned');
     const {siteDir, docsDir, versionedDir, env, siteConfig} = props;
-    const {docsMetadatas} = await loadDocs(
-      {siteDir, docsDir, env, siteConfig},
-      true,
-    );
+    const {docsMetadatas} = await loadDocs({
+      siteDir,
+      docsDir,
+      env,
+      siteConfig,
+      skipNextRelease: true,
+    });
     expect(docsMetadatas['version-1.0.0-foo/bar']).toEqual({
       category: 'Test',
       id: 'version-1.0.0-foo/bar',