diff --git a/package-lock.json b/package-lock.json index c3a2607edf..e1e7fceed5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -39,7 +39,7 @@ "file-loader": "^6.2.0", "font-awesome": "4.7.0", "hls.js": "0.14.17", - "imports-loader": "^5.0.0", + "imports-loader": "0.7.1", "jest-environment-jsdom": "^26.0.0", "jquery": "2.2.4", "jquery-migrate": "1.4.1", @@ -23531,22 +23531,20 @@ } }, "node_modules/imports-loader": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/imports-loader/-/imports-loader-5.0.0.tgz", - "integrity": "sha512-tXgL8xxZFjOjQLLiE7my00UUQfktg4G8fdpXcZphL0bJWbk9eCxKKFaCwmFRcwyRJQl95GXBL1DoE1rCS/tcPw==", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/imports-loader/-/imports-loader-0.7.1.tgz", + "integrity": "sha512-tQ1upp3IcLH8YRk9b9PlJi7BsAGQhGRlgyLil6uZ/6kFb7C0H9YH9XwDVIjxl/TxFgQ0Wkrx8VRt1Ff2Vf6Mag==", "dependencies": { - "source-map-js": "^1.0.2", - "strip-comments": "^2.0.1" - }, + "loader-utils": "^1.0.2", + "source-map": "^0.5.6" + } + }, + "node_modules/imports-loader/node_modules/source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==", "engines": { - "node": ">= 18.12.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - }, - "peerDependencies": { - "webpack": "^5.0.0" + "node": ">=0.10.0" } }, "node_modules/imurmurhash": { @@ -35540,14 +35538,6 @@ "node": ">=8" } }, - "node_modules/strip-comments": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/strip-comments/-/strip-comments-2.0.1.tgz", - "integrity": "sha512-ZprKx+bBLXv067WTCALv8SSz5l2+XhpYCsVtSqlMnkAXMWDq+/ekVbl1ghqP9rUHTzv6sm/DwCOiYutU/yp1fw==", - "engines": { - "node": ">=10" - } - }, "node_modules/strip-eof": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", diff --git a/package.json b/package.json index 0050a5f5f9..cca6d5f82e 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "file-loader": "^6.2.0", "font-awesome": "4.7.0", "hls.js": "0.14.17", - "imports-loader": "^5.0.0", + "imports-loader": "0.7.1", "jest-environment-jsdom": "^26.0.0", "jquery": "2.2.4", "jquery-migrate": "1.4.1", diff --git a/webpack.common.config.js b/webpack.common.config.js index c1b5b30378..cf2519c495 100644 --- a/webpack.common.config.js +++ b/webpack.common.config.js @@ -242,17 +242,11 @@ module.exports = Merge.smart({ use: [ { loader: 'exports-loader', - options: { exports: 'window.XBlock' } + options: 'window.XBlock' }, { loader: 'imports-loader', - options: { - imports: [ - "jquery", - "default jquery immediateDescendents", - ], - wrapper: 'window' - } + options: 'jquery,jquery.immediateDescendents,this=>window' } ] }, @@ -261,14 +255,11 @@ module.exports = Merge.smart({ use: [ { loader: 'exports-loader', - options: { exports: 'window.XBlock' } + options: 'window.XBlock' }, { loader: 'imports-loader', - options: { - imports: "default xblock/core XBlock", - wrapper: 'window' - } + options: 'XBlock=xblock/core,this=>window' } ] }, @@ -300,7 +291,7 @@ module.exports = Merge.smart({ use: [ { loader: 'imports-loader', - options: { wrapper: 'window' } + options: 'this=>window' } ] }, @@ -309,7 +300,7 @@ module.exports = Merge.smart({ use: [ { loader: 'imports-loader', - options: { wrapper: 'window' } + options: 'this=>window' } ] }, @@ -318,7 +309,7 @@ module.exports = Merge.smart({ use: [ { loader: 'imports-loader', - options: { wrapper: 'window' } + options: 'this=>window' } ] }, @@ -327,7 +318,7 @@ module.exports = Merge.smart({ use: [ { loader: 'imports-loader', - options: { wrapper: 'window' } + options: 'this=>window' } ] }, @@ -336,7 +327,7 @@ module.exports = Merge.smart({ use: [ { loader: 'imports-loader', - options: { wrapper: 'window' } + options: 'this=>window' } ] }, @@ -345,7 +336,7 @@ module.exports = Merge.smart({ use: [ { loader: 'imports-loader', - options: { wrapper: 'window' } + options: 'this=>window' } ] }, @@ -354,7 +345,7 @@ module.exports = Merge.smart({ use: [ { loader: 'imports-loader', - options: { wrapper: 'window' } + options: 'this=>window' } ] }, @@ -363,7 +354,7 @@ module.exports = Merge.smart({ use: [ { loader: 'imports-loader', - options: { wrapper: 'window' } + options: 'this=>window' } ] }, @@ -372,7 +363,7 @@ module.exports = Merge.smart({ use: [ { loader: 'imports-loader', - options: { wrapper: 'window' } + options: 'this=>window' } ] }, @@ -381,7 +372,7 @@ module.exports = Merge.smart({ use: [ { loader: 'imports-loader', - options: { wrapper: 'window' } + options: 'this=>window' } ] }, @@ -390,7 +381,7 @@ module.exports = Merge.smart({ use: [ { loader: 'imports-loader', - options: { wrapper: 'window' } + options: 'this=>window' } ] }, @@ -399,7 +390,7 @@ module.exports = Merge.smart({ use: [ { loader: 'imports-loader', - options: { wrapper: 'window' } + options: 'this=>window' } ] }, @@ -408,7 +399,7 @@ module.exports = Merge.smart({ use: [ { loader: 'imports-loader', - options: { wrapper: 'window' } + options: 'this=>window' } ] }, @@ -417,7 +408,7 @@ module.exports = Merge.smart({ use: [ { loader: 'imports-loader', - options: { wrapper: 'window' } + options: 'this=>window' } ] }, @@ -426,7 +417,7 @@ module.exports = Merge.smart({ use: [ { loader: 'imports-loader', - options: { wrapper: 'window' } + options: 'this=>window' } ] }, @@ -435,7 +426,7 @@ module.exports = Merge.smart({ use: [ { loader: 'imports-loader', - options: { wrapper: 'window' } + options: 'this=>window' } ] }, @@ -444,7 +435,7 @@ module.exports = Merge.smart({ use: [ { loader: 'imports-loader', - options: { wrapper: 'window' } + options: 'this=>window' } ] }, @@ -453,7 +444,7 @@ module.exports = Merge.smart({ use: [ { loader: 'imports-loader', - options: { wrapper: 'window' } + options: 'this=>window' } ] }, @@ -462,7 +453,7 @@ module.exports = Merge.smart({ use: [ { loader: 'imports-loader', - options: { wrapper: 'window' } + options: 'this=>window' } ] }, @@ -471,7 +462,7 @@ module.exports = Merge.smart({ use: [ { loader: 'imports-loader', - options: { wrapper: 'window' } + options: 'this=>window' } ] }, @@ -480,7 +471,7 @@ module.exports = Merge.smart({ use: [ { loader: 'imports-loader', - options: { wrapper: 'window' } + options: 'this=>window' } ] }, @@ -489,7 +480,7 @@ module.exports = Merge.smart({ use: [ { loader: 'imports-loader', - options: { wrapper: 'window' } + options: 'this=>window' } ] }, @@ -498,7 +489,7 @@ module.exports = Merge.smart({ use: [ { loader: 'imports-loader', - options: { wrapper: 'window' } + options: 'this=>window' } ] }, @@ -510,7 +501,7 @@ module.exports = Merge.smart({ use: [ { loader: 'exports-loader', - options: { exports: 'window.CodeMirror' } + options: 'window.CodeMirror' } ] }, @@ -519,7 +510,7 @@ module.exports = Merge.smart({ use: [ { loader: 'imports-loader', - options: { wrapper: 'window' } + options: 'this=>window' } ] }, @@ -528,11 +519,11 @@ module.exports = Merge.smart({ use: [ { loader: 'exports-loader', - options: { exports: 'window.XModule' } + options: 'window.XModule' }, { loader: 'imports-loader', - options: { wrapper: 'window' } + options: 'this=>window' } ], }, @@ -541,7 +532,7 @@ module.exports = Merge.smart({ use: [ { loader: 'imports-loader', - options: { exports: 'false' } + options: 'exports=>false' } ] }, @@ -562,7 +553,7 @@ module.exports = Merge.smart({ use: [ { loader: 'imports-loader', - options: { wrapper: 'window' } + options: 'this=>window' } ] }, @@ -572,7 +563,7 @@ module.exports = Merge.smart({ use: [ { loader: 'imports-loader', - options: { wrapper: 'window' } + options: 'this=>window' } ] }, @@ -584,7 +575,7 @@ module.exports = Merge.smart({ use: [ { loader: 'imports-loader', - options: { wrapper: 'window' } + options: 'this=>window' } ] },