@atlaspack/package-manager 2.12.1-dev.3450 → 2.12.1-dev.3466

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/package-manager",
-  "version": "2.12.1-dev.3450+58845ef87",
+  "version": "2.12.1-dev.3466+9a12fb8bd",
   "description": "Blazing fast, zero configuration web application bundler",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
@@ -25,7 +25,7 @@
     "types": false,
     "main": {
       "includeNodeModules": {
-        "@atlaspack/core": false,
+        "@atlaspack/build-cache": false,
         "@atlaspack/diagnostic": false,
         "@atlaspack/fs": false,
         "@atlaspack/logger": false,
@@ -39,14 +39,14 @@
     }
   },
   "dependencies": {
-    "@atlaspack/diagnostic": "2.12.1-dev.3450+58845ef87",
-    "@atlaspack/fs": "2.12.1-dev.3450+58845ef87",
-    "@atlaspack/logger": "2.12.1-dev.3450+58845ef87",
-    "@atlaspack/node-resolver-core": "3.3.1-dev.3450+58845ef87",
-    "@atlaspack/types": "2.12.1-dev.3450+58845ef87",
-    "@atlaspack/utils": "2.12.1-dev.3450+58845ef87",
-    "@atlaspack/workers": "2.12.1-dev.3450+58845ef87",
-    "@swc/core": "^1.3.36",
+    "@atlaspack/diagnostic": "2.12.1-dev.3466+9a12fb8bd",
+    "@atlaspack/fs": "2.12.1-dev.3466+9a12fb8bd",
+    "@atlaspack/logger": "2.12.1-dev.3466+9a12fb8bd",
+    "@atlaspack/node-resolver-core": "3.3.1-dev.3466+9a12fb8bd",
+    "@atlaspack/types": "2.12.1-dev.3466+9a12fb8bd",
+    "@atlaspack/utils": "2.12.1-dev.3466+9a12fb8bd",
+    "@atlaspack/workers": "2.12.1-dev.3466+9a12fb8bd",
+    "@swc/core": "^1.7.26",
     "semver": "^7.5.2"
   },
   "devDependencies": {
@@ -56,7 +56,7 @@
     "split2": "^3.1.1"
   },
   "peerDependencies": {
-    "@atlaspack/core": "^2.12.1-dev.3450+58845ef87"
+    "@atlaspack/build-cache": "^2.12.0"
   },
   "browser": {
     "./src/NodePackageManager.js": false,
@@ -64,5 +64,5 @@
     "./src/Pnpm.js": false,
     "./src/Yarn.js": false
   },
-  "gitHead": "58845ef87446fcedb7d7d8876440c64184645cbb"
+  "gitHead": "9a12fb8bd1b72e407ed043e20337dc60fbec9cbe"
 }

package/src/MockPackageInstaller.js

@@ -10,7 +10,7 @@ import type {FilePath} from '@atlaspack/types';
 
 import path from 'path';
 import {ncp} from '@atlaspack/fs';
-import {registerSerializableClass} from '@atlaspack/core';
+import {registerSerializableClass} from '@atlaspack/build-cache';
 import pkg from '../package.json';
 import {moduleRequestsFromDependencyMap} from './utils';
 

package/src/NodePackageManager.js

@@ -14,7 +14,7 @@ import type {
   PackageManagerResolveResult,
 } from '@atlaspack/types';
 
-import {registerSerializableClass} from '@atlaspack/core';
+import {registerSerializableClass} from '@atlaspack/build-cache';
 import ThrowableDiagnostic, {
   encodeJSONKeyComponent,
   escapeMarkdown,
@@ -77,7 +77,7 @@ export class NodePackageManager implements PackageManager {
     this.installer = installer;
 
     // $FlowFixMe - no type for _extensions
-    this.currentExtensions = Object.keys(Module._extensions).map(e =>
+    this.currentExtensions = Object.keys(Module._extensions).map((e) =>
       e.substring(1),
     );
   }
@@ -88,10 +88,10 @@ export class NodePackageManager implements PackageManager {
         this.fs instanceof NodeFS && process.versions.pnp == null
           ? undefined
           : {
-              canonicalize: path => this.fs.realpathSync(path),
-              read: path => this.fs.readFileSync(path),
-              isFile: path => this.fs.statSync(path).isFile(),
-              isDir: path => this.fs.statSync(path).isDirectory(),
+              canonicalize: (path) => this.fs.realpathSync(path),
+              read: (path) => this.fs.readFileSync(path),
+              isFile: (path) => this.fs.statSync(path).isFile(),
+              isDir: (path) => this.fs.statSync(path).isDirectory(),
             },
       mode: 2,
       entries: ENTRIES,
@@ -192,7 +192,7 @@ export class NodePackageManager implements PackageManager {
     // We assume that the extension list will change in size - as these tools usually add support for
     // additional extensions.
     if (extensions.length !== this.currentExtensions.length) {
-      this.currentExtensions = extensions.map(e => e.substring(1));
+      this.currentExtensions = extensions.map((e) => e.substring(1));
       this.resolver = this._createResolver();
     }
 
@@ -200,7 +200,7 @@ export class NodePackageManager implements PackageManager {
     Module._cache[filePath] = m;
 
     // Patch require within this module so it goes through our require
-    m.require = id => {
+    m.require = (id) => {
       return this.requireSync(id, filePath);
     };
 
@@ -212,7 +212,7 @@ export class NodePackageManager implements PackageManager {
     };
 
     // $FlowFixMe
-    nativeFS.statSync = filename => {
+    nativeFS.statSync = (filename) => {
       return this.fs.statSync(filename);
     };
 
@@ -320,7 +320,7 @@ export class NodePackageManager implements PackageManager {
         }
 
         throw new ThrowableDiagnostic({
-          diagnostic: conflicts.fields.map(field => ({
+          diagnostic: conflicts.fields.map((field) => ({
             message: md`Could not find module "${name}", but it was listed in package.json. Run your package manager first.`,
             origin: '@atlaspack/package-manager',
             codeFrames: [
@@ -371,7 +371,7 @@ export class NodePackageManager implements PackageManager {
                     code: conflicts.json,
                     codeHighlights: generateJSONCodeHighlights(
                       conflicts.json,
-                      conflicts.fields.map(field => ({
+                      conflicts.fields.map((field) => ({
                         key: `/${field}/${encodeJSONKeyComponent(name)}`,
                         type: 'key',
                         message: 'Found this conflicting local requirement.',
@@ -509,10 +509,10 @@ export class NodePackageManager implements PackageManager {
       // 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);
-        invalidations.invalidateOnFileChange.forEach(i =>
+        invalidations.invalidateOnFileChange.forEach((i) =>
           res.invalidateOnFileChange.add(i),
         );
-        invalidations.invalidateOnFileCreate.forEach(i =>
+        invalidations.invalidateOnFileCreate.forEach((i) =>
           res.invalidateOnFileCreate.push(i),
         );
         res.invalidateOnStartup ||= invalidations.invalidateOnStartup;

package/src/Npm.js

@@ -6,7 +6,7 @@ import path from 'path';
 import spawn from 'cross-spawn';
 import logger from '@atlaspack/logger';
 import promiseFromProcess from './promiseFromProcess';
-import {registerSerializableClass} from '@atlaspack/core';
+import {registerSerializableClass} from '@atlaspack/build-cache';
 import {npmSpecifierFromModuleRequest} from './utils';
 
 // $FlowFixMe

package/src/Pnpm.js

@@ -10,7 +10,7 @@ import logger from '@atlaspack/logger';
 import split from 'split2';
 import JSONParseStream from './JSONParseStream';
 import promiseFromProcess from './promiseFromProcess';
-import {registerSerializableClass} from '@atlaspack/core';
+import {registerSerializableClass} from '@atlaspack/build-cache';
 import {exec, npmSpecifierFromModuleRequest} from './utils';
 
 // $FlowFixMe
@@ -123,7 +123,7 @@ export class Pnpm implements PackageInstaller {
     installProcess.stdout
       .pipe(split())
       .pipe(new JSONParseStream())
-      .on('error', e => {
+      .on('error', (e) => {
         logger.warn({
           origin: '@atlaspack/package-manager',
           message: e.chunk,
@@ -150,10 +150,10 @@ export class Pnpm implements PackageInstaller {
 
     let stderr = [];
     installProcess.stderr
-      .on('data', str => {
+      .on('data', (str) => {
         stderr.push(str.toString());
       })
-      .on('error', e => {
+      .on('error', (e) => {
         logger.warn({
           origin: '@atlaspack/package-manager',
           message: e.message,

package/src/Yarn.js

@@ -8,7 +8,7 @@ import logger from '@atlaspack/logger';
 import split from 'split2';
 import JSONParseStream from './JSONParseStream';
 import promiseFromProcess from './promiseFromProcess';
-import {registerSerializableClass} from '@atlaspack/core';
+import {registerSerializableClass} from '@atlaspack/build-cache';
 import {exec, npmSpecifierFromModuleRequest} from './utils';
 
 // $FlowFixMe
@@ -93,7 +93,7 @@ export class Yarn implements PackageInstaller {
       // Invoking yarn with --json provides streaming, newline-delimited JSON output.
       .pipe(split())
       .pipe(new JSONParseStream())
-      .on('error', e => {
+      .on('error', (e) => {
         logger.error(e, '@atlaspack/package-manager');
       })
       .on('data', (message: YarnStdOutMessage) => {
@@ -120,7 +120,7 @@ export class Yarn implements PackageInstaller {
     installProcess.stderr
       .pipe(split())
       .pipe(new JSONParseStream())
-      .on('error', e => {
+      .on('error', (e) => {
         logger.error(e, '@atlaspack/package-manager');
       })
       .on('data', (message: YarnStdErrMessage) => {

package/src/installPackage.js

@@ -24,7 +24,7 @@ import WorkerFarm from '@atlaspack/workers';
 
 import {Npm} from './Npm';
 import {Yarn} from './Yarn';
-import {Pnpm} from './Pnpm.js';
+import {Pnpm} from './Pnpm';
 import {getConflictingLocalDependencies} from './utils';
 import getCurrentPackageManager from './getCurrentPackageManager';
 import validateModuleSpecifier from './validateModuleSpecifier';
@@ -38,7 +38,7 @@ async function install(
   options: InstallOptions = {},
 ): Promise<void> {
   let {installPeers = true, saveDev = true, packageInstaller} = options;
-  let moduleNames = modules.map(m => m.name).join(', ');
+  let moduleNames = modules.map((m) => m.name).join(', ');
 
   logger.progress(`Installing ${moduleNames}...`);
 
@@ -68,7 +68,7 @@ async function install(
 
   if (installPeers) {
     await Promise.all(
-      modules.map(m =>
+      modules.map((m) =>
         installPeerDependencies(
           fs,
           packageManager,
@@ -121,7 +121,7 @@ async function installPeerDependencies(
                 code: conflicts.json,
                 codeHighlights: generateJSONCodeHighlights(
                   conflicts.json,
-                  conflicts.fields.map(field => ({
+                  conflicts.fields.map((field) => ({
                     key: `/${field}/${encodeJSONKeyComponent(name)}`,
                     type: 'key',
                     message: 'Found this conflicting local requirement.',
@@ -206,7 +206,7 @@ export function _addToInstallQueue(
   projectRoot: FilePath,
   options?: InstallOptions,
 ): Promise<mixed> {
-  modules = modules.map(request => ({
+  modules = modules.map((request) => ({
     name: validateModuleSpecifier(request.name),
     range: request.range,
   }));
@@ -215,7 +215,7 @@ export function _addToInstallQueue(
   // If a request comes in for a module that is currently installing, don't bother
   // enqueuing it.
   let modulesToInstall = modules.filter(
-    m => !modulesInstalling.has(getModuleRequestKey(m)),
+    (m) => !modulesInstalling.has(getModuleRequestKey(m)),
   );
   if (modulesToInstall.length) {
     for (let m of modulesToInstall) {

package/src/promiseFromProcess.js

@@ -7,7 +7,7 @@ export default function promiseFromProcess(
 ): Promise<void> {
   return new Promise((resolve, reject) => {
     childProcess.on('error', reject);
-    childProcess.on('close', code => {
+    childProcess.on('close', (code) => {
       if (code !== 0) {
         reject(new Error('Child process failed'));
         return;

package/test/NodePackageManager.test.js

@@ -49,7 +49,7 @@ describe('NodePackageManager', function () {
 
   beforeEach(() => {
     workerFarm = new WorkerFarm({
-      workerPath: require.resolve('@atlaspack/core/src/worker.js'),
+      workerPath: require.resolve('@atlaspack/core/worker'),
     });
     fs = new OverlayFS(new MemoryFS(workerFarm), new NodeFS());
     packageInstaller = new MockPackageInstaller();
@@ -167,7 +167,7 @@ describe('NodePackageManager', function () {
           path.join(FIXTURES_DIR, 'has-a-not-yet-installed/index.js'),
           {shouldAutoInstall: true},
         ),
-      err => {
+      (err) => {
         invariant(err instanceof ThrowableDiagnostic);
         assert(err.message.includes('Run your package manager'));
         return true;
@@ -258,7 +258,7 @@ describe('NodePackageManager', function () {
               range: '^2.0.0',
             },
           ),
-        err => {
+        (err) => {
           invariant(err instanceof ThrowableDiagnostic);
           assert.equal(
             err.message,
@@ -370,7 +370,7 @@ describe('NodePackageManager', function () {
               shouldAutoInstall: true,
             },
           ),
-        err => {
+        (err) => {
           assert(err instanceof ThrowableDiagnostic);
           assert.equal(
             err.message,

package/test/validateModuleSpecifiers.test.js

@@ -15,7 +15,7 @@ describe('Validate Module Specifiers', () => {
     ];
 
     assert.deepEqual(
-      modules.map(module => validateModuleSpecifier(module)),
+      modules.map((module) => validateModuleSpecifier(module)),
       [
         '@atlaspack/transformer-posthtml',
         '@some-org/package@v1.0.0',
@@ -31,7 +31,7 @@ describe('Validate Module Specifiers', () => {
     let modules = ['./somewhere.js', './hello/world.js', '~/hello/world.js'];
 
     assert.deepEqual(
-      modules.map(module => validateModuleSpecifier(module)),
+      modules.map((module) => validateModuleSpecifier(module)),
       ['', '', ''],
     );
   });