Fix release build issue
Summary:
D24358369 (8a31e984b3) introduced a dependency outside the `sonar/` dir, which probably should not have happened. D27324576 finally broke this, by adding a dep to QPL core, which will never be installed in our CI.
This diff unbreaks that rewriting the require to a locally provided version of crc32, however this is a stop gap, and it would be great if someone would look into a sustainable solution :)
Reviewed By: passy
Differential Revision: D27327272
fbshipit-source-id: 70cdf21c7ecf081ef804d6338ec11e498e3cb7cf
This commit is contained in:
committed by
Facebook GitHub Bot
parent
bfde7c4d24
commit
740fbe57fd
@@ -28,7 +28,9 @@
|
|||||||
"archiver": "^5.0.2",
|
"archiver": "^5.0.2",
|
||||||
"async-mutex": "^0.3.1",
|
"async-mutex": "^0.3.1",
|
||||||
"axios": "^0.21.1",
|
"axios": "^0.21.1",
|
||||||
|
"cbuffer": "^2.2.0",
|
||||||
"console-feed": "^3.2.1",
|
"console-feed": "^3.2.1",
|
||||||
|
"crc32": "^0.2.2",
|
||||||
"deep-equal": "^2.0.1",
|
"deep-equal": "^2.0.1",
|
||||||
"expand-tilde": "^2.0.2",
|
"expand-tilde": "^2.0.2",
|
||||||
"flipper-client-sdk": "^0.0.3",
|
"flipper-client-sdk": "^0.0.3",
|
||||||
@@ -75,8 +77,7 @@
|
|||||||
"uuid": "^8.3.2",
|
"uuid": "^8.3.2",
|
||||||
"which": "^2.0.1",
|
"which": "^2.0.1",
|
||||||
"ws": "^7.4.2",
|
"ws": "^7.4.2",
|
||||||
"xdg-basedir": "^4.0.0",
|
"xdg-basedir": "^4.0.0"
|
||||||
"cbuffer": "^2.2.0"
|
|
||||||
},
|
},
|
||||||
"optionalDependencies": {
|
"optionalDependencies": {
|
||||||
"7zip-bin-mac": "^1.0.1"
|
"7zip-bin-mac": "^1.0.1"
|
||||||
|
|||||||
@@ -43,6 +43,8 @@ import * as Immer from 'immer';
|
|||||||
import * as antd from 'antd';
|
import * as antd from 'antd';
|
||||||
import * as emotion_styled from '@emotion/styled';
|
import * as emotion_styled from '@emotion/styled';
|
||||||
import * as antdesign_icons from '@ant-design/icons';
|
import * as antdesign_icons from '@ant-design/icons';
|
||||||
|
// @ts-ignore
|
||||||
|
import * as crc32 from 'crc32';
|
||||||
|
|
||||||
// eslint-disable-next-line import/no-unresolved
|
// eslint-disable-next-line import/no-unresolved
|
||||||
import getDefaultPluginsIndex from '../utils/getDefaultPluginsIndex';
|
import getDefaultPluginsIndex from '../utils/getDefaultPluginsIndex';
|
||||||
@@ -64,6 +66,7 @@ export default async (store: Store, logger: Logger) => {
|
|||||||
globalObject.antd = antd;
|
globalObject.antd = antd;
|
||||||
globalObject.emotion_styled = emotion_styled;
|
globalObject.emotion_styled = emotion_styled;
|
||||||
globalObject.antdesign_icons = antdesign_icons;
|
globalObject.antdesign_icons = antdesign_icons;
|
||||||
|
globalObject.crc32_hack_fix_me = crc32;
|
||||||
|
|
||||||
const gatekeepedPlugins: Array<ActivatablePluginDetails> = [];
|
const gatekeepedPlugins: Array<ActivatablePluginDetails> = [];
|
||||||
const disabledPlugins: Array<ActivatablePluginDetails> = [];
|
const disabledPlugins: Array<ActivatablePluginDetails> = [];
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ const requireReplacements: any = {
|
|||||||
immer: 'global.Immer',
|
immer: 'global.Immer',
|
||||||
'@emotion/styled': 'global.emotion_styled',
|
'@emotion/styled': 'global.emotion_styled',
|
||||||
'@ant-design/icons': 'global.antdesign_icons',
|
'@ant-design/icons': 'global.antdesign_icons',
|
||||||
|
crc32: 'global.crc32_hack_fix_me',
|
||||||
};
|
};
|
||||||
|
|
||||||
export function tryReplaceFlipperRequire(path: NodePath<CallExpression>) {
|
export function tryReplaceFlipperRequire(path: NodePath<CallExpression>) {
|
||||||
|
|||||||
@@ -4696,6 +4696,11 @@ crc32-stream@^4.0.1:
|
|||||||
crc-32 "^1.2.0"
|
crc-32 "^1.2.0"
|
||||||
readable-stream "^3.4.0"
|
readable-stream "^3.4.0"
|
||||||
|
|
||||||
|
crc32@^0.2.2:
|
||||||
|
version "0.2.2"
|
||||||
|
resolved "https://registry.yarnpkg.com/crc32/-/crc32-0.2.2.tgz#7ad220d6ffdcd119f9fc127a7772cacea390a4ba"
|
||||||
|
integrity sha1-etIg1v/c0Rn5/BJ6d3LKzqOQpLo=
|
||||||
|
|
||||||
crc@^3.4.4, crc@^3.8.0:
|
crc@^3.4.4, crc@^3.8.0:
|
||||||
version "3.8.0"
|
version "3.8.0"
|
||||||
resolved "https://registry.yarnpkg.com/crc/-/crc-3.8.0.tgz#ad60269c2c856f8c299e2c4cc0de4556914056c6"
|
resolved "https://registry.yarnpkg.com/crc/-/crc-3.8.0.tgz#ad60269c2c856f8c299e2c4cc0de4556914056c6"
|
||||||
|
|||||||
Reference in New Issue
Block a user