@atlaspack/core 2.14.1-dev.10 → 2.14.1-dev.15

package/lib/loadAtlaspackPlugin.js

@@ -33,7 +33,6 @@ function _utils() {
   return data;
 }
 var _projectPath = require("./projectPath");
-var _package = require("../package.json");
 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 }; }
@@ -62,10 +61,9 @@ async function loadPlugin(pluginName, configPath, keyPath, options) {
       }
     });
   }
-  let resolved, pkg;
+  let pkg;
   try {
     ({
-      resolved,
       pkg
     } = await options.packageManager.resolve(pluginName, resolveFrom, {
       shouldAutoInstall: options.shouldAutoInstall
@@ -93,9 +91,6 @@ async function loadPlugin(pluginName, configPath, keyPath, options) {
       }
     });
   }
-
-  // Remove plugin version compatiblility validation in canary builds as they don't use semver
-
   let plugin = await options.packageManager.require(pluginName, resolveFrom, {
     shouldAutoInstall: options.shouldAutoInstall
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/core",
-  "version": "2.14.1-dev.10+1adc60d42",
+  "version": "2.14.1-dev.15+30b65feb9",
   "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.10+1adc60d42",
-    "@atlaspack/cache": "2.13.3-dev.10+1adc60d42",
-    "@atlaspack/diagnostic": "2.14.1-dev.10+1adc60d42",
-    "@atlaspack/events": "2.14.1-dev.10+1adc60d42",
-    "@atlaspack/feature-flags": "2.14.1-dev.10+1adc60d42",
-    "@atlaspack/fs": "2.14.1-dev.10+1adc60d42",
-    "@atlaspack/graph": "3.4.1-dev.10+1adc60d42",
-    "@atlaspack/logger": "2.14.1-dev.10+1adc60d42",
-    "@atlaspack/package-manager": "2.14.1-dev.10+1adc60d42",
-    "@atlaspack/plugin": "2.14.1-dev.10+1adc60d42",
-    "@atlaspack/profiler": "2.14.1-dev.10+1adc60d42",
-    "@atlaspack/rust": "3.0.1-dev.10+1adc60d42",
-    "@atlaspack/types": "2.14.1-dev.10+1adc60d42",
-    "@atlaspack/utils": "2.14.1-dev.10+1adc60d42",
-    "@atlaspack/workers": "2.14.1-dev.10+1adc60d42",
+    "@atlaspack/build-cache": "2.13.3-dev.15+30b65feb9",
+    "@atlaspack/cache": "2.13.3-dev.15+30b65feb9",
+    "@atlaspack/diagnostic": "2.14.1-dev.15+30b65feb9",
+    "@atlaspack/events": "2.14.1-dev.15+30b65feb9",
+    "@atlaspack/feature-flags": "2.14.1-dev.15+30b65feb9",
+    "@atlaspack/fs": "2.14.1-dev.15+30b65feb9",
+    "@atlaspack/graph": "3.4.1-dev.15+30b65feb9",
+    "@atlaspack/logger": "2.14.1-dev.15+30b65feb9",
+    "@atlaspack/package-manager": "2.14.1-dev.15+30b65feb9",
+    "@atlaspack/plugin": "2.14.1-dev.15+30b65feb9",
+    "@atlaspack/profiler": "2.14.1-dev.15+30b65feb9",
+    "@atlaspack/rust": "3.0.1-dev.15+30b65feb9",
+    "@atlaspack/types": "2.14.1-dev.15+30b65feb9",
+    "@atlaspack/utils": "2.14.1-dev.15+30b65feb9",
+    "@atlaspack/workers": "2.14.1-dev.15+30b65feb9",
     "@mischnic/json-sourcemap": "^0.1.0",
     "@parcel/source-map": "^2.1.1",
     "base-x": "^3.0.8",
@@ -67,5 +67,5 @@
     "./src/serializerCore.js": "./src/serializerCore.browser.js"
   },
   "type": "commonjs",
-  "gitHead": "1adc60d42abc9d6f5f7c968e35dd89a48fc1b175"
+  "gitHead": "30b65feb98113722e721c7cdee547765d195b65a"
 }

package/src/loadAtlaspackPlugin.js

@@ -3,16 +3,13 @@ import type {FilePath, PackageName, Semver} from '@atlaspack/types';
 import type {AtlaspackOptions} from './types';
 
 import path from 'path';
-import semver from 'semver';
-import logger from '@atlaspack/logger';
 import nullthrows from 'nullthrows';
 import ThrowableDiagnostic, {
   generateJSONCodeHighlights,
   md,
 } from '@atlaspack/diagnostic';
-import {findAlternativeNodeModules, resolveConfig} from '@atlaspack/utils';
+import {findAlternativeNodeModules} from '@atlaspack/utils';
 import {type ProjectPath, toProjectPath} from './projectPath';
-import {version as ATLASPACK_VERSION} from '../package.json';
 
 const NODE_MODULES = `${path.sep}node_modules${path.sep}`;
 const CONFIG = Symbol.for('parcel-plugin-config');
@@ -56,13 +53,11 @@ export default async function loadPlugin<T>(
     });
   }
 
-  let resolved, pkg;
+  let pkg;
   try {
-    ({resolved, pkg} = await options.packageManager.resolve(
-      pluginName,
-      resolveFrom,
-      {shouldAutoInstall: options.shouldAutoInstall},
-    ));
+    ({pkg} = await options.packageManager.resolve(pluginName, resolveFrom, {
+      shouldAutoInstall: options.shouldAutoInstall,
+    }));
   } catch (err) {
     if (err.code !== 'MODULE_NOT_FOUND') {
       throw err;
@@ -102,61 +97,6 @@ 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 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.atlaspack\` field with the supported Atlaspack version range.`,
-        });
-      }
-
-      if (
-        atlaspackVersionRange &&
-        !semver.satisfies(ATLASPACK_VERSION, atlaspackVersionRange)
-      ) {
-        let pkgFile = nullthrows(
-          await resolveConfig(
-            options.inputFS,
-            resolved,
-            ['package.json'],
-            options.projectRoot,
-          ),
-        );
-        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 "${atlaspackVersionRange}" but the current version is "${ATLASPACK_VERSION}".`,
-            origin: '@atlaspack/core',
-            codeFrames: [
-              {
-                filePath: pkgFile,
-                language: 'json5',
-                code: pkgContents,
-                codeHighlights: generateJSONCodeHighlights(pkgContents, [
-                  {
-                    key: `/engines/${key}`,
-                  },
-                ]),
-              },
-            ],
-          },
-        });
-      }
-    }
-  }
-
   let plugin = await options.packageManager.require(pluginName, resolveFrom, {
     shouldAutoInstall: options.shouldAutoInstall,
   });

package/test/AtlaspackConfig.test.js

@@ -3,10 +3,6 @@
 import assert from 'assert';
 import path from 'path';
 
-import logger from '@atlaspack/logger';
-import {inputFS} from '@atlaspack/test-utils';
-import sinon from 'sinon';
-
 import {AtlaspackConfig} from '../src/AtlaspackConfig';
 import {toProjectPath} from '../src/projectPath';
 import {parseAndProcessConfig} from '../src/requests/AtlaspackConfigRequest';
@@ -127,167 +123,6 @@ describe('AtlaspackConfig', () => {
   });
 
   describe('loadPlugin', () => {
-    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(projectRoot, '.parcelrc'),
-      );
-
-      let config = new AtlaspackConfig(
-        {
-          filePath: configFilePath,
-          bundler: undefined,
-          transformers: {
-            '*.js': [
-              {
-                packageName: 'atlaspack-transformer-no-engines',
-                resolveFrom: configFilePath,
-                keyPath: '/transformers/*.js/0',
-              },
-            ],
-          },
-        },
-        {...DEFAULT_OPTIONS, projectRoot},
-      );
-
-      let warnStub = sinon.stub(logger, 'warn');
-      let {plugin} = await config.loadPlugin({
-        packageName: 'atlaspack-transformer-no-engines',
-        resolveFrom: configFilePath,
-        keyPath: '/transformers/*.js/0',
-      });
-
-      assert.equal(typeof plugin?.transform, 'function');
-      assert(warnStub.calledOnce);
-      assert.deepEqual(warnStub.getCall(0).args[0], {
-        origin: '@atlaspack/core',
-        message:
-          '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(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-parcel-engines',
-        'package.json',
-      );
-      let code = inputFS.readFileSync(pkgJSON, 'utf8');
-
-      // $FlowFixMe
-      await assert.rejects(
-        () =>
-          config.loadPlugin({
-            packageName: 'atlaspack-transformer-bad-parcel-engines',
-            resolveFrom: configFilePath,
-            keyPath: '/transformers/*.js/0',
-          }),
-        {
-          name: 'Error',
-          diagnostics: [
-            {
-              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: [
-                {
-                  filePath: pkgJSON,
-                  language: 'json5',
-                  code,
-                  codeHighlights: [
-                    {
-                      start: {line: 5, column: 5},
-                      end: {line: 5, column: 19},
-                      message: undefined,
-                    },
-                  ],
-                },
-              ],
-            },
-          ],
-        },
-      );
-    });
-
     it('should error with a codeframe if a plugin is not resolved', async () => {
       let configFilePath = path.join(
         __dirname,

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

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

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

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

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

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

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

@@ -1,7 +0,0 @@
-{
-  "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

@@ -1,7 +0,0 @@
-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

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