Skip to content

Commit

Permalink
Merge pull request #894 from StackStorm/node_14
Browse files Browse the repository at this point in the history
Update node.js to v14.16.1
  • Loading branch information
m4dcoder authored Sep 14, 2021
2 parents 2175287 + b8c3a42 commit 065f5c6
Show file tree
Hide file tree
Showing 9 changed files with 1,281 additions and 1,110 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ jobs:
set +e
export NVM_DIR="/opt/circleci/.nvm"
[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"
nvm install 10.15.3
nvm alias default 10.15.3
nvm install 14.16.1
nvm alias default 14.16.1
# Each step uses the same `$BASH_ENV`, so need to modify it
echo 'export NVM_DIR="/opt/circleci/.nvm"' >> $BASH_ENV
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:10.15.3
FROM node:14.16.1

# Create app directory
WORKDIR /opt/stackstorm/static/webui/st2web
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-dev
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:10.15.3
FROM node:14.16.1

# Create app directory
WORKDIR /opt/stackstorm/static/webui/st2web
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile-nginx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:10.15.3 as build
FROM node:14.16.1 as build

# Create app directory
WORKDIR /opt/stackstorm/static/webui/st2web
Expand All @@ -23,4 +23,4 @@ COPY --from=build /opt/stackstorm/static/webui /opt/stackstorm/static/webui
RUN mkdir -p /etc/ssl/st2
RUN openssl req -x509 -newkey rsa:2048 -keyout /etc/ssl/st2/st2.key -out /etc/ssl/st2/st2.crt \
-days 365 -nodes -subj "/C=US/ST=California/L=Palo Alto/O=StackStorm/OU=Information \
Technology/CN=$(hostname)"
Technology/CN=$(hostname)"
4 changes: 2 additions & 2 deletions Dockerfile-nginx-dev
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:10.15.3 as build
FROM node:14.16.1 as build

# Create app directory
WORKDIR /opt/stackstorm/static/webui/st2web
Expand All @@ -17,4 +17,4 @@ EXPOSE 3000
FROM nginx
RUN rm -f /etc/nginx/conf.d/default.conf
COPY ./nginx.local-dev.conf /etc/nginx/conf.d/st2.conf
COPY --from=build /opt/stackstorm/static/webui /opt/stackstorm/static/webui
COPY --from=build /opt/stackstorm/static/webui /opt/stackstorm/static/webui
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ DEB_DISTRO := $(shell (echo $(PKG_VERSION) | grep -q dev) && echo unstable || ec
.PHONY: all build clean install deb rpm
all: build

# yarn now included in later node images
npm-install:
echo "npm install"
npm install -g lerna yarn
npm install -g lerna

lerna:
echo "lerna"
Expand Down
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,22 @@ StackStorm Web UI
Quick start
-----------

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.
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.

```shell
$ n 10
$ n 14

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

$ node -v
v10.4.1
v14.17.0

$ npm -v
6.1.0
6.14.13
```

then you need to globally install `gulp`, `lerna` and `yarn`
Expand Down
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
},
"repository": "stackstorm/st2web",
"engines": {
"node": "10.15.3",
"npm": "6.9.0"
"node": "^14.16.1",
"npm": "6.14.12"
},
"browserify": {
"transform": [
Expand Down Expand Up @@ -77,6 +77,7 @@
"minimatch": "^3.0.2",
"mixin-deep": "^1.3.2",
"moment": "2.24.0",
"node": "^14.16.1",
"node-uuid": "^1.4.4",
"open": "^6.0.0",
"qs": "^6.0.4",
Expand Down
2,351 changes: 1,260 additions & 1,091 deletions yarn.lock

Large diffs are not rendered by default.

0 comments on commit 065f5c6

Please sign in to comment.