A platform for community discussion. Free, open, simple.
FIX: Remove async from module broker (#38878)
Jarek Radosz3b91df766090
diff --git a/frontend/asset-processor/babel-replace-imports.js b/frontend/asset-processor/babel-replace-imports.jsindex 12be257cc53..b64ecd52c4a 100644--- a/frontend/asset-processor/babel-replace-imports.js+++ b/frontend/asset-processor/babel-replace-imports.js@@ -77,17 +77,15 @@ export default function (babel) {const replacements = [];- const moduleBrokerLookup = t.awaitExpression(- t.callExpression(+ const moduleBrokerLookup = t.callExpression(+ t.memberExpression(t.memberExpression(- t.memberExpression(- t.identifier("window"),- t.identifier("moduleBroker")- ),- t.identifier("lookup")+ t.identifier("window"),+ t.identifier("moduleBroker")),- [t.stringLiteral(moduleName)]- )+ t.identifier("lookup")+ ),+ [t.stringLiteral(moduleName)]);if (properties.length) {diff --git a/frontend/asset-processor/babel-replace-imports.test.mjs b/frontend/asset-processor/babel-replace-imports.test.mjsindex 6ac129819b7..dd04ef41ded 100644--- a/frontend/asset-processor/babel-replace-imports.test.mjs+++ b/frontend/asset-processor/babel-replace-imports.test.mjs@@ -19,12 +19,12 @@ import { default as renamedDefaultImport, namedImport, otherNamedImport as renam).toMatchInlineSnapshot(`"const {default: concatClass- } = await window.moduleBroker.lookup("discourse/helpers/concat-class");+ } = window.moduleBroker.lookup("discourse/helpers/concat-class");const {default: renamedDefaultImport,namedImport: namedImport,otherNamedImport: renamedImport- } = await window.moduleBroker.lookup("discourse/module-1");"+ } = window.moduleBroker.lookup("discourse/module-1");"`);});@@ -35,10 +35,10 @@ import * as MyModule from "discourse/module-1";import defaultExport, * as MyModule2 from "discourse/module-2";`)).toMatchInlineSnapshot(`- "const MyModule = await window.moduleBroker.lookup("discourse/module-1");+ "const MyModule = window.moduleBroker.lookup("discourse/module-1");const {default: defaultExport- } = await window.moduleBroker.lookup("discourse/module-2");- const MyModule2 = await window.moduleBroker.lookup("discourse/module-2");"+ } = window.moduleBroker.lookup("discourse/module-2");+ const MyModule2 = window.moduleBroker.lookup("discourse/module-2");"`);});diff --git a/frontend/discourse/app/app.js b/frontend/discourse/app/app.jsindex c480bdbb60b..73c66f7e643 100644--- a/frontend/discourse/app/app.js+++ b/frontend/discourse/app/app.js@@ -32,7 +32,7 @@ const _pluginCallbacks = [];let _unhandledThemeErrors = [];window.moduleBroker = {- async lookup(moduleName) {+ lookup(moduleName) {return require(moduleName);},};diff --git a/lib/asset_processor.rb b/lib/asset_processor.rbindex 0cb31728220..c1495be8d8c 100644--- a/lib/asset_processor.rb+++ b/lib/asset_processor.rb@@ -1,7 +1,7 @@# frozen_string_literal: trueclass AssetProcessor- BASE_COMPILER_VERSION = 106+ BASE_COMPILER_VERSION = 107PROCESSOR_DIR = "tmp/asset-processor"LOCK_FILE = "#{PROCESSOR_DIR}/build.lock"