@sapphire/cli 1.3.2-next.f854841.0 → 1.4.0-next.6944f40.0

package/dist/commands/new.js

@@ -27,9 +27,16 @@ async function installDeps(location, pm, verbose) {
     if (value.exitCode !== 0) {
         throw new Error('An unknown error occurred while installing the dependencies. Try running Sapphire CLI with "--verbose" flag.');
     }
-    const oppositeLockfile = `./${location}/${pm === 'npm' ? 'yarn.lock' : 'package-lock.json'}`;
-    if (await fileExists(oppositeLockfile)) {
-        await rm(oppositeLockfile);
+    const oppositeLockfiles = {
+        npm: ['yarn.lock', 'pnpm-lock.yaml'],
+        yarn: ['package-lock.json', 'pnpm-lock.yaml'],
+        pnpm: ['package-lock.json', 'yarn.lock']
+    };
+    const lockfiles = pm === 'npm' ? oppositeLockfiles.npm : pm === 'Yarn' ? oppositeLockfiles.yarn : oppositeLockfiles.pnpm;
+    for (const lockfile of lockfiles) {
+        if (await fileExists(lockfile)) {
+            await rm(lockfile);
+        }
     }
     return true;
 }
@@ -83,7 +90,7 @@ async function cloneRepo(location, verbose) {
     return true;
 }
 export default async (name, flags) => {
-    const response = await prompts(PromptNew(name, await CommandExists('yarn')));
+    const response = await prompts(PromptNew(name, await CommandExists('yarn'), await CommandExists('pnpm')));
     if (!response.projectName || !response.projectLang || !response.projectTemplate || !response.packageManager) {
         process.exit(1);
     }
@@ -98,6 +105,9 @@ export default async (name, flags) => {
             language: response.projectLang
         });
         await editPackageJson(response.projectName, projectName);
+        if (response.packageManager === 'pnpm') {
+            await writeFile(`./${response.projectName}/.npmrc`, '# pnpm only\nshamefully-hoist=true\npublic-hoist-pattern[]=@sapphire/*');
+        }
     };
     const jobs = [
         [() => cloneRepo(response.projectName, flags.verbose), 'Cloning the repository'],

package/dist/prompts/PromptNew.js

@@ -8,13 +8,18 @@ const jsTemplates = [
     { title: 'with ESM (Recommended)', value: 'with-esm' },
     { title: 'with CommonJS', value: 'with-javascript' }
 ];
-export const PromptNew = (projectName, yarn) => {
+export const PromptNew = (projectName, yarn, pnpm) => {
     const pmChoices = [
         {
             title: `Yarn (Recommended) ${yarn ? '' : '(Not installed)'}`,
             value: 'Yarn',
             disabled: !yarn
         },
+        {
+            title: `pnpm ${pnpm ? '' : '(Not Installed)'}`,
+            value: 'pnpm',
+            disabled: !pnpm
+        },
         { title: 'npm', value: 'npm' }
     ];
     return [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapphire/cli",
-  "version": "1.3.2-next.f854841.0",
+  "version": "1.4.0-next.6944f40.0",
   "description": "CLI for Sapphire Framework",
   "author": "@sapphire",
   "license": "MIT",
@@ -41,38 +41,38 @@
     "@favware/colorette-spinner": "^1.0.1",
     "@sapphire/result": "^2.6.0",
     "colorette": "^2.0.19",
-    "commander": "^9.4.1",
+    "commander": "^9.5.0",
     "execa": "^6.1.0",
     "find-up": "^5.0.0",
     "js-yaml": "^4.1.0",
     "prompts": "^2.4.2",
-    "tslib": "^2.4.0"
+    "tslib": "^2.4.1"
   },
   "devDependencies": {
-    "@commitlint/cli": "^17.1.2",
-    "@commitlint/config-conventional": "^17.1.0",
-    "@favware/cliff-jumper": "^1.8.8",
-    "@favware/npm-deprecate": "^1.0.5",
+    "@commitlint/cli": "^17.4.0",
+    "@commitlint/config-conventional": "^17.4.0",
+    "@favware/cliff-jumper": "^1.9.0",
+    "@favware/npm-deprecate": "^1.0.7",
     "@sapphire/eslint-config": "^4.3.8",
     "@sapphire/prettier-config": "^1.4.4",
     "@sapphire/ts-config": "^3.3.4",
     "@types/js-yaml": "^4.0.5",
-    "@types/node": "^18.7.15",
-    "@types/prompts": "^2.4.1",
-    "@typescript-eslint/eslint-plugin": "^5.40.1",
-    "@typescript-eslint/parser": "^5.40.1",
+    "@types/node": "^18.11.18",
+    "@types/prompts": "^2.4.2",
+    "@typescript-eslint/eslint-plugin": "^5.48.0",
+    "@typescript-eslint/parser": "^5.48.0",
     "cz-conventional-changelog": "^3.3.0",
-    "eslint": "^8.26.0",
-    "eslint-config-prettier": "^8.5.0",
+    "eslint": "^8.31.0",
+    "eslint-config-prettier": "^8.6.0",
     "eslint-plugin-prettier": "^4.2.1",
-    "globby": "^13.1.2",
-    "husky": "^8.0.1",
-    "lint-staged": "^13.0.3",
+    "globby": "^13.1.3",
+    "husky": "^8.0.3",
+    "lint-staged": "^13.1.0",
     "pinst": "^3.0.0",
-    "prettier": "^2.7.1",
+    "prettier": "^2.8.2",
     "pretty-quick": "^3.1.3",
     "ts-node": "^10.9.1",
-    "typescript": "^4.8.4"
+    "typescript": "^4.9.4"
   },
   "resolutions": {
     "ansi-regex": "^5.0.1",
@@ -117,5 +117,5 @@
     "access": "public"
   },
   "prettier": "@sapphire/prettier-config",
-  "packageManager": "yarn@3.2.4"
+  "packageManager": "yarn@3.3.1"
 }

package/templates/components/contextmenucommand.js.sapphire

@@ -26,10 +26,10 @@ class UserCommand extends Command {
 	}
 
 	/**
-	 * @param {Command.ContextMenuInteraction} interaction
+	 * @param {Command.ContextMenuCommandInteraction} interaction
 	 */
 	async contextMenuRun(interaction) {
-		return await interaction.reply({ content: 'Hello world!' });
+		return interaction.reply({ content: 'Hello world!' });
 	}
 }
 

package/templates/components/contextmenucommand.ts.sapphire

@@ -16,7 +16,7 @@ export class UserCommand extends Command {
 		);
 	}
 
-	public async contextMenuRun(interaction: Command.ContextMenuInteraction) {
-		return await interaction.reply({ content: 'Hello world!' });
+	public async contextMenuRun(interaction: Command.ContextMenuCommandInteraction) {
+		return interaction.reply({ content: 'Hello world!' });
 	}
 }

package/templates/components/precondition.js.sapphire

@@ -11,14 +11,14 @@ class UserPrecondition extends Precondition {
 	}
 
 	/**
-	 * @param {import('discord.js').CommandInteraction} interaction
+	 * @param {import('discord.js').ChatInputCommandInteraction} interaction
 	 */
 	chatInputRun(interaction) {
 		return this.ok();
 	}
 
 	/**
-	 * @param {import('discord.js').ContextMenuInteraction} interaction
+	 * @param {import('discord.js').ContextMenuCommandInteraction} interaction
 	 */
 	contextMenuRun(interaction) {
 		return this.ok();

package/templates/components/precondition.ts.sapphire

@@ -1,18 +1,18 @@
 { "category": "preconditions" }
 ---
 import { Precondition } from '@sapphire/framework';
-import type { CommandInteraction, ContextMenuInteraction, Message } from 'discord.js';
+import type { ChatInputCommandInteraction, ContextMenuCommandInteraction, Message } from 'discord.js';
 
 export class UserPrecondition extends Precondition {
 	public override messageRun(message: Message) {
 		return this.ok();
 	}
 
-	public override chatInputRun(interaction: CommandInteraction) {
+	public override chatInputRun(interaction: ChatInputCommandInteraction) {
 		return this.ok();
 	}
 
-	public override contextMenuRun(interaction: ContextMenuInteraction) {
+	public override contextMenuRun(interaction: ContextMenuCommandInteraction) {
 		return this.ok();
 	}
 }

package/templates/components/slashcommand.js.sapphire

@@ -27,10 +27,10 @@ class UserCommand extends Command {
 	}
 
 	/**
-	 * @param {Command.ChatInputInteraction} interaction
+	 * @param {Command.ChatInputCommandInteraction} interaction
 	 */
 	async chatInputRun(interaction) {
-		return await interaction.reply({ content: 'Hello world!' });
+		return interaction.reply({ content: 'Hello world!' });
 	}
 }
 

package/templates/components/slashcommand.ts.sapphire

@@ -15,7 +15,7 @@ export class UserCommand extends Command {
 		);
 	}
 
-	public override async chatInputRun(interaction: Command.ChatInputInteraction) {
-		return await interaction.reply({ content: 'Hello world!' });
+	public override async chatInputRun(interaction: Command.ChatInputCommandInteraction) {
+		return interaction.reply({ content: 'Hello world!' });
 	}
 }