@atlaspack/package-manager 2.14.21-typescript-bc4459c37.0 → 2.14.21

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @atlaspack/package-manager
 
+## 2.14.21
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @atlaspack/fs@2.15.16
+  - @atlaspack/types@2.15.11
+  - @atlaspack/workers@2.14.21
+  - @atlaspack/utils@2.17.3
+  - @atlaspack/node-resolver-core@3.5.21
+
 ## 2.14.20
 
 ### Patch Changes

package/index.d.ts

@@ -0,0 +1,40 @@
+import type {
+  FilePath,
+  PackageInstaller,
+  PackageManager,
+  PackageManagerResolveResult,
+} from '@atlaspack/types';
+import type {FileSystem} from '@atlaspack/fs';
+
+export type {PackageManagerResolveResult};
+export type {PackageManagerResolveResult as ResolveResult};
+
+export type {
+  PackageManager,
+  InstallOptions,
+  InstallerOptions,
+  PackageInstaller,
+  Invalidations,
+  ModuleRequest,
+} from '@atlaspack/types';
+
+export const Npm: {
+  new (): PackageInstaller;
+};
+export const Pnpm: {
+  new (): PackageInstaller;
+};
+export const Yarn: {
+  new (): PackageInstaller;
+};
+
+export const MockPackageInstaller: {
+  new (): PackageInstaller;
+};
+export const NodePackageManager: {
+  new (
+    fs: FileSystem,
+    projectRoot: FilePath,
+    installer?: PackageInstaller,
+  ): PackageManager;
+};

package/lib/JSONParseStream.js

@@ -23,12 +23,13 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 // Pair with split2 to parse stream of newline-delimited text.
 class JSONParseStream extends _stream().Transform {
   constructor(options) {
-    // @ts-expect-error TS2698
     super({
       ...options,
       objectMode: true
     });
   }
+
+  // $FlowFixMe We are in object mode, so we emit objects, not strings
   _transform(chunk, encoding, callback) {
     try {
       let parsed;

package/lib/NodePackageManager.js

@@ -123,18 +123,14 @@ const invalidationsCache = new Map();
 // See https://github.com/nodejs/node/blob/master/lib/internal/modules/cjs/loader.js
 // for reference to Node internals.
 class NodePackageManager {
-  // @ts-expect-error TS2749
-
   constructor(fs, projectRoot, installer) {
     this.fs = fs;
     this.projectRoot = projectRoot;
     this.installer = installer;
 
-    // @ts-expect-error TS2339
+    // $FlowFixMe - no type for _extensions
     this.currentExtensions = Object.keys(_module().default._extensions).map(e => e.substring(1));
   }
-
-  // @ts-expect-error TS2749
   _createResolver() {
     return new (_nodeResolverCore().ResolverBase)(this.projectRoot, {
       fs: this.fs instanceof _fs().NodeFS && process.versions.pnp == null ? undefined : {
@@ -147,7 +143,7 @@ class NodePackageManager {
       entries: ENTRIES,
       packageExports: true,
       moduleDirResolver: process.versions.pnp != null ? (module, from) => {
-        // @ts-expect-error TS2339
+        // $FlowFixMe[prop-missing]
         let pnp = _module().default.findPnpApi(_path().default.dirname(from));
         return pnp.resolveToUnqualified(
         // append slash to force loading builtins from npm
@@ -185,9 +181,10 @@ class NodePackageManager {
 
       // On Windows, Node requires absolute paths to be file URLs.
       if (process.platform === 'win32' && _path().default.isAbsolute(resolved)) {
-        // @ts-expect-error TS2322
         resolved = (0, _url().pathToFileURL)(resolved);
       }
+
+      // $FlowFixMe
       return import(resolved);
     }
     return this.load(resolved, from);
@@ -201,19 +198,20 @@ class NodePackageManager {
   load(filePath, from) {
     if (!_path().default.isAbsolute(filePath)) {
       // Node builtin module
+      // $FlowFixMe
       return require(filePath);
     }
 
-    // @ts-expect-error TS2339
+    // $FlowFixMe[prop-missing]
     const cachedModule = _module().default._cache[filePath];
     if (cachedModule !== undefined) {
       return cachedModule.exports;
     }
 
-    // @ts-expect-error TS2339
+    // $FlowFixMe
     let m = new (_module().default)(filePath, _module().default._cache[from] || module.parent);
 
-    // @ts-expect-error TS2339
+    // $FlowFixMe _extensions not in type
     const extensions = Object.keys(_module().default._extensions);
     // This handles supported extensions changing due to, for example, esbuild/register being used
     // We assume that the extension list will change in size - as these tools usually add support for
@@ -223,7 +221,7 @@ class NodePackageManager {
       this.resolver = this._createResolver();
     }
 
-    // @ts-expect-error TS2339
+    // $FlowFixMe[prop-missing]
     _module().default._cache[filePath] = m;
 
     // Patch require within this module so it goes through our require
@@ -236,23 +234,21 @@ class NodePackageManager {
       readFileSync,
       statSync
     } = _fs2().default;
-    // @ts-expect-error TS2322
+    // $FlowFixMe
     _fs2().default.readFileSync = (filename, encoding) => {
       return this.fs.readFileSync(filename, encoding);
     };
 
-    // @ts-expect-error TS2540
+    // $FlowFixMe
     _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') &&
-      // @ts-expect-error TS2339
+      // $FlowFixMe
       !_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,
@@ -263,25 +259,25 @@ class NodePackageManager {
           compile.call(m, out.code, filename);
         };
 
-        // @ts-expect-error TS2339
+        // $FlowFixMe
         _module().default._extensions[extname] = (m, filename) => {
-          // @ts-expect-error TS2339
+          // $FlowFixMe
           delete _module().default._extensions[extname];
-          // @ts-expect-error TS2339
+          // $FlowFixMe
           _module().default._extensions['.js'](m, filename);
         };
       }
     }
     try {
-      // @ts-expect-error TS2339
       m.load(filePath);
     } catch (err) {
-      // @ts-expect-error TS2339
+      // $FlowFixMe[prop-missing]
       delete _module().default._cache[filePath];
       throw err;
     } finally {
+      // $FlowFixMe
       _fs2().default.readFileSync = readFileSync;
-      // @ts-expect-error TS2540
+      // $FlowFixMe
       _fs2().default.statSync = statSync;
     }
     return m.exports;
@@ -304,7 +300,7 @@ class NodePackageManager {
                 hints: ['Autoinstall is disabled, please install this package manually and restart Parcel.']
               }
             });
-            // @ts-expect-error TS2339
+            // $FlowFixMe - needed for loadParcelPlugin
             err.code = 'MODULE_NOT_FOUND';
             throw err;
           } else {
@@ -327,7 +323,6 @@ class NodePackageManager {
         }
         throw new (_diagnostic().default)({
           diagnostic: conflicts.fields.map(field => ({
-            // @ts-expect-error TS2345
             message: (0, _diagnostic().md)`Could not find module "${name}", but it was listed in package.json. Run your package manager first.`,
             origin: '@atlaspack/package-manager',
             codeFrames: [{
@@ -361,7 +356,6 @@ class NodePackageManager {
           } else if (conflicts != null) {
             throw new (_diagnostic().default)({
               diagnostic: {
-                // @ts-expect-error TS2345
                 message: (0, _diagnostic().md)`Could not find module "${name}" satisfying ${range}.`,
                 origin: '@atlaspack/package-manager',
                 codeFrames: [{
@@ -378,10 +372,8 @@ class NodePackageManager {
             });
           }
           let version = pkg === null || pkg === void 0 ? void 0 : pkg.version;
-          // @ts-expect-error TS2345
           let message = (0, _diagnostic().md)`Could not resolve package "${name}" that satisfies ${range}.`;
           if (version != null) {
-            // @ts-expect-error TS2345
             message += (0, _diagnostic().md)` Found ${version}.`;
           }
           throw new (_diagnostic().default)({
@@ -460,8 +452,6 @@ class NodePackageManager {
         if (!resolved || !_path().default.isAbsolute(resolved.resolved)) {
           return;
         }
-
-        // @ts-expect-error TS2345
         res.invalidateOnFileCreate.push(...resolved.invalidateOnFileCreate);
         res.invalidateOnFileChange.add(resolved.resolved);
         for (let file of resolved.invalidateOnFileChange) {
@@ -480,25 +470,17 @@ class NodePackageManager {
       // cannot be intercepted. Instead, ask the resolver to parse the file and recursively analyze the deps.
       if (resolved.type === 2) {
         let invalidations = this.resolver.getInvalidations(resolved.resolved);
-        // @ts-expect-error TS7006
         invalidations.invalidateOnFileChange.forEach(i => res.invalidateOnFileChange.add(i));
-        // @ts-expect-error TS7006
-        invalidations.invalidateOnFileCreate.forEach(i =>
-        // @ts-expect-error TS2345
-        res.invalidateOnFileCreate.push(i));
+        invalidations.invalidateOnFileCreate.forEach(i => res.invalidateOnFileCreate.push(i));
         res.invalidateOnStartup ||= invalidations.invalidateOnStartup;
         if (res.invalidateOnStartup) {
           _logger().default.warn({
-            // @ts-expect-error TS2345
             message: (0, _diagnostic().md)`${_path().default.relative(this.projectRoot, resolved.resolved)} contains non-statically analyzable dependencies in its module graph. This causes Parcel to invalidate the cache on startup.`,
             origin: '@atlaspack/package-manager'
           });
         }
       }
-
-      // @ts-expect-error TS2345
       invalidationsCache.set(resolved.resolved, res);
-      // @ts-expect-error TS2322
       return res;
     }
     return {
@@ -531,10 +513,10 @@ class NodePackageManager {
       }
       invalidationsCache.delete(resolved.resolved);
 
-      // @ts-expect-error TS2339
+      // $FlowFixMe
       let module = _module().default._cache[resolved.resolved];
       if (module) {
-        // @ts-expect-error TS2339
+        // $FlowFixMe
         delete _module().default._cache[resolved.resolved];
       }
       let moduleChildren = children.get(resolved.resolved);
@@ -563,17 +545,16 @@ class NodePackageManager {
     // Invalidate whenever the .pnp.js file changes.
     // TODO: only when we actually resolve a node_modules package?
     if (process.versions.pnp != null && res.invalidateOnFileChange) {
-      // @ts-expect-error TS2339
+      // $FlowFixMe[prop-missing]
       let pnp = _module().default.findPnpApi(_path().default.dirname(from));
       res.invalidateOnFileChange.push(pnp.resolveToUnqualified('pnpapi', null));
     }
     if (res.error) {
       let e = new Error(`Could not resolve module "${name}" from "${from}"`);
-      // @ts-expect-error TS2339
+      // $FlowFixMe
       e.code = 'MODULE_NOT_FOUND';
       throw e;
     }
-    // @ts-expect-error TS7034
     let getPkg;
     switch (res.resolution.type) {
       case 'Path':
@@ -589,7 +570,6 @@ class NodePackageManager {
           invalidateOnFileCreate: res.invalidateOnFileCreate,
           type: res.moduleType,
           get pkg() {
-            // @ts-expect-error TS7005
             return getPkg();
           }
         };

package/lib/Npm.js

@@ -36,8 +36,7 @@ var _promiseFromProcess = _interopRequireDefault(require("./promiseFromProcess")
 var _utils = require("./utils");
 var _package = _interopRequireDefault(require("../package.json"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-// @ts-expect-error TS7016
-
+// $FlowFixMe
 const NPM_CMD = 'npm';
 class Npm {
   async install({

package/lib/Pnpm.js

@@ -58,12 +58,7 @@ var _promiseFromProcess = _interopRequireDefault(require("./promiseFromProcess")
 var _utils = require("./utils");
 var _package = _interopRequireDefault(require("../package.json"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-// @ts-expect-error TS7016
-
-// @ts-expect-error TS7016
-
-// @ts-expect-error TS7016
-
+// $FlowFixMe
 const PNPM_CMD = 'pnpm';
 let hasPnpm;
 let pnpmVersion;
@@ -86,7 +81,6 @@ class Pnpm {
   }) {
     if (pnpmVersion == null) {
       let version = await (0, _utils.exec)('pnpm --version');
-      // @ts-expect-error TS2345
       pnpmVersion = parseInt(version.stdout, 10);
     }
     let args = ['add', '--reporter', 'ndjson'];
@@ -115,11 +109,7 @@ class Pnpm {
       cwd,
       env
     });
-    installProcess.stdout.pipe((0, _split().default)())
-    // @ts-expect-error TS2554
-    .pipe(new _JSONParseStream.default())
-    // @ts-expect-error TS7006
-    .on('error', e => {
+    installProcess.stdout.pipe((0, _split().default)()).pipe(new _JSONParseStream.default()).on('error', e => {
       _logger().default.warn({
         origin: '@atlaspack/package-manager',
         message: e.chunk,
@@ -143,13 +133,9 @@ class Pnpm {
       }
     });
     let stderr = [];
-    installProcess.stderr
-    // @ts-expect-error TS7006
-    .on('data', str => {
+    installProcess.stderr.on('data', str => {
       stderr.push(str.toString());
-    })
-    // @ts-expect-error TS7006
-    .on('error', e => {
+    }).on('error', e => {
       _logger().default.warn({
         origin: '@atlaspack/package-manager',
         message: e.message

package/lib/Yarn.js

@@ -44,12 +44,7 @@ var _promiseFromProcess = _interopRequireDefault(require("./promiseFromProcess")
 var _utils = require("./utils");
 var _package = _interopRequireDefault(require("../package.json"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-// @ts-expect-error TS7016
-
-// @ts-expect-error TS7016
-
-// @ts-expect-error TS7016
-
+// $FlowFixMe
 const YARN_CMD = 'yarn';
 let hasYarn;
 let yarnVersion;
@@ -72,7 +67,6 @@ class Yarn {
   }) {
     if (yarnVersion == null) {
       let version = await (0, _utils.exec)('yarn --version');
-      // @ts-expect-error TS2345
       yarnVersion = parseInt(version.stdout, 10);
     }
     let args = ['add', '--json'].concat(modules.map(_utils.npmSpecifierFromModuleRequest));
@@ -98,11 +92,7 @@ class Yarn {
     });
     installProcess.stdout
     // Invoking yarn with --json provides streaming, newline-delimited JSON output.
-    .pipe((0, _split().default)())
-    // @ts-expect-error TS2554
-    .pipe(new _JSONParseStream.default())
-    // @ts-expect-error TS7006
-    .on('error', e => {
+    .pipe((0, _split().default)()).pipe(new _JSONParseStream.default()).on('error', e => {
       _logger().default.error(e, '@atlaspack/package-manager');
     }).on('data', message => {
       switch (message.type) {
@@ -121,11 +111,7 @@ class Yarn {
       }
     });
 
-    installProcess.stderr.pipe((0, _split().default)())
-    // @ts-expect-error TS2554
-    .pipe(new _JSONParseStream.default())
-    // @ts-expect-error TS7006
-    .on('error', e => {
+    installProcess.stderr.pipe((0, _split().default)()).pipe(new _JSONParseStream.default()).on('error', e => {
       _logger().default.error(e, '@atlaspack/package-manager');
     }).on('data', message => {
       switch (message.type) {

package/lib/getCurrentPackageManager.js

@@ -4,9 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = getCurrentPackageManager;
-function getCurrentPackageManager(
-// @ts-expect-error TS2322
-userAgent = process.env.npm_config_user_agent) {
+function getCurrentPackageManager(userAgent = process.env.npm_config_user_agent) {
   if (!userAgent) {
     return undefined;
   }

package/lib/index.d.ts

@@ -1,10 +1,10 @@
-import type { PackageManagerResolveResult } from '@atlaspack/types';
-export type { PackageManager, Invalidations, PackageInstaller, ModuleRequest, } from '@atlaspack/types';
-export * from './Npm';
-export * from './Pnpm';
-export * from './Yarn';
-export * from './MockPackageInstaller';
-export * from './NodePackageManager';
-export { _addToInstallQueue } from './installPackage';
+import type { PackageManagerResolveResult } from "@atlaspack/types";
+export type { PackageManager, Invalidations, PackageInstaller, ModuleRequest } from "@atlaspack/types";
+export * from "./Npm";
+export * from "./Pnpm";
+export * from "./Yarn";
+export * from "./MockPackageInstaller";
+export * from "./NodePackageManager";
+export { _addToInstallQueue } from "./installPackage";
 export type { PackageManagerResolveResult };
 export type { PackageManagerResolveResult as ResolveResult };

package/lib/installPackage.js

@@ -116,7 +116,6 @@ async function installPeerDependencies(fs, packageManager, module, from, project
       if (!_semver().default.satisfies(pkg.version, range)) {
         throw new (_diagnostic().default)({
           diagnostic: {
-            // @ts-expect-error TS2345
             message: (0, _diagnostic().md)`Could not install the peer dependency "${name}" for "${module.name}", installed version ${pkg.version} is incompatible with ${range}`,
             origin: '@atlaspack/package-manager',
             codeFrames: [{

package/lib/nodejsConditions.js

@@ -15,7 +15,6 @@ function _process() {
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 // https://nodejs.org/api/packages.html#conditional-exports
 // TODO We don't support { "type": "module" }
-// @ts-expect-error TS4104
 const defaultNodejsConditions = exports.defaultNodejsConditions = Object.freeze(['node-addons', 'node',
 // 'import',
 'require', 'module-sync', 'default']);
@@ -27,15 +26,10 @@ function getConditionsFromEnv() {
     const conditions = [];
     for (const arg of [..._process().default.execArgv, ...(_process().default.env.NODE_OPTIONS || '').split(' ')]) {
       if (arg.startsWith('--conditions=')) {
-        // @ts-expect-error TS2345
         conditions.push(arg.substring(13));
       }
     }
-
-    // @ts-expect-error TS4104
     envConditions = Object.freeze([...conditions, ...defaultNodejsConditions]);
   }
-
-  // @ts-expect-error TS2322
   return envConditions;
 }

package/lib/promiseFromProcess.js

@@ -12,8 +12,6 @@ function promiseFromProcess(childProcess) {
         reject(new Error('Child process failed'));
         return;
       }
-
-      // @ts-expect-error TS2794
       resolve();
     });
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/package-manager",
-  "version": "2.14.21-typescript-bc4459c37.0",
+  "version": "2.14.21",
   "description": "Blazing fast, zero configuration web application bundler",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
@@ -10,14 +10,15 @@
     "type": "git",
     "url": "https://github.com/atlassian-labs/atlaspack.git"
   },
-  "main": "./lib/index.js",
-  "source": "./src/index.ts",
-  "types": "./lib/index.d.ts",
+  "main": "lib/index.js",
+  "source": "src/index.js",
+  "types": "index.d.ts",
   "engines": {
     "node": ">= 16.0.0"
   },
   "scripts": {
-    "check-ts": "tsc --emitDeclarationOnly --rootDir src",
+    "build-ts": "mkdir -p lib && flow-to-ts src/index.js > lib/index.d.ts",
+    "check-ts": "tsc --noEmit index.d.ts",
     "test": "mocha test"
   },
   "targets": {
@@ -38,19 +39,19 @@
     }
   },
   "dependencies": {
-    "@atlaspack/build-cache": "2.13.4-typescript-bc4459c37.0",
-    "@atlaspack/diagnostic": "2.14.2-typescript-bc4459c37.0",
-    "@atlaspack/fs": "2.15.16-typescript-bc4459c37.0",
-    "@atlaspack/logger": "2.14.14-typescript-bc4459c37.0",
-    "@atlaspack/node-resolver-core": "3.5.21-typescript-bc4459c37.0",
-    "@atlaspack/types": "2.15.11-typescript-bc4459c37.0",
-    "@atlaspack/utils": "2.17.3-typescript-bc4459c37.0",
-    "@atlaspack/workers": "2.14.21-typescript-bc4459c37.0",
+    "@atlaspack/build-cache": "2.13.3",
+    "@atlaspack/diagnostic": "2.14.1",
+    "@atlaspack/fs": "2.15.16",
+    "@atlaspack/logger": "2.14.13",
+    "@atlaspack/node-resolver-core": "3.5.21",
+    "@atlaspack/types": "2.15.11",
+    "@atlaspack/utils": "2.17.3",
+    "@atlaspack/workers": "2.14.21",
     "@swc/core": "^1.10.0",
+    "semver": "^7.5.2",
     "command-exists": "^1.2.6",
     "cross-spawn": "^6.0.4",
     "nullthrows": "^1.1.1",
-    "semver": "^7.5.2",
     "split2": "^3.1.1"
   },
   "browser": {
@@ -59,6 +60,5 @@
     "./src/Pnpm.js": false,
     "./src/Yarn.js": false
   },
-  "type": "commonjs",
-  "gitHead": "bc4459c37a38ef1f74772126637e1d8841d1fcb0"
-}
+  "type": "commonjs"
+}

package/src/{JSONParseStream.ts → JSONParseStream.js}

@@ -1,3 +1,5 @@
+// @flow strict-local
+
 import type {JSONObject} from '@atlaspack/types';
 
 import logger from '@atlaspack/logger';
@@ -6,24 +8,21 @@ import {Transform} from 'stream';
 // Transforms chunks of json strings to parsed objects.
 // Pair with split2 to parse stream of newline-delimited text.
 export default class JSONParseStream extends Transform {
-  constructor(options: unknown) {
-    // @ts-expect-error TS2698
+  constructor(options: mixed) {
     super({...options, objectMode: true});
   }
 
+  // $FlowFixMe We are in object mode, so we emit objects, not strings
   _transform(
     chunk: Buffer | string,
     encoding: string,
-    callback: (
-      err?: Error | null | undefined,
-      parsed?: JSONObject | null | undefined,
-    ) => unknown,
+    callback: (err: ?Error, parsed: ?JSONObject) => mixed,
   ) {
     try {
       let parsed;
       try {
         parsed = JSON.parse(chunk.toString());
-      } catch (e: any) {
+      } catch (e) {
         // Be permissive and ignoreJSON parse errors in case there was
         // a non-JSON line in the package manager's stdout.
         logger.verbose({
@@ -33,7 +32,7 @@ export default class JSONParseStream extends Transform {
         return;
       }
       callback(null, parsed);
-    } catch (err: any) {
+    } catch (err) {
       callback(err);
     }
   }

package/src/{MockPackageInstaller.ts → MockPackageInstaller.js}

@@ -1,3 +1,5 @@
+// @flow
+
 import type {
   ModuleRequest,
   PackageInstaller,
@@ -12,10 +14,10 @@ import {ncp} from '@atlaspack/fs';
 import pkg from '../package.json';
 import {moduleRequestsFromDependencyMap} from './utils';
 
-type Package = {
-  fs: FileSystem;
-  packagePath: FilePath;
-};
+type Package = {|
+  fs: FileSystem,
+  packagePath: FilePath,
+|};
 
 // This PackageInstaller implementation simply copies files from one filesystem to another.
 // Mostly useful for testing purposes.