Merge branch 'master' into services_settings

microsoft · Mar 12, 2018 · ce9ddde · ce9ddde
2 parents e8033dc + ac5a39c
commit ce9ddde
Show file tree

Hide file tree

Showing 1,546 changed files with 63,527 additions and 55,595 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,31 +1,21 @@
+defaultFilters: &defaultFilters
+  filters:
+    branches:
+      only:
+        - master
+        - release-2.5
+        - release-2.6
+        - release-2.7
 workflows:
   version: 2
   main:
     jobs:
       - node9:
-          filters:
-            branches:
-              only:
-                - master
-                - release-2.5
-                - release-2.6
-                - release-2.7
+          <<: *defaultFilters
       - node8:
-          filters:
-            branches:
-              only:
-                - master
-                - release-2.5
-                - release-2.6
-                - release-2.7
+          <<: *defaultFilters
       - node6:
-          filters:
-            branches:
-              only:
-                - master
-                - release-2.5
-                - release-2.6
-                - release-2.7
+          <<: *defaultFilters
   nightly:
     triggers:
       - schedule:
@@ -35,38 +25,23 @@ workflows:
               only: master
     jobs:
       - node9:
-          filters:
-            branches:
-              only:
-                - master
-                - release-2.5
-                - release-2.6
-                - release-2.7
+          <<: *defaultFilters
           context: nightlies
       - node8:
-          filters:
-            branches:
-              only:
-                - master
-                - release-2.5
-                - release-2.6
-                - release-2.7
+          <<: *defaultFilters
           context: nightlies
       - node6:
-          filters:
-            branches:
-              only:
-                - master
-                - release-2.5
-                - release-2.6
-                - release-2.7
+          <<: *defaultFilters
           context: nightlies
 
 base: &base
   environment:
     - workerCount: 4
+    - timeout: 400000
   steps:
-    - checkout
+    - checkout:
+        post:
+          - git submodule update --init --recursive
     - run: |
         npm uninstall typescript --no-save
         npm uninstall tslint --no-save

diff --git a/.npmignore b/.npmignore
@@ -15,8 +15,12 @@ tslint.json
 Jakefile.js
 .editorconfig
 .gitattributes
+.gitmodules
 .settings/
 .travis.yml
+.circleci
 .vscode/
+.parallelperf.json
 test.config
 package-lock.json
+yarn.lock
diff --git a/.travis.yml b/.travis.yml
@@ -8,17 +8,16 @@ node_js:
 sudo: false
 
 env:
-  - workerCount=3
+  - workerCount=3 timeout=600000
 
 matrix:
   fast_finish: true
 
 branches:
   only:
   - master
-  - release-2.5
-  - release-2.6
   - release-2.7
+  - release-2.8
 
 install:
   - npm uninstall typescript --no-save

diff --git a/Gulpfile.ts b/Gulpfile.ts
@@ -143,14 +143,16 @@ const es2017LibrarySource = [
 const es2017LibrarySourceMap = es2017LibrarySource.map(source =>
     ({ target: "lib." + source, sources: ["header.d.ts", source] }));
 
-const es2018LibrarySource = [];
+const es2018LibrarySource = [
+    "es2018.regexp.d.ts",
+    "es2018.promise.d.ts"
+];
 const es2018LibrarySourceMap = es2018LibrarySource.map(source =>
     ({ target: "lib." + source, sources: ["header.d.ts", source] }));
 
 const esnextLibrarySource = [
     "esnext.asynciterable.d.ts",
-    "esnext.array.d.ts",
-    "esnext.promise.d.ts"
+    "esnext.array.d.ts"
 ];
 
 const esnextLibrarySourceMap = esnextLibrarySource.map(source =>

diff --git a/Jakefile.js b/Jakefile.js
@@ -206,16 +206,18 @@ var es2017LibrarySourceMap = es2017LibrarySource.map(function (source) {
     return { target: "lib." + source, sources: ["header.d.ts", source] };
 });
 
-var es2018LibrarySource = [];
+var es2018LibrarySource = [
+    "es2018.regexp.d.ts",
+    "es2018.promise.d.ts"
+];
 
 var es2018LibrarySourceMap = es2018LibrarySource.map(function (source) {
     return { target: "lib." + source, sources: ["header.d.ts", source] };
 });
 
 var esnextLibrarySource = [
     "esnext.asynciterable.d.ts",
-    "esnext.array.d.ts",
-    "esnext.promise.d.ts"
+    "esnext.array.d.ts"
 ];
 
 var esnextLibrarySourceMap = esnextLibrarySource.map(function (source) {