From 76aadc67bb4b6a844db81f751fd2d123897bf8d5 Mon Sep 17 00:00:00 2001
From: Alan Guo Xiang Tan <gxtan1990@gmail.com>
Date: Fri, 11 Feb 2022 11:37:12 +0800
Subject: [PATCH] Revert "DEV: Prefix deprecation notices and api warnings with
 theme name/id" (#15902)

This reverts commit a4ff69bd99e5ca00ee8c26cf0e9bbabc3c36e23b.

Follow-up to 8e5b945b0ffd8ab5f5156ae52e460cef0136a551
---
 .../discourse-common/addon/lib/deprecated.js         |  8 +-------
 .../javascripts/discourse/app/lib/plugin-api.js      | 12 ++----------
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/app/assets/javascripts/discourse-common/addon/lib/deprecated.js b/app/assets/javascripts/discourse-common/addon/lib/deprecated.js
index c9c4d46fcbd..e1d82d3bb20 100644
--- a/app/assets/javascripts/discourse-common/addon/lib/deprecated.js
+++ b/app/assets/javascripts/discourse-common/addon/lib/deprecated.js
@@ -11,11 +11,5 @@ export default function deprecated(msg, opts = {}) {
   if (opts.raiseError) {
     throw msg;
   }
-
-  // Using deferred `require` because this is discourse-specific logic which
-  // we don't want to run in pretty-text/wizard/etc.
-  const consolePrefix =
-    require("discourse/lib/source-identifier")?.consolePrefix() || "";
-
-  console.warn(consolePrefix, msg); //eslint-disable-line no-console
+  console.warn(msg); // eslint-disable-line no-console
 }
diff --git a/app/assets/javascripts/discourse/app/lib/plugin-api.js b/app/assets/javascripts/discourse/app/lib/plugin-api.js
index ed0ed57cc2e..bad054424fe 100644
--- a/app/assets/javascripts/discourse/app/lib/plugin-api.js
+++ b/app/assets/javascripts/discourse/app/lib/plugin-api.js
@@ -92,7 +92,6 @@ import {
 } from "discourse/widgets/search-menu-results";
 import { CUSTOM_USER_SEARCH_OPTIONS } from "select-kit/components/user-chooser";
 import { downloadCalendar } from "discourse/lib/download-calendar";
-import { consolePrefix } from "discourse/lib/source-identifier";
 
 // If you add any methods to the API ensure you bump up the version number
 // based on Semantic Versioning 2.0.0. Please update the changelog at
@@ -105,7 +104,6 @@ function canModify(klass, type, resolverName, changes) {
   if (!changes.pluginId) {
     // eslint-disable-next-line no-console
     console.warn(
-      consolePrefix(),
       "To prevent errors in tests, add a `pluginId` key to your `modifyClass` call. This will ensure the modification is only applied once."
     );
     return true;
@@ -168,7 +166,6 @@ class PluginApi {
     if (this.container.cache[resolverName]) {
       // eslint-disable-next-line no-console
       console.warn(
-        consolePrefix(),
         `"${resolverName}" was already cached in the container. Changes won't be applied.`
       );
     }
@@ -177,10 +174,7 @@ class PluginApi {
     if (!klass) {
       if (!opts.ignoreMissing) {
         // eslint-disable-next-line no-console
-        console.warn(
-          consolePrefix(),
-          `"${resolverName}" was not found by modifyClass`
-        );
+        console.warn(`"${resolverName}" was not found by modifyClass`);
       }
       return;
     }
@@ -987,7 +981,6 @@ class PluginApi {
     if (!item["name"]) {
       // eslint-disable-next-line no-console
       console.warn(
-        consolePrefix(),
         "A 'name' is required when adding a Navigation Bar Item.",
         item
       );
@@ -1650,7 +1643,7 @@ function getPluginApi(version) {
     return pluginApi;
   } else {
     // eslint-disable-next-line no-console
-    console.warn(consolePrefix(), `Plugin API v${version} is not supported`);
+    console.warn(`Plugin API v${version} is not supported`);
   }
 }
 
@@ -1677,7 +1670,6 @@ function decorate(klass, evt, cb, id) {
   if (!id) {
     // eslint-disable-next-line no-console
     console.warn(
-      consolePrefix(),
       "`decorateCooked` should be supplied with an `id` option to avoid memory leaks in test mode. The id will be used to ensure the decorator is only applied once."
     );
   } else {