Merge branch 'develop' into pre-req-workspace

Author: ihexxa

.npmrc

@@ -1,5 +1,5 @@
 runtime = electron
-target = 28.0.0
+target = 29.0.0
 disturl = https://electronjs.org/headers
 playwright_skip_browser_download=true
 engine-strict=true

.nvmrc

@@ -1 +1 @@
-18.18.2
+20.9.0

package-lock.json

@@ -11,8 +11,8 @@
   },
   "homepage": "https://github.com/kong/insomnia#readme",
   "engines": {
-    "node": ">=18.18.2 <20",
-    "npm": ">=8.19.0"
+    "node": ">=20.9 <22",
+    "npm": ">=10"
   },
   "workspaces": [
     "packages/openapi-2-kong",

package.json

@@ -1,3 +1,4 @@
 dist
 bin
 coverage
+verify-pkg.js

packages/insomnia-inso/.eslintignore

@@ -1,5 +1,4 @@
 import { build, type BuildOptions, context } from 'esbuild';
-import { nodeExternalsPlugin } from 'esbuild-node-externals';
 
 const isProd = Boolean(process.env.NODE_ENV === 'production');
 const watch = Boolean(process.env.ESBUILD_WATCH);
@@ -9,20 +8,34 @@ const config: BuildOptions = {
   bundle: true,
   platform: 'node',
   minify: isProd,
-  target: 'node18',
+  target: 'node20',
   sourcemap: true,
   format: 'cjs',
   tsconfig: 'tsconfig.json',
   plugins: [
-    // Exclude node_modules from the bundle since they will be packaged with the cli
-    nodeExternalsPlugin(),
+    // taken from https://github.com/tjx666/awesome-vscode-extension-boilerplate/blob/main/scripts/esbuild.ts
+    {
+      name: 'umd2esm',
+      setup(build) {
+        build.onResolve({ filter: /^(vscode-.*|estree-walker|jsonc-parser)/ }, args => {
+          const pathUmdMay = require.resolve(args.path, {
+            paths: [args.resolveDir],
+          });
+          // Call twice the replace is to solve the problem of the path in Windows
+          const pathEsm = pathUmdMay
+            .replace('/umd/', '/esm/')
+            .replace('\\umd\\', '\\esm\\');
+          return { path: pathEsm };
+        });
+      },
+    },
   ],
   define: {
     'process.env.DEFAULT_APP_NAME': JSON.stringify(isProd ? 'Insomnia' : 'insomnia-app'),
     'process.env.VERSION': JSON.stringify(isProd ? version : 'dev'),
     '__DEV__': JSON.stringify(!isProd),
   },
-  external: ['@getinsomnia/node-libcurl', 'mocha'],
+  external: ['@getinsomnia/node-libcurl', 'insomnia-send-request', 'fsevents', 'mocha'],
   entryPoints: ['./src/index.ts'],
 };
 

packages/insomnia-inso/esbuild.ts

@@ -29,9 +29,9 @@
     "build": "esr esbuild.ts",
     "build:production": "cross-env NODE_ENV=production esr esbuild.ts",
     "start": "ESBUILD_WATCH=true esr esbuild.ts",
-    "prepackage": "npm run build:production",
-    "package": "npx -y pkg@5.8.1 . --output binaries/inso --targets host",
-    "postpackage": "esr src/scripts/verify-pkg.ts",
+    "prepackage": "npm run build:production && rm -rf binaries/inso",
+    "package": "npx -y @yao-pkg/pkg@5.11.5 . --output binaries/inso --targets host",
+    "postpackage": "node src/scripts/verify-pkg.js",
     "artifacts": "esr src/scripts/artifacts.ts"
   },
   "devDependencies": {
@@ -41,7 +41,6 @@
     "concurrently": "^8.2.2",
     "cross-env": "^7.0.3",
     "esbuild": "^0.20.2",
-    "esbuild-node-externals": "^1.13.0",
     "esbuild-runner": "^2.2.2",
     "execa": "^5.0.0",
     "jest": "^29.7.0",

packages/insomnia-inso/package.json

@@ -0,0 +1,19 @@
+// import { spawn } from 'child_process';
+// import { resolve } from 'path';
+const spawn = require('child_process').spawn;
+const resolve = require('path').resolve;
+const basePath = resolve('binaries/inso');
+const childProcess = spawn(basePath, ['--help']);
+childProcess.stdout.on('data', data => {
+  console.log(`stdout: ${data}`);
+});
+childProcess.on('error', err => {
+  console.error(`Error: ${err.message}`);
+});
+childProcess.on('exit', (code, signal) => {
+  if (code !== 0) {
+    console.error(`Child process exited with code ${code} and signal ${signal}`);
+  } else {
+    console.log('Child process finished successfully');
+  }
+});