Skip to content

Commit

Permalink
Merge pull request #1 from denoland/master
Browse files Browse the repository at this point in the history
update from upstream
  • Loading branch information
CGQAQ authored Sep 1, 2020
2 parents f616760 + 8447851 commit 6d9cc26
Show file tree
Hide file tree
Showing 203 changed files with 6,274 additions and 4,748 deletions.
2 changes: 2 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
node_modules
out
17 changes: 17 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"root": true,
"parser": "@typescript-eslint/parser",
"globals": {
"module": true
},
"plugins": ["@typescript-eslint"],
"extends": [
"eslint:recommended",
"plugin:@typescript-eslint/eslint-recommended",
"plugin:@typescript-eslint/recommended"
],
"rules": {
"@typescript-eslint/camelcase": 0,
"@typescript-eslint/explicit-function-return-type": 0
}
}
28 changes: 28 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
---
name: Bug report
about: Create a report to help us improve
---

### test

**Describe the bug**

**To Reproduce**

1. first step
2. second step
3. ...

**Expected behavior**

A clear and concise description of what you expected to happen.

**Screenshots**

If applicable, add screenshots to help explain your problem.

**Versions**

vscode: xxx
deno: xxx
extension: xxx
4 changes: 4 additions & 0 deletions .github/ISSUE_TEMPLATE/custom.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
name: Custom issue template
about: Describe this issue template's purpose here.
---
12 changes: 12 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
name: Feature request
about: Suggest an idea for this project
---

**Is your feature request related to a problem? Please describe.**

A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**

A clear and concise description of what you want to happen.
75 changes: 75 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
name: build

on: [push, pull_request]

jobs:
build:
runs-on: ${{ matrix.os }}
if: |
github.event_name == 'push' ||
!startsWith(github.event.pull_request.head.label, 'denoland:')
strategy:
matrix:
node: ["12.16.1"]
deno: ["1.3.0"]
os: [ubuntu-latest, macOS-latest, windows-latest]
name: test in ${{ matrix.os }}
steps:
- name: Checkout
uses: actions/checkout@v2

- name: Setup node.js
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node }}

- name: Get npm cache directory
id: npm-cache
run: |
echo "::set-output name=dir::$(npm config get cache)"
- uses: actions/cache@v2
with:
path: ${{ steps.npm-cache.outputs.dir }}
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-node-
- name: Setup Deno
uses: denolib/setup-deno@master
with:
deno-version: ${{ matrix.deno }}

- name: Environment
run: |
node -v
npm -v
deno --version
- name: Install
run: npm i

- name: Check code format
run: npm run check

- name: Lint
run: npm run lint

- name: Test
run: npm run test

- name: Compile
run: npm run compile

- name: Package
run: npm run build

- name: Publish
if: |
startsWith(matrix.os, 'ubuntu') &&
github.repository == 'denoland/vscode_deno' &&
startsWith(github.ref, 'refs/tags/')
env:
# https://dev.azure.com/propelml/_usersSettings/tokens
AZURE_PAT: ${{ secrets.AZURE_PAT }}
run: npx vsce publish --pat $AZURE_PAT
43 changes: 0 additions & 43 deletions .github/workflows/ci.yml

This file was deleted.

26 changes: 23 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,25 @@
out
dist
# dependencies
node_modules

# build
out
*.vsix
**/tsconfig.tsbuildinfo

# package lock
yarn.lock
package-json.lock
**/package-lock.json

# testing
coverage

# debug
npm-debug.log*
yarn-debug.log*
yarn-error.log*

# misc
.DS_Store

# TypeScript caches
**/*.tsbuildinfo
4 changes: 4 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
**/node_modules/**/*
out
package.json
coverage
5 changes: 5 additions & 0 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"semi": true,
"singleQuote": false,
"endOfLine": "lf"
}
40 changes: 33 additions & 7 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,44 @@
// A launch configuration that compiles the extension and then opens it inside a new window
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
{
"version": "0.2.0",
"configurations": [
{
"name": "Run Extension",
"type": "extensionHost",
"request": "launch",
"name": "Launch Client",
"runtimeExecutable": "${execPath}",
"args": ["--extensionDevelopmentPath=${workspaceFolder}"],
"outFiles": ["${workspaceFolder}/out/**/*.js"],
"preLaunchTask": "npm: watch"
"args": ["--extensionDevelopmentPath=${workspaceRoot}"],
"outFiles": ["${workspaceRoot}/client/out/**/*.js"],
"preLaunchTask": {
"type": "npm",
"script": "watch"
}
},
{
"type": "node",
"request": "attach",
"name": "Attach to Server",
"port": 9523,
"restart": true,
"outFiles": ["${workspaceRoot}/server/out/**/*.js"]
},
{
"name": "Language Server E2E Test",
"type": "extensionHost",
"request": "launch",
"runtimeExecutable": "${execPath}",
"args": [
"--extensionDevelopmentPath=${workspaceRoot}",
"--extensionTestsPath=${workspaceRoot}/client/out/test",
"${workspaceRoot}/client/testFixture"
],
"outFiles": ["${workspaceRoot}/client/out/test/**/*.js"]
}
],
"compounds": [
{
"name": "Client + Server",
"configurations": ["Launch Client", "Attach to Server"]
}
]
}
21 changes: 15 additions & 6 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -1,20 +1,29 @@
// See https://go.microsoft.com/fwlink/?LinkId=733558
// for the documentation about the tasks.json format
{
"version": "2.0.0",
"tasks": [
{
"type": "npm",
"script": "watch",
"problemMatcher": "$tsc-watch",
"isBackground": true,
"script": "compile",
"group": "build",
"presentation": {
"panel": "dedicated",
"reveal": "never"
},
"problemMatcher": ["$tsc"]
},
{
"type": "npm",
"script": "watch",
"isBackground": true,
"group": {
"kind": "build",
"isDefault": true
}
},
"presentation": {
"panel": "dedicated",
"reveal": "never"
},
"problemMatcher": ["$tsc-watch"]
}
]
}
42 changes: 25 additions & 17 deletions .vscodeignore
Original file line number Diff line number Diff line change
@@ -1,28 +1,36 @@
.vscode/**
.github/**
typings/**
out/test/**
test/**
__test__
**/*.test.*
src/**
**/*.map
*.vsix
coverage
core/*.ts

images/**/*.gif
images/**/*.png

.gitattributes
.prettierignore
.prettierrc.json
jest.config.js
.gitignore
.gitmodules
.appveyor.yml
.travis.yml
.npmrc
.yarnrc
.eslintignore
.eslintrc.json

**/tsconfig*.json
typescript-deno-plugin
**/yarn.lock
**/package-lock.json
renovate.json

client/src
client/package.json

tsconfig*.json
package-lock.json
server/src
server/package.json

CODE_OF_CONDUCT.md
CODING_STANDARDS.md
CONTRIBUTING.md
**/node_modules/**/**.d.ts
**/node_modules/**/**.md
**/node_modules/typescript-deno-plugin/src

vsc-extension-quickstart.md
screenshot/*
examples/*
Loading

0 comments on commit 6d9cc26

Please sign in to comment.