upgrade to node 16; removed npm-force-resolutions (#2218)
This commit is contained in:
Michael Geers
GitHub
parent
cfe8a961b6
commit
96c6c62525
14 changed files with 38640 additions and 7615 deletions
7
.github/workflows/default.yml
vendored
7
.github/workflows/default.yml
vendored
|
|
@ -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:
|
||||
|
|
|
|||
5
.github/workflows/nightly.yml
vendored
5
.github/workflows/nightly.yml
vendored
|
|
@ -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
|
||||
|
|
|
|||
7
.github/workflows/release.yml
vendored
7
.github/workflows/release.yml
vendored
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
4
dist/index.html
vendored
4
dist/index.html
vendored
|
|
@ -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>
|
||||
File diff suppressed because one or more lines are too long
1
dist/js/chunk-vendors.323cc329.js.map
vendored
Normal file
1
dist/js/chunk-vendors.323cc329.js.map
vendored
Normal file
File diff suppressed because one or more lines are too long
1
dist/js/chunk-vendors.42761c73.js.map
vendored
1
dist/js/chunk-vendors.42761c73.js.map
vendored
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
46190
package-lock.json
generated
46190
package-lock.json
generated
File diff suppressed because it is too large
Load diff
23
package.json
23
package.json
|
|
@ -3,7 +3,6 @@
|
|||
"description": "",
|
||||
"author": "naltatis & andig",
|
||||
"scripts": {
|
||||
"preinstall": "npx npm-force-resolutions",
|
||||
"build": "vue-cli-service build",
|
||||
"test": "vue-cli-service test:unit",
|
||||
"lint": "prettier assets --write && eslint assets/**/*.js assets/**/*.vue --fix",
|
||||
|
|
@ -21,7 +20,7 @@
|
|||
"axios": "^0.24.0",
|
||||
"bootstrap": "^5.1.3",
|
||||
"canvas-confetti": "^1.4.0",
|
||||
"v-tooltip": "^3.0.0-beta.1",
|
||||
"v-tooltip": "^3.0.0-beta.4",
|
||||
"vue": "^2.6.14",
|
||||
"vue-hot-reload-api": "^2.3.4",
|
||||
"vue-i18n": "^8.26.8",
|
||||
|
|
@ -29,11 +28,11 @@
|
|||
"vue-router": "^3.5.3"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@storybook/addon-actions": "^6.4.9",
|
||||
"@storybook/addon-essentials": "^6.4.9",
|
||||
"@storybook/addon-links": "^6.4.9",
|
||||
"@storybook/addon-actions": "^6.5.0-alpha.9",
|
||||
"@storybook/addon-essentials": "^6.5.0-alpha.9",
|
||||
"@storybook/addon-links": "^6.5.0-alpha.9",
|
||||
"@storybook/addon-postcss": "^2.0.0",
|
||||
"@storybook/vue": "^6.4.9",
|
||||
"@storybook/vue": "^6.5.0-alpha.9",
|
||||
"@vue/cli-plugin-unit-jest": "^4.5.15",
|
||||
"@vue/cli-service": "^4.5.15",
|
||||
"@vue/component-compiler-utils": "^3.3.0",
|
||||
|
|
@ -54,15 +53,9 @@
|
|||
"vue": "./node_modules/vue/dist/vue.js"
|
||||
},
|
||||
"engines": {
|
||||
"npm": ">=6.0.0",
|
||||
"node": ">=14.0.0"
|
||||
"npm": ">=8.0.0",
|
||||
"node": ">=16.0.0"
|
||||
},
|
||||
"license": "MIT",
|
||||
"repository": "github:evcc-io/evcc",
|
||||
"resolutions": {
|
||||
"glob-parent": ">=5.1.2",
|
||||
"immer": ">=9.0.6",
|
||||
"node-notifier": ">=8.0.1",
|
||||
"trim": ">=1.0.1"
|
||||
}
|
||||
"repository": "github:evcc-io/evcc"
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue