merge main

Author: motm32

api/.npmignore

@@ -1,6 +1,6 @@
 node_modules/
 .vscode/
-src/
+src/*
 tsconfig.json
 *.tgz
 test/
@@ -15,7 +15,9 @@ resources/*.png
 *.tsbuildinfo
 docs/
 
-out/**/*.d.ts
-out/**/*.d.ts.map
-out/**/*.js.map
+dist/**/*.d.ts
+dist/**/*.d.ts.map
+dist/**/*.js.map
 api-extractor.json
+
+!dist/vscode-azureresources-api.d.ts

api/api-extractor.json

@@ -42,7 +42,7 @@
      *
      * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
      */
-    "mainEntryPointFilePath": "<projectFolder>/out/src/index.d.ts",
+    "mainEntryPointFilePath": "<projectFolder>/dist/esm/src/index.d.ts",
     /**
      * A list of NPM package names whose exports should be treated as part of this package.
      *

api/package-lock.json

@@ -1,21 +1,27 @@
 {
     "name": "@microsoft/vscode-azureresources-api",
-    "version": "2.6.3",
+    "version": "3.0.0",
     "description": "Type declarations and client library for the Azure Resources extension API",
     "repository": {
         "type": "git",
         "url": "https://github.com/Microsoft/vscode-azureresourcegroups",
         "directory": "api"
     },
-    "main": "out/src/index.js",
+    "module": "dist/esm/src/index.js",
+    "main": "dist/cjs/src/index.js",
     "types": "dist/vscode-azureresources-api.d.ts",
     "scripts": {
         "prepack": "npm run api-extractor",
         "api-extractor": "npm run build && api-extractor run",
-        "build": "tsc -p ./"
+        "build": "npm run build:esm && npm run build:cjs",
+        "build:esm": "tsc -p ./ --outDir dist/esm",
+        "build:cjs": "tsc -p ./ --outDir dist/cjs --module nodenext --moduleResolution nodenext"
     },
     "author": "Microsoft",
     "license": "MIT",
+    "engines": {
+        "vscode": "^1.105.0"
+    },
     "devDependencies": {
         "@types/node": "^16.0.0",
         "@types/vscode": "1.104.0"

api/package.json

@@ -13,3 +13,26 @@ export * from './resources/workspace';
 export * from './utils/apiUtils';
 export * from './utils/getApi';
 export * from './utils/wrapper';
+
+// Temporary until @types/vscode 1.105.0 is published
+declare module 'vscode' {
+    /**
+     * Represents parameters for creating a session based on a WWW-Authenticate header value.
+     * This is used when an API returns a 401 with a WWW-Authenticate header indicating
+     * that additional authentication is required. The details of which will be passed down
+     * to the authentication provider to create a session.
+     */
+    export interface AuthenticationWwwAuthenticateRequest {
+        /**
+         * The raw WWW-Authenticate header value that triggered this challenge.
+         * This will be parsed by the authentication provider to extract the necessary
+         * challenge information.
+         */
+        readonly wwwAuthenticate: string;
+
+        /**
+         * The fallback scopes to use if no scopes are found in the WWW-Authenticate header.
+         */
+        readonly fallbackScopes?: readonly string[];
+    }
+}

api/src/index.ts

@@ -22,12 +22,12 @@ export interface AzureAuthentication {
     /**
      * Gets a VS Code authentication session for an Azure subscription.
      *
-     * @param scopes - The scopes for which the authentication is needed. Use AuthenticationWwwAuthenticateRequest for supporting challenge requests.
-     * Note: use of AuthenticationWwwAuthenticateRequest requires VS Code v1.104
+     * @param scopeListOrRequest - The scopes for which the authentication is needed. Use AuthenticationWwwAuthenticateRequest for supporting challenge requests.
+     * Note: use of AuthenticationWwwAuthenticateRequest requires VS Code v1.105.0
      *
      * @returns A VS Code authentication session or undefined, if none could be obtained.
      */
-    getSessionWithScopes(scopes: string[] | vscode.AuthenticationWwwAuthenticateRequest): vscode.ProviderResult<vscode.AuthenticationSession>;
+    getSessionWithScopes(scopeListOrRequest: string[] | vscode.AuthenticationWwwAuthenticateRequest): vscode.ProviderResult<vscode.AuthenticationSession>;
 }
 
 /**

api/src/resources/azure.ts

@@ -1,15 +1,15 @@
 {
     "extends": "../tsconfig.json",
     "compilerOptions": {
+        "module": "es2022",
+        "moduleResolution": "bundler",
+        "target": "es2022",
+        "lib": [
+            "es2022",
+        ],
         "declaration": true,
         "declarationMap": true,
         "rootDir": ".",
-        "outDir": "out",
         "baseUrl": "./",
     },
-    "exclude": [
-        "node_modules",
-        "out",
-        "dist",
-    ]
 }

api/src/vscode.proposed.authLearnMore.d.ts

@@ -889,7 +889,7 @@
         "webpack-prod": "npm run build && gulp webpack-prod",
         "webpack-profile": "webpack --profile --json --mode production > webpack-stats.json && echo Use http://webpack.github.io/analyse to analyze the stats",
         "all": "npm i && npm run lint && npm test",
-        "api-extractor": "tsc -p ./api && api-extractor run -c ./api/api-extractor.json"
+        "api-extractor": "cd api && npm run api-extractor"
     },
     "devDependencies": {
         "@azure/arm-authorization": "^9.0.0",