Revert "Improve shared ids"

This reverts commit 322dc36.
ehmicky · Feb 21, 2022 · 06b3f68 · 06b3f68
1 parent ce27735
commit 06b3f68
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 18 deletions.
diff --git a/src/config/plugin/lib/config.js b/src/config/plugin/lib/config.js
@@ -65,7 +65,7 @@ const normalizeSharedConfig = async function ({
     [...item, ...dummyDefinitions],
     {
       context: { ...context, plugin },
-      prefix: `${propName}.`,
+      prefix: propName,
       cwd,
       UserErrorType: ConsumerError,
       SystemErrorType: UserError,
@@ -87,7 +87,7 @@ const normalizeSpecificConfig = async function ({
     [...dummyDefinitions, ...pluginConfigDefinitions],
     {
       context,
-      prefix: `${propName}.`,
+      prefix: propName,
       cwd,
       UserErrorType: ConsumerError,
       SystemErrorType: PluginError,

diff --git a/src/config/plugin/lib/id.js b/src/config/plugin/lib/id.js
@@ -17,7 +17,6 @@ export const isModuleId = function (id, modulePrefix, builtins) {
   return (
     modulePrefix !== undefined &&
     !isInlineId(id) &&
-    !isSharedId(id) &&
     !isBuiltinId(id, builtins) &&
     !isPathId(id, builtins)
   )
@@ -26,22 +25,15 @@ export const isModuleId = function (id, modulePrefix, builtins) {
 export const isPathId = function (id, builtins) {
   return (
     !isInlineId(id) &&
-    !isSharedId(id) &&
     !isBuiltinId(id, builtins) &&
     (id.startsWith('.') || isAbsolute(id))
   )
 }
 
 export const isBuiltinId = function (id, builtins) {
-  return !isSharedId(id) && builtins[id] !== undefined
+  return builtins[id] !== undefined
 }
 
-export const isSharedId = function (id) {
-  return id === SHARED_ID
-}
-
-const SHARED_ID = 'any'
-
 export const isInlineId = function (id) {
   return typeof id !== 'string'
 }

diff --git a/src/config/plugin/lib/multiple.js b/src/config/plugin/lib/multiple.js
@@ -45,7 +45,5 @@ const handleDuplicatePlugin = function (
     return pluginConfig
   }
 
-  return duplicatePlugins[duplicatePlugins.length - 1] === pluginConfig
-    ? deepMerge(duplicatePlugins)
-    : {}
+  return duplicatePlugins[0] === pluginConfig ? deepMerge(duplicatePlugins) : {}
 }
diff --git a/src/config/plugin/lib/shared_config.js b/src/config/plugin/lib/shared_config.js
@@ -1,12 +1,10 @@
 import { deepMerge } from '../../merge.js'
 
-import { isSharedId } from './id.js'
-
 // Plugin configurations with `id: "any"` are merged to all others, with lower
 // priority
 export const applySharedConfigs = function (pluginConfigs, { pluginProp }) {
   const sharedConfigs = pluginConfigs.filter((pluginConfig) =>
-    isSharedId(pluginConfig[pluginProp]),
+    isSharedConfig(pluginConfig, pluginProp),
   )
 
   if (sharedConfigs.length === 0) {
@@ -20,7 +18,13 @@ export const applySharedConfigs = function (pluginConfigs, { pluginProp }) {
 }
 
 const applySharedConfig = function (pluginConfig, sharedConfig, pluginProp) {
-  return isSharedId(pluginConfig[pluginProp])
+  return isSharedConfig(pluginConfig, pluginProp)
     ? {}
     : deepMerge([sharedConfig, pluginConfig])
 }
+
+const isSharedConfig = function (pluginConfig, pluginProp) {
+  return pluginConfig[pluginProp] === SHARED_ID
+}
+
+const SHARED_ID = 'any'