Merge branch 'prescientmoon:master' into patch-1

.github/workflows/build.yaml

@@ -0,0 +1,41 @@
+name: Build and deploy
+
+on:
+  push:
+  pull_request:
+
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: DeterminateSystems/nix-installer-action@main
+      - uses: DeterminateSystems/magic-nix-cache-action@main
+
+      - name: Build project
+        run: nix build .#erratic-gate-github-pages
+
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v2
+        with:
+          path: ./result/www
+
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+
+    runs-on: ubuntu-latest
+    needs: build
+    if: github.event_name == 'push' && github.ref == 'refs/heads/master'
+
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v2

.gitignore

@@ -2,3 +2,6 @@ node_modules
 dist
 coverege
 idea
+.direnv
+result
+.envrc

.prettierrc.js

@@ -1,7 +0,0 @@
-module.exports = {
-    semi: false,
-    trailingComma: 'none',
-    singleQuote: true,
-    printWidth: 80,
-    tabWidth: 4
-}

.prettierrc.json

@@ -0,0 +1,7 @@
+{
+    "semi": false,
+    "trailingComma": "none",
+    "singleQuote": true,
+    "printWidth": 80,
+    "tabWidth": 2
+}

.vscode/settings.json

@@ -1,6 +0,0 @@
-{
-    "editor.formatOnSave": true,
-    "prettier.eslintIntegration": true,
-    "explorer.autoReveal": false,
-    "typescript.tsdk": "node_modules/typescript/lib"
-}

.vscode/template.code-snippets

@@ -1,15 +0,0 @@
-{
-    "Gate template": {
-        "prefix": "template",
-        "body": [
-            "import { PartialTemplate } from '../types/PartialTemplate'",
-            "",
-            "/**",
-            " * The template of the ${1:and} gate",
-            " */",
-            "const ${1}Template: PartialTemplate = ${2:[]}",
-            "",
-            "export default ${1}Template"
-        ]
-    }
-}

README.md

@@ -4,10 +4,8 @@ This is a logic gate simulator made for infoeducatie 2019.
 
 ## Getting started
 
-Check out the [demo](https://logic-gate-simulator.herokuapp.com/)
+Check out the [demo](https://mateiadrielrafael.github.io/erratic-gate/)
-Or read the [docs](./docs/main.md)
+Or read the [docs](./docs/main.md).
-
-I've also made a [trello board](https://trello.com/b/LW3XSnGN/logic-gate-simulator) .
 
 ## Credits
 
@@ -21,30 +19,10 @@ Many thanks to:
 
 -   Simple & intuitive UI
 -   Multiple simulations support
--   Integrated circuits
+-   (Configurable) integrated circuits
 -   Multiple bits per pin
 -   Multiple language support: Romanian, English, Dutch, Turkish, Chinese & more in the future
 
 ## Playing with the source
 
-To run locally clone this repo, and then install all dependencies by rrunning:
+This repo provides a nix flake for deployment.
-
-```sh
-npm install
-```
-
-Start the development server by running:
-
-```sh
-npm run dev
-```
-
-Or bundle the source with:
-
-```sh
-npm run build
-```
-
-## Assets & code wich i didn't make myself:
-
-You can read a full list with what i don't own [here](./docs/assets-i-dont-own.md)

babel.config.js

@@ -1,18 +0,0 @@
-module.exports = {
-    presets: [
-        '@babel/preset-env',
-        '@babel/preset-react',
-        '@babel/preset-typescript'
-    ],
-    plugins: [
-        '@babel/plugin-proposal-optional-chaining',
-        '@babel/plugin-syntax-dynamic-import',
-        ['@babel/plugin-proposal-decorators', { legacy: true }],
-        ['@babel/plugin-proposal-class-properties', { loose: true }]
-    ],
-    env: {
-        test: {
-            presets: [['@babel/preset-env', { targets: { node: 'current' } }]]
-        }
-    }
-}

build.js

@@ -0,0 +1,53 @@
+import * as esbuild from 'esbuild'
+import { htmlPlugin } from '@craftamap/esbuild-plugin-html'
+import { sassPlugin } from 'esbuild-sass-plugin'
+import * as fs from 'fs'
+
+const serve = process.env.ESBUILD_SERVE === '1'
+const baseurl = process.env.ESBUILD_BASEURL || ''
+
+console.log(`Building with baseurl ${baseurl}`)
+
+const ctx = await esbuild.context({
+  entryPoints: ['src/index.ts'],
+  minify: true,
+  bundle: true,
+  metafile: true,
+  splitting: true,
+  outdir: 'dist',
+  format: 'esm',
+  target: ['es2020'],
+  assetNames: 'assets/[name]',
+  chunkNames: 'chunks/[name]',
+  loader: {
+    '.svg': 'file'
+  },
+  define: {
+    'process.env.BASEURL': JSON.stringify(baseurl)
+  },
+  plugins: [
+    htmlPlugin({
+      files: [
+        {
+          filename: 'index.html',
+          entryPoints: ['src/index.ts'],
+          favicon: 'public/favicon.ico',
+          htmlTemplate: 'public/index.html',
+          scriptLoading: 'module'
+        }
+      ]
+    }),
+    sassPlugin({})
+  ],
+  publicPath: baseurl
+})
+
+if (serve) {
+  const { port, host } = await ctx.serve({ servedir: 'dist' })
+  console.log(`Serving on ${host}:${port}`)
+} else {
+  await ctx.rebuild()
+  await ctx.dispose()
+  fs.cpSync('./dist/index.html', './dist/404.html') // Needed to please github pages
+  console.log(`Project bundled successfully`)
+}

docs/tutorials/basic-operations.md

@@ -0,0 +1,33 @@
+# Basic opeartions
+
+To demonstrate the basic usage of the simulator we will construct one of the simplest logic gates: the `buffer` gate.
+
+First of all we need to create something called an `integrated circuit`. You can think of integrated circuits like a box containing some components. You only put the components there once and can then reuse that box as many times as you want.
+
+To create an integrated circuit, click on `Create simulation`, then on `integrated circuit` and type in the name of the circuit - in this case `buffer`.
+
+You should see something like this:
+
+![empty IC](../assets/empty.png)
+
+Now we need to actually add some logic gates. To do that you need to:
+
+1. click on `Logic gates`, which should bring up a screen which looks similar to this:
+
+    ![gates](../assets/gates.png)
+
+2. Click on the logic gates you want to add to your integrated circuit! In our case we need to add a `button` and a `light bulb`
+
+    > After you add any logic gate you should get a confirmation message which looks something like this: ![notification](../assets/notification.png)
+
+3. To go back to the simulation view click the `Back to simulation` button. Now you should see something like this:
+
+    ![components](../assets/components.png)
+
+4. As you probably noticed, the components are on top of eachother. You can use your right mouse button to drag them around!
+
+    > Note 1: while your mouse is outside of gate you can start a selection. After you selected some gates you can use your mouse to drag all of them.
+
+    > Note 2: this isn't limited to movement. In the future you'll learn about many actions you can perform which also work on multiple gates :D
+
+    > Note 3: While we're on the topic of selection: You can use `ctrl + a` (or `command + a` on macs) to select everything

flake.lock

@@ -0,0 +1,58 @@
+{
+  "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1694529238,
+        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1695360818,
+        "narHash": "sha256-JlkN3R/SSoMTa+CasbxS1gq+GpGxXQlNZRUh9+LIy/0=",
+        "path": "/nix/store/09yvj6yyxspzfivv91bcxwrjxawpk1g2-source",
+        "rev": "e35dcc04a3853da485a396bdd332217d0ac9054f",
+        "type": "path"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "type": "indirect"
+      }
+    },
+    "root": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

flake.nix

@@ -0,0 +1,60 @@
+{
+  description = "Logic gate simulator";
+  inputs.flake-utils.url = "github:numtide/flake-utils";
+
+  outputs = { nixpkgs, flake-utils, ... }:
+    flake-utils.lib.eachDefaultSystem (system:
+      let pkgs = nixpkgs.legacyPackages.${system};
+      in
+      rec {
+        packages.erratic-gate = pkgs.buildNpmPackage {
+          name = "erratic-gate";
+
+          buildInputs = [ pkgs.nodejs_18 ];
+
+          src = pkgs.lib.cleanSource ./.;
+          npmDepsHash = "sha256-f5mw6IjkhZgsIuzCz9d7DvoAdceY1y+yWXn1BOonsVI=";
+
+          ESBUILD_BASEURL = "";
+
+          installPhase = ''
+            mkdir $out
+            cp -r dist $out/www
+          '';
+        };
+
+        packages.erratic-gate-github-pages = packages.erratic-gate;
+        packages.default = packages.erratic-gate;
+
+        devShells.default =
+          pkgs.mkShell {
+            buildInputs = with pkgs;
+              with nodePackages_latest; [
+                nodejs
+              ];
+          };
+
+        apps.compute-npm-dep-hash = {
+          type = "app";
+          program = pkgs.lib.getExe (pkgs.writeShellApplication {
+            name = "generate-layout-previes";
+            runtimeInputs = [ pkgs.prefetch-npm-deps ];
+            text = "prefetch-npm-deps ./package-lock.json";
+          });
+        };
+      }
+    );
+
+  # {{{ Caching and whatnot
+  nixConfig = {
+    # extra-substituters = [
+    #   "erratic-gate.cachix.org-1:Ijiu/v//aVpKO4xBqV+2AM2s2uQYOnGCfoj9fYRXxtk" # I think I need this for neovim-nightly?
+    # ];
+    #
+    # extra-trusted-public-keys = [
+    #   "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+    # ];
+  };
+  # }}}
+}
+

package.json

@@ -1,61 +1,30 @@
 {
-    "name": "logic-gate-simulator",
+    "name": "erratic-gate",
     "version": "1.0.0",
-    "main": "./src/index.ts",
+    "type": "module",
     "scripts": {
-        "dev": "webpack-dev-server --open --mode development",
+        "build": "node ./build.js",
-        "build": "cross-env NODE_ENV=production webpack",
+        "check": "tsc"
-        "build:server": "cross-env NODE_ENV=server webpack",
-        "show": "gource -f  --start-date \"2019-07-01 12:00\" --key --hide dirnames,filenames,bloom -s 0.3",
-        "start": "node ./dist/server"
     },
     "devDependencies": {
-        "@babel/core": "^7.5.5",
+        "@craftamap/esbuild-plugin-html": "^0.6.1",
-        "@babel/plugin-proposal-class-properties": "^7.5.5",
-        "@babel/plugin-proposal-decorators": "^7.4.4",
-        "@babel/plugin-syntax-dynamic-import": "^7.2.0",
-        "@babel/preset-env": "^7.5.5",
-        "@babel/preset-react": "^7.0.0",
-        "@babel/preset-typescript": "^7.3.3",
         "@types/deepmerge": "^2.2.0",
-        "@types/express": "^4.17.0",
-        "@types/gh-pages": "^2.0.0",
         "@types/mainloop.js": "^1.0.5",
-        "@types/react-helmet": "^5.0.8",
+        "@types/node": "^20.8.9",
+        "@types/react-dom": "^18.2.14",
         "@types/react-router-dom": "^4.3.4",
-        "babel-loader": "^8.0.6",
+        "esbuild": "^0.19.5",
-        "babel-plugin-transform-runtime": "^6.23.0",
+        "esbuild-sass-plugin": "^2.16.0",
-        "babel-regenerator-runtime": "^6.5.0",
+        "typescript": "^5.0.2"
-        "copy-webpack-plugin": "^5.1.1",
-        "cross-env": "^5.2.0",
-        "css-loader": "^3.0.0",
-        "file-loader": "^4.1.0",
-        "gh-pages": "^2.0.1",
-        "html-webpack-inline-source-plugin": "0.0.10",
-        "html-webpack-plugin": "^3.2.0",
-        "mini-css-extract-plugin": "^0.8.0",
-        "node-sass": "^4.13.1",
-        "optimize-css-assets-webpack-plugin": "^5.0.3",
-        "sass-loader": "^7.1.0",
-        "style-loader": "^0.23.1",
-        "typescript": "^3.8.3",
-        "webpack": "^4.36.1",
-        "webpack-cli": "^3.3.6",
-        "webpack-dev-server": "^3.7.2",
-        "webpack-merge": "^4.2.1",
-        "webpack-node-externals": "^1.7.2"
     },
     "dependencies": {
-        "@babel/plugin-proposal-optional-chaining": "^7.9.0",
         "@eix-js/utils": "0.0.6",
         "@material-ui/core": "^4.2.1",
         "deepmerge": "^4.0.0",
-        "express": "^4.17.1",
         "keycode": "^2.2.0",
         "mainloop.js": "^1.0.4",
         "react": "^16.8.6",
         "react-dom": "^16.8.6",
-        "react-helmet": "^5.2.1",
         "react-router-dom": "^5.0.1",
         "react-toastify": "^5.3.2",
         "rxjs": "^6.5.2",

public/index.html

@@ -0,0 +1,66 @@
+<!doctype html>
+<html lang="en">
+    <head>
+        <title>Erratic gate</title>
+
+        <meta name="pinterest" content="nopin" />
+
+        <link
+            rel="stylesheet"
+            href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap"
+        />
+        <link
+            rel="stylesheet"
+            href="https://fonts.googleapis.com/css?family=Righteous&display=swap"
+        />
+        <link
+            rel="stylesheet"
+            href="https://fonts.googleapis.com/icon?family=Material+Icons"
+        />
+
+        <meta
+            name="viewport"
+            content="minimum-scale=1, initial-scale=1, width=device-width, shrink-to-fit=no"
+        />
+
+        <meta property="og:title" content="Erratic gate" />
+        <meta
+            property="og:description"
+            content="A logic gate simulator made for infoeducatie 2019"
+        />
+        <meta
+            property="og:url"
+            content="https://mateiadrielrafael.github.io/erratic-gate/"
+        />
+
+        <meta
+            name="Description"
+            content="A logic gate simulator made for infoeducatie 2019"
+        />
+
+        <meta charset="UTF-8" />
+    </head>
+
+    <body
+        ondragstart="return false;"
+        ondrop="return false;"
+        oncontextmenu="return false"
+    >
+        <!--The react app is rendered here-->
+        <div id="app"></div>
+
+        <!--The splash screen structure-->
+        <div class="Splash">
+            <!--Loading animation-->
+            <div class="loading">
+                <div class="lds-ripple">
+                    <div></div>
+                    <div></div>
+                </div>
+            </div>
+
+            <!--In case someone tries to laod this with js disabled-->
+            <noscript> JavaScript must be enabled to run this app. </noscript>
+        </div>
+    </body>
+</html>

src/index.html

@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <!-- This doesnt work inside react helmetv-->
-        <meta name="pinterest" content="nopin" />
-    </head>
-
-    <body
-        ondragstart="return false;"
-        ondrop="return false;"
-        oncontextmenu="return false"
-    >
-        <!--The react app is rendered here-->
-        <div id="app"></div>
-
-        <!--The splash screen structure-->
-        <div class="Splash">
-            <!--Loading animation-->
-            <div class="loading">
-                <div class="lds-ripple">
-                    <div></div>
-                    <div></div>
-                </div>
-            </div>
-
-            <!--In case someone tries to laod this with js disabled-->
-            <noscript> JavaScript must be enabled to run this app. </noscript>
-        </div>
-    </body>
-</html>

src/main.tsx

@@ -1,4 +1,3 @@
-import React from 'react'
 import App from './modules/core/components/App'
 
 import { render } from 'react-dom'
@@ -10,6 +9,7 @@ import { take, filter } from 'rxjs/operators'
 import { logWelcome } from './modules/core/helpers/logWelcome'
 import { initRenderer } from './modules/simulationRenderer/helpers/initRenderer'
 import { updateLogicGateList } from './modules/logic-gates/subjects/LogicGateList'
+import { initAutoSave } from './modules/simulation-actions/helpers/initAutoSave'
 
 /**
  * The function wich does the heavy lifting for starting the app
@@ -18,7 +18,7 @@ export const start = async () => {
     // This will resolve at the first render
     const result = loadSubject
         .pipe(
-            filter(a => a),
+            filter((a) => a),
             take(1)
         )
         .toPromise()
@@ -41,6 +41,9 @@ export const start = async () => {
     // Update the logic gates in local storage
     updateLogicGateList()
 
+    // start the autosaving stuff
+    initAutoSave()
+
     // Render app component
     render(<App />, document.getElementById('app'))
 

src/modules/core/components/App.tsx

@@ -1,21 +1,19 @@
-import '../styles/reset'
+import '../styles/reset.scss'
 import './App.scss'
 import './Scrollbars.scss'
 import 'react-toastify/dist/ReactToastify.css'
 
 import { ToastContainer } from 'react-toastify'
 import { theme as muiTheme } from '../constants'
-import { Route } from 'react-router-dom'
+import { BrowserRouter, Route } from 'react-router-dom'
 
-import React, { useEffect } from 'react'
+import { useEffect } from 'react'
 import CssBaseline from '@material-ui/core/CssBaseline'
 import Theme from '@material-ui/styles/ThemeProvider'
 import Sidebar from './Sidebar'
-import Head from './Head'
 import Root from './Root'
 import LogicGatePage from '../../logic-gates/components/LogicGatesPage'
 import { loadSubject } from '../subjects/loadedSubject'
-import { CustomRouter } from './CustomRouter'
 import LogicGateInfoPage from '../../logic-gate-info/components/LogicGateInfoPage'
 
 const App = () => {
@@ -25,17 +23,16 @@ const App = () => {
 
   return (
     <>
-            <Head />
       <CssBaseline />
 
       <Theme theme={muiTheme}>
-                <CustomRouter>
+        <BrowserRouter basename={process.env.BASEURL}>
           <Sidebar />
 
           <Route path="/" component={Root} exact />
           <Route path="/gates" component={LogicGatePage} />
           <Route path="/info/:name" component={LogicGateInfoPage} />
-                </CustomRouter>
+        </BrowserRouter>
       </Theme>
 
       <ToastContainer

src/modules/core/components/CustomRouter.tsx

@@ -1,6 +0,0 @@
-import { BrowserRouter } from 'react-router-dom'
-import { history } from '../constants'
-
-export class CustomRouter extends BrowserRouter {
-    public history = history
-}

src/modules/core/components/Head.tsx

@@ -1,45 +0,0 @@
-import Helmet from 'react-helmet'
-import React from 'react'
-
-const title = 'Logic gate simulator'
-const description = 'A logic gate simulator made for infoeducatie 2019'
-const url = 'https://logic-gate-simulator.herokuapp.com/'
-
-const Head = () => {
-    return (
-        <Helmet>
-            <title>{title}</title>
-
-            <link
-                rel="stylesheet"
-                href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap"
-            />
-            <link
-                rel="stylesheet"
-                href="https://fonts.googleapis.com/icon?family=Material+Icons"
-            />
-            <meta
-                name="viewport"
-                content="minimum-scale=1, initial-scale=1, width=device-width, shrink-to-fit=no"
-            />
-
-            <link
-                href="https://fonts.googleapis.com/css?family=Righteous&display=swap"
-                rel="stylesheet"
-            />
-
-            <meta property="og:title" content={title} />
-            <meta property="og:description" content={description} />
-            <meta property="og:url" content={url} />
-
-            <meta
-                name="Description"
-                content="A logic gate simulator made for infoeducatie 2019"
-            />
-
-            <link rel="icon" href={require('../../../assets/favicon.ico')} />
-        </Helmet>
-    )
-}
-
-export default Head

src/modules/core/constants.ts

@@ -1,9 +1,8 @@
-import { createMuiTheme } from '@material-ui/core/styles'
+import { createTheme } from '@material-ui/core/styles'
 import { red, deepPurple } from '@material-ui/core/colors'
 import { simulationMode } from '../saving/types/SimulationSave'
-import { createBrowserHistory } from 'history'
 
-export const theme = createMuiTheme({
+export const theme = createTheme({
     palette: {
         type: 'dark',
         primary: deepPurple,
@@ -32,8 +31,3 @@ export const icons: IconInterface = {
  * The width of the sidebar
  */
 export const sidebarWidth = 240
-
-/**
- * The history to be used by the router
- */
-export const history = createBrowserHistory()

src/modules/core/helpers/logWelcome.ts

@@ -1,11 +1,10 @@
 /**
- * In case the guys who look at my projet open the console -_-
+ * In case the people who look at my projet open the console -_-
  */
 export const logWelcome = () => {
   const commonStyles = 'padding: 3px'
   const titleStyles = `font-size: 3em;`
 
-    // console.log('%c Hello!',` `${titleStyles})
   console.log(
     `%c Hello
         %c I don't know if you see this, 
@@ -15,7 +14,7 @@ export const logWelcome = () => {
         (in case someone randomly openes it), but now i don't even know what i'm doing :) 
         Anyways, I hope you are having a good time in my simulator!!!`
       .split('\n')
-            .map(s => s.trim())
+      .map((s) => s.trim())
       .join(' '),
     `${titleStyles}`,
     `${commonStyles}`

src/modules/core/styles/reset.scss

@@ -169,8 +169,6 @@ audio,
 canvas,
 video {
     display: inline-block;
-    *display: inline;
-    *zoom: 1;
     max-width: 100%;
 }
 
@@ -269,7 +267,7 @@ legend {
     border: 0; /* 1 */
     padding: 0;
     white-space: normal; /* 2 */
-    *margin-left: -7px; /* 3 */
+    margin-left: -7px; /* 3 */
 }
 
 /**
@@ -286,7 +284,6 @@ textarea {
     font-size: 100%; /* 1 */
     margin: 0; /* 2 */
     vertical-align: baseline; /* 3 */
-    *vertical-align: middle; /* 3 */
 }
 
 /**
@@ -327,7 +324,7 @@ input[type="reset"],
 input[type="submit"] {
     -webkit-appearance: button; /* 2 */
     cursor: pointer; /* 3 */
-    *overflow: visible; /* 4 */
+    overflow: visible; /* 4 */
 }
 
 /**
@@ -350,8 +347,8 @@ input[type='checkbox'],
 input[type='radio'] {
     box-sizing: border-box; /* 1 */
     padding: 0; /* 2 */
-    *height: 13px; /* 3 */
+    height: 13px; /* 3 */
-    *width: 13px; /* 3 */
+    width: 13px; /* 3 */
 }
 
 /**

src/modules/integrated-circuits/helpers/compileIc.ts

@@ -2,7 +2,6 @@ import { SimulationState } from '../../saving/types/SimulationSave'
 import { SimulationError } from '../../errors/classes/SimulationError'
 import {
     GateTemplate,
-    Property,
     PropGroup,
     isGroup
 } from '../../simulation/types/GateTemplate'
@@ -24,9 +23,10 @@ import { getTemplateSafely } from '../../logic-gates/helpers/getTemplateSafely'
  * Compiles a simulation into a logicGate
  *
  * @param simulaton The simulation to compile
+ * @param log Allow disabling logging
  */
-export const compileIc = (state: SimulationState) => {
+export const compileIc = (state: SimulationState, log = false) => {
-    const { mode, name, gates } = state
+    const { mode, name } = state
 
     if (mode === 'project') {
         throw new SimulationError('Cannot compile project')
@@ -59,7 +59,7 @@ export const compileIc = (state: SimulationState) => {
         category: categories.ic,
         material: {
             type: 'image',
-            fill: require('../../../assets/ic')
+            fill: require('../../../assets/ic.svg')
         },
         properties: {
             enabled: !!props.length,
@@ -82,10 +82,13 @@ export const compileIc = (state: SimulationState) => {
     }
 
     templateStore.set(name, result)
+
+    if (log) {
         toast(
             ...createToastArguments(
                 translation.messages.compiledIc(name),
                 'markunread_mailbox'
             )
         )
+    }
 }

src/modules/internalisation/helpers/nextLanguage.ts

@@ -1,7 +1,4 @@
-import {
+import { CurrentLanguage } from '../stores/currentLanguage'
-    CurrentLanguage,
-    CurrentLanguageLocalStore
-} from '../stores/currentLanguage'
 import { allSupportedLanguages } from '../constants'
 
 /**

src/modules/internalisation/translations/deutsch.ts

@@ -7,12 +7,12 @@ export const DeutschTranslation: Translation = {
     language: 'deutsch',
     sidebar: {
         createSimulation: 'Simulation erstellen',
-        logicGates: ' Logische Tore',
+        logicGates: 'Logikgatter',
-        openSimulation: ' Simulationen öffnen ',
+        openSimulation: 'Simulationen öffnen',
         simulation: 'Simulation',
-        language: ' Sprache ',
+        language: 'Sprache',
-        backToSimulation: ' Zurück zur Simulation',
+        backToSimulation: 'Zurück zur Simulation',
-        backToGates: ' Zurück zur Logische Tore'
+        backToGates: 'Zurück zu den Logikgattern'
     },
     createSimulation: {
         mode: {
@@ -23,33 +23,33 @@ export const DeutschTranslation: Translation = {
             }
         },
         name: {
-            question: 'Was wollen Sie Ihre Simulation genannt werden?'
+            question: 'Wie soll Ihre Simulation genannt werden?'
         }
     },
     actions: {
         save: 'Speichern',
-        clean: 'Reinigen',
+        clean: 'Bereinigen',
-        refresh: 'Aktualisierung',
+        refresh: 'Aktualisieren',
         undo: 'Rückgängig machen',
         paste: 'Einfügen',
         copy: 'Kopieren',
         duplicate: 'Duplizieren',
-        cut: 'Schnitt',
+        cut: 'Ausschneiden',
-        'select all': 'Wählen Sie Alle',
+        'select all': 'Alles auswählen',
         'delete selection': 'Auswahl löschen',
         'delete simulation': 'Simulation löschen'
     },
     messages: {
-        createdSimulation: name => `Erfolgreich erstellte Simulation '${name}'`,
+        createdSimulation: name => `Simulation '${name}' erfolgreich erstellt`,
         switchedToSimulation: name =>
-            `Erfolgreich auf Simulation umgestellt '${name}'`,
+            `Erfolgreich zu Simulation '${name}' gewechselt`,
         savedSimulation: name =>
-            `Erfolgreich gespeicherte Simulation '${name}'`,
+            `Simulation '${name}' erfolgreich gespeichert`,
-        compiledIc: name => `Erfolgreich kompilierte Schaltung '${name}'`,
+        compiledIc: name => `Integrierter Schaltkreis '${name}' erfolgreich kompiliert`,
-        cleaned: name => `Erfolgreich bereinigte Simulation '${name}'`,
+        cleaned: name => `Simulation '${name}' erfolgreich bereinigt`,
-        refreshed: name => `Erfolgreich aktualisierte Simulation '${name}'`,
+        refreshed: name => `Simulation '${name}' erfolgreich aktualisiert`,
-        undone: name => `Simulation erfolgreich rückgängig gemacht ' ${name}'`,
+        undone: name => `Simulation '${name}' erfolgreich Rückgängig gemacht`,
-        deletedSimulation: name => `Simulation erfolgreich gelöscht ' ${name}'`,
+        deletedSimulation: name => `Simulation '${name}' erfolgreich gelöscht`,
-        addedGate: name => `Tor erfolgreich hinzugefügt`
+        addedGate: name => `Logikgatter erfolgreich hinzugefügt`
     }
 }

src/modules/internalisation/translations/english.ts

@@ -40,15 +40,16 @@ export const EnglishTranslation: Translation = {
         'delete simulation': 'Delete simulation'
     },
     messages: {
-        createdSimulation: name => `Succesfully created simulation '${name}'`,
+        autoSave: 'The sim saves your work automatically :D',
-        switchedToSimulation: name =>
+        createdSimulation: (name) => `Succesfully created simulation '${name}'`,
+        switchedToSimulation: (name) =>
             `Succesfully switched to simulation '${name}'`,
-        savedSimulation: name => `Succesfully saved simulation '${name}'`,
+        savedSimulation: (name) => `Succesfully saved simulation '${name}'`,
-        compiledIc: name => `Succesfully compiled circuit '${name}'`,
+        compiledIc: (name) => `Succesfully compiled circuit '${name}'`,
-        cleaned: name => `Succesfully cleaned simulation '${name}'`,
+        cleaned: (name) => `Succesfully cleaned simulation '${name}'`,
-        refreshed: name => `Succesfully refreshed simulation '${name}'`,
+        refreshed: (name) => `Succesfully refreshed simulation '${name}'`,
-        undone: name => `Succesfully undone simulation '${name}'`,
+        undone: (name) => `Succesfully undone simulation '${name}'`,
-        deletedSimulation: name => `Succesfully deleted simulation '${name}'`,
+        deletedSimulation: (name) => `Succesfully deleted simulation '${name}'`,
-        addedGate: name => `Succesfully added gate '${name}'`
+        addedGate: (name) => `Succesfully added gate '${name}'`
     }
 }

src/modules/internalisation/types/TranslationInterface.ts

@@ -29,6 +29,7 @@ export interface Translation {
         }
     }
     messages: {
+        autoSave?: string
         createdSimulation: NameSentence
         switchedToSimulation: NameSentence
         savedSimulation: NameSentence

src/modules/logic-gates/components/GatePropertiesModal.tsx

@@ -117,7 +117,7 @@ const GateRawProperty = ({
             raw.type === 'text' ||
             raw.type === 'string'
         ) {
-            return (input = (
+            return (
                 <TextField
                     onChange={handleChange}
                     label={displayableName}
@@ -126,9 +126,9 @@ const GateRawProperty = ({
                     multiline={raw.type === 'string'}
                     rowsMax={7}
                 />
-            ))
+            )
         } else if (raw.type === 'boolean') {
-            return (input = (
+            return (
                 <>
                     <span className="checkbox-label">{displayableName}</span>
                     <CheckBox
@@ -139,7 +139,7 @@ const GateRawProperty = ({
                         checked={!!outputSnapshot}
                     />{' '}
                 </>
-            ))
+            )
         }
     })()
 

src/modules/logic-gates/components/LogicGatesPage.tsx

@@ -20,11 +20,10 @@ const LogicGatePage = () => {
           {gates
             .map(getTemplateSafely)
             .sort((a, b) => a.category - b.category)
-                        .filter(template => {
+            .filter((template) => {
               return (
                 renderer.simulation.mode === 'project' ||
-                                template.metadata.name !==
+                template.metadata.name !== renderer.simulation.name
-                                    renderer.simulation.name
               )
             })
             .map((template, index) => {

src/modules/modals/styles/mixins/modal-container.scss

@@ -1,8 +1,8 @@
-@import '../../core/styles/indexes.scss';
+@import '../../../core/styles/indexes.scss';
-@import '../../core/styles/colors.scss';
+@import '../../../core/styles/colors.scss';
-@import '../../core/styles/mixins/flex.scss';
+@import '../../../core/styles/mixins/flex.scss';
-@import '../../core/styles/mixins/full-screen.scss';
+@import '../../../core/styles/mixins/full-screen.scss';
-@import '../../core/styles/mixins/visibility.scss';
+@import '../../../core/styles/mixins/visibility.scss';
 
 @mixin modal-container {
     @include flex();

src/modules/saving/helpers/save.ts

@@ -7,6 +7,20 @@ import { toast } from 'react-toastify'
 import { createToastArguments } from '../../toasts/helpers/createToastArguments'
 import { CurrentLanguage } from '../../internalisation/stores/currentLanguage'
 import { compileIc } from '../../integrated-circuits/helpers/compileIc'
+import { EnglishTranslation } from '../../internalisation/translations/english'
+
+export const notifyAboutAutosave = () => {
+    const translation = CurrentLanguage.getTranslation()
+
+    toast(
+        ...createToastArguments(
+            translation.messages.autoSave ||
+                EnglishTranslation.messages.autoSave ||
+                'this sentence was not translated yet',
+            'save'
+        )
+    )
+}
 
 /**
  * Saves the state from a renderer in localStorage,
@@ -22,20 +36,11 @@ export const save = (renderer: SimulationRenderer) => {
 
     if (current) {
         const state = getRendererState(renderer)
-        const translation = CurrentLanguage.getTranslation()
-
         saveStore.set(current, state)
 
         if (state.simulation.mode === 'ic') {
             compileIc(state.simulation)
         }
-
-        toast(
-            ...createToastArguments(
-                translation.messages.savedSimulation(current),
-                'save'
-            )
-        )
     } else {
         throw new SimulationError(
             'Cannot save without knowing the name of the active simulation'

src/modules/saving/helpers/switchTo.ts

@@ -5,6 +5,8 @@ import { toast } from 'react-toastify'
 import { createToastArguments } from '../../toasts/helpers/createToastArguments'
 import { dumpSimulation } from './dumpSimulation'
 import { CurrentLanguage } from '../../internalisation/stores/currentLanguage'
+import { compileIc } from '../../integrated-circuits/helpers/compileIc'
+import { getRendererState } from './getState'
 
 /**
  * Used to switch to a simulation
@@ -22,6 +24,12 @@ export const switchTo = (simulationName: string = 'default') => {
     if (rendererSubject.value) {
         const renderer = rendererSubject.value
         const translation = CurrentLanguage.getTranslation()
+        const state = getRendererState(renderer)
+
+        // compile the ic just in case
+        if (state.simulation.mode === 'ic') {
+            compileIc(state.simulation, true)
+        }
 
         dumpSimulation(renderer)
 

src/modules/saving/templates/4bitDecoder.ts

@@ -25,7 +25,7 @@ const _4bitDecoderTemplate: PartialTemplate = {
     },
     material: {
         type: 'image',
-        fill: require('../../../assets/4decoder')
+        fill: require('../../../assets/4decoder.svg')
     },
     shape: {
         scale: _4BitScale

src/modules/saving/templates/4bitEncoder.ts

@@ -24,7 +24,7 @@ const _4bitEncoderTemplate: PartialTemplate = {
     },
     material: {
         type: 'image',
-        fill: require('../../../assets/4encoder')
+        fill: require('../../../assets/4encoder.svg')
     },
     shape: {
         scale: _4BitScale

src/modules/saving/templates/and.ts

@@ -9,7 +9,7 @@ const andTemplate: PartialTemplate = {
     },
     material: {
         type: 'image',
-        fill: require('../../../assets/and')
+        fill: require('../../../assets/and.svg')
     },
     code: {
         activation: `

src/modules/saving/templates/bitMerger.ts

@@ -24,7 +24,7 @@ const bitMergerTemplate: PartialTemplate = {
     category: categories.compressing,
     material: {
         type: 'image',
-        fill: require('../../../assets/merger')
+        fill: require('../../../assets/merger.svg')
     }
 }
 

src/modules/saving/templates/bitSplitter.ts

@@ -27,7 +27,7 @@ const bitSplitterTemplate: PartialTemplate = {
     },
     material: {
         type: 'image',
-        fill: require('../../../assets/splitter')
+        fill: require('../../../assets/splitter.svg')
     },
     category: categories.compressing,
     pins: {

src/modules/saving/templates/fullAdder.ts

@@ -11,7 +11,7 @@ const fullAdderTemplate: PartialTemplate = {
     },
     material: {
         type: 'image',
-        fill: require('../../../assets/full-adder')
+        fill: require('../../../assets/full-adder.svg')
     },
     code: {
         activation: adderActivation(true)

src/modules/saving/templates/halfAdder.ts

@@ -11,7 +11,7 @@ const halfAdderTemplate: PartialTemplate = {
     },
     material: {
         type: 'image',
-        fill: require('../../../assets/half-adder')
+        fill: require('../../../assets/half-adder.svg')
     },
     code: {
         activation: adderActivation(false)

src/modules/saving/templates/nand.ts

@@ -9,7 +9,7 @@ const nandTemplate: PartialTemplate = {
     },
     material: {
         type: 'image',
-        fill: require('../../../assets/nand')
+        fill: require('../../../assets/nand.svg')
     },
     code: {
         activation: `

src/modules/saving/templates/nor.ts

@@ -9,7 +9,7 @@ const norTemplate: PartialTemplate = {
     },
     material: {
         type: 'image',
-        fill: require('../../../assets/nor')
+        fill: require('../../../assets/nor.svg')
     },
     code: {
         activation: `

src/modules/saving/templates/not.ts

@@ -9,7 +9,7 @@ const notTemplate: PartialTemplate = {
     },
     material: {
         type: 'image',
-        fill: require('../../../assets/not')
+        fill: require('../../../assets/not.svg')
     },
     code: {
         activation: `

src/modules/saving/templates/or.ts

@@ -9,7 +9,7 @@ const orTemplate: PartialTemplate = {
     },
     material: {
         type: 'image',
-        fill: require('../../../assets/or')
+        fill: require('../../../assets/or.svg')
     },
     code: {
         activation: `

src/modules/saving/templates/parallelDelayer.ts

@@ -11,7 +11,7 @@ const parallelDelayerTemplate: PartialTemplate = {
     },
     material: {
         type: 'image',
-        fill: require('../../../assets/parallel')
+        fill: require('../../../assets/parallel.svg')
     },
     code: {
         activation: `

src/modules/saving/templates/sequentialDelayer.ts

@@ -11,7 +11,7 @@ const sequentialDelayerTemplate: PartialTemplate = {
     },
     material: {
         type: 'image',
-        fill: require('../../../assets/sequential')
+        fill: require('../../../assets/sequential.svg')
     },
     code: {
         activation: `

src/modules/saving/templates/xnor.ts

@@ -9,7 +9,7 @@ const xnorTemplate: PartialTemplate = {
     },
     material: {
         type: 'image',
-        fill: require('../../../assets/xnor')
+        fill: require('../../../assets/xnor.svg')
     },
     code: {
         activation: `

src/modules/saving/templates/xor.ts

@@ -9,7 +9,7 @@ const xorTemplate: PartialTemplate = {
     },
     material: {
         type: 'image',
-        fill: require('../../../assets/xor')
+        fill: require('../../../assets/xor.svg')
     },
     code: {
         activation: `

src/modules/simulation-actions/constants.ts

@@ -1,6 +1,6 @@
 import { SidebarAction } from './types/SidebarAction'
 import { possibleAction } from './types/possibleAction'
-import { save } from '../saving/helpers/save'
+import { save, notifyAboutAutosave } from '../saving/helpers/save'
 import { refresh } from './helpers/refresh'
 import { undo } from './helpers/undo'
 import { createActionConfig } from './helpers/createActionConfig'
@@ -30,7 +30,7 @@ export const actionIcons: Record<possibleAction, string> = {
  * Array with all the actions for the SimulationAction component to render
  */
 export const SidebarActions: Record<possibleAction, SidebarAction> = {
-    ...createActionConfig('save', save, ['control', 's']),
+    ...createActionConfig('save', notifyAboutAutosave, ['control', 's']),
     ...createActionConfig(
         'refresh',
         {

src/modules/simulation-actions/helpers/initAutoSave.ts

@@ -0,0 +1,12 @@
+import { interval } from 'rxjs'
+import { save } from '../../saving/helpers/save'
+import { getRendererSafely } from '../../logic-gates/helpers/getRendererSafely'
+
+const everySecond = interval(1000)
+
+export const initAutoSave = () => {
+    everySecond.subscribe(() => {
+        const renderer = getRendererSafely()
+        save(renderer)
+    })
+}

src/modules/simulation/classes/Wire.ts

@@ -19,18 +19,13 @@ export class Wire {
     end.value.addPair(start.value, true, !ic)
     start.value.addPair(end.value, false, !ic)
 
-        // if (ic) {
-        //     start.value.state.subscribe(console.log)
-        //     end.value.state.subscribe(console.log)
-        // }
-
     this.id = id !== undefined ? id : idStore.generate()
   }
 
   public dispose() {
     this.end.value.removePair(this.start.value)
     this.start.value.removePair(this.end.value)
-        this.end.value.state.next("0")
+    this.end.value.state.next('0')
 
     this.active = false
   }

src/modules/simulation/constants.ts

@@ -70,7 +70,8 @@ export const DefaultGateTemplate: GateTemplate = {
         enabled: false,
         color: 'white'
     },
-    category: categories.basic
+    category: categories.basic,
+    info: []
 }
 
 /**

src/modules/simulation/types/GateTemplate.ts

@@ -92,4 +92,5 @@ export interface GateTemplate {
         enabled: boolean
     }
     category: number // for better sorting
+    info: string[]
 }

src/modules/simulationRenderer/classes/SimulationRenderer.ts

@@ -81,7 +81,7 @@ export class SimulationRenderer {
   public updateWheelListener(ref: RefObject<HTMLCanvasElement>) {
     if (ref.current) {
       ref.current.addEventListener('wheel', (event) => {
-                if (!modalIsOpen() && location.pathname === '/') {
+        if (!modalIsOpen() && location.pathname === `${process.env.BASEURL}/`) {
           event.preventDefault()
 
           handleScroll(event, this.camera)
@@ -125,9 +125,7 @@ export class SimulationRenderer {
       if (!gate) {
         throw new SimulationError(`Cannot find gate with id ${id}`)
       } else if (!gate.data) {
-                throw new SimulationError(
+        throw new SimulationError(`Cannot find data of gate with id ${id}`)
-                    `Cannot find data of gate with id ${id}`
-                )
       }
 
       return gate.data

src/modules/simulationRenderer/helpers/pinFill.ts

@@ -9,21 +9,19 @@ export const pinFill = (renderer: SimulationRenderer, pin: Pin) => {
     const { open, closed } = renderer.options.gates.pinFill
     const digits = Array.from(pin.state.value).map(Number)
 
-        const colors = digits.map(digit => (digit ? open : closed))
+    const colors = digits.map((digit) => (digit ? open : closed))
     const chunked = colors.map(fromHexColorString)
 
     const summed = [0, 1, 2]
-            .map(key =>
+      .map((key) =>
         chunked
           .flat()
           .filter((v, index) => index % 3 === key)
           .reduce((acc, curr) => acc + curr, 0)
       )
-            .map(value => Math.floor(value / digits.length))
+      .map((value) => Math.floor(value / digits.length))
 
     color = fromChunks(summed)
-
-        // console.log(color)
   }
 
   return color

src/modules/storage/classes/LocalStore.ts

@@ -1,6 +1,3 @@
-import { CacheInstancesByKey } from '@eix-js/utils'
-
-@CacheInstancesByKey(Infinity)
 export class LocalStore<T> {
     public constructor(public name: string) {
         if (!localStorage.getItem(name)) {
@@ -13,9 +10,7 @@ export class LocalStore<T> {
 
         if (!raw)
             throw new Error(
-                `An error occured when accesing ${
+                `An error occured when accesing ${this.name} in the local storage!`
-                    this.name
-                } in the local storage!`
             )
         else {
             return JSON.parse(raw)

src/public/robots.txt

@@ -1,4 +0,0 @@
-User-agent: *
-Disallow: /server.js
-Disallow: /js
-Disallow: /css

src/server.ts

@@ -1,16 +0,0 @@
-import express, { static as _static } from 'express'
-import { resolve } from 'path'
-
-// create express app
-const app = express()
-
-// serve static assets
-app.use(_static(__dirname))
-
-// serve single page application
-app.get('*', (rex, res) => {
-    res.sendFile(resolve(__dirname, 'index.html'))
-})
-
-// listen to the port from .env (default to 8080)
-app.listen(process.env.PORT || 8080)

tsconfig.json

@@ -1,14 +1,26 @@
 {
   "compilerOptions": {
-        "moduleResolution": "node",
-        "esModuleInterop": true,
-        "jsx": "preserve",
-        "experimentalDecorators": true,
     "target": "ESNext",
+    "lib": [
+      "DOM",
+      "DOM.Iterable",
+      "ESNext"
+    ],
+    "module": "ESNext",
+    "skipLibCheck": true,
+    /* Bundler mode */
+    "moduleResolution": "bundler",
+    "allowImportingTsExtensions": true,
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "noEmit": true,
+    "jsx": "react-jsx",
+    /* Features */
+    "experimentalDecorators": true,
     "downlevelIteration": true,
-        "strictNullChecks": true,
+    "strictNullChecks": true
-        "module": "esnext"
   },
-    "exclude": ["node_modules"],
+  "include": [
-    "include": ["src"]
+    "src"
+  ],
 }

webpack.config.js

@@ -1,171 +0,0 @@
-const { resolve } = require('path')
-const HtmlWebpackPlugin = require('html-webpack-plugin')
-const HtmlWebpackInlineSourcePlugin = require('html-webpack-inline-source-plugin')
-const MiniCssExtractPlugin = require('mini-css-extract-plugin')
-const OptimizeCssAssetsWebpackPlugin = require('optimize-css-assets-webpack-plugin')
-const webpackMerge = require('webpack-merge')
-const nodeExternals = require('webpack-node-externals')
-const CopyPlugin = require('copy-webpack-plugin')
-
-const isProduction = process.env.NODE_ENV === 'production'
-
-const projectRoot = resolve(__dirname)
-const sourceFolder = resolve(projectRoot, 'src')
-const buildFolder = resolve(projectRoot, 'dist')
-const htmlTemplateFile = resolve(sourceFolder, 'index.html')
-
-const babelRule = {
-    test: /\.(js|tsx?)$/,
-    use: 'babel-loader'
-}
-
-const fileRule = {
-    test: /\.(png|svg|jpg|gif|ico)$/,
-    use: ['file-loader']
-}
-
-const cssAndSass = [
-    isProduction
-        ? MiniCssExtractPlugin.loader
-        : {
-              loader: 'style-loader',
-              options: {
-                  singleton: true
-              }
-          },
-    'css-loader'
-]
-
-const cssRule = {
-    test: /\.css$/,
-    use: cssAndSass
-}
-
-const sassRule = {
-    test: /\.scss$/,
-    use: [
-        ...cssAndSass,
-        {
-            loader: 'sass-loader',
-            options: {
-                includePaths: [sourceFolder]
-            }
-        }
-    ]
-}
-
-const serverConfig = {
-    mode: 'production',
-    target: 'node',
-    externals: [nodeExternals()],
-    module: {
-        rules: [babelRule]
-    },
-    resolve: {
-        extensions: ['.ts', '.js', '.json']
-    },
-    entry: [resolve(sourceFolder, 'server')],
-    output: {
-        filename: 'server.js',
-        path: buildFolder,
-        publicPath: '/'
-    },
-    node: {
-        __dirname: false
-    },
-    plugins: [
-        new CopyPlugin([
-            {
-                from: resolve(sourceFolder, 'public'),
-                to: buildFolder
-            }
-        ])
-    ]
-}
-
-const baseConfig = {
-    mode: 'none',
-    entry: ['babel-regenerator-runtime', resolve(sourceFolder, 'index')],
-    output: {
-        filename: 'js/[name].js',
-        path: buildFolder,
-        publicPath: '/'
-    },
-    module: {
-        rules: [babelRule, sassRule, cssRule, fileRule]
-    },
-    resolve: {
-        extensions: [
-            '.js',
-            '.ts',
-            '.tsx',
-            '.scss',
-            '.png',
-            '.svg',
-            '.jpg',
-            '.gif'
-        ]
-    }
-}
-
-const devConfig = {
-    mode: 'development',
-    plugins: [
-        new HtmlWebpackPlugin({
-            template: htmlTemplateFile,
-            chunksSortMode: 'dependency'
-        })
-    ],
-    devtool: 'inline-source-map',
-    devServer: {
-        historyApiFallback: true
-    }
-}
-
-const prodConfig = {
-    mode: 'production',
-    optimization: {
-        minimize: true,
-        nodeEnv: 'production'
-    },
-    plugins: [
-        new MiniCssExtractPlugin({
-            filename: 'css/[name].min.css'
-        }),
-        new OptimizeCssAssetsWebpackPlugin(),
-        new HtmlWebpackPlugin({
-            template: htmlTemplateFile,
-            minify: {
-                removeComments: true,
-                collapseWhitespace: true,
-                removeRedundantAttributes: true,
-                useShortDoctype: true,
-                removeEmptyAttributes: true,
-                removeStyleLinkTypeAttributes: true,
-                keepClosingSlash: true,
-                minifyJS: true,
-                minifyCSS: true,
-                minifyURLs: true
-            },
-            inject: true
-            // favicon: faviconPath
-        }),
-        new HtmlWebpackInlineSourcePlugin()
-    ],
-    devtool: 'source-map'
-}
-
-function getFinalConfig() {
-    if (process.env.NODE_ENV === 'production') {
-        console.info('Running production config')
-        return [webpackMerge(baseConfig, prodConfig), serverConfig]
-    } else if (process.env.NODE_ENV === 'server') {
-        console.info('Running server config')
-        return [serverConfig]
-    }
-
-    console.info('Running development config')
-    return webpackMerge(baseConfig, devConfig)
-}
-
-module.exports = getFinalConfig()