Skip to content

Commit

Permalink
test: top-level core7 imports
Browse files Browse the repository at this point in the history
  • Loading branch information
@mshanemc
mshanemc committed Apr 10, 2024
1 parent a19b797 commit 5669b92
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 55 deletions.
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"@salesforce/cli-plugins-testkit": "^5.2.0",
"@salesforce/dev-scripts": "^9.0.0",
"@salesforce/plugin-command-reference": "^3.0.75",
"@salesforce/plugin-deploy-retrieve": "^3.5.3",
"@salesforce/plugin-deploy-retrieve": "^3.6.0",
"@salesforce/ts-sinon": "^1.4.17",
"@types/fast-levenshtein": "^0.0.4",
"eslint-plugin-sf-plugin": "^1.18.0",
Expand Down
4 changes: 2 additions & 2 deletions src/hooks/init/load_config_meta.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

import type { Hook } from '@oclif/core';
import type { ConfigPropertyMeta } from '@salesforce/core';
import type { ConfigPropertyMeta } from '@salesforce/core/config';
import { ModuleLoader } from '@oclif/core';

const OCLIF_META_PJSON_KEY = 'configMeta';
Expand All @@ -33,7 +33,7 @@ const hook: Hook<'init'> = async ({ config, context }): Promise<void> => {
.filter((d): d is ConfigPropertyMeta => !!d);

if (flattenedConfigMetas.length) {
const { Config } = await import('@salesforce/core/lib/config/config.js');
const { Config } = await import('@salesforce/core/config');
Config.addAllowedProperties(flattenedConfigMetas);
}
return Promise.resolve();
Expand Down
2 changes: 1 addition & 1 deletion test/commands/alias/list.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 { expect, test } from '@oclif/test';
import { TestContext } from '@salesforce/core/lib/testSetup.js';
import { TestContext } from '@salesforce/core/testSetup';

describe('alias list', () => {
const $$ = new TestContext();
Expand Down
2 changes: 1 addition & 1 deletion test/commands/alias/unset.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

import { expect, test } from '@oclif/test';
import { TestContext } from '@salesforce/core/lib/testSetup.js';
import { TestContext } from '@salesforce/core/testSetup';

describe('alias unset', () => {
const $$ = new TestContext();
Expand Down
2 changes: 1 addition & 1 deletion test/commands/config/list.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { ConfigAggregator, OrgConfigProperties } from '@salesforce/core';
import { stubMethod } from '@salesforce/ts-sinon';
import { SinonSandbox } from 'sinon';
import sinon from 'sinon';
import { SfConfigProperties } from '@salesforce/core/lib/config/config.js';
import { SfConfigProperties } from '@salesforce/core/config';

describe('config:list', () => {
let sandbox: SinonSandbox;
Expand Down
73 changes: 24 additions & 49 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1558,19 +1558,19 @@
handlebars "^4.7.8"
tslib "^2"

"@salesforce/plugin-deploy-retrieve@^3.5.3":
version "3.5.3"
resolved "https://registry.yarnpkg.com/@salesforce/plugin-deploy-retrieve/-/plugin-deploy-retrieve-3.5.3.tgz#2dca559e474e05cde7692dbb88bcfdf8add4bcfe"
integrity sha512-eA1E48/bKhLYZEjFK1JqmPmbXAdkPA5LS3CV8gh9ibfQmSVjLqU90nbJAes0O2tbdwpRg7HHb0MSmh7lc9c26g==
"@salesforce/plugin-deploy-retrieve@^3.6.0":
version "3.6.0"
resolved "https://registry.yarnpkg.com/@salesforce/plugin-deploy-retrieve/-/plugin-deploy-retrieve-3.6.0.tgz#12e8520e611878321d08d4a3aa9a81f275ff5fb6"
integrity sha512-65rKUUQaixrJMJ9hAa084eIXfIY+4y4sg1u2IG/Em0OIHvVxA4trHBWAJg3T7mgKFBsXm3q4UzyPShmvQR+0Eg==
dependencies:
"@oclif/core" "^3.26.0"
"@oclif/core" "^3.26.2"
"@salesforce/apex-node" "^4.0.2"
"@salesforce/core" "^6.7.3"
"@salesforce/core" "^7.0.1"
"@salesforce/kit" "^3.1.0"
"@salesforce/plugin-info" "^3.1.0"
"@salesforce/sf-plugins-core" "^8.0.2"
"@salesforce/source-deploy-retrieve" "^10.7.0"
"@salesforce/source-tracking" "^5.2.1"
"@salesforce/sf-plugins-core" "^9.0.0"
"@salesforce/source-deploy-retrieve" "^11.0.0"
"@salesforce/source-tracking" "^6.0.0"
"@salesforce/ts-types" "^2.0.9"
chalk "^5.3.0"

Expand Down Expand Up @@ -1614,7 +1614,7 @@
chalk "^4"
inquirer "^8.2.5"

"@salesforce/sf-plugins-core@^8.0.2", "@salesforce/sf-plugins-core@^8.0.3":
"@salesforce/sf-plugins-core@^8.0.3":
version "8.0.3"
resolved "https://registry.yarnpkg.com/@salesforce/sf-plugins-core/-/sf-plugins-core-8.0.3.tgz#df8840419031b8d3ec2db171246757a9bfb38655"
integrity sha512-RJIi0lbpOg6ZflRDCTi/8E3QBhOHfvA5F3xlvThuQo9Yw2SvOjti+s/+Z2RCpvWdy4aaleeGqqgn7AwDi/ISDQ==
Expand All @@ -1640,12 +1640,12 @@
"@salesforce/ts-types" "^2.0.9"
chalk "^5.3.0"

"@salesforce/source-deploy-retrieve@^10.7.0":
version "10.7.1"
resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-10.7.1.tgz#0c26b2e952b1618d3c31759e8eb006839369672c"
integrity sha512-9SvFv2Xu3ALBCXSmTv4GDoAufA4GCJbg/WmfGq3rhfCwC7i/vN+ZMiHQEXoRk4kkFsmw7U62Mq8xDM1cZwvZ7w==
"@salesforce/source-deploy-retrieve@^11.0.0":
version "11.0.0"
resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-11.0.0.tgz#13752319de7604e01710994e3f44bad353c5d1e8"
integrity sha512-hPgmpke2FGVtxsf51CdMpRdqIDQff2sGoqCwq79WncXRw3FPkTR3/SoaURSNxn++erFDSmODlYz0FZpthQ28xw==
dependencies:
"@salesforce/core" "^6.7.3"
"@salesforce/core" "^7.0.0"
"@salesforce/kit" "^3.1.0"
"@salesforce/ts-types" "^2.0.9"
fast-levenshtein "^3.0.0"
Expand All @@ -1659,15 +1659,15 @@
proxy-agent "^6.4.0"
ts-retry-promise "^0.7.1"

"@salesforce/source-tracking@^5.2.1":
version "5.2.2"
resolved "https://registry.yarnpkg.com/@salesforce/source-tracking/-/source-tracking-5.2.2.tgz#519e595e8c1357caf126ceb83b98625a28bed936"
integrity sha512-47G833qYatviGypYUu3g0+lU4ol4oyoE2PIhNeTXgzutB1dPxdiQ/qzNO3VJOWGbJI4YaWpu0T1pEpyjARV3xA==
"@salesforce/source-tracking@^6.0.0":
version "6.0.0"
resolved "https://registry.yarnpkg.com/@salesforce/source-tracking/-/source-tracking-6.0.0.tgz#21c3e89f09cada73e32e510c12bd5b8fabb97167"
integrity sha512-jBs/R4B4EL27qSaS3464lrf/GQdViXkKlRwl5yCISAZmfMinTYwxlU6ibt/f+ryRBu/S4XxoiqSY6hVJdGgzUA==
dependencies:
"@oclif/core" "^3.26.0"
"@salesforce/core" "^6.7.3"
"@salesforce/core" "^7.0.0"
"@salesforce/kit" "^3.1.0"
"@salesforce/source-deploy-retrieve" "^10.7.0"
"@salesforce/source-deploy-retrieve" "^11.0.0"
"@salesforce/ts-types" "^2.0.9"
fast-xml-parser "^4.3.6"
graceful-fs "^4.2.11"
Expand Down Expand Up @@ -7540,16 +7540,7 @@ stdout-stderr@^0.1.9:
debug "^4.1.1"
strip-ansi "^6.0.0"

"string-width-cjs@npm:string-width@^4.2.0":
version "4.2.3"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
dependencies:
emoji-regex "^8.0.0"
is-fullwidth-code-point "^3.0.0"
strip-ansi "^6.0.1"

string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
version "4.2.3"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
Expand Down Expand Up @@ -7608,14 +7599,7 @@ string_decoder@~1.1.1:
dependencies:
safe-buffer "~5.1.0"

"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
version "6.0.1"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
dependencies:
ansi-regex "^5.0.1"

[email protected], strip-ansi@^6.0.0, strip-ansi@^6.0.1:
"strip-ansi-cjs@npm:strip-ansi@^6.0.1", [email protected], strip-ansi@^6.0.0, strip-ansi@^6.0.1:
version "6.0.1"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
Expand Down Expand Up @@ -8167,7 +8151,7 @@ [email protected]:
resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.1.tgz#46fc150c17d826b86a008e5a4508656777e9c343"
integrity sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==

"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
version "7.0.0"
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
Expand All @@ -8185,15 +8169,6 @@ wrap-ansi@^6.0.1, wrap-ansi@^6.2.0:
string-width "^4.1.0"
strip-ansi "^6.0.0"

wrap-ansi@^7.0.0:
version "7.0.0"
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
dependencies:
ansi-styles "^4.0.0"
string-width "^4.1.0"
strip-ansi "^6.0.0"

wrap-ansi@^8.1.0:
version "8.1.0"
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
Expand Down

0 comments on commit 5669b92

Please sign in to comment.