Minor - update version, fix js calls

bundles/fosjsrouting/js/router.min.js already added in app.js
Fix path
pull/2635/head^2
Julio Montoya 6 years ago
parent 698c48feab
commit c2ca824e89
  1. 2
      config/packages/fos_js_routing.yaml
  2. 2
      package.json
  3. 1
      src/CoreBundle/Resources/config/routing.yml
  4. 4
      src/ThemeBundle/Resources/views/Layout/head.html.twig
  5. 37
      yarn.lock

@ -1,3 +1,3 @@
fos_js_routing:
request_context_base_url: '%url_append%'
request_context_base_url: '/%url_append%'
routes_to_expose: [home]

@ -4,7 +4,7 @@
"description": "E-learning and collaboration software",
"license": "GPL-3.0",
"devDependencies": {
"@symfony/webpack-encore": "^0.19",
"@symfony/webpack-encore": "0.20.*",
"babel-preset-react": "^6.24.1",
"bootstrap": "^4.1.3",
"copy-webpack-plugin": "^4.3.1",

@ -42,7 +42,6 @@ legacy_javascript:
type: annotation
prefix: /js
legacy_plugin:
path: /plugin/{name}
defaults: {_controller: 'ChamiloCoreBundle:Legacy:plugin'}

@ -54,9 +54,9 @@
{#<script src="{{ asset_url }} "></script>#}
{#{% endjavascripts %}#}
{#<script src="{{ asset('bundles/ivoryckeditor/ckeditor.js') }}" type="text/javascript"></script>#}
<script src="{{ asset('bundles/fosjsrouting/js/router.min.js') }}"></script>
{#<script src="{{ asset('bundles/fosjsrouting/js/router.min.js') }}"></script>#}
{#<script src="{{ url('fos_js_routing_js', { callback: 'fos.Router.setData' }) }}"></script>#}
<script src="{{ url('legacy_index') ~ 'public/js/routing?callback=fos.Router.setData' }}"></script>
{#<script src="{{ path('legacy_index') ~ 'public/js/routing?callback=fos.Router.setData' }}"></script>#}
{% block chamilo_header_js %}
{# Loading legacy js using the $htmlHeadXtra array #}
{% autoescape false %}

@ -6,9 +6,9 @@
version "5.2.0"
resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.2.0.tgz#50cd9856774351c56c0b1b0db4efe122d7913e58"
"@symfony/webpack-encore@^0.19":
version "0.19.0"
resolved "https://registry.yarnpkg.com/@symfony/webpack-encore/-/webpack-encore-0.19.0.tgz#f0725dbbede5ff9d9fdbd7a07f84accafc83ca14"
"@symfony/webpack-encore@0.20.*":
version "0.20.1"
resolved "https://registry.yarnpkg.com/@symfony/webpack-encore/-/webpack-encore-0.20.1.tgz#ab879839f31aef8d6706eef3803ad3e2fb271dc4"
dependencies:
babel-core "^6.24.0"
babel-loader "^7.1.0"
@ -30,6 +30,7 @@
webpack ">=2.2.0 <4"
webpack-chunk-hash "^0.5.0"
webpack-dev-server "^2.4.5"
webpack-manifest-plugin "^2.0.0"
yargs "^8.0.1"
"@types/node@*":
@ -2579,6 +2580,16 @@ from2@^2.1.0:
inherits "^2.0.1"
readable-stream "^2.0.0"
fs-extra@^0.30.0:
version "0.30.0"
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.30.0.tgz#f233ffcc08d4da7d432daa449776989db1df93f0"
dependencies:
graceful-fs "^4.1.2"
jsonfile "^2.1.0"
klaw "^1.0.0"
path-is-absolute "^1.0.0"
rimraf "^2.2.8"
fs-extra@^2.0.0:
version "2.1.2"
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-2.1.2.tgz#046c70163cef9aad46b0e4a7fa467fb22d71de35"
@ -2776,7 +2787,7 @@ globule@^1.0.0:
lodash "~4.17.4"
minimatch "~3.0.2"
graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
version "4.1.11"
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
@ -3566,6 +3577,12 @@ kind-of@^6.0.0, kind-of@^6.0.2:
version "6.0.2"
resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
klaw@^1.0.0:
version "1.3.1"
resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439"
optionalDependencies:
graceful-fs "^4.1.9"
lazy-cache@^1.0.3:
version "1.0.4"
resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
@ -5929,6 +5946,10 @@ tapable@^0.2.7, tapable@~0.2.5:
version "0.2.8"
resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.2.8.tgz#99372a5c999bf2df160afc0d74bed4f47948cd22"
tapable@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.0.0.tgz#cbb639d9002eed9c6b5975eb20598d7936f1f9f2"
tar@^2.0.0:
version "2.2.1"
resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
@ -6314,6 +6335,14 @@ webpack-jquery-ui@^1.0.0:
style-loader "^0.17.0"
webpack "^2.5.1"
webpack-manifest-plugin@^2.0.0:
version "2.0.3"
resolved "https://registry.yarnpkg.com/webpack-manifest-plugin/-/webpack-manifest-plugin-2.0.3.tgz#b42c5b08a0319cedb3ec45d9375a9ecee0acf5eb"
dependencies:
fs-extra "^0.30.0"
lodash ">=3.5 <5"
tapable "^1.0.0"
webpack-sources@^1.0.1:
version "1.1.0"
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.1.0.tgz#a101ebae59d6507354d71d8013950a3a8b7a5a54"

Loading…
Cancel
Save