Jump to Node v16, `npm update` (#3500)
This commit is contained in:
Родитель
29de98a272
Коммит
de1595deee
|
@ -1,8 +1,8 @@
|
|||
steps:
|
||||
- task: NodeTool@0
|
||||
displayName: 'Use Node 14.x'
|
||||
displayName: 'Use Node 16.x'
|
||||
inputs:
|
||||
versionSpec: 14.x
|
||||
versionSpec: 16.x
|
||||
|
||||
- task: Npm@1
|
||||
inputs:
|
||||
|
|
|
@ -16,7 +16,7 @@ jobs:
|
|||
|
||||
strategy:
|
||||
matrix:
|
||||
node-version: [14.x]
|
||||
node-version: [16.x]
|
||||
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
|
||||
|
||||
steps:
|
||||
|
|
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
28
package.json
28
package.json
|
@ -3065,7 +3065,7 @@
|
|||
]
|
||||
},
|
||||
"engines": {
|
||||
"vscode": "^1.64.0"
|
||||
"vscode": "^1.66.0"
|
||||
},
|
||||
"capabilities": {
|
||||
"virtualWorkspaces": false,
|
||||
|
@ -3107,29 +3107,28 @@
|
|||
"vscode.yaml"
|
||||
],
|
||||
"devDependencies": {
|
||||
"@types/dockerode": "^3.2.3",
|
||||
"@types/dockerode": "^3.3.8",
|
||||
"@types/fs-extra": "^9.0.11",
|
||||
"@types/glob": "^7.1.3",
|
||||
"@types/mocha": "^9.0.0",
|
||||
"@types/node": "14.x",
|
||||
"@types/node": "16.x",
|
||||
"@types/node-fetch": "^2.5.12",
|
||||
"@types/semver": "^7.3.4",
|
||||
"@types/tar-stream": "^2.2.0",
|
||||
"@types/uuid": "^8.3.0",
|
||||
"@types/vscode": "1.64.0",
|
||||
"@types/vscode": "1.66.0",
|
||||
"@types/xml2js": "^0.4.8",
|
||||
"@typescript-eslint/eslint-plugin": "^5.7.0",
|
||||
"@typescript-eslint/parser": "^5.7.0",
|
||||
"@typescript-eslint/eslint-plugin": "^5.19.0",
|
||||
"@typescript-eslint/parser": "^5.19.0",
|
||||
"@vscode/test-electron": "^2.0.0",
|
||||
"copy-webpack-plugin": "^10.1.0",
|
||||
"eslint": "^8.4.1",
|
||||
"eslint": "^8.13.0",
|
||||
"mocha": "^9.0.2",
|
||||
"node-loader": "^2.0.0",
|
||||
"ts-loader": "^9.2.3",
|
||||
"typescript": "^4.5.4",
|
||||
"typescript": "^4.6.3",
|
||||
"umd-compat-loader": "^2.1.2",
|
||||
"vsce": "^2.6.4",
|
||||
"webpack": "^5.65.0",
|
||||
"webpack": "^5.72.0",
|
||||
"webpack-bundle-analyzer": "^4.4.1",
|
||||
"webpack-cli": "^4.6.0"
|
||||
},
|
||||
|
@ -3139,7 +3138,7 @@
|
|||
"@azure/arm-containerregistry": "^10.0.0",
|
||||
"@azure/storage-blob": "^12.4.1",
|
||||
"@docker/sdk": "^1.0.3",
|
||||
"@grpc/grpc-js": "^1.5.0",
|
||||
"@grpc/grpc-js": "^1.6.3",
|
||||
"@microsoft/compose-language-service": "^0.1.1",
|
||||
"@microsoft/vscode-azext-azureappservice": "^0.1.9",
|
||||
"@microsoft/vscode-azext-azureutils": "^0.1.3",
|
||||
|
@ -3148,14 +3147,13 @@
|
|||
"dockerfile-language-server-nodejs": "^0.8.0",
|
||||
"dockerode": "^3.2.1",
|
||||
"fs-extra": "^10.0.0",
|
||||
"glob": "^7.1.6",
|
||||
"gradle-to-js": "^2.0.0",
|
||||
"glob": "^8.0.1",
|
||||
"gradle-to-js": "^2.0.1",
|
||||
"handlebars": "^4.7.6",
|
||||
"node-fetch": "^2.6.7",
|
||||
"semver": "^7.3.5",
|
||||
"semver": "^7.3.6",
|
||||
"tar": "^6.1.11",
|
||||
"tar-stream": "^2.2.0",
|
||||
"uuid": "^8.3.2",
|
||||
"vscode-languageclient": "^7.0.0",
|
||||
"vscode-nls": "^5.0.0",
|
||||
"vscode-tas-client": "^0.1.22",
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
* Licensed under the MIT License. See LICENSE.md in the project root for license information.
|
||||
*--------------------------------------------------------------------------------------------*/
|
||||
|
||||
import { randomUUID } from "crypto";
|
||||
import { AzureWizardExecuteStep } from "@microsoft/vscode-azext-utils";
|
||||
import type { IAppServiceWizardContext } from "@microsoft/vscode-azext-azureappservice"; // These are only dev-time imports so don't need to be lazy
|
||||
import { Progress } from "vscode";
|
||||
|
@ -10,7 +11,7 @@ import { ext } from "../../../extensionVariables";
|
|||
import { localize } from "../../../localize";
|
||||
import { AzureRegistryTreeItem } from '../../../tree/registries/azure/AzureRegistryTreeItem';
|
||||
import { RemoteTagTreeItem } from '../../../tree/registries/RemoteTagTreeItem';
|
||||
import { getArmAppSvc, getArmAuth, getArmContainerRegistry, getAzExtAzureUtils, getUuid } from "../../../utils/lazyPackages";
|
||||
import { getArmAppSvc, getArmAuth, getArmContainerRegistry, getAzExtAzureUtils } from "../../../utils/lazyPackages";
|
||||
|
||||
export class DockerAssignAcrPullRoleStep extends AzureWizardExecuteStep<IAppServiceWizardContext> {
|
||||
public priority: number = 141; // execute after DockerSiteCreateStep
|
||||
|
@ -63,7 +64,7 @@ export class DockerAssignAcrPullRoleStep extends AzureWizardExecuteStep<IAppServ
|
|||
}
|
||||
|
||||
// 4. On the registry, assign the AcrPull role to the principal representing the website
|
||||
await authClient.roleAssignments.create(registry.id, (await getUuid()).v4(), {
|
||||
await authClient.roleAssignments.create(registry.id, randomUUID(), {
|
||||
principalId: siteInfo.identity.principalId,
|
||||
roleDefinitionId: acrPullRoleDefinition.id,
|
||||
principalType: 'ServicePrincipal',
|
||||
|
|
|
@ -25,10 +25,6 @@ export async function getHandlebars(): Promise<typeof import('handlebars')> {
|
|||
return await import('handlebars');
|
||||
}
|
||||
|
||||
export async function getUuid(): Promise<typeof import('uuid')> {
|
||||
return await import('uuid');
|
||||
}
|
||||
|
||||
// This file is really most important for these next two functions, which ensure that the extension variables are registered before the package is used
|
||||
|
||||
export async function getAzExtAzureUtils(): Promise<typeof import('@microsoft/vscode-azext-azureutils')> {
|
||||
|
|
Загрузка…
Ссылка в новой задаче