feat: opt in bundling @salesforce/core (#5656)

* feat: opt in bundling core * chore: templates version with caret
forcedotcom · Jun 24, 2024 · bc743fc · bc743fc
1 parent 3ddb6c0
commit bc743fc
Show file tree

Hide file tree

Showing 136 changed files with 629 additions and 517 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/salesforcedx-sobjects-faux-generator/package.json b/packages/salesforcedx-sobjects-faux-generator/package.json
@@ -11,9 +11,9 @@
   "main": "out/src",
   "dependencies": {
     "@jsforce/jsforce-node": "3.2.0",
-    "@salesforce/core": "7.5.0",
     "@salesforce/salesforcedx-utils-vscode": "61.2.0",
-    "shelljs": "0.8.5"
+    "shelljs": "0.8.5",
+    "@salesforce/core-bundle": "7.5.0"
   },
   "devDependencies": {
     "@types/chai": "4.3.3",

diff --git a/packages/salesforcedx-sobjects-faux-generator/scripts/regenerateMinsSObjects.ts b/packages/salesforcedx-sobjects-faux-generator/scripts/regenerateMinsSObjects.ts
@@ -19,7 +19,7 @@ import { SObjectShortDescription } from '../src/describe';
 import { OrgObjectDetailRetriever } from '../src/retriever';
 import { SObject } from '../src/types';
 
-import { Connection, Org } from '@salesforce/core';
+import { Connection, Org } from '@salesforce/core-bundle';
 
 // tslint:disable-next-line:no-floating-promises
 (async () => {

diff --git a/packages/salesforcedx-sobjects-faux-generator/src/describe/sObjectDescribe.ts b/packages/salesforcedx-sobjects-faux-generator/src/describe/sObjectDescribe.ts
@@ -10,7 +10,7 @@ import {
   DescribeSObjectResult,
   Field
 } from '@jsforce/jsforce-node';
-import { Connection } from '@salesforce/core';
+import { Connection } from '@salesforce/core-bundle';
 import { CLIENT_ID } from '../constants';
 import { BatchRequest, BatchResponse, SObject } from '../types';
 import { SObjectField } from '../types/describe';

diff --git a/packages/salesforcedx-sobjects-faux-generator/src/retriever/orgObjectRetriever.ts b/packages/salesforcedx-sobjects-faux-generator/src/retriever/orgObjectRetriever.ts
@@ -5,7 +5,7 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 
-import { Connection } from '@salesforce/core';
+import { Connection } from '@salesforce/core-bundle';
 import {
   SObjectDescribe,
   SObjectSelector,

diff --git a/packages/salesforcedx-sobjects-faux-generator/src/transformer/transformerFactory.ts b/packages/salesforcedx-sobjects-faux-generator/src/transformer/transformerFactory.ts
@@ -4,7 +4,7 @@
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-import { AuthInfo, Connection, SfProject } from '@salesforce/core';
+import { AuthInfo, Connection, SfProject } from '@salesforce/core-bundle';
 import {
   ConfigUtil,
   WorkspaceContextUtil

diff --git a/packages/salesforcedx-sobjects-faux-generator/test/integration/sObjectDescribe.test.ts b/packages/salesforcedx-sobjects-faux-generator/test/integration/sObjectDescribe.test.ts
@@ -5,7 +5,7 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 
-import { AuthInfo, Connection } from '@salesforce/core';
+import { AuthInfo, Connection } from '@salesforce/core-bundle';
 import { fail } from 'assert';
 import { expect } from 'chai';
 import { createSandbox } from 'sinon';

diff --git a/packages/salesforcedx-sobjects-faux-generator/test/integration/sobjectTransformer.test.ts b/packages/salesforcedx-sobjects-faux-generator/test/integration/sobjectTransformer.test.ts
@@ -5,7 +5,7 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 
-import { AuthInfo } from '@salesforce/core';
+import { AuthInfo } from '@salesforce/core-bundle';
 import { projectPaths } from '@salesforce/salesforcedx-utils-vscode';
 import { fail } from 'assert';
 import { expect } from 'chai';

diff --git a/packages/salesforcedx-utils-vscode/package.json b/packages/salesforcedx-utils-vscode/package.json
@@ -10,14 +10,14 @@
   ],
   "main": "out/src",
   "dependencies": {
-    "@salesforce/core": "7.5.0",
-    "@salesforce/source-deploy-retrieve": "11.6.10",
-    "@salesforce/source-tracking": "6.5.1",
     "applicationinsights": "1.0.7",
     "cross-spawn": "7.0.3",
     "rxjs": "^5.4.1",
     "strip-ansi": "^5.2.0",
-    "tree-kill": "^1.1.0"
+    "tree-kill": "^1.1.0",
+    "@salesforce/core-bundle": "7.5.0",
+    "@salesforce/source-tracking-bundle": "6.5.1",
+    "@salesforce/source-deploy-retrieve-bundle": "11.6.10"
   },
   "devDependencies": {
     "@types/cross-spawn": "6.0.0",

diff --git a/packages/salesforcedx-utils-vscode/src/config/configUtil.ts b/packages/salesforcedx-utils-vscode/src/config/configUtil.ts
@@ -11,7 +11,7 @@ import {
   Org,
   OrgConfigProperties,
   StateAggregator
-} from '@salesforce/core';
+} from '@salesforce/core-bundle';
 import { workspaceUtils } from '..';
 import {
   SF_CONFIG_DISABLE_TELEMETRY,

diff --git a/packages/salesforcedx-utils-vscode/src/context/workspaceContextUtil.ts b/packages/salesforcedx-utils-vscode/src/context/workspaceContextUtil.ts
@@ -5,7 +5,7 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 
-import { AuthInfo, Connection, StateAggregator } from '@salesforce/core';
+import { AuthInfo, Connection, StateAggregator } from '@salesforce/core-bundle';
 import * as vscode from 'vscode';
 import { ConfigAggregatorProvider, TelemetryService } from '..';
 import { ConfigUtil } from '../config/configUtil';

diff --git a/packages/salesforcedx-utils-vscode/src/helpers/paths.ts b/packages/salesforcedx-utils-vscode/src/helpers/paths.ts
@@ -5,7 +5,7 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 
-import { Global } from '@salesforce/core';
+import { Global } from '@salesforce/core-bundle';
 import * as fs from 'fs';
 import * as path from 'path';
 import * as vscode from 'vscode';

diff --git a/packages/salesforcedx-utils-vscode/src/helpers/traceFlags.ts b/packages/salesforcedx-utils-vscode/src/helpers/traceFlags.ts
@@ -4,7 +4,7 @@
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-import { Connection } from '@salesforce/core';
+import { Connection } from '@salesforce/core-bundle';
 import { TraceFlagsRemover } from '../helpers';
 import { nls } from '../messages';
 

diff --git a/packages/salesforcedx-utils-vscode/src/helpers/traceFlagsRemover.ts b/packages/salesforcedx-utils-vscode/src/helpers/traceFlagsRemover.ts
@@ -4,7 +4,7 @@
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-import { Connection } from '@salesforce/core';
+import { Connection } from '@salesforce/core-bundle';
 
 /**
  * TraceFlagsRemover is a singleton which deletes trace flags created by the extensions.

diff --git a/packages/salesforcedx-utils-vscode/src/providers/configAggregatorProvider.ts b/packages/salesforcedx-utils-vscode/src/providers/configAggregatorProvider.ts
@@ -5,7 +5,7 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 
-import { ConfigAggregator } from '@salesforce/core';
+import { ConfigAggregator } from '@salesforce/core-bundle';
 import { workspaceUtils } from '../workspaces';
 
 /*

diff --git a/packages/salesforcedx-utils-vscode/src/providers/sourceTrackingProvider.ts b/packages/salesforcedx-utils-vscode/src/providers/sourceTrackingProvider.ts
@@ -5,11 +5,11 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 
-import { Connection, Org, SfProject } from '@salesforce/core';
+import { Connection, Org, SfProject } from '@salesforce/core-bundle';
 import {
   SourceTracking,
   SourceTrackingOptions
-} from '@salesforce/source-tracking';
+} from '@salesforce/source-tracking-bundle';
 
 /*
  * The SourceTrackingProvider class is used to instantiate

diff --git a/packages/salesforcedx-utils-vscode/src/services/sourceTrackingService.ts b/packages/salesforcedx-utils-vscode/src/services/sourceTrackingService.ts
@@ -5,9 +5,9 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 
-import { Connection } from '@salesforce/core';
-import { RetrieveResult } from '@salesforce/source-deploy-retrieve';
-import { SourceTracking, StatusOutputRow } from '@salesforce/source-tracking';
+import { Connection } from '@salesforce/core-bundle';
+import { RetrieveResult } from '@salesforce/source-deploy-retrieve-bundle';
+import { SourceTracking, StatusOutputRow } from '@salesforce/source-tracking-bundle';
 import { WorkspaceContextUtil } from '../context/workspaceContextUtil';
 import { nls } from '../messages';
 import { Row, Table } from '../output';

diff --git a/packages/salesforcedx-utils-vscode/test/jest/config/configUtil.test.ts b/packages/salesforcedx-utils-vscode/test/jest/config/configUtil.test.ts
@@ -4,7 +4,7 @@
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-import { Config, Org, StateAggregator } from '@salesforce/core';
+import { Config, Org, StateAggregator } from '@salesforce/core-bundle';
 import { ConfigUtil, TARGET_ORG_KEY, workspaceUtils } from '../../../src';
 import { ConfigAggregatorProvider } from './../../../src/providers/configAggregatorProvider';
 

diff --git a/packages/salesforcedx-utils-vscode/test/jest/context/workspaceContextUtil.test.ts b/packages/salesforcedx-utils-vscode/test/jest/context/workspaceContextUtil.test.ts
@@ -5,7 +5,7 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 
-import { AuthInfo, Connection, StateAggregator } from '@salesforce/core';
+import { AuthInfo, Connection, StateAggregator } from '@salesforce/core-bundle';
 import * as vscode from 'vscode';
 import {
   ConfigAggregatorProvider,
@@ -15,7 +15,7 @@ import {
 import { ConfigUtil } from '../../../src/config/configUtil';
 import { WORKSPACE_CONTEXT_ORG_ID_ERROR } from '../../../src/context/workspaceContextUtil';
 import { nls } from '../../../src/messages';
-jest.mock('@salesforce/core', () => {
+jest.mock('@salesforce/core-bundle', () => {
   return {
     Logger: {
       childFromRoot: () => {

diff --git a/packages/salesforcedx-utils-vscode/test/jest/helpers/paths.test.ts b/packages/salesforcedx-utils-vscode/test/jest/helpers/paths.test.ts
@@ -25,7 +25,7 @@ import {
   TOOLS
 } from '../../../src/helpers/paths';
 
-jest.mock('@salesforce/core', () => {
+jest.mock('@salesforce/core-bundle', () => {
   return {
     Global: {
       SFDX_STATE_FOLDER: '.sfdx',
@@ -34,7 +34,7 @@ jest.mock('@salesforce/core', () => {
   };
 });
 
-jest.mock('@salesforce/source-tracking', () => {
+jest.mock('@salesforce/source-tracking-bundle', () => {
   return {};
 });
 

diff --git a/...alesforcedx-utils-vscode/test/jest/services/source-tracking/sourceTrackingService.test.ts b/...alesforcedx-utils-vscode/test/jest/services/source-tracking/sourceTrackingService.test.ts
@@ -8,8 +8,8 @@ import { WorkspaceContextUtil } from '../../../../src';
 import { SourceTrackingService } from '../../../../src/services';
 import { testData } from './testData';
 
-jest.mock('@salesforce/core', () => ({
-  ...jest.requireActual('@salesforce/core'),
+jest.mock('@salesforce/core-bundle', () => ({
+  ...jest.requireActual('@salesforce/core-bundle'),
   Org: { create: jest.fn() },
   SfProject: { resolve: jest.fn() }
 }));

diff --git a/packages/salesforcedx-vscode-apex-debugger/esbuild.config.js b/packages/salesforcedx-vscode-apex-debugger/esbuild.config.js
@@ -6,41 +6,44 @@
  */
 /* eslint-disable @typescript-eslint/no-var-requires */
 const { build } = require('esbuild');
-// const fs = require('fs').promises;
+const esbuildPluginPino = require('esbuild-plugin-pino');
+const fs = require('fs').promises;
 
 // Configure and run the build process
 const sharedConfig = {
   bundle: true,                     // Bundle all dependencies into one file
   format: 'cjs',                    // Output format (CommonJS)
   platform: 'node',                 // Platform target (Node.js)
   minify: true,                     // Minify the output
+  keepNames: true,                  // keepNames to get rid of
   external: [
-    'vscode',
-    '@salesforce/core',
-    '@salesforce/source-tracking'
+    'vscode'
+  ],
+  plugins: [
+    esbuildPluginPino({ transports: ['pino-pretty'] })
   ]
 };
 
 // copy core-bundle/lib/transformStream.js to dist if core-bundle is included
-// const copyFiles = async (src, dest) => {
-//   try {
-//     // Copy the file
-//     await fs.copyFile(src, dest);
-//     console.log(`File was copied from ${src} to ${dest}`);
-//   } catch (error) {
-//     console.error('An error occurred:', error);
-//   }
-// };
+const copyFiles = async (src, dest) => {
+  try {
+    // Copy the file
+    await fs.copyFile(src, dest);
+    console.log(`File was copied from ${src} to ${dest}`);
+  } catch (error) {
+    console.error('An error occurred:', error);
+  }
+};
 
-// const srcPath = '../../node_modules/@salesforce/core-bundle/lib/transformStream.js';
-// const destPath = './dist/transformStream.js';
+const srcPath = '../../node_modules/@salesforce/core-bundle/lib/transformStream.js';
+const destPath = './dist/transformStream.js';
 
 (async () => {
   await build({
     ...sharedConfig,
     entryPoints: ['./src/index.ts'],
-    outfile: 'dist/index.js'
+    outdir: 'dist'
   });
 })().then(async () => {
-  // await copyFiles(srcPath, destPath);
+  await copyFiles(srcPath, destPath);
 }).catch(() => process.exit(1));
diff --git a/packages/salesforcedx-vscode-apex-debugger/package.json b/packages/salesforcedx-vscode-apex-debugger/package.json
@@ -97,9 +97,7 @@
     "packageUpdates": {
       "main": "dist/index.js",
       "dependencies": {
-        "applicationinsights": "1.0.7",
-        "@salesforce/core": "7.5.0",
-        "@salesforce/source-tracking": "6.5.1"
+        "applicationinsights": "1.0.7"
       },
       "devDependencies": {}
     }

diff --git a/packages/salesforcedx-vscode-apex-replay-debugger/esbuild.config.js b/packages/salesforcedx-vscode-apex-replay-debugger/esbuild.config.js
@@ -6,42 +6,45 @@
  */
 /* eslint-disable @typescript-eslint/no-var-requires */
 const { build } = require('esbuild');
-// const fs = require('fs').promises;
+const esbuildPluginPino = require('esbuild-plugin-pino');
+const fs = require('fs').promises;
 
 const sharedConfig = {
   bundle: true,
   format: 'cjs',
   platform: 'node',
   external: [
     'vscode',
-    '@salesforce/core',
-    '@salesforce/source-tracking',
     'applicationinsights',
     'jsonpath'
   ],
-  minify: true
+  minify: true,
+  keepNames: true,
+  plugins: [
+    esbuildPluginPino({ transports: ['pino-pretty'] })
+  ]
 };
 
 // copy core-bundle/lib/transformStream.js to dist if core-bundle is included
-// const copyFiles = async (src, dest) => {
-//   try {
-//     // Copy the file
-//     await fs.copyFile(src, dest);
-//     console.log(`File was copied from ${src} to ${dest}`);
-//   } catch (error) {
-//     console.error('An error occurred:', error);
-//   }
-// };
+const copyFiles = async (src, dest) => {
+  try {
+    // Copy the file
+    await fs.copyFile(src, dest);
+    console.log(`File was copied from ${src} to ${dest}`);
+  } catch (error) {
+    console.error('An error occurred:', error);
+  }
+};
 
-// const srcPath = '../../node_modules/@salesforce/core-bundle/lib/transformStream.js';
-// const destPath = './dist/transformStream.js';
+const srcPath = '../../node_modules/@salesforce/core-bundle/lib/transformStream.js';
+const destPath = './dist/transformStream.js';
 
 (async () => {
   await build({
     ...sharedConfig,
     entryPoints: ['./src/index.ts'],
-    outfile: 'dist/index.js'
+    outdir: 'dist'
   });
 })().then(async () => {
-  // await copyFiles(srcPath, destPath);
-}).catch(() => process.exit(1));
+  await copyFiles(srcPath, destPath);
+}).catch(() => process.exit(1));
diff --git a/packages/salesforcedx-vscode-apex-replay-debugger/package.json b/packages/salesforcedx-vscode-apex-replay-debugger/package.json
@@ -24,14 +24,14 @@
     "Debuggers"
   ],
   "dependencies": {
-    "@salesforce/apex-node": "6.1.3",
-    "@salesforce/core": "7.5.0",
     "@salesforce/salesforcedx-apex-replay-debugger": "61.2.0",
     "@salesforce/salesforcedx-utils": "61.2.0",
     "@salesforce/salesforcedx-utils-vscode": "61.2.0",
     "async-lock": "1.0.0",
     "request-light": "^0.7.0",
-    "vscode-extension-telemetry": "0.0.17"
+    "vscode-extension-telemetry": "0.0.17",
+    "@salesforce/core-bundle": "7.5.0",
+    "@salesforce/apex-node-bundle": "6.1.3"
   },
   "devDependencies": {
     "@salesforce/salesforcedx-test-utils-vscode": "61.2.0",
@@ -106,8 +106,6 @@
     "packageUpdates": {
       "main": "dist/index.js",
       "dependencies": {
-        "@salesforce/core": "7.5.0",
-        "@salesforce/source-tracking": "6.5.1",
         "applicationinsights": "1.0.7",
         "jsonpath": "1.1.1"
       },

diff --git a/packages/salesforcedx-vscode-apex-replay-debugger/src/commands/quickLaunch.ts b/packages/salesforcedx-vscode-apex-replay-debugger/src/commands/quickLaunch.ts
@@ -12,8 +12,8 @@ import {
   TestLevel,
   TestResult,
   TestService
-} from '@salesforce/apex-node';
-import { Connection } from '@salesforce/core';
+} from '@salesforce/apex-node-bundle';
+import { Connection } from '@salesforce/core-bundle';
 import {
   ContinueResponse,
   LibraryCommandletExecutor,