fix: Worker filename in cjs/mjs builds

Author: jedwards1211

.circleci/config.yml

@@ -19,13 +19,13 @@ jobs:
           command: pnpm install --frozen-lockfile
       - run:
           name: build
-          command: ASTX_WORKERS=1 pnpm prepublishOnly
+          command: pnpm prepublishOnly
       - run:
           name: upload test coverage
           command: pnpm codecov
       - run:
           name: release
-          command: ASTX_WORKERS=1 pnpm semantic-release
+          command: pnpm semantic-release
 workflows:
   version: 2
   build:

convertCjsBuild.ts

@@ -0,0 +1,8 @@
+import { TransformOptions } from './src'
+
+export async function astx({ astx }: TransformOptions): Promise<void> {
+  astx.find`require.resolve('$source')`().replace(
+    ({ $source }) =>
+      `require.resolve('${$source.stringValue.replace(/\.babel\.js$/, '.js')}')`
+  )
+}

convertImportsToMjs.ts renamed to convertMjsBuild.ts

@@ -71,7 +71,7 @@ export async function astx({ astx, file }: TransformOptions): Promise<void> {
   astx.find`new Worker(require.resolve('$source'))`().replace(
     ({ $source }) =>
       `new Worker(new URL('${$source.stringValue.replace(
-        /\.js$/,
+        /\.babel\.js$/,
         '.mjs'
       )}', import.meta.url))`
   )

package.json

@@ -30,7 +30,7 @@
   ],
   "astx": {
     "parser": "babel",
-    "workers": 0
+    "workers": 1
   },
   "main": "./cjs/index.js",
   "types": "./types/index.d.ts",
@@ -46,10 +46,10 @@
     "clean": "rimraf mjs cjs types",
     "build": "npm run clean && npm run build:types && npm run build:cjs && npm run check:cjs && npm run build:mjs && npm run check:mjs",
     "build:types": "tsc -p tsconfig.build.json && mkdir -p cjs && copy 'src/**/*.js.flow' cjs && mkdir -p mjs && copy 'src/**/*.js.flow' mjs",
-    "build:cjs": "cross-env BABEL_ENV=es5 babel src --out-dir cjs --extensions .ts",
-    "check:cjs": "node cjs/index.js && node cjs/node/index.js && node cjs/cli/index.js -f 'export type TransformOptions = $T' src",
-    "build:mjs": "cross-env OUTPUT_ESM=1 babel src --out-dir mjs --out-file-extension .mjs --extensions .ts --source-maps inline && babel-node --extensions .ts src/cli/index.ts -t convertImportsToMjs.ts --parser babel --workers 0 --no-gitignore -y 'mjs/**/*.mjs'",
-    "check:mjs": "node mjs/index.mjs && node mjs/node/index.mjs && node mjs/cli/index.mjs -f 'export type TransformOptions = $T' src",
+    "build:cjs": "cross-env BABEL_ENV=es5 babel src --out-dir cjs --extensions .ts && babel-node --extensions .ts src/cli/index.ts -t convertCjsBuild.ts --parser babel --no-gitignore -y cjs",
+    "check:cjs": "node cjs/cli/index.js -f 'export type TransformOptions = $T' src",
+    "build:mjs": "cross-env OUTPUT_ESM=1 babel src --out-dir mjs --out-file-extension .mjs --extensions .ts --source-maps inline && babel-node --extensions .ts src/cli/index.ts -t convertMjsBuild.ts --parser babel --no-gitignore -y mjs",
+    "check:mjs": "node mjs/cli/index.mjs -f 'export type TransformOptions = $T' src",
     "test": "cross-env NODE_ENV=test BABEL_ENV=coverage nyc --reporter=lcov --reporter=text mocha $npm_package_config_mocha",
     "test:watch": "cross-env NODE_ENV=test BABEL_ENV=test mocha $npm_package_config_mocha --watch",
     "test:debug": "cross-env NODE_ENV=test BABEL_ENV=test mocha --inspect-brk $npm_package_config_mocha",

src/node/AstxWorker.ts

@@ -27,10 +27,7 @@ export default class AstxWorker {
 
   private startWorker() {
     if (this.ended) return
-    const worker =
-      typeof __filename !== 'undefined' && __filename.endsWith('.ts')
-        ? new Worker(require.resolve('./AstxWorkerEntry.babel.js'))
-        : new Worker(require.resolve('./AstxWorkerEntry.js'))
+    const worker = new Worker(require.resolve('./AstxWorkerEntry.babel.js'))
     this.worker = worker
     worker.once('exit', async () => {
       this.worker = undefined