Skip to content

Commit 7abf72e

Browse files
author
Nathan Turinski
committed
Merge from main
2 parents 705e90d + 80248de commit 7abf72e

File tree

254 files changed

+5928
-6037
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

254 files changed

+5928
-6037
lines changed

‎.eslintignore‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎.nvmrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20.18.1
1+
22

‎.vscode-test.mjs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
/*---------------------------------------------------------------------------------------------
2+
* Copyright (c) Microsoft Corporation. All rights reserved.
3+
* Licensed under the MIT License. See LICENSE.md in the project root for license information.
4+
*--------------------------------------------------------------------------------------------*/
5+
6+
export { azExtTestConfig as default } from '@microsoft/vscode-azext-eng/vscode-test'; // Other configurations exist

‎.vscode/extensions.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"recommendations": [
33
"dbaeumer.vscode-eslint",
4+
"connor4312.esbuild-problem-matchers",
45
"ms-azuretools.vscode-azureresourcegroups"
56
]
67
}

‎.vscode/launch.json‎

Lines changed: 10 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -6,102 +6,49 @@
66
"name": "Launch Extension",
77
"type": "extensionHost",
88
"request": "launch",
9-
"runtimeExecutable": "${execPath}",
109
"args": [
1110
"--extensionDevelopmentPath=${workspaceFolder}"
1211
],
1312
"outFiles": [
14-
"${workspaceFolder}/out/**/*.js"
13+
"${workspaceFolder}/dist/**/*.{js,mjs,cjs}",
1514
],
16-
"preLaunchTask": "${defaultBuildTask}",
15+
"preLaunchTask": "Watch: ESBuild",
1716
"env": {
18-
"DEBUGTELEMETRY": "v",
19-
"NODE_DEBUG": ""
17+
"DEBUGTELEMETRY": "v"
2018
}
2119
},
2220
{
2321
"name": "Launch Extension + Host",
2422
"type": "extensionHost",
2523
"request": "launch",
26-
"runtimeExecutable": "${execPath}",
2724
"args": [
2825
"--extensionDevelopmentPath=${workspaceFolder}",
2926
"--extensionDevelopmentPath=${workspaceFolder}/../vscode-azureresourcegroups"
3027
],
3128
"outFiles": [
32-
"${workspaceFolder}/out/**/*.js"
29+
"${workspaceFolder}/dist/**/*.{js,mjs,cjs}",
3330
],
34-
"preLaunchTask": "${defaultBuildTask}",
31+
"preLaunchTask": "Watch: ESBuild",
3532
"env": {
36-
"DEBUGTELEMETRY": "v",
37-
"NODE_DEBUG": ""
38-
}
39-
},
40-
{
41-
"name": "Launch Extension (webpack)",
42-
"type": "extensionHost",
43-
"request": "launch",
44-
"runtimeExecutable": "${execPath}",
45-
"args": [
46-
"--extensionDevelopmentPath=${workspaceFolder}"
47-
],
48-
"outFiles": [
49-
"${workspaceFolder}/dist/**/*.js"
50-
],
51-
"preLaunchTask": "npm: webpack",
52-
"env": {
53-
"DEBUGTELEMETRY": "v",
54-
"NODE_DEBUG": "",
55-
"DEBUG_WEBPACK": "1"
33+
"DEBUGTELEMETRY": "v"
5634
}
5735
},
5836
{
5937
"name": "Launch Tests",
6038
"type": "extensionHost",
6139
"request": "launch",
62-
"runtimeExecutable": "${execPath}",
63-
"args": [
64-
"--extensionDevelopmentPath=${workspaceFolder}",
65-
"--extensionTestsPath=${workspaceFolder}/out/test/index",
66-
"${workspaceFolder}/test/test.code-workspace"
67-
],
40+
"testConfiguration": "${workspaceFolder}/.vscode-test.mjs",
6841
"outFiles": [
69-
"${workspaceFolder}/out/**/*.js"
42+
"${workspaceFolder}/dist/**/*.{js,mjs,cjs}",
43+
"${workspaceFolder}/test/**/*.{ts,mts,cts}", // We are using TSX so out files *are* the source files
7044
],
71-
"preLaunchTask": "${defaultBuildTask}",
45+
"preLaunchTask": "Watch: ESBuild",
7246
"env": {
73-
"MOCHA_grep": "", // RegExp of tests to run (empty for all)
74-
"MOCHA_timeout": "0", // Disable time-outs
7547
"DEBUGTELEMETRY": "v",
76-
"NODE_DEBUG": "",
7748
"FUNC_PATH": "func",
7849
"AZFUNC_UPDATE_BACKUP_TEMPLATES": "",
7950
"AzCode_EnableLongRunningTestsLocal": "",
8051
}
81-
},
82-
{
83-
"name": "Launch Tests (webpack)",
84-
"type": "extensionHost",
85-
"request": "launch",
86-
"runtimeExecutable": "${execPath}",
87-
"args": [
88-
"--extensionDevelopmentPath=${workspaceFolder}",
89-
"--extensionTestsPath=${workspaceFolder}/dist/test/index",
90-
"${workspaceFolder}/test/test.code-workspace"
91-
],
92-
"outFiles": [
93-
"${workspaceFolder}/dist/**/*.js"
94-
],
95-
"preLaunchTask": "npm: webpack",
96-
"env": {
97-
"MOCHA_grep": "", // RegExp of tests to run (empty for all)
98-
"MOCHA_timeout": "0", // Disable time-outs
99-
"DEBUGTELEMETRY": "v",
100-
"NODE_DEBUG": "",
101-
"DEBUG_WEBPACK": "1",
102-
"ENABLE_LONG_RUNNING_TESTS": "",
103-
"FUNC_PATH": "func"
104-
}
10552
}
10653
]
10754
}

‎.vscode/settings.json‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,5 @@
1717
"**/node_modules": true,
1818
".vscode-test": true,
1919
"resources/backup*Templates": true
20-
},
21-
"typescript.preferences.importModuleSpecifier": "relative",
22-
"typescript.tsdk": "node_modules/typescript/lib"
20+
}
2321
}

‎.vscode/tasks.json‎

Lines changed: 31 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,43 @@
22
"version": "2.0.0",
33
"tasks": [
44
{
5-
"type": "npm",
6-
"script": "compile",
5+
"label": "Watch: ESBuild",
6+
"type": "shell",
7+
"command": "npm",
8+
"args": [
9+
"run",
10+
"build:esbuild",
11+
"--",
12+
"--watch",
13+
],
14+
"problemMatcher": "$esbuild-watch",
15+
"presentation": {
16+
"reveal": "silent",
17+
},
718
"group": {
819
"kind": "build",
9-
"isDefault": true
1020
},
1121
"isBackground": true,
22+
},
23+
{
24+
"label": "Watch: Check Types",
25+
"type": "shell",
26+
"command": "npm",
27+
"args": [
28+
"run",
29+
"build:check",
30+
"--",
31+
"--watch",
32+
],
33+
"problemMatcher": "$tsc-watch",
1234
"presentation": {
13-
"reveal": "never"
35+
"revealProblems": "onProblem",
1436
},
15-
"problemMatcher": "$tsc-watch"
37+
"group": {
38+
"kind": "build",
39+
"isDefault": true,
40+
},
41+
"isBackground": true,
1642
},
17-
{
18-
"type": "npm",
19-
"script": "lint",
20-
"problemMatcher": "$eslint-stylish"
21-
}
2243
]
2344
}

‎esbuild.mjs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
/*---------------------------------------------------------------------------------------------
2+
* Copyright (c) Microsoft Corporation. All rights reserved.
3+
* Licensed under the MIT License. See License.txt in the project root for license information.
4+
*--------------------------------------------------------------------------------------------*/
5+
6+
import { autoEsbuildOrWatch, autoSelectEsbuildConfig } from '@microsoft/vscode-azext-eng/esbuild';
7+
8+
await autoEsbuildOrWatch(autoSelectEsbuildConfig());

‎eslint.config.mjs‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
/*---------------------------------------------------------------------------------------------
2+
* Copyright (c) Microsoft Corporation. All rights reserved.
3+
* Licensed under the MIT License. See LICENSE.md in the project root for license information.
4+
*--------------------------------------------------------------------------------------------*/
5+
6+
import { azExtEslintRecommended } from '@microsoft/vscode-azext-eng/eslint'; // Other configurations exist
7+
import { defineConfig } from 'eslint/config';
8+
9+
export default defineConfig([
10+
{
11+
ignores: ['test/**', 'webpack.config.js', '.eslintrc.js', 'scripts/**'],
12+
},
13+
...azExtEslintRecommended,
14+
{
15+
rules: {
16+
'@typescript-eslint/no-namespace': 'off',
17+
'no-useless-escape': 'off',
18+
'no-unused-vars': 'off',
19+
'@typescript-eslint/no-empty-object-type': 'off',
20+
'@typescript-eslint/no-require-imports': 'off',
21+
'no-case-declarations': 'off',
22+
'no-template-curly-in-string': 'off', // Used for VS Code task variable substitution patterns
23+
'@typescript-eslint/no-unused-vars': [
24+
'error',
25+
{
26+
argsIgnorePattern: '^_',
27+
varsIgnorePattern: '^_',
28+
caughtErrorsIgnorePattern: '^_',
29+
},
30+
],
31+
'@typescript-eslint/naming-convention': [
32+
'error',
33+
{
34+
selector: 'default',
35+
format: ['camelCase', 'PascalCase', 'snake_case', 'UPPER_CASE'],
36+
leadingUnderscore: 'allow'
37+
},
38+
{
39+
selector: 'objectLiteralProperty',
40+
format: null,
41+
filter: {
42+
regex: '^(Content-Type|Cache-Control|x-functions-key|api-version)$',
43+
match: true
44+
}
45+
},
46+
]
47+
}
48+
},
49+
]);

‎extension.bundle.ts‎

Lines changed: 0 additions & 58 deletions
This file was deleted.

0 commit comments

Comments
 (0)
⚡