Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
98694f4
Update dependencies
enykeev Oct 20, 2023
3b27bb9
fix lerna version
guzzijones Sep 28, 2023
0e4cdee
bump st2 version
guzzijones Sep 28, 2023
22e9ffb
increase sleep
guzzijones Sep 28, 2023
50bf111
extend timeout
guzzijones Sep 28, 2023
0ea3532
restart docker
guzzijones Sep 28, 2023
9f78752
docker needs a restart
guzzijones Sep 28, 2023
ba9a18e
Change "docker-compose up" timeout to 300s
arm4b Oct 18, 2023
37093c9
Revert back to 100s timeout for "docker-compose up"
arm4b Oct 18, 2023
a62a481
Pin lerna@6.0.0 in Makefile
arm4b Oct 19, 2023
95f6bb9
Rebuild
arm4b Oct 19, 2023
6b8abc0
Revert "Pin lerna@6.0.0 in Makefile"
arm4b Oct 19, 2023
a050abf
Revert "Revert "Pin lerna@6.0.0 in Makefile""
arm4b Oct 19, 2023
0f1806a
Debug nvm
arm4b Oct 19, 2023
b6bc283
Debug
arm4b Oct 19, 2023
7c87d0b
Debug
arm4b Oct 19, 2023
3302d1e
Debug
arm4b Oct 19, 2023
a2bb879
Debug
arm4b Oct 19, 2023
ccef8fb
Pin machine image to an older working version
arm4b Oct 19, 2023
939230c
Add a Changelog for #1008
arm4b Oct 19, 2023
172b243
update changelog
enykeev Oct 21, 2023
56f60c5
Update CHANGELOG.rst
arm4b Oct 21, 2023
f5a9ce6
Bump node version to current
enykeev Oct 21, 2023
1b1fe41
Update moment and react-textarea-autoresize
enykeev Oct 28, 2023
737b914
update postcss
enykeev Oct 29, 2023
573efe5
remove express dependency
enykeev Oct 29, 2023
470c51a
update changelog
enykeev Oct 29, 2023
6b6c8d1
Bump ruby 2.6 -> 2.7 to fix packagecloud deploy step
arm4b Nov 23, 2023
b158679
Update docker ST2_VERSION=3.8 used for st2web testing
arm4b Nov 29, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@
version: 2
jobs:
build:
machine: true
machine:
# pin image to older version as "ubuntu-2204:2023.10.1" breaks on "nvm" step
image: ubuntu-2204:2023.04.2
environment:
DEPLOY_PACKAGES: 1
DEB: bionic focal
RPM: el7 el8
ST2_VERSION: "3.6dev"
ST2_VERSION: "3.8"
ST2_HOST: localhost
ST2_PROTOCOL: http
ST2_USERNAME: st2admin
Expand All @@ -33,8 +35,8 @@ jobs:
set +e
export NVM_DIR="/opt/circleci/.nvm"
[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"
nvm install 14.20.1
nvm alias default v14.20.1
nvm install 20.8.1
nvm alias default v20.8.1

# Each step uses the same `$BASH_ENV`, so need to modify it
echo 'export NVM_DIR="/opt/circleci/.nvm"' >> $BASH_ENV
Expand All @@ -57,18 +59,18 @@ jobs:
sudo apt-get update
sudo apt-get install rpm jq devscripts debhelper
gem install package_cloud
nvm use 14.20.1
npm install --global lerna yarn
nvm use 20.8.1
npm install --global lerna@6.0.0 yarn
- run:
name: Install package dependencies
command: |
nvm use 14.20.1
nvm use 20.8.1
lerna bootstrap

- run:
name: Run unit tests
command: |
nvm use 14.20.1
nvm use 20.8.1
npm run test-unit

- run:
Expand Down Expand Up @@ -127,13 +129,13 @@ jobs:
- run:
name: Make deb packages
command: |
nvm use 14.20.1
nvm use 20.8.1
make deb
echo $DEB | tr ' ' '\n' | xargs -I{} cp -vr ../st2web_*.{deb,changes} ~/artifacts/{}
- run:
name: Make RPM packages
command: |
nvm use 14.20.1
nvm use 20.8.1
make rpm
echo $RPM | tr ' ' '\n' | xargs -I{} cp -vr ../st2web-*.rpm ~/artifacts/{}
- store_artifacts:
Expand All @@ -148,7 +150,7 @@ jobs:
- el8
deploy:
docker:
- image: ruby:2.6.3
- image: ruby:2.7
environment:
ARTIFACTS: /home/circleci/artifacts
DISTROS: bionic focal el7 el8
Expand Down
24 changes: 19 additions & 5 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,25 @@ Changelog
in development
--------------

Changed
~~~~~~~
* Updated various dependencies (security). #1009, #1020

Contributed by @enykeev

* Updated NodeJS to v20 current (security). #1010

Contributed by @enykeev

Fixed
~~~~~
* Fixed CircleCI tests by pinning lerna@6.0.0. #1008

Contributed by @guzzijones


st2 v3.8.0
------

Added
~~~~~
Expand All @@ -30,7 +49,6 @@ Changed

Reported by @cded from @Bitovi


Fixed
~~~~~
* Fixed CircleCI tests
Expand All @@ -44,7 +62,3 @@ Fixed
* Escaped text in notifications. #990

Contributed by @cded from @Bitovi


v2.4.3
------
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:14.20.1
FROM node:20.8.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:14.20.1
FROM node:20.8.1

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

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

# Create app directory
WORKDIR /opt/stackstorm/static/webui/st2web
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ all: build
# yarn now included in later node images
npm-install:
echo "npm install"
npm install -g lerna
npm install -g lerna@6.0.0

lerna:
echo "lerna"
Expand Down
17 changes: 8 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,18 @@ Quick start
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 14

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 : v14.17.0
$ n 20
installing : node-v20.8.1
mkdir : /home/enykeev/n/n/versions/node/20.8.1
fetch : https://nodejs.org/dist/v20.8.1/node-v20.8.1-linux-x64.tar.xz
copying : node/20.8.1
installed : v20.8.1 (with npm 10.1.0)

$ node -v
v14.17.0
v20.8.1

$ npm -v
6.14.13
10.1.0
```

then you need to globally install `gulp`, `lerna` and `yarn`
Expand Down
4 changes: 2 additions & 2 deletions apps/st2-workflows/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"gulp-uglify-es": "^1.0.4",
"insert-css": "^2.0.0",
"lodash": "^4.17.21",
"moment": "^2.18.1",
"moment": "^2.29.4",
"prop-types": "^15.6.0",
"react": "^16.8.4",
"react-dom": "^16.8.4",
Expand Down Expand Up @@ -96,7 +96,7 @@
"ignore-styles": "^5.0.1",
"lerna": "^3.4.3",
"less": "^3.9.0",
"postcss": "^7.0.14",
"postcss": "^8.4.31",
"postcss-import": "12.0.1",
"postcss-nested": "4.1.2",
"postcss-preset-env": "6.6.0",
Expand Down
2 changes: 0 additions & 2 deletions modules/st2-api/api.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,6 @@ export class API {
'Authorization': `Basic ${toBase64(`${username}:${password}`)}`,
'content-type': 'application/json',
},
// You need to define data field for axios to set content-type header
data: null,
});

if (res.status !== 201) {
Expand Down
2 changes: 1 addition & 1 deletion modules/st2-auto-form/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"prop-types": "15.7.2",
"react": "16.8.6",
"react-dom": "16.8.6",
"react-textarea-autosize": "5.2.1",
"react-textarea-autosize": "7.1.2",
"validator": "^13.0.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion modules/st2-style/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"@stackstorm/browserify-postcss": "0.3.4-patch.5",
"normalize.css": "8.0.1",
"babelify": "10.0.0",
"postcss": "7.0.14",
"postcss": "8.4.31",
"postcss-import": "12.0.1",
"postcss-nested": "4.1.2",
"postcss-preset-env": "6.6.0"
Expand Down
2 changes: 1 addition & 1 deletion modules/st2flow-canvas/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"@stackstorm/browserify-postcss": "0.3.4-patch.5",
"babelify": "10.0.0",
"classnames": "^2.2.6",
"postcss": "7.0.14",
"postcss": "8.4.31",
"postcss-color-mod-function": "^3.0.3",
"postcss-import": "12.0.1",
"postcss-nested": "4.1.2",
Expand Down
2 changes: 1 addition & 1 deletion modules/st2flow-details/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"devDependencies": {
"@stackstorm/browserify-postcss": "0.3.4-patch.5",
"babelify": "10.0.0",
"postcss": "7.0.14",
"postcss": "8.4.31",
"postcss-import": "12.0.1",
"postcss-nested": "4.1.2",
"postcss-preset-env": "6.6.0"
Expand Down
2 changes: 1 addition & 1 deletion modules/st2flow-editor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"@stackstorm/browserify-postcss": "0.3.4-patch.5",
"babelify": "10.0.0",
"classnames": "^2.2.6",
"postcss": "7.0.14",
"postcss": "8.4.31",
"postcss-import": "12.0.1",
"postcss-nested": "4.1.2",
"postcss-preset-env": "6.6.0"
Expand Down
2 changes: 1 addition & 1 deletion modules/st2flow-header/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"@stackstorm/browserify-postcss": "0.3.4-patch.5",
"babelify": "10.0.0",
"classnames": "^2.2.6",
"postcss": "7.0.14",
"postcss": "8.4.31",
"postcss-import": "12.0.1",
"postcss-nested": "4.1.2",
"postcss-preset-env": "6.6.0"
Expand Down
2 changes: 1 addition & 1 deletion modules/st2flow-palette/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"@stackstorm/browserify-postcss": "0.3.4-patch.5",
"babelify": "10.0.0",
"classnames": "^2.2.6",
"postcss": "7.0.14",
"postcss": "8.4.31",
"postcss-import": "12.0.1",
"postcss-nested": "4.1.2",
"postcss-preset-env": "6.6.0"
Expand Down
12 changes: 7 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
},
"repository": "stackstorm/st2web",
"engines": {
"node": "14.20.1",
"npm": "6.14.12"
"node": "20.8.1",
"npm": "10.1.0"
},
"browserify": {
"transform": [
Expand Down Expand Up @@ -75,11 +75,10 @@
"js-yaml": "^3.13.1",
"kind-of": "^6.0.3",
"lodash": "4.17.21",
"lodash.template": "^4.5.0",
"minimatch": "^3.0.4",
"mixin-deep": "^1.3.2",
"moment": "2.24.0",
"node": "14.20.1",
"moment": "2.29.4",
"node": "20.8.1",
"node-uuid": "^1.4.8",
"open": "^8.4.0",
"qs": "^6.10.2",
Expand All @@ -106,5 +105,8 @@
"ignore-styles": "5.0.1",
"insert-css": "2.0.0",
"zombie": "5.0.8"
},
"resolutions": {
"open": "^8.4.0"
}
}
1 change: 0 additions & 1 deletion tasks/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
"chalk": "2.4.2",
"css-extract": "1.3.1",
"event-stream": "4.0.1",
"express": "4.16.4",
"fancy-log": "1.3.3",
"fontello-update": "0.6.5",
"git-rev-sync": "1.12.0",
Expand Down
6 changes: 3 additions & 3 deletions tasks/serve.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ gulp.task('serve', () => {
https: true,
proxies: [{
source: '/api',
target: `https://${st2host}/api`,
target: `${process.env.ST2_PROTOCOL || 'https'}://${st2host}/api`,
options,
}, {
source: '/auth',
target: `https://${st2host}/auth`,
target: `${process.env.ST2_PROTOCOL || 'https'}://${st2host}/auth`,
options,
}, {
source: '/stream',
target: `https://${st2host}/stream`,
target: `${process.env.ST2_PROTOCOL || 'https'}://${st2host}/stream`,
options,
}],
}));
Expand Down
Loading