@atlaspack/core 2.13.2-canary.3672 → 2.13.2-canary.3673

package/lib/loadAtlaspackPlugin.js

@@ -41,7 +41,6 @@ const NODE_MODULES = `${_path().default.sep}node_modules${_path().default.sep}`;
 const CONFIG = Symbol.for('parcel-plugin-config');
 async function loadPlugin(pluginName, configPath, keyPath, options) {
   let resolveFrom = configPath;
-  let range;
   if (resolveFrom.includes(NODE_MODULES)) {
     var _configPkg$config$dep;
     // Config packages can reference plugins, but cannot contain other plugins within them.
@@ -66,31 +65,22 @@ async function loadPlugin(pluginName, configPath, keyPath, options) {
     }
     let configPkg = await (0, _utils().loadConfig)(options.inputFS, resolveFrom, ['package.json'], options.projectRoot);
     if (configPkg != null && ((_configPkg$config$dep = configPkg.config.dependencies) === null || _configPkg$config$dep === void 0 ? void 0 : _configPkg$config$dep[pluginName]) == null) {
-      var _configPkg$config$par;
-      // If not in the config's dependencies, the plugin will be auto installed with
-      // the version declared in "parcelDependencies".
-      range = (_configPkg$config$par = configPkg.config.parcelDependencies) === null || _configPkg$config$par === void 0 ? void 0 : _configPkg$config$par[pluginName];
-      if (range == null) {
-        let contents = await options.inputFS.readFile(configPkg.files[0].filePath, 'utf8');
-        throw new (_diagnostic().default)({
-          diagnostic: {
-            message: (0, _diagnostic().md)`Could not determine version of ${pluginName} in ${_path().default.relative(process.cwd(), resolveFrom)}. Either include it in "dependencies" or "parcelDependencies".`,
-            origin: '@atlaspack/core',
-            codeFrames: configPkg.config.dependencies || configPkg.config.parcelDependencies ? [{
-              filePath: configPkg.files[0].filePath,
-              language: 'json5',
-              code: contents,
-              codeHighlights: (0, _diagnostic().generateJSONCodeHighlights)(contents, [{
-                key: configPkg.config.parcelDependencies ? '/parcelDependencies' : '/dependencies',
-                type: 'key'
-              }])
-            }] : undefined
-          }
-        });
-      }
-
-      // Resolve from project root if not in the config's dependencies.
-      resolveFrom = _path().default.join(options.projectRoot, 'index');
+      let contents = await options.inputFS.readFile(configPkg.files[0].filePath, 'utf8');
+      throw new (_diagnostic().default)({
+        diagnostic: {
+          message: (0, _diagnostic().md)`Could not determine version of ${pluginName} in ${_path().default.relative(process.cwd(), resolveFrom)}. Include it in "dependencies".`,
+          origin: '@atlaspack/core',
+          codeFrames: configPkg.config.dependencies ? [{
+            filePath: configPkg.files[0].filePath,
+            language: 'json5',
+            code: contents,
+            codeHighlights: (0, _diagnostic().generateJSONCodeHighlights)(contents, [{
+              key: '/dependencies',
+              type: 'key'
+            }])
+          }] : undefined
+        }
+      });
     }
   }
   let resolved, pkg;
@@ -99,8 +89,7 @@ async function loadPlugin(pluginName, configPath, keyPath, options) {
       resolved,
       pkg
     } = await options.packageManager.resolve(pluginName, resolveFrom, {
-      shouldAutoInstall: options.shouldAutoInstall,
-      range
+      shouldAutoInstall: options.shouldAutoInstall
     }));
   } catch (err) {
     if (err.code !== 'MODULE_NOT_FOUND') {
@@ -142,7 +131,6 @@ async function loadPlugin(pluginName, configPath, keyPath, options) {
   return {
     plugin,
     version: (0, _nullthrows().default)(pkg).version,
-    resolveFrom: (0, _projectPath.toProjectPath)(options.projectRoot, resolveFrom),
-    range
+    resolveFrom: (0, _projectPath.toProjectPath)(options.projectRoot, resolveFrom)
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/core",
-  "version": "2.13.2-canary.3672+3460531d9",
+  "version": "2.13.2-canary.3673+8386ca4dc",
   "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.2-canary.3672+3460531d9",
-    "@atlaspack/cache": "2.13.2-canary.3672+3460531d9",
-    "@atlaspack/diagnostic": "2.13.2-canary.3672+3460531d9",
-    "@atlaspack/events": "2.13.2-canary.3672+3460531d9",
-    "@atlaspack/feature-flags": "2.13.2-canary.3672+3460531d9",
-    "@atlaspack/fs": "2.13.2-canary.3672+3460531d9",
-    "@atlaspack/graph": "3.3.2-canary.3672+3460531d9",
-    "@atlaspack/logger": "2.13.2-canary.3672+3460531d9",
-    "@atlaspack/package-manager": "2.13.2-canary.3672+3460531d9",
-    "@atlaspack/plugin": "2.13.2-canary.3672+3460531d9",
-    "@atlaspack/profiler": "2.13.2-canary.3672+3460531d9",
-    "@atlaspack/rust": "2.13.2-canary.3672+3460531d9",
-    "@atlaspack/types": "2.13.2-canary.3672+3460531d9",
-    "@atlaspack/utils": "2.13.2-canary.3672+3460531d9",
-    "@atlaspack/workers": "2.13.2-canary.3672+3460531d9",
+    "@atlaspack/build-cache": "2.13.2-canary.3673+8386ca4dc",
+    "@atlaspack/cache": "2.13.2-canary.3673+8386ca4dc",
+    "@atlaspack/diagnostic": "2.13.2-canary.3673+8386ca4dc",
+    "@atlaspack/events": "2.13.2-canary.3673+8386ca4dc",
+    "@atlaspack/feature-flags": "2.13.2-canary.3673+8386ca4dc",
+    "@atlaspack/fs": "2.13.2-canary.3673+8386ca4dc",
+    "@atlaspack/graph": "3.3.2-canary.3673+8386ca4dc",
+    "@atlaspack/logger": "2.13.2-canary.3673+8386ca4dc",
+    "@atlaspack/package-manager": "2.13.2-canary.3673+8386ca4dc",
+    "@atlaspack/plugin": "2.13.2-canary.3673+8386ca4dc",
+    "@atlaspack/profiler": "2.13.2-canary.3673+8386ca4dc",
+    "@atlaspack/rust": "2.13.2-canary.3673+8386ca4dc",
+    "@atlaspack/types": "2.13.2-canary.3673+8386ca4dc",
+    "@atlaspack/utils": "2.13.2-canary.3673+8386ca4dc",
+    "@atlaspack/workers": "2.13.2-canary.3673+8386ca4dc",
     "@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": "3460531d9cb036f2575a99ea69fe2b03cfd6ac06"
+  "gitHead": "8386ca4dc318688fbed1af3bbebf2af3e7d24552"
 }

package/src/AtlaspackConfig.js

@@ -12,7 +12,6 @@ import type {
   Packager,
   Reporter,
   Semver,
-  SemverRange,
   Validator,
   FilePath,
 } from '@atlaspack/types';
@@ -52,7 +51,6 @@ export type LoadedPlugin<T> = {|
   plugin: T,
   resolveFrom: ProjectPath,
   keyPath?: string,
-  range?: ?SemverRange,
 |};
 
 export class AtlaspackConfig {
@@ -120,7 +118,6 @@ export class AtlaspackConfig {
     plugin: T,
     version: Semver,
     resolveFrom: ProjectPath,
-    range: ?SemverRange,
   |}> {
     let plugin = this.pluginCache.get(node.packageName);
     if (plugin) {

package/src/loadAtlaspackPlugin.js

@@ -1,10 +1,5 @@
 // @flow
-import type {
-  FilePath,
-  PackageName,
-  Semver,
-  SemverRange,
-} from '@atlaspack/types';
+import type {FilePath, PackageName, Semver} from '@atlaspack/types';
 import type {AtlaspackOptions} from './types';
 
 import path from 'path';
@@ -35,10 +30,8 @@ export default async function loadPlugin<T>(
   plugin: T,
   version: Semver,
   resolveFrom: ProjectPath,
-  range: ?SemverRange,
 |}> {
   let resolveFrom = configPath;
-  let range;
   if (resolveFrom.includes(NODE_MODULES)) {
     // Config packages can reference plugins, but cannot contain other plugins within them.
     // This forces every published plugin to be published separately so they can be mixed and matched if needed.
@@ -77,47 +70,34 @@ export default async function loadPlugin<T>(
       configPkg != null &&
       configPkg.config.dependencies?.[pluginName] == null
     ) {
-      // If not in the config's dependencies, the plugin will be auto installed with
-      // the version declared in "parcelDependencies".
-      range = configPkg.config.parcelDependencies?.[pluginName];
-
-      if (range == null) {
-        let contents = await options.inputFS.readFile(
-          configPkg.files[0].filePath,
-          'utf8',
-        );
-        throw new ThrowableDiagnostic({
-          diagnostic: {
-            message: md`Could not determine version of ${pluginName} in ${path.relative(
-              process.cwd(),
-              resolveFrom,
-            )}. Either include it in "dependencies" or "parcelDependencies".`,
-            origin: '@atlaspack/core',
-            codeFrames:
-              configPkg.config.dependencies ||
-              configPkg.config.parcelDependencies
-                ? [
+      let contents = await options.inputFS.readFile(
+        configPkg.files[0].filePath,
+        'utf8',
+      );
+      throw new ThrowableDiagnostic({
+        diagnostic: {
+          message: md`Could not determine version of ${pluginName} in ${path.relative(
+            process.cwd(),
+            resolveFrom,
+          )}. Include it in "dependencies".`,
+          origin: '@atlaspack/core',
+          codeFrames: configPkg.config.dependencies
+            ? [
+                {
+                  filePath: configPkg.files[0].filePath,
+                  language: 'json5',
+                  code: contents,
+                  codeHighlights: generateJSONCodeHighlights(contents, [
                     {
-                      filePath: configPkg.files[0].filePath,
-                      language: 'json5',
-                      code: contents,
-                      codeHighlights: generateJSONCodeHighlights(contents, [
-                        {
-                          key: configPkg.config.parcelDependencies
-                            ? '/parcelDependencies'
-                            : '/dependencies',
-                          type: 'key',
-                        },
-                      ]),
+                      key: '/dependencies',
+                      type: 'key',
                     },
-                  ]
-                : undefined,
-          },
-        });
-      }
-
-      // Resolve from project root if not in the config's dependencies.
-      resolveFrom = path.join(options.projectRoot, 'index');
+                  ]),
+                },
+              ]
+            : undefined,
+        },
+      });
     }
   }
 
@@ -126,10 +106,7 @@ export default async function loadPlugin<T>(
     ({resolved, pkg} = await options.packageManager.resolve(
       pluginName,
       resolveFrom,
-      {
-        shouldAutoInstall: options.shouldAutoInstall,
-        range,
-      },
+      {shouldAutoInstall: options.shouldAutoInstall},
     ));
   } catch (err) {
     if (err.code !== 'MODULE_NOT_FOUND') {
@@ -242,6 +219,5 @@ export default async function loadPlugin<T>(
     plugin,
     version: nullthrows(pkg).version,
     resolveFrom: toProjectPath(options.projectRoot, resolveFrom),
-    range,
   };
 }