examples/basic/package.json

@@ -38,7 +38,7 @@
     "bob-esbuild": "workspace:^3.2.3",
     "bob-esbuild-cli": "workspace:^3.0.1",
     "bob-ts": "workspace:^3.0.1",
-    "bob-tsm": "workspace:^0.4.5",
+    "bob-tsm": "workspace:^0.4.6",
     "shared": "workspace:^1.0.0"
   },
   "publishConfig": {

examples/nextjs-custom-server/package.json

@@ -9,16 +9,16 @@
     "start": "cross-env NODE_ENV=production bob-tsm src/server.ts"
   },
   "dependencies": {
-    "bob-tsm": "workspace:^0.4.5",
+    "bob-tsm": "workspace:^0.4.6",
     "next": "^12.0.8",
     "react": "^17.0.2",
     "react-dom": "^17.0.2"
   },
   "devDependencies": {
-    "@types/node": "^17.0.7",
+    "@types/node": "^17.0.10",
     "@types/react": "^17.0.38",
     "cross-env": "^7.0.3",
-    "typescript": "^4.5.4"
+    "typescript": "^4.5.5"
   },
   "dependenciesMeta": {
     "bob-tsm": {

package.json

@@ -27,18 +27,25 @@
     "@changesets/config": "^1.6.3",
     "@changesets/read": "^0.5.2",
     "@manypkg/get-packages": "^1.1.3",
-    "@types/node": "^17.0.7",
+    "@types/node": "^17.0.10",
     "changesets-github-release": "^0.0.4",
-    "esbuild": "^0.14.11",
+    "esbuild": "^0.14.13",
     "husky": "^7.0.4",
     "prettier": "^2.5.1",
     "pretty-quick": "^3.1.3",
     "rimraf": "^3.0.2",
     "semver": "^7.3.5",
     "tsm": "^2.2.1",
-    "typescript": "^4.5.4"
+    "typescript": "^4.5.5"
   },
   "engines": {
     "pnpm": ">=6.7.1"
+  },
+  "pnpm": {
+    "peerDependencyRules": {
+      "ignoreMissing": [
+        "@babel/core"
+      ]
+    }
   }
 }

packages/bob-cli/package.json

@@ -39,9 +39,9 @@
     "commander": "^8.3.0"
   },
   "devDependencies": {
-    "bob-esbuild": "workspace:^3.2.1",
+    "bob-esbuild": "workspace:^3.2.3",
     "changesets-github-release": "^0.0.4",
-    "typescript": "^4.5.4"
+    "typescript": "^4.5.5"
   },
   "engines": {
     "node": ">=12.0.0"

packages/bob-ts/package.json

@@ -37,26 +37,26 @@
   },
   "dependencies": {
     "bob-esbuild-plugin": "workspace:^3.1.3",
-    "rollup": "^2.64.0"
+    "rollup": "^2.66.0"
   },
   "devDependencies": {
     "@rollup/plugin-json": "^4.1.0",
-    "@types/node": "^17.0.7",
+    "@types/node": "^17.0.10",
     "bob-esbuild-cli": "workspace:^3.0.1",
     "changesets-github-release": "^0.0.4",
     "commander": "^8.3.0",
-    "esbuild": "^0.14.11",
+    "esbuild": "^0.14.13",
     "execa": "^6.0.0",
-    "globby": "^12.1.0",
+    "globby": "^12.2.0",
     "rollup-plugin-delete": "^2.0.0",
     "rollup-plugin-node-externals": "^3.1.2",
     "rollup-plugin-tsconfig-paths": "^1.1.6",
     "tree-kill": "^1.2.2",
-    "typescript": "^4.5.4"
+    "typescript": "^4.5.5"
   },
   "peerDependencies": {
     "@types/node": "*",
-    "esbuild": ">=0.14.11",
+    "esbuild": ">=0.14.13",
     "typescript": "*"
   },
   "engines": {

packages/bob-tsm/CHANGELOG.md

@@ -1,5 +1,11 @@
 # bob-tsm
 
+## 0.4.6
+
+### Patch Changes
+
+- b349c7e: Add "--keep-esm-loader" option, it enables to keep the ESM Loader for forks (It can break certain environments like Next.js custom server)
+
 ## 0.4.5
 
 ### Patch Changes

packages/bob-tsm/build.ts

@@ -38,7 +38,7 @@ async function main() {
       outDir: 'lib',
       target: 'node12.20',
       sourcemap: false,
-      external: ['./deps/semver.js', './deps/typescriptPaths.js'],
+      external: ['./deps/typescriptPaths.js'],
       esbuild: {
         minify: false,
       },

packages/bob-tsm/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bob-tsm",
-  "version": "0.4.5",
+  "version": "0.4.6",
   "homepage": "https://github.com/PabloSzx/bob-esbuild",
   "bugs": "https://github.com/PabloSzx/bob-esbuild/issues",
   "repository": {
@@ -43,17 +43,16 @@
     "@types/semver": "^7.3.9",
     "bob-esbuild-plugin": "workspace:^3.1.3",
     "c8": "^7.11.0",
-    "chokidar": "^3.5.2",
+    "chokidar": "^3.5.3",
     "commander": "^8.3.0",
-    "esbuild": "^0.14.11",
+    "esbuild": "^0.14.13",
     "execa": "^6.0.0",
-    "semver": "^7.3.5",
     "tree-kill": "^1.2.2",
-    "typescript": "^4.5.4",
+    "typescript": "^4.5.5",
     "typescript-paths": "^1.3.1"
   },
   "peerDependencies": {
-    "esbuild": ">=0.14.11",
+    "esbuild": ">=0.14.13",
     "typescript": ">=4.1.2"
   },
   "peerDependenciesMeta": {

packages/bob-tsm/src/bin.ts

@@ -15,6 +15,7 @@ program
   .option('--tsmconfig <config>', 'Configuration file path', 'tsm.js')
   .option('--watch <patterns...>', 'Enable & specify watch mode')
   .option('--ignore <patterns...>', 'Ignore watch patterns')
+  .option('--keep-esm-loader', 'Keep ESM Loader for forks (It can break certain environments like Next.js custom server)')
   .addOption(
     new Option(
       '--node-env,--node_env <NODE_ENV>',
@@ -44,9 +45,10 @@ program
       node_env: 'production' | 'prod' | 'development' | 'dev' | 'test';
       quiet?: boolean;
       paths?: boolean;
+      keepEsmLoader?: boolean;
     }>();
 
-    const { watch, ignore, cjs, node_env, quiet, tsmconfig, paths } = options;
+    const { watch, ignore, cjs, node_env, quiet, tsmconfig, paths, keepEsmLoader } = options;
 
     const binDirname = dirname(fileURLToPath(import.meta.url));
 
@@ -89,6 +91,12 @@ program
       });
     }
 
+    if (keepEsmLoader) {
+      Object.assign((spawnEnv ||= { ...process.env }), {
+        KEEP_LOADER_ARGV: '1',
+      });
+    }
+
     const spawnOptions: SpawnOptions = {
       stdio: 'inherit',
       env: spawnEnv,

packages/bob-tsm/src/loader.ts

@@ -4,22 +4,21 @@ import { promises } from 'fs';
 import { dirname, extname } from 'path';
 import { fileURLToPath, pathToFileURL, URL } from 'url';
 import type { Config, Extension, Options } from './config';
-import semverGtePkg from './deps/semver.js';
-import { defaults, fileExists, finalize, getDefault } from './utils';
+import { defaults, fileExists, finalize, getNodeVersion } from './utils';
 
 if (!process.env.KEEP_LOADER_ARGV) {
   const loaderArgIndex = process.execArgv.findIndex(v => v.startsWith('--loader'));
 
   if (loaderArgIndex !== -1) process.execArgv.splice(loaderArgIndex, 1);
 }
 
-const semverGte = getDefault(semverGtePkg);
-
 export const tsconfigPathsHandler = process.env.TSCONFIG_PATHS
   ? import('./deps/typescriptPaths.js').then(({ createHandler }) => createHandler())
   : undefined;
 
-const HAS_UPDATED_HOOKS = semverGte(process.versions.node, '16.12.0');
+const { major, minor } = getNodeVersion();
+
+const HAS_UPDATED_HOOKS = major > 16 || (major === 16 && minor >= 12);
 
 let config: Config;
 let esbuild: typeof import('esbuild');

packages/bob-tsm/src/utils.ts

@@ -123,3 +123,16 @@ export function debouncePromise<T extends unknown[]>(
 export function getDefault<T>(module: T & { default?: T }): T {
   return module.default || module;
 }
+
+export function getNodeVersion() {
+  const [major, minor, patch] = process.version
+    .slice(1)
+    .split('.')
+    .map(v => parseInt(v, 10)) as [major: number, minor: number, patch: number];
+
+  return {
+    major,
+    minor,
+    patch,
+  };
+}

packages/bob-watch/package.json

@@ -39,10 +39,10 @@
     "postpublish": "gh-release"
   },
   "devDependencies": {
-    "bob-esbuild": "workspace:^3.2.1",
+    "bob-esbuild": "workspace:^3.2.3",
     "bob-esbuild-cli": "workspace:^3.0.1",
-    "bob-tsm": "workspace:^0.4.0",
-    "chokidar": "^3.5.2",
+    "bob-tsm": "workspace:^0.4.5",
+    "chokidar": "^3.5.3",
     "commander": "^8.3.0",
     "execa": "^6.0.0",
     "tree-kill": "^1.2.2"

packages/bob/package.json

@@ -33,36 +33,36 @@
   "dependencies": {
     "@pnpm/types": "^7.9.0",
     "bob-esbuild-plugin": "workspace:3.1.3",
-    "rollup": "^2.64.0"
+    "rollup": "^2.66.0"
   },
   "devDependencies": {
     "@pnpm/exportable-manifest": "^2.2.4",
     "@rollup/plugin-json": "^4.1.0",
     "@types/folder-hash": "^4.0.1",
     "@types/fs-extra": "^9.0.13",
     "@types/lodash.get": "^4.4.6",
-    "@types/node": "^17.0.7",
+    "@types/node": "^17.0.10",
     "builtin-modules": "^3.2.0",
     "chalk": "^5.0.0",
     "changesets-github-release": "^0.0.4",
     "cosmiconfig": "^7.0.1",
     "date-fns": "^2.28.0",
-    "esbuild": "^0.14.11",
+    "esbuild": "^0.14.13",
     "execa": "^6.0.0",
     "fast-glob": "^3.2.11",
     "folder-hash": "^4.0.1",
     "fs-extra": "^10.0.0",
-    "globby": "^12.1.0",
+    "globby": "^12.2.0",
     "lodash.get": "^4.4.2",
     "rollup-plugin-delete": "^2.0.0",
     "rollup-plugin-node-externals": "^3.1.2",
     "rollup-plugin-tsconfig-paths": "^1.1.6",
     "tree-kill": "^1.2.2",
     "tsconfck": "^1.1.1",
-    "typescript": "^4.5.4"
+    "typescript": "^4.5.5"
   },
   "peerDependencies": {
-    "esbuild": ">=0.14.11",
+    "esbuild": ">=0.14.13",
     "typescript": "*"
   },
   "publishConfig": {

packages/esbuild-plugin/package.json

@@ -33,13 +33,13 @@
   },
   "devDependencies": {
     "changesets-github-release": "^0.0.4",
-    "esbuild": "^0.14.11",
-    "rollup": "^2.64.0",
+    "esbuild": "^0.14.13",
+    "rollup": "^2.66.0",
     "tsconfck": "^1.1.1",
     "tsup": "^5.11.11"
   },
   "peerDependencies": {
-    "esbuild": ">=0.14.11",
+    "esbuild": ">=0.14.13",
     "rollup": "*"
   },
   "publishConfig": {