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.

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

Update yarn and Jest in the servicing branch #10524

Open
wants to merge 9 commits into
base: release/omnisharp-vscode
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
40 changes: 32 additions & 8 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,9 @@ stages:
demands: ImageOverride -equals windows.vs2022preview.amd64
steps:
- task: NodeTool@0
displayName: Install Node 10.x
displayName: Install Node 18.x
inputs:
versionSpec: 10.x
versionSpec: 18.x
- task: NuGetCommand@2
displayName: 'Clear NuGet caches'
condition: succeeded()
Expand Down Expand Up @@ -165,14 +165,38 @@ stages:

steps:
- task: NodeTool@0
displayName: Install Node 10.x
displayName: Install Node 18.x
inputs:
versionSpec: 10.x
versionSpec: 18.x

- powershell: npm install -g yarn
displayName: Install yarn
condition: succeeded()

- task: npmAuthenticate@0
displayName: 'npm Authentication for VSCode TS/JS'
condition: succeeded()
inputs:
workingFile: '$(Build.SourcesDirectory)\src\Razor\src\Microsoft.AspNetCore.Razor.VSCode\.npmrc'

- task: npmAuthenticate@0
displayName: 'npm Authentication for VSCode.Extension TS/JS'
condition: succeeded()
inputs:
workingFile: '$(Build.SourcesDirectory)\src\Razor\src\Microsoft.AspNetCore.Razor.VSCode.Extension\.npmrc'

- task: npmAuthenticate@0
displayName: 'npm Authentication for VSCode.Grammar.Test TS/JS'
condition: succeeded()
inputs:
workingFile: '$(Build.SourcesDirectory)\src\Razor\test\Microsoft.AspNetCore.Razor.VSCode.Grammar.Test\.npmrc'

- task: npmAuthenticate@0
displayName: 'npm Authentication for VSCode.Test TS/JS'
condition: succeeded()
inputs:
workingFile: '$(Build.SourcesDirectory)\src\Razor\test\Microsoft.AspNetCore.Razor.VSCode.Test\.npmrc'

- task: NuGetCommand@2
displayName: 'Clear NuGet caches'
condition: succeeded()
Expand Down Expand Up @@ -324,9 +348,9 @@ stages:

steps:
- task: NodeTool@0
displayName: Install Node 10.x
displayName: Install Node 18.x
inputs:
versionSpec: 10.x
versionSpec: 18.x

- ${{ if ne(variables['System.TeamProject'], 'public') }}:
- task: Bash@3
Expand Down Expand Up @@ -388,9 +412,9 @@ stages:

steps:
- task: NodeTool@0
displayName: Install Node 10.x
displayName: Install Node 18.x
inputs:
versionSpec: 10.x
versionSpec: 18.x
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
- task: Bash@3
displayName: Setup Private Feeds Credentials
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23226.4",
"Yarn.MSBuild": "1.22.10"
"Yarn.MSBuild": "1.22.19"
}
}
64 changes: 64 additions & 0 deletions src/Razor/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
module.exports = {
env: {
node: true
},
extends: [
"eslint:recommended",
"plugin:@typescript-eslint/recommended"
],
parser: "@typescript-eslint/parser",
parserOptions: {
project: true,
tsconfigRootDir: __dirname,
},
plugins: [
"@typescript-eslint",
"unicorn",
"header",
"prettier"
],
root: true,
rules: {
"@typescript-eslint/no-explicit-any": "off",
"@typescript-eslint/no-non-null-assertion": "off",
"@typescript-eslint/semi": ["error", "always"],
// Allow unused vars if prefixed by _
"@typescript-eslint/no-unused-vars": [
"warn",
{
"argsIgnorePattern": "^_",
"varsIgnorePattern": "^_",
"caughtErrorsIgnorePattern": "^_"
}
],
"@typescript-eslint/no-namespace": "off",
"@typescript-eslint/promise-function-async": "error",
"prefer-promise-reject-errors": "error",
"curly": "error",
"prettier/prettier": [ "error", { "endOfLine": "auto" } ],
"unicorn/filename-case": [
"error",
{
"case": "camelCase",
"ignore": [
"I[A-Z].*\\.ts$",
"vscode-tasks\\.d\\.ts"
]
}
],
"header/header": [ 2, "block", [
"---------------------------------------------------------------------------------------------",
" * Copyright (c) Microsoft Corporation. All rights reserved.",
" * Licensed under the MIT License. See License.txt in the project root for license information.",
" *--------------------------------------------------------------------------------------------"
]]
},
ignorePatterns: [
"out/",
"dist/",
"wallaby.js",
"webpack.config.js",
".eslintrc.js",
"**/*.d.ts"
],
};
Original file line number Diff line number Diff line change
Expand Up @@ -503,19 +503,18 @@
"scripts": {
"vscode:prepublish": "yarn run compile",
"clean": "rimraf dist",
"build": "yarn run clean && yarn run lint && tsc -p ./ && yarn run compile:TextMate",
"lint": "tslint --project ./",
"watch": "yarn run clean && yarn run lint && tsc -watch -p ./",
"build": "yarn run clean && tsc -p ./ && yarn run compile:TextMate && npx eslint",
"watch": "yarn run clean && tsc -watch -p ./",
"compile:TextMate": "npx js-yaml syntaxes/aspnetcorerazor.tmLanguage.yml > syntaxes/aspnetcorerazor.tmLanguage.json"
},
"devDependencies": {
"@types/node": "^17.0.2",
"@types/vscode": "1.69.0",
"cross-env": "^5.2.0",
"eslint": "8.57.0",
"js-yaml": ">=3.13.1",
"minimatch": "3.0.5",
"rimraf": "2.6.3",
"tslint": "^5.11.0",
"typescript": "^4.5.4"
},
"dependencies": {
Expand Down

This file was deleted.

Loading
Loading