@atlaspack/core 2.12.1-canary.3534 → 2.12.1-canary.3536

package/lib/Atlaspack.js

@@ -563,6 +563,7 @@ class Atlaspack {
    */
   async unstable_buildAssetGraph(writeToCache = true) {
     await this._init();
+    const origin = '@atlaspack/core';
     const input = {
       optionsRef: this.#optionsRef,
       name: 'Main',
@@ -572,19 +573,24 @@ class Atlaspack {
       lazyExcludes: [],
       requestedAssetIds: this.#requestedAssetIds
     };
+    const start = Date.now();
     const result = await this.#requestTracker.runRequest(this.rustAtlaspack != null ? (0, _AssetGraphRequestRust.createAssetGraphRequestRust)(this.rustAtlaspack)(input) : (0, _AssetGraphRequest.default)(input), {
       force: true
     });
+    const duration = Date.now() - start;
     _logger().default.info({
-      message: 'Done building asset graph!'
+      message: `Done building asset graph in ${duration / 1000}s!`,
+      origin
     });
     if (writeToCache) {
       _logger().default.info({
-        message: 'Write request tracker to cache'
+        message: 'Write request tracker to cache',
+        origin
       });
       await this.writeRequestTrackerToCache();
       _logger().default.info({
-        message: 'Done writing request tracker to cache'
+        message: 'Done writing request tracker to cache',
+        origin
       });
     }
     return result;

package/lib/requests/AssetGraphRequestRust.js

@@ -48,6 +48,7 @@ function createAssetGraphRequestRust(rustAtlaspack) {
       let serializedAssetGraph;
       try {
         serializedAssetGraph = await rustAtlaspack.buildAssetGraph();
+        serializedAssetGraph.nodes = serializedAssetGraph.nodes.flatMap(node => JSON.parse(node));
       } catch (err) {
         throw new (_diagnostic().default)({
           diagnostic: err

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/core",
-  "version": "2.12.1-canary.3534+80c3a9777",
+  "version": "2.12.1-canary.3536+e6d31a6a3",
   "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.12.1-canary.3534+80c3a9777",
-    "@atlaspack/cache": "2.12.1-canary.3534+80c3a9777",
-    "@atlaspack/diagnostic": "2.12.1-canary.3534+80c3a9777",
-    "@atlaspack/events": "2.12.1-canary.3534+80c3a9777",
-    "@atlaspack/feature-flags": "2.12.1-canary.3534+80c3a9777",
-    "@atlaspack/fs": "2.12.1-canary.3534+80c3a9777",
-    "@atlaspack/graph": "3.2.1-canary.3534+80c3a9777",
-    "@atlaspack/logger": "2.12.1-canary.3534+80c3a9777",
-    "@atlaspack/package-manager": "2.12.1-canary.3534+80c3a9777",
-    "@atlaspack/plugin": "2.12.1-canary.3534+80c3a9777",
-    "@atlaspack/profiler": "2.12.1-canary.3534+80c3a9777",
-    "@atlaspack/rust": "2.12.1-canary.3534+80c3a9777",
-    "@atlaspack/types": "2.12.1-canary.3534+80c3a9777",
-    "@atlaspack/utils": "2.12.1-canary.3534+80c3a9777",
-    "@atlaspack/workers": "2.12.1-canary.3534+80c3a9777",
+    "@atlaspack/build-cache": "2.12.1-canary.3536+e6d31a6a3",
+    "@atlaspack/cache": "2.12.1-canary.3536+e6d31a6a3",
+    "@atlaspack/diagnostic": "2.12.1-canary.3536+e6d31a6a3",
+    "@atlaspack/events": "2.12.1-canary.3536+e6d31a6a3",
+    "@atlaspack/feature-flags": "2.12.1-canary.3536+e6d31a6a3",
+    "@atlaspack/fs": "2.12.1-canary.3536+e6d31a6a3",
+    "@atlaspack/graph": "3.2.1-canary.3536+e6d31a6a3",
+    "@atlaspack/logger": "2.12.1-canary.3536+e6d31a6a3",
+    "@atlaspack/package-manager": "2.12.1-canary.3536+e6d31a6a3",
+    "@atlaspack/plugin": "2.12.1-canary.3536+e6d31a6a3",
+    "@atlaspack/profiler": "2.12.1-canary.3536+e6d31a6a3",
+    "@atlaspack/rust": "2.12.1-canary.3536+e6d31a6a3",
+    "@atlaspack/types": "2.12.1-canary.3536+e6d31a6a3",
+    "@atlaspack/utils": "2.12.1-canary.3536+e6d31a6a3",
+    "@atlaspack/workers": "2.12.1-canary.3536+e6d31a6a3",
     "@mischnic/json-sourcemap": "^0.1.0",
     "@parcel/source-map": "^2.1.1",
     "base-x": "^3.0.8",
@@ -66,5 +66,5 @@
   "browser": {
     "./src/serializerCore.js": "./src/serializerCore.browser.js"
   },
-  "gitHead": "80c3a97779bec00bdb7c90eb5da4174cca5d5215"
+  "gitHead": "e6d31a6a3698efceb11ebb7b79d7427ec59044f6"
 }

package/src/Atlaspack.js

@@ -585,6 +585,8 @@ export default class Atlaspack {
     writeToCache: boolean = true,
   ): Promise<AssetGraphRequestResult> {
     await this._init();
+
+    const origin = '@atlaspack/core';
     const input = {
       optionsRef: this.#optionsRef,
       name: 'Main',
@@ -594,6 +596,8 @@ export default class Atlaspack {
       lazyExcludes: [],
       requestedAssetIds: this.#requestedAssetIds,
     };
+
+    const start = Date.now();
     const result = await this.#requestTracker.runRequest(
       this.rustAtlaspack != null
         ? createAssetGraphRequestRust(this.rustAtlaspack)(input)
@@ -601,12 +605,17 @@ export default class Atlaspack {
       {force: true},
     );
 
-    logger.info({message: 'Done building asset graph!'});
+    const duration = Date.now() - start;
+
+    logger.info({
+      message: `Done building asset graph in ${duration / 1000}s!`,
+      origin,
+    });
 
     if (writeToCache) {
-      logger.info({message: 'Write request tracker to cache'});
+      logger.info({message: 'Write request tracker to cache', origin});
       await this.writeRequestTrackerToCache();
-      logger.info({message: 'Done writing request tracker to cache'});
+      logger.info({message: 'Done writing request tracker to cache', origin});
     }
 
     return result;

package/src/loadAtlaspackPlugin.js

@@ -173,18 +173,26 @@ export default async function loadPlugin<T>(
   // Remove plugin version compatiblility validation in canary builds as they don't use semver
   if (!process.env.SKIP_PLUGIN_COMPATIBILITY_CHECK) {
     if (!pluginName.startsWith('.')) {
-      // Validate the engines.parcel field in the plugin's package.json
-      let parcelVersionRange = pkg && pkg.engines && pkg.engines.parcel;
-      if (!parcelVersionRange) {
+      // Validate the plugin engines field
+      let key = 'atlaspack';
+      let atlaspackVersionRange;
+      if (pkg?.engines?.atlaspack) {
+        atlaspackVersionRange = pkg.engines.atlaspack;
+      } else if (pkg?.engines?.parcel) {
+        key = 'parcel';
+        atlaspackVersionRange = pkg.engines.parcel;
+      }
+
+      if (!atlaspackVersionRange) {
         logger.warn({
           origin: '@atlaspack/core',
-          message: `The plugin "${pluginName}" needs to specify a \`package.json#engines.parcel\` field with the supported Atlaspack version range.`,
+          message: `The plugin "${pluginName}" needs to specify a \`package.json#engines.atlaspack\` field with the supported Atlaspack version range.`,
         });
       }
 
       if (
-        parcelVersionRange &&
-        !semver.satisfies(ATLASPACK_VERSION, parcelVersionRange)
+        atlaspackVersionRange &&
+        !semver.satisfies(ATLASPACK_VERSION, atlaspackVersionRange)
       ) {
         let pkgFile = nullthrows(
           await resolveConfig(
@@ -197,7 +205,7 @@ export default async function loadPlugin<T>(
         let pkgContents = await options.inputFS.readFile(pkgFile, 'utf8');
         throw new ThrowableDiagnostic({
           diagnostic: {
-            message: md`The plugin "${pluginName}" is not compatible with the current version of Atlaspack. Requires "${parcelVersionRange}" but the current version is "${ATLASPACK_VERSION}".`,
+            message: md`The plugin "${pluginName}" is not compatible with the current version of Atlaspack. Requires "${atlaspackVersionRange}" but the current version is "${ATLASPACK_VERSION}".`,
             origin: '@atlaspack/core',
             codeFrames: [
               {
@@ -206,7 +214,7 @@ export default async function loadPlugin<T>(
                 code: pkgContents,
                 codeHighlights: generateJSONCodeHighlights(pkgContents, [
                   {
-                    key: '/engines/parcel',
+                    key: `/engines/${key}`,
                   },
                 ]),
               },

package/src/requests/AssetGraphRequestRust.js

@@ -42,6 +42,9 @@ export function createAssetGraphRequestRust(
       let serializedAssetGraph;
       try {
         serializedAssetGraph = await rustAtlaspack.buildAssetGraph();
+        serializedAssetGraph.nodes = serializedAssetGraph.nodes.flatMap(
+          (node) => JSON.parse(node),
+        );
       } catch (err) {
         throw new ThrowableDiagnostic({
           diagnostic: err,

package/test/AtlaspackConfig.test.js

@@ -127,12 +127,13 @@ describe('AtlaspackConfig', () => {
   });
 
   describe('loadPlugin', () => {
-    it('should warn if a plugin needs to specify an engines.parcel field in package.json', async () => {
+    it('should warn if a plugin needs to specify an engines.atlaspack field in package.json', async () => {
       let projectRoot = path.join(__dirname, 'fixtures', 'plugins');
       let configFilePath = toProjectPath(
         projectRoot,
-        path.join(__dirname, 'fixtures', 'plugins', '.parcelrc'),
+        path.join(projectRoot, '.parcelrc'),
       );
+
       let config = new AtlaspackConfig(
         {
           filePath: configFilePath,
@@ -140,7 +141,7 @@ describe('AtlaspackConfig', () => {
           transformers: {
             '*.js': [
               {
-                packageName: 'parcel-transformer-no-engines',
+                packageName: 'atlaspack-transformer-no-engines',
                 resolveFrom: configFilePath,
                 keyPath: '/transformers/*.js/0',
               },
@@ -152,51 +153,103 @@ describe('AtlaspackConfig', () => {
 
       let warnStub = sinon.stub(logger, 'warn');
       let {plugin} = await config.loadPlugin({
-        packageName: 'parcel-transformer-no-engines',
+        packageName: 'atlaspack-transformer-no-engines',
         resolveFrom: configFilePath,
         keyPath: '/transformers/*.js/0',
       });
-      assert(plugin);
-      assert.equal(typeof plugin.transform, 'function');
+
+      assert.equal(typeof plugin?.transform, 'function');
       assert(warnStub.calledOnce);
       assert.deepEqual(warnStub.getCall(0).args[0], {
         origin: '@atlaspack/core',
         message:
-          'The plugin "parcel-transformer-no-engines" needs to specify a `package.json#engines.parcel` field with the supported Atlaspack version range.',
+          'The plugin "atlaspack-transformer-no-engines" needs to specify a `package.json#engines.atlaspack` field with the supported Atlaspack version range.',
       });
       warnStub.restore();
     });
 
+    it('should error if a plugin specifies an invalid engines.atlaspack field in package.json', async () => {
+      let projectRoot = path.join(__dirname, 'fixtures', 'plugins');
+      let configFilePath = toProjectPath(
+        projectRoot,
+        path.join(projectRoot, '.parcelrc'),
+      );
+
+      let config = new AtlaspackConfig(
+        {
+          filePath: configFilePath,
+          bundler: undefined,
+          transformers: {},
+        },
+        {...DEFAULT_OPTIONS, projectRoot},
+      );
+
+      // $FlowFixMe[untyped-import]
+      let atlaspackVersion = require('../package.json').version;
+      let pkgJSON = path.join(
+        projectRoot,
+        'node_modules',
+        'atlaspack-transformer-bad-engines',
+        'package.json',
+      );
+      let code = inputFS.readFileSync(pkgJSON, 'utf8');
+
+      // $FlowFixMe
+      await assert.rejects(
+        () =>
+          config.loadPlugin({
+            packageName: 'atlaspack-transformer-bad-engines',
+            resolveFrom: configFilePath,
+            keyPath: '/transformers/*.js/0',
+          }),
+        {
+          name: 'Error',
+          diagnostics: [
+            {
+              message: `The plugin "atlaspack-transformer-bad-engines" is not compatible with the current version of Atlaspack. Requires "1.x" but the current version is "${atlaspackVersion}".`,
+              origin: '@atlaspack/core',
+              codeFrames: [
+                {
+                  filePath: pkgJSON,
+                  language: 'json5',
+                  code,
+                  codeHighlights: [
+                    {
+                      start: {line: 5, column: 5},
+                      end: {line: 5, column: 22},
+                      message: undefined,
+                    },
+                  ],
+                },
+              ],
+            },
+          ],
+        },
+      );
+    });
+
     it('should error if a plugin specifies an invalid engines.parcel field in package.json', async () => {
       let projectRoot = path.join(__dirname, 'fixtures', 'plugins');
       let configFilePath = toProjectPath(
         projectRoot,
-        path.join(__dirname, 'fixtures', 'plugins', '.parcelrc'),
+        path.join(projectRoot, '.parcelrc'),
       );
+
       let config = new AtlaspackConfig(
         {
           filePath: configFilePath,
           bundler: undefined,
-          transformers: {
-            '*.js': [
-              {
-                packageName: 'parcel-transformer-not-found',
-                resolveFrom: configFilePath,
-                keyPath: '/transformers/*.js/0',
-              },
-            ],
-          },
+          transformers: {},
         },
         {...DEFAULT_OPTIONS, projectRoot},
       );
+
       // $FlowFixMe[untyped-import]
-      let parcelVersion = require('../package.json').version;
+      let atlaspackVersion = require('../package.json').version;
       let pkgJSON = path.join(
-        __dirname,
-        'fixtures',
-        'plugins',
+        projectRoot,
         'node_modules',
-        'parcel-transformer-bad-engines',
+        'atlaspack-transformer-bad-parcel-engines',
         'package.json',
       );
       let code = inputFS.readFileSync(pkgJSON, 'utf8');
@@ -205,7 +258,7 @@ describe('AtlaspackConfig', () => {
       await assert.rejects(
         () =>
           config.loadPlugin({
-            packageName: 'parcel-transformer-bad-engines',
+            packageName: 'atlaspack-transformer-bad-parcel-engines',
             resolveFrom: configFilePath,
             keyPath: '/transformers/*.js/0',
           }),
@@ -213,7 +266,7 @@ describe('AtlaspackConfig', () => {
           name: 'Error',
           diagnostics: [
             {
-              message: `The plugin "parcel-transformer-bad-engines" is not compatible with the current version of Atlaspack. Requires "5.x" but the current version is "${parcelVersion}".`,
+              message: `The plugin "atlaspack-transformer-bad-parcel-engines" is not compatible with the current version of Atlaspack. Requires "1.x" but the current version is "${atlaspackVersion}".`,
               origin: '@atlaspack/core',
               codeFrames: [
                 {

package/test/fixtures/local-plugin-config-pkg/node_modules/parcel-config-local/package.json

@@ -1,7 +1,4 @@
 {
   "name": "parcel-config-local",
-  "version": "1.0.0",
-  "engines": {
-    "parcel": "2.x"
-  }
+  "version": "1.0.0"
 }

package/test/fixtures/plugins/node_modules/atlaspack-transformer-bad-engines/package.json

@@ -0,0 +1,7 @@
+{
+  "name": "atlaspack-transformer-bad-engines",
+  "version": "1.0.0",
+  "engines": {
+    "atlaspack": "1.x"
+  }
+}

package/test/fixtures/plugins/node_modules/atlaspack-transformer-bad-parcel-engines/package.json

@@ -0,0 +1,7 @@
+{
+  "name": "atlaspack-transformer-bad-parcel-engines",
+  "version": "1.0.0",
+  "engines": {
+    "parcel": "1.x"
+  }
+}

package/test/fixtures/plugins/node_modules/atlaspack-transformer-no-engines/index.js

@@ -0,0 +1,7 @@
+const {Transformer} = require('@atlaspack/plugin');
+
+module.exports = new Transformer({
+  transform(asset) {
+    return [asset];
+  }
+});

package/test/fixtures/plugins/node_modules/atlaspack-transformer-no-engines/package.json

@@ -0,0 +1,4 @@
+{
+  "name": "atlaspack-transformer-no-engines",
+  "version": "1.0.0"
+}

package/test/fixtures/plugins/node_modules/parcel-transformer-bad-engines/package.json

@@ -1,7 +0,0 @@
-{
-  "name": "parcel-transformer-bad-engines",
-  "version": "1.0.0",
-  "engines": {
-    "parcel": "5.x"
-  }
-}

package/test/fixtures/plugins/node_modules/parcel-transformer-no-engines/package.json

@@ -1,4 +0,0 @@
-{
-  "name": "parcel-transformer-no-engines",
-  "version": "1.0.0"
-}