Merge branch 'master' into mael/pnp

Author: arcanis

Diff for: .eslintrc.json

@@ -54,6 +54,7 @@
         "simple-indent": "error",
         "debug-assert": "error",
         "no-keywords": "error",
+        "one-namespace-per-file": "error",
 
         // eslint-plugin-import
         "import/no-extraneous-dependencies": ["error", { "optionalDependencies": false }],

Diff for: .github/ISSUE_TEMPLATE/config.yml

@@ -5,4 +5,7 @@ contact_links:
     about: Please ask and answer questions here.
   - name: TypeScript FAQ
     url: https://github.com/microsoft/TypeScript/wiki/FAQ
-    about: Please check the FAQ before filing new issues
+    about: Please check the FAQ before filing new issues
+- name: Website
+    url: https://github.com/microsoft/TypeScript-Website/issues/new
+    about: Please raise issues about the site on it's own repo.

Diff for: .gitignore

@@ -90,6 +90,7 @@ tests/cases/user/TypeScript-React-Native-Starter/TypeScript-React-Native-Starter
 tests/cases/user/TypeScript-Vue-Starter/TypeScript-Vue-Starter
 tests/cases/user/TypeScript-WeChat-Starter/TypeScript-WeChat-Starter
 tests/cases/user/create-react-app/create-react-app
+tests/cases/user/fp-ts/fp-ts
 tests/cases/user/webpack/webpack
 tests/cases/user/puppeteer/puppeteer
 tests/cases/user/axios-src/axios-src

Diff for: Gulpfile.js

@@ -477,7 +477,6 @@ task("runtests-parallel").flags = {
     "   --workers=<number>": "The number of parallel workers to use.",
     "   --timeout=<ms>": "Overrides the default test timeout.",
     "   --built": "Compile using the built version of the compiler.",
-    "   --skipPercent=<number>": "Skip expensive tests with <percent> chance to miss an edit. Default 5%.",
     "   --shards": "Total number of shards running tests (default: 1)",
     "   --shardId": "1-based ID of this shard (default: 1)",
 };
@@ -588,15 +587,15 @@ task("generate-spec").description = "Generates a Markdown version of the Languag
 task("clean", series(parallel(cleanTasks), cleanBuilt));
 task("clean").description = "Cleans build outputs";
 
-const configureNightly = () => exec(process.execPath, ["scripts/configurePrerelease.js", "dev", "package.json", "src/compiler/core.ts"]);
+const configureNightly = () => exec(process.execPath, ["scripts/configurePrerelease.js", "dev", "package.json", "src/compiler/corePublic.ts"]);
 task("configure-nightly", series(buildScripts, configureNightly));
 task("configure-nightly").description = "Runs scripts/configurePrerelease.ts to prepare a build for nightly publishing";
 
-const configureInsiders = () => exec(process.execPath, ["scripts/configurePrerelease.js", "insiders", "package.json", "src/compiler/core.ts"]);
+const configureInsiders = () => exec(process.execPath, ["scripts/configurePrerelease.js", "insiders", "package.json", "src/compiler/corePublic.ts"]);
 task("configure-insiders", series(buildScripts, configureInsiders));
 task("configure-insiders").description = "Runs scripts/configurePrerelease.ts to prepare a build for insiders publishing";
 
-const configureExperimental = () => exec(process.execPath, ["scripts/configurePrerelease.js", "experimental", "package.json", "src/compiler/core.ts"]);
+const configureExperimental = () => exec(process.execPath, ["scripts/configurePrerelease.js", "experimental", "package.json", "src/compiler/corePublic.ts"]);
 task("configure-experimental", series(buildScripts, configureExperimental));
 task("configure-experimental").description = "Runs scripts/configurePrerelease.ts to prepare a build for experimental publishing";
 

Diff for: package.json

@@ -92,7 +92,6 @@
         "prex": "^0.4.3",
         "q": "latest",
         "remove-internal": "^2.9.2",
-        "simple-git": "^1.113.0",
         "source-map-support": "latest",
         "through2": "latest",
         "travis-fold": "latest",
@@ -117,8 +116,7 @@
         "lint:ci": "gulp lint --ci",
         "lint:compiler": "gulp lint-compiler",
         "lint:scripts": "gulp lint-scripts",
-        "setup-hooks": "node scripts/link-hooks.js",
-        "update-costly-tests": "node scripts/costly-tests.js"
+        "setup-hooks": "node scripts/link-hooks.js"
     },
     "browser": {
         "fs": false,

Diff for: scripts/build/options.js

@@ -4,8 +4,8 @@ const os = require("os");
 
 /** @type {CommandLineOptions} */
 module.exports = minimist(process.argv.slice(2), {
-    boolean: ["debug", "dirty", "inspect", "light", "colors", "lint", "lkg", "soft", "fix", "failed", "keepFailed", "force", "built"],
-    string: ["browser", "tests", "host", "reporter", "stackTraceLimit", "timeout", "shards", "shardId"],
+    boolean: ["debug", "dirty", "light", "colors", "lint", "lkg", "soft", "fix", "failed", "keepFailed", "force", "built"],
+    string: ["browser", "tests", "inspect", "host", "reporter", "stackTraceLimit", "timeout", "shards", "shardId"],
     alias: {
         "b": "browser",
         "d": "debug", "debug-brk": "debug",
@@ -14,7 +14,6 @@ module.exports = minimist(process.argv.slice(2), {
         "ru": "runners", "runner": "runners",
         "r": "reporter",
         "c": "colors", "color": "colors",
-        "skip-percent": "skipPercent",
         "skippercent": "skipPercent",
         "w": "workers",
         "f": "fix"
@@ -50,7 +49,6 @@ if (module.exports.built) {
  * @typedef TypedOptions
  * @property {boolean} debug
  * @property {boolean} dirty
- * @property {boolean} inspect
  * @property {boolean} light
  * @property {boolean} colors
  * @property {boolean} lint
@@ -60,6 +58,7 @@ if (module.exports.built) {
  * @property {boolean} fix
  * @property {string} browser
  * @property {string} tests
+ * @property {string} inspect
  * @property {string} runners
  * @property {string|number} workers
  * @property {string} host

Diff for: scripts/build/tests.js

@@ -31,7 +31,6 @@ async function runConsoleTests(runJs, defaultReporter, runInParallel, watchMode,
     const inspect = cmdLineOptions.inspect;
     const runners = cmdLineOptions.runners;
     const light = cmdLineOptions.light;
-    const skipPercent = process.env.CI === "true" ? 0 : cmdLineOptions.skipPercent;
     const stackTraceLimit = cmdLineOptions.stackTraceLimit;
     const testConfigFile = "test.config";
     const failed = cmdLineOptions.failed;
@@ -65,8 +64,8 @@ async function runConsoleTests(runJs, defaultReporter, runInParallel, watchMode,
         testTimeout = 400000;
     }
 
-    if (tests || runners || light || testTimeout || taskConfigsFolder || keepFailed || skipPercent !== undefined || shards || shardId) {
-        writeTestConfigFile(tests, runners, light, skipPercent, taskConfigsFolder, workerCount, stackTraceLimit, testTimeout, keepFailed, shards, shardId);
+    if (tests || runners || light || testTimeout || taskConfigsFolder || keepFailed || shards || shardId) {
+        writeTestConfigFile(tests, runners, light, taskConfigsFolder, workerCount, stackTraceLimit, testTimeout, keepFailed, shards, shardId);
     }
 
     const colors = cmdLineOptions.colors;
@@ -90,8 +89,8 @@ async function runConsoleTests(runJs, defaultReporter, runInParallel, watchMode,
         else {
             args.push("--no-colors");
         }
-        if (inspect) {
-            args.unshift("--inspect-brk");
+        if (inspect !== undefined) {
+            args.unshift(inspect == "" ? "--inspect-brk" : "--inspect-brk="+inspect);
         }
         else if (debug) {
             args.unshift("--debug-brk");
@@ -161,7 +160,6 @@ exports.cleanTestDirs = cleanTestDirs;
  * @param {string} tests
  * @param {string} runners
  * @param {boolean} light
- * @param {string} skipPercent
  * @param {string} [taskConfigsFolder]
  * @param {string | number} [workerCount]
  * @param {string} [stackTraceLimit]
@@ -170,12 +168,11 @@ exports.cleanTestDirs = cleanTestDirs;
  * @param {number | undefined} [shards]
  * @param {number | undefined} [shardId]
  */
-function writeTestConfigFile(tests, runners, light, skipPercent, taskConfigsFolder, workerCount, stackTraceLimit, timeout, keepFailed, shards, shardId) {
+function writeTestConfigFile(tests, runners, light, taskConfigsFolder, workerCount, stackTraceLimit, timeout, keepFailed, shards, shardId) {
     const testConfigContents = JSON.stringify({
         test: tests ? [tests] : undefined,
         runners: runners ? runners.split(",") : undefined,
         light,
-        skipPercent,
         workerCount,
         stackTraceLimit,
         taskConfigsFolder,

Diff for: scripts/costly-tests.js

@@ -0,0 +1,44 @@
+import { AST_NODE_TYPES, TSESTree } from "@typescript-eslint/experimental-utils";
+import { createRule } from "./utils";
+
+export = createRule({
+    name: "one-namespace-per-file",
+    meta: {
+        docs: {
+            description: `Limits each file to having at most one top-level namespace declaration`,
+            category: "Possible Errors",
+            recommended: "error",
+        },
+        messages: {
+            excessNamespaceError: `All but one of these namespaces should be moved into seperate files.`,
+        },
+        schema: [],
+        type: "problem",
+    },
+    defaultOptions: [],
+
+    create(context) {
+        const isNamespaceDeclaration = (node: TSESTree.Node): node is TSESTree.TSModuleDeclaration => node.type === AST_NODE_TYPES.TSModuleDeclaration;
+
+        const checkSourceFile = (node: TSESTree.Program) => {
+            if (context.getFilename().endsWith(".d.ts")) {
+                return;
+            }
+            const members = node.body;
+            const namespaces = members.filter(isNamespaceDeclaration);
+            if (namespaces.length <= 1) {
+                return;
+            }
+
+            namespaces.forEach(n => {
+                context.report({
+                    messageId: "excessNamespaceError", node: n
+                });
+            });
+        };
+
+        return {
+            Program: checkSourceFile,
+        };
+    },
+});

Diff for: scripts/eslint/rules/one-namespace-per-file.ts

@@ -1,2 +1,2 @@
-#!/bin/sh
-npm run gulp -- generate-diagnostics
+#!/bin/sh
+npm run gulp -- generate-diagnostics