fix

facebook · Apr 8, 2022 · 234e289 · 234e289
1 parent 78eda85
commit 234e289
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 15 deletions.
diff --git a/packages/docusaurus/bin/docusaurus.mjs b/packages/docusaurus/bin/docusaurus.mjs
@@ -196,14 +196,14 @@ cli
   });
 
 cli
-  .command('upgrade')
-  .description('Upgrades @docusaurus packages')
+  .command('upgrade [siteDir]')
+  .description('Upgrade @docusaurus packages.')
   .option(
     '-t, --tag <tag>',
     'Tag of npm to look for upgrading. This option accepts any of: <alpha, beta, next, latest>',
   )
-  .action(({tag = undefined}) => {
-    wrapCommand(upgrade)({tag});
+  .action(async (siteDir, {tag = undefined}) => {
+    upgrade(await resolveDir(siteDir), {tag});
   });
 
 cli

diff --git a/packages/docusaurus/src/commands/upgrade.ts b/packages/docusaurus/src/commands/upgrade.ts
@@ -18,37 +18,42 @@ async function hasYarn() {
 
 type CommonNpmTags = 'alpha' | 'beta' | 'latest' | 'next';
 
-export async function upgrade(opts: {tag: CommonNpmTags}): Promise<void> {
-  const [npmClient, npmCommand] = await hasYarn()
+export async function upgrade(
+  siteDir: string,
+  {tag}: {tag: CommonNpmTags},
+): Promise<void> {
+  const [npmClient, npmCommand] = (await hasYarn())
     ? ['yarn', 'upgrade']
     : ['npm', 'install'];
 
-  const {dependencies = {}, devDependencies = {}} = await fs.readJSON(path.join(process.cwd(), './package.json'), 'utf8');
+  const {dependencies = {}, devDependencies = {}} = await fs.readJSON(
+    path.join(siteDir, 'package.json'),
+  );
 
-  let packageNames = Array.from(
+  const packageNames = Array.from(
     new Set(
       [...Object.keys(dependencies), ...Object.keys(devDependencies)].filter(
         (pkg) => pkg.startsWith('@docusaurus'),
       ),
     ),
-  ).sort();
+  )
+    .sort()
+    .map((name) => (tag ? `${name}@${tag}` : name));
 
   if (!packageNames.length) {
     logger.error(`Found 0 packages with scope @docusaurus`);
     return;
   }
 
-  if (opts.tag) {
-    packageNames = packageNames.map((_) => `${_}@${opts.tag}`);
-  }
-
   logger.info`Found number=${packageNames.length} to update: name=${packageNames}`;
-  logger.info`Executing code=${`${npmClient} ${npmCommand} ${packageNames.join(' ')}`}`;
+  logger.info`Executing code=${`${npmClient} ${npmCommand} ${packageNames.join(
+    ' ',
+  )}`}`;
 
   childProcess.spawnSync(npmClient, [npmCommand, ...packageNames], {
     stdio: 'inherit',
     shell: os.platform() === 'win32',
   });
 
-  await clear(path.resolve('.'));
+  await clear(siteDir);
 }