Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feature #587 Enhance the webpack-encore integration (alOneh)
This PR was squashed before being merged into the master branch (closes #587). Discussion ---------- Enhance the webpack-encore integration This enhance the first integration (#586) of webpack-encore. Fixes : * jquery issue * typeahead issue * delete modal issue - [ ] Add build sources - [ ] Update webpack-encore version Commits ------- 13d02c1 Enhance the webpack-encore integration
- Loading branch information
Showing
6 changed files
with
34 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
// loads the Bootstrap jQuery plugins | ||
require('bootstrap-sass/assets/javascripts/bootstrap/dropdown.js'); | ||
require('bootstrap-sass/assets/javascripts/bootstrap/modal.js'); | ||
require('bootstrap-sass/assets/javascripts/bootstrap/transition.js'); | ||
import 'bootstrap-sass/assets/javascripts/bootstrap/dropdown.js'; | ||
import 'bootstrap-sass/assets/javascripts/bootstrap/modal.js'; | ||
import 'bootstrap-sass/assets/javascripts/bootstrap/transition.js'; | ||
|
||
// loads the code syntax highlighting library | ||
require('./highlight.js'); | ||
import './highlight.js'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,8 @@ | ||
var hljs = require('highlight.js/lib/highlight.js'); | ||
import hljs from 'highlight.js/lib/highlight'; | ||
import php from 'highlight.js/lib/languages/php'; | ||
import twig from 'highlight.js/lib/languages/twig'; | ||
|
||
hljs.configure({ | ||
languages: ['twig', 'php'] | ||
}); | ||
hljs.registerLanguage('php', php); | ||
hljs.registerLanguage('twig', twig); | ||
|
||
hljs.initHighlightingOnLoad(); | ||
|
||
module.exports = hljs; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters