@atlaspack/core 2.14.1-dev.118 → 2.14.1-dev.128

package/lib/Atlaspack.js

@@ -119,7 +119,6 @@ var _atlaspackV = require("./atlaspack-v3");
 var _AssetGraphRequest = _interopRequireDefault(require("./requests/AssetGraphRequest"));
 var _AssetGraphRequestRust = require("./requests/AssetGraphRequestRust");
 var _rustWorkerThreadDylibHack = require("./rustWorkerThreadDylibHack");
-var _isSuperPackage = require("./isSuperPackage");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -212,15 +211,13 @@ class Atlaspack {
       await lmdb.put('current_session_version', Buffer.from(version));
       rustAtlaspack = await _atlaspackV.AtlaspackV3.create({
         ...options,
-        corePath: _path().default.join( /*#__ATLASPACK_IGNORE__*/__dirname, '..'),
         threads: process.env.NODE_ENV === 'test' ? 2 : undefined,
         entries: Array.isArray(entries) ? entries : entries == null ? undefined : [entries],
         env: resolvedOptions.env,
         fs: inputFS && new _atlaspackV.FileSystemV3(inputFS),
         // $FlowFixMe ProjectPath is a string
         defaultTargetOptions: resolvedOptions.defaultTargetOptions,
-        lmdb,
-        isSuperPackage: (0, _isSuperPackage.isSuperPackage)()
+        lmdb
       });
     }
     this.rustAtlaspack = rustAtlaspack;

package/lib/atlaspack-v3/AtlaspackV3.js

@@ -19,7 +19,46 @@ function _diagnostic() {
   };
   return data;
 }
+var _isSuperPackage = require("../isSuperPackage");
+function _path() {
+  const data = _interopRequireDefault(require("path"));
+  _path = function () {
+    return data;
+  };
+  return data;
+}
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function getJsPaths() {
+  const dirname = /*#__ATLASPACK_IGNORE__*/__dirname;
+  if ((0, _isSuperPackage.isSuperPackage)()) {
+    // dirname: atlaspack/lib/core/core/atlaspack-v3
+    // core: atlaspack/lib/core/core/index.js
+    const corePath = _path().default.join(dirname, '..');
+    // esmodule helpers: atlaspack/lib/transformers/js/esmodule-helpers.js
+    const esmoduleHelpersPath = _path().default.join(dirname, '../../../transformers/js/esmodule-helpers.js');
+
+    // empty file: atlaspack/lib/core/core/_empty.js
+    const emptyFile = _path().default.join(dirname, '_empty.js');
+    return {
+      corePath,
+      esmoduleHelpersSpecifier: _path().default.relative(corePath, esmoduleHelpersPath),
+      esmoduleHelpersIncludeNodeModules: 'atlaspack',
+      emptyFile
+    };
+  }
+
+  // dirname: @atlaspack/core/lib/atlaspack-v3
+  // core: @atlaspack/core
+  const corePath = _path().default.join(dirname, '../..');
+  // empty file: atlaspack/lib/core/core/_empty.js
+  const emptyFile = _path().default.join(dirname, '_empty.js');
+  return {
+    corePath,
+    esmoduleHelpersSpecifier: '@atlaspack/transformer-js/src/esmodule-helpers.js',
+    esmoduleHelpersIncludeNodeModules: '@atlaspack/transformer-js',
+    emptyFile
+  };
+}
 class AtlaspackV3 {
   constructor(atlaspack_napi) {
     this._atlaspack_napi = atlaspack_napi;
@@ -40,7 +79,10 @@ class AtlaspackV3 {
       fs,
       packageManager,
       threads,
-      options,
+      options: {
+        ...options,
+        jsPaths: getJsPaths()
+      },
       napiWorkerPool
     }, lmdb);
     if (error !== null) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/core",
-  "version": "2.14.1-dev.118+f615781c0",
+  "version": "2.14.1-dev.128+6bc708e4e",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -20,21 +20,21 @@
     "check-ts": "tsc --noEmit index.d.ts"
   },
   "dependencies": {
-    "@atlaspack/build-cache": "2.13.3-dev.118+f615781c0",
-    "@atlaspack/cache": "2.13.3-dev.118+f615781c0",
-    "@atlaspack/diagnostic": "2.14.1-dev.118+f615781c0",
-    "@atlaspack/events": "2.14.1-dev.118+f615781c0",
-    "@atlaspack/feature-flags": "2.14.1-dev.118+f615781c0",
-    "@atlaspack/fs": "2.14.1-dev.118+f615781c0",
-    "@atlaspack/graph": "3.4.1-dev.118+f615781c0",
-    "@atlaspack/logger": "2.14.1-dev.118+f615781c0",
-    "@atlaspack/package-manager": "2.14.1-dev.118+f615781c0",
-    "@atlaspack/plugin": "2.14.1-dev.118+f615781c0",
-    "@atlaspack/profiler": "2.14.1-dev.118+f615781c0",
-    "@atlaspack/rust": "3.0.1-dev.118+f615781c0",
-    "@atlaspack/types": "2.14.1-dev.118+f615781c0",
-    "@atlaspack/utils": "2.14.1-dev.118+f615781c0",
-    "@atlaspack/workers": "2.14.1-dev.118+f615781c0",
+    "@atlaspack/build-cache": "2.13.3-dev.128+6bc708e4e",
+    "@atlaspack/cache": "2.13.3-dev.128+6bc708e4e",
+    "@atlaspack/diagnostic": "2.14.1-dev.128+6bc708e4e",
+    "@atlaspack/events": "2.14.1-dev.128+6bc708e4e",
+    "@atlaspack/feature-flags": "2.14.1-dev.128+6bc708e4e",
+    "@atlaspack/fs": "2.14.1-dev.128+6bc708e4e",
+    "@atlaspack/graph": "3.4.1-dev.128+6bc708e4e",
+    "@atlaspack/logger": "2.14.1-dev.128+6bc708e4e",
+    "@atlaspack/package-manager": "2.14.1-dev.128+6bc708e4e",
+    "@atlaspack/plugin": "2.14.1-dev.128+6bc708e4e",
+    "@atlaspack/profiler": "2.14.1-dev.128+6bc708e4e",
+    "@atlaspack/rust": "3.0.1-dev.128+6bc708e4e",
+    "@atlaspack/types": "2.14.1-dev.128+6bc708e4e",
+    "@atlaspack/utils": "2.14.1-dev.128+6bc708e4e",
+    "@atlaspack/workers": "2.14.1-dev.128+6bc708e4e",
     "@mischnic/json-sourcemap": "^0.1.0",
     "@parcel/source-map": "^2.1.1",
     "base-x": "^3.0.8",
@@ -63,9 +63,12 @@
       "default": "./lib/worker.js"
     }
   },
+  "atlaspackReferences": [
+    "_empty.js"
+  ],
   "browser": {
     "./src/serializerCore.js": "./src/serializerCore.browser.js"
   },
   "type": "commonjs",
-  "gitHead": "f615781c07b16806135476593869793c64e9f4b6"
+  "gitHead": "6bc708e4ef019a9c7dd1ecb0966cd546f1b04f05"
 }

package/src/Atlaspack.js

@@ -68,7 +68,6 @@ import createAssetGraphRequestJS from './requests/AssetGraphRequest';
 import {createAssetGraphRequestRust} from './requests/AssetGraphRequestRust';
 import type {AssetGraphRequestResult} from './requests/AssetGraphRequest';
 import {loadRustWorkerThreadDylibHack} from './rustWorkerThreadDylibHack';
-import {isSuperPackage} from './isSuperPackage';
 
 registerCoreWithSerializer();
 
@@ -177,7 +176,6 @@ export default class Atlaspack {
 
       rustAtlaspack = await AtlaspackV3.create({
         ...options,
-        corePath: path.join(/*#__ATLASPACK_IGNORE__*/ __dirname, '..'),
         threads: process.env.NODE_ENV === 'test' ? 2 : undefined,
         entries: Array.isArray(entries)
           ? entries
@@ -189,7 +187,6 @@ export default class Atlaspack {
         // $FlowFixMe ProjectPath is a string
         defaultTargetOptions: resolvedOptions.defaultTargetOptions,
         lmdb,
-        isSuperPackage: isSuperPackage(),
       });
     }
     this.rustAtlaspack = rustAtlaspack;

package/src/atlaspack-v3/AtlaspackV3.js

@@ -12,6 +12,8 @@ import {NapiWorkerPool} from './NapiWorkerPool';
 import ThrowableDiagnostic from '@atlaspack/diagnostic';
 import type {Event} from '@parcel/watcher';
 import type {NapiWorkerPool as INapiWorkerPool} from '@atlaspack/types';
+import {isSuperPackage} from '../isSuperPackage';
+import path from 'path';
 
 export type AtlaspackV3Options = {|
   fs?: AtlaspackNapiOptions['fs'],
@@ -23,9 +25,53 @@ export type AtlaspackV3Options = {|
   lmdb: Lmdb,
   featureFlags?: {[string]: string | boolean},
   napiWorkerPool?: INapiWorkerPool,
-  ...AtlaspackNapiOptions['options'],
+  ...$Diff<
+    AtlaspackNapiOptions['options'],
+    {|
+      jsPaths: AtlaspackNapiOptions['options']['jsPaths'],
+    |},
+  >,
 |};
 
+function getJsPaths(): AtlaspackNapiOptions['options']['jsPaths'] {
+  const dirname = /*#__ATLASPACK_IGNORE__*/ __dirname;
+
+  if (isSuperPackage()) {
+    // dirname: atlaspack/lib/core/core/atlaspack-v3
+    // core: atlaspack/lib/core/core/index.js
+    const corePath = path.join(dirname, '..');
+    // esmodule helpers: atlaspack/lib/transformers/js/esmodule-helpers.js
+    const esmoduleHelpersPath = path.join(
+      dirname,
+      '../../../transformers/js/esmodule-helpers.js',
+    );
+
+    // empty file: atlaspack/lib/core/core/_empty.js
+    const emptyFile = path.join(dirname, '_empty.js');
+
+    return {
+      corePath,
+      esmoduleHelpersSpecifier: path.relative(corePath, esmoduleHelpersPath),
+      esmoduleHelpersIncludeNodeModules: 'atlaspack',
+      emptyFile,
+    };
+  }
+
+  // dirname: @atlaspack/core/lib/atlaspack-v3
+  // core: @atlaspack/core
+  const corePath = path.join(dirname, '../..');
+  // empty file: atlaspack/lib/core/core/_empty.js
+  const emptyFile = path.join(dirname, '_empty.js');
+
+  return {
+    corePath,
+    esmoduleHelpersSpecifier:
+      '@atlaspack/transformer-js/src/esmodule-helpers.js',
+    esmoduleHelpersIncludeNodeModules: '@atlaspack/transformer-js',
+    emptyFile,
+  };
+}
+
 export class AtlaspackV3 {
   _atlaspack_napi: AtlaspackNapi;
 
@@ -52,7 +98,10 @@ export class AtlaspackV3 {
         fs,
         packageManager,
         threads,
-        options,
+        options: {
+          ...options,
+          jsPaths: getJsPaths(),
+        },
         napiWorkerPool,
       },
       lmdb,