Merge branch 'master' of github.com:Microsoft/TypeScript into add-to-types2

Author: ajafff

.github/ISSUE_TEMPLATE/Bug_report.md

@@ -16,7 +16,7 @@ Please fill in the *entire* template below.
 -->
 
 <!-- Please try to reproduce the issue with `typescript@next`. It may have already been fixed. -->
-**TypeScript Version:**  3.3.0-dev.201xxxxx
+**TypeScript Version:**  3.4.0-dev.201xxxxx
 
 <!-- Search terms you tried before logging this (so others can find this issue more easily) -->
 **Search Terms:**

Gulpfile.js

@@ -8,10 +8,8 @@ const path = require("path");
 const fold = require("travis-fold");
 const ts = require("./lib/typescript");
 const del = require("del");
-const getDirSize = require("./scripts/build/getDirSize");
+const { getDirSize, needsUpdate, flatten } = require("./scripts/build/utils");
 const { base64VLQFormatEncode } = require("./scripts/build/sourcemaps");
-const needsUpdate = require("./scripts/build/needsUpdate");
-const { flatten } = require("./scripts/build/project");
 
 // add node_modules to path so we don't need global modules, prefer the modules by adding them first
 var nodeModulesPathPrefix = path.resolve("./node_modules/.bin/") + path.delimiter;
@@ -361,7 +359,7 @@ file(ConfigFileFor.tsserverLibrary, [], function () {
         compilerOptions: {
             "removeComments": false,
             "stripInternal": true,
-            "declarationMap": false,
+            "declaration": true,
             "outFile": "tsserverlibrary.out.js"
         }
     })

Jakefile.js

@@ -1,5 +1,5 @@
 [![Build Status](https://travis-ci.org/Microsoft/TypeScript.svg?branch=master)](https://travis-ci.org/Microsoft/TypeScript)
-[![VSTS Build Status](https://dev.azure.com/typescript/TypeScript/_apis/build/status/Typescript/node10)](https://https://dev.azure.com/typescript/TypeScript/_build/latest?definitionId=4&view=logs) 
+[![VSTS Build Status](https://dev.azure.com/typescript/TypeScript/_apis/build/status/Typescript/node10)](https://dev.azure.com/typescript/TypeScript/_build/latest?definitionId=4&view=logs) 
 [![npm version](https://badge.fury.io/js/typescript.svg)](https://www.npmjs.com/package/typescript)
 [![Downloads](https://img.shields.io/npm/dm/typescript.svg)](https://www.npmjs.com/package/typescript)
 

README.md

@@ -3715,7 +3715,7 @@ the array literal initializer expression is contextually typed by the implied ty
 
 ## <a name="5.3"/>5.3 Let and Const Declarations
 
-Let and const declarations are exended to include optional type annotations.
+Let and const declarations are extended to include optional type annotations.
 
 &emsp;&emsp;*LexicalBinding:*  *( Modified )*  
 &emsp;&emsp;&emsp;*SimpleLexicalBinding*  

doc/spec.md

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "3.3.0",
+    "version": "3.4.0",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
@@ -35,10 +35,8 @@
         "@types/convert-source-map": "latest",
         "@types/del": "latest",
         "@types/glob": "latest",
-        "@types/gulp": "3.X",
+        "@types/gulp": "^4.0.5",
         "@types/gulp-concat": "latest",
-        "@types/gulp-help": "latest",
-        "@types/gulp-if": "0.0.33",
         "@types/gulp-newer": "latest",
         "@types/gulp-rename": "0.0.33",
         "@types/gulp-sourcemaps": "0.0.32",
@@ -50,7 +48,6 @@
         "@types/mocha": "latest",
         "@types/node": "8.5.5",
         "@types/q": "latest",
-        "@types/run-sequence": "latest",
         "@types/source-map-support": "latest",
         "@types/through2": "latest",
         "@types/travis-fold": "latest",
@@ -63,16 +60,12 @@
         "del": "latest",
         "fancy-log": "latest",
         "fs-extra": "^6.0.1",
-        "gulp": "3.X",
-        "gulp-clone": "latest",
+        "gulp": "^4.0.0",
         "gulp-concat": "latest",
-        "gulp-help": "latest",
-        "gulp-if": "latest",
         "gulp-insert": "latest",
         "gulp-newer": "latest",
         "gulp-rename": "latest",
         "gulp-sourcemaps": "latest",
-        "gulp-typescript": "latest",
         "istanbul": "latest",
         "jake": "latest",
         "lodash": "4.17.10",
@@ -86,7 +79,6 @@
         "prex": "^0.4.3",
         "q": "latest",
         "remove-internal": "^2.9.2",
-        "run-sequence": "latest",
         "source-map-support": "latest",
         "through2": "latest",
         "travis-fold": "latest",

package.json

@@ -1,12 +1,10 @@
 // @ts-check
 const browserify = require("browserify");
-const Vinyl = require("./vinyl");
+const Vinyl = require("vinyl");
 const { Transform } = require("stream");
 const { streamFromFile } = require("./utils");
 const { replaceContents } = require("./sourcemaps");
 
-module.exports = browserifyFile;
-
 /**
  * @param {import("browserify").Options} [opts]
  */
@@ -31,4 +29,5 @@ function browserifyFile(opts) {
             }
         }
     });
-}
+}
+exports.browserify = browserifyFile;