Skip to content
This repository has been archived by the owner on May 3, 2024. It is now read-only.

chore(deps): update all the things #1327

Merged
merged 36 commits into from
Mar 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
662847c
chore(deps-dev): update all the things
10xLaCroixDrinker Mar 14, 2024
9a6a39d
chore(deps): @fastify/compress@6.5.0
10xLaCroixDrinker Mar 14, 2024
2f1e612
chore(deps): @fastify/cors@8.5.0
10xLaCroixDrinker Mar 14, 2024
1adf3b9
chore(deps): fastify@4.26.2
10xLaCroixDrinker Mar 14, 2024
042f56d
chore(deps): immutable@4.3.5
10xLaCroixDrinker Mar 14, 2024
5de44c8
chore(deps): holocron@1.10.2
10xLaCroixDrinker Mar 14, 2024
78d3460
chore(deps): holocron-module-route@1.10.2
10xLaCroixDrinker Mar 14, 2024
429d04a
chore(deps): reselect@4.1.8
10xLaCroixDrinker Mar 14, 2024
d81ba46
chore(deps): joi@17.12.2
10xLaCroixDrinker Mar 15, 2024
9452f68
chore(dev-deps): remove lodash.set
10xLaCroixDrinker Mar 15, 2024
11d1fb7
chore(deps): uuid@9.0.1 & wildcard-match@5.1.3
10xLaCroixDrinker Mar 15, 2024
a2b48cd
chore(deps): one-app-ducks@4.5.0
10xLaCroixDrinker Mar 15, 2024
77871be
Revert "chore(deps): one-app-ducks@4.5.0"
10xLaCroixDrinker Mar 15, 2024
187ec32
chore(deps-dev): remove mkdirp & rimraf
10xLaCroixDrinker Mar 15, 2024
a2b5526
chore(deps): core-js@3.36.0
10xLaCroixDrinker Mar 15, 2024
c70e0c8
chore(deps-dev): remove fs-extra
10xLaCroixDrinker Mar 15, 2024
5000836
chore(deps): @fastify/compress@7.0.0
10xLaCroixDrinker Mar 15, 2024
4f5335c
chore(deps): @fastify/cors@9.0.1
10xLaCroixDrinker Mar 15, 2024
7865018
chore(deps): @fastify/static@7.0.1
10xLaCroixDrinker Mar 15, 2024
c97d9a9
chore(deps-dev): remove node-fetch
10xLaCroixDrinker Mar 15, 2024
a52e827
chore(deps): fastify-metrics@11.0.0
10xLaCroixDrinker Mar 15, 2024
779a660
chore(deps-dev): remove https-proxy
10xLaCroixDrinker Mar 15, 2024
974af99
chore(deps-dev): @commitlint/cli@19.2.0 & @commitlint/config-conventi…
10xLaCroixDrinker Mar 15, 2024
426d651
chore(deps): move to @americanexpress/one-app-server-bundler
10xLaCroixDrinker Mar 15, 2024
d7e4914
chore(deps): regenerator-runtime@0.14.1
10xLaCroixDrinker Mar 15, 2024
1009824
Revert "chore(deps): regenerator-runtime@0.14.1"
10xLaCroixDrinker Mar 15, 2024
fe1375e
chore(deps): npm dedupe
10xLaCroixDrinker Mar 15, 2024
f3223e6
chore(deps-dev): eslint@8.57.0 & eslint-config-amex@16.0.0
10xLaCroixDrinker Mar 15, 2024
0e1801b
chore(deps): @americanexpress/one-app-server-bundler@1.0.2
10xLaCroixDrinker Mar 15, 2024
75521b8
chore(deps): fresh lockfile
10xLaCroixDrinker Mar 15, 2024
90341b6
chore(deps): regenerator-runtime@0.14.1
10xLaCroixDrinker Mar 15, 2024
1ad8b40
refactor: cleanup after eslint --fix
10xLaCroixDrinker Mar 15, 2024
3ecc7a3
refactor: prefer node protocol for built-ins
10xLaCroixDrinker Mar 16, 2024
e94cc27
chore: update sample module deps
10xLaCroixDrinker Mar 16, 2024
92bcf79
chore: update prod-sample servers
10xLaCroixDrinker Mar 16, 2024
e94af84
chore: update perf test images
10xLaCroixDrinker Mar 16, 2024
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
33 changes: 31 additions & 2 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,37 @@
{
"root": true,
"extends": "amex",
"plugins": ["es"],
"plugins": [
"es"
],
"parserOptions": {
"babelOptions": {
"presets": [
"@babel/preset-react"
]
}
},
"rules": {
"unicorn/prefer-node-protocol": "error",
"eslint-comments/require-description": [
"error",
{
"ignore": [
"eslint-enable"
]
}
],
"default-param-last": 0
},
"overrides": [
{
"files": [
"__performance__/**"
],
"globals": {
"__ENV": true
}
},
{
"files": [
"**/__mocks__/**"
Expand Down Expand Up @@ -39,4 +68,4 @@
}
}
]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ jobs:
${{ runner.os }}-node-
- name: npm install
run: NODE_ENV=development npm ci
env:
HUSKY: 0
- name: npm unit test
run: npm run test:unit
- name: npm lint test
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/on-pr_dangerJS.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ jobs:
${{ runner.os }}-node-
- name: npm install
run: NODE_ENV=development npm ci
env:
HUSKY: 0
- name: Danger
run: NODE_ENV=production npm run test:danger
env:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/on-pr_one-app-integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ jobs:
node-version-file: .nvmrc
- name: npm install
run: NODE_ENV=development npm ci
env:
HUSKY: 0
- name: Build docker image
run: docker build -t one-app:at-test . --build-arg USER=root --build-arg VERSION=$(cat .nvmrc)
- name: Run Integration Tests
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ jobs:
npm run release
git add .
git commit -m "docs(changelog): update"
env:
HUSKY: 0
- name: Create release pull request
uses: peter-evans/create-pull-request@v6
with:
Expand Down
3 changes: 0 additions & 3 deletions .husky/commit-msg
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

npx commitlint --edit $1
3 changes: 0 additions & 3 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

npm run test:lint && npm run test:unit && npm run test:lockfile
30 changes: 0 additions & 30 deletions __mocks__/express.js

This file was deleted.

33 changes: 0 additions & 33 deletions __mocks__/http.js

This file was deleted.

33 changes: 0 additions & 33 deletions __mocks__/https.js

This file was deleted.

40 changes: 0 additions & 40 deletions __mocks__/node-fetch.js

This file was deleted.

6 changes: 3 additions & 3 deletions __performance__/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ services:

# receives one-app internals metrics
prometheus:
image: prom/prometheus:v2.49.1
image: prom/prometheus:v2.50.1
networks:
- one-app-performance
volumes:
Expand All @@ -26,7 +26,7 @@ services:

# graphing of metrics
grafana:
image: grafana/grafana:10.0.10
image: grafana/grafana:10.0.12
networks:
- one-app-performance
ports:
Expand All @@ -43,7 +43,7 @@ services:

# runs performance scripts
k6:
image: grafana/k6:0.48.0
image: grafana/k6:0.49.0
networks:
- one-app-performance
ports:
Expand Down
4 changes: 2 additions & 2 deletions __performance__/scripts/load.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,10 @@
* permissions and limitations under the License.
*/

/* eslint-disable import/no-unresolved */
/* eslint-disable import/no-unresolved -- performance scripts are not ran directly */
import http from 'k6/http';
import { check, sleep } from 'k6';
/* eslint-enable import/no-unresolved */

export const options = {
stages: [
Expand All @@ -30,7 +31,6 @@ export const options = {
},
};

// eslint-disable-next-line no-undef
const { TARGET_URL } = __ENV;

export default function virtualUser() {
Expand Down
5 changes: 2 additions & 3 deletions __performance__/scripts/smoke.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
* permissions and limitations under the License.
*/

/* eslint-disable import/no-anonymous-default-export */
/* eslint-disable import/no-unresolved */
/* eslint-disable import/no-unresolved -- performance scripts are not ran directly */
import http from 'k6/http';
import { check, sleep } from 'k6';
/* eslint-enable import/no-unresolved */

// This is a simple smoke test to ensure there is no major regression
// to the one-app server.
Expand All @@ -32,7 +32,6 @@ export const options = {
},
};

// eslint-disable-next-line no-undef
const { TARGET_URL } = __ENV;

export default function virtualUser() {
Expand Down
4 changes: 2 additions & 2 deletions __performance__/scripts/soak.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,10 @@
* permissions and limitations under the License.
*/

/* eslint-disable import/no-unresolved */
/* eslint-disable import/no-unresolved -- performance scripts are not ran directly */
import http from 'k6/http';
import { check, sleep } from 'k6';
/* eslint-enable import/no-unresolved */

export const options = {
stages: [
Expand All @@ -29,7 +30,6 @@ export const options = {
},
};

// eslint-disable-next-line no-undef
const { TARGET_URL } = __ENV;

export default function virtualUser() {
Expand Down
4 changes: 2 additions & 2 deletions __performance__/scripts/spike.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,10 @@
* permissions and limitations under the License.
*/

/* eslint-disable import/no-unresolved */
/* eslint-disable import/no-unresolved -- performance scripts are not ran directly */
import http from 'k6/http';
import { check, sleep } from 'k6';
/* eslint-enable import/no-unresolved */

export const options = {
stages: [
Expand All @@ -33,7 +34,6 @@ export const options = {
},
};

// eslint-disable-next-line no-undef
const { TARGET_BASE_URL } = __ENV;

export default function virtualUser() {
Expand Down
4 changes: 2 additions & 2 deletions __performance__/scripts/stress.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,10 @@
* permissions and limitations under the License.
*/

/* eslint-disable import/no-unresolved */
/* eslint-disable import/no-unresolved -- performance scripts are not ran directly */
import http from 'k6/http';
import { check, sleep } from 'k6';
/* eslint-enable import/no-unresolved */

export const options = {
stages: [
Expand All @@ -35,7 +36,6 @@ export const options = {
},
};

// eslint-disable-next-line no-undef
const { TARGET_BASE_URL } = __ENV;

export default function virtualUser() {
Expand Down
Loading
Loading