From a40c474a67264282e3c7b3372aa642fd6377492e Mon Sep 17 00:00:00 2001 From: Pieter Vanderwerff Date: Thu, 3 Feb 2022 19:08:22 -0800 Subject: [PATCH 1/6] Deploy 0.171.0 to xplat Summary: Changelog: [Internal] Reviewed By: gkz Differential Revision: D33992472 fbshipit-source-id: 529c7d5545bbda8eb9660a461a091eeda13288df --- .flowconfig | 2 +- package.json | 2 +- yarn.lock | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.flowconfig b/.flowconfig index ff7ea2159d..c54a512ef7 100644 --- a/.flowconfig +++ b/.flowconfig @@ -39,4 +39,4 @@ untyped-import untyped-type-import [version] -^0.170.0 +^0.171.0 diff --git a/package.json b/package.json index 19e8f3eb1f..a8cb42141a 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "eslint-plugin-prettier": "^4.0.0", "eslint-plugin-react": "^7.26.1", "eslint-plugin-relay": "^1.8.2", - "flow-bin": "^0.170.0", + "flow-bin": "^0.171.0", "glob": "^7.1.1", "istanbul-api": "3.0.0", "istanbul-lib-coverage": "3.0.0", diff --git a/yarn.lock b/yarn.lock index 23eb87c032..bde0caf84d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3523,10 +3523,10 @@ flatted@^3.1.0: resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.2.tgz#64bfed5cb68fe3ca78b3eb214ad97b63bedce561" integrity sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA== -flow-bin@^0.170.0: - version "0.170.0" - resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.170.0.tgz#1da264de9868cc20a338f801bedc370e3e06f5cc" - integrity sha512-h4qy4f5loKdeLhj7TRM6XQWhmPpnfjDcOg6GPDuJnLAQuB60LJIHZ8QL3hxMf0oA++NkiYx62Vr8oHu+UZ2bGQ== +flow-bin@^0.171.0: + version "0.171.0" + resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.171.0.tgz#43902cf3ab10704a9c8a96bd16f789d92490ba1c" + integrity sha512-2HEiXAyE60ztGs+loFk6XSskL69THL6tSjzopUcbwgfrdbuZ5Jhv23qh1jUKP5AZJh0NNwxaFZ6To2p6xR+GEA== for-in@^1.0.2: version "1.0.2" From bf73ed3aa7fec15f1394fd492450163b62b6267a Mon Sep 17 00:00:00 2001 From: Andrew Goodale Date: Mon, 7 Feb 2022 09:44:49 -0800 Subject: [PATCH 2/6] RN preset: support async iterators, for await of (#747) Summary: **Summary** Async Generators and `for await` are part of ES2018. This PR adds `plugin-proposal-async-generator-functions` to the react native preset. See https://babeljs.io/docs/en/babel-plugin-proposal-async-generator-functions Fixes https://github.com/facebook/metro/issues/551 **Test plan** I added a test `transforms async generators` to `index-test.js`. Pull Request resolved: https://github.com/facebook/metro/pull/747 Reviewed By: motiz88 Differential Revision: D33621536 Pulled By: rh389 fbshipit-source-id: 0e07e6132e894fb5ad455627c2a33674f904a2fc --- .../package.json | 1 + .../src/configs/main.js | 11 ++++- .../__snapshots__/index-test.js.snap | 40 +++++++++++++++++++ .../src/__tests__/index-test.js | 33 +++++++++++++++ yarn.lock | 9 +++++ 5 files changed, 92 insertions(+), 2 deletions(-) diff --git a/packages/metro-react-native-babel-preset/package.json b/packages/metro-react-native-babel-preset/package.json index 038c21250d..7749317845 100644 --- a/packages/metro-react-native-babel-preset/package.json +++ b/packages/metro-react-native-babel-preset/package.json @@ -19,6 +19,7 @@ "license": "MIT", "dependencies": { "@babel/core": "^7.14.0", + "@babel/plugin-proposal-async-generator-functions": "^7.0.0", "@babel/plugin-proposal-class-properties": "^7.0.0", "@babel/plugin-proposal-export-default-from": "^7.0.0", "@babel/plugin-proposal-nullish-coalescing-operator": "^7.0.0", diff --git a/packages/metro-react-native-babel-preset/src/configs/main.js b/packages/metro-react-native-babel-preset/src/configs/main.js index 4e568dacd9..2ab1f5fea3 100644 --- a/packages/metro-react-native-babel-preset/src/configs/main.js +++ b/packages/metro-react-native-babel-preset/src/configs/main.js @@ -114,8 +114,15 @@ const getPreset = (src, options) => { {loose: true}, // dont 'a'.concat('b'), just use 'a'+'b' ]); } - if (isHermes && (isNull || src.indexOf('async') !== -1)) { - extraPlugins.push([require('@babel/plugin-transform-async-to-generator')]); + if (isNull || src.indexOf('async') !== -1) { + extraPlugins.push([ + require('@babel/plugin-proposal-async-generator-functions'), + ]); + if (isHermes) { + extraPlugins.push([ + require('@babel/plugin-transform-async-to-generator'), + ]); + } } if (!isHermes && (isNull || src.indexOf('**') !== -1)) { extraPlugins.push([ diff --git a/packages/metro-transform-worker/src/__tests__/__snapshots__/index-test.js.snap b/packages/metro-transform-worker/src/__tests__/__snapshots__/index-test.js.snap index 9f785abcbe..1791a8c1a8 100644 --- a/packages/metro-transform-worker/src/__tests__/__snapshots__/index-test.js.snap +++ b/packages/metro-transform-worker/src/__tests__/__snapshots__/index-test.js.snap @@ -272,6 +272,46 @@ Object { } `; +exports[`transforms async generators 1`] = ` +"__d(function (global, _$$_REQUIRE, _$$_IMPORT_DEFAULT, _$$_IMPORT_ALL, module, exports, _dependencyMap) { + var _interopRequireDefault = _$$_REQUIRE(_dependencyMap[0], \\"@babel/runtime/helpers/interopRequireDefault\\"); + + Object.defineProperty(exports, \\"__esModule\\", { + value: true + }); + exports.test = test; + + var _regenerator = _interopRequireDefault(_$$_REQUIRE(_dependencyMap[1], \\"@babel/runtime/regenerator\\")); + + var _awaitAsyncGenerator2 = _interopRequireDefault(_$$_REQUIRE(_dependencyMap[2], \\"@babel/runtime/helpers/awaitAsyncGenerator\\")); + + var _wrapAsyncGenerator2 = _interopRequireDefault(_$$_REQUIRE(_dependencyMap[3], \\"@babel/runtime/helpers/wrapAsyncGenerator\\")); + + function test() { + return _test.apply(this, arguments); + } + + function _test() { + _test = (0, _wrapAsyncGenerator2.default)(_regenerator.default.mark(function _callee() { + return _regenerator.default.wrap(function _callee$(_context) { + while (1) { + switch (_context.prev = _context.next) { + case 0: + _context.next = 2; + return \\"ok\\"; + + case 2: + case \\"end\\": + return _context.stop(); + } + } + }, _callee); + })); + return _test.apply(this, arguments); + } +});" +`; + exports[`transforms import/export syntax when experimental flag is on 1`] = ` Array [ Array [ diff --git a/packages/metro-transform-worker/src/__tests__/index-test.js b/packages/metro-transform-worker/src/__tests__/index-test.js index ddc13e82b5..feed5e725f 100644 --- a/packages/metro-transform-worker/src/__tests__/index-test.js +++ b/packages/metro-transform-worker/src/__tests__/index-test.js @@ -211,6 +211,39 @@ it('transforms an es module with regenerator', async () => { ]); }); +it('transforms async generators', async () => { + const result = await Transformer.transform( + baseConfig, + '/root', + 'local/file.js', + 'export async function* test() { yield "ok"; }', + { + dev: true, + type: 'module', + }, + ); + + expect(result.output[0].data.code).toMatchSnapshot(); + expect(result.dependencies).toEqual([ + { + data: expect.objectContaining({asyncType: null}), + name: '@babel/runtime/helpers/interopRequireDefault', + }, + { + data: expect.objectContaining({asyncType: null}), + name: '@babel/runtime/regenerator', + }, + { + data: expect.objectContaining({asyncType: null}), + name: '@babel/runtime/helpers/awaitAsyncGenerator', + }, + { + data: expect.objectContaining({asyncType: null}), + name: '@babel/runtime/helpers/wrapAsyncGenerator', + }, + ]); +}); + it('transforms import/export syntax when experimental flag is on', async () => { const contents = ['import c from "./c";'].join('\n'); diff --git a/yarn.lock b/yarn.lock index bde0caf84d..a501f9856e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -383,6 +383,15 @@ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.15.7.tgz#0c3ed4a2eb07b165dfa85b3cc45c727334c4edae" integrity sha512-rycZXvQ+xS9QyIcJ9HXeDWf1uxqlbVFAUq0Rq0dbc50Zb/+wUe/ehyfzGfm9KZZF0kBejYgxltBXocP+gKdL2g== +"@babel/plugin-proposal-async-generator-functions@^7.0.0": + version "7.13.15" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.13.15.tgz#80e549df273a3b3050431b148c892491df1bcc5b" + integrity sha512-VapibkWzFeoa6ubXy/NgV5U2U4MVnUlvnx6wo1XhlsaTrLYWE0UFpDQsVrmn22q5CzeloqJ8gEMHSKxuee6ZdA== + dependencies: + "@babel/helper-plugin-utils" "^7.13.0" + "@babel/helper-remap-async-to-generator" "^7.13.0" + "@babel/plugin-syntax-async-generators" "^7.8.4" + "@babel/plugin-proposal-class-properties@^7.0.0": version "7.13.0" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.13.0.tgz#146376000b94efd001e57a40a88a525afaab9f37" From 02baeb6dac4621588baa02f6db9597af4f9daf2a Mon Sep 17 00:00:00 2001 From: Rob Hogan Date: Wed, 9 Feb 2022 04:48:05 -0800 Subject: [PATCH 3/6] Change github actions trigger to use `main` branch (#769) Summary: This hasn't been updated since we renamed from `master`, and resulted in deploy not triggering. Pull Request resolved: https://github.com/facebook/metro/pull/769 Reviewed By: motiz88 Differential Revision: D34106356 Pulled By: rh389 fbshipit-source-id: ad880d0d95653ec366265c2616ef920770f85732 --- .github/workflows/deploy-website.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-website.yml b/.github/workflows/deploy-website.yml index b4e6668530..c84ac64cf1 100644 --- a/.github/workflows/deploy-website.yml +++ b/.github/workflows/deploy-website.yml @@ -3,7 +3,7 @@ name: Deploy on: push: branches: - - "master" + - "main" paths: - "docs/**" - "website/**" From fbe26fd9294bece80415e7ca669eb2a46747ad79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Vannicatte?= Date: Wed, 9 Feb 2022 05:29:44 -0800 Subject: [PATCH 4/6] fix(website): add Algolia search API key (#726) Summary: **Summary** This PR update the docusaurus config to expose the Algolia search API key. _note: Algolia search API keys can be disclosed publicly_ **Motivation** Search does not work on the production website. **Test plan** - `cd website` - `yarn start` - Search Pull Request resolved: https://github.com/facebook/metro/pull/726 Reviewed By: motiz88 Differential Revision: D34105655 Pulled By: rh389 fbshipit-source-id: 6a9fda7e92ff27ddbf5212cca72c138ec3672f56 --- website/docusaurus.config.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/website/docusaurus.config.js b/website/docusaurus.config.js index 1db710835f..0b73a6a4c0 100644 --- a/website/docusaurus.config.js +++ b/website/docusaurus.config.js @@ -94,7 +94,8 @@ const siteConfig = { }, image: 'img/opengraph.png', algolia: { - apiKey: process.env.ALGOLIA_METRO_API_KEY || ' ', + apiKey: 'd51e7fbd21ccab3db4c83f0f736f6a3a', + appId: 'T38HJZTD87', indexName: 'metro', }, gtag: { From c84b533643f89daa87bb6844cc0950ae84334cf3 Mon Sep 17 00:00:00 2001 From: Rob Hogan Date: Wed, 9 Feb 2022 06:21:57 -0800 Subject: [PATCH 5/6] Publish 0.68.0 Summary: Bumping from 0.67.0 -> 0.68.0. Reviewed By: motiz88 Differential Revision: D34105376 fbshipit-source-id: 327cb4265c9934e8bcb6c82393839756a6914f62 --- lerna.json | 2 +- packages/buck-worker-tool/package.json | 4 +- packages/metro-babel-register/package.json | 2 +- packages/metro-babel-transformer/package.json | 4 +- packages/metro-cache-key/package.json | 4 +- packages/metro-cache/package.json | 6 +-- packages/metro-config/package.json | 10 ++--- packages/metro-core/package.json | 4 +- packages/metro-hermes-compiler/package.json | 2 +- packages/metro-inspector-proxy/package.json | 2 +- packages/metro-memory-fs/package.json | 2 +- packages/metro-minify-terser/package.json | 2 +- packages/metro-minify-uglify/package.json | 2 +- .../package.json | 2 +- .../package.json | 8 ++-- packages/metro-resolver/package.json | 2 +- packages/metro-runtime/package.json | 2 +- packages/metro-source-map/package.json | 6 +-- packages/metro-symbolicate/package.json | 4 +- packages/metro-transform-plugins/package.json | 4 +- packages/metro-transform-worker/package.json | 22 +++++------ packages/metro/package.json | 38 +++++++++---------- packages/ob1/package.json | 2 +- 23 files changed, 68 insertions(+), 68 deletions(-) diff --git a/lerna.json b/lerna.json index a1daf4e52b..dbab88195c 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "2.4.0", - "version": "0.67.0", + "version": "0.68.0", "npmClient": "yarn", "useWorkspaces": true } diff --git a/packages/buck-worker-tool/package.json b/packages/buck-worker-tool/package.json index 28360f1d10..ca12b8e156 100644 --- a/packages/buck-worker-tool/package.json +++ b/packages/buck-worker-tool/package.json @@ -1,6 +1,6 @@ { "name": "buck-worker-tool", - "version": "0.67.0", + "version": "0.68.0", "description": "Implementation of the Buck worker protocol for Node.js.", "license": "MIT", "main": "src/worker-tool.js", @@ -12,7 +12,7 @@ "temp": "^0.8.3" }, "devDependencies": { - "metro-memory-fs": "0.67.0", + "metro-memory-fs": "0.68.0", "mkdirp": "^0.5.1" }, "scripts": { diff --git a/packages/metro-babel-register/package.json b/packages/metro-babel-register/package.json index 351935e534..960de033f8 100644 --- a/packages/metro-babel-register/package.json +++ b/packages/metro-babel-register/package.json @@ -1,6 +1,6 @@ { "name": "metro-babel-register", - "version": "0.67.0", + "version": "0.68.0", "description": "🚇 babel/register configuration for Metro.", "main": "src/babel-register.js", "repository": { diff --git a/packages/metro-babel-transformer/package.json b/packages/metro-babel-transformer/package.json index 339534c366..287542f618 100644 --- a/packages/metro-babel-transformer/package.json +++ b/packages/metro-babel-transformer/package.json @@ -1,6 +1,6 @@ { "name": "metro-babel-transformer", - "version": "0.67.0", + "version": "0.68.0", "description": "🚇 Base Babel transformer for Metro.", "main": "src/index.js", "repository": { @@ -19,7 +19,7 @@ "dependencies": { "@babel/core": "^7.14.0", "hermes-parser": "0.5.0", - "metro-source-map": "0.67.0", + "metro-source-map": "0.68.0", "nullthrows": "^1.1.1" } } diff --git a/packages/metro-cache-key/package.json b/packages/metro-cache-key/package.json index 94de016c87..f6ba2d4163 100644 --- a/packages/metro-cache-key/package.json +++ b/packages/metro-cache-key/package.json @@ -1,6 +1,6 @@ { "name": "metro-cache-key", - "version": "0.67.0", + "version": "0.68.0", "description": "🚇 Cache key utility.", "main": "src/index.js", "repository": { @@ -13,6 +13,6 @@ }, "license": "MIT", "devDependencies": { - "metro-memory-fs": "0.67.0" + "metro-memory-fs": "0.68.0" } } diff --git a/packages/metro-cache/package.json b/packages/metro-cache/package.json index 9103cac7ee..0f6217afaa 100644 --- a/packages/metro-cache/package.json +++ b/packages/metro-cache/package.json @@ -1,6 +1,6 @@ { "name": "metro-cache", - "version": "0.67.0", + "version": "0.68.0", "description": "🚇 Cache layers for Metro.", "main": "src/index.js", "repository": { @@ -12,12 +12,12 @@ "cleanup-release": "test ! -e build && mv src build && mv src.real src" }, "dependencies": { - "metro-core": "0.67.0", + "metro-core": "0.68.0", "mkdirp": "^0.5.1", "rimraf": "^2.5.4" }, "devDependencies": { - "metro-memory-fs": "0.67.0" + "metro-memory-fs": "0.68.0" }, "license": "MIT" } diff --git a/packages/metro-config/package.json b/packages/metro-config/package.json index a7d9c1f608..b8997825d6 100644 --- a/packages/metro-config/package.json +++ b/packages/metro-config/package.json @@ -1,6 +1,6 @@ { "name": "metro-config", - "version": "0.67.0", + "version": "0.68.0", "description": "🚇 Config parser for Metro.", "main": "src/index.js", "repository": { @@ -15,10 +15,10 @@ "dependencies": { "cosmiconfig": "^5.0.5", "jest-validate": "^26.5.2", - "metro": "0.67.0", - "metro-cache": "0.67.0", - "metro-core": "0.67.0", - "metro-runtime": "0.67.0" + "metro": "0.68.0", + "metro-cache": "0.68.0", + "metro-core": "0.68.0", + "metro-runtime": "0.68.0" }, "devDependencies": { "pretty-format": "^26.5.2", diff --git a/packages/metro-core/package.json b/packages/metro-core/package.json index 1b6b0ef3b0..38e5578d01 100644 --- a/packages/metro-core/package.json +++ b/packages/metro-core/package.json @@ -1,6 +1,6 @@ { "name": "metro-core", - "version": "0.67.0", + "version": "0.68.0", "description": "🚇 Metro's core package.", "main": "src/index.js", "repository": { @@ -14,7 +14,7 @@ "dependencies": { "jest-haste-map": "^27.3.1", "lodash.throttle": "^4.1.1", - "metro-resolver": "0.67.0" + "metro-resolver": "0.68.0" }, "license": "MIT" } diff --git a/packages/metro-hermes-compiler/package.json b/packages/metro-hermes-compiler/package.json index fe6eabb0df..bce2931905 100644 --- a/packages/metro-hermes-compiler/package.json +++ b/packages/metro-hermes-compiler/package.json @@ -1,6 +1,6 @@ { "name": "metro-hermes-compiler", - "version": "0.67.0", + "version": "0.68.0", "description": "🚇 Hermes bytecode compiler for Metro.", "main": "src/index.js", "repository": { diff --git a/packages/metro-inspector-proxy/package.json b/packages/metro-inspector-proxy/package.json index f12675efe0..ca77df9161 100644 --- a/packages/metro-inspector-proxy/package.json +++ b/packages/metro-inspector-proxy/package.json @@ -1,6 +1,6 @@ { "name": "metro-inspector-proxy", - "version": "0.67.0", + "version": "0.68.0", "description": "🚇 Inspector proxy for React Native and dev tools integration.", "main": "src/index.js", "bin": "src/cli.js", diff --git a/packages/metro-memory-fs/package.json b/packages/metro-memory-fs/package.json index fc49cddd9c..c2747f038f 100644 --- a/packages/metro-memory-fs/package.json +++ b/packages/metro-memory-fs/package.json @@ -1,6 +1,6 @@ { "name": "metro-memory-fs", - "version": "0.67.0", + "version": "0.68.0", "description": "🚇 A memory-based implementation of `fs` useful for testing.", "main": "src/index.js", "repository": { diff --git a/packages/metro-minify-terser/package.json b/packages/metro-minify-terser/package.json index 0d628f1668..57b3d00a34 100644 --- a/packages/metro-minify-terser/package.json +++ b/packages/metro-minify-terser/package.json @@ -1,6 +1,6 @@ { "name": "metro-minify-terser", - "version": "0.67.0", + "version": "0.68.0", "description": "🚇 Minifier for Metro based on Terser.", "main": "src/index.js", "repository": { diff --git a/packages/metro-minify-uglify/package.json b/packages/metro-minify-uglify/package.json index 9ad47572b7..eefe24c4d4 100644 --- a/packages/metro-minify-uglify/package.json +++ b/packages/metro-minify-uglify/package.json @@ -1,6 +1,6 @@ { "name": "metro-minify-uglify", - "version": "0.67.0", + "version": "0.68.0", "description": "🚇 Minifier for Metro based on Uglify.", "main": "src/index.js", "repository": { diff --git a/packages/metro-react-native-babel-preset/package.json b/packages/metro-react-native-babel-preset/package.json index 7749317845..ada1ff0d79 100644 --- a/packages/metro-react-native-babel-preset/package.json +++ b/packages/metro-react-native-babel-preset/package.json @@ -1,6 +1,6 @@ { "name": "metro-react-native-babel-preset", - "version": "0.67.0", + "version": "0.68.0", "description": "Babel preset for React Native applications", "main": "src/index.js", "repository": { diff --git a/packages/metro-react-native-babel-transformer/package.json b/packages/metro-react-native-babel-transformer/package.json index 149d22fabf..6b6ae8fbef 100644 --- a/packages/metro-react-native-babel-transformer/package.json +++ b/packages/metro-react-native-babel-transformer/package.json @@ -1,6 +1,6 @@ { "name": "metro-react-native-babel-transformer", - "version": "0.67.0", + "version": "0.68.0", "description": "Babel transformer for React Native applications.", "main": "src/index.js", "repository": { @@ -21,9 +21,9 @@ "@babel/core": "^7.14.0", "babel-preset-fbjs": "^3.4.0", "hermes-parser": "0.5.0", - "metro-babel-transformer": "0.67.0", - "metro-react-native-babel-preset": "0.67.0", - "metro-source-map": "0.67.0", + "metro-babel-transformer": "0.68.0", + "metro-react-native-babel-preset": "0.68.0", + "metro-source-map": "0.68.0", "nullthrows": "^1.1.1" }, "peerDependencies": { diff --git a/packages/metro-resolver/package.json b/packages/metro-resolver/package.json index d1d577aa7d..19bfdd1cec 100644 --- a/packages/metro-resolver/package.json +++ b/packages/metro-resolver/package.json @@ -1,6 +1,6 @@ { "name": "metro-resolver", - "version": "0.67.0", + "version": "0.68.0", "description": "🚇 Implementation of Metro's resolution logic.", "main": "src", "repository": { diff --git a/packages/metro-runtime/package.json b/packages/metro-runtime/package.json index 6612905c00..0acbe96787 100644 --- a/packages/metro-runtime/package.json +++ b/packages/metro-runtime/package.json @@ -1,6 +1,6 @@ { "name": "metro-runtime", - "version": "0.67.0", + "version": "0.68.0", "description": "🚇 Module required for evaluating Metro bundles.", "main": "src", "repository": { diff --git a/packages/metro-source-map/package.json b/packages/metro-source-map/package.json index e4690aec9a..bf7e3f8799 100644 --- a/packages/metro-source-map/package.json +++ b/packages/metro-source-map/package.json @@ -1,6 +1,6 @@ { "name": "metro-source-map", - "version": "0.67.0", + "version": "0.68.0", "description": "🚇 Source map generator for Metro.", "main": "src/source-map.js", "repository": { @@ -15,9 +15,9 @@ "@babel/traverse": "^7.14.0", "@babel/types": "^7.0.0", "invariant": "^2.2.4", - "metro-symbolicate": "0.67.0", + "metro-symbolicate": "0.68.0", "nullthrows": "^1.1.1", - "ob1": "0.67.0", + "ob1": "0.68.0", "source-map": "^0.5.6", "vlq": "^1.0.0" }, diff --git a/packages/metro-symbolicate/package.json b/packages/metro-symbolicate/package.json index 8b9007b14d..89ee19974f 100644 --- a/packages/metro-symbolicate/package.json +++ b/packages/metro-symbolicate/package.json @@ -1,6 +1,6 @@ { "name": "metro-symbolicate", - "version": "0.67.0", + "version": "0.68.0", "description": "🚇 A tool to find the source location from JS bundles and stack traces.", "license": "MIT", "main": "./src/index.js", @@ -21,7 +21,7 @@ ], "dependencies": { "invariant": "^2.2.4", - "metro-source-map": "0.67.0", + "metro-source-map": "0.68.0", "nullthrows": "^1.1.1", "source-map": "^0.5.6", "through2": "^2.0.1", diff --git a/packages/metro-transform-plugins/package.json b/packages/metro-transform-plugins/package.json index 93be9c5c12..0c81fe1d48 100644 --- a/packages/metro-transform-plugins/package.json +++ b/packages/metro-transform-plugins/package.json @@ -1,6 +1,6 @@ { "name": "metro-transform-plugins", - "version": "0.67.0", + "version": "0.68.0", "description": "🚇 Transform plugins for Metro.", "main": "src/index.js", "repository": { @@ -24,6 +24,6 @@ "@babel/plugin-syntax-nullish-coalescing-operator": "^7.0.0", "@babel/plugin-transform-flow-strip-types": "^7.0.0", "@babel/types": "^7.0.0", - "metro": "0.67.0" + "metro": "0.68.0" } } diff --git a/packages/metro-transform-worker/package.json b/packages/metro-transform-worker/package.json index e82b64561b..ae8177c1d4 100644 --- a/packages/metro-transform-worker/package.json +++ b/packages/metro-transform-worker/package.json @@ -1,6 +1,6 @@ { "name": "metro-transform-worker", - "version": "0.67.0", + "version": "0.68.0", "description": "🚇 Transform worker for Metro.", "main": "src/index.js", "repository": { @@ -18,19 +18,19 @@ "@babel/parser": "^7.14.0", "@babel/types": "^7.0.0", "babel-preset-fbjs": "^3.4.0", - "metro": "0.67.0", - "metro-babel-transformer": "0.67.0", - "metro-cache": "0.67.0", - "metro-cache-key": "0.67.0", - "metro-hermes-compiler": "0.67.0", - "metro-source-map": "0.67.0", - "metro-transform-plugins": "0.67.0", + "metro": "0.68.0", + "metro-babel-transformer": "0.68.0", + "metro-cache": "0.68.0", + "metro-cache-key": "0.68.0", + "metro-hermes-compiler": "0.68.0", + "metro-source-map": "0.68.0", + "metro-transform-plugins": "0.68.0", "nullthrows": "^1.1.1" }, "devDependencies": { - "metro-memory-fs": "0.67.0", - "metro-minify-uglify": "0.67.0", - "metro-react-native-babel-transformer": "0.67.0", + "metro-memory-fs": "0.68.0", + "metro-minify-uglify": "0.68.0", + "metro-react-native-babel-transformer": "0.68.0", "mkdirp": "^0.5.1" } } diff --git a/packages/metro/package.json b/packages/metro/package.json index 5aeb03f1e1..b6fae7a1d4 100644 --- a/packages/metro/package.json +++ b/packages/metro/package.json @@ -1,6 +1,6 @@ { "name": "metro", - "version": "0.67.0", + "version": "0.68.0", "description": "🚇 The JavaScript bundler for React Native.", "main": "src/index.js", "bin": "src/cli.js", @@ -37,21 +37,21 @@ "jest-haste-map": "^27.3.1", "jest-worker": "^26.0.0", "lodash.throttle": "^4.1.1", - "metro-babel-transformer": "0.67.0", - "metro-cache": "0.67.0", - "metro-cache-key": "0.67.0", - "metro-config": "0.67.0", - "metro-core": "0.67.0", - "metro-hermes-compiler": "0.67.0", - "metro-inspector-proxy": "0.67.0", - "metro-minify-uglify": "0.67.0", - "metro-react-native-babel-preset": "0.67.0", - "metro-resolver": "0.67.0", - "metro-runtime": "0.67.0", - "metro-source-map": "0.67.0", - "metro-symbolicate": "0.67.0", - "metro-transform-plugins": "0.67.0", - "metro-transform-worker": "0.67.0", + "metro-babel-transformer": "0.68.0", + "metro-cache": "0.68.0", + "metro-cache-key": "0.68.0", + "metro-config": "0.68.0", + "metro-core": "0.68.0", + "metro-hermes-compiler": "0.68.0", + "metro-inspector-proxy": "0.68.0", + "metro-minify-uglify": "0.68.0", + "metro-react-native-babel-preset": "0.68.0", + "metro-resolver": "0.68.0", + "metro-runtime": "0.68.0", + "metro-source-map": "0.68.0", + "metro-symbolicate": "0.68.0", + "metro-transform-plugins": "0.68.0", + "metro-transform-worker": "0.68.0", "mime-types": "^2.1.27", "mkdirp": "^0.5.1", "node-fetch": "^2.2.0", @@ -71,9 +71,9 @@ "babel-jest": "^26.6.3", "dedent": "^0.7.0", "jest-snapshot": "^26.5.2", - "metro-memory-fs": "0.67.0", - "metro-react-native-babel-preset": "0.67.0", - "metro-react-native-babel-transformer": "0.67.0", + "metro-memory-fs": "0.68.0", + "metro-react-native-babel-preset": "0.68.0", + "metro-react-native-babel-transformer": "0.68.0", "stack-trace": "^0.0.10" }, "license": "MIT" diff --git a/packages/ob1/package.json b/packages/ob1/package.json index a932e39a54..05a45bd1e4 100644 --- a/packages/ob1/package.json +++ b/packages/ob1/package.json @@ -1,6 +1,6 @@ { "name": "ob1", - "version": "0.67.0", + "version": "0.68.0", "description": "A small library for working with 0- and 1-based offsets in a type-checked way.", "main": "src/ob1.js", "repository": { From 96c3adfa369d52d36144c6132463bc366894ae19 Mon Sep 17 00:00:00 2001 From: Janic Duplessis Date: Wed, 9 Feb 2022 08:04:42 -0800 Subject: [PATCH 6/6] Use node devtools url (#761) Summary: **Summary** This uses the new chrome devtools ui, this is the one used by the nodejs inspector. It is more focused on js debugging / profiling instead of general browser devtools. **Test plan** Tested that it works in Flipper and also when opened directly in chrome. ### Before image ### After image Pull Request resolved: https://github.com/facebook/metro/pull/761 Reviewed By: arushikesarwani94 Differential Revision: D34105401 Pulled By: rh389 fbshipit-source-id: f4be7c3e642542e7f90a1c8b9f7535505fffceeb --- packages/metro-inspector-proxy/src/InspectorProxy.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/metro-inspector-proxy/src/InspectorProxy.js b/packages/metro-inspector-proxy/src/InspectorProxy.js index df61a732c2..b82a3970fe 100644 --- a/packages/metro-inspector-proxy/src/InspectorProxy.js +++ b/packages/metro-inspector-proxy/src/InspectorProxy.js @@ -119,7 +119,7 @@ class InspectorProxy { const debuggerUrl = `${this._serverAddressWithPort}${WS_DEBUGGER_URL}?device=${deviceId}&page=${page.id}`; const webSocketDebuggerUrl = 'ws://' + debuggerUrl; const devtoolsFrontendUrl = - 'chrome-devtools://devtools/bundled/inspector.html?experiments=true&v8only=true&ws=' + + 'devtools://devtools/bundled/js_app.html?experiments=true&v8only=true&ws=' + encodeURIComponent(debuggerUrl); return { id: `${deviceId}-${page.id}`,