From 579771d53fb79b2a04dda27e4505331df5906932 Mon Sep 17 00:00:00 2001 From: Daniel Tomlinson Date: Sun, 31 May 2020 05:20:08 +0100 Subject: [PATCH] Updating documentation --- .DS_Store | Bin 6148 -> 6148 bytes blog/.DS_Store | Bin 10244 -> 10244 bytes blog/todo-webpack.todo | 3 ++- blog/webpack-structure.md | 12 ++++++------ 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.DS_Store b/.DS_Store index 2f71506ab79c07349f8692a55f0b0030fcbd1aba..93a9a109353bed39bf4f41f2d667fa8f8f6a0cf2 100644 GIT binary patch delta 67 zcmZoMXffE}%_MpvsURn_xWvHVIwKP^3o9Et2PY@z~A3$yb;Z X7-vlW$|TP?bF(P(Czj1@9RK(Ma+DI< delta 121 zcmZoMXffE}%_Mp~8jU4vR3 zg=#}H3n1Ijz{tF|mXkwV)zH>6A-A%sx~8^nCIc8SGD2tuekcv2W^EQ>{=~AGo#QV* E0KlgiFaQ7m diff --git a/blog/.DS_Store b/blog/.DS_Store index 7dd594a3d5b85c7aec74e994a83b4902a80a401b..e38d302ad3c814e291ece9ad635711a5c9627588 100644 GIT binary patch delta 168 zcmZn(XbG6$&uG3eU^hRb`D6zHiODJg$5mJuk{EIr@)^=SbMljua`KZH7#IW?7?@WB z=^6jQfMN4%YzzeqrC`;W49VD3Po5_#x4BESgLU$8(KDOxOJ8N)%&zc@W%5mt Kc|>bgV*&s{Z8GNo delta 105 zcmV-v0G9uRP=rvBPXRTtP`eKSHIqOP7?UIr$Fma=j0CgG6`KVW$zpJ9X>)WiFxLSB z0|W&I2M7rX2$S#;XbcDmUl163do3_5AT5*b8z2FhlMfsp0h+Tf9M}VqfK#&vAo>K8 LDHV3J%N30RvP2+z diff --git a/blog/todo-webpack.todo b/blog/todo-webpack.todo index 2a33548..3bb4f22 100644 --- a/blog/todo-webpack.todo +++ b/blog/todo-webpack.todo @@ -1,6 +1,7 @@ Tasks: - ☐ Move all the scss into the new theme. + ✔ Move all the scss into the new theme. @done (5/31/2020, 3:26:30 AM) ☐ Move the image shortcode into the new theme. ☐ Recreate the fonts scss file and apply it. ☐ Download and create the monospace font. + ☐ Remove any unneccessary additions from old theme (custom css, prism etc). ☐ Create a gulpfile to build the search index. diff --git a/blog/webpack-structure.md b/blog/webpack-structure.md index 655d1c3..882efe7 100644 --- a/blog/webpack-structure.md +++ b/blog/webpack-structure.md @@ -36,7 +36,7 @@ You should create the file structure for your project. TODO: Link to the webpack-filestructure note in Trilium. -We will create `./src/js` and `./src/scss` folders. We create a `./dist` folder for webpacks output and we create a `./static` folder for anything that needs to be outside the bundle. +We will create `./src/js` and `./src/scss` folders. We create a `./static/dist` folder for webpacks output. The `./static` folder can also be used for files that go outside the bundle. Inside `./src/js` we will create an `App.js`. Inside `./src` we will create a `main.js`. @@ -76,11 +76,11 @@ module.exports = { devtool: "source-map", entry: path.resolve(__dirname, "src/main.js"), output: { - path: path.resolve(__dirname, "dist"), + path: path.resolve(__dirname, "static/dist"), }, plugins: [ new CleanWebpackPlugin({ - cleanAfterEveryBuildPatterns: ["dist/*"], + cleanAfterEveryBuildPatterns: ["static/dist/*"], }), ], }; @@ -102,7 +102,7 @@ module.exports = { devtool: "source-map", entry: path.resolve(__dirname, "src/main.js"), output: { - path: path.resolve(__dirname, "dist"), + path: path.resolve(__dirname, "static/dist"), }, module: { rules: [ @@ -115,7 +115,7 @@ module.exports = { }, plugins: [ new CleanWebpackPlugin({ - cleanAfterEveryBuildPatterns: ["dist/*"], + cleanAfterEveryBuildPatterns: ["static/dist/*"], }), new AssetsPlugin({ filename: "assets.json", @@ -154,7 +154,7 @@ module.exports = merge(common, { output: { filename: "[name].[contenthash].min.js", chunkFilename: "[id].[name].[contenthash].min.js", - publicPath: "dist/", + publicPath: "/dist/", }, }); ```