Skip to content

Commit 11c442f

Browse files
authored
fix(deps): bump multiple dependencies
1 parent f407b65 commit 11c442f

File tree

7 files changed

+1902
-4442
lines changed

7 files changed

+1902
-4442
lines changed

Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
FROM salesforce/cli:latest-full
2+
WORKDIR /plugin
3+
COPY . .
4+
RUN sf plugins link .

package.json

Lines changed: 13 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -2,47 +2,24 @@
22
"name": "plugin-analytics-connected-objects",
33
"description": "Additional Salesforce CLI commands to manage CRM Analytics connected-objects",
44
"version": "1.0.0",
5-
"dependencies": {
6-
"@oclif/core": "^2.9.4",
7-
"@oclif/plugin-legacy": "^1.3.0",
8-
"@salesforce/core": "^4.3.11",
9-
"@salesforce/kit": "^3.0.6",
10-
"@salesforce/sf-plugins-core": "^3.1.12",
11-
"@salesforce/source-deploy-retrieve": "^9.3.0",
12-
"tslib": "^2"
13-
},
145
"devDependencies": {
15-
"@salesforce/cli-plugins-testkit": "^4.2.7",
16-
"@salesforce/dev-config": "^4.0.1",
17-
"@salesforce/dev-scripts": "^5.4.3",
18-
"@salesforce/prettier-config": "^0.0.3",
19-
"@salesforce/ts-sinon": "^1.4.8",
20-
"@swc/core": "^1.3.19",
21-
"@types/inquirer": "^9.0.3",
22-
"@typescript-eslint/eslint-plugin": "^5.59.8",
23-
"@typescript-eslint/parser": "^5.59.11",
24-
"chai": "^4.3.6",
25-
"eslint": "^8.21.0",
26-
"eslint-config-prettier": "^8.5.0",
27-
"eslint-config-salesforce": "^2.0.1",
28-
"eslint-config-salesforce-typescript": "^1.1.1",
29-
"eslint-plugin-import": "2.27.5",
30-
"eslint-plugin-jsdoc": "^44.2.7",
31-
"eslint-plugin-sf-plugin": "^1.15.13",
32-
"husky": "^7.0.4",
33-
"mocha": "^9.2.2",
6+
"@salesforce/cli-plugins-testkit": "^5.0.6",
7+
"@salesforce/dev-scripts": "^7.1.1",
8+
"mocha": "^10.2.0",
349
"nyc": "^15.1.0",
35-
"oclif": "^3.9.1",
36-
"prettier": "^2.8.8",
37-
"pretty-quick": "^3.1.3",
38-
"shx": "0.3.4",
39-
"sinon": "10.0.0",
4010
"ts-node": "^10.9.1",
41-
"typescript": "^4.7.3",
42-
"wireit": "^0.9.5"
11+
"wireit": "^0.14.1"
12+
},
13+
"dependencies": {
14+
"@oclif/core": "^3.11.0",
15+
"@salesforce/core": "^6.1.3",
16+
"@salesforce/kit": "^3.0.15",
17+
"@salesforce/sf-plugins-core": "^5.0.3",
18+
"@salesforce/source-deploy-retrieve": "^10.0.3",
19+
"@salesforce/ts-types": "^2.0.9"
4320
},
4421
"engines": {
45-
"node": ">=16.0.0"
22+
"node": ">=18.0.0"
4623
},
4724
"files": [
4825
"/lib",

src/commands/analytics/connected-objects/upsert.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
/* eslint-disable no-await-in-loop */
22
import { SfCommand, Flags, Progress } from '@salesforce/sf-plugins-core';
33
import { Messages, SfError } from '@salesforce/core';
4-
import { blue, bold } from 'chalk';
54
import { MetadataHelper } from '../../../metadataHelper';
65
import { ApiHelper } from '../../../apiHelper';
76
import { RecipeDefinition, LoadDefinitionNodeParam, ReplicatedDataset } from '../../../modules/upsert';
@@ -20,7 +19,7 @@ export interface ConnectedObjectUpsertResult {
2019
fieldsCount?: number;
2120
}
2221

23-
export default class ConnectedObjectUpsert extends SfCommand<ConnectedObjectUpsertResult[]> {
22+
export default class ConnectedObjectsUpsert extends SfCommand<ConnectedObjectUpsertResult[]> {
2423
public static readonly summary = messages.getMessage('summary');
2524
public static readonly description = messages.getMessage('description');
2625
public static readonly examples = messages.getMessages('examples');
@@ -55,7 +54,7 @@ export default class ConnectedObjectUpsert extends SfCommand<ConnectedObjectUpse
5554
};
5655

5756
public async run(): Promise<ConnectedObjectUpsertResult[]> {
58-
const { flags } = await this.parse(ConnectedObjectUpsert);
57+
const { flags } = await this.parse(ConnectedObjectsUpsert);
5958
const conn = flags['target-org'].getConnection(flags['api-version']);
6059
const service = new ApiHelper(conn);
6160

@@ -199,7 +198,7 @@ export default class ConnectedObjectUpsert extends SfCommand<ConnectedObjectUpse
199198
extended: !verbose,
200199
},
201200
},
202-
{ title: blue(bold('Changed connected-objects')) }
201+
{ title: 'Changed connected-objects' }
203202
);
204203
}
205204
}

src/metadataHelper.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,13 @@ export class MetadataHelper {
2323
const result = new Array<T>();
2424
const sourceComponents = componentSet.getSourceComponents().toArray();
2525
for (const sourceComponent of sourceComponents) {
26-
const recipeString = fs.readFileSync(sourceComponent?.content as string, 'utf-8');
26+
const recipeString = this.readFileUtf8(sourceComponent?.content as string);
2727
result.push(JSON.parse(recipeString) as T);
2828
}
2929
return result;
3030
}
31+
32+
public readFileUtf8(path: string) {
33+
return fs.readFileSync(path, 'utf8');
34+
}
3135
}

test/commands/analytics/connected-objects/upsert.test.ts

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/* eslint-disable @typescript-eslint/no-explicit-any */
22
import { resolve } from 'path';
3-
import * as fs from 'fs';
43
import { expect } from 'chai';
54
import { TestContext, MockTestOrgData } from '@salesforce/core/lib/testSetup';
65
import { ensureJsonMap, AnyJson } from '@salesforce/ts-types';
@@ -9,9 +8,13 @@ import { ComponentSet, ComponentSetBuilder, LazyCollection, SourceComponent } fr
98
import { ApiHelper } from '../../../../src/apiHelper';
109
import { PostReplicatedDataset } from '../../../../src/modules/upsert';
1110
import { MetadataHelper } from '../../../../src/metadataHelper';
12-
import ConnectedObjectUpsert from '../../../../src/commands/analytics/connected-objects/upsert';
11+
import ConnectedObjectsUpsert from '../../../../src/commands/analytics/connected-objects/upsert';
1312
import {
14-
createReplicatedDateset, getDataConnectors, getEmptyReplicatedDataset, getReplicatedDatasetFields, getReplicatedDatasets
13+
createReplicatedDateset,
14+
getDataConnectors,
15+
getEmptyReplicatedDataset,
16+
getReplicatedDatasetFields,
17+
getReplicatedDatasets,
1518
} from './mocks/apis';
1619
import { recipeFields, simpleRecipe } from './mocks/recipes';
1720

@@ -44,20 +47,22 @@ describe('analytics recipe run', () => {
4447
};
4548
});
4649

47-
after(async () => { $$.restore(); });
48-
50+
after(async () => {
51+
$$.restore();
52+
});
53+
4954
it('should mark multiple fields and return a json', async () => {
5055
stubMethodsInMetadataHelper($$, simpleRecipe);
51-
const cmd = new ConnectedObjectUpsert([...commandParams, '--json'], config);
56+
const cmd = new ConnectedObjectsUpsert([...commandParams, '--json'], config);
5257
const result = await cmd.run();
5358
expect(result).to.deep.equal([
5459
{
5560
objectName: 'User',
5661
isNew: true,
5762
fields: recipeFields,
5863
fieldsCount: recipeFields.length,
59-
connectorName: 'SFDC_LOCAL'
60-
}
64+
connectorName: 'SFDC_LOCAL',
65+
},
6166
]);
6267
});
6368

@@ -72,7 +77,7 @@ describe('analytics recipe run', () => {
7277
$$.SANDBOX.stub(ApiHelper.prototype, 'getReplicatedDatasetFields' as any).resolves(
7378
getReplicatedDatasetFields(fieldIsSkipped)
7479
);
75-
const cmd = new ConnectedObjectUpsert([...commandParams, '--json'], config);
80+
const cmd = new ConnectedObjectsUpsert([...commandParams, '--json'], config);
7681
const result = await cmd.run();
7782
expect(result).to.deep.equal([
7883
{
@@ -81,7 +86,7 @@ describe('analytics recipe run', () => {
8186
fields: [USERNAME],
8287
fieldsCount: 1,
8388
connectorName: 'SFDC_LOCAL',
84-
}
89+
},
8590
]);
8691
});
8792

@@ -95,7 +100,7 @@ describe('analytics recipe run', () => {
95100
$$.SANDBOX.stub(ApiHelper.prototype, 'getReplicatedDatasetFields' as any).resolves(
96101
getReplicatedDatasetFields(fieldIsSkipped)
97102
);
98-
const cmd = new ConnectedObjectUpsert([...commandParams, '--verbose'], config);
103+
const cmd = new ConnectedObjectsUpsert([...commandParams, '--verbose'], config);
99104
await cmd.run();
100105
});
101106

@@ -109,7 +114,7 @@ describe('analytics recipe run', () => {
109114
$$.SANDBOX.stub(ApiHelper.prototype, 'getReplicatedDatasetFields' as any).resolves(
110115
getReplicatedDatasetFields(fieldIsSkipped)
111116
);
112-
const cmd = new ConnectedObjectUpsert([...commandParams, '--json', '--verbose'], config);
117+
const cmd = new ConnectedObjectsUpsert([...commandParams, '--json', '--verbose'], config);
113118
const result = await cmd.run();
114119
expect(result).to.lengthOf(0);
115120
});
@@ -123,5 +128,5 @@ function stubMethodsInMetadataHelper(testContext: TestContext, result: unknown):
123128
testContext.SANDBOX.stub(ComponentSet.prototype, 'getSourceComponents').returns(
124129
new LazyCollection([{ content: 'my/path' } as SourceComponent])
125130
);
126-
testContext.SANDBOX.stub(fs, 'readFileSync').returns(JSON.stringify(result));
131+
testContext.SANDBOX.stub(MetadataHelper.prototype, 'readFileUtf8').returns(JSON.stringify(result));
127132
}

tsconfig.json

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,19 @@
11
{
2-
"extends": "@salesforce/dev-config/tsconfig-strict",
2+
"extends": "@salesforce/dev-config/tsconfig-strict-esm",
33
"compilerOptions": {
44
"outDir": "lib",
5-
"rootDir": "src"
5+
"rootDir": "src",
6+
"skipLibCheck": true,
7+
"declaration": false,
8+
"baseUrl": ".",
9+
"downlevelIteration": true,
10+
"paths": {
11+
"@salesforce/kit": [
12+
"node_modules/@salesforce/kit"
13+
]
14+
}
615
},
7-
"include": ["./src/**/*.ts"]
8-
}
16+
"include": [
17+
"./src/**/*.ts"
18+
]
19+
}

0 commit comments

Comments
 (0)