Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DEV: print modifyClass warning correctly for deprecated lookups (#28298) 

e.g. we map `controller:composer` to `service:composer` in resolver lookups. So, when doing the cache check in modifyClass, we need to check against the normalized name, not the deprecated name.
This commit is contained in:
David Taylor 2024-08-09 09:20:14 +01:00 committed by GitHub
parent 6d1862409e
commit 65895f44e9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse-common/addon/resolver.js
View File

@ -115,6 +115,10 @@ const DEPRECATED_MODULES = new Map(
}) })
); );
export function normalizeDeprecatedModule(name) {
return DEPRECATED_MODULES.get(name)?.newName || name;
}
export function setResolverOption(name, value) { export function setResolverOption(name, value) {
_options[name] = value; _options[name] = value;
} }

5
app/assets/javascripts/discourse/app/lib/plugin-api.gjs
View File

@ -159,6 +159,7 @@ import {
registerIconRenderer, registerIconRenderer,
replaceIcon, replaceIcon,
} from "discourse-common/lib/icon-library"; } from "discourse-common/lib/icon-library";
import { normalizeDeprecatedModule } from "discourse-common/resolver";
import { addImageWrapperButton } from "discourse-markdown-it/features/image-controls"; import { addImageWrapperButton } from "discourse-markdown-it/features/image-controls";
import { CUSTOM_USER_SEARCH_OPTIONS } from "select-kit/components/user-chooser"; import { CUSTOM_USER_SEARCH_OPTIONS } from "select-kit/components/user-chooser";
import { modifySelectKit } from "select-kit/mixins/plugin-api"; import { modifySelectKit } from "select-kit/mixins/plugin-api";
@ -255,14 +256,14 @@ class PluginApi {
opts = opts || {}; opts = opts || {};
if ( if (
this.container.cache[resolverName] || this.container.cache[normalizeDeprecatedModule(resolverName)] ||
(resolverName === "model:user" && (resolverName === "model:user" &&
this.container.lookup("service:current-user")) this.container.lookup("service:current-user"))
) { ) {
// eslint-disable-next-line no-console // eslint-disable-next-line no-console
console.warn( console.warn(
consolePrefix(), consolePrefix(),
`"${resolverName}" has already been initialized and registered as a singleton. Move the modifyClass call earlier in the boot process for changes to take effect. https://meta.discourse.org/t/262064` `Attempted to modify "${resolverName}", but it was already initialized earlier in the boot process (e.g. via a lookup()). Remove that lookup, or move the modifyClass call earlier in the boot process for changes to take effect. https://meta.discourse.org/t/262064`
); );
} }