Skip to content

Commit 065f5c6

Browse files
authored
Merge pull request #894 from StackStorm/node_14
Update node.js to v14.16.1
2 parents 2175287 + b8c3a42 commit 065f5c6

File tree

9 files changed

+1281
-1110
lines changed

9 files changed

+1281
-1110
lines changed

.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ jobs:
3333
set +e
3434
export NVM_DIR="/opt/circleci/.nvm"
3535
[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"
36-
nvm install 10.15.3
37-
nvm alias default 10.15.3
36+
nvm install 14.16.1
37+
nvm alias default 14.16.1
3838
3939
# Each step uses the same `$BASH_ENV`, so need to modify it
4040
echo 'export NVM_DIR="/opt/circleci/.nvm"' >> $BASH_ENV

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:10.15.3
1+
FROM node:14.16.1
22

33
# Create app directory
44
WORKDIR /opt/stackstorm/static/webui/st2web

Dockerfile-dev

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:10.15.3
1+
FROM node:14.16.1
22

33
# Create app directory
44
WORKDIR /opt/stackstorm/static/webui/st2web

Dockerfile-nginx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:10.15.3 as build
1+
FROM node:14.16.1 as build
22

33
# Create app directory
44
WORKDIR /opt/stackstorm/static/webui/st2web
@@ -23,4 +23,4 @@ COPY --from=build /opt/stackstorm/static/webui /opt/stackstorm/static/webui
2323
RUN mkdir -p /etc/ssl/st2
2424
RUN openssl req -x509 -newkey rsa:2048 -keyout /etc/ssl/st2/st2.key -out /etc/ssl/st2/st2.crt \
2525
-days 365 -nodes -subj "/C=US/ST=California/L=Palo Alto/O=StackStorm/OU=Information \
26-
Technology/CN=$(hostname)"
26+
Technology/CN=$(hostname)"

Dockerfile-nginx-dev

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:10.15.3 as build
1+
FROM node:14.16.1 as build
22

33
# Create app directory
44
WORKDIR /opt/stackstorm/static/webui/st2web
@@ -17,4 +17,4 @@ EXPOSE 3000
1717
FROM nginx
1818
RUN rm -f /etc/nginx/conf.d/default.conf
1919
COPY ./nginx.local-dev.conf /etc/nginx/conf.d/st2.conf
20-
COPY --from=build /opt/stackstorm/static/webui /opt/stackstorm/static/webui
20+
COPY --from=build /opt/stackstorm/static/webui /opt/stackstorm/static/webui

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@ DEB_DISTRO := $(shell (echo $(PKG_VERSION) | grep -q dev) && echo unstable || ec
99
.PHONY: all build clean install deb rpm
1010
all: build
1111

12+
# yarn now included in later node images
1213
npm-install:
1314
echo "npm install"
14-
npm install -g lerna yarn
15+
npm install -g lerna
1516

1617
lerna:
1718
echo "lerna"

README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,22 @@ StackStorm Web UI
99
Quick start
1010
-----------
1111

12-
First of all, you need to make sure you have `node` and `npm` packages installed. Currently, we consider Node v10.x.x to be our stable.
12+
First of all, you need to make sure you have `node` and `npm` packages installed. Currently, we consider Node v14.x.x to be our stable.
1313

1414
```shell
15-
$ n 10
15+
$ n 14
1616

17-
install : node-v10.4.1
18-
mkdir : /usr/local/n/versions/node/10.4.1
19-
fetch : https://nodejs.org/dist/v10.4.1/node-v10.4.1-darwin-x64.tar.gz
17+
install : node-v14.17.0
18+
mkdir : /usr/local/n/versions/node/14.17.0
19+
fetch : https://nodejs.org/dist/v14.17.0/node-v14.17.0-darwin-x64.tar.gz
2020
######################################################################## 100.0%
21-
installed : v10.4.1
21+
installed : v14.17.0
2222

2323
$ node -v
24-
v10.4.1
24+
v14.17.0
2525

2626
$ npm -v
27-
6.1.0
27+
6.14.13
2828
```
2929

3030
then you need to globally install `gulp`, `lerna` and `yarn`

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
},
2020
"repository": "stackstorm/st2web",
2121
"engines": {
22-
"node": "10.15.3",
23-
"npm": "6.9.0"
22+
"node": "^14.16.1",
23+
"npm": "6.14.12"
2424
},
2525
"browserify": {
2626
"transform": [
@@ -77,6 +77,7 @@
7777
"minimatch": "^3.0.2",
7878
"mixin-deep": "^1.3.2",
7979
"moment": "2.24.0",
80+
"node": "^14.16.1",
8081
"node-uuid": "^1.4.4",
8182
"open": "^6.0.0",
8283
"qs": "^6.0.4",

yarn.lock

Lines changed: 1260 additions & 1091 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)