chore: make codebase bundle-able

forcedotcom · Feb 13, 2024 · e01b3cb · e01b3cb
1 parent 5bd3456
commit e01b3cb
Show file tree

Hide file tree

Showing 20 changed files with 31 additions and 27 deletions.
diff --git a/examples/test/tsconfig.json b/examples/test/tsconfig.json
@@ -4,6 +4,7 @@
   "compilerOptions": {
     "noEmit": true,
     "skipLibCheck": true,
-    "resolveJsonModule": true
+    "resolveJsonModule": true,
+    "esModuleInterop": true
   }
 }
diff --git a/src/deviceOauthService.ts b/src/deviceOauthService.ts
@@ -11,7 +11,7 @@ import Transport from 'jsforce/lib/transport';
 import { AsyncCreatable, Duration, parseJsonMap, sleep } from '@salesforce/kit';
 import { HttpRequest, OAuth2Config } from 'jsforce';
 import { ensureString, isString, JsonMap, Nullable } from '@salesforce/ts-types';
-import * as FormData from 'form-data';
+import FormData from 'form-data';
 import { Logger } from './logger/logger';
 import { AuthInfo, DEFAULT_CONNECTED_APP_INFO } from './org/authInfo';
 import { SFDX_HTTP_HEADERS } from './org/connection';

diff --git a/src/logger/logger.ts b/src/logger/logger.ts
@@ -180,7 +180,7 @@ export class Logger {
           transport: {
             pipeline: [
               {
-                target: path.join('..', '..', 'lib', 'logger', 'transformStream'),
+                target: './transformStream',
               },
               getWriteStream(level),
             ],

diff --git a/src/status/streamingClient.ts b/src/status/streamingClient.ts
@@ -10,7 +10,7 @@
 import { resolve as resolveUrl } from 'node:url';
 import { AsyncOptionalCreatable, Duration, Env, env, set } from '@salesforce/kit/lib';
 import { AnyFunction, AnyJson, ensure, ensureString, JsonMap } from '@salesforce/ts-types/lib';
-import * as Faye from 'faye';
+import Faye from 'faye';
 import { Logger } from '../logger/logger';
 import { Org } from '../org/org';
 import { SfError } from '../sfError';

diff --git a/src/util/zipWriter.ts b/src/util/zipWriter.ts
@@ -6,7 +6,7 @@
  */
 
 import { Readable, Writable } from 'node:stream';
-import * as JSZip from 'jszip';
+import JSZip from 'jszip';
 import { Logger } from '../logger/logger';
 import { SfError } from '../sfError';
 import { StructuredWriter } from './structuredWriter';

diff --git a/test/tsconfig.json b/test/tsconfig.json
@@ -4,6 +4,7 @@
   "compilerOptions": {
     "noEmit": true,
     "skipLibCheck": true,
-    "resolveJsonModule": true
+    "resolveJsonModule": true,
+    "esModuleInterop": true
   }
 }
diff --git a/test/unit/config/configAggregatorTest.ts b/test/unit/config/configAggregatorTest.ts
@@ -6,7 +6,7 @@
  */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-call */
-import * as fs from 'node:fs';
+import fs from 'node:fs';
 import { assert, expect, config as chaiConfig } from 'chai';
 import { Config, ConfigProperties, SFDX_ALLOWED_PROPERTIES, SfdxPropertyKeys } from '../../../src/config/config';
 import { ConfigAggregator, ConfigInfo } from '../../../src/config/configAggregator';

diff --git a/test/unit/config/configFileTest.ts b/test/unit/config/configFileTest.ts
@@ -7,12 +7,12 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 
-import * as Path from 'node:path';
-import * as fs from 'node:fs';
+import Path from 'node:path';
+import fs from 'node:fs';
 import { expect } from 'chai';
 
 import { assert } from '@salesforce/ts-types';
-import * as lockfileLib from 'proper-lockfile';
+import lockfileLib from 'proper-lockfile';
 import { ConfigFile } from '../../../src/config/configFile';
 import { SfError } from '../../../src/exported';
 import { shouldThrow, TestContext } from '../../../src/testSetup';

diff --git a/test/unit/crypto/cryptoKeyFailuresTest.ts b/test/unit/crypto/cryptoKeyFailuresTest.ts
@@ -6,9 +6,9 @@
  */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 
-import * as childProcess from 'node:child_process';
-import * as _crypto from 'node:crypto';
-import * as os from 'node:os';
+import childProcess from 'node:child_process';
+import _crypto from 'node:crypto';
+import os from 'node:os';
 import { AnyJson } from '@salesforce/ts-types';
 import { assert, expect } from 'chai';
 import { Crypto } from '../../../src/crypto/crypto';

diff --git a/test/unit/crypto/cryptoTest.ts b/test/unit/crypto/cryptoTest.ts
@@ -6,7 +6,7 @@
  */
 /* eslint-disable @typescript-eslint/ban-types */
 
-import * as os from 'node:os';
+import os from 'node:os';
 import { stubMethod } from '@salesforce/ts-sinon';
 import { expect } from 'chai';
 import { Crypto } from '../../../src/crypto/crypto';

diff --git a/test/unit/crypto/keyChainImplTest.ts b/test/unit/crypto/keyChainImplTest.ts
@@ -11,7 +11,7 @@
 /* eslint-disable no-underscore-dangle */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 
-import * as fs from 'node:fs';
+import fs from 'node:fs';
 import { assert, expect } from 'chai';
 import { KeychainAccess, keyChainImpl } from '../../../src/crypto/keyChainImpl';
 import { shouldThrow, TestContext } from '../../../src/testSetup';

diff --git a/test/unit/crypto/secureStringTest.ts b/test/unit/crypto/secureStringTest.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 * as crypto from 'node:crypto';
+import crypto from 'node:crypto';
 import { expect } from 'chai';
 import { stub } from 'sinon';
 import { SecureBuffer } from '../../../src/crypto/secureBuffer';

diff --git a/test/unit/messagesTest.ts b/test/unit/messagesTest.ts
@@ -7,8 +7,8 @@
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 
-import * as fs from 'node:fs';
-import * as path from 'node:path';
+import fs from 'node:fs';
+import path from 'node:path';
 import { EOL } from 'node:os';
 import { assert, expect } from 'chai';
 import { SinonStub } from 'sinon';

diff --git a/test/unit/org/authInfoTest.ts b/test/unit/org/authInfoTest.ts
@@ -9,9 +9,9 @@
 /* eslint-disable @typescript-eslint/ban-types */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 
-import * as pathImport from 'node:path';
-import * as dns from 'node:dns';
-import * as jwt from 'jsonwebtoken';
+import pathImport from 'node:path';
+import dns from 'node:dns';
+import jwt from 'jsonwebtoken';
 import { env, includes } from '@salesforce/kit';
 import { spyMethod, stubMethod } from '@salesforce/ts-sinon';
 import { AnyJson, getJsonMap, JsonMap, toJsonMap } from '@salesforce/ts-types';

diff --git a/test/unit/org/orgTest.ts b/test/unit/org/orgTest.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 { deepStrictEqual, fail } from 'node:assert';
-import * as fs from 'node:fs';
+import fs from 'node:fs';
 import { constants as fsConstants } from 'node:fs';
 import { join as pathJoin } from 'node:path';
 import { format } from 'node:util';

diff --git a/test/unit/status/myDomainResolverTest.ts b/test/unit/status/myDomainResolverTest.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 * as dns from 'node:dns';
+import dns from 'node:dns';
 import { URL } from 'node:url';
 import { Duration, Env } from '@salesforce/kit';
 import { AnyFunction } from '@salesforce/ts-types';

diff --git a/test/unit/util/directoryWriterTest.ts b/test/unit/util/directoryWriterTest.ts
@@ -9,7 +9,7 @@ import * as fs from 'node:fs';
 import * as path from 'node:path';
 import { Readable } from 'node:stream';
 import * as chai from 'chai';
-import * as chaiString from 'chai-string';
+import chaiString from 'chai-string';
 import { DirectoryWriter } from '../../../src/util/directoryWriter';
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires

diff --git a/test/unit/util/zipWriterTest.ts b/test/unit/util/zipWriterTest.ts
@@ -9,7 +9,7 @@ import * as fs from 'node:fs';
 import * as path from 'node:path';
 import { expect } from 'chai';
 import * as sinon from 'sinon';
-import * as JSZip from 'jszip';
+import JSZip from 'jszip';
 import { ZipWriter } from '../../../src/util/zipWriter';
 
 describe('ZipWriter', () => {

diff --git a/tsconfig.json b/tsconfig.json
@@ -4,7 +4,8 @@
     "outDir": "./lib",
     "resolveJsonModule": true,
     "rootDir": "./src",
-    "plugins": [{ "transform": "./src/messageTransformer.ts" }]
+    "plugins": [{ "transform": "./src/messageTransformer.ts" }],
+    "esModuleInterop": true
   },
   "include": ["./src/**/*.ts"]
 }
diff --git a/typedocExamples/tsconfig.json b/typedocExamples/tsconfig.json
@@ -4,6 +4,7 @@
   "compilerOptions": {
     "noEmit": true,
     "skipLibCheck": true,
-    "resolveJsonModule": true
+    "resolveJsonModule": true,
+    "esModuleInterop": true
   }
 }