IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Babel 6

Browse Source
This commit is contained in:
Robin Ward
2017-07-05 14:14:30 -04:00
parent 2f480e21a0
commit 754c1e5438
35 changed files with 62713 additions and 67299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,7 +38,7 @@ export function buildResolver(baseName) {
resolveRouter(parsedName) {
const routerPath = `${baseName}/router`;
if (requirejs.entries[routerPath]) {
const module = require(routerPath, null, null, true);
const module = requirejs(routerPath, null, null, true);
return module.default;
}
return this._super(parsedName);
@@ -79,7 +79,7 @@ export function buildResolver(baseName) {
var module;
if (moduleName) {
module = require(moduleName, null, null, true /* force sync */);
module = requirejs(moduleName, null, null, true /* force sync */);
if (module && module['default']) { module = module['default']; }
}
return module;