Skip to content

Commit 94d44ad

Browse files
author
zhengbli
committed
Merge branch 'master' of https://github.com/Microsoft/TypeScript into fixLargeProjectTry2
# Conflicts: # src/compiler/commandLineParser.ts # src/compiler/program.ts # src/compiler/sys.ts # src/compiler/types.ts # src/server/editorServices.ts # src/server/session.ts
2 parents 5c9ce9e + d0f669e commit 94d44ad

1,894 files changed

Lines changed: 180110 additions & 84750 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ tests/cases/perf/*
66
!tests/cases/webharness/compilerToString.js
77
test-args.txt
88
~*.docx
9+
\#*\#
10+
.\#*
911
tests/baselines/local/*
1012
tests/services/baselines/local/*
1113
tests/baselines/prototyping/local/*
@@ -26,11 +28,12 @@ rwc-report.html
2628
*.swp
2729
build.json
2830
*.actual
31+
tests/webTestServer.js
32+
tests/webTestServer.js.map
2933
tests/webhost/*.d.ts
3034
tests/webhost/webtsc.js
3135
tests/cases/**/*.js
3236
tests/cases/**/*.js.map
33-
tests/cases/**/*.d.ts
3437
*.config
3538
scripts/debug.bat
3639
scripts/run.bat
@@ -42,5 +45,7 @@ coverage/
4245
internal/
4346
**/.DS_Store
4447
.settings
45-
.vscode/*
46-
!.vscode/tasks.json
48+
**/.vs
49+
**/.vscode
50+
!**/.vscode/tasks.json
51+
!tests/cases/projects/projectOption/**/node_modules

‎.npmignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
built
22
doc
3+
internal
4+
issue_template.md
35
lib/README.md
6+
pull_request_template.md
47
scripts
58
src
69
tests
7-
internal
810
tslint.json
911
Jakefile.js
1012
.editorconfig

‎Jakefile.js‎

Lines changed: 161 additions & 97 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)