Skip to content

[WIP] Add Webpack Config #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jul 23, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Cleanup, fix webpack config
  • Loading branch information
Ari committed Jul 19, 2019
commit 5cab3734229b1206b0ef3755d7e64ba217085add
1 change: 0 additions & 1 deletion build/pre-webpack.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

const concat = require("concat");
const path = require("path");
const fs = require("fs");

const jsOutFilePath = path.resolve(__dirname, "./bin/concatenated-js.js")

Expand Down
8 changes: 6 additions & 2 deletions build/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ module.exports = {
"./src/styles/bulma-mods.css"
],
output: {
filename: "scripts.js",
//filename: "prod.js", // Not imported, breaks some stuff.
path: path.resolve(__dirname, "dist")
},
plugins: [
Expand All @@ -31,7 +31,11 @@ module.exports = {
}),
new CopyWebpackPlugin([
{from: path.resolve(__dirname, "../src/assets"), to: "assets"},
{from: path.resolve(__dirname, "../src/index.html"), to: "."}
{from: path.resolve(__dirname, "../src/index.html"), to: "."},

// These two are temporary fixes
{from: path.resolve(__dirname, "../src/scripts/"), to: "./scripts/"},
{from: path.resolve(__dirname, "../src/index.js"), to: "."}
])
],
module: {
Expand Down
3 changes: 1 addition & 2 deletions src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<link id="favicon" rel="shortcut icon" type="image/png" href="assets/favicon.ico.png">
<meta name="viewport" content="width=device-width, initial-scale=1">

<link rel="stylesheet" href="styles.min.css">
<link rel="stylesheet" href="styles.min.css"> <!--Dist CSS File-->
<link rel="stylesheet" href="styles/styles.css">
<link rel="stylesheet" href="styles/bulma-mods.css"> <!--bulma-mods.css must always be imported last-->

Expand Down Expand Up @@ -730,7 +730,6 @@ <h1 class="title is-1">This is the dropdown click area</h1>
</div>-->
</div>
<script src="https://cdn.jsdelivr.net/npm/vue@2.6.10/dist/vue.js"></script>
<script type="text/javascript" src="main.js"></script>
<script type="text/javascript" src="index.js"></script>
<script type="text/javascript" src="scripts/page-controls.js"></script>
<script type="text/javascript" src="scripts/HTML-generator.js"></script>
Expand Down
4 changes: 1 addition & 3 deletions src/scripts/choose-a-license.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
set_license_text()
set_license_icons()
set_license_info()
set_license()

function set_license() {
set_license_text()
Expand Down
9 changes: 0 additions & 9 deletions src/styles/styles.min.css

This file was deleted.