Remove separate flipper-server lock file

Summary: This shouldn't be needed anymore and is causing deps we need to build getting pruned.

Reviewed By: mweststrate

Differential Revision: D56521382

fbshipit-source-id: 199b8eb797ef0e4c7f93a3360e571df0c62cfb2e

desktop/flipper-server/package.json

@@ -73,6 +73,11 @@
     "@types/ws": "^8.5.3",
     "mock-fs": "^5.2.0"
   },
+  "resolutions": {
+    "adbkit-logcat": "^2.0.1",
+    "minimist": "1.2.6",
+    "node-forge": "^1.0.6"
+  },
   "peerDependencies": {},
   "scripts": {
     "reset": "rimraf lib *.tsbuildinfo",

desktop/scripts/build-flipper-server-release.tsx

@@ -126,13 +126,6 @@ const argv = yargs
         'Unique build identifier to be used as the version patch part for the build',
       type: 'number',
     },
-    // On intern we ship flipper-server with node_modules (no big internet behind the firewall). yarn.lock makes sure that a CI that builds flipper-server installs the same dependencies all the time.
-    'generate-lock': {
-      describe:
-        'Generate a new yarn.lock file for flipper-server prod build. It is used for reproducible builds of the final artifact for the intern.',
-      type: 'boolean',
-      default: false,
-    },
     mac: {
       describe: 'Build arm64 and x64 bundles for MacOS.',
       type: 'boolean',
@@ -276,6 +269,7 @@ async function linkLocalDeps(buildFolder: string) {
   const manifest = await fs.readJSON(path.resolve(serverDir, 'package.json'));
 
   const resolutions = {
+    ...manifest.resolutions,
     'flipper-doctor': `file:${rootDir}/doctor`,
     'flipper-common': `file:${rootDir}/flipper-common`,
     'flipper-server-client': `file:${rootDir}/flipper-server-client`,
@@ -284,15 +278,14 @@ async function linkLocalDeps(buildFolder: string) {
   };
   manifest.resolutions = resolutions;
 
-  for (const depName of Object.keys(manifest.dependencies)) {
+  for (const depName in manifest.dependencies) {
     if (depName in resolutions) {
       manifest.dependencies[depName] =
         resolutions[depName as keyof typeof resolutions];
     }
   }
 
   delete manifest.scripts;
-  delete manifest.devDependencies;
 
   await fs.writeFile(
     path.join(buildFolder, 'package.json'),
@@ -381,13 +374,6 @@ async function yarnInstall(dir: string) {
     )}`,
   );
 
-  if (!argv['generate-lock']) {
-    await fs.copyFile(
-      path.resolve(rootDir, 'yarn.flipper-server.lock'),
-      path.resolve(dir, 'yarn.lock'),
-    );
-  }
-
   await spawn(
     'yarn',
     [
@@ -401,15 +387,6 @@ async function yarnInstall(dir: string) {
       shell: true,
     },
   );
-
-  if (argv['generate-lock']) {
-    await fs.copyFile(
-      path.resolve(dir, 'yarn.lock'),
-      path.resolve(rootDir, 'yarn.flipper-server.lock'),
-    );
-  }
-
-  await fs.rm(path.resolve(dir, 'yarn.lock'));
 }
 
 async function stripForwardingToolFromArchive(archive: string): Promise<void> {