fix: upgrade failure using docker

nocobase · Nov 1, 2022 · af32f08 · af32f08
1 parent 7d73194
commit af32f08
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/packages/core/cli/src/commands/upgrade.js b/packages/core/cli/src/commands/upgrade.js
@@ -15,10 +15,7 @@ module.exports = (cli) => {
     .option('--raw')
     .option('-S|--skip-code-update')
     .action(async (options) => {
-      if (!hasTsNode()) {
-        return;
-      }
-      promptForTs();
+      if (hasTsNode()) promptForTs();
       if (hasCorePackages()) {
         // await run('yarn', ['install']);
         await runAppCommand('upgrade');
@@ -28,6 +25,11 @@ module.exports = (cli) => {
         await runAppCommand('upgrade');
         return;
       }
+      await runAppCommand('upgrade');
+      // If ts-node is not installed, do not do the following
+      if (!hasTsNode()) {
+        return;
+      }
       const version = await getVersion();
       await run('yarn', ['add', '@nocobase/cli', '@nocobase/devtools', '-W']);
       const clientPackage = resolve(process.cwd(), `packages/${APP_PACKAGE_ROOT}/client/package.json`);

diff --git a/packages/core/client/src/pm/PluginManagerLink.tsx b/packages/core/client/src/pm/PluginManagerLink.tsx
@@ -66,10 +66,10 @@ export const SettingsCenterDropdown = () => {
       title: t('Workflow'),
       path: 'workflow/workflows',
     },
-    {
-      title: t('Graph Collections'),
-      path: 'graph/collections',
-    },
+    // {
+    //   title: t('Graph Collections'),
+    //   path: 'graph/collections',
+    // },
   ];
   return (
     <ActionContext.Provider value={{ visible, setVisible }}>