chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix load of font awesome + flag images

Browse Source
pull/2487/head
jmontoyaa 8 years ago
parent 9816b0fef5
commit 355abb6765
3 changed files with 52 additions and 31 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 18
      package.json
  2. 25
      webpack.config.js
  3. 40
      yarn.lock

18
package.json
Unescape View File

@ -5,16 +5,16 @@
"bootstrap-sass": "^3.3.7",
"copy-webpack-plugin": "^4.3.1",
"node-sass": "^4.5.3",
"sass-loader": "^6.0.6",
"webpack": "^3.0.0"
"sass-loader": "^6.0.7",
"webpack": "^3.0"
},
"dependencies": {
"blueimp-file-upload": "^9.19.2",
"bootstrap-daterangepicker": "^2.1.30",
"bootstrap-select": "^1.12.4",
"chosen-js": "^1.8.0",
"cropper": "^3.1.6",
"flag-icon-css": "^2.9.0",
"chosen-js": "^1.8.3",
"cropper": "^4.0",
"flag-icon-css": "^3.0",
"font-awesome": "^4.7",
"font-awesome-webpack": "^0.0.5-beta.2",
"fs": "0.0.1-security",
@ -27,16 +27,16 @@
"jsplumb": "^2.6.9",
"less": "^2.7.2",
"less-loader": "^4.0.5",
"mathjax": "^2.7.2",
"mediaelement": "^4.2.7",
"moment": "^2.18.1",
"mathjax": "^2.7.4",
"mediaelement": "^4.2.9",
"moment": "^2.22",
"mxgraph": "^3.9.3",
"pwstrength-bootstrap": "^2.1.1",
"qtip2": "^3.0.3",
"select2": "^4.0.6-rc.1",
"simplewebrtc": "^3.0.1",
"timeago": "^1.6.1",
"webcamjs": "^1.0.24",
"webcamjs": "^1.0",
"webpack-jquery-ui": "^1.0.0"
}
}

25
webpack.config.js
Unescape View File

@ -3,20 +3,18 @@ var copyWebpackPlugin = require('copy-webpack-plugin');
Encore
.setOutputPath('public/build/')
.setManifestKeyPrefix('build/')
.setManifestKeyPrefix('public/build/')
// If chamilo is installed in localhost/chamilo2
.setPublicPath('./public/build/')
.setPublicPath('../')
// If chamilo is installed in a domain my.chamilo.net
//.setPublicPath('/build')
.cleanupOutputBeforeBuild()
// enable features!
.enableSassLoader(function(sassOptions) {}, {
// resolveUrlLoader: false
//resolveUrlLoader: false
})
.enableLessLoader()
.autoProvidejQuery()
.enableReactPreset()
// read main.js -> output as public/build/chamilo.js
.addEntry('chamilo', './assets/js/main.js')
@ -78,4 +76,17 @@ chamiloThemes.forEach(function (theme) {
]));
});
module.exports = Encore.getWebpackConfig();
var config = Encore.getWebpackConfig();
/*config.module.rules.push({
test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,
loader: 'file-loader',
options: {
name: '[path][name].[ext]',
useRelativePath: true,
cssOutputPath: 'static/css'
}
});*/
module.exports = config;

40
yarn.lock
Unescape View File

@ -1322,7 +1322,7 @@ chokidar@^2.0.0, chokidar@^2.0.2:
optionalDependencies:
fsevents "^1.1.2"
chosen-js@^1.8.0:
chosen-js@^1.8.3:
version "1.8.3"
resolved "https://registry.yarnpkg.com/chosen-js/-/chosen-js-1.8.3.tgz#1f953aef905d9760c14b5facc839a5f47eb356ec"
@ -1614,9 +1614,15 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.3, create-hmac@^1.1.4:
safe-buffer "^5.0.1"
sha.js "^2.4.8"
cropper@^3.1.6:
version "3.1.6"
resolved "https://registry.yarnpkg.com/cropper/-/cropper-3.1.6.tgz#cd862bc8f441d03ee94afbc2dc29e64e2176be7f"
cropper@^4.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/cropper/-/cropper-4.0.0.tgz#77a0c1f8989049f6b9a9137acb865dca5a1e9f62"
dependencies:
cropperjs "^1.3.4"
cropperjs@^1.3.4:
version "1.3.4"
resolved "https://registry.yarnpkg.com/cropperjs/-/cropperjs-1.3.4.tgz#e288af96f7781f85a3cbefaf342095ab35818110"
cross-spawn@^3.0.0:
version "3.0.1"
@ -2482,9 +2488,9 @@ find-up@^2.0.0, find-up@^2.1.0:
dependencies:
locate-path "^2.0.0"
flag-icon-css@^2.9.0:
version "2.9.0"
resolved "https://registry.yarnpkg.com/flag-icon-css/-/flag-icon-css-2.9.0.tgz#5793c15244e3c63ae36631478a758a3fc29c86be"
flag-icon-css@^3.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/flag-icon-css/-/flag-icon-css-3.0.0.tgz#a67cb3913973e38a8117e738ebbe9081049d8127"
flatten@^1.0.2:
version "1.0.2"
@ -3817,9 +3823,9 @@ math-expression-evaluator@^1.2.14:
version "1.2.17"
resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz#de819fdbcd84dccd8fae59c6aeb79615b9d266ac"
mathjax@^2.7.2:
version "2.7.3"
resolved "https://registry.yarnpkg.com/mathjax/-/mathjax-2.7.3.tgz#9cf668467d9eafadcc28569cba8eb34f4ea2c9a3"
mathjax@^2.7.4:
version "2.7.4"
resolved "https://registry.yarnpkg.com/mathjax/-/mathjax-2.7.4.tgz#a88c55392b69a9715813cdc041ce02de6548a603"
md5.js@^1.3.4:
version "1.3.4"
@ -3832,7 +3838,7 @@ media-typer@0.3.0:
version "0.3.0"
resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
mediaelement@^4.2.7:
mediaelement@^4.2.9:
version "4.2.9"
resolved "https://registry.yarnpkg.com/mediaelement/-/mediaelement-4.2.9.tgz#6ea844f188c0be88127ae825fdb6bd2364a53600"
dependencies:
@ -4006,10 +4012,14 @@ mockconsole@0.0.1, mockconsole@0.0.x:
version "0.0.1"
resolved "https://registry.yarnpkg.com/mockconsole/-/mockconsole-0.0.1.tgz#d62a7ed85530964abcd24edb9f30fa58bbce56c6"
moment@>=2.9.0, moment@^2.18.1, moment@^2.9.0:
moment@>=2.9.0, moment@^2.9.0:
version "2.21.0"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.21.0.tgz#2a114b51d2a6ec9e6d83cf803f838a878d8a023a"
moment@^2.22:
version "2.22.0"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.0.tgz#7921ade01017dd45186e7fee5f424f0b8663a730"
move-concurrently@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
@ -5358,7 +5368,7 @@ sass-graph@^2.2.4:
scss-tokenizer "^0.2.3"
yargs "^7.0.0"
sass-loader@^6.0.6:
sass-loader@^6.0.7:
version "6.0.7"
resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-6.0.7.tgz#dd2fdb3e7eeff4a53f35ba6ac408715488353d00"
dependencies:
@ -6277,7 +6287,7 @@ wbuf@^1.1.0, wbuf@^1.7.2:
dependencies:
minimalistic-assert "^1.0.0"
webcamjs@^1.0.24:
webcamjs@^1.0:
version "1.0.25"
resolved "https://registry.yarnpkg.com/webcamjs/-/webcamjs-1.0.25.tgz#4ac9645f25545fa01a29a59b8b00277a14f29416"
@ -6347,7 +6357,7 @@ webpack-sources@^1.0.1:
source-list-map "^2.0.0"
source-map "~0.6.1"
"webpack@>=2.2.0 <4", webpack@^3.0.0:
"webpack@>=2.2.0 <4", webpack@^3.0:
version "3.11.0"
resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.11.0.tgz#77da451b1d7b4b117adaf41a1a93b5742f24d894"
dependencies:

Write Preview
Loading…
Cancel
Save