[WIP]: reverse order of npm dependencies

also ensures that our proctoring JS will run through babel, even while
we have npm dependencies installed on a local-only basis
This commit is contained in:
Matt Hughes
2018-11-19 13:26:30 -05:00
committed by Dave St.Germain
parent 658fd6c139
commit 6430dc42a6
3 changed files with 21607 additions and 8 deletions

21591
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -4,6 +4,8 @@
"dependencies": {
"@edx/cookie-policy-banner": "1.1.10",
"@edx/edx-bootstrap": "1.0.3",
"@edx/edx-proctoring": "file:../../../src/edx-proctoring",
"@edx/mockprock": "file:../../../src/mockprock",
"@edx/paragon": "2.6.4",
"@edx/studio-frontend": "1.16.12",
"babel-core": "6.26.0",
@@ -24,7 +26,6 @@
"datatables": "1.10.18",
"datatables.net-fixedcolumns": "3.2.6",
"edx-pattern-library": "0.18.1",
"edx-proctoring": "file:../../../src/edx-proctoring",
"edx-ui-toolkit": "1.5.2",
"exports-loader": "0.6.4",
"extract-text-webpack-plugin": "2.1.2",
@@ -63,8 +64,7 @@
"webpack-bundle-tracker": "0.2.1",
"webpack-merge": "4.1.1",
"whatwg-fetch": "2.0.3",
"which-country": "1.0.0",
"worker-loader": "^2.0.0"
"which-country": "1.0.0"
},
"devDependencies": {
"@edx/stylelint-config-edx": "1.1.0",

View File

@@ -390,7 +390,7 @@ module.exports = Merge.smart({
target: "webworker",
context: __dirname,
entry: {
mockprock: './node_modules/edx-proctoring/edx_proctoring/static/proctoring/js/plugin/mockprock-provider.js',
mockprock: './node_modules/@edx/mockprock/static/index.js'
},
output: {
filename: '[name].js',
@@ -402,12 +402,20 @@ module.exports = Merge.smart({
filename: 'webpack-worker-stats.json'
})
],
module: {
rules: [
{
test: /\.(js|jsx)$/,
include: [
/node_modules\/@edx/,
],
use: 'babel-loader'
}
]
},
resolve: {
extensions: ['.js'],
modules: [
'node_modules',
'node_modules/edx-proctoring/node_modules'
]
symlinks: false
}
}}, {web: xmoduleJS});