Skip to content

Commit

Permalink
Merge branch 'main' into chyuan/pipelines
Browse files Browse the repository at this point in the history
  • Loading branch information
blackchoey authored Jan 9, 2025
2 parents 09985a2 + fdbcbd5 commit 3f4ac60
Show file tree
Hide file tree
Showing 111 changed files with 15,435 additions and 13,941 deletions.
5 changes: 5 additions & 0 deletions .vscode-test.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { defineConfig } from '@vscode/test-cli';

export default defineConfig({
files: 'out/test/**/*.test.js',
});
1 change: 0 additions & 1 deletion extension.bundle.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ export { activateInternal, deactivateInternal } from './src/extension';
// At runtime the tests live in dist/tests and will therefore pick up the main webpack bundle at dist/extension.bundle.js.
export { ext } from './src/extensionVariables';
export * from './src/constants';
export * from "vscode-azureextensionui";
export * from './src/utils/fsUtil';
export * from './src/explorer/ApiManagementProvider';
export * from './src/vsCodeConfig/settings';
Expand Down
2 changes: 1 addition & 1 deletion gulpfile.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import * as cp from 'child_process';
import * as gulp from 'gulp';
import * as path from 'path';
import { gulp_installAzureAccount, gulp_webpack } from 'vscode-azureextensiondev';
import { gulp_installAzureAccount, gulp_webpack } from '@microsoft/vscode-azext-dev';
import { gulp_installRestClient } from './gulp/gulp_installRestClient';

const env = process.env;
Expand Down
27,628 changes: 14,514 additions & 13,114 deletions package-lock.json

Large diffs are not rendered by default.

27 changes: 15 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -810,8 +810,7 @@
"package": "vsce package",
"lint": "tslint --project tsconfig.json -e src/*.d.ts -t verbose",
"lint-fix": "tslint --project tsconfig.json -t verbose --fix",
"postinstall": "node ./node_modules/vscode/bin/install",
"test": "gulp test",
"test": "vscode-test",
"watch": "tsc -watch -p ./",
"all": "npm i && npm run lint && npm test",
"webpack": "npm run build && gulp webpack-dev",
Expand All @@ -820,35 +819,40 @@
},
"devDependencies": {
"@azure/ms-rest-js": "^2.7.0",
"@microsoft/vscode-azext-dev": "^2.1.0",
"@types/fs-extra": "^4.0.3",
"@types/gulp": "^4.0.6",
"@types/mocha": "^5.2.6",
"@types/mocha": "^10.0.0",
"@types/node": "^8.10.59",
"@types/request": "^2.48.4",
"@types/request-promise": "^4.1.46",
"@types/request-promise-native": "^1.0.17",
"@types/swagger-parser": "^4.0.3",
"@types/vscode": "^1.96.0",
"@types/ws": "^6.0.4",
"@vscode/test-cli": "^0.0.10",
"@vscode/test-electron": "^2.4.1",
"gulp": "^4.0.0",
"mocha": "^5.2.0",
"mocha": "^10.0.0",
"mocha-junit-reporter": "^1.23.3",
"mocha-multi-reporters": "^1.1.7",
"ts-node": "^7.0.1",
"tslint": "^5.20.1",
"tslint-microsoft-contrib": "5.0.1",
"typescript": "^3.8.3",
"typescript": "^5.0.0",
"vsce": "^1.74.0",
"vscode": "^1.1.37",
"vscode-azureextensiondev": "^0.6.0",
"vscode-debugadapter-testsupport": "1.40.2",
"vscode-extension-telemetry": "^0.0.18",
"webpack": "4.29.6",
"webpack-cli": "^3.3.11"
"webpack": "^5.76.0",
"webpack-cli": "^4.6.0"
},
"dependencies": {
"@azure/arm-apimanagement": "^6.0.0",
"@azure/arm-appservice": "^7.0.0",
"@azure/arm-apimanagement": "^9.2.0",
"@azure/arm-appservice": "^15.0.0",
"@azure/arm-resources": "^4.0.0",
"@azure/ms-rest-nodeauth": "^3.1.1",
"@microsoft/vscode-azext-azureutils": "^3.1.2",
"@microsoft/vscode-azext-utils": "^2.5.12",
"@types/xml": "^1.0.4",
"adal-node": "^0.2.2",
"await-notify": "1.0.1",
Expand All @@ -862,7 +866,6 @@
"request-promise": "^4.2.5",
"request-promise-native": "^1.0.8",
"swagger-parser": "^6.0.5",
"vscode-azureextensionui": "^0.38.5",
"vscode-debugadapter": "^1.39.1",
"vscode-debugprotocol": "^1.39.0",
"vscode-nls": "^4.1.2",
Expand Down
16 changes: 16 additions & 0 deletions resources/azureSubscription.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 3f4ac60

Please sign in to comment.