Skip to content

Commit

Permalink
Merge pull request #585 from salesforcecli/devScripts2023-10-29
Browse files Browse the repository at this point in the history
refactor: devScripts update
  • Loading branch information
svc-cli-bot authored Oct 29, 2023
2 parents 26dd3f0 + 7aebfc9 commit afe6c85
Show file tree
Hide file tree
Showing 13 changed files with 196 additions and 240 deletions.
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,29 +56,29 @@
},
"devDependencies": {
"@salesforce/dev-config": "^4.1.0",
"@salesforce/dev-scripts": "^5.11.0",
"@salesforce/dev-scripts": "^5.12.2",
"@salesforce/prettier-config": "^0.0.3",
"@salesforce/ts-sinon": "^1.4.19",
"@types/debug": "^4.1.10",
"@typescript-eslint/eslint-plugin": "^5.62.0",
"@typescript-eslint/parser": "^5.62.0",
"chai": "^4.3.10",
"eslint": "^8.51.0",
"eslint": "^8.52.0",
"eslint-config-prettier": "^8.10.0",
"eslint-config-salesforce": "^2.0.2",
"eslint-config-salesforce-license": "^0.2.0",
"eslint-config-salesforce-typescript": "^1.1.2",
"eslint-config-salesforce-typescript": "^2.0.0",
"eslint-plugin-header": "^3.1.1",
"eslint-plugin-import": "2.29.0",
"eslint-plugin-jsdoc": "^44.2.4",
"eslint-plugin-jsdoc": "^46.8.2",
"husky": "^7.0.4",
"mocha": "^9.1.3",
"nyc": "^15.1.0",
"prettier": "^2.8.8",
"pretty-quick": "^3.1.0",
"sinon": "10.0.0",
"ts-node": "^10.0.0",
"typescript": "^4.9.5",
"typescript": "^5.2.2",
"wireit": "^0.14.1"
},
"config": {},
Expand Down
8 changes: 4 additions & 4 deletions src/execCmd.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
* 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 'fs';
import { spawn, SpawnOptionsWithoutStdio } from 'child_process';
import { join as pathJoin, resolve as pathResolve } from 'path';
import { inspect } from 'util';
import * as fs from 'node:fs';
import { spawn, SpawnOptionsWithoutStdio } from 'node:child_process';
import { join as pathJoin, resolve as pathResolve } from 'node:path';
import { inspect } from 'node:util';
import { SfError } from '@salesforce/core';
import { Duration, env, parseJson } from '@salesforce/kit';
import { AnyJson, isNumber, Many } from '@salesforce/ts-types';
Expand Down
4 changes: 2 additions & 2 deletions src/genUniqueString.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
*/

import { randomBytes } from 'crypto';
import { format } from 'util';
import { randomBytes } from 'node:crypto';
import { format } from 'node:util';

/**
* Returns a unique string. If template is supplied and contains a replaceable string (see node library util.format)
Expand Down
6 changes: 3 additions & 3 deletions src/hubAuth.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
* 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 path from 'path';
import * as os from 'os';
import * as fs from 'fs';
import * as path from 'node:path';
import * as os from 'node:os';
import * as fs from 'node:fs';
import * as shell from 'shelljs';
import { debug } from 'debug';
import { AuthFields } from '@salesforce/core';
Expand Down
8 changes: 4 additions & 4 deletions src/testProject.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
* 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 'fs';
import * as path from 'path';
import { tmpdir } from 'os';
import { inspect } from 'util';
import * as fs from 'node:fs';
import * as path from 'node:path';
import { tmpdir } from 'node:os';
import { inspect } from 'node:util';
import { debug, Debugger } from 'debug';
import * as shell from 'shelljs';
import { env } from '@salesforce/kit';
Expand Down
4 changes: 2 additions & 2 deletions src/testSession.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
* 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 'fs';
import * as path from 'path';
import * as fs from 'node:fs';
import * as path from 'node:path';
import { RetryConfig } from 'ts-retry-promise';
import { debug, Debugger } from 'debug';
import { AsyncOptionalCreatable, Duration, env, parseJson, sleep } from '@salesforce/kit';
Expand Down
4 changes: 2 additions & 2 deletions src/zip.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
* 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 'fs';
import * as path from 'path';
import * as fs from 'node:fs';
import * as path from 'node:path';
import * as JSZip from 'jszip';
import Debug from 'debug';

Expand Down
4 changes: 2 additions & 2 deletions test/unit/execCmd.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
* 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 'fs';
import { join } from 'path';
import * as fs from 'node:fs';
import { join } from 'node:path';
import { expect, assert, config } from 'chai';
import * as sinon from 'sinon';
import { Duration, env } from '@salesforce/kit';
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,9 +4,9 @@
* 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 'fs';
import { tmpdir } from 'os';
import { join as pathJoin } from 'path';
import * as 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';
Expand Down
4 changes: 2 additions & 2 deletions test/unit/testSession.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

// For testing private properties of TestSession
/* eslint-disable @typescript-eslint/ban-ts-comment */
import * as fs from 'fs';
import * as path from 'path';
import * as fs from 'node:fs';
import * as path from 'node:path';
import { assert, expect } from 'chai';
import * as sinon from 'sinon';
import * as shelljs from 'shelljs';
Expand Down
2 changes: 1 addition & 1 deletion test/unit/zip.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 fs from 'fs';
import * as fs from 'node:fs';
import { join } from 'node:path';
import { tmpdir } from 'node:os';
import { expect } from 'chai';
Expand Down
6 changes: 3 additions & 3 deletions test/unit/zzhubAuth.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
* 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 'fs';
import * as os from 'os';
import * as path from 'path';
import * as fs from 'node:fs';
import * as os from 'node:os';
import * as path from 'node:path';
import { stubMethod } from '@salesforce/ts-sinon';
import * as chai from 'chai';
import { AuthFields } from '@salesforce/core';
Expand Down
Loading

0 comments on commit afe6c85

Please sign in to comment.