Merge branch 'develop' into merge-develop-into-13

scripts/binary/binary-cleanup.js

@@ -87,6 +87,7 @@ const getDependencyPathsToKeep = async (buildAppDir) => {
         '@swc/core',
         'emitter',
         'ts-loader',
+        '@babel/preset-typescript/package.json',
       ],
     })
 
@@ -204,6 +205,8 @@ const buildEntryPointAndCleanup = async (buildAppDir) => {
     path.join(buildAppDir, '**', 'nexus', 'dist-esm'),
     path.join(buildAppDir, '**', '@graphql-tools', '**', '*.mjs'),
     path.join(buildAppDir, '**', 'graphql', '**', '*.mjs'),
+    path.join(buildAppDir, '**', '@openTelemetry', '**', 'esm'),
+    path.join(buildAppDir, '**', '@openTelemetry', '**', 'esnext'),
     // We currently do not use any map files
     path.join(buildAppDir, '**', '*js.map'),
     // License files need to be kept

scripts/binary/build.ts

@@ -98,7 +98,7 @@ export async function buildCypressApp (options: BuildCypressAppOpts) {
   if (!keepBuild) {
     log('#buildPackages')
 
-    await execa('yarn', ['lerna', 'run', 'build-prod', '--ignore', 'cli', '--concurrency', '1'], {
+    await execa('yarn', ['lerna', 'run', 'build-prod', '--ignore', 'cli', '--concurrency', '4'], {
       stdio: 'inherit',
       cwd: CY_ROOT_DIR,
     })
@@ -180,10 +180,12 @@ require('./packages/server/index.js')
 `)
 
   // removeTypeScript
+  log('#remove typescript files and devDep patches')
   await del([
     // include ts files of packages
     meta.distDir('**', '*.ts'),
-
+    // remove dev dep patches
+    meta.distDir('**', '*.dev.patch'),
     // except those in node_modules
     `!${meta.distDir('**', 'node_modules', '**', '*.ts')}`,
   ], { force: true })
@@ -195,7 +197,6 @@ require('./packages/server/index.js')
 
   // transformSymlinkRequires
   log('#transformSymlinkRequires')
-
   await transformRequires(meta.distDir())
 
   log(`#testDistVersion ${meta.distDir()}`)