Сборка CSS и JS через webpack

remotes/origin/hasaccess
Vitaly Baev 8 years ago
parent 8d69cfa7de
commit 576320a570
  1. 2
      .gitignore
  2. 5
      project/templates/lilcity/test.html
  3. 5535
      web/build/css/app.css
  4. 1
      web/build/css/app.css.map
  5. BIN
      web/build/css/fonts/ProximaNova-Bold.woff
  6. BIN
      web/build/css/fonts/ProximaNova-Bold.woff2
  7. BIN
      web/build/css/fonts/ProximaNova-Light.woff
  8. BIN
      web/build/css/fonts/ProximaNova-Light.woff2
  9. BIN
      web/build/css/fonts/ProximaNova-Regular.woff
  10. BIN
      web/build/css/fonts/ProximaNova-Regular.woff2
  11. BIN
      web/build/css/fonts/ProximaNova-SemiBold.woff
  12. BIN
      web/build/css/fonts/ProximaNova-SemiBold.woff2
  13. 29813
      web/build/js/app.js
  14. 1
      web/build/js/app.js.map
  15. 62321
      web/build/js/courseRedactor.js
  16. 7
      web/package.json
  17. 13
      web/webpack.config.js

2
.gitignore vendored

@ -112,3 +112,5 @@ venv.bak/
node_modules node_modules
db.sqlite3 db.sqlite3
.vscode .vscode
/web/build

@ -3,8 +3,9 @@
{% block title %}School LIL.CITY{% endblock title %} {% block title %}School LIL.CITY{% endblock title %}
{% block content %} {% block content %}
{{ request.user.auth_token }} {{ request.user.auth_token }}
<course-redactor author-picture="http://localhost:8000/static/img/user.jpg" author-name="Vitaly Baev" access-token="95a4b7ac608d5e4e0290ea93b7b0d2bf0e20bc92"></course-redactor> <course-redactor author-picture="http://localhost:8000/static/img/user.jpg" author-name="Vitaly Baev" access-token="1fac76972542b0f6492076e45e4b8cb39b5c422a" :course-id="71"></course-redactor>
{% endblock content %} {% endblock content %}
{% block foot %} {% block foot %}
<script type="text/javascript" src={% static "js/courseRedactor.js" %}></script> <script type="text/javascript" src={% static "courseRedactor.js" %}></script>
<link rel="stylesheet" href={% static "courseRedactor.css" %}></link>
{% endblock foot %} {% endblock foot %}

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -11,9 +11,12 @@
"autoprefixer": "^6.3.3", "autoprefixer": "^6.3.3",
"babel-core": "^6.26.0", "babel-core": "^6.26.0",
"babel-loader": "^7.1.2", "babel-loader": "^7.1.2",
"babel-plugin-transform-runtime": "^6.4.3", "babel-plugin-transform-es2015-arrow-functions": "^6.22.0",
"babel-plugin-transform-es2015-shorthand-properties": "^6.24.1",
"babel-plugin-transform-es2015-template-literals": "^6.22.0",
"babel-plugin-transform-runtime": "^6.23.0",
"babel-preset-env": "^1.6.1", "babel-preset-env": "^1.6.1",
"babel-preset-es2015": "^6.3.13", "babel-preset-es2015": "^6.24.1",
"browser-sync": "^2.10.0", "browser-sync": "^2.10.0",
"css-loader": "^0.28.9", "css-loader": "^0.28.9",
"css-mqpacker": "^5.0.1", "css-mqpacker": "^5.0.1",

@ -10,8 +10,10 @@ module.exports = {
}, },
output: { output: {
path: path.join(__dirname, "build"), path: path.join(__dirname, "build"),
filename: NODE_ENV === 'development' ? '[name].js' : '[name].[id].[chunkhash].js', filename: NODE_ENV === 'development' ? '[name].js' : '[name].js',
library: '[name]', library: '[name]',
//filename: NODE_ENV === 'development' ? '[name].js' : '[name].[id].[chunkhash].js',
//library: '[name]',
publicPath: '/static/', publicPath: '/static/',
}, },
module: { module: {
@ -22,13 +24,7 @@ module.exports = {
use: { use: {
loader: 'babel-loader', loader: 'babel-loader',
options: { options: {
presets: [ "presets": ["es2015"],
["env", {
"targets": {
"browsers": ["last 2 versions", "safari >= 7"]
}
}]
]
} }
} }
}, },
@ -52,6 +48,7 @@ module.exports = {
exclude: [/node_modules/], exclude: [/node_modules/],
options: { options: {
loaders: { loaders: {
js: 'babel-loader?presets[]=es2015',
css: 'vue-style-loader!css-loader', css: 'vue-style-loader!css-loader',
scss: 'vue-style-loader!css-loader!sass-loader', scss: 'vue-style-loader!css-loader!sass-loader',
sass: 'vue-style-loader!css-loader!sass-loader?indentedSyntax' sass: 'vue-style-loader!css-loader!sass-loader?indentedSyntax'

Loading…
Cancel
Save