Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update versions of things #167

Merged
merged 6 commits into from
Dec 7, 2023
Merged

Update versions of things #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ef19372
Update to node 18.15.0 and vscode 1.82.0
smithgp Nov 21, 2023
f4fc25e
Update to typescript 5.2.2
smithgp Nov 30, 2023
56fdab8
Use implicit extension activation
smithgp Nov 30, 2023
5860e85
Update devDependencies
smithgp Dec 4, 2023
d6f07e3
Update fuse.js 6.6.2 -> 7.0.0
smithgp Dec 5, 2023
d41d4ef
Update which from 3.0.0 to 4.0.0
smithgp Dec 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-and-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- develop

env:
NODE_VERSION: '16.14.2'
NODE_VERSION: '18.15.0'

jobs:
# We really only need to run lint on one job so we'll do it here
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-build-and-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- develop

env:
NODE_VERSION: '16.14.2'
NODE_VERSION: '18.15.0'

jobs:
pr-build:
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v16.14.2
v18.15.0
2 changes: 1 addition & 1 deletion contributing/developing.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
## Pre-requisites

1. We are using the same version of Node that the supported release of VSCode uses (see `engines.vscode` in the
extensions' `package.json`'s, currently 16.14.2).
extensions' `package.json`'s, currently 18.15.0).
If you need to work with multiple versions of Node (e.g. for other projects), you might consider using
[nvm](https://github.com/creationix/nvm).
1. It is suggested, though not required, that you use the Insiders version of VS
Expand Down
43 changes: 17 additions & 26 deletions extensions/analyticsdx-vscode-core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,40 +19,40 @@
},
"license": "BSD-3-Clause",
"engines": {
"vscode": "^1.74.0"
"vscode": "^1.82.0"
},
"categories": [
"Other"
],
"dependencies": {
"@salesforce/salesforcedx-utils-vscode": "file:../../lib/salesforcedx-utils-vscode.tgz",
"@salesforce/templates": "54.7.0",
"glob": "8.0.3",
"glob": "10.3.10",
"semver": "7.5.4",
"tmp": "0.2.1",
"which": "3.0.0"
"which": "4.0.0"
},
"devDependencies": {
"@salesforce/analyticsdx-test-utils-vscode": "1.0.0",
"@types/chai": "4.3.4",
"@types/glob": "7.2.0",
"@types/mocha": "10.0.1",
"@types/node": "16.18.14",
"@types/semver": "7.5.0",
"@types/sinon": "10.0.13",
"@types/tmp": "0.2.2",
"@types/vscode": "1.74.0",
"@types/which": "2.0.2",
"chai": "4.3.7",
"@types/chai": "4.3.11",
"@types/glob": "8.1.0",
"@types/mocha": "10.0.6",
"@types/node": "18.11.9",
"@types/semver": "7.5.6",
"@types/sinon": "17.0.2",
"@types/tmp": "0.2.6",
"@types/vscode": "1.82.0",
"@types/which": "3.0.3",
"chai": "4.3.10",
"cross-env": "7.0.3",
"mocha": "10.2.0",
"mocha-junit-reporter": "2.2.0",
"mocha-junit-reporter": "2.2.1",
"mocha-multi-reporters": "1.5.1",
"mock-spawn": "0.2.6",
"nyc": "15.1.0",
"shx": "0.3.4",
"sinon": "15.0.1",
"typescript": "4.9.5"
"sinon": "17.0.1",
"typescript": "5.2.2"
},
"scripts": {
"vscode:prepublish": "npm prune --production",
Expand All @@ -77,16 +77,7 @@
],
"activationEvents": [
"workspaceContains:sfdx-project.json",
"onCommand:analyticsdx.app.create.blank",
"onCommand:analyticsdx.app.delete",
"onCommand:analyticsdx.dashboard.lwc.create",
"onCommand:analyticsdx.studio.open",
"onCommand:analyticsdx.studio.open.app",
"onCommand:analyticsdx.telemetry.send",
"onCommand:analyticsdx.template.create",
"onCommand:analyticsdx.template.delete",
"onCommand:analyticsdx.template.udpate",
"onCommand:analyticsdx.template.updateFromApp"
"onCommand:analyticsdx.telemetry.send"
],
"main": "./out/src",
"contributes": {
Expand Down
4 changes: 2 additions & 2 deletions extensions/analyticsdx-vscode-core/src/commands/gatherers/outputDirGatherer.ts
View file
Open in desktop
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 * as glob from 'glob';
import { globSync } from 'glob';
import * as path from 'path';
import * as vscode from 'vscode';
import { nls } from '../../messages';
Expand Down Expand Up @@ -59,7 +59,7 @@ export class OutputDirGatherer implements ParametersGatherer<OutputDirType> {
const packages = packageDirs.length > 1 ? `{${packageDirs.join(',')}}` : packageDirs[0];
// glob patterns have to use / (https://github.com/isaacs/node-glob#windows)
const pattern = path.join(rootPath, packages, '**', path.sep).replace(/\\/g, '/');
return new glob.GlobSync(pattern).found.map(value => {
return globSync(pattern).map(value => {
const relativePath = path.relative(rootPath, path.join(value, path.sep));
return path.join(relativePath, this.typeDirRequired && !relativePath.endsWith(this.typeDir) ? this.typeDir : '');
});
Expand Down
22 changes: 11 additions & 11 deletions extensions/analyticsdx-vscode-core/test/vscode-integration/telemetry/telemetry.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@ import { EXTENSION_NAME } from '../../../src/constants';
import { TelemetryService } from '../../../src/telemetry/telemetry';

class MockExtensionContext implements vscode.ExtensionContext {
public secrets!: vscode.SecretStorage;
public extensionUri!: vscode.Uri;
public environmentVariableCollection!: vscode.EnvironmentVariableCollection;
public storageUri: vscode.Uri | undefined;
public globalStorageUri!: vscode.Uri;
public logUri!: vscode.Uri;
public extension!: vscode.Extension<any>;
public subscriptions: Array<{ dispose(): any }> = [];
public workspaceState!: vscode.Memento;
public globalState!: vscode.Memento & { setKeysForSync(keys: readonly string[]): void };
public extensionPath: string = 'extensionPath';
public secrets!: vscode.ExtensionContext['secrets'];
public extensionUri!: vscode.ExtensionContext['extensionUri'];
public environmentVariableCollection!: vscode.ExtensionContext['environmentVariableCollection'];
public storageUri: vscode.ExtensionContext['storageUri'];
public globalStorageUri!: vscode.ExtensionContext['globalStorageUri'];
public logUri!: vscode.ExtensionContext['logUri'];
public extension!: vscode.ExtensionContext['extension'];
public subscriptions = [];
public workspaceState!: vscode.ExtensionContext['workspaceState'];
public globalState!: vscode.ExtensionContext['globalState'];
public extensionPath = 'extensionPath';
public asAbsolutePath(relativePath: string): string {
return relativePath;
}
Expand Down
25 changes: 12 additions & 13 deletions extensions/analyticsdx-vscode-templates/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
},
"license": "BSD-3-Clause",
"engines": {
"vscode": "^1.74.0"
"vscode": "^1.82.0"
},
"categories": [
"Other"
Expand All @@ -35,24 +35,24 @@
},
"devDependencies": {
"@salesforce/analyticsdx-test-utils-vscode": "1.0.0",
"@types/chai": "4.3.4",
"@types/lodash.isequal": "4.5.5",
"@types/mocha": "10.0.1",
"@types/node": "16.18.14",
"@types/sinon": "10.0.13",
"@types/tmp": "0.2.2",
"@types/vscode": "1.74.0",
"chai": "4.3.7",
"@types/chai": "4.3.11",
"@types/lodash.isequal": "4.5.8",
"@types/mocha": "10.0.6",
"@types/node": "18.11.9",
"@types/sinon": "17.0.2",
"@types/tmp": "0.2.6",
"@types/vscode": "1.82.0",
"chai": "4.3.10",
"cross-env": "7.0.3",
"mocha": "10.2.0",
"mocha-junit-reporter": "2.2.0",
"mocha-junit-reporter": "2.2.1",
"mocha-multi-reporters": "1.5.1",
"nyc": "15.1.0",
"readdirp": "3.6.0",
"shx": "0.3.4",
"sinon": "15.0.1",
"sinon": "17.0.1",
"tmp": "0.2.1",
"typescript": "4.9.5"
"typescript": "5.2.2"
},
"scripts": {
"vscode:prepublish": "npm prune --production",
Expand All @@ -78,7 +78,6 @@
"activationEvents": [
"onLanguage:json",
"onLanguage:jsonc",
"onLanguage:adx-template-json",
"onLanguage:html",
"onLanguage:xml"
],
Expand Down
22 changes: 11 additions & 11 deletions extensions/analyticsdx-vscode-templates/test/vscode-integration/telemetry/telemetry.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@ import { EXTENSION_NAME } from '../../../src/constants';
import { TelemetryService } from '../../../src/telemetry/telemetry';

class MockExtensionContext implements vscode.ExtensionContext {
public secrets!: vscode.SecretStorage;
public extensionUri!: vscode.Uri;
public environmentVariableCollection!: vscode.EnvironmentVariableCollection;
public storageUri: vscode.Uri | undefined;
public globalStorageUri!: vscode.Uri;
public logUri!: vscode.Uri;
public extension!: vscode.Extension<any>;
public subscriptions: Array<{ dispose(): any }> = [];
public workspaceState!: vscode.Memento;
public globalState!: vscode.Memento & { setKeysForSync(keys: readonly string[]): void };
public extensionPath: string = 'extensionPath';
public secrets!: vscode.ExtensionContext['secrets'];
public extensionUri!: vscode.ExtensionContext['extensionUri'];
public environmentVariableCollection!: vscode.ExtensionContext['environmentVariableCollection'];
public storageUri: vscode.ExtensionContext['storageUri'];
public globalStorageUri!: vscode.ExtensionContext['globalStorageUri'];
public logUri!: vscode.ExtensionContext['logUri'];
public extension!: vscode.ExtensionContext['extension'];
public subscriptions = [];
public workspaceState!: vscode.ExtensionContext['workspaceState'];
public globalState!: vscode.ExtensionContext['globalState'];
public extensionPath = 'extensionPath';
public asAbsolutePath(relativePath: string): string {
return relativePath;
}
Expand Down
2 changes: 1 addition & 1 deletion extensions/analyticsdx-vscode/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
},
"license": "BSD-3-Clause",
"engines": {
"vscode": "^1.74.0"
"vscode": "^1.82.0"
},
"devDependencies": {
"shx": "0.3.4"
Expand Down
10 changes: 5 additions & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@
"url": "git+https://github.com/forcedotcom/analyticsdx-vscode.git"
},
"engines": {
"node": ">=16.14.2"
"node": ">=18.15.0"
},
"dependencies": {
"node": "^16.14.2",
"node": "^18.15.0",
"npm": "^6"
},
"devDependencies": {
"@salesforce/dev-config": "1.5.0",
"@types/lerna-alias": "3.0.0",
"@types/lerna-alias": "3.0.4",
"@types/shelljs": "0.8.11",
"@vscode/test-electron": "2.3.0",
"@vscode/test-electron": "2.3.8",
"eslint": "6.7.2",
"eslint-config-prettier": "2.9.0",
"lerna": "4.0.0",
Expand All @@ -27,7 +27,7 @@
"shx": "0.3.4",
"tslint": "6.1.3",
"tslint-no-focused-test": "0.5.0",
"typescript": "4.9.5",
"typescript": "5.2.2",
"vsce": "1.103.1"
},
"scripts": {
Expand Down
16 changes: 8 additions & 8 deletions packages/analyticsdx-template-lint/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,25 @@
"description": "Provides a linting api for Salesforce/TableauCRM analytics templates",
"license": "BSD-3-Clause",
"dependencies": {
"fuse.js": "6.6.2",
"fuse.js": "7.0.0",
"jsonc-parser": "3.2.0"
},
"devDependencies": {
"@types/chai": "4.3.4",
"@types/mocha": "10.0.1",
"@types/node": "16.18.14",
"@types/chai": "4.3.11",
"@types/mocha": "10.0.6",
"@types/node": "18.11.9",
"ajv": "8.12.0",
"better-ajv-errors": "1.2.0",
"chai": "4.3.7",
"chai": "4.3.10",
"mocha": "10.2.0",
"mocha-junit-reporter": "2.2.0",
"mocha-junit-reporter": "2.2.1",
"mocha-multi-reporters": "1.5.1",
"nyc": "15.1.0",
"shx": "0.3.4",
"typescript": "4.9.5"
"typescript": "5.2.2"
},
"optionalDependencies": {
"vscode-json-languageservice": "^5.3.2"
"vscode-json-languageservice": "^5.3.7"
},
"files": [
"out/src"
Expand Down
4 changes: 2 additions & 2 deletions packages/analyticsdx-template-lint/src/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

import * as fs from 'fs';
import Fuse from 'fuse.js';
import Fuse, { IFuseOptions } from 'fuse.js';
import { JSONPath, Node as JsonNode } from 'jsonc-parser';

const jsonIdRegex = /^[A-Za-z][A-Za-z0-9_]*$/;
Expand Down Expand Up @@ -190,7 +190,7 @@ export function isValidVariableName(name: string): boolean {
}

const noFuzzyMatch = () => [];
const fuzzOptions: Fuse.IFuseOptions<string> = {
const fuzzOptions: IFuseOptions<string> = {
isCaseSensitive: false,
shouldSort: true
};
Expand Down
4 changes: 2 additions & 2 deletions packages/analyticsdx-template-lint/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
"module": "commonjs",
"target": "ES2020",
"lib": ["ES2020"],
// fuse.js only works w/ esModuleInterop on
"esModuleInterop": true,
"sourceMap": true,
"declaration": true,
// need this for fuse.js to work right
"esModuleInterop": true,
"moduleResolution": "node",
"noImplicitAny": true,
"rootDir": ".",
Expand Down
26 changes: 13 additions & 13 deletions packages/analyticsdx-test-utils-vscode/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,26 @@
"description": "Provides test utilities to run mocha tests",
"license": "BSD-3-Clause",
"devDependencies": {
"@types/chai": "4.3.4",
"@types/glob": "7.2.0",
"@types/mocha": "10.0.1",
"@types/node": "16.18.14",
"chai": "4.3.7",
"decache": "4.6.1",
"glob": "8.0.3",
"istanbul-lib-coverage": "3.2.0",
"@types/chai": "4.3.11",
"@types/glob": "8.1.0",
"@types/mocha": "10.0.6",
"@types/node": "18.11.9",
"chai": "4.3.10",
"decache": "4.6.2",
"glob": "10.3.10",
"istanbul-lib-coverage": "3.2.2",
"istanbul-lib-hook": "3.0.0",
"istanbul-lib-instrument": "5.2.1",
"istanbul-lib-report": "3.0.0",
"istanbul-lib-instrument": "6.0.1",
"istanbul-lib-report": "3.0.1",
"istanbul-lib-source-maps": "4.0.1",
"istanbul-reports": "3.1.5",
"istanbul-reports": "3.1.6",
"mocha": "10.2.0",
"mocha-junit-reporter": "2.2.0",
"mocha-junit-reporter": "2.2.1",
"mocha-multi-reporters": "1.5.1",
"mock-spawn": "0.2.6",
"shx": "0.3.4",
"source-map-support": "0.5.21",
"typescript": "4.9.5"
"typescript": "5.2.2"
},
"scripts": {
"compile": "tsc -p ./",
Expand Down
Loading