Fix some eslint errors on touched files
Also package lock was tricky in how specifically it wanted to be updated
This commit is contained in:
Matt Hughes
committed by
Dave St.Germain
Dave St.Germain
parent
0a33fb6bb6
commit
6264d75f49
11
package-lock.json
generated
11
package-lock.json
generated
@@ -86,12 +86,17 @@
|
||||
}
|
||||
},
|
||||
"@edx/edx-proctoring": {
|
||||
"version": "git+https://git@github.com/edx/edx-proctoring.git#da02cd60c9ee56df04ed95be0ada83cf1041489c"
|
||||
"version": "git+https://git@github.com/edx/edx-proctoring.git#0cb6a1603fd39a4955b125f674480ac4ccf13ce3"
|
||||
},
|
||||
"@edx/mockprock": {
|
||||
"version": "git+https://git@github.com/edx/mockprock.git#67eff3a2bc7ac6917f5d1e3300e35c753f811f36",
|
||||
"version": "git+https://git@github.com/edx/mockprock.git#181d2c962006ffcecfda009ee9b6f417982c48c6",
|
||||
"requires": {
|
||||
"@edx/edx-proctoring": "git+https://git@github.com/edx/edx-proctoring.git#da02cd60c9ee56df04ed95be0ada83cf1041489c"
|
||||
"@edx/edx-proctoring": "git+https://git@github.com/edx/edx-proctoring.git#0cb6a1603fd39a4955b125f674480ac4ccf13ce3"
|
||||
},
|
||||
"dependencies": {
|
||||
"@edx/edx-proctoring": {
|
||||
"version": "git+https://git@github.com/edx/edx-proctoring.git#0cb6a1603fd39a4955b125f674480ac4ccf13ce3"
|
||||
}
|
||||
}
|
||||
},
|
||||
"@edx/paragon": {
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
"dependencies": {
|
||||
"@edx/cookie-policy-banner": "1.1.10",
|
||||
"@edx/edx-bootstrap": "1.0.3",
|
||||
"@edx/edx-proctoring": "git+https://git@github.com/edx/edx-proctoring.git#dahlia/proctoring-master",
|
||||
"@edx/mockprock": "git+https://git@github.com/edx/mockprock.git#matthugs/proctoring-js-arch-proof-of-concept",
|
||||
"@edx/edx-proctoring": "git+https://git@github.com/edx/edx-proctoring.git",
|
||||
"@edx/mockprock": "git+https://git@github.com/edx/mockprock.git",
|
||||
"@edx/paragon": "2.6.4",
|
||||
"@edx/studio-frontend": "1.16.12",
|
||||
"babel-core": "6.26.0",
|
||||
|
||||
@@ -27,394 +27,397 @@ var defineFooter = new RegExp('(' + defineCallFooter.source + ')|('
|
||||
+ defineFancyFooter.source + ')', 'm');
|
||||
|
||||
module.exports = Merge.smart({
|
||||
web: {
|
||||
context: __dirname,
|
||||
web: {
|
||||
context: __dirname,
|
||||
|
||||
entry: {
|
||||
// Studio
|
||||
Import: './cms/static/js/features/import/factories/import.js',
|
||||
CourseOrLibraryListing: './cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx',
|
||||
'js/factories/login': './cms/static/js/factories/login.js',
|
||||
'js/factories/textbooks': './cms/static/js/factories/textbooks.js',
|
||||
'js/factories/container': './cms/static/js/factories/container.js',
|
||||
'js/factories/context_course': './cms/static/js/factories/context_course.js',
|
||||
'js/factories/library': './cms/static/js/factories/library.js',
|
||||
'js/factories/xblock_validation': './cms/static/js/factories/xblock_validation.js',
|
||||
'js/factories/edit_tabs': './cms/static/js/factories/edit_tabs.js',
|
||||
'js/sock': './cms/static/js/sock.js',
|
||||
entry: {
|
||||
// Studio
|
||||
Import: './cms/static/js/features/import/factories/import.js',
|
||||
CourseOrLibraryListing: './cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx',
|
||||
'js/factories/login': './cms/static/js/factories/login.js',
|
||||
'js/factories/textbooks': './cms/static/js/factories/textbooks.js',
|
||||
'js/factories/container': './cms/static/js/factories/container.js',
|
||||
'js/factories/context_course': './cms/static/js/factories/context_course.js',
|
||||
'js/factories/library': './cms/static/js/factories/library.js',
|
||||
'js/factories/xblock_validation': './cms/static/js/factories/xblock_validation.js',
|
||||
'js/factories/edit_tabs': './cms/static/js/factories/edit_tabs.js',
|
||||
'js/sock': './cms/static/js/sock.js',
|
||||
|
||||
// LMS
|
||||
SingleSupportForm: './lms/static/support/jsx/single_support_form.jsx',
|
||||
AlertStatusBar: './lms/static/js/accessible_components/StatusBarAlert.jsx',
|
||||
LearnerAnalyticsDashboard: './lms/static/js/learner_analytics_dashboard/LearnerAnalyticsDashboard.jsx',
|
||||
UpsellExperimentModal: './lms/static/common/js/components/UpsellExperimentModal.jsx',
|
||||
PortfolioExperimentUpsellModal: './lms/static/common/js/components/PortfolioExperimentUpsellModal.jsx',
|
||||
EntitlementSupportPage: './lms/djangoapps/support/static/support/jsx/entitlements/index.jsx',
|
||||
PasswordResetConfirmation: './lms/static/js/student_account/components/PasswordResetConfirmation.jsx',
|
||||
StudentAccountDeletion: './lms/static/js/student_account/components/StudentAccountDeletion.jsx',
|
||||
StudentAccountDeletionInitializer: './lms/static/js/student_account/StudentAccountDeletionInitializer.js',
|
||||
ProblemBrowser: './lms/djangoapps/instructor/static/instructor/ProblemBrowser/index.jsx',
|
||||
// LMS
|
||||
SingleSupportForm: './lms/static/support/jsx/single_support_form.jsx',
|
||||
AlertStatusBar: './lms/static/js/accessible_components/StatusBarAlert.jsx',
|
||||
LearnerAnalyticsDashboard: './lms/static/js/learner_analytics_dashboard/LearnerAnalyticsDashboard.jsx',
|
||||
UpsellExperimentModal: './lms/static/common/js/components/UpsellExperimentModal.jsx',
|
||||
PortfolioExperimentUpsellModal: './lms/static/common/js/components/PortfolioExperimentUpsellModal.jsx',
|
||||
EntitlementSupportPage: './lms/djangoapps/support/static/support/jsx/entitlements/index.jsx',
|
||||
PasswordResetConfirmation: './lms/static/js/student_account/components/PasswordResetConfirmation.jsx',
|
||||
StudentAccountDeletion: './lms/static/js/student_account/components/StudentAccountDeletion.jsx',
|
||||
StudentAccountDeletionInitializer: './lms/static/js/student_account/StudentAccountDeletionInitializer.js',
|
||||
ProblemBrowser: './lms/djangoapps/instructor/static/instructor/ProblemBrowser/index.jsx',
|
||||
|
||||
// Learner Dashboard
|
||||
EntitlementFactory: './lms/static/js/learner_dashboard/course_entitlement_factory.js',
|
||||
EntitlementUnenrollmentFactory: './lms/static/js/learner_dashboard/entitlement_unenrollment_factory.js',
|
||||
ProgramDetailsFactory: './lms/static/js/learner_dashboard/program_details_factory.js',
|
||||
ProgramListFactory: './lms/static/js/learner_dashboard/program_list_factory.js',
|
||||
UnenrollmentFactory: './lms/static/js/learner_dashboard/unenrollment_factory.js',
|
||||
CompletionOnViewService: './lms/static/completion/js/CompletionOnViewService.js',
|
||||
// Learner Dashboard
|
||||
EntitlementFactory: './lms/static/js/learner_dashboard/course_entitlement_factory.js',
|
||||
EntitlementUnenrollmentFactory: './lms/static/js/learner_dashboard/entitlement_unenrollment_factory.js',
|
||||
ProgramDetailsFactory: './lms/static/js/learner_dashboard/program_details_factory.js',
|
||||
ProgramListFactory: './lms/static/js/learner_dashboard/program_list_factory.js',
|
||||
UnenrollmentFactory: './lms/static/js/learner_dashboard/unenrollment_factory.js',
|
||||
CompletionOnViewService: './lms/static/completion/js/CompletionOnViewService.js',
|
||||
|
||||
// Features
|
||||
CourseGoals: './openedx/features/course_experience/static/course_experience/js/CourseGoals.js',
|
||||
CourseHome: './openedx/features/course_experience/static/course_experience/js/CourseHome.js',
|
||||
CourseOutline: './openedx/features/course_experience/static/course_experience/js/CourseOutline.js',
|
||||
CourseSock: './openedx/features/course_experience/static/course_experience/js/CourseSock.js',
|
||||
CourseTalkReviews: './openedx/features/course_experience/static/course_experience/js/CourseTalkReviews.js',
|
||||
Currency: './openedx/features/course_experience/static/course_experience/js/currency.js',
|
||||
Enrollment: './openedx/features/course_experience/static/course_experience/js/Enrollment.js',
|
||||
LatestUpdate: './openedx/features/course_experience/static/course_experience/js/LatestUpdate.js',
|
||||
WelcomeMessage: './openedx/features/course_experience/static/course_experience/js/WelcomeMessage.js',
|
||||
// Features
|
||||
CourseGoals: './openedx/features/course_experience/static/course_experience/js/CourseGoals.js',
|
||||
CourseHome: './openedx/features/course_experience/static/course_experience/js/CourseHome.js',
|
||||
CourseOutline: './openedx/features/course_experience/static/course_experience/js/CourseOutline.js',
|
||||
CourseSock: './openedx/features/course_experience/static/course_experience/js/CourseSock.js',
|
||||
CourseTalkReviews: './openedx/features/course_experience/static/course_experience/js/CourseTalkReviews.js',
|
||||
Currency: './openedx/features/course_experience/static/course_experience/js/currency.js',
|
||||
Enrollment: './openedx/features/course_experience/static/course_experience/js/Enrollment.js',
|
||||
LatestUpdate: './openedx/features/course_experience/static/course_experience/js/LatestUpdate.js',
|
||||
WelcomeMessage: './openedx/features/course_experience/static/course_experience/js/WelcomeMessage.js',
|
||||
|
||||
CookiePolicyBanner: './common/static/js/src/CookiePolicyBanner.jsx',
|
||||
CookiePolicyBanner: './common/static/js/src/CookiePolicyBanner.jsx',
|
||||
|
||||
// Common
|
||||
ReactRenderer: './common/static/js/src/ReactRenderer.jsx',
|
||||
XModuleShim: 'xmodule/js/src/xmodule.js',
|
||||
|
||||
VerticalStudentView: './common/lib/xmodule/xmodule/assets/vertical/public/js/vertical_student_view.js',
|
||||
commons: 'babel-polyfill'
|
||||
},
|
||||
|
||||
output: {
|
||||
path: path.resolve(__dirname, 'common/static/bundles'),
|
||||
libraryTarget: 'window'
|
||||
},
|
||||
|
||||
plugins: [
|
||||
new webpack.NoEmitOnErrorsPlugin(),
|
||||
new webpack.NamedModulesPlugin(),
|
||||
new BundleTracker({
|
||||
path: process.env.STATIC_ROOT_CMS,
|
||||
filename: 'webpack-stats.json'
|
||||
}),
|
||||
new BundleTracker({
|
||||
path: process.env.STATIC_ROOT_LMS,
|
||||
filename: 'webpack-stats.json'
|
||||
}),
|
||||
new webpack.ProvidePlugin({
|
||||
_: 'underscore',
|
||||
$: 'jquery',
|
||||
jQuery: 'jquery',
|
||||
'window.jQuery': 'jquery',
|
||||
Popper: 'popper.js', // used by bootstrap
|
||||
CodeMirror: 'codemirror',
|
||||
'edx.HtmlUtils': 'edx-ui-toolkit/js/utils/html-utils',
|
||||
AjaxPrefix: 'ajax_prefix',
|
||||
// This is used by some XModules/XBlocks, which don't have
|
||||
// any other way to declare that dependency.
|
||||
$script: 'scriptjs'
|
||||
}),
|
||||
|
||||
// Note: Until karma-webpack releases v3, it doesn't play well with
|
||||
// the CommonsChunkPlugin. We have a kludge in karma.common.conf.js
|
||||
// that dynamically removes this plugin from webpack config when
|
||||
// running those tests (the details are in that file). This is a
|
||||
// recommended workaround, as this plugin is just an optimization. But
|
||||
// because of this, we really don't want to get too fancy with how we
|
||||
// invoke this plugin until we can upgrade karma-webpack.
|
||||
new webpack.optimize.CommonsChunkPlugin({
|
||||
// If the value below changes, update the render_bundle call in
|
||||
// common/djangoapps/pipeline_mako/templates/static_content.html
|
||||
name: 'commons',
|
||||
filename: 'commons.js',
|
||||
minChunks: 3
|
||||
})
|
||||
],
|
||||
|
||||
module: {
|
||||
noParse: [
|
||||
// See sinon/webpack interaction weirdness:
|
||||
// https://github.com/webpack/webpack/issues/304#issuecomment-272150177
|
||||
// (I've tried every other suggestion solution on that page, this
|
||||
// was the only one that worked.)
|
||||
/\/sinon\.js|codemirror-compressed\.js|hls\.js|tinymce\.full\.min\.js/
|
||||
],
|
||||
rules: [
|
||||
{
|
||||
test: files.namespacedRequire.concat(files.textBangUnderscore, filesWithRequireJSBlocks),
|
||||
loader: StringReplace.replace(
|
||||
['babel-loader'],
|
||||
{
|
||||
replacements: [
|
||||
{
|
||||
pattern: defineHeader,
|
||||
replacement: function() { return ''; }
|
||||
},
|
||||
{
|
||||
pattern: defineFooter,
|
||||
replacement: function() { return ''; }
|
||||
},
|
||||
{
|
||||
pattern: /(\/\* RequireJS) \*\//g,
|
||||
replacement: function(match, p1) { return p1; }
|
||||
},
|
||||
{
|
||||
pattern: /\/\* Webpack/g,
|
||||
replacement: function(match) { return match + ' */'; }
|
||||
},
|
||||
{
|
||||
pattern: /text!(.*?\.underscore)/g,
|
||||
replacement: function(match, p1) { return p1; }
|
||||
},
|
||||
{
|
||||
pattern: /RequireJS.require/g,
|
||||
replacement: function() {
|
||||
return 'require';
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
)
|
||||
},
|
||||
{
|
||||
test: /\.(js|jsx)$/,
|
||||
exclude: [
|
||||
/node_modules/,
|
||||
files.namespacedRequire,
|
||||
files.textBangUnderscore,
|
||||
filesWithRequireJSBlocks
|
||||
],
|
||||
use: 'babel-loader'
|
||||
},
|
||||
{
|
||||
test: /\.(js|jsx)$/,
|
||||
include: [
|
||||
/paragon/
|
||||
],
|
||||
use: 'babel-loader'
|
||||
},
|
||||
{
|
||||
test: path.resolve(__dirname, 'common/static/js/src/ajax_prefix.js'),
|
||||
use: [
|
||||
'babel-loader',
|
||||
{
|
||||
loader: 'exports-loader',
|
||||
options: {
|
||||
'this.AjaxPrefix': true
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
test: /\.underscore$/,
|
||||
use: 'raw-loader'
|
||||
},
|
||||
{
|
||||
// This file is used by both RequireJS and Webpack and depends on window globals
|
||||
// This is a dirty hack and shouldn't be replicated for other files.
|
||||
test: path.resolve(__dirname, 'cms/static/cms/js/main.js'),
|
||||
loader: StringReplace.replace(
|
||||
['babel-loader'],
|
||||
{
|
||||
replacements: [
|
||||
{
|
||||
pattern: /\(function\(AjaxPrefix\) {/,
|
||||
replacement: function() { return ''; }
|
||||
},
|
||||
{
|
||||
pattern: /], function\(domReady, \$, str, Backbone, gettext, NotificationView\) {/,
|
||||
replacement: function() {
|
||||
// eslint-disable-next-line
|
||||
return '], function(domReady, $, str, Backbone, gettext, NotificationView, AjaxPrefix) {';
|
||||
}
|
||||
},
|
||||
{
|
||||
pattern: /'..\/..\/common\/js\/components\/views\/feedback_notification',/,
|
||||
replacement: function() {
|
||||
return "'../../common/js/components/views/feedback_notification', 'AjaxPrefix',";
|
||||
}
|
||||
},
|
||||
{
|
||||
pattern: /}\).call\(this, AjaxPrefix\);/,
|
||||
replacement: function() { return ''; }
|
||||
},
|
||||
{
|
||||
pattern: /'..\/..\/common\/js\/components\/views\/feedback_notification',/,
|
||||
replacement: function() {
|
||||
return "'../../common/js/components/views/feedback_notification', 'AjaxPrefix',";
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
)
|
||||
},
|
||||
{
|
||||
test: /\.(woff2?|ttf|eot)(\?v=\d+\.\d+\.\d+)?$/,
|
||||
loader: 'file-loader'
|
||||
},
|
||||
{
|
||||
test: /\.svg$/,
|
||||
loader: 'svg-inline-loader'
|
||||
},
|
||||
{
|
||||
test: /xblock\/core/,
|
||||
loader: 'exports-loader?window.XBlock!imports-loader?jquery,jquery.immediateDescendents,this=>window'
|
||||
},
|
||||
{
|
||||
test: /xblock\/runtime.v1/,
|
||||
loader: 'exports-loader?window.XBlock!imports-loader?XBlock=xblock/core,this=>window'
|
||||
},
|
||||
{
|
||||
test: /descriptors\/js/,
|
||||
loader: 'imports-loader?this=>window'
|
||||
},
|
||||
{
|
||||
test: /modules\/js/,
|
||||
loader: 'imports-loader?this=>window'
|
||||
},
|
||||
{
|
||||
test: /codemirror/,
|
||||
loader: 'exports-loader?window.CodeMirror'
|
||||
},
|
||||
{
|
||||
test: /tinymce/,
|
||||
loader: 'imports-loader?this=>window'
|
||||
},
|
||||
{
|
||||
test: /xmodule\/js\/src\/xmodule/,
|
||||
loader: 'exports-loader?window.XModule!imports-loader?this=>window'
|
||||
},
|
||||
{
|
||||
test: /mock-ajax/,
|
||||
loader: 'imports-loader?exports=>false'
|
||||
},
|
||||
{
|
||||
test: /d3.min/,
|
||||
use: [
|
||||
'babel-loader',
|
||||
{
|
||||
loader: 'exports-loader',
|
||||
options: {
|
||||
d3: true
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
test: /logger/,
|
||||
loader: 'imports-loader?this=>window'
|
||||
}
|
||||
]
|
||||
},
|
||||
|
||||
resolve: {
|
||||
extensions: ['.js', '.jsx', '.json'],
|
||||
alias: {
|
||||
AjaxPrefix: 'ajax_prefix',
|
||||
accessibility: 'accessibility_tools',
|
||||
codemirror: 'codemirror-compressed',
|
||||
datepair: 'timepicker/datepair',
|
||||
'edx-ui-toolkit': 'edx-ui-toolkit/src/', // @TODO: some paths in toolkit are not valid relative paths
|
||||
ieshim: 'ie_shim',
|
||||
jquery: 'jquery/src/jquery', // Use the non-diqst form of jQuery for better debugging + optimization
|
||||
'jquery.flot': 'flot/jquery.flot.min',
|
||||
'jquery.ui': 'jquery-ui.min',
|
||||
'jquery.tinymce': 'jquery.tinymce.min',
|
||||
'jquery.inputnumber': 'html5-input-polyfills/number-polyfill',
|
||||
'jquery.qtip': 'jquery.qtip.min',
|
||||
'jquery.smoothScroll': 'jquery.smooth-scroll.min',
|
||||
'jquery.timepicker': 'timepicker/jquery.timepicker',
|
||||
'backbone.associations': 'backbone-associations/backbone-associations-min',
|
||||
squire: 'Squire',
|
||||
tinymce: 'tinymce.full.min',
|
||||
|
||||
// See sinon/webpack interaction weirdness:
|
||||
// https://github.com/webpack/webpack/issues/304#issuecomment-272150177
|
||||
// (I've tried every other suggestion solution on that page, this
|
||||
// was the only one that worked.)
|
||||
sinon: __dirname + '/node_modules/sinon/pkg/sinon.js',
|
||||
hls: 'hls.js/dist/hls.js'
|
||||
// Common
|
||||
ReactRenderer: './common/static/js/src/ReactRenderer.jsx',
|
||||
XModuleShim: 'xmodule/js/src/xmodule.js',
|
||||
VerticalStudentView: './common/lib/xmodule/xmodule/assets/vertical/public/js/vertical_student_view.js',
|
||||
commons: 'babel-polyfill'
|
||||
},
|
||||
modules: [
|
||||
'cms/djangoapps/pipeline_js/js',
|
||||
'cms/static',
|
||||
'cms/static/cms/js',
|
||||
'cms/templates/js',
|
||||
'lms/static',
|
||||
'common/lib/xmodule',
|
||||
'common/lib/xmodule/xmodule/js/src',
|
||||
'common/lib/xmodule/xmodule/assets/word_cloud/src/js',
|
||||
'common/static',
|
||||
'common/static/coffee/src',
|
||||
'common/static/common/js',
|
||||
'common/static/common/js/vendor/',
|
||||
'common/static/common/js/components',
|
||||
'common/static/js/src',
|
||||
'common/static/js/vendor/',
|
||||
'common/static/js/vendor/jQuery-File-Upload/js/',
|
||||
'common/static/js/vendor/tinymce/js/tinymce',
|
||||
'node_modules',
|
||||
'common/static/xmodule'
|
||||
]
|
||||
},
|
||||
|
||||
resolveLoader: {
|
||||
alias: {
|
||||
text: 'raw-loader' // Compatibility with RequireJSText's text! loader, uses raw-loader under the hood
|
||||
output: {
|
||||
path: path.resolve(__dirname, 'common/static/bundles'),
|
||||
libraryTarget: 'window'
|
||||
},
|
||||
|
||||
plugins: [
|
||||
new webpack.NoEmitOnErrorsPlugin(),
|
||||
new webpack.NamedModulesPlugin(),
|
||||
new BundleTracker({
|
||||
path: process.env.STATIC_ROOT_CMS,
|
||||
filename: 'webpack-stats.json'
|
||||
}),
|
||||
new BundleTracker({
|
||||
path: process.env.STATIC_ROOT_LMS,
|
||||
filename: 'webpack-stats.json'
|
||||
}),
|
||||
new webpack.ProvidePlugin({
|
||||
_: 'underscore',
|
||||
$: 'jquery',
|
||||
jQuery: 'jquery',
|
||||
'window.jQuery': 'jquery',
|
||||
Popper: 'popper.js', // used by bootstrap
|
||||
CodeMirror: 'codemirror',
|
||||
'edx.HtmlUtils': 'edx-ui-toolkit/js/utils/html-utils',
|
||||
AjaxPrefix: 'ajax_prefix',
|
||||
// This is used by some XModules/XBlocks, which don't have
|
||||
// any other way to declare that dependency.
|
||||
$script: 'scriptjs'
|
||||
}),
|
||||
|
||||
// Note: Until karma-webpack releases v3, it doesn't play well with
|
||||
// the CommonsChunkPlugin. We have a kludge in karma.common.conf.js
|
||||
// that dynamically removes this plugin from webpack config when
|
||||
// running those tests (the details are in that file). This is a
|
||||
// recommended workaround, as this plugin is just an optimization. But
|
||||
// because of this, we really don't want to get too fancy with how we
|
||||
// invoke this plugin until we can upgrade karma-webpack.
|
||||
new webpack.optimize.CommonsChunkPlugin({
|
||||
// If the value below changes, update the render_bundle call in
|
||||
// common/djangoapps/pipeline_mako/templates/static_content.html
|
||||
name: 'commons',
|
||||
filename: 'commons.js',
|
||||
minChunks: 3
|
||||
})
|
||||
],
|
||||
|
||||
module: {
|
||||
noParse: [
|
||||
// See sinon/webpack interaction weirdness:
|
||||
// https://github.com/webpack/webpack/issues/304#issuecomment-272150177
|
||||
// (I've tried every other suggestion solution on that page, this
|
||||
// was the only one that worked.)
|
||||
/\/sinon\.js|codemirror-compressed\.js|hls\.js|tinymce\.full\.min\.js/
|
||||
],
|
||||
rules: [
|
||||
{
|
||||
test: files.namespacedRequire.concat(files.textBangUnderscore, filesWithRequireJSBlocks),
|
||||
loader: StringReplace.replace(
|
||||
['babel-loader'],
|
||||
{
|
||||
replacements: [
|
||||
{
|
||||
pattern: defineHeader,
|
||||
replacement: function() { return ''; }
|
||||
},
|
||||
{
|
||||
pattern: defineFooter,
|
||||
replacement: function() { return ''; }
|
||||
},
|
||||
{
|
||||
pattern: /(\/\* RequireJS) \*\//g,
|
||||
replacement: function(match, p1) { return p1; }
|
||||
},
|
||||
{
|
||||
pattern: /\/\* Webpack/g,
|
||||
replacement: function(match) { return match + ' */'; }
|
||||
},
|
||||
{
|
||||
pattern: /text!(.*?\.underscore)/g,
|
||||
replacement: function(match, p1) { return p1; }
|
||||
},
|
||||
{
|
||||
pattern: /RequireJS.require/g,
|
||||
replacement: function() {
|
||||
return 'require';
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
)
|
||||
},
|
||||
{
|
||||
test: /\.(js|jsx)$/,
|
||||
exclude: [
|
||||
/node_modules/,
|
||||
files.namespacedRequire,
|
||||
files.textBangUnderscore,
|
||||
filesWithRequireJSBlocks
|
||||
],
|
||||
use: 'babel-loader'
|
||||
},
|
||||
{
|
||||
test: /\.(js|jsx)$/,
|
||||
include: [
|
||||
/paragon/
|
||||
],
|
||||
use: 'babel-loader'
|
||||
},
|
||||
{
|
||||
test: path.resolve(__dirname, 'common/static/js/src/ajax_prefix.js'),
|
||||
use: [
|
||||
'babel-loader',
|
||||
{
|
||||
loader: 'exports-loader',
|
||||
options: {
|
||||
'this.AjaxPrefix': true
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
test: /\.underscore$/,
|
||||
use: 'raw-loader'
|
||||
},
|
||||
{
|
||||
// This file is used by both RequireJS and Webpack and depends on window globals
|
||||
// This is a dirty hack and shouldn't be replicated for other files.
|
||||
test: path.resolve(__dirname, 'cms/static/cms/js/main.js'),
|
||||
loader: StringReplace.replace(
|
||||
['babel-loader'],
|
||||
{
|
||||
replacements: [
|
||||
{
|
||||
pattern: /\(function\(AjaxPrefix\) {/,
|
||||
replacement: function() { return ''; }
|
||||
},
|
||||
{
|
||||
pattern: /], function\(domReady, \$, str, Backbone, gettext, NotificationView\) {/,
|
||||
replacement: function() {
|
||||
// eslint-disable-next-line
|
||||
return '], function(domReady, $, str, Backbone, gettext, NotificationView, AjaxPrefix) {';
|
||||
}
|
||||
},
|
||||
{
|
||||
pattern: /'..\/..\/common\/js\/components\/views\/feedback_notification',/,
|
||||
replacement: function() {
|
||||
return "'../../common/js/components/views/feedback_notification'," +
|
||||
"'AjaxPrefix',";
|
||||
}
|
||||
},
|
||||
{
|
||||
pattern: /}\).call\(this, AjaxPrefix\);/,
|
||||
replacement: function() { return ''; }
|
||||
},
|
||||
{
|
||||
pattern: /'..\/..\/common\/js\/components\/views\/feedback_notification',/,
|
||||
replacement: function() {
|
||||
return "'../../common/js/components/views/feedback_notification'," +
|
||||
"'AjaxPrefix',";
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
)
|
||||
},
|
||||
{
|
||||
test: /\.(woff2?|ttf|eot)(\?v=\d+\.\d+\.\d+)?$/,
|
||||
loader: 'file-loader'
|
||||
},
|
||||
{
|
||||
test: /\.svg$/,
|
||||
loader: 'svg-inline-loader'
|
||||
},
|
||||
{
|
||||
test: /xblock\/core/,
|
||||
loader: 'exports-loader?window.XBlock!' +
|
||||
'imports-loader?jquery,jquery.immediateDescendents,this=>window'
|
||||
},
|
||||
{
|
||||
test: /xblock\/runtime.v1/,
|
||||
loader: 'exports-loader?window.XBlock!imports-loader?XBlock=xblock/core,this=>window'
|
||||
},
|
||||
{
|
||||
test: /descriptors\/js/,
|
||||
loader: 'imports-loader?this=>window'
|
||||
},
|
||||
{
|
||||
test: /modules\/js/,
|
||||
loader: 'imports-loader?this=>window'
|
||||
},
|
||||
{
|
||||
test: /codemirror/,
|
||||
loader: 'exports-loader?window.CodeMirror'
|
||||
},
|
||||
{
|
||||
test: /tinymce/,
|
||||
loader: 'imports-loader?this=>window'
|
||||
},
|
||||
{
|
||||
test: /xmodule\/js\/src\/xmodule/,
|
||||
loader: 'exports-loader?window.XModule!imports-loader?this=>window'
|
||||
},
|
||||
{
|
||||
test: /mock-ajax/,
|
||||
loader: 'imports-loader?exports=>false'
|
||||
},
|
||||
{
|
||||
test: /d3.min/,
|
||||
use: [
|
||||
'babel-loader',
|
||||
{
|
||||
loader: 'exports-loader',
|
||||
options: {
|
||||
d3: true
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
test: /logger/,
|
||||
loader: 'imports-loader?this=>window'
|
||||
}
|
||||
]
|
||||
},
|
||||
|
||||
resolve: {
|
||||
extensions: ['.js', '.jsx', '.json'],
|
||||
alias: {
|
||||
AjaxPrefix: 'ajax_prefix',
|
||||
accessibility: 'accessibility_tools',
|
||||
codemirror: 'codemirror-compressed',
|
||||
datepair: 'timepicker/datepair',
|
||||
'edx-ui-toolkit': 'edx-ui-toolkit/src/', // @TODO: some paths in toolkit are not valid relative paths
|
||||
ieshim: 'ie_shim',
|
||||
jquery: 'jquery/src/jquery', // Use the non-diqst form of jQuery for better debugging + optimization
|
||||
'jquery.flot': 'flot/jquery.flot.min',
|
||||
'jquery.ui': 'jquery-ui.min',
|
||||
'jquery.tinymce': 'jquery.tinymce.min',
|
||||
'jquery.inputnumber': 'html5-input-polyfills/number-polyfill',
|
||||
'jquery.qtip': 'jquery.qtip.min',
|
||||
'jquery.smoothScroll': 'jquery.smooth-scroll.min',
|
||||
'jquery.timepicker': 'timepicker/jquery.timepicker',
|
||||
'backbone.associations': 'backbone-associations/backbone-associations-min',
|
||||
squire: 'Squire',
|
||||
tinymce: 'tinymce.full.min',
|
||||
|
||||
// See sinon/webpack interaction weirdness:
|
||||
// https://github.com/webpack/webpack/issues/304#issuecomment-272150177
|
||||
// (I've tried every other suggestion solution on that page, this
|
||||
// was the only one that worked.)
|
||||
sinon: __dirname + '/node_modules/sinon/pkg/sinon.js',
|
||||
hls: 'hls.js/dist/hls.js'
|
||||
},
|
||||
modules: [
|
||||
'cms/djangoapps/pipeline_js/js',
|
||||
'cms/static',
|
||||
'cms/static/cms/js',
|
||||
'cms/templates/js',
|
||||
'lms/static',
|
||||
'common/lib/xmodule',
|
||||
'common/lib/xmodule/xmodule/js/src',
|
||||
'common/lib/xmodule/xmodule/assets/word_cloud/src/js',
|
||||
'common/static',
|
||||
'common/static/coffee/src',
|
||||
'common/static/common/js',
|
||||
'common/static/common/js/vendor/',
|
||||
'common/static/common/js/components',
|
||||
'common/static/js/src',
|
||||
'common/static/js/vendor/',
|
||||
'common/static/js/vendor/jQuery-File-Upload/js/',
|
||||
'common/static/js/vendor/tinymce/js/tinymce',
|
||||
'node_modules',
|
||||
'common/static/xmodule'
|
||||
]
|
||||
},
|
||||
|
||||
resolveLoader: {
|
||||
alias: {
|
||||
text: 'raw-loader' // Compatibility with RequireJSText's text! loader, uses raw-loader under the hood
|
||||
}
|
||||
},
|
||||
|
||||
externals: {
|
||||
$: 'jQuery',
|
||||
backbone: 'Backbone',
|
||||
canvas: 'canvas',
|
||||
coursetalk: 'CourseTalk',
|
||||
gettext: 'gettext',
|
||||
jquery: 'jQuery',
|
||||
logger: 'Logger',
|
||||
underscore: '_',
|
||||
URI: 'URI',
|
||||
XBlockToXModuleShim: 'XBlockToXModuleShim',
|
||||
XModule: 'XModule'
|
||||
},
|
||||
|
||||
watchOptions: {
|
||||
poll: true
|
||||
},
|
||||
|
||||
node: {
|
||||
fs: 'empty'
|
||||
}
|
||||
},
|
||||
|
||||
externals: {
|
||||
$: 'jQuery',
|
||||
backbone: 'Backbone',
|
||||
canvas: 'canvas',
|
||||
coursetalk: 'CourseTalk',
|
||||
gettext: 'gettext',
|
||||
jquery: 'jQuery',
|
||||
logger: 'Logger',
|
||||
underscore: '_',
|
||||
URI: 'URI',
|
||||
XBlockToXModuleShim: 'XBlockToXModuleShim',
|
||||
XModule: 'XModule'
|
||||
},
|
||||
|
||||
watchOptions: {
|
||||
poll: true
|
||||
},
|
||||
|
||||
node: {
|
||||
fs: 'empty'
|
||||
webworker: {
|
||||
target: 'webworker',
|
||||
context: __dirname,
|
||||
entry: {
|
||||
mockprock: './node_modules/@edx/mockprock/static/index.js'
|
||||
},
|
||||
output: {
|
||||
filename: '[name].js',
|
||||
path: path.resolve(__dirname, 'common/static/bundles')
|
||||
},
|
||||
plugins: [
|
||||
new BundleTracker({
|
||||
path: process.env.STATIC_ROOT_LMS,
|
||||
filename: 'webpack-worker-stats.json'
|
||||
})
|
||||
],
|
||||
module: {
|
||||
rules: [
|
||||
{
|
||||
test: /\.(js|jsx)$/,
|
||||
include: [
|
||||
/node_modules\/@edx/
|
||||
],
|
||||
use: 'babel-loader'
|
||||
}
|
||||
]
|
||||
},
|
||||
resolve: {
|
||||
extensions: ['.js']
|
||||
}
|
||||
}
|
||||
|
||||
},
|
||||
webworker: {
|
||||
target: "webworker",
|
||||
context: __dirname,
|
||||
entry: {
|
||||
mockprock: './node_modules/@edx/mockprock/static/index.js'
|
||||
},
|
||||
output: {
|
||||
filename: '[name].js',
|
||||
path: path.resolve(__dirname, 'common/static/bundles'),
|
||||
},
|
||||
plugins: [
|
||||
new BundleTracker({
|
||||
path: process.env.STATIC_ROOT_LMS,
|
||||
filename: 'webpack-worker-stats.json'
|
||||
})
|
||||
],
|
||||
module: {
|
||||
rules: [
|
||||
{
|
||||
test: /\.(js|jsx)$/,
|
||||
include: [
|
||||
/node_modules\/@edx/,
|
||||
],
|
||||
use: 'babel-loader'
|
||||
}
|
||||
]
|
||||
},
|
||||
resolve: {
|
||||
extensions: ['.js']
|
||||
}
|
||||
}}, {web: xmoduleJS});
|
||||
}, {web: xmoduleJS});
|
||||
|
||||
|
||||
@@ -5,60 +5,59 @@
|
||||
var Merge = require('webpack-merge');
|
||||
var path = require('path');
|
||||
var webpack = require('webpack');
|
||||
// TODO: remove once common worker settings moved into common
|
||||
var BundleTracker = require('webpack-bundle-tracker');
|
||||
var _ = require('underscore');
|
||||
|
||||
var commonConfig = require('./webpack.common.config.js');
|
||||
|
||||
module.exports = _.values(Merge.smart(commonConfig, {
|
||||
web: {
|
||||
output: {
|
||||
filename: '[name].js'
|
||||
},
|
||||
devtool: 'source-map',
|
||||
plugins: [
|
||||
new webpack.LoaderOptionsPlugin({
|
||||
debug: true
|
||||
}),
|
||||
new webpack.DefinePlugin({
|
||||
'process.env.NODE_ENV': JSON.stringify('development')
|
||||
})
|
||||
],
|
||||
module: {
|
||||
rules: [
|
||||
{
|
||||
test: /(.scss|.css)$/,
|
||||
include: [
|
||||
/paragon/,
|
||||
/font-awesome/
|
||||
],
|
||||
use: [
|
||||
'style-loader',
|
||||
{
|
||||
loader: 'css-loader',
|
||||
options: {
|
||||
sourceMap: true,
|
||||
modules: true,
|
||||
localIdentName: '[name]__[local]'
|
||||
web: {
|
||||
output: {
|
||||
filename: '[name].js'
|
||||
},
|
||||
devtool: 'source-map',
|
||||
plugins: [
|
||||
new webpack.LoaderOptionsPlugin({
|
||||
debug: true
|
||||
}),
|
||||
new webpack.DefinePlugin({
|
||||
'process.env.NODE_ENV': JSON.stringify('development')
|
||||
})
|
||||
],
|
||||
module: {
|
||||
rules: [
|
||||
{
|
||||
test: /(.scss|.css)$/,
|
||||
include: [
|
||||
/paragon/,
|
||||
/font-awesome/
|
||||
],
|
||||
use: [
|
||||
'style-loader',
|
||||
{
|
||||
loader: 'css-loader',
|
||||
options: {
|
||||
sourceMap: true,
|
||||
modules: true,
|
||||
localIdentName: '[name]__[local]'
|
||||
}
|
||||
},
|
||||
{
|
||||
loader: 'sass-loader',
|
||||
options: {
|
||||
data: '$base-rem-size: 0.625; @import "paragon-reset";',
|
||||
includePaths: [
|
||||
path.join(__dirname, './node_modules/@edx/paragon/src/utils'),
|
||||
path.join(__dirname, './node_modules/')
|
||||
],
|
||||
sourceMap: true
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
loader: 'sass-loader',
|
||||
options: {
|
||||
data: '$base-rem-size: 0.625; @import "paragon-reset";',
|
||||
includePaths: [
|
||||
path.join(__dirname, './node_modules/@edx/paragon/src/utils'),
|
||||
path.join(__dirname, './node_modules/')
|
||||
],
|
||||
sourceMap: true
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
watchOptions: {
|
||||
ignored: [/node_modules/, /\.git/]
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
watchOptions: {
|
||||
ignored: [/node_modules/, /\.git/]
|
||||
}
|
||||
}
|
||||
}}));
|
||||
}));
|
||||
|
||||
Reference in New Issue
Block a user