8000 Merge slides and root webpack projects. · dry-python/dry-python.github.io@243b200 · GitHub
[go: up one dir, main page]
Skip to content

Commit 243b200

Browse files
proofit404proofit404
committed
Merge slides and root webpack projects.
1 parent 1b71c82 commit 243b200

File tree

7 files changed

+10830
-3629
lines changed

7 files changed

+10830
-3629
lines changed

‎.flake8

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
[flake8]
2-
max-line-length = 88
2+
max-line-length = 88

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
*.pyo
44
*~
55
[#]*[#]
6-
assets/static/
76
node_modules/
7+
site/

‎mkdocs.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ markdown_extensions:
2727
custom_checkbox: true
2828
google_analytics:
2929
- "UA-136933644-1"
30+
- "auto"
3031
nav:
3132
- "Home": index.md
3233
- "Projects": projects.md

‎package-lock.json

Lines changed: 10802 additions & 3625 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,26 @@
22
"name": "dry-python.org",
33
"author": "Artem Malyshev",
44
"private": true,
5+
"dependencies": {
6+
"highlight.js": "^9.18.0",
7+
"reveal.js": "^3.8.0"
8+
},
59
"devDependencies": {
10+
"@babel/core": "^7.8.3",
11+
"@babel/preset-env": "^7.8.3",
612
"babel-eslint": "^10.0.3",
13+
"babel-loader": "^8.0.6",
14+
"css-loader": "^3.4.2",
715
"eslint": "^6.8.0",
816
"eslint-config-prettier": "^6.9.0",
917
"eslint-plugin-babel": "^5.3.0",
1018
"eslint-plugin-import": "^2.20.0",
19+
"file-loader": "^5.0.2",
20+
"html-webpack-plugin": "^3.2.0",
21+
"mini-css-extract-plugin": "^0.9.0",
22+
"pug": "^2.0.4",
1123
"pug-lint": "^2.6.0",
24+
"pug-loader": "^2.4.0",
1225
"remark-cli": "*",
1326
"remark-lint": "*",
1427
"remark-preset-lint-recommended": "*",
@@ -17,9 +30,12 @@
1730
"typescript": "^3.7.4",
1831
"typescript-language-server": "^0.4.0",
1932
"vscode-css-languageserver-bin": "^1.4.0",
20-
"vscode-html-languageserver-bin": "^1.4.0"
33+
"vscode-html-languageserver-bin": "^1.4.0",
34+
"webpack": "^4.41.5",
35+
"webpack-cli": "^3.3.10"
2136
},
2237
"scripts": {
38+
"build:slides": "webpack",
2339
"lint:css": "stylelint --ignore-path .gitignore '**/*.css'",
2440
"lint:js": "eslint --ext .js --ignore-path .gitignore .",
2541
"lint:md": "remark --frail .",

‎tasks.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,9 @@ def lint(c):
1010
c.run("npm run lint:md")
1111
c.run("npm run lint:pug")
1212
c.run("vale '--glob=*.md' docs")
13+
14+
15+
@task
16+
def build(c):
17+
c.run("poetry run mkdocs build")
18+
c.run("npm run build:slides")

‎slides/webpack.config.js renamed to ‎webpack.config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@ const HtmlWebpackPlugin = require("html-webpack-plugin");
33
const MiniCssExtractPlugin = require("mini-css-extract-plugin");
44

55
module.exports = {
6+
context: path.resolve(__dirname, "slides"),
67
entry: {
78
reveal: "./index.js"
89
},
910
output: {
10-
path: path.resolve(__dirname, "../assets/static/slides/"),
11+
path: path.resolve(__dirname, "./site/static/slides/"),
1112
filename: "[name].js"
1213
},
1314
mode: "production",

0 commit comments

Comments
 (0)
0