Skip to content

Commit

Permalink
refactor: devScripts update (#667)
Browse files Browse the repository at this point in the history
* chore: updates from devScripts

* fix(deps): node16 module resolution for ut

* chore: remove header

---------

Co-authored-by: mshanemc <shane.mclaughlin@salesforce.com>
  • Loading branch information
svc-cli-bot and mshanemc authored Jul 30, 2024
1 parent cda2c48 commit 7f43aa5
Show file tree
Hide file tree
Showing 8 changed files with 263 additions and 257 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"ts-retry-promise": "^0.8.1"
},
"devDependencies": {
"@salesforce/dev-scripts": "^10.2.2",
"@salesforce/dev-scripts": "^10.2.7",
"@salesforce/ts-sinon": "^1.4.22",
"@types/debug": "^4.1.12",
"ts-node": "^10.9.2",
Expand Down
4 changes: 2 additions & 2 deletions src/zip.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/
import * as fs from 'node:fs';
import * as path from 'node:path';
import * as JSZip from 'jszip';
import JSZip from 'jszip';
import Debug from 'debug';

export type ZipDirConfig = {
Expand All @@ -25,7 +25,7 @@ export type ZipDirConfig = {
* E.g., "myArchivedDir.zip"
*/
name: string;
}
};

/**
* Zip the contents of a directory to a file.
Expand Down
6 changes: 3 additions & 3 deletions test/unit/execCmd.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
* 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 fs from 'node:fs';
import fs from 'node:fs';
import { join } from 'node:path';
import { expect, assert, config } from 'chai';
import * as sinon from 'sinon';
import sinon from 'sinon';
import { Duration, env } from '@salesforce/kit';
import { stubMethod } from '@salesforce/ts-sinon';
import * as shelljs from 'shelljs';
import shelljs from 'shelljs';
import { ShellString } from 'shelljs';
import { beforeEach } from 'mocha';
import { execCmd } from '../../src';
Expand Down
6 changes: 3 additions & 3 deletions test/unit/testProject.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
* 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 fs from 'node:fs';
import fs from 'node:fs';
import { tmpdir } from 'node:os';
import { join as pathJoin } from 'node:path';
import { assert, expect } from 'chai';
import * as sinon from 'sinon';
import * as shelljs from 'shelljs';
import sinon from 'sinon';
import shelljs from 'shelljs';
import { ShellString } from 'shelljs';
import { stubMethod } from '@salesforce/ts-sinon';
import { env } from '@salesforce/kit';
Expand Down
8 changes: 4 additions & 4 deletions test/unit/testSession.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@

// For testing private properties of TestSession
/* eslint-disable @typescript-eslint/ban-ts-comment */
import * as fs from 'node:fs';
import * as path from 'node:path';
import fs from 'node:fs';
import path from 'node:path';
import { assert, expect } from 'chai';
import * as sinon from 'sinon';
import * as shelljs from 'shelljs';
import sinon from 'sinon';
import shelljs from 'shelljs';
import { ShellString } from 'shelljs';
import { spyMethod, stubMethod } from '@salesforce/ts-sinon';
import { env } from '@salesforce/kit';
Expand Down
4 changes: 2 additions & 2 deletions test/unit/zip.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
* 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 fs from 'node:fs';
import fs from 'node:fs';
import { join } from 'node:path';
import { tmpdir } from 'node:os';
import { expect } from 'chai';
import * as JSZip from 'jszip';
import JSZip from 'jszip';
import { zipDir } from '../../src/zip';

describe('zipDir', () => {
Expand Down
13 changes: 6 additions & 7 deletions test/unit/zzhubAuth.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,17 @@
* a number of the testSession fail. Running these tests after testSession tests seems to work,
* so chose a file name that guarantees these will be run last.
*/
import * as fs from 'node:fs';
import * as os from 'node:os';
import * as path from 'node:path';
import fs from 'node:fs';
import os from 'node:os';
import path from 'node:path';
import { stubMethod } from '@salesforce/ts-sinon';
import * as chai from 'chai';
import { expect } from 'chai';
import { AuthFields } from '@salesforce/core';
import { Env, env } from '@salesforce/kit';
import * as sinon from 'sinon';
import * as shell from 'shelljs';
import sinon from 'sinon';
import shell from 'shelljs';
import { prepareForAuthUrl, prepareForJwt, transferExistingAuthToEnv } from '../../src/hubAuth';

const { expect } = chai;
const tmp = os.tmpdir();
type SampleData = {
jwtKeyWithHeaderFooter: string;
Expand Down
Loading

0 comments on commit 7f43aa5

Please sign in to comment.