Skip to content

Commit 4275dd0

Browse files
gjreasonerdriesvints
authored andcommitted
Use Markdown.js with bootstrap.js (#325)
* remove current markdown usage * setup markdown so it can be used with bundled js * dx: enable npm run hot during development
1 parent edb2e1f commit 4275dd0

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

resources/assets/js/bootstrap.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
5050
*/
5151
require('vue-resource');
5252
require('selectize');
53-
require('markdown'); // This doesn't seems to work so we require it directly in base.blade.php
5453
require('to-markdown');
5554
require('bootstrap-markdown/js/bootstrap-markdown');
5655
require('prismjs');
@@ -59,4 +58,5 @@ require('prismjs/components/prism-css');
5958
require('prismjs/components/prism-javascript');
6059
require('prismjs/components/prism-less');
6160
require('prismjs/components/prism-sass');
62-
require('prismjs/components/prism-php');
61+
require('prismjs/components/prism-php');
62+
window.markdown = require('markdown').markdown;

resources/views/layouts/base.blade.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
@include('layouts._footer')
3232
</div>
3333

34-
<script src="{{ asset('build/custom/markdown.js') }}"></script>
3534
<script src="{{ mix('build/js/app.js') }}"></script>
3635

3736
@include('layouts._intercom')

webpack.mix.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ const { mix } = require('laravel-mix');
1212
*/
1313

1414
mix.js('resources/assets/js/app.js', 'public/build/js')
15-
.sass('resources/assets/sass/app.scss', 'public/build/css')
16-
.version()
17-
.copy('node_modules/markdown/lib/markdown.js', 'public/build/custom/markdown.js');
15+
.sass('resources/assets/sass/app.scss', 'public/build/css');
16+
17+
if (mix.config.inProduction) {
18+
mix.version();
19+
}

0 commit comments

Comments
 (0)