Skip to content

Commit 27d33d4

Browse files
brian-smith-tcrilbrian-smith-tcril
committed
fix: move back to old version of imports-loader
this fixes the issue with xblocks not loading in studio. it also requires use of the deprecated "string as loader options" method for imports and exports loader config
1 parent 14b113c commit 27d33d4

File tree

3 files changed

+49
-68
lines changed

3 files changed

+49
-68
lines changed

‎package-lock.json

+13-23
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"file-loader": "^6.2.0",
4646
"font-awesome": "4.7.0",
4747
"hls.js": "0.14.17",
48-
"imports-loader": "^5.0.0",
48+
"imports-loader": "0.7.1",
4949
"jest-environment-jsdom": "^26.0.0",
5050
"jquery": "2.2.4",
5151
"jquery-migrate": "1.4.1",

‎webpack.common.config.js

+35-44
Original file line numberDiff line numberDiff line change
@@ -242,17 +242,11 @@ module.exports = Merge.smart({
242242
use: [
243243
{
244244
loader: 'exports-loader',
245-
options: { exports: 'window.XBlock' }
245+
options: 'window.XBlock'
246246
},
247247
{
248248
loader: 'imports-loader',
249-
options: {
250-
imports: [
251-
"jquery",
252-
"default jquery immediateDescendents",
253-
],
254-
wrapper: 'window'
255-
}
249+
options: 'jquery,jquery.immediateDescendents,this=>window'
256250
}
257251
]
258252
},
@@ -261,14 +255,11 @@ module.exports = Merge.smart({
261255
use: [
262256
{
263257
loader: 'exports-loader',
264-
options: { exports: 'window.XBlock' }
258+
options: 'window.XBlock'
265259
},
266260
{
267261
loader: 'imports-loader',
268-
options: {
269-
imports: "default xblock/core XBlock",
270-
wrapper: 'window'
271-
}
262+
options: 'XBlock=xblock/core,this=>window'
272263
}
273264
]
274265
},
@@ -300,7 +291,7 @@ module.exports = Merge.smart({
300291
use: [
301292
{
302293
loader: 'imports-loader',
303-
options: { wrapper: 'window' }
294+
options: 'this=>window'
304295
}
305296
]
306297
},
@@ -309,7 +300,7 @@ module.exports = Merge.smart({
309300
use: [
310301
{
311302
loader: 'imports-loader',
312-
options: { wrapper: 'window' }
303+
options: 'this=>window'
313304
}
314305
]
315306
},
@@ -318,7 +309,7 @@ module.exports = Merge.smart({
318309
use: [
319310
{
320311
loader: 'imports-loader',
321-
options: { wrapper: 'window' }
312+
options: 'this=>window'
322313
}
323314
]
324315
},
@@ -327,7 +318,7 @@ module.exports = Merge.smart({
327318
use: [
328319
{
329320
loader: 'imports-loader',
330-
options: { wrapper: 'window' }
321+
options: 'this=>window'
331322
}
332323
]
333324
},
@@ -336,7 +327,7 @@ module.exports = Merge.smart({
336327
use: [
337328
{
338329
loader: 'imports-loader',
339-
options: { wrapper: 'window' }
330+
options: 'this=>window'
340331
}
341332
]
342333
},
@@ -345,7 +336,7 @@ module.exports = Merge.smart({
345336
use: [
346337
{
347338
loader: 'imports-loader',
348-
options: { wrapper: 'window' }
339+
options: 'this=>window'
349340
}
350341
]
351342
},
@@ -354,7 +345,7 @@ module.exports = Merge.smart({
354345
use: [
355346
{
356347
loader: 'imports-loader',
357-
options: { wrapper: 'window' }
348+
options: 'this=>window'
358349
}
359350
]
360351
},
@@ -363,7 +354,7 @@ module.exports = Merge.smart({
363354
use: [
364355
{
365356
loader: 'imports-loader',
366-
options: { wrapper: 'window' }
357+
options: 'this=>window'
367358
}
368359
]
369360
},
@@ -372,7 +363,7 @@ module.exports = Merge.smart({
372363
use: [
373364
{
374365
loader: 'imports-loader',
375-
options: { wrapper: 'window' }
366+
options: 'this=>window'
376367
}
377368
]
378369
},
@@ -381,7 +372,7 @@ module.exports = Merge.smart({
381372
use: [
382373
{
383374
loader: 'imports-loader',
384-
options: { wrapper: 'window' }
375+
options: 'this=>window'
385376
}
386377
]
387378
},
@@ -390,7 +381,7 @@ module.exports = Merge.smart({
390381
use: [
391382
{
392383
loader: 'imports-loader',
393-
options: { wrapper: 'window' }
384+
options: 'this=>window'
394385
}
395386
]
396387
},
@@ -399,7 +390,7 @@ module.exports = Merge.smart({
399390
use: [
400391
{
401392
loader: 'imports-loader',
402-
options: { wrapper: 'window' }
393+
options: 'this=>window'
403394
}
404395
]
405396
},
@@ -408,7 +399,7 @@ module.exports = Merge.smart({
408399
use: [
409400
{
410401
loader: 'imports-loader',
411-
options: { wrapper: 'window' }
402+
options: 'this=>window'
412403
}
413404
]
414405
},
@@ -417,7 +408,7 @@ module.exports = Merge.smart({
417408
use: [
418409
{
419410
loader: 'imports-loader',
420-
options: { wrapper: 'window' }
411+
options: 'this=>window'
421412
}
422413
]
423414
},
@@ -426,7 +417,7 @@ module.exports = Merge.smart({
426417
use: [
427418
{
428419
loader: 'imports-loader',
429-
options: { wrapper: 'window' }
420+
options: 'this=>window'
430421
}
431422
]
432423
},
@@ -435,7 +426,7 @@ module.exports = Merge.smart({
435426
use: [
436427
{
437428
loader: 'imports-loader',
438-
options: { wrapper: 'window' }
429+
options: 'this=>window'
439430
}
440431
]
441432
},
@@ -444,7 +435,7 @@ module.exports = Merge.smart({
444435
use: [
445436
{
446437
loader: 'imports-loader',
447-
options: { wrapper: 'window' }
438+
options: 'this=>window'
448439
}
449440
]
450441
},
@@ -453,7 +444,7 @@ module.exports = Merge.smart({
453444
use: [
454445
{
455446
loader: 'imports-loader',
456-
options: { wrapper: 'window' }
447+
options: 'this=>window'
457448
}
458449
]
459450
},
@@ -462,7 +453,7 @@ module.exports = Merge.smart({
462453
use: [
463454
{
464455
loader: 'imports-loader',
465-
options: { wrapper: 'window' }
456+
options: 'this=>window'
466457
}
467458
]
468459
},
@@ -471,7 +462,7 @@ module.exports = Merge.smart({
471462
use: [
472463
{
473464
loader: 'imports-loader',
474-
options: { wrapper: 'window' }
465+
options: 'this=>window'
475466
}
476467
]
477468
},
@@ -480,7 +471,7 @@ module.exports = Merge.smart({
480471
use: [
481472
{
482473
loader: 'imports-loader',
483-
options: { wrapper: 'window' }
474+
options: 'this=>window'
484475
}
485476
]
486477
},
@@ -489,7 +480,7 @@ module.exports = Merge.smart({
489480
use: [
490481
{
491482
loader: 'imports-loader',
492-
options: { wrapper: 'window' }
483+
options: 'this=>window'
493484
}
494485
]
495486
},
@@ -498,7 +489,7 @@ module.exports = Merge.smart({
498489
use: [
499490
{
500491
loader: 'imports-loader',
501-
options: { wrapper: 'window' }
492+
options: 'this=>window'
502493
}
503494
]
504495
},
@@ -510,7 +501,7 @@ module.exports = Merge.smart({
510501
use: [
511502
{
512503
loader: 'exports-loader',
513-
options: { exports: 'window.CodeMirror' }
504+
options: 'window.CodeMirror'
514505
}
515506
]
516507
},
@@ -519,7 +510,7 @@ module.exports = Merge.smart({
519510
use: [
520511
{
521512
loader: 'imports-loader',
522-
options: { wrapper: 'window' }
513+
options: 'this=>window'
523514
}
524515
]
525516
},
@@ -528,11 +519,11 @@ module.exports = Merge.smart({
528519
use: [
529520
{
530521
loader: 'exports-loader',
531-
options: { exports: 'window.XModule' }
522+
options: 'window.XModule'
532523
},
533524
{
534525
loader: 'imports-loader',
535-
options: { wrapper: 'window' }
526+
options: 'this=>window'
536527
}
537528
],
538529
},
@@ -541,7 +532,7 @@ module.exports = Merge.smart({
541532
use: [
542533
{
543534
loader: 'imports-loader',
544-
options: { exports: 'false' }
535+
options: 'exports=>false'
545536
}
546537
]
547538
},
@@ -562,7 +553,7 @@ module.exports = Merge.smart({
562553
use: [
563554
{
564555
loader: 'imports-loader',
565-
options: { wrapper: 'window' }
556+
options: 'this=>window'
566557
}
567558
]
568559
},
@@ -572,7 +563,7 @@ module.exports = Merge.smart({
572563
use: [
573564
{
574565
loader: 'imports-loader',
575-
options: { wrapper: 'window' }
566+
options: 'this=>window'
576567
}
577568
]
578569
},
@@ -584,7 +575,7 @@ module.exports = Merge.smart({
584575
use: [
585576
{
586577
loader: 'imports-loader',
587-
options: { wrapper: 'window' }
578+
options: 'this=>window'
588579
}
589580
]
590581
},

0 commit comments

Comments
 (0)