Skip to content

Commit

Permalink
feat: core7
Browse files Browse the repository at this point in the history
* chore: updates from devScripts

* test: top-level core7 imports

---------

Co-authored-by: mshanemc <[email protected]>
  • Loading branch information
svc-cli-bot and mshanemc authored Apr 10, 2024
1 parent 08be971 commit 938c99f
Show file tree
Hide file tree
Showing 6 changed files with 169 additions and 54 deletions.
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,21 @@
"author": "Salesforce",
"bugs": "https://github.com/forcedotcom/cli/issues",
"dependencies": {
"@oclif/core": "^3.26.0",
"@salesforce/core": "^6.7.3",
"@salesforce/sf-plugins-core": "^8.0.2",
"@oclif/core": "^3.26.2",
"@salesforce/core": "^7.0.1",
"@salesforce/sf-plugins-core": "^9.0.0",
"fast-levenshtein": "^3.0.0"
},
"devDependencies": {
"@oclif/plugin-command-snapshot": "^5.1.4",
"@oclif/test": "^3.2.8",
"@salesforce/cli-plugins-testkit": "^5.1.13",
"@salesforce/dev-scripts": "^8.5.0",
"@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.17.5",
"eslint-plugin-sf-plugin": "^1.18.0",
"oclif": "^4.7.6",
"ts-node": "^10.9.2",
"typescript": "^5.4.4"
Expand Down
4 changes: 2 additions & 2 deletions src/hooks/init/load_config_meta.ts
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
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
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
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
Loading

0 comments on commit 938c99f

Please sign in to comment.