@clerk/upgrade 1.1.2 → 1.2.0-canary.v08c5a2a

package/dist/app.js

@@ -63,7 +63,6 @@ export default function App(props) {
   // Handle the individual SDK upgrade
   if (!fromVersion && !toVersion && sdks[0] === 'nextjs') {
     return /*#__PURE__*/React.createElement(SDKWorkflow, {
-      packageManager: props.packageManager,
       sdk: sdks[0]
     });
   }

package/dist/cli.js

@@ -14,7 +14,6 @@ const cli = meow(`
       --sdk              Name of the SDK you're upgrading
       --dir              Directory you'd like to scan for files
       --ignore           Any files or directories you'd like to ignore
-      --packageManager   The package manager you're using (npm, yarn, pnpm)
       --noWarnings       Do not print warnings, only items that must be fixed
       --disableTelemetry Do not send anonymous usage telemetry
 
@@ -42,9 +41,6 @@ const cli = meow(`
       type: 'string',
       isMultiple: true
     },
-    packageManager: {
-      type: 'string'
-    },
     yolo: {
       type: 'boolean'
     },

package/dist/components/Codemod.js

@@ -45,7 +45,7 @@ export function Codemod(props) {
       setGlob(val.split(/[ ,]/));
     }
   })), !result && !error && glob && /*#__PURE__*/React.createElement(Spinner, {
-    label: `Running @clerk/${sdk}</Text> codemod... ${transform}`
+    label: `Running @clerk/${sdk} codemod... ${transform}`
   }), result && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(StatusMessage, {
     variant: "success"
   }, "Running ", /*#__PURE__*/React.createElement(Text, {

package/dist/components/SDKWorkflow.js

@@ -15,14 +15,12 @@ import { UpgradeSDK } from './UpgradeSDK.js';
  *
  * @component
  * @param {Object} props
- * @param {string} props.packageManager - The package manager to use for the upgrade, if needed.
  * @param {string} props.sdk - The SDK to be upgraded.
  *
  * @returns {JSX.Element} The rendered component.
  */
 export function SDKWorkflow(props) {
   const {
-    packageManager,
     sdk
   } = props;
   const [done, setDone] = useState(false);
@@ -48,7 +46,6 @@ export function SDKWorkflow(props) {
     color: "green"
   }, "yes")) : null, /*#__PURE__*/React.createElement(Newline, null), version === 5 && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(UpgradeSDK, {
     callback: setUpgradeComplete,
-    packageManager: packageManager,
     sdk: sdk
   }), upgradeComplete ? /*#__PURE__*/React.createElement(Codemod, {
     callback: setDone,

package/dist/components/UpgradeSDK.js

@@ -1,7 +1,7 @@
-import { Spinner, StatusMessage } from '@inkjs/ui';
+import { Select, Spinner, StatusMessage } from '@inkjs/ui';
 import { execa } from 'execa';
 import { existsSync } from 'fs';
-import { Text } from 'ink';
+import { Newline, Text } from 'ink';
 import React, { useEffect, useState } from 'react';
 function detectPackageManager() {
   if (existsSync('package-lock.json')) {
@@ -10,12 +10,11 @@ function detectPackageManager() {
     return 'yarn';
   } else if (existsSync('pnpm-lock.yaml')) {
     return 'pnpm';
-  } else {
-    return 'npm';
   }
+  return undefined;
 }
 function upgradeCommand(sdk, packageManager) {
-  switch (packageManager || detectPackageManager()) {
+  switch (packageManager) {
     case 'yarn':
       return `yarn add @clerk/${sdk}@latest`;
     case 'pnpm':
@@ -31,7 +30,6 @@ function upgradeCommand(sdk, packageManager) {
  * @component
  * @param {Object} props
  * @param {Function} props.callback - The callback function to be called after the command execution.
- * @param {string} props.packageManager - The package manager used in the project in case we cannot detect it automatically.
  * @param {string} props.sdk - The SDK for which the upgrade command is run.
  * @returns {JSX.Element} The rendered component.
  *
@@ -40,23 +38,48 @@ function upgradeCommand(sdk, packageManager) {
  */
 export function UpgradeSDK({
   callback,
-  packageManager,
   sdk
 }) {
+  const [command, setCommand] = useState();
   const [error, setError] = useState();
+  const [packageManager, setPackageManager] = useState(detectPackageManager());
   const [result, setResult] = useState();
-  const command = upgradeCommand(sdk, packageManager);
   useEffect(() => {
+    if (!packageManager) {
+      return;
+    }
+    setCommand(previous => {
+      if (previous) {
+        return previous;
+      }
+      return upgradeCommand(sdk, packageManager);
+    });
+    if (!command) {
+      return;
+    }
     execa({
       shell: true
     })`${command}`.then(res => {
       setResult(res);
-      callback(true);
     }).catch(err => {
       setError(err);
+    }).finally(() => {
+      callback(true);
     });
-  }, [command]);
-  return /*#__PURE__*/React.createElement(React.Fragment, null, !result && !error && /*#__PURE__*/React.createElement(Spinner, {
+  }, [command, packageManager, sdk]);
+  return /*#__PURE__*/React.createElement(React.Fragment, null, packageManager ? null : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Text, null, "We could not detect the package manager used in your project. Please select the package manager you are using"), /*#__PURE__*/React.createElement(Select, {
+    options: [{
+      label: 'npm',
+      value: 'npm'
+    }, {
+      label: 'pnpm',
+      value: 'pnpm'
+    }, {
+      label: 'yarn',
+      value: 'yarn'
+    }],
+    onChange: setPackageManager
+  })), packageManager && !result && !error && /*#__PURE__*/React.createElement(Spinner, {
     label: `Running upgrade command: ${command}`
   }), result && /*#__PURE__*/React.createElement(StatusMessage, {
     variant: "success"
@@ -64,7 +87,16 @@ export function UpgradeSDK({
     bold: true
   }, "@clerk/", sdk), " upgraded successfully to ", /*#__PURE__*/React.createElement(Text, {
     bold: true
-  }, "latest!")), error && /*#__PURE__*/React.createElement(StatusMessage, {
+  }, "latest!")), error && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(StatusMessage, {
     variant: "error"
-  }, "Upgrade failed!"));
+  }, "Running the upgrade command failed:", ' ', /*#__PURE__*/React.createElement(Text, {
+    bold: true,
+    color: "red"
+  }, command)), /*#__PURE__*/React.createElement(StatusMessage, {
+    variant: "info"
+  }, "Please manually upgrade ", /*#__PURE__*/React.createElement(Text, {
+    bold: true
+  }, "@clerk/", sdk), " to ", /*#__PURE__*/React.createElement(Text, {
+    bold: true
+  }, "latest"), " in your project."), /*#__PURE__*/React.createElement(Newline, null)));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clerk/upgrade",
-  "version": "1.1.2",
+  "version": "1.2.0-canary.v08c5a2a",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/clerk/javascript.git",
@@ -17,7 +17,7 @@
   ],
   "scripts": {
     "build": "npm run clean && NODE_ENV=production babel --keep-file-extension --out-dir=dist src --copy-files",
-    "clean": "del-cli dist/*",
+    "clean": "rm -rf dist/*",
     "dev": "babel --keep-file-extension --out-dir=dist --watch src --copy-files",
     "lint": "eslint src/",
     "lint:publint": "publint",
@@ -52,7 +52,6 @@
     "@babel/cli": "^7.24.7",
     "@babel/preset-react": "^7.24.7",
     "@types/jscodeshift": "^0.12.0",
-    "del-cli": "^5.1.0",
     "eslint-config-custom": "*",
     "vitest": "^2.1.3"
   },