@atlaspack/package-manager 2.14.28 → 2.14.29

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaspack/package-manager
 
+## 2.14.29
+
+### Patch Changes
+
+- [#764](https://github.com/atlassian-labs/atlaspack/pull/764) [`58ddd5d`](https://github.com/atlassian-labs/atlaspack/commit/58ddd5d79adde2ac5dc4c60ca575e4705a91e592) Thanks [@mattcompiles](https://github.com/mattcompiles)! - Fix using Atlaspack linked with source files
+
+- Updated dependencies [[`53dd47b`](https://github.com/atlassian-labs/atlaspack/commit/53dd47bd6d23cd47f87297347f03a609ab38a03d)]:
+  - @atlaspack/node-resolver-core@3.7.0
+  - @atlaspack/fs@2.15.24
+  - @atlaspack/utils@2.19.1
+  - @atlaspack/logger@2.14.21
+  - @atlaspack/types@2.15.19
+  - @atlaspack/workers@2.14.29
+
 ## 2.14.28
 
 ### Patch Changes

package/lib/NodePackageManager.js

@@ -110,6 +110,7 @@ if (process.env.ATLASPACK_REGISTER_USE_SRC === 'true') {
   ENTRIES |= SOURCE;
 }
 const NODE_MODULES = `${_path().default.sep}node_modules${_path().default.sep}`;
+const compileExtensions = new Set(['.ts', '.tsx', '.mts', '.cts']);
 
 // There can be more than one instance of NodePackageManager, but node has only a single module cache.
 // Therefore, the resolution cache and the map of parent to child modules should also be global.
@@ -130,6 +131,9 @@ class NodePackageManager {
     this.projectRoot = projectRoot;
     this.installer = installer;
 
+    // If using src then assume we're linked and find the link root dir
+    this.atlaspackLinkRoot = process.env.ATLASPACK_REGISTER_USE_SRC === 'true' ? _path().default.resolve(__dirname, '../../../..') : null;
+
     // @ts-expect-error TS2339
     this.currentExtensions = Object.keys(_module().default._extensions).map(e => e.substring(1));
   }
@@ -245,32 +249,52 @@ class NodePackageManager {
     _fs2().default.statSync = filename => {
       return this.fs.statSync(filename);
     };
-    if (!filePath.includes(NODE_MODULES)) {
-      let extname = _path().default.extname(filePath);
-      if ((extname === '.ts' || extname === '.tsx' || extname === '.mts' || extname === '.cts') &&
+    let extname = _path().default.extname(filePath);
+    function shouldCompile(atlaspackLinkRoot) {
+      if (filePath.includes(NODE_MODULES)) {
+        // Don't compile node_modules
+        return false;
+      }
+      if (!compileExtensions.has(extname)) {
+        // Ignore non-TS files
+        return false;
+      }
+      if (atlaspackLinkRoot != null) {
+        // If we're linked, only compile files outside the linked atlaspack
+        // as those are handled by @atlaspack/babel-register
+        return !filePath.startsWith(atlaspackLinkRoot);
+      }
+
       // @ts-expect-error TS2339
-      !_module().default._extensions[extname]) {
-        // @ts-expect-error TS2339
-        let compile = m._compile;
-        // @ts-expect-error TS2339
-        m._compile = (code, filename) => {
-          let out = (0, _core().transformSync)(code, {
-            filename,
-            module: {
-              type: 'commonjs'
+      // Lastly make sure there's no existing loader for this extension
+      return !_module().default._extensions[extname];
+    }
+    if (shouldCompile(this.atlaspackLinkRoot)) {
+      // @ts-expect-error TS2339
+      let compile = m._compile;
+      // @ts-expect-error TS2339
+      m._compile = (code, filename) => {
+        let out = (0, _core().transformSync)(code, {
+          filename,
+          module: {
+            type: 'commonjs'
+          },
+          env: {
+            targets: {
+              node: '18'
             }
-          });
-          compile.call(m, out.code, filename);
-        };
+          }
+        });
+        compile.call(m, out.code, filename);
+      };
 
+      // @ts-expect-error TS2339
+      _module().default._extensions[extname] = (m, filename) => {
         // @ts-expect-error TS2339
-        _module().default._extensions[extname] = (m, filename) => {
-          // @ts-expect-error TS2339
-          delete _module().default._extensions[extname];
-          // @ts-expect-error TS2339
-          _module().default._extensions['.js'](m, filename);
-        };
-      }
+        delete _module().default._extensions[extname];
+        // @ts-expect-error TS2339
+        _module().default._extensions['.js'](m, filename);
+      };
     }
     try {
       // @ts-expect-error TS2339

package/lib/types/NodePackageManager.d.ts

@@ -7,6 +7,7 @@ export declare class NodePackageManager implements PackageManager {
     installer: PackageInstaller | null | undefined;
     resolver: ResolverBase;
     currentExtensions: Array<string>;
+    atlaspackLinkRoot: string | null;
     constructor(fs: FileSystem, projectRoot: FilePath, installer?: PackageInstaller | null);
     _createResolver(): ResolverBase;
     static deserialize(opts: any): NodePackageManager;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/package-manager",
-  "version": "2.14.28",
+  "version": "2.14.29",
   "description": "Blazing fast, zero configuration web application bundler",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
@@ -41,12 +41,12 @@
   "dependencies": {
     "@atlaspack/build-cache": "2.13.5",
     "@atlaspack/diagnostic": "2.14.3",
-    "@atlaspack/fs": "2.15.23",
-    "@atlaspack/logger": "2.14.20",
-    "@atlaspack/node-resolver-core": "3.6.4",
-    "@atlaspack/types": "2.15.18",
-    "@atlaspack/utils": "2.19.0",
-    "@atlaspack/workers": "2.14.28",
+    "@atlaspack/fs": "2.15.24",
+    "@atlaspack/logger": "2.14.21",
+    "@atlaspack/node-resolver-core": "3.7.0",
+    "@atlaspack/types": "2.15.19",
+    "@atlaspack/utils": "2.19.1",
+    "@atlaspack/workers": "2.14.29",
     "@swc/core": "^1.10.0",
     "semver": "^7.5.2",
     "command-exists": "^1.2.6",

package/src/NodePackageManager.ts

@@ -46,6 +46,7 @@ if (process.env.ATLASPACK_REGISTER_USE_SRC === 'true') {
 }
 
 const NODE_MODULES = `${path.sep}node_modules${path.sep}`;
+const compileExtensions = new Set(['.ts', '.tsx', '.mts', '.cts']);
 
 // There can be more than one instance of NodePackageManager, but node has only a single module cache.
 // Therefore, the resolution cache and the map of parent to child modules should also be global.
@@ -65,6 +66,7 @@ export class NodePackageManager implements PackageManager {
   // @ts-expect-error TS2749
   resolver: ResolverBase;
   currentExtensions: Array<string>;
+  atlaspackLinkRoot: string | null;
 
   constructor(
     fs: FileSystem,
@@ -75,6 +77,12 @@ export class NodePackageManager implements PackageManager {
     this.projectRoot = projectRoot;
     this.installer = installer;
 
+    // If using src then assume we're linked and find the link root dir
+    this.atlaspackLinkRoot =
+      process.env.ATLASPACK_REGISTER_USE_SRC === 'true'
+        ? path.resolve(__dirname, '../../../..')
+        : null;
+
     // @ts-expect-error TS2339
     this.currentExtensions = Object.keys(Module._extensions).map((e) =>
       e.substring(1),
@@ -215,32 +223,50 @@ export class NodePackageManager implements PackageManager {
       return this.fs.statSync(filename);
     };
 
-    if (!filePath.includes(NODE_MODULES)) {
-      let extname = path.extname(filePath);
-      if (
-        (extname === '.ts' ||
-          extname === '.tsx' ||
-          extname === '.mts' ||
-          extname === '.cts') &&
-        // @ts-expect-error TS2339
-        !Module._extensions[extname]
-      ) {
-        // @ts-expect-error TS2339
-        let compile = m._compile;
-        // @ts-expect-error TS2339
-        m._compile = (code: any, filename: any) => {
-          let out = transformSync(code, {filename, module: {type: 'commonjs'}});
-          compile.call(m, out.code, filename);
-        };
+    let extname = path.extname(filePath);
 
-        // @ts-expect-error TS2339
-        Module._extensions[extname] = (m: any, filename: any) => {
-          // @ts-expect-error TS2339
-          delete Module._extensions[extname];
-          // @ts-expect-error TS2339
-          Module._extensions['.js'](m, filename);
-        };
+    function shouldCompile(atlaspackLinkRoot: string | null): boolean {
+      if (filePath.includes(NODE_MODULES)) {
+        // Don't compile node_modules
+        return false;
+      }
+
+      if (!compileExtensions.has(extname)) {
+        // Ignore non-TS files
+        return false;
+      }
+
+      if (atlaspackLinkRoot != null) {
+        // If we're linked, only compile files outside the linked atlaspack
+        // as those are handled by @atlaspack/babel-register
+        return !filePath.startsWith(atlaspackLinkRoot);
       }
+
+      // @ts-expect-error TS2339
+      // Lastly make sure there's no existing loader for this extension
+      return !Module._extensions[extname];
+    }
+
+    if (shouldCompile(this.atlaspackLinkRoot)) {
+      // @ts-expect-error TS2339
+      let compile = m._compile;
+      // @ts-expect-error TS2339
+      m._compile = (code: any, filename: any) => {
+        let out = transformSync(code, {
+          filename,
+          module: {type: 'commonjs'},
+          env: {targets: {node: '18'}},
+        });
+        compile.call(m, out.code, filename);
+      };
+
+      // @ts-expect-error TS2339
+      Module._extensions[extname] = (m: any, filename: any) => {
+        // @ts-expect-error TS2339
+        delete Module._extensions[extname];
+        // @ts-expect-error TS2339
+        Module._extensions['.js'](m, filename);
+      };
     }
 
     try {