feat: remove hooks from plugin generate

salesforcecli · Jun 20, 2023 · 1942ed6 · 1942ed6
1 parent adfe3ed
commit 1942ed6
Show file tree

Hide file tree

Showing 19 changed files with 6 additions and 519 deletions.
diff --git a/command-snapshot.json b/command-snapshot.json
@@ -55,14 +55,6 @@
     "flagChars": ["d"],
     "flagAliases": ["dryrun"]
   },
-  {
-    "command": "dev:generate:hook",
-    "plugin": "@salesforce/plugin-dev",
-    "flags": ["event", "force"],
-    "alias": [],
-    "flagChars": [],
-    "flagAliases": []
-  },
   {
     "command": "dev:generate:library",
     "plugin": "@salesforce/plugin-dev",
@@ -78,13 +70,5 @@
     "alias": ["plugins:generate"],
     "flagChars": [],
     "flagAliases": []
-  },
-  {
-    "command": "dev:hook",
-    "plugin": "@salesforce/plugin-dev",
-    "flags": ["json", "plugin"],
-    "alias": [],
-    "flagChars": ["p"],
-    "flagAliases": []
   }
 ]
diff --git a/messages/dev.generate.hook.md b/messages/dev.generate.hook.md
diff --git a/messages/dev.hook.md b/messages/dev.hook.md
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@salesforce/plugin-dev",
   "description": "commands for sf plugin development",
-  "version": "0.7.11",
+  "version": "1.0.0",
   "author": "Salesforce",
   "bugs": "https://github.com/forcedotcom/cli/issues",
   "dependencies": {
@@ -13,7 +13,6 @@
     "@salesforce/ts-types": "^2.0.3",
     "change-case": "^4.1.2",
     "fast-glob": "^3.2.12",
-    "got": "^11.8.5",
     "graphology": "^0.25.1",
     "graphology-types": "^0.24.7",
     "js-yaml": "^4.1.0",

diff --git a/src/commands/dev/generate/hook.ts b/src/commands/dev/generate/hook.ts
diff --git a/src/commands/dev/hook.ts b/src/commands/dev/hook.ts
diff --git a/src/generators/hook.ts b/src/generators/hook.ts
diff --git a/src/generators/plugin.ts b/src/generators/plugin.ts
@@ -11,10 +11,9 @@ import * as Generator from 'yeoman-generator';
 import yosay = require('yosay');
 import { exec } from 'shelljs';
 import replace = require('replace-in-file');
-import { camelCase } from 'change-case';
 import { Messages } from '@salesforce/core';
-import { Hook, NYC, PackageJson } from '../types';
-import { addHookToPackageJson, readJson, validatePluginName } from '../util';
+import { NYC, PackageJson } from '../types';
+import { readJson, validatePluginName } from '../util';
 
 Messages.importMessagesDirectory(__dirname);
 const messages = Messages.loadMessages('@salesforce/plugin-dev', 'plugin.generator');
@@ -26,7 +25,6 @@ type PluginAnswers = {
   internal: boolean;
   name: string;
   description: string;
-  hooks?: Hook[];
   author?: string;
   codeCoverage?: string;
 };
@@ -95,13 +93,6 @@ export default class Plugin extends Generator {
         choices: ['0%', '25%', '50%', '75%', '90%', '100%'],
         when: (answers: { internal: boolean }): boolean => !answers.internal,
       },
-      {
-        type: 'checkbox',
-        name: 'hooks',
-        message: messages.getMessage('question.hooks'),
-        choices: Object.values(Hook),
-        when: (answers: { internal: boolean }): boolean => answers.internal,
-      },
     ]);
 
     const directory = path.resolve(this.answers.name);
@@ -123,20 +114,9 @@ export default class Plugin extends Generator {
   }
 
   public writing(): void {
-    let pjson = readJson<PackageJson>(path.join(this.env.cwd, 'package.json'));
+    const pjson = readJson<PackageJson>(path.join(this.env.cwd, 'package.json'));
 
     this.sourceRoot(path.join(__dirname, '../../templates'));
-    const hooks = (this.answers.hooks ?? []).map((h) => h.split(' ').join(':')) as Hook[];
-    for (const hook of hooks) {
-      const filename = camelCase(hook.replace('sf:', ''));
-      this.fs.copyTpl(
-        this.templatePath(`src/hooks/${hook.replace(/:/g, '.')}.ts.ejs`),
-        this.destinationPath(`src/hooks/${filename}.ts`),
-        { year: new Date().getFullYear() }
-      );
-
-      pjson = addHookToPackageJson(hook, filename, pjson);
-    }
 
     const updated: Partial<PackageJson> = this.answers.internal
       ? {

diff --git a/src/types.ts b/src/types.ts
@@ -31,7 +31,6 @@ export type PackageJson = {
   oclif: {
     bin: string;
     dirname: string;
-    hooks: Record<string, string | string[]>;
     topics: Record<string, Topic>;
   };
   repository: string;
@@ -52,13 +51,6 @@ export type PackageJson = {
   };
 };
 
-export enum Hook {
-  'sf:env:list' = 'sf env list',
-  'sf:env:display' = 'sf env display',
-  'sf:deploy' = 'sf deploy',
-  'sf:logout' = 'sf logout',
-}
-
 export type FlagAnswers = {
   char?: string;
   type: keyof typeof Flags;

diff --git a/src/util.ts b/src/util.ts
@@ -7,8 +7,7 @@
 import * as fs from 'fs';
 import * as os from 'os';
 import { createEnv } from 'yeoman-environment';
-import { ensureArray } from '@salesforce/kit';
-import { FlagAnswers, Hook, PackageJson } from './types';
+import { FlagAnswers } from './types';
 
 export function generate(type: string, generatorOptions: Record<string, unknown> = {}): Promise<void> {
   const env = createEnv();
@@ -21,17 +20,6 @@ export function readJson<T>(filePath: string): T {
   return JSON.parse(pjsonRaw) as T;
 }
 
-export function addHookToPackageJson(hook: Hook, filename: string, pjson: PackageJson): PackageJson {
-  pjson.oclif.hooks = pjson.oclif.hooks || {};
-  const p = `./lib/hooks/${filename}`;
-  if (pjson.oclif.hooks[hook]) {
-    pjson.oclif.hooks[hook] = [...ensureArray(pjson.oclif.hooks[hook]), p];
-  } else {
-    pjson.oclif.hooks[hook] = p;
-  }
-  return pjson;
-}
-
 export async function fileExists(file: string): Promise<boolean> {
   try {
     await fs.promises.access(file);