Merge branch 'develop' into phale/W-7210928-tslint-2-eslint-skinny

forcedotcom · Nov 6, 2023 · ae7b8e4 · ae7b8e4
2 parents aa0632e + df21144
commit ae7b8e4
Show file tree

Hide file tree

Showing 29 changed files with 33 additions and 4,598 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/salesforcedx-utils-vscode/src/types/index.ts b/packages/salesforcedx-utils-vscode/src/types/index.ts
@@ -87,8 +87,3 @@ export type LocalComponent = DirFileNameSelection & {
    */
   suffix?: string;
 };
-
-export type FunctionInfo = {
-  fileName: string;
-  language: string;
-};
diff --git a/packages/salesforcedx-vscode-core/package.json b/packages/salesforcedx-vscode-core/package.json
@@ -24,7 +24,6 @@
     "Other"
   ],
   "dependencies": {
-    "@heroku/functions-core": "0.7.0",
     "@salesforce/core": "5.3.0",
     "@salesforce/salesforcedx-sobjects-faux-generator": "59.4.0",
     "@salesforce/salesforcedx-utils-vscode": "59.4.0",
@@ -98,7 +97,6 @@
       "main": "dist/index.js",
       "dependencies": {
         "applicationinsights": "1.0.7",
-        "@heroku/functions-core": "0.7.0",
         "@salesforce/core": "5.3.0",
         "@salesforce/source-tracking": "4.2.14",
         "@salesforce/templates": "^58.0.1",
@@ -109,7 +107,7 @@
     }
   },
   "scripts": {
-    "bundle:extension": "esbuild ./src/index.ts  --bundle --outfile=dist/index.js --format=cjs --platform=node --external:vscode  --external:@salesforce/core --external:applicationinsights --external:shelljs --external:@salesforce/source-tracking --external:@salesforce/templates --external:@salesforce/source-deploy-retrieve --external:@heroku/functions-core --minify",
+    "bundle:extension": "esbuild ./src/index.ts  --bundle --outfile=dist/index.js --format=cjs --platform=node --external:vscode  --external:@salesforce/core --external:applicationinsights --external:shelljs --external:@salesforce/source-tracking --external:@salesforce/templates --external:@salesforce/source-deploy-retrieve --minify",
     "vscode:prepublish": "npm prune --production",
     "vscode:package": "ts-node -P ./tsconfig.json ../../scripts/vsce-bundled-extension.ts",
     "vscode:sha256": "node ../../scripts/generate-sha256.js >> ../../SHA256",
@@ -209,10 +207,6 @@
         }
       ],
       "editor/context": [
-        {
-          "command": "sfdx.force.function.containerless.start",
-          "when": "sfdx:project_opened && resource =~ /.*\\/functions\\/.*\\/[^\\/]+(\\/[^\\/]+\\.(ts|js|java|json|toml))?$/ && resourceFilename != package.json && resourceFilename != package-lock.json && resourceFilename != tsconfig.json"
-        },
         {
           "command": "sfdx.force.source.retrieve.current.source.file",
           "when": "sfdx:project_opened && resourceLangId != 'forcesourcemanifest'"
@@ -331,10 +325,6 @@
           "command": "sfdx.delete.source",
           "when": "sfdx:project_opened && resourceLangId != 'forcesourcemanifest'"
         },
-        {
-          "command": "sfdx.force.function.containerless.start",
-          "when": "sfdx:project_opened && resource =~ /.*\\/functions\\/.*\\/[^\\/]+(\\/[^\\/]+\\.(ts|js|java|json|toml))?$/ && resourceFilename != package.json && resourceFilename != package-lock.json && resourceFilename != tsconfig.json"
-        },
         {
           "command": "sfdx.create.manifest",
           "when": "sfdx:project_opened"
@@ -601,26 +591,6 @@
           "command": "sfdx.force.conflict.open",
           "when": "false"
         },
-        {
-          "command": "sfdx.force.function.create",
-          "when": "sfdx:project_opened"
-        },
-        {
-          "command": "sfdx.force.function.containerless.start",
-          "when": "sfdx:project_opened && resource =~ /.*\\/functions\\/.*\\/[^\\/]+(\\/[^\\/]+\\.(ts|js|java|json|toml))?$/"
-        },
-        {
-          "command": "sfdx.force.function.invoke",
-          "when": "false"
-        },
-        {
-          "command": "sfdx.force.function.debugInvoke",
-          "when": "false"
-        },
-        {
-          "command": "sfdx.force.function.stop",
-          "when": "sfdx:project_opened"
-        },
         {
           "command": "sfdx.force.internal.refreshsobjects",
           "when": "sfdx:project_opened"
@@ -912,26 +882,6 @@
           "dark": "resources/dark/go-to-file.svg"
         }
       },
-      {
-        "command": "sfdx.force.function.create",
-        "title": "%force_function_create%"
-      },
-      {
-        "command": "sfdx.force.function.containerless.start",
-        "title": "%force_function_start%"
-      },
-      {
-        "command": "sfdx.force.function.invoke",
-        "title": "%force_function_invoke%"
-      },
-      {
-        "command": "sfdx.force.function.debugInvoke",
-        "title": "%force_function_debug_invoke%"
-      },
-      {
-        "command": "sfdx.force.function.stop",
-        "title": "%force_function_stop%"
-      },
       {
         "command": "sfdx.force.internal.refreshsobjects",
         "title": "%force_sobjects_refresh%"

diff --git a/packages/salesforcedx-vscode-core/package.nls.ja.json b/packages/salesforcedx-vscode-core/package.nls.ja.json
@@ -67,11 +67,6 @@
   "force_diff_against_org": "SFDX: ファイルと組織の差分を表示",
   "force_diff_folder_against_org": "SFDX: フォルダと組織の差分を表示",
   "force_analytics_template_create_text": "SFDX: サンプルの Analytics テンプレートを作成",
-  "force_function_create": "SFDX: Function を作成",
-  "force_function_start": "SFDX: Function を開始",
-  "force_function_invoke": "SFDX: Function を呼び出す",
-  "force_function_debug_invoke": "SFDX: Function をデバッグ",
-  "force_function_stop": "SFDX: Function を停止",
   "force_sobjects_refresh": "SFDX: SObject 定義を更新",
   "enable_sobject_refresh_on_startup_description": "プロジェクトに sObject 定義がない場合、拡張機能が有効化される際に自動的に sObject 定義を更新するかどうかを指定します。"
 }
diff --git a/packages/salesforcedx-vscode-core/package.nls.json b/packages/salesforcedx-vscode-core/package.nls.json
@@ -72,11 +72,6 @@
   "force_diff_against_org": "SFDX: Diff File Against Org",
   "force_diff_folder_against_org": "SFDX: Diff Folder Against Org",
   "force_analytics_template_create_text": "SFDX: Create Sample Analytics Template",
-  "force_function_create": "SFDX: Create Function",
-  "force_function_start": "SFDX: Start Function",
-  "force_function_invoke": "SFDX: Invoke Function",
-  "force_function_debug_invoke": "SFDX: Debug Function",
-  "force_function_stop": "SFDX: Stop Function",
   "force_sobjects_refresh": "SFDX: Refresh SObject Definitions",
   "enable_sobject_refresh_on_startup_description": "If a project has no sObject definitions, specifies whether to automatically refresh sObject definitions on extension activation (true) or not (false).",
   "force_launch_apex_replay_debugger_with_current_file": "SFDX: Launch Apex Replay Debugger with Current File",

diff --git a/...salesforcedx-vscode-core/src/commands/functions/forceFunctionContainerlessStartCommand.ts b/...salesforcedx-vscode-core/src/commands/functions/forceFunctionContainerlessStartCommand.ts
diff --git a/packages/salesforcedx-vscode-core/src/commands/functions/forceFunctionInvoke.ts b/packages/salesforcedx-vscode-core/src/commands/functions/forceFunctionInvoke.ts
diff --git a/...es/salesforcedx-vscode-core/src/commands/functions/forceFunctionInvokeCodeLensProvider.ts b/...es/salesforcedx-vscode-core/src/commands/functions/forceFunctionInvokeCodeLensProvider.ts