From 5124cb495c3ad13418fc08c45ac7720fcf8ecefb Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Sat, 7 Sep 2019 20:22:18 -0400 Subject: [PATCH 01/14] Use json5 for optimisticReadJsonOrNull. Because json5 is more tolerant of non-standards-compliant input, it has no trouble with \t tab characters outside of string literals, so this change should fix issue #10688. Note that json5 is already installed in dev_bundle/lib/node_modules/json5, because it is a dependency of @babel/core, so we don't need to rebuild the dev bundle immediately, though it would be a good idea to do so before the next beta/RC release. --- scripts/dev-bundle-tool-package.js | 1 + tools/fs/optimistic.ts | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js index fb23613d03..57ce4a8c7a 100644 --- a/scripts/dev-bundle-tool-package.js +++ b/scripts/dev-bundle-tool-package.js @@ -36,6 +36,7 @@ var packageJson = { "graceful-fs": "4.2.2", fstream: "https://github.com/meteor/fstream/tarball/cf4ea6c175355cec7bee38311e170d08c4078a5d", tar: "2.2.1", + json5: "2.1.0", kexec: "3.0.0", "source-map": "0.5.7", chalk: "0.5.1", diff --git a/tools/fs/optimistic.ts b/tools/fs/optimistic.ts index 672430e0b3..3cc9d6a90d 100644 --- a/tools/fs/optimistic.ts +++ b/tools/fs/optimistic.ts @@ -246,6 +246,9 @@ export const optimisticHashOrNull = makeOptimistic("hashOrNull", ( return null; }); +// A more tolerant implementation of JSON.parse. +const { parse: jsonParse } = require("json5"); + export const optimisticReadJsonOrNull = makeOptimistic("readJsonOrNull", ( path: string, @@ -254,7 +257,7 @@ makeOptimistic("readJsonOrNull", ( }, ) => { try { - return JSON.parse( + return jsonParse( optimisticReadFile(path, options) ) as Record; From c4ad648c5e3d87b7b3112dd6074b3fc6e2a69109 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Tue, 17 Sep 2019 21:11:56 -0400 Subject: [PATCH 02/14] Update meteor-babel to version 7.6.1. --- History.md | 2 +- .../.npm/package/npm-shrinkwrap.json | 83 +++++++++++-------- packages/babel-compiler/package.js | 2 +- scripts/dev-bundle-tool-package.js | 2 +- 4 files changed, 50 insertions(+), 39 deletions(-) diff --git a/History.md b/History.md index 9f0ed14bec..6095131999 100644 --- a/History.md +++ b/History.md @@ -55,7 +55,7 @@ N/A * The `mongodb` npm package used by the `npm-mongo` Meteor package has been updated to version 3.2.7. -* The `meteor-babel` npm package has been updated to version 7.6.0, +* The `meteor-babel` npm package has been updated to version 7.6.1, enabling compilation of the `meteor/tools` codebase with TypeScript (specifically, version 3.6.2 of the `typescript` npm package). diff --git a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json index 9b2cff8a65..e027e1cbf9 100644 --- a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json +++ b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json @@ -11,11 +11,6 @@ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.6.0.tgz", "integrity": "sha512-FuRhDRtsd6IptKpHXAa+4WPZYY2ZzgowkbLBecEDDSje1X/apG7jQM33or3NdOmjXBKWGOg4JmSiRfUfuTtHXw==", "dependencies": { - "@babel/parser": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.6.0.tgz", - "integrity": "sha512-+o2q111WEx4srBs7L9eJmcwi655eD8sXniLqMB93TBK9GrNzGrxDWSjiqz2hLU0Ha8MTXFIP0yd9fNdP+m43ZQ==" - }, "json5": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.0.tgz", @@ -144,9 +139,9 @@ "integrity": "sha512-7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==" }, "@babel/parser": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.5.5.tgz", - "integrity": "sha512-E5BN68cqR7dhKan1SfqgPGhQ178bkVKpXTPEXnFJBrEt8/DKRZlybmy+IgYLTeN7tp1R5Ccmbm2rBk17sHYU3g==" + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.6.0.tgz", + "integrity": "sha512-+o2q111WEx4srBs7L9eJmcwi655eD8sXniLqMB93TBK9GrNzGrxDWSjiqz2hLU0Ha8MTXFIP0yd9fNdP+m43ZQ==" }, "@babel/plugin-proposal-async-generator-functions": { "version": "7.2.0", @@ -158,11 +153,26 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.5.5.tgz", "integrity": "sha512-AF79FsnWFxjlaosgdi421vmYG6/jg79bVD0dpD44QdgobzHKuLZ6S3vl8la9qIeSwGi8i1fS0O1mfuDAAdo1/A==" }, + "@babel/plugin-proposal-nullish-coalescing-operator": { + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.4.4.tgz", + "integrity": "sha512-Amph7Epui1Dh/xxUxS2+K22/MUi6+6JVTvy3P58tja3B6yKTSjwwx0/d83rF7551D6PVSSoplQb8GCwqec7HRw==" + }, "@babel/plugin-proposal-object-rest-spread": { "version": "7.5.5", "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.5.5.tgz", "integrity": "sha512-F2DxJJSQ7f64FyTVl5cw/9MWn6naXGdk3Q3UhDbFEEHv+EilCPoeRD3Zh/Utx1CJz4uyKlQ4uH+bJPbEhMV7Zw==" }, + "@babel/plugin-proposal-optional-catch-binding": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.2.0.tgz", + "integrity": "sha512-mgYj3jCcxug6KUcX4OBoOJz3CMrwRfQELPQ5560F70YQUBZB7uac9fqaWamKR1iWUzGiK2t0ygzjTScZnVz75g==" + }, + "@babel/plugin-proposal-optional-chaining": { + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.6.0.tgz", + "integrity": "sha512-kj4gkZ6qUggkprRq3Uh5KP8XnE1MdIO0J7MhdDX8+rAbB6dJ2UrensGIS+0NPZAaaJ1Vr0PN6oLUgXMU1uMcSg==" + }, "@babel/plugin-syntax-async-generators": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.2.0.tgz", @@ -188,11 +198,26 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.2.0.tgz", "integrity": "sha512-VyN4QANJkRW6lDBmENzRszvZf3/4AXaj9YR7GwrWeeN9tEBPuXbmDYVU9bYBN0D70zCWVwUy0HWq2553VCb6Hw==" }, + "@babel/plugin-syntax-nullish-coalescing-operator": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.2.0.tgz", + "integrity": "sha512-lRCEaKE+LTxDQtgbYajI04ddt6WW0WJq57xqkAZ+s11h4YgfRHhVA/Y2VhfPzzFD4qeLHWg32DMp9HooY4Kqlg==" + }, "@babel/plugin-syntax-object-rest-spread": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz", "integrity": "sha512-t0JKGgqk2We+9may3t0xDdmneaXmyxq0xieYcKHxIsrJO64n1OiMWNUtc5gQK1PA0NpdCRrtZp4z+IUaKugrSA==" }, + "@babel/plugin-syntax-optional-catch-binding": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.2.0.tgz", + "integrity": "sha512-bDe4xKNhb0LI7IvZHiA13kff0KEfaGX/Hv4lMA9+7TEc63hMNvfKo6ZFpXhKuEp+II/q35Gc4NoMeDZyaUbj9w==" + }, + "@babel/plugin-syntax-optional-chaining": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.2.0.tgz", + "integrity": "sha512-HtGCtvp5Uq/jH/WNUPkK6b7rufnCPLLlDAFN7cmACoIjaOOiXxUt3SswU5loHqrhtqTsa/WoLQ1OQ1AGuZqaWA==" + }, "@babel/plugin-transform-arrow-functions": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.2.0.tgz", @@ -341,26 +366,12 @@ "@babel/template": { "version": "7.6.0", "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.6.0.tgz", - "integrity": "sha512-5AEH2EXD8euCk446b7edmgFdub/qfH1SN6Nii3+fyXP807QRx9Q73A2N5hNwRRslC2H9sNzaFhsPubkS4L8oNQ==", - "dependencies": { - "@babel/parser": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.6.0.tgz", - "integrity": "sha512-+o2q111WEx4srBs7L9eJmcwi655eD8sXniLqMB93TBK9GrNzGrxDWSjiqz2hLU0Ha8MTXFIP0yd9fNdP+m43ZQ==" - } - } + "integrity": "sha512-5AEH2EXD8euCk446b7edmgFdub/qfH1SN6Nii3+fyXP807QRx9Q73A2N5hNwRRslC2H9sNzaFhsPubkS4L8oNQ==" }, "@babel/traverse": { "version": "7.6.0", "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.6.0.tgz", - "integrity": "sha512-93t52SaOBgml/xY74lsmt7xOR4ufYvhb5c5qiM6lu4J/dWGMAfAh6eKw4PjLes6DI6nQgearoxnFJk60YchpvQ==", - "dependencies": { - "@babel/parser": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.6.0.tgz", - "integrity": "sha512-+o2q111WEx4srBs7L9eJmcwi655eD8sXniLqMB93TBK9GrNzGrxDWSjiqz2hLU0Ha8MTXFIP0yd9fNdP+m43ZQ==" - } - } + "integrity": "sha512-93t52SaOBgml/xY74lsmt7xOR4ufYvhb5c5qiM6lu4J/dWGMAfAh6eKw4PjLes6DI6nQgearoxnFJk60YchpvQ==" }, "@babel/types": { "version": "7.6.1", @@ -533,9 +544,9 @@ "integrity": "sha1-viQcqBQEAwZ4t0hxcyK4nQyP4oA=" }, "babel-preset-meteor": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/babel-preset-meteor/-/babel-preset-meteor-7.6.0.tgz", - "integrity": "sha512-YEuDJ3F8s8eLtv0Rpg9gD6xRa9gLYw6KiaZmYGyhj6VoyhEVAHFfzLd7aqE2KVlYYFowr/hi4BcqTE7hcu0ECQ==" + "version": "7.6.1", + "resolved": "https://registry.npmjs.org/babel-preset-meteor/-/babel-preset-meteor-7.6.1.tgz", + "integrity": "sha512-MtFTa3g7cF+lepxY+XraKMTXBKdY5iNrSC2vcnp/cSC3rLwhWfc8WCxIS+qFU7dTen0u2IB3GIWI8cjqCIMOsA==" }, "babel-preset-minify": { "version": "0.5.1", @@ -628,9 +639,9 @@ "integrity": "sha512-6QK0OpF/phMz0Q2AxILkX2mFhi7m+WMwTRg0LQKq/WBB0cDP4rYH3Wp4/d3OTXlrPLVJT/RFqj8tFeAR4nk8AA==" }, "meteor-babel": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/meteor-babel/-/meteor-babel-7.6.0.tgz", - "integrity": "sha512-LOFO4R6qoujjalVafJfSk/io9Mydj1tgAd8+b2f8a3f4dtaFxOp3ey99SrpDEjMdztOa1vMEEJbtGJ8ozoyENg==" + "version": "7.6.1", + "resolved": "https://registry.npmjs.org/meteor-babel/-/meteor-babel-7.6.1.tgz", + "integrity": "sha512-3gINjMYXgbBvkWs9x/rD4MInU2hOUTJ5dREEVcKQh48kvLa7WMKl28dkPFARTr0GmGVLqrlP8a01QCgEqk8+9A==" }, "meteor-babel-helpers": { "version": "0.0.3", @@ -688,9 +699,9 @@ "integrity": "sha512-flVuee02C3FKRISbxhXl9mGzdbWUVHubl1SMaknjxkFB1/iqpJhArQUvRxOOPEc/9tAiX0BaQ28FJH10E4isSQ==" }, "regexpu-core": { - "version": "4.5.5", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.5.5.tgz", - "integrity": "sha512-FpI67+ky9J+cDizQUJlIlNZFKual/lUkFr1AG6zOCpwZ9cLrg8UUVakyUQJD7fCDIe9Z2nwTQJNPyonatNmDFQ==" + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.6.0.tgz", + "integrity": "sha512-YlVaefl8P5BnFYOITTNzDvan1ulLOiXJzCNZxduTIosN17b87h3bvG9yHMoHaRuo88H4mQ06Aodj5VtYGGGiTg==" }, "regjsgen": { "version": "0.5.0", @@ -755,9 +766,9 @@ "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=" }, "typescript": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.6.2.tgz", - "integrity": "sha512-lmQ4L+J6mnu3xweP8+rOrUwzmN+MRAj7TgtJtDaXE5PMyX2kCrklhg3rvOsOIfNeAWMQWO2F1GPc1kMD2vLAfw==" + "version": "3.6.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.6.3.tgz", + "integrity": "sha512-N7bceJL1CtRQ2RiG0AQME13ksR7DiuQh/QehubYcghzv20tnh+MQnQIuJddTmsbqYj+dztchykemz0zFzlvdQw==" }, "unicode-canonical-property-names-ecmascript": { "version": "1.0.4", diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js index ab7b4ab25b..b54f4b26c8 100644 --- a/packages/babel-compiler/package.js +++ b/packages/babel-compiler/package.js @@ -10,7 +10,7 @@ Package.describe({ }); Npm.depends({ - 'meteor-babel': '7.6.0', + 'meteor-babel': '7.6.1', 'json5': '2.1.0' }); diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js index 57ce4a8c7a..9bc8d7b4a5 100644 --- a/scripts/dev-bundle-tool-package.js +++ b/scripts/dev-bundle-tool-package.js @@ -15,7 +15,7 @@ var packageJson = { "node-gyp": "5.0.1", "node-pre-gyp": "0.13.0", typescript: "3.6.2", - "meteor-babel": "7.6.0", + "meteor-babel": "7.6.1", // Keep the versions of these packages consistent with the versions // found in dev-bundle-server-package.js. "meteor-promise": "0.8.7", From ec403b3fe538e256401df23615e747b26f84f017 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Tue, 17 Sep 2019 21:25:31 -0400 Subject: [PATCH 03/14] Update optimism npm package to latest version (0.11.2). --- History.md | 5 +++-- scripts/dev-bundle-tool-package.js | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/History.md b/History.md index 6095131999..a8a2a93ce6 100644 --- a/History.md +++ b/History.md @@ -67,8 +67,9 @@ N/A * The `node-gyp` npm package has been updated to version 5.0.1, and `node-pre-gyp` has been updated to 0.13.0. -* The `optimism` npm package has been updated to version 0.10.2, which - enables caching of thrown exceptions, as well as ordinary results. +* The `optimism` npm package has been updated to version 0.11.2, which + enables caching of thrown exceptions as well as ordinary results, in + addition to performance improvements. * The `pathwatcher` npm package has been updated to version 8.1.0. diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js index 9bc8d7b4a5..d5f0a5f5f2 100644 --- a/scripts/dev-bundle-tool-package.js +++ b/scripts/dev-bundle-tool-package.js @@ -59,7 +59,7 @@ var packageJson = { pathwatcher: "8.1.0", // The @wry/context package version must be compatible with the // version constraint imposed by optimism/package.json. - optimism: "0.10.2", + optimism: "0.11.2", "@wry/context": "0.4.4", 'lru-cache': '4.1.3' } From f22bfec5274ca822241c8de38f4c98e78163a7d3 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Tue, 17 Sep 2019 21:26:27 -0400 Subject: [PATCH 04/14] Bump $BUNDLE_VERSION to 8.16.1.2 before rebuilding dev bundle. --- meteor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meteor b/meteor index 312b1371f7..2ab0b33f8b 100755 --- a/meteor +++ b/meteor @@ -1,6 +1,6 @@ #!/usr/bin/env bash -BUNDLE_VERSION=8.16.1.1 +BUNDLE_VERSION=8.16.1.2 # OS Check. Put here because here is where we download the precompiled # bundles that are arch specific. From 7bc5b5b061b794661792d2019b19f04db566adf5 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Wed, 18 Sep 2019 11:40:47 -0400 Subject: [PATCH 05/14] Use dep API from optimism instead of wrap in a few places. Background: https://github.com/benjamn/optimism/pull/50 --- tools/fs/files.ts | 12 ++---------- tools/fs/optimistic.ts | 26 ++++++-------------------- 2 files changed, 8 insertions(+), 30 deletions(-) diff --git a/tools/fs/files.ts b/tools/fs/files.ts index 3d51cb8cc5..d2fb10c8cd 100644 --- a/tools/fs/files.ts +++ b/tools/fs/files.ts @@ -11,6 +11,7 @@ import os from "os"; import { spawn, execFile } from "child_process"; import { EventEmitter } from "events"; import { Slot } from "@wry/context"; +import { dep } from "optimism"; const _ = require('underscore'); const Fiber = require("fibers"); @@ -1646,16 +1647,7 @@ export function withCache(fn: () => R): R { return cache ? fn() : withCacheSlot.withValue(Object.create(null), fn); } -let dependOnPathSalt = 0; -import { wrap } from "optimism"; -export const dependOnPath = wrap( - // Always return something different to prevent optimism from - // second-guessing the dirtiness of this function. - (_path: string) => ++dependOnPathSalt, - // This function is disposable because we don't care about its result, - // only its role in optimistic dependency tracking/dirtying. - { disposable: true } -); +export const dependOnPath = dep(); function wrapDestructiveFsFunc( fnName: string, diff --git a/tools/fs/optimistic.ts b/tools/fs/optimistic.ts index 3cc9d6a90d..18969a36ac 100644 --- a/tools/fs/optimistic.ts +++ b/tools/fs/optimistic.ts @@ -1,5 +1,5 @@ import assert from "assert"; -import { wrap, OptimisticWrapperFunction } from "optimism"; +import { wrap, OptimisticWrapperFunction, dep } from "optimism"; import ignore from "ignore"; import { Profile } from "../tool-env/profile"; import { watch, SafeWatcher } from "./safe-watcher"; @@ -146,13 +146,7 @@ function maybeDependOnNodeModules(path: string) { } } -let dependOnDirectorySalt = 0; - -const dependOnDirectory = wrap((_dir: string) => { - // Always return something different to prevent optimism from - // second-guessing the dirtiness of this function. - return ++dependOnDirectorySalt; -}, { +const dependOnDirectory = dep({ subscribe(dir: string) { let watcher: SafeWatcher | null = watch( dir, @@ -166,10 +160,6 @@ const dependOnDirectory = wrap((_dir: string) => { } }; }, - - // This function is disposable because we don't care about its result, - // only its role in optimistic dependency tracking/dirtying. - disposable: true }); // Called when an optimistic function detects the given file does not @@ -191,20 +181,16 @@ function dependOnParentDirectory(path: string) { // Note that this strategy will not detect changes within subdirectories // of this node_modules directory, but that's ok because the use case we // care about is adding or removing npm packages. -const dependOnNodeModules = wrap((nodeModulesDir: string) => { +function dependOnNodeModules(nodeModulesDir: string) { assert(pathIsAbsolute(nodeModulesDir)); assert(nodeModulesDir.endsWith(pathSep + "node_modules")); - return dependOnDirectory(nodeModulesDir); -}, { - // This function is disposable because we don't care about its result, - // only its role in optimistic dependency tracking/dirtying. - disposable: true -}); + dependOnDirectory(nodeModulesDir); +} // Invalidate all optimistic results derived from paths involving the // given node_modules directory. export function dirtyNodeModulesDirectory(nodeModulesDir: string) { - dependOnNodeModules.dirty(nodeModulesDir); + dependOnDirectory.dirty(nodeModulesDir); } export const optimisticStatOrNull = makeOptimistic("statOrNull", (path: string) => { From f9c498adb83942099c956729be29e8d2652a6021 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Wed, 18 Sep 2019 16:19:02 -0400 Subject: [PATCH 06/14] Improve the shouldWatch function in tools/fs/optimistic.ts. (#10693) This function determines whether the optimistic caching system should subscribe to file change notifications for a given path. Note that Meteor has other ways of watching for file changes (e.g. the WatchSet abstraction), as well as other mechanisms for invalidating cached results, so time and resources can often be saved by returning false here, if we know that the path will be watched in other ways. Improvements: - Add METEOR_PROFILE instrumentation to the shouldWatch implementation. - Stop exporting shouldWatch, since it is no longer used anywhere else in the codebase. - Return false early to avoid watching files inside the .meteor directory, a significant shortcut. - Allow watching files in application node_modules directories that are not located directly in the root application directory (closes #10664). --- tools/fs/optimistic.ts | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/tools/fs/optimistic.ts b/tools/fs/optimistic.ts index 18969a36ac..64e6dbf676 100644 --- a/tools/fs/optimistic.ts +++ b/tools/fs/optimistic.ts @@ -15,6 +15,7 @@ import { readFile, readdir, dependOnPath, + findAppDir, } from "./files"; // When in doubt, the optimistic caching system can be completely disabled @@ -79,7 +80,12 @@ function makeOptimistic< return wrapper; } -export const shouldWatch = wrap((path: string) => { +// The Meteor application directory should never change during the lifetime +// of the build process, so it should be safe to cache findAppDir without +// subscribing to file changes. +const optimisticFindAppDir = wrap(findAppDir); + +const shouldWatch = wrap(Profile("shouldWatch", (path: string) => { const parts = path.split(pathSep); const nmi = parts.indexOf("node_modules"); @@ -88,6 +94,14 @@ export const shouldWatch = wrap((path: string) => { return true; } + const dotMeteorIndex = parts.lastIndexOf(".meteor", nmi); + if (dotMeteorIndex >= 0) { + // Watch nothing inside of .meteor, at least for the purposes of the + // optimistic caching system. Meteor watches files inside .meteor/local + // via the WatchSet abstraction, unrelatedly. + return false; + } + if (nmi < parts.length - 1) { const nmi2 = parts.indexOf("node_modules", nmi + 1); if (nmi2 > nmi) { @@ -97,6 +111,21 @@ export const shouldWatch = wrap((path: string) => { return false; } + const parentDirParts = parts.slice(0, nmi); + const parentDir = parentDirParts.join(pathSep); + const appDir = optimisticFindAppDir(parentDir); + if ( + appDir && + parentDir.startsWith(appDir) && + appDir.split(pathSep).length < parentDirParts.length + ) { + // If the given path is contained by the Meteor application directory, + // but the node_modules directory we're considering is not directly + // contained by the root application directory, watch the file. See + // discussion in issue https://github.com/meteor/meteor/issues/10664 + return true; + } + const packageDirParts = parts.slice(0, nmi + 2); if (parts[nmi + 1].startsWith("@")) { @@ -118,7 +147,7 @@ export const shouldWatch = wrap((path: string) => { // instead we rely on dependOnNodeModules to tell us when files in // node_modules directories might have changed. return false; -}); +})); function maybeDependOnPath(path: string) { if (typeof path === "string") { From 2468d17fec6639a07cded3a7f0fdbb0a93fcad52 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Wed, 18 Sep 2019 19:07:41 -0400 Subject: [PATCH 07/14] Allow creating Meteor apps with --typescript skeleton. Just as developers can run meteor create --react my-react-app meteor create --minimal my-minimal-app meteor create --bare my-bare-app meteor create --full my-full-app they can now run meteor create --typescript my-typescript-app to produce a new TypeScript application, based on the --react application, configured using a recommended tsconfig.json file. This app represents the current best/simplest-known way to set up a Meteor-compatible TypeScript application, but it is still very much a work in progress. Please feel free to submit pull requests to improve it, or create issues to discuss how it should work. For example, the community-maintained @types/meteor package covers all the core packages used by this starter application, but it has not been updated in a while, so there will no doubt be meteor/* packages with missing types. In future versions, Meteor should ideally generate the appropriate .d.ts files from TypeScript package source code, so that no separate @types/meteor/* declarations need to be maintained. --- tools/cli/commands.js | 23 ++++++----- .../skel-react/imports/api/links.js | 2 +- .../static-assets/skel-typescript/.gitignore | 1 + .../skel-typescript/.meteor/.gitignore | 1 + .../skel-typescript/.meteor/packages | 22 ++++++++++ .../skel-typescript/.meteor/platforms | 2 + .../skel-typescript/client/main.css | 4 ++ .../skel-typescript/client/main.html | 7 ++++ .../skel-typescript/client/main.tsx | 8 ++++ .../skel-typescript/imports/api/links.ts | 10 +++++ .../skel-typescript/imports/ui/App.tsx | 11 +++++ .../skel-typescript/imports/ui/Hello.tsx | 22 ++++++++++ .../skel-typescript/imports/ui/Info.tsx | 34 ++++++++++++++++ .../skel-typescript/package.json | 29 ++++++++++++++ .../skel-typescript/server/main.ts | 31 ++++++++++++++ .../skel-typescript/tests/main.ts | 21 ++++++++++ .../skel-typescript/tsconfig.json | 40 +++++++++++++++++++ tools/tsconfig.json | 1 + 18 files changed, 258 insertions(+), 11 deletions(-) create mode 100644 tools/static-assets/skel-typescript/.gitignore create mode 100644 tools/static-assets/skel-typescript/.meteor/.gitignore create mode 100644 tools/static-assets/skel-typescript/.meteor/packages create mode 100644 tools/static-assets/skel-typescript/.meteor/platforms create mode 100644 tools/static-assets/skel-typescript/client/main.css create mode 100644 tools/static-assets/skel-typescript/client/main.html create mode 100644 tools/static-assets/skel-typescript/client/main.tsx create mode 100644 tools/static-assets/skel-typescript/imports/api/links.ts create mode 100644 tools/static-assets/skel-typescript/imports/ui/App.tsx create mode 100644 tools/static-assets/skel-typescript/imports/ui/Hello.tsx create mode 100644 tools/static-assets/skel-typescript/imports/ui/Info.tsx create mode 100644 tools/static-assets/skel-typescript/package.json create mode 100644 tools/static-assets/skel-typescript/server/main.ts create mode 100644 tools/static-assets/skel-typescript/tests/main.ts create mode 100644 tools/static-assets/skel-typescript/tsconfig.json diff --git a/tools/cli/commands.js b/tools/cli/commands.js index 7648a2128c..2b4d2f5599 100644 --- a/tools/cli/commands.js +++ b/tools/cli/commands.js @@ -505,6 +505,7 @@ main.registerCommand({ minimal: { type: Boolean }, full: { type: Boolean }, react: { type: Boolean }, + typescript: { type: Boolean }, }, catalogRefresh: new catalog.Refresh.Never() }, function (options) { @@ -593,7 +594,7 @@ main.registerCommand({ return transform(f); }, transformContents: function (contents, f) { - if ((/(\.html|\.js|\.css)/).test(f)) { + if ((/(\.html|\.[jt]sx?|\.css)/).test(f)) { return Buffer.from(transform(contents.toString())); } else { return contents; @@ -757,6 +758,8 @@ main.registerCommand({ skelName += "-full"; } else if (options.react) { skelName += "-react"; + } else if (options.typescript) { + skelName += "-typescript"; } files.cp_r(files.pathJoin(__dirnameConverted, '..', 'static-assets', skelName), appPath, { @@ -764,7 +767,7 @@ main.registerCommand({ return transform(f); }, transformContents: function (contents, f) { - if ((/(\.html|\.js|\.css)/).test(f)) { + if ((/(\.html|\.[jt]sx?|\.css)/).test(f)) { return Buffer.from(transform(contents.toString())); } else { return contents; @@ -864,20 +867,20 @@ main.registerCommand({ if (! options.bare && ! options.minimal && ! options.full && - ! options.react) { - // Notify people about --bare, --minimal, --full, and --react. + ! options.react && + ! options.typescript) { + // Notify people about --bare, --minimal, --full, --react, and --typescript. Console.info([ "", "To start with a different app template, try one of the following:", "", ].join("\n")); - cmd("meteor create --bare # to create an empty app"); - cmd("meteor create --minimal # to create an app with as few " + - "Meteor packages as possible"); - cmd("meteor create --full # to create a more complete " + - "scaffolded app"); - cmd("meteor create --react # to create a basic React-based app"); + cmd("meteor create --bare # to create an empty app"); + cmd("meteor create --minimal # to create an app with as few Meteor packages as possible"); + cmd("meteor create --full # to create a more complete scaffolded app"); + cmd("meteor create --react # to create a basic React-based app"); + cmd("meteor create --typescript # to create an app using TypeScript and React"); } Console.info(""); diff --git a/tools/static-assets/skel-react/imports/api/links.js b/tools/static-assets/skel-react/imports/api/links.js index 27352f85ff..872bb75c9c 100644 --- a/tools/static-assets/skel-react/imports/api/links.js +++ b/tools/static-assets/skel-react/imports/api/links.js @@ -1,3 +1,3 @@ import { Mongo } from 'meteor/mongo'; -export default Links = new Mongo.Collection('links'); +export default new Mongo.Collection('links'); diff --git a/tools/static-assets/skel-typescript/.gitignore b/tools/static-assets/skel-typescript/.gitignore new file mode 100644 index 0000000000..c2658d7d1b --- /dev/null +++ b/tools/static-assets/skel-typescript/.gitignore @@ -0,0 +1 @@ +node_modules/ diff --git a/tools/static-assets/skel-typescript/.meteor/.gitignore b/tools/static-assets/skel-typescript/.meteor/.gitignore new file mode 100644 index 0000000000..4083037423 --- /dev/null +++ b/tools/static-assets/skel-typescript/.meteor/.gitignore @@ -0,0 +1 @@ +local diff --git a/tools/static-assets/skel-typescript/.meteor/packages b/tools/static-assets/skel-typescript/.meteor/packages new file mode 100644 index 0000000000..3319ee0005 --- /dev/null +++ b/tools/static-assets/skel-typescript/.meteor/packages @@ -0,0 +1,22 @@ +# Meteor packages used by this project, one per line. +# Check this file (and the other files in this directory) into your repository. +# +# 'meteor add' and 'meteor remove' will edit this file for you, +# but you can also edit it by hand. + +meteor-base # Packages every Meteor app needs to have +mobile-experience # Packages for a great mobile UX +mongo # The database Meteor supports right now +reactive-var # Reactive variable for tracker + +standard-minifier-css # CSS minifier run for production mode +standard-minifier-js # JS minifier run for production mode +es5-shim # ECMAScript 5 compatibility for older browsers +ecmascript # Enable ECMAScript2015+ syntax in app code +typescript # Enable TypeScript syntax in .ts and .tsx modules +shell-server # Server-side component of the `meteor shell` command + +autopublish # Publish all data to the clients (for prototyping) +insecure # Allow all DB writes from clients (for prototyping) +static-html # Define static page content in .html files +react-meteor-data # React higher-order component for reactively tracking Meteor data diff --git a/tools/static-assets/skel-typescript/.meteor/platforms b/tools/static-assets/skel-typescript/.meteor/platforms new file mode 100644 index 0000000000..efeba1b50c --- /dev/null +++ b/tools/static-assets/skel-typescript/.meteor/platforms @@ -0,0 +1,2 @@ +server +browser diff --git a/tools/static-assets/skel-typescript/client/main.css b/tools/static-assets/skel-typescript/client/main.css new file mode 100644 index 0000000000..7f354f0fa7 --- /dev/null +++ b/tools/static-assets/skel-typescript/client/main.css @@ -0,0 +1,4 @@ +body { + padding: 10px; + font-family: sans-serif; +} diff --git a/tools/static-assets/skel-typescript/client/main.html b/tools/static-assets/skel-typescript/client/main.html new file mode 100644 index 0000000000..27c3712e54 --- /dev/null +++ b/tools/static-assets/skel-typescript/client/main.html @@ -0,0 +1,7 @@ + + ~name~ + + + +
+ diff --git a/tools/static-assets/skel-typescript/client/main.tsx b/tools/static-assets/skel-typescript/client/main.tsx new file mode 100644 index 0000000000..e3b8986233 --- /dev/null +++ b/tools/static-assets/skel-typescript/client/main.tsx @@ -0,0 +1,8 @@ +import React from 'react'; +import { Meteor } from 'meteor/meteor'; +import { render } from 'react-dom'; +import App from '/imports/ui/App' + +Meteor.startup(() => { + render(, document.getElementById('react-target')); +}); diff --git a/tools/static-assets/skel-typescript/imports/api/links.ts b/tools/static-assets/skel-typescript/imports/api/links.ts new file mode 100644 index 0000000000..f426a971d4 --- /dev/null +++ b/tools/static-assets/skel-typescript/imports/api/links.ts @@ -0,0 +1,10 @@ +import { Mongo } from 'meteor/mongo'; + +export interface Link { + _id?: string; + title: string; + url: string; + createdAt: Date; +} + +export const Links = new Mongo.Collection('links'); diff --git a/tools/static-assets/skel-typescript/imports/ui/App.tsx b/tools/static-assets/skel-typescript/imports/ui/App.tsx new file mode 100644 index 0000000000..e28430f56a --- /dev/null +++ b/tools/static-assets/skel-typescript/imports/ui/App.tsx @@ -0,0 +1,11 @@ +import React from 'react'; +import Hello from './Hello'; +import Info from './Info'; + +export default () => ( +
+

Welcome to Meteor!

+ + +
+); diff --git a/tools/static-assets/skel-typescript/imports/ui/Hello.tsx b/tools/static-assets/skel-typescript/imports/ui/Hello.tsx new file mode 100644 index 0000000000..a717944c0c --- /dev/null +++ b/tools/static-assets/skel-typescript/imports/ui/Hello.tsx @@ -0,0 +1,22 @@ +import React from 'react'; + +export default class Hello extends React.Component { + state = { + counter: 0, + } + + increment() { + this.setState({ + counter: this.state.counter + 1 + }); + } + + render() { + return ( +
+ +

You've pressed the button {this.state.counter} times.

+
+ ); + } +} diff --git a/tools/static-assets/skel-typescript/imports/ui/Info.tsx b/tools/static-assets/skel-typescript/imports/ui/Info.tsx new file mode 100644 index 0000000000..098df948ac --- /dev/null +++ b/tools/static-assets/skel-typescript/imports/ui/Info.tsx @@ -0,0 +1,34 @@ +import React from 'react'; +import { withTracker } from 'meteor/react-meteor-data'; +import { Links, Link } from '../api/links'; + +class Info extends React.Component<{ + links: Link[]; +}> { + render() { + const links = this.props.links.map( + link => this.makeLink(link) + ); + + return ( +
+

Learn Meteor!

+
    { links }
+
+ ); + } + + makeLink(link: Link) { + return ( +
  • + {link.title} +
    • + ); + } +} + +export default withTracker(() => { + return { + links: Links.find().fetch(), + }; +})(Info); diff --git a/tools/static-assets/skel-typescript/package.json b/tools/static-assets/skel-typescript/package.json new file mode 100644 index 0000000000..4fb03a4b66 --- /dev/null +++ b/tools/static-assets/skel-typescript/package.json @@ -0,0 +1,29 @@ +{ + "name": "~name~", + "private": true, + "scripts": { + "start": "meteor run", + "test": "meteor test --once --driver-package meteortesting:mocha", + "test-app": "TEST_WATCH=1 meteor test --full-app --driver-package meteortesting:mocha", + "visualize": "meteor --production --extra-packages bundle-visualizer" + }, + "dependencies": { + "@babel/runtime": "^7.6.0", + "meteor-node-stubs": "^1.0.0", + "react": "^16.9.0", + "react-dom": "^16.9.0" + }, + "devDependencies": { + "@types/meteor": "^1.4.30", + "@types/mocha": "^5.2.7", + "@types/react": "^16.9.0", + "@types/react-dom": "^16.9.0" + }, + "meteor": { + "mainModule": { + "client": "client/main.tsx", + "server": "server/main.ts" + }, + "testModule": "tests/main.ts" + } +} diff --git a/tools/static-assets/skel-typescript/server/main.ts b/tools/static-assets/skel-typescript/server/main.ts new file mode 100644 index 0000000000..9f8cf7abcc --- /dev/null +++ b/tools/static-assets/skel-typescript/server/main.ts @@ -0,0 +1,31 @@ +import { Meteor } from 'meteor/meteor'; +import { Links } from '/imports/api/links'; + +function insertLink(title: string, url: string) { + Links.insert({ title, url, createdAt: new Date() }); +} + +Meteor.startup(() => { + // If the Links collection is empty, add some data. + if (Links.find().count() === 0) { + insertLink( + 'Do the Tutorial', + 'https://www.meteor.com/tutorials/react/creating-an-app' + ); + + insertLink( + 'Follow the Guide', + 'http://guide.meteor.com' + ); + + insertLink( + 'Read the Docs', + 'https://docs.meteor.com' + ); + + insertLink( + 'Discussions', + 'https://forums.meteor.com' + ); + } +}); diff --git a/tools/static-assets/skel-typescript/tests/main.ts b/tools/static-assets/skel-typescript/tests/main.ts new file mode 100644 index 0000000000..7c3722128b --- /dev/null +++ b/tools/static-assets/skel-typescript/tests/main.ts @@ -0,0 +1,21 @@ +import { Meteor } from 'meteor/meteor'; +import assert from 'assert'; + +describe('~name~', function () { + it('package.json has correct name', async function () { + const { name } = await import('../package.json'); + assert.strictEqual(name, '~name~'); + }); + + if (Meteor.isClient) { + it('client is not server', function () { + assert.strictEqual(Meteor.isServer, false); + }); + } + + if (Meteor.isServer) { + it('server is not client', function () { + assert.strictEqual(Meteor.isClient, false); + }); + } +}); diff --git a/tools/static-assets/skel-typescript/tsconfig.json b/tools/static-assets/skel-typescript/tsconfig.json new file mode 100644 index 0000000000..4be740cec2 --- /dev/null +++ b/tools/static-assets/skel-typescript/tsconfig.json @@ -0,0 +1,40 @@ +{ + "compilerOptions": { + /* Basic Options */ + "target": "es2018", + "module": "esNext", + "lib": ["esnext", "dom"], + "allowJs": true, + "checkJs": false, + "jsx": "preserve", + "incremental": true, + "noEmit": true, + + /* Strict Type-Checking Options */ + "strict": true, + "noImplicitAny": true, + "strictNullChecks": true, + + /* Additional Checks */ + "noUnusedLocals": true, + "noUnusedParameters": true, + "noImplicitReturns": false, + "noFallthroughCasesInSwitch": false, + + /* Module Resolution Options */ + "baseUrl": ".", + "paths": { + /* Support absolute /imports/* with a leading '/' */ + "/*": ["*"] + }, + "moduleResolution": "node", + "resolveJsonModule": true, + "types": ["node", "mocha"], + "esModuleInterop": true, + "preserveSymlinks": true + }, + "exclude": [ + "./.meteor/**", + "./packages/**" + ] +} diff --git a/tools/tsconfig.json b/tools/tsconfig.json index 668d91e71b..ce0a729ba8 100644 --- a/tools/tsconfig.json +++ b/tools/tsconfig.json @@ -6,6 +6,7 @@ "lib": ["esnext"], "allowJs": true, "checkJs": false, + "jsx": "preserve", "incremental": true, "noEmit": true, From ee62fd419e052989d0fa64f343aa149f39b981f9 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Thu, 19 Sep 2019 09:41:23 -0400 Subject: [PATCH 08/14] Mention TypeScript support and skeleton app in History.md. --- History.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/History.md b/History.md index a8a2a93ce6..4151d99d9d 100644 --- a/History.md +++ b/History.md @@ -28,6 +28,19 @@ N/A [fork](https://github.com/meteor/pacote/tree/v9.5.8-meteor) of its `pacote` dependency has been updated to version 9.5.8. +* New Meteor applications now include an official `typescript` package, + supporting TypeScript compilation of `.ts` and `.tsx` modules, which can + be added to existing apps by running `meteor add typescript`. + +* New TypeScript-based Meteor applications can be created by running + ```sh + meteor create --typescript new-typescript-app + ``` + This app skeleton contains a recommended tsconfig.json file, and should + serve as a reference for how to make TypeScript and Meteor work together + (to the best of our current knowledge). + [PR #10695](https://github.com/meteor/meteor/pull/10695) + * When bundling client code, the Meteor module system now prefers the `"module"` field in `package.json`, if defined. [PR #10541](https://github.com/meteor/meteor/pull/10541) From 63bb2cbac63411c9dd2938896d4f9086deef8906 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Thu, 19 Sep 2019 10:12:48 -0400 Subject: [PATCH 09/14] Invalidate AppVeyor .babel-cache cache when BUNDLE_VERSION changes. --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 28290ec4c6..7c1ca47fdd 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -43,5 +43,5 @@ on_failure: cache: - dev_bundle -> meteor - - .babel-cache + - .babel-cache -> meteor - .meteor From c61c75b0e8a9ad8956a0593c0d22406ac16f1cb1 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Thu, 19 Sep 2019 10:46:23 -0400 Subject: [PATCH 10/14] Include checksum of meteor script in .babel-cache CircleCI cache key. --- .circleci/config.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7dfe7f968c..eae8da0cea 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -128,8 +128,9 @@ jobs: - package-npm-deps-cache-group2-v3- - restore_cache: keys: - - v2-other-deps-cache-{{ .Branch }}-{{ .Revision }} - - v2-other-deps-cache-{{ .Branch }}- + - v3-other-deps-cache-{{ .Branch }}-{{ checksum "meteor" }}-{{ .Revision }} + - v3-other-deps-cache-{{ .Branch }}-{{ checksum "meteor" }}- + - v3-other-deps-cache-{{ .Branch }}- - restore_cache: keys: - v1-test-groups-{{ .Branch }} @@ -768,7 +769,7 @@ jobs: - packages/fetch/.npm/package/node_modules - packages/non-core/mongo-decimal/.npm/package/node_modules - save_cache: - key: v2-other-deps-cache-{{ .Branch }}-{{ .Revision }} + key: v3-other-deps-cache-{{ .Branch }}-{{ checksum "meteor" }}-{{ .Revision }} paths: - ".babel-cache" - ".meteor" From de01ab1a09b8bb069071167a2b5407db3f8636cd Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Wed, 18 Sep 2019 16:11:42 -0400 Subject: [PATCH 11/14] Pass tsconfig.json path to meteor-babel via features.typescript. This information is not used by meteor-babel, yet, but it will become important as Meteor's TypeScript support begins to honor tsconfig.json. --- packages/babel-compiler/babel-compiler.js | 35 +++++++++++++++++------ 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js index f93790fc18..b88abe5a30 100644 --- a/packages/babel-compiler/babel-compiler.js +++ b/packages/babel-compiler/babel-compiler.js @@ -79,22 +79,22 @@ BCp.processOneFileForTarget = function (inputFile, source) { // compilation, give it the following file extension: .es5.js ! excludedFileExtensionPattern.test(inputFilePath)) { - const extraFeatures = { ...this.extraFeatures }; + const features = { ...this.extraFeatures }; const arch = inputFile.getArch(); if (arch.startsWith("os.")) { // Start with a much simpler set of Babel presets and plugins if // we're compiling for Node 8. - extraFeatures.nodeMajorVersion = parseInt(process.versions.node, 10); + features.nodeMajorVersion = parseInt(process.versions.node, 10); } else if (arch === "web.browser") { - extraFeatures.modernBrowsers = true; + features.modernBrowsers = true; } - if (! extraFeatures.hasOwnProperty("jscript")) { + if (! features.hasOwnProperty("jscript")) { // Perform some additional transformations to improve compatibility // in older browsers (e.g. wrapping named function expressions, per // http://kiro.me/blog/nfe_dilemma.html). - extraFeatures.jscript = true; + features.jscript = true; } if (shouldCompileModulesOnly(inputFilePath)) { @@ -102,12 +102,9 @@ BCp.processOneFileForTarget = function (inputFile, source) { // compiled to support ECMAScript modules syntax, but should *not* // be compiled in any other way (for more explanation, see my longer // comment in shouldCompileModulesOnly). - extraFeatures.compileModulesOnly = true; + features.compileModulesOnly = true; } - var babelOptions = Babel.getDefaultOptions(extraFeatures); - babelOptions.caller = { name: "meteor", arch }; - const cacheOptions = { cacheDirectory: this.cacheDirectory, cacheDeps: { @@ -115,6 +112,12 @@ BCp.processOneFileForTarget = function (inputFile, source) { }, }; + this.inferTypeScriptConfig( + features, inputFile, cacheOptions.cacheDeps); + + var babelOptions = Babel.getDefaultOptions(features); + babelOptions.caller = { name: "meteor", arch }; + this.inferExtraBabelOptions( inputFile, babelOptions, @@ -212,6 +215,20 @@ function profile(name, func) { } }; +BCp.inferTypeScriptConfig = function (features, inputFile, cacheDeps) { + if (features.typescript && inputFile.findControlFile) { + const tsconfigPath = inputFile.findControlFile("tsconfig.json"); + if (tsconfigPath) { + if (typeof features.typescript !== "object") { + features.typescript = Object.create(null); + } + Object.assign(features.typescript, { tsconfigPath }); + return true; + } + } + return false; +}; + BCp.inferExtraBabelOptions = function (inputFile, babelOptions, cacheDeps) { if (! inputFile.require || ! inputFile.findControlFile || From 6c3ce7baa6201d01534e6827d6f23fd6cc445abd Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Thu, 19 Sep 2019 10:46:59 -0400 Subject: [PATCH 12/14] Update terser minifier to version 4.3.1. --- History.md | 3 +++ .../.npm/package/npm-shrinkwrap.json | 18 +++++++++--------- packages/minifier-js/package.js | 4 ++-- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/History.md b/History.md index 4151d99d9d..b236fb7048 100644 --- a/History.md +++ b/History.md @@ -77,6 +77,9 @@ N/A * The `core-js` npm package used by `ecmascript-runtime-client` and `ecmascript-runtime-server` has been updated to version 3.1.4. +* The `terser` npm package used by `minifier-js` (and indirectly by + `standard-minifier-js`) has been updated to version 4.3.1. + * The `node-gyp` npm package has been updated to version 5.0.1, and `node-pre-gyp` has been updated to 0.13.0. diff --git a/packages/minifier-js/.npm/package/npm-shrinkwrap.json b/packages/minifier-js/.npm/package/npm-shrinkwrap.json index eec2ad9379..30e274a698 100644 --- a/packages/minifier-js/.npm/package/npm-shrinkwrap.json +++ b/packages/minifier-js/.npm/package/npm-shrinkwrap.json @@ -7,9 +7,9 @@ "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==" }, "commander": { - "version": "2.17.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz", - "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==" + "version": "2.20.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz", + "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==" }, "source-map": { "version": "0.6.1", @@ -17,14 +17,14 @@ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" }, "source-map-support": { - "version": "0.5.10", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.10.tgz", - "integrity": "sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ==" + "version": "0.5.13", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz", + "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==" }, "terser": { - "version": "3.16.1", - "resolved": "https://registry.npmjs.org/terser/-/terser-3.16.1.tgz", - "integrity": "sha512-JDJjgleBROeek2iBcSNzOHLKsB/MdDf+E/BOAJ0Tk9r7p9/fVobfv7LMJ/g/k3v9SXdmjZnIlFd5nfn/Rt0Xow==" + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/terser/-/terser-4.3.1.tgz", + "integrity": "sha512-pnzH6dnFEsR2aa2SJaKb1uSCl3QmIsJ8dEkj0Fky+2AwMMcC9doMqLOQIH6wVTEKaVfKVvLSk5qxPBEZT9mywg==" } } } diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js index e6c8fab292..1f7721c178 100644 --- a/packages/minifier-js/package.js +++ b/packages/minifier-js/package.js @@ -1,10 +1,10 @@ Package.describe({ summary: "JavaScript minifier", - version: "2.4.1" + version: "2.5.0" }); Npm.depends({ - terser: "3.16.1" + terser: "4.3.1" }); Package.onUse(function (api) { From 810c8ea89bfaacd52867275f3aaacdd102f305f6 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Thu, 19 Sep 2019 11:01:17 -0400 Subject: [PATCH 13/14] Update core-js to version 3.2.1. --- History.md | 2 +- .../.npm/package/npm-shrinkwrap.json | 6 +++--- packages/ecmascript-runtime-client/package.js | 2 +- .../.npm/package/npm-shrinkwrap.json | 6 +++--- packages/ecmascript-runtime-server/package.js | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/History.md b/History.md index b236fb7048..728a2639be 100644 --- a/History.md +++ b/History.md @@ -75,7 +75,7 @@ N/A * The `reify` npm package has been updated to version 0.20.12. * The `core-js` npm package used by `ecmascript-runtime-client` and - `ecmascript-runtime-server` has been updated to version 3.1.4. + `ecmascript-runtime-server` has been updated to version 3.2.1. * The `terser` npm package used by `minifier-js` (and indirectly by `standard-minifier-js`) has been updated to version 4.3.1. diff --git a/packages/ecmascript-runtime-client/.npm/package/npm-shrinkwrap.json b/packages/ecmascript-runtime-client/.npm/package/npm-shrinkwrap.json index 79e8c3e339..c5366d30b1 100644 --- a/packages/ecmascript-runtime-client/.npm/package/npm-shrinkwrap.json +++ b/packages/ecmascript-runtime-client/.npm/package/npm-shrinkwrap.json @@ -2,9 +2,9 @@ "lockfileVersion": 1, "dependencies": { "core-js": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.1.4.tgz", - "integrity": "sha512-YNZN8lt82XIMLnLirj9MhKDFZHalwzzrL9YLt6eb0T5D0EDl4IQ90IGkua8mHbnxNrkj1d8hbdizMc0Qmg1WnQ==" + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.2.1.tgz", + "integrity": "sha512-Qa5XSVefSVPRxy2XfUC13WbvqkxhkwB3ve+pgCQveNgYzbM/UxZeu1dcOX/xr4UmfUd+muuvsaxilQzCyUurMw==" } } } diff --git a/packages/ecmascript-runtime-client/package.js b/packages/ecmascript-runtime-client/package.js index da6effe196..19e8dd569f 100644 --- a/packages/ecmascript-runtime-client/package.js +++ b/packages/ecmascript-runtime-client/package.js @@ -7,7 +7,7 @@ Package.describe({ }); Npm.depends({ - "core-js": "3.1.4" + "core-js": "3.2.1" }); Package.onUse(function(api) { diff --git a/packages/ecmascript-runtime-server/.npm/package/npm-shrinkwrap.json b/packages/ecmascript-runtime-server/.npm/package/npm-shrinkwrap.json index 79e8c3e339..c5366d30b1 100644 --- a/packages/ecmascript-runtime-server/.npm/package/npm-shrinkwrap.json +++ b/packages/ecmascript-runtime-server/.npm/package/npm-shrinkwrap.json @@ -2,9 +2,9 @@ "lockfileVersion": 1, "dependencies": { "core-js": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.1.4.tgz", - "integrity": "sha512-YNZN8lt82XIMLnLirj9MhKDFZHalwzzrL9YLt6eb0T5D0EDl4IQ90IGkua8mHbnxNrkj1d8hbdizMc0Qmg1WnQ==" + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.2.1.tgz", + "integrity": "sha512-Qa5XSVefSVPRxy2XfUC13WbvqkxhkwB3ve+pgCQveNgYzbM/UxZeu1dcOX/xr4UmfUd+muuvsaxilQzCyUurMw==" } } } diff --git a/packages/ecmascript-runtime-server/package.js b/packages/ecmascript-runtime-server/package.js index 693622d03e..fa722b8458 100644 --- a/packages/ecmascript-runtime-server/package.js +++ b/packages/ecmascript-runtime-server/package.js @@ -7,7 +7,7 @@ Package.describe({ }); Npm.depends({ - "core-js": "3.1.4" + "core-js": "3.2.1" }); Package.onUse(function(api) { From e94739f7e8adee41e7e5aa8fc0a466ddece5472f Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Thu, 19 Sep 2019 11:06:18 -0400 Subject: [PATCH 14/14] Bump package versions for 1.8.2-rc.0 release. :tada: --- packages/babel-compiler/package.js | 2 +- packages/babel-runtime/package.js | 2 +- packages/context/package.js | 2 +- packages/ecmascript-runtime-client/package.js | 2 +- packages/ecmascript-runtime-server/package.js | 2 +- packages/ecmascript/package.js | 2 +- packages/meteor-tool/package.js | 2 +- packages/minifier-css/package.js | 2 +- packages/minifier-js/package.js | 2 +- packages/modules-runtime/package.js | 2 +- packages/modules/package.js | 2 +- packages/mongo/package.js | 2 +- packages/npm-mongo/package.js | 2 +- packages/standard-minifier-css/package.js | 2 +- packages/standard-minifier-js/package.js | 2 +- packages/typescript/package.js | 2 +- scripts/admin/meteor-release-experimental.json | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js index b54f4b26c8..721d7785db 100644 --- a/packages/babel-compiler/package.js +++ b/packages/babel-compiler/package.js @@ -6,7 +6,7 @@ Package.describe({ // isn't possible because you can't publish a non-recommended // release with package versions that don't have a pre-release // identifier at the end (eg, -dev) - version: '7.4.0-beta182.18' + version: '7.4.0-rc182.0' }); Npm.depends({ diff --git a/packages/babel-runtime/package.js b/packages/babel-runtime/package.js index 65805f40d9..c57f7372dd 100644 --- a/packages/babel-runtime/package.js +++ b/packages/babel-runtime/package.js @@ -1,7 +1,7 @@ Package.describe({ name: "babel-runtime", summary: "Runtime support for output of Babel transpiler", - version: '1.4.0-beta182.18', + version: '1.4.0-rc182.0', documentation: 'README.md' }); diff --git a/packages/context/package.js b/packages/context/package.js index 412cee0167..1ebd2e1fdc 100644 --- a/packages/context/package.js +++ b/packages/context/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "context", - version: "0.4.0-beta182.18", + version: "0.4.0-rc182.0", summary: "Manage contextual information without passing objects around", documentation: "README.md" }); diff --git a/packages/ecmascript-runtime-client/package.js b/packages/ecmascript-runtime-client/package.js index 19e8dd569f..ff508479f0 100644 --- a/packages/ecmascript-runtime-client/package.js +++ b/packages/ecmascript-runtime-client/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "ecmascript-runtime-client", - version: "0.9.0-beta182.18", + version: "0.9.0-rc182.0", summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set", git: "https://github.com/meteor/meteor/tree/devel/packages/ecmascript-runtime-client", documentation: "README.md" diff --git a/packages/ecmascript-runtime-server/package.js b/packages/ecmascript-runtime-server/package.js index fa722b8458..71fee4d6f9 100644 --- a/packages/ecmascript-runtime-server/package.js +++ b/packages/ecmascript-runtime-server/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "ecmascript-runtime-server", - version: "0.8.0-beta182.18", + version: "0.8.0-rc182.0", summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set", git: "https://github.com/meteor/meteor/tree/devel/packages/ecmascript-runtime-client", documentation: "README.md" diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js index 414edaf1ec..0f32b54d0a 100644 --- a/packages/ecmascript/package.js +++ b/packages/ecmascript/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'ecmascript', - version: '0.13.0-beta182.18', + version: '0.13.0-rc182.0', summary: 'Compiler plugin that supports ES2015+ in all .js files', documentation: 'README.md' }); diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js index 4adb688e32..cdbbdfe478 100644 --- a/packages/meteor-tool/package.js +++ b/packages/meteor-tool/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "The Meteor command-line tool", - version: '1.8.2-beta.18' + version: '1.8.2-rc.0' }); Package.includeTool(); diff --git a/packages/minifier-css/package.js b/packages/minifier-css/package.js index 619c9e50e1..3380cf0984 100644 --- a/packages/minifier-css/package.js +++ b/packages/minifier-css/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: 'CSS minifier', - version: '1.4.3-beta182.18' + version: '1.4.3-rc182.0' }); Npm.depends({ diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js index 1f7721c178..fa319ae271 100644 --- a/packages/minifier-js/package.js +++ b/packages/minifier-js/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "JavaScript minifier", - version: "2.5.0" + version: "2.5.0-rc182.0" }); Npm.depends({ diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js index 31c29c957c..0b653264a4 100644 --- a/packages/modules-runtime/package.js +++ b/packages/modules-runtime/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "modules-runtime", - version: "0.11.0-beta182.18", + version: "0.11.0-rc182.0", summary: "CommonJS module system", git: "https://github.com/benjamn/install", documentation: "README.md" diff --git a/packages/modules/package.js b/packages/modules/package.js index 8ccc4ba361..88de0ee2be 100644 --- a/packages/modules/package.js +++ b/packages/modules/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "modules", - version: "0.14.0-beta182.18", + version: "0.14.0-rc182.0", summary: "CommonJS module system", documentation: "README.md" }); diff --git a/packages/mongo/package.js b/packages/mongo/package.js index 72279d75f8..d35c3cb019 100644 --- a/packages/mongo/package.js +++ b/packages/mongo/package.js @@ -9,7 +9,7 @@ Package.describe({ summary: "Adaptor for using MongoDB and Minimongo over DDP", - version: '1.7.0-beta182.18' + version: '1.7.0-rc182.0' }); Npm.depends({ diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js index e0e837963f..78086dd1e6 100644 --- a/packages/npm-mongo/package.js +++ b/packages/npm-mongo/package.js @@ -3,7 +3,7 @@ Package.describe({ summary: "Wrapper around the mongo npm package", - version: "3.2.0-beta182.18", + version: "3.2.0-rc182.0", documentation: null }); diff --git a/packages/standard-minifier-css/package.js b/packages/standard-minifier-css/package.js index 4adf1ca60a..41a7952b88 100644 --- a/packages/standard-minifier-css/package.js +++ b/packages/standard-minifier-css/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'standard-minifier-css', - version: '1.5.4-beta182.18', + version: '1.5.4-rc182.0', summary: 'Standard css minifier used with Meteor apps by default.', documentation: 'README.md' }); diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js index 6f98cf77c3..0b3680082d 100644 --- a/packages/standard-minifier-js/package.js +++ b/packages/standard-minifier-js/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'standard-minifier-js', - version: '2.4.1', + version: '2.5.0-rc182.0', summary: 'Standard javascript minifiers used with Meteor apps by default.', documentation: 'README.md', }); diff --git a/packages/typescript/package.js b/packages/typescript/package.js index 5180d09219..2197102160 100644 --- a/packages/typescript/package.js +++ b/packages/typescript/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "typescript", - version: "3.6.2-beta182.18", + version: "3.6.2-rc182.0", summary: "Compiler plugin that compiles TypeScript and ECMAScript in .ts and .tsx files", documentation: "README.md" }); diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json index 459c211386..ccc4f289f0 100644 --- a/scripts/admin/meteor-release-experimental.json +++ b/scripts/admin/meteor-release-experimental.json @@ -1,6 +1,6 @@ { "track": "METEOR", - "version": "1.8.2-beta.18", + "version": "1.8.2-rc.0", "recommended": false, "official": false, "description": "Meteor"