Skip to content

Commit

Permalink
Merge branch 'master' into string-literal-refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
Kingwl committed Jul 23, 2020
2 parents 801edb2 + 56865f7 commit 7617bb3
Show file tree
Hide file tree
Showing 1,654 changed files with 17,552 additions and 5,653 deletions.
18 changes: 18 additions & 0 deletions .github/tsc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"problemMatcher": [
{
"owner": "tsc",
"pattern": [
{
"regexp": "^(?:\\s+\\d+\\>)?([^\\s].*)\\((\\d+),(\\d+)\\)\\s*:\\s+(error|warning|info)\\s+(\\w{1,2}\\d+)\\s*:\\s*(.*)$",
"file": 1,
"line": 2,
"column": 3,
"severity": 4,
"code": 5,
"message": 6
}
]
}
]
}
23 changes: 15 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
node-version: [10.x, 12.x, 13.x]

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2
with:
fetch-depth: 5
- name: Use node version ${{ matrix.node-version }}
Expand All @@ -30,12 +30,19 @@ jobs:
run: |
npm uninstall typescript --no-save
npm uninstall tslint --no-save
- name: npm install and test
run: |
npm install
npm update
npm test
- run: npm install
- run: npm update

# Re: https://github.com/actions/setup-node/pull/125
- name: Register Problem Matcher for TSC
run: echo "##[add-matcher].github/tsc.json"

- name: Tests
run: npm test -- --no-lint

- name: Linter
run: npm run lint:ci

- name: Validate the browser can import TypeScript
run: gulp test-browser-integration


2 changes: 2 additions & 0 deletions .github/workflows/nightly.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ name: Publish Nightly
on:
schedule:
- cron: '0 7 * * *'
# enable users to manually trigger with workflow_dispatch
workflow_dispatch: {}
repository_dispatch:
types: publish-nightly

Expand Down
23 changes: 23 additions & 0 deletions .github/workflows/twoslash-repros.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Twoslash Code Sample Repros

on:
push:
branches:
- orta-twoslash-repros
schedule:
- cron: '0 8 * * *'
repository_dispatch:
types: run-twoslash-repros

jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Use node
uses: actions/setup-node@v1
- run: |
npm init -y
npm install --save typescript@next
- uses: microsoft/TypeScript-Twoslash-Repro-Action@master
with:
github-token: ${{ secrets.TS_BOT_GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ TypeScript is currently accepting contributions in the form of bug fixes. A bug

## Contributing features

Features (things that add new or improved functionality to TypeScript) may be accepted, but will need to first be approved (labelled ["help wanted"](https://github.com/Microsoft/TypeScript/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22) or in the "Backlog" milestone) by a TypeScript project maintainer) in the suggestion issue. Features with language design impact, or that are adequately satisfied with external tools, will not be accepted.
Features (things that add new or improved functionality to TypeScript) may be accepted, but will need to first be approved (labelled ["help wanted"](https://github.com/Microsoft/TypeScript/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22) or in the "Backlog" milestone) by a TypeScript project maintainer in the suggestion issue. Features with language design impact, or that are adequately satisfied with external tools, will not be accepted.

Design changes will not be accepted at this time. If you have a design change proposal, please log a suggestion issue.

Expand Down
5 changes: 3 additions & 2 deletions Gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -350,11 +350,12 @@ const lintFoldEnd = async () => { if (fold.isTravis()) console.log(fold.end("lin
/** @type { (folder: string) => { (): Promise<any>; displayName?: string } } */
const eslint = (folder) => async () => {

const formatter = cmdLineOptions.ci ? "stylish" : "autolinkable-stylish";
const args = [
"node_modules/eslint/bin/eslint",
"--cache",
"--cache-location", `${folder}/.eslintcache`,
"--format", "autolinkable-stylish",
"--format", formatter,
"--rulesdir", "scripts/eslint/built/rules",
"--ext", ".ts",
];
Expand All @@ -367,7 +368,7 @@ const eslint = (folder) => async () => {

log(`Linting: ${args.join(" ")}`);
return exec(process.execPath, args);
}
};

const lintScripts = eslint("scripts");
lintScripts.displayName = "lint-scripts";
Expand Down
1,047 changes: 0 additions & 1,047 deletions lib/diagnosticMessages.generated.json

This file was deleted.

223 changes: 0 additions & 223 deletions lib/lib.esnext.array.d.ts

This file was deleted.

44 changes: 0 additions & 44 deletions lib/lib.esnext.asynciterable.d.ts

This file was deleted.

Loading

0 comments on commit 7617bb3

Please sign in to comment.