mirror of
https://github.com/wallabag/wallabag.git
synced 2025-06-27 16:36:00 +00:00
Rename wallassets to build
This commit is contained in:
parent
5e8ca0887e
commit
c89878d88e
5 changed files with 10 additions and 6 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -29,7 +29,7 @@ web/uploads/
|
||||||
!/web/bundles/.gitkeep
|
!/web/bundles/.gitkeep
|
||||||
/web/assets/images/*
|
/web/assets/images/*
|
||||||
!web/assets/images/.gitkeep
|
!web/assets/images/.gitkeep
|
||||||
/web/wallassets/*
|
/web/build/*
|
||||||
|
|
||||||
# Build
|
# Build
|
||||||
/app/build
|
/app/build
|
||||||
|
|
|
@ -1,5 +1,9 @@
|
||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## Upcoming changes
|
||||||
|
|
||||||
|
* `wallassets/` folder renamed to `build/`
|
||||||
|
|
||||||
## [2.6.10](https://github.com/wallabag/wallabag/tree/2.6.10)
|
## [2.6.10](https://github.com/wallabag/wallabag/tree/2.6.10)
|
||||||
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.6.9...2.6.10)
|
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.6.9...2.6.10)
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,7 @@ module.exports = {
|
||||||
},
|
},
|
||||||
output: {
|
output: {
|
||||||
filename: '[name].js',
|
filename: '[name].js',
|
||||||
path: path.resolve(projectDir, 'web/wallassets'),
|
path: path.resolve(projectDir, 'web/build'),
|
||||||
publicPath: '',
|
publicPath: '',
|
||||||
},
|
},
|
||||||
plugins: [
|
plugins: [
|
||||||
|
|
|
@ -18,9 +18,9 @@
|
||||||
<meta name="twitter:title" content="{{ entry.title|e|raw }}" />
|
<meta name="twitter:title" content="{{ entry.title|e|raw }}" />
|
||||||
<meta name="twitter:description" content="{{ entry.content|striptags|slice(0, 300)|raw }}…" />
|
<meta name="twitter:description" content="{{ entry.content|striptags|slice(0, 300)|raw }}…" />
|
||||||
{% if app.debug %}
|
{% if app.debug %}
|
||||||
<script src="{{ asset('wallassets/public.dev.js') }}"></script>
|
<script src="{{ asset('build/public.dev.js') }}"></script>
|
||||||
{% else %}
|
{% else %}
|
||||||
<link rel="stylesheet" href="{{ asset('wallassets/public.css') }}">
|
<link rel="stylesheet" href="{{ asset('build/public.css') }}">
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
</head>
|
</head>
|
||||||
|
|
|
@ -3,13 +3,13 @@
|
||||||
{% block css %}
|
{% block css %}
|
||||||
{{ parent() }}
|
{{ parent() }}
|
||||||
{% if not app.debug %}
|
{% if not app.debug %}
|
||||||
<link rel="stylesheet" href="{{ asset('wallassets/main.css') }}">
|
<link rel="stylesheet" href="{{ asset('build/main.css') }}">
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block scripts %}
|
{% block scripts %}
|
||||||
{{ parent() }}
|
{{ parent() }}
|
||||||
<script src="{{ asset('wallassets/main' ~ (app.debug ? '.dev' : '') ~ '.js') }}"></script>
|
<script src="{{ asset('build/main' ~ (app.debug ? '.dev' : '') ~ '.js') }}"></script>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block header %}
|
{% block header %}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue