Metro and Babel upgraded

Summary:
Upgraded Metro to 0.65.2 which contains the fix for regression which blocked us previously (https://github.com/facebook/metro/issues/641).
Also upgraded Babel to the latest available versions as anyway most of its packages were upgraded together with Metro.

Reviewed By: passy

Differential Revision: D26777168

fbshipit-source-id: f325e0ba46a95e15605a7b15a793d714b1027061
This commit is contained in:
Anton Nikolaev
2021-03-03 04:40:14 -08:00
committed by Facebook GitHub Bot
parent 90ac5f55a2
commit fce723eaca
7 changed files with 878 additions and 891 deletions

View File

@@ -82,7 +82,7 @@
"@testing-library/react": "^11.2.3", "@testing-library/react": "^11.2.3",
"@types/lodash.memoize": "^4.1.6", "@types/lodash.memoize": "^4.1.6",
"flipper-test-utils": "0.0.0", "flipper-test-utils": "0.0.0",
"metro-runtime": "^0.63.0", "metro-runtime": "^0.65.2",
"mock-fs": "^4.13.0", "mock-fs": "^4.13.0",
"pretty-format": "^26.1.0", "pretty-format": "^26.1.0",
"react-refresh": "^0.9.0", "react-refresh": "^0.9.0",

View File

@@ -9,21 +9,21 @@
"license": "MIT", "license": "MIT",
"bugs": "https://github.com/facebook/flipper/issues", "bugs": "https://github.com/facebook/flipper/issues",
"dependencies": { "dependencies": {
"@babel/core": "^7.12.10", "@babel/core": "^7.13.8",
"@babel/parser": "^7.12.11", "@babel/parser": "^7.13.9",
"@babel/generator": "^7.12.11", "@babel/generator": "^7.13.9",
"@babel/plugin-proposal-class-properties": "^7.10.4", "@babel/plugin-proposal-class-properties": "^7.13.0",
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.10.4", "@babel/plugin-proposal-nullish-coalescing-operator": "^7.13.8",
"@babel/plugin-proposal-object-rest-spread": "^7.11.0", "@babel/plugin-proposal-object-rest-spread": "^7.13.8",
"@babel/plugin-proposal-optional-chaining": "^7.12.7", "@babel/plugin-proposal-optional-chaining": "^7.13.8",
"@babel/plugin-transform-flow-strip-types": "^7.12.10", "@babel/plugin-transform-flow-strip-types": "^7.13.0",
"@babel/plugin-transform-modules-commonjs": "^7.10.4", "@babel/plugin-transform-modules-commonjs": "^7.13.8",
"@babel/plugin-transform-typescript": "^7.11.0", "@babel/plugin-transform-typescript": "^7.13.0",
"@babel/preset-env": "^7.12.10", "@babel/preset-env": "^7.13.9",
"@babel/preset-react": "^7.12.10", "@babel/preset-react": "^7.12.13",
"@babel/traverse": "^7.12.12", "@babel/traverse": "^7.13.0",
"@babel/types": "^7.12.10", "@babel/types": "^7.13.0",
"@emotion/babel-plugin": "^11.0.0", "@emotion/babel-plugin": "^11.2.0",
"@types/fs-extra": "^9.0.1", "@types/fs-extra": "^9.0.1",
"@types/node": "^14.14.10", "@types/node": "^14.14.10",
"fs-extra": "^9.0.1", "fs-extra": "^9.0.1",

View File

@@ -71,17 +71,17 @@
"description": "Mobile development tool", "description": "Mobile development tool",
"devDependencies": { "devDependencies": {
"@adobe/node-fetch-retry": "^1.1.0", "@adobe/node-fetch-retry": "^1.1.0",
"@babel/code-frame": "^7.12.11", "@babel/code-frame": "^7.12.13",
"@babel/eslint-parser": "^7.11.5", "@babel/eslint-parser": "^7.13.8",
"@jest-runner/electron": "^3.0.0", "@jest-runner/electron": "^3.0.0",
"@testing-library/dom": "^7.29.0", "@testing-library/dom": "^7.29.0",
"@testing-library/react": "^11.2.3", "@testing-library/react": "^11.2.3",
"@types/adobe__node-fetch-retry": "^1.0.0", "@types/adobe__node-fetch-retry": "^1.0.0",
"@types/algoliasearch": "^3.30.19", "@types/algoliasearch": "^3.30.19",
"@types/babel__code-frame": "^7.0.1", "@types/babel__code-frame": "^7.0.2",
"@types/babel__core": "^7.1.12", "@types/babel__core": "^7.1.12",
"@types/babel__generator": "^7.6.1", "@types/babel__generator": "^7.6.2",
"@types/babel__traverse": "^7.0.15", "@types/babel__traverse": "^7.11.0",
"@types/decompress": "4.2.3", "@types/decompress": "4.2.3",
"@types/deep-equal": "^1.0.1", "@types/deep-equal": "^1.0.1",
"@types/detect-port": "^1.1.0", "@types/detect-port": "^1.1.0",
@@ -165,9 +165,9 @@
"jest-fetch-mock": "^3.0.3", "jest-fetch-mock": "^3.0.3",
"less": "^3.12.2", "less": "^3.12.2",
"line-replace": "^2.0.1", "line-replace": "^2.0.1",
"metro": "^0.63.0", "metro": "^0.65.2",
"metro-minify-terser": "^0.63.0", "metro-minify-terser": "^0.65.2",
"metro-resolver": "^0.63.0", "metro-resolver": "^0.65.2",
"node-fetch": "^2.6.1", "node-fetch": "^2.6.1",
"p-filter": "^2.1.0", "p-filter": "^2.1.0",
"p-map": "^4.0.0", "p-map": "^4.0.0",

View File

@@ -1,13 +1,13 @@
diff --git a/node_modules/metro/src/lib/getPreludeCode.js b/node_modules/metro/src/lib/getPreludeCode.js diff --git a/node_modules/metro/src/lib/getPreludeCode.js b/node_modules/metro/src/lib/getPreludeCode.js
index 476319e..c1cd920 100644 index f73c6ec..fc313ec 100644
--- a/node_modules/metro/src/lib/getPreludeCode.js --- a/node_modules/metro/src/lib/getPreludeCode.js
+++ b/node_modules/metro/src/lib/getPreludeCode.js +++ b/node_modules/metro/src/lib/getPreludeCode.js
@@ -57,7 +57,7 @@ function getPreludeCode(_ref) { @@ -14,7 +14,7 @@ function getPreludeCode({ extraVars, isDev, globalPrefix }) {
"__BUNDLE_START_TIME__=this.nativePerformanceNow?nativePerformanceNow():Date.now()", "__BUNDLE_START_TIME__=this.nativePerformanceNow?nativePerformanceNow():Date.now()",
`__DEV__=${String(isDev)}` `__DEV__=${String(isDev)}`,
].concat(_toConsumableArray(formatExtraVars(extraVars)), [ ...formatExtraVars(extraVars),
- "process=this.process||{}", - "process=this.process||{}",
+ "process=process||this.process||global.process||{}", + "process=process||this.process||global.process||{}",
`__METRO_GLOBAL_PREFIX__='${globalPrefix}'` `__METRO_GLOBAL_PREFIX__='${globalPrefix}'`
]); ];
return `var ${vars.join(",")};${processEnv( return `var ${vars.join(",")};${processEnv(

View File

@@ -1,8 +1,8 @@
diff --git a/node_modules/metro-runtime/src/polyfills/require.js b/node_modules/metro-runtime/src/polyfills/require.js diff --git a/node_modules/metro-runtime/src/polyfills/require.js b/node_modules/metro-runtime/src/polyfills/require.js
index 8b086a6..42dee53 100644 index f9bb647..d918aa1 100644
--- a/node_modules/metro-runtime/src/polyfills/require.js --- a/node_modules/metro-runtime/src/polyfills/require.js
+++ b/node_modules/metro-runtime/src/polyfills/require.js +++ b/node_modules/metro-runtime/src/polyfills/require.js
@@ -114,11 +114,6 @@ function metroRequire(moduleId) { @@ -113,11 +113,6 @@ function metroRequire(moduleId) {
.map(id => (modules[id] ? modules[id].verboseName : "[unknown]")); // We want to show A -> B -> A: .map(id => (modules[id] ? modules[id].verboseName : "[unknown]")); // We want to show A -> B -> A:
cycle.push(cycle[0]); cycle.push(cycle[0]);

View File

@@ -11,8 +11,8 @@
"dependencies": { "dependencies": {
"flipper-babel-transformer": "0.0.0", "flipper-babel-transformer": "0.0.0",
"fs-extra": "^9.0.1", "fs-extra": "^9.0.1",
"metro": "^0.63.0", "metro": "^0.65.2",
"metro-minify-terser": "^0.63.0" "metro-minify-terser": "^0.65.2"
}, },
"devDependencies": { "devDependencies": {
"@types/fs-extra": "^9.0.1", "@types/fs-extra": "^9.0.1",

File diff suppressed because it is too large Load Diff