Skip to content

Commit fa0ecd4

Browse files
committed
Merge branch 'dependabot/npm_and_yarn/fastify-5.8.3' of https://github.com/openops-cloud/openops into dependabot/npm_and_yarn/fastify-5.8.3
2 parents 47e553f + 663afbc commit fa0ecd4

111 files changed

Lines changed: 3959 additions & 593 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ WORKDIR /root/.mcp/openops-mcp
6868
RUN <<-```
6969
set -ex
7070
git clone https://github.com/openops-cloud/openops-mcp .
71-
git checkout 7f964bd4fcfd46fbb7ab4b96abd15e4d3d77758d
71+
git checkout 5d6d9e515ad27bf1237d7e4df84b9ba9832214fb
7272
wget -qO- https://astral.sh/uv/install.sh | sh && source $HOME/.local/bin/env
7373
uv venv && . .venv/bin/activate && uv pip install -r requirements.txt
7474
```

.husky/pre-commit

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
npx lint-staged --verbose

.lintstagedrc.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"*.{ts,tsx,js,jsx,json,css,scss,md,html,yaml,yml}": "prettier --write"
3+
}

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ WORKDIR /root/.mcp/openops-mcp
1717
RUN <<-```
1818
set -ex
1919
git clone https://github.com/openops-cloud/openops-mcp .
20-
git checkout 7f964bd4fcfd46fbb7ab4b96abd15e4d3d77758d
20+
git checkout 5d6d9e515ad27bf1237d7e4df84b9ba9832214fb
2121
wget -qO- https://astral.sh/uv/install.sh | sh && source $HOME/.local/bin/env
2222
uv venv && . .venv/bin/activate && uv pip install -r requirements.txt
2323
```

compose.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ name: openopsdev
22
services:
33
tables:
44
container_name: tables
5+
restart: unless-stopped
56
image: public.ecr.aws/openops/openops-tables:0.2.17
67
environment:
78
BASEROW_PUBLIC_URL: ${OPS_OPENOPS_TABLES_PUBLIC_URL}
@@ -63,6 +64,7 @@ services:
6364
redis:
6465
image: 'redis:7.4.0'
6566
container_name: redis
67+
restart: unless-stopped
6668
ports: ['6379:6379']
6769
command: ['redis-server', '--notify-keyspace-events', 'Ex']
6870
healthcheck:
@@ -74,7 +76,8 @@ services:
7476
- 'redis_data:/data'
7577
analytics:
7678
container_name: analytics
77-
image: public.ecr.aws/openops/openops-analytics:0.14.6
79+
restart: unless-stopped
80+
image: public.ecr.aws/openops/openops-analytics:0.14.7
7881
ports: ['8088:8088']
7982
environment:
8083
DATABASE_DIALECT: 'postgresql'

deploy/docker-compose/docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ services:
2424
OPS_COMPONENT: app
2525
OPS_VERSION: ${OPS_VERSION:-latest}
2626
OPS_OPENOPS_TABLES_VERSION: 0.2.17
27-
OPS_ANALYTICS_VERSION: 0.14.6
27+
OPS_ANALYTICS_VERSION: 0.14.7
2828
depends_on:
2929
openops-tables:
3030
condition: service_healthy
@@ -88,7 +88,7 @@ services:
8888
postgres:
8989
condition: service_healthy
9090
openops-analytics:
91-
image: public.ecr.aws/openops/openops-analytics:0.14.6
91+
image: public.ecr.aws/openops/openops-analytics:0.14.7
9292
restart: unless-stopped
9393
environment:
9494
ADMIN_PASSWORD: ${OPS_ANALYTICS_ADMIN_PASSWORD}

package-lock.json

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
"version": "0.100.0",
44
"rcVersion": "0.100.0",
55
"scripts": {
6-
"prepare": "[ ! -e .env ] && cp -v .env.template .env || :",
6+
"setup:husky": "husky || true",
7+
"setup:env": "[ ! -e .env ] && cp -v .env.template .env || :",
8+
"prepare": "npm run setup:env && npm run setup:husky",
79
"serve:frontend": "nx serve react-ui",
810
"build:frontend": "nx build react-ui",
911
"serve:backend": "nx run server-api:serve:development",
@@ -391,7 +393,7 @@
391393
"eslint-plugin-testing-library": "6.2.2",
392394
"eslint-plugin-vitest": "0.5.4",
393395
"generate-license-file": "4.1.0",
394-
"husky": "8.0.3",
396+
"husky": "9.1.7",
395397
"i18next-parser": "9.0.2",
396398
"inquirer": "8.2.6",
397399
"jest": "29.7.0",
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
export default {
2+
displayName: 'blocks-http',
3+
preset: '../../../jest.preset.js',
4+
setupFiles: ['../../../jest.env.js'],
5+
testEnvironment: 'node',
6+
transform: {
7+
'^.+\\.[tj]s$': ['ts-jest', { tsconfig: '<rootDir>/tsconfig.spec.json' }],
8+
},
9+
moduleFileExtensions: ['ts', 'js', 'html'],
10+
coverageDirectory: '../../../coverage/packages/blocks/http',
11+
};

packages/blocks/http/project.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,13 @@
1717
"updateBuildableProjectDepsInPackageJson": true
1818
}
1919
},
20+
"test": {
21+
"executor": "@nx/jest:jest",
22+
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
23+
"options": {
24+
"jestConfig": "packages/blocks/http/jest.config.ts"
25+
}
26+
},
2027
"lint": {
2128
"executor": "@nx/eslint:lint",
2229
"outputs": ["{options.outputFile}"]

0 commit comments

Comments
 (0)