upgrade to node 16; removed npm-force-resolutions (#2218)

evcc-io · Jan 7, 2022 · 96c6c62 · 96c6c62
1 parent cfe8a96
commit 96c6c62
Show file tree

Hide file tree

Showing 14 changed files with 38,995 additions and 7,970 deletions.
diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml
@@ -9,12 +9,17 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - name: Setup
+    - name: Set up Go
       uses: actions/setup-go@v2
       with:
         go-version: ^1.16
       id: go
 
+    - name: Set up Node
+      uses: actions/setup-node@v2
+      with:
+        node-version: '16'
+
     - name: Cache Go modules
       uses: actions/cache@v2
       with:

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -84,6 +84,11 @@ jobs:
       with:
         go-version: ^1.16
       id: go
+
+    - name: Set up Node
+      uses: actions/setup-node@v2
+      with:
+        node-version: '16'
 
     - name: Install Cloudsmith CLI
       run: pip install --upgrade cloudsmith-cli

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -58,11 +58,16 @@ jobs:
         restore-keys: |
           ${{ runner.os }}-${{ matrix.go-version }}-go-
 
-    - name: Set up Go
+    - name: Setup Go
       uses: actions/setup-go@v2
       with:
         go-version: ^1.16
       id: go
+
+    - name: Setup Node
+      uses: actions/setup-node@v2
+      with:
+        node-version: '16'
 
     - name: Install Cloudsmith CLI
       run: pip install --upgrade cloudsmith-cli

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # STEP 1 build ui
-FROM node:14-alpine as node
+FROM node:16-alpine as node
 
 RUN apk update && apk add --no-cache make
 

diff --git a/README.md b/README.md
@@ -134,7 +134,7 @@ For use with SMA Sunny Home Manager, `evcc` needs to generate a unique device id
 docker run -v /etc/machine-id:/etc/machine-id -v /var/lib/dbus/machine-id:/var/lib/dbus/machine-id andig/evcc ...
 ```
 
-To build EVCC from source, [Go][2] 1.16 is required:
+To build EVCC from source, [Go][2] 1.16 and [Node][3] 16 are required:
 
 ```sh
 make
@@ -739,6 +739,7 @@ Hence, for a simplified and stricter implementation of an EV charge controller,
 
 [1]: https://github.com/snaptec/openWB
 [2]: https://golang.org
+[3]: https://nodejs.org/
 [4]: https://getbootstrap.org
 [5]: https://hub.docker.com/repository/docker/andig/evcc
 [6]: https://github.com/volkszaehler/mbmd
diff --git a/dist/css/chunk-vendors.a7b690cd.css → dist/css/chunk-vendors.4692b1e2.css b/dist/css/chunk-vendors.a7b690cd.css → dist/css/chunk-vendors.4692b1e2.css
diff --git a/dist/index.html b/dist/index.html
@@ -1,5 +1,5 @@
-<!DOCTYPE html><html lang="de"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><meta name="description" content="EV Charge Controller"><meta name="author" content="andig"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-status-bar-style" content="black"><link rel="apple-touch-icon" sizes="180x180" href="ico/apple-touch-icon.png?[[.Version]]"><link rel="icon" type="image/png" sizes="32x32" href="ico/favicon-32x32.png?[[.Version]]"><link rel="icon" type="image/png" sizes="16x16" href="ico/favicon-16x16.png?[[.Version]]"><link rel="manifest" href="ico/site.webmanifest"><link rel="mask-icon" href="ico/safari-pinned-tab.svg?[[.Version]]" color="#18191a"><link rel="shortcut icon" href="ico/favicon.ico?[[.Version]]"><meta name="apple-mobile-web-app-title" content="evcc"><meta name="application-name" content="evcc"><meta name="msapplication-TileColor" content="#18191a"><meta name="msapplication-config" content="ico/browserconfig.xml"><meta name="theme-color" content="#18191a"><title>evcc</title><link href="css/chunk-vendors.a7b690cd.css" rel="preload" as="style"><link href="css/index.a26a8c8b.css" rel="preload" as="style"><link href="js/chunk-vendors.42761c73.js" rel="preload" as="script"><link href="js/index.333afce9.js" rel="preload" as="script"><link href="css/chunk-vendors.a7b690cd.css" rel="stylesheet"><link href="css/index.a26a8c8b.css" rel="stylesheet"></head><body><script>window.evcc = {
+<!DOCTYPE html><html lang="de"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><meta name="description" content="EV Charge Controller"><meta name="author" content="andig"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-status-bar-style" content="black"><link rel="apple-touch-icon" sizes="180x180" href="ico/apple-touch-icon.png?[[.Version]]"><link rel="icon" type="image/png" sizes="32x32" href="ico/favicon-32x32.png?[[.Version]]"><link rel="icon" type="image/png" sizes="16x16" href="ico/favicon-16x16.png?[[.Version]]"><link rel="manifest" href="ico/site.webmanifest"><link rel="mask-icon" href="ico/safari-pinned-tab.svg?[[.Version]]" color="#18191a"><link rel="shortcut icon" href="ico/favicon.ico?[[.Version]]"><meta name="apple-mobile-web-app-title" content="evcc"><meta name="application-name" content="evcc"><meta name="msapplication-TileColor" content="#18191a"><meta name="msapplication-config" content="ico/browserconfig.xml"><meta name="theme-color" content="#18191a"><title>evcc</title><link href="css/chunk-vendors.4692b1e2.css" rel="preload" as="style"><link href="css/index.a26a8c8b.css" rel="preload" as="style"><link href="js/chunk-vendors.323cc329.js" rel="preload" as="script"><link href="js/index.b0ecc7d3.js" rel="preload" as="script"><link href="css/chunk-vendors.4692b1e2.css" rel="stylesheet"><link href="css/index.a26a8c8b.css" rel="stylesheet"></head><body><script>window.evcc = {
         version: "[[.Version]]",
         configured: "[[.Configured]]",
         commit: "[[.Commit]]",
-      };</script><div id="app"></div><script src="js/chunk-vendors.42761c73.js"></script><script src="js/index.333afce9.js"></script></body></html>
+      };</script><div id="app"></div><script src="js/chunk-vendors.323cc329.js"></script><script src="js/index.b0ecc7d3.js"></script></body></html>
diff --git a/dist/js/chunk-vendors.42761c73.js → dist/js/chunk-vendors.323cc329.js b/dist/js/chunk-vendors.42761c73.js → dist/js/chunk-vendors.323cc329.js
diff --git a/dist/js/chunk-vendors.323cc329.js.map b/dist/js/chunk-vendors.323cc329.js.map
diff --git a/dist/js/chunk-vendors.42761c73.js.map b/dist/js/chunk-vendors.42761c73.js.map
diff --git a/dist/js/index.333afce9.js → dist/js/index.b0ecc7d3.js b/dist/js/index.333afce9.js → dist/js/index.b0ecc7d3.js
diff --git a/dist/js/index.333afce9.js.map → dist/js/index.b0ecc7d3.js.map b/dist/js/index.333afce9.js.map → dist/js/index.b0ecc7d3.js.map