@atlaspack/node-resolver-core 3.5.5-canary.36 → 3.5.5-canary.360

package/lib/Wrapper.js

@@ -71,12 +71,15 @@ function _featureFlags() {
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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; }
+// @ts-expect-error TS2305
+
 // Package.json fields. Must match package_json.rs.
 const MAIN = 1 << 0;
 const MODULE = 1 << 1;
 const SOURCE = 1 << 2;
 const BROWSER = 1 << 3;
 const TYPES = 1 << 6;
+const MODULE_ES2019 = 1 << 7;
 class NodeResolver {
   constructor(options) {
     this.options = options;
@@ -116,7 +119,7 @@ class NodeResolver {
         conditions: environmentToExportsConditions(options.env, this.options.mode),
         packageExports: this.options.packageExports ?? false,
         moduleDirResolver: process.versions.pnp != null ? (module, from) => {
-          // $FlowFixMe[prop-missing]
+          // @ts-expect-error TS2339
           let pnp = _module().default.findPnpApi(_path().default.dirname(from));
           return pnp.resolveToUnqualified(
           // append slash to force loading builtins from npm
@@ -137,16 +140,12 @@ class NodeResolver {
 
     // Async resolver is only supported in non-WASM environments, and does not support JS callbacks (e.g. FS, PnP).
     let canResolveAsync = !_rust().init && this.options.fs instanceof _fs().NodeFS && process.versions.pnp == null;
-    let res = canResolveAsync ?
-    // $FlowFixMe[incompatible-call] - parent is not null here.
-    await resolver.resolveAsync(options) :
-    // $FlowFixMe[incompatible-call] - parent is not null here.
-    resolver.resolve(options);
+    let res = canResolveAsync ? await resolver.resolveAsync(options) : resolver.resolve(options);
 
     // Invalidate whenever the .pnp.js file changes.
     // TODO: only when we actually resolve a node_modules package?
     if (process.versions.pnp != null && options.parent && res.invalidateOnFileChange) {
-      // $FlowFixMe[prop-missing]
+      // @ts-expect-error TS2339
       let pnp = _module().default.findPnpApi(_path().default.dirname(options.parent));
       res.invalidateOnFileChange.push(pnp.resolveToUnqualified('pnpapi', null));
     }
@@ -596,27 +595,33 @@ class NodeResolver {
 exports.default = NodeResolver;
 function environmentToExportsConditions(env, mode) {
   // These must match the values in package_json.rs.
-
+  const NODE = 1 << 3;
+  const BROWSER = 1 << 4;
+  const WORKER = 1 << 5;
+  const WORKLET = 1 << 6;
+  const ELECTRON = 1 << 7;
+  const DEVELOPMENT = 1 << 8;
+  const PRODUCTION = 1 << 9;
   let conditions = 0;
   if (env.isBrowser()) {
-    conditions |= 1 << 4;
+    conditions |= BROWSER;
   }
-  if (env.isWorker()) {
-    conditions |= 1 << 5;
+  if (env.isWorker() || env.isTesseract()) {
+    conditions |= WORKER;
   }
   if (env.isWorklet()) {
-    conditions |= 1 << 6;
+    conditions |= WORKLET;
   }
   if (env.isElectron()) {
-    conditions |= 1 << 7;
+    conditions |= ELECTRON;
   }
   if (env.isNode()) {
-    conditions |= 1 << 3;
+    conditions |= NODE;
   }
   if (mode === 'production') {
-    conditions |= 1 << 9;
+    conditions |= PRODUCTION;
   } else if (mode === 'development') {
-    conditions |= 1 << 8;
+    conditions |= DEVELOPMENT;
   }
   return conditions;
 }
@@ -630,6 +635,9 @@ function mainFieldsToEntries(mainFields) {
       case 'module':
         entries |= MODULE;
         break;
+      case 'module:es2019':
+        entries |= MODULE_ES2019;
+        break;
       case 'source':
         entries |= SOURCE;
         break;

package/lib/builtins.browser.js

@@ -6,9 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.empty = exports.default = void 0;
 const builtinModules = ['_http_agent', '_http_client', '_http_common', '_http_incoming', '_http_outgoing', '_http_server', '_stream_duplex', '_stream_passthrough', '_stream_readable', '_stream_transform', '_stream_wrap', '_stream_writable', '_tls_common', '_tls_wrap', 'assert', 'assert/strict', 'async_hooks', 'buffer', 'child_process', 'cluster', 'console', 'constants', 'crypto', 'dgram', 'diagnostics_channel', 'dns', 'dns/promises', 'domain', 'events', 'fs', 'fs/promises', 'http', 'http2', 'https', 'inspector', 'module', 'net', 'os', 'path', 'path/posix', 'path/win32', 'perf_hooks', 'process', 'punycode', 'querystring', 'readline', 'repl', 'stream', 'stream/consumers', 'stream/promises', 'stream/web', 'string_decoder', 'sys', 'timers', 'timers/promises', 'tls', 'trace_events', 'tty', 'url', 'util', 'util/types', 'v8', 'vm', 'worker_threads', 'zlib'];
 const empty = exports.empty = '/_empty.js';
-let builtins =
-// $FlowFixMe
-Object.create(null);
+let builtins = Object.create(null);
 
 // use definite (current) list of Node builtins
 for (let key of builtinModules) {

package/lib/builtins.js

@@ -20,12 +20,10 @@ function _nullthrows() {
 }
 var _package = _interopRequireDefault(require("../package.json"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-// $FlowFixMe this is untyped
 // flowlint-next-line untyped-import:off
+
 const empty = exports.empty = require.resolve('./_empty.js');
-let builtins =
-// $FlowFixMe
-Object.create(null);
+let builtins = Object.create(null);
 
 // use definite (current) list of Node builtins
 for (let key of _module().builtinModules) {
@@ -60,9 +58,11 @@ let polyfills = {
   zlib: 'browserify-zlib'
 };
 for (let k in polyfills) {
+  // @ts-expect-error TS7053
   let polyfill = polyfills[k];
   builtins[k] = {
     name: polyfill + (_module().builtinModules.includes(polyfill) ? '/' : ''),
+    // @ts-expect-error TS7053
     range: (0, _nullthrows().default)(_package.default.devDependencies[polyfill])
   };
 }

package/lib/index.js

@@ -25,4 +25,6 @@ function _rust() {
 }
 var _Wrapper = _interopRequireDefault(require("./Wrapper"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-const ResolverBase = exports.ResolverBase = _rust().Resolver;
+const ResolverBase = exports.ResolverBase = _rust().Resolver;
+
+// @ts-expect-error TS2305

package/lib/types/Wrapper.d.ts

@@ -0,0 +1,34 @@
+import type { FilePath, SpecifierType, SemverRange, Environment, SourceLocation, BuildMode, ResolveResult, PluginLogger, FileSystem, PackageManager } from '@atlaspack/types';
+import type { Diagnostic } from '@atlaspack/diagnostic';
+type Options = {
+    fs: FileSystem;
+    projectRoot: FilePath;
+    packageManager?: PackageManager;
+    logger?: PluginLogger;
+    shouldAutoInstall?: boolean;
+    mode: BuildMode;
+    mainFields?: Array<string>;
+    extensions?: Array<string>;
+    packageExports?: boolean;
+};
+type ResolveOptions = {
+    filename: FilePath;
+    parent: FilePath | null | undefined;
+    specifierType: SpecifierType;
+    range?: SemverRange | null | undefined;
+    env: Environment;
+    sourcePath?: FilePath | null | undefined;
+    loc?: SourceLocation | null | undefined;
+    packageConditions?: Array<string> | null | undefined;
+};
+export default class NodeResolver {
+    resolversByEnv: Map<string, any>;
+    options: Options;
+    constructor(options: Options);
+    resolve(options: ResolveOptions): Promise<ResolveResult | null | undefined>;
+    resolveBuiltin(name: string, options: ResolveOptions): Promise<ResolveResult | null | undefined>;
+    shouldIncludeNodeModule({ includeNodeModules }: Environment, name: string): boolean | null | undefined;
+    handleError(error: any, options: ResolveOptions): Promise<Diagnostic | Array<Diagnostic> | null | undefined>;
+    checkExcludedDependency(sourceFile: FilePath, name: string, options: ResolveOptions): Promise<Diagnostic | null | undefined>;
+}
+export {};

package/lib/types/builtins.browser.d.ts

@@ -0,0 +1,8 @@
+export declare const empty: string;
+declare let builtins: {
+    [key: string]: {
+        name: string;
+        range: string | null | undefined;
+    };
+};
+export default builtins;

package/lib/types/builtins.d.ts

@@ -0,0 +1,8 @@
+export declare const empty: string;
+declare let builtins: {
+    [key: string]: {
+        name: string;
+        range: string | null | undefined;
+    };
+};
+export default builtins;

package/lib/types/index.d.ts

@@ -0,0 +1,4 @@
+import { Resolver } from '@atlaspack/rust';
+export declare const ResolverBase: typeof Resolver;
+export { default } from './Wrapper';
+export { init } from '@atlaspack/rust';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/node-resolver-core",
-  "version": "3.5.5-canary.36+2d10c6656",
+  "version": "3.5.5-canary.360+fc3adc098",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -9,23 +9,25 @@
     "type": "git",
     "url": "https://github.com/atlassian-labs/atlaspack.git"
   },
-  "main": "lib/index.js",
-  "source": "src/index.js",
+  "main": "./lib/index.js",
+  "source": "./src/index.ts",
+  "types": "./lib/types/index.d.ts",
   "engines": {
     "node": ">= 16.0.0"
   },
   "scripts": {
-    "test": "mocha test"
+    "test": "mocha test",
+    "build:lib": "gulp build --gulpfile ../../../gulpfile.js --cwd ."
   },
   "files": [
     "lib"
   ],
   "dependencies": {
-    "@atlaspack/diagnostic": "2.14.1-canary.104+2d10c6656",
-    "@atlaspack/feature-flags": "2.14.1-canary.104+2d10c6656",
-    "@atlaspack/fs": "2.14.5-canary.36+2d10c6656",
-    "@atlaspack/rust": "3.2.1-canary.36+2d10c6656",
-    "@atlaspack/utils": "2.14.5-canary.36+2d10c6656",
+    "@atlaspack/diagnostic": "2.14.1-canary.428+fc3adc098",
+    "@atlaspack/feature-flags": "2.14.1-canary.428+fc3adc098",
+    "@atlaspack/fs": "2.14.5-canary.360+fc3adc098",
+    "@atlaspack/rust": "3.2.1-canary.360+fc3adc098",
+    "@atlaspack/utils": "2.14.5-canary.360+fc3adc098",
     "@mischnic/json-sourcemap": "^0.1.0",
     "nullthrows": "^1.1.1",
     "semver": "^7.5.2"
@@ -58,5 +60,5 @@
     "./src/builtins.js": "./src/builtins.browser.js"
   },
   "type": "commonjs",
-  "gitHead": "2d10c6656fc58743c5dbed1d2b6c5666887f9fe4"
-}
+  "gitHead": "fc3adc098f583e40d6d7687412cac6dde7cbb3f3"
+}