Skip to content

Commit 5ecda1d

Browse files
authored
feat: apply cumulative update (#5444)
1 parent 3a7e950 commit 5ecda1d

File tree

208 files changed

+5581
-2105
lines changed

Some content is hidden

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

208 files changed

+5581
-2105
lines changed

.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ REACT_APP_COMPACT_BUNDLE=true
1515
# REACT_APP_DEFINITION_URL=https://petstore.swagger.io/v2/swagger.json
1616

1717
# AsyncAPI 2.x.x remote absolute URI
18-
REACT_APP_DEFINITION_URL=https://raw.githubusercontent.com/asyncapi/spec/v2.6.0/examples/streetlights-kafka.yml
18+
# REACT_APP_DEFINITION_URL=https://raw.githubusercontent.com/asyncapi/spec/v2.6.0/examples/streetlights-kafka.yml
1919

2020
REACT_APP_VERSION=$npm_package_version
2121

.eslintrc

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
"no-nested-ternary": "off",
3838
"prettier/prettier": "error",
3939
"react/react-in-jsx-scope": 0,
40+
"react/require-default-props": "off",
4041
"react/function-component-definition": [1, {
4142
"namedComponents": ["arrow-function"]
4243
}],
@@ -47,13 +48,9 @@
4748
"ignore": [
4849
// https://github.com/import-js/eslint-plugin-import/issues/1810
4950
"^monaco-marker-data-provider$",
50-
"^monaco-languageclient\/monaco-converter$",
51-
"^vscode\/services$",
52-
"^vscode\/extensions$",
53-
"^vscode\/vscode",
54-
"^vscode\/service-override",
5551
"^plugins\/.+\/index.js",
56-
"^presets\/.+\/index.js"
52+
"^presets\/.+\/index.js",
53+
"^@codingame\/monaco-vscode-api"
5754
]
5855
}]
5956
}

.github/dependabot.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,11 @@ updates:
4646
prefix: "chore"
4747
include: "scope"
4848
open-pull-requests-limit: 3
49+
ignore:
50+
# do not update react-scripts as we use forked version of Create React App via git submodule
51+
- dependency-name: "create-react-app/packages/react-scripts"
52+
- dependency-name: "react-scripts"
53+
4954

5055
- package-ecosystem: "docker"
5156
# Look for a `Dockerfile` in the `root` directory

.github/workflows/build.yml

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,12 @@ jobs:
1818
with:
1919
submodules: true
2020

21-
- name: Use Node.js 20
21+
- name: Use Node.js 22
2222
uses: actions/setup-node@v4
2323
with:
24-
node-version: 20
25-
26-
- name: Cache npm cache files
27-
id: cache-npm-cache-files
28-
uses: actions/cache@v4
29-
with:
30-
path: ~/.npm
31-
key: npm-cache-${{ runner.os }}-${{ hashFiles('package-lock.json') }}
32-
- name: Cache Cypress binary
33-
id: cache-cypress-binary
34-
uses: actions/cache@v4
35-
with:
36-
path: cypress/cache
37-
key: cypress-binary-${{ hashFiles('package-lock.json') }}
24+
node-version: 22
25+
cache: npm
26+
cache-dependency-path: package-lock.json
3827

3928
- name: Install dependencies
4029
run: npm ci
@@ -54,12 +43,12 @@ jobs:
5443
- name: Build App artifacts
5544
run: npm run build:app
5645

57-
- name: E2E Tests
58-
run: npm run cy:ci
59-
6046
- name: Upload build artifacts
6147
if: github.ref == 'refs/heads/next'
6248
uses: actions/upload-artifact@v4
6349
with:
6450
name: build
6551
path: ./build
52+
53+
- name: E2E Tests
54+
run: npm run cy:ci

.github/workflows/docker-build-push.yml

Lines changed: 12 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -12,37 +12,26 @@ jobs:
1212

1313
build-push:
1414
if: github.event.workflow_run.conclusion == 'success'
15-
name: Build & Push SwaggerEditor@next Docker imageq
15+
name: Build & Push SwaggerEditor@next Docker image
1616
runs-on: ubuntu-latest
1717

1818
steps:
1919
- uses: actions/checkout@v4
2020
with:
2121
ref: next
2222

23-
- name: Download build artifact
24-
uses: actions/github-script@v7
23+
- name: Use Node.js 22
24+
uses: actions/setup-node@v4
2525
with:
26-
script: |
27-
const allArtifacts = await github.rest.actions.listWorkflowRunArtifacts({
28-
owner: context.repo.owner,
29-
repo: context.repo.repo,
30-
run_id: context.payload.workflow_run.id,
31-
});
32-
const matchArtifact = allArtifacts.data.artifacts.filter((artifact) => {
33-
return artifact.name == "build"
34-
})[0];
35-
const download = await github.rest.actions.downloadArtifact({
36-
owner: context.repo.owner,
37-
repo: context.repo.repo,
38-
artifact_id: matchArtifact.id,
39-
archive_format: 'zip',
40-
});
41-
const fs = require('fs');
42-
fs.writeFileSync('${{github.workspace}}/build.zip', Buffer.from(download.data));
43-
- run: |
44-
mkdir build
45-
unzip build.zip -d build
26+
node-version: 22
27+
cache: npm
28+
cache-dependency-path: package-lock.json
29+
30+
- name: Install dependencies
31+
run: npm ci
32+
33+
- name: Build App artifacts
34+
run: npm run build:app
4635

4736
- name: Determine released version
4837
uses: actions/github-script@v7

.github/workflows/nightly-build.yml

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,12 @@ jobs:
1919
submodules: true
2020
ref: next
2121

22-
- name: Use Node.js 20
22+
- name: Use Node.js 22
2323
uses: actions/setup-node@v4
2424
with:
25-
node-version: 20
26-
27-
- name: Cache npm cache files
28-
id: cache-npm-cache-files
29-
uses: actions/cache@v4
30-
with:
31-
path: ~/.npm
32-
key: npm-cache-${{ runner.os }}-${{ hashFiles('package-lock.json') }}
33-
- name: Cache Cypress binary
34-
id: cache-cypress-binary
35-
uses: actions/cache@v4
36-
with:
37-
path: cypress/cache
38-
key: cypress-binary-${{ hashFiles('package-lock.json') }}
25+
node-version: 22
26+
cache: npm
27+
cache-dependency-path: package-lock.json
3928

4029
- name: Install dependencies
4130
run: npm ci

.github/workflows/release.yml

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@ jobs:
1717
submodules: true
1818
ref: next
1919

20+
- name: Setup Node.js
21+
uses: actions/setup-node@v4
22+
with:
23+
node-version: 20
24+
2025
- name: Determine the next release version
2126
uses: cycjimmy/semantic-release-action@v4
2227
with:
@@ -35,11 +40,6 @@ jobs:
3540
script: |
3641
core.setFailed('Nothing to release')
3742
38-
- name: Setup Node.js
39-
uses: actions/setup-node@v4
40-
with:
41-
node-version: 20
42-
4343
- name: Install dependencies
4444
run: npm ci
4545

@@ -49,7 +49,6 @@ jobs:
4949
run: |
5050
npm run lint
5151
npm run test
52-
npm run build:app
5352
npm run cy:ci
5453
npm run build:bundle:esm
5554
npm run build:bundle:umd
@@ -79,13 +78,6 @@ jobs:
7978
echo ${{ steps.semantic.outputs.new_release_minor_version }}
8079
echo ${{ steps.semantic.outputs.new_release_patch_version }}
8180
82-
- name: Upload build artifacts
83-
uses: actions/upload-artifact@v4
84-
with:
85-
name: build
86-
path: ./build
87-
88-
8981
- name: Prepare released version for uploading
9082
shell: bash
9183
run: |

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20.3.0
1+
22.11.0

Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@ FROM nginx:1.27.5-alpine
33
LABEL maintainer="[email protected]" \
44
org.opencontainers.image.authors="[email protected]" \
55
org.opencontainers.image.url="https://editor-next.swagger.io" \
6-
org.opencontainers.image.source="https://github.com/swagger-api/swagger-editor/tree/next"
6+
org.opencontainers.image.source="https://github.com/swagger-api/swagger-editor/tree/next" \
7+
org.opencontainers.image.description="SwaggerEditor@5 Docker image" \
8+
org.opencontainers.image.licenses="Apache-2.0"
9+
710

811
RUN apk update && apk add --no-cache "tiff>=4.4.0-r4"
912

Dockerfile.unprivileged

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM nginxinc/nginx-unprivileged:1.27.5-alpine
1+
FROM nginxinc/nginx-unprivileged:1.27.4-alpine
22

33
LABEL maintainer="[email protected]" \
44
org.opencontainers.image.authors="[email protected]" \

0 commit comments

Comments
 (0)