osr-plastic/osr-discourse-src
Archived
1
0
Fork 0
Code Issues Pull Requests 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
app/assets/javascripts/wizard/initializers/load-helpers.js.es6
+1 -1
View File
@@ -6,7 +6,7 @@ export default {
initialize(application) {
Object.keys(requirejs.entries).forEach(entry => {
if ((/\/helpers\//).test(entry)) {
require(entry, null, null, true);
requirejs(entry, null, null, true);
}
});
registerHelpers(application);
app/assets/javascripts/wizard/test/test_helper.js
+4 -4
View File
@@ -35,7 +35,7 @@ if (window.Logster) {
}
Ember.Test.adapter = window.QUnitAdapter.create();
var createPretendServer = require('wizard/test/wizard-pretender', null, null, false).default;
var createPretendServer = requirejs('wizard/test/wizard-pretender', null, null, false).default;
var server;
QUnit.testStart(function() {
@@ -47,12 +47,12 @@ QUnit.testDone(function() {
});
var _testApp = require('wizard/test/helpers/start-app').default();
var _buildResolver = require('discourse-common/resolver').buildResolver;
var _testApp = requirejs('wizard/test/helpers/start-app').default();
var _buildResolver = requirejs('discourse-common/resolver').buildResolver;
window.setResolver(_buildResolver('wizard').create({ namespace: _testApp }));
Object.keys(requirejs.entries).forEach(function(entry) {
if ((/\-test/).test(entry)) {
require(entry, null, null, true);
requirejs(entry, null, null, true);
}
});
app/assets/javascripts/wizard/wizard.js.es6
+1 -1
View File
@@ -7,7 +7,7 @@ export default Ember.Application.extend({
start() {
Object.keys(requirejs._eak_seen).forEach(key => {
if (/\/initializers\//.test(key)) {
const module = require(key, null, null, true);
const module = requirejs(key, null, null, true);
if (!module) { throw new Error(key + ' must export an initializer.'); }
this.initializer(module.default);
}