htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use webpack to deliver underscore (and use newest version)

Browse Source
This commit is contained in:
Sebastian Serth
2018-10-08 13:40:52 +02:00
parent 53e7739e05
commit 8faacd5577
6 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/application.js
View File

@ -23,5 +23,4 @@
//= require ace/ace //= require ace/ace
//= require ace/ext-language_tools //= require ace/ext-language_tools
//= require jquery-ui.min //= require jquery-ui.min
//= require underscore.min
//= require_tree . //= require_tree .

2
app/javascript/packs/application.js
View File

@ -12,6 +12,8 @@ import 'jquery'
import 'bootstrap/dist/js/bootstrap.bundle.min'; import 'bootstrap/dist/js/bootstrap.bundle.min';
import 'chosen-js/chosen.jquery'; import 'chosen-js/chosen.jquery';
import 'jstree'; import 'jstree';
import 'underscore';
window._ = _; // Publish underscore's `_` in global namespace
// CSS // CSS
import 'chosen-js/chosen.css'; import 'chosen-js/chosen.css';

6
config/webpack/environment.js
View File

@ -15,6 +15,7 @@ environment.plugins.prepend('Provide', new webpack.ProvidePlugin({
jquery: 'jquery', jquery: 'jquery',
'window.Tether': "tether", 'window.Tether': "tether",
Popper: ['popper.js', 'default'], // for Bootstrap 4 Popper: ['popper.js', 'default'], // for Bootstrap 4
_: 'underscore',
}) })
); );
@ -22,9 +23,10 @@ const envConfig = module.exports = environment;
const aliasConfig = module.exports = { const aliasConfig = module.exports = {
resolve: { resolve: {
alias: { alias: {
jquery: 'jquery/src/jquery' jquery: 'jquery/src/jquery',
underscore: 'underscore/underscore',
} }
} }
}; };
module.exports = merge(envConfig.toWebpackConfig(), aliasConfig); module.exports = merge(envConfig.toWebpackConfig(), aliasConfig);

1
package.json
View File

@ -7,6 +7,7 @@
"jquery": "^3.3.1", "jquery": "^3.3.1",
"jstree": "^3.3.5", "jstree": "^3.3.5",
"popper.js": "^1.14.4", "popper.js": "^1.14.4",
"underscore": "^1.9.1",
"webpack-merge": "^4.1.4" "webpack-merge": "^4.1.4"
}, },
"devDependencies": { "devDependencies": {

6
vendor/assets/javascripts/underscore.min.js vendored
View File

File diff suppressed because one or more lines are too long

5
yarn.lock
View File

@ -6475,6 +6475,11 @@ uglifyjs-webpack-plugin@^1.2.7:
webpack-sources "^1.1.0" webpack-sources "^1.1.0"
worker-farm "^1.5.2" worker-farm "^1.5.2"
underscore@^1.9.1:
version "1.9.1"
resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.9.1.tgz#06dce34a0e68a7babc29b365b8e74b8925203961"
integrity sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg==
union-value@^1.0.0: union-value@^1.0.0:
version "1.0.0" version "1.0.0"
resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4" resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"