Skip to content

Commit adfb019

Browse files
authored
Merge pull request #1418 from jhipster/main
Sync release branch to prepare for next patch release
2 parents 756bd49 + a16a19a commit adfb019

File tree

12 files changed

+91
-82
lines changed

12 files changed

+91
-82
lines changed

.github/workflows/applications.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ jobs:
7979
uses: actions/cache@v2
8080
with:
8181
path: |
82-
~/.cache/Cypress/10.7.x
82+
~/.cache/Cypress/10.9.x
8383
~/.cache/Cypress/cy
84-
key: ${{ runner.os }}-cypress-10.7.x
84+
key: ${{ runner.os }}-cypress-10.9.x
8585
- name: Retrieve saved Svelte Docker Image
8686
uses: actions/download-artifact@v2
8787
with:
@@ -180,7 +180,7 @@ jobs:
180180
- uses: actions/setup-java@v1
181181
with:
182182
java-version: '11'
183-
- uses: actions/setup-node@v1
183+
- uses: actions/setup-node@v3
184184
with:
185185
node-version: ${{ matrix.node_version }}
186186
- name: Gradle - Configure cache
@@ -201,9 +201,9 @@ jobs:
201201
uses: actions/cache@v2
202202
with:
203203
path: |
204-
~/.cache/Cypress/10.7.x
204+
~/.cache/Cypress/10.9.x
205205
~/.cache/Cypress/cy
206-
key: ${{ runner.os }}-cypress-10.7.x
206+
key: ${{ runner.os }}-cypress-10.9.x
207207
- name: Retrieve saved Svelte Docker Image
208208
uses: actions/download-artifact@v2
209209
with:
@@ -307,7 +307,7 @@ jobs:
307307
- uses: actions/setup-java@v1
308308
with:
309309
java-version: '11'
310-
- uses: actions/setup-node@v1
310+
- uses: actions/setup-node@v3
311311
with:
312312
node-version: ${{ matrix.node_version }}
313313
- name: Gradle - Configure cache
@@ -328,9 +328,9 @@ jobs:
328328
uses: actions/cache@v2
329329
with:
330330
path: |
331-
~/.cache/Cypress/10.7.x
331+
~/.cache/Cypress/10.9.x
332332
~/.cache/Cypress/cy
333-
key: ${{ runner.os }}-cypress-10.7.x
333+
key: ${{ runner.os }}-cypress-10.9.x
334334
- name: Retrieve saved Svelte Docker Image
335335
uses: actions/download-artifact@v2
336336
with:
@@ -462,7 +462,7 @@ jobs:
462462
- uses: actions/setup-java@v1
463463
with:
464464
java-version: '11'
465-
- uses: actions/setup-node@v1
465+
- uses: actions/setup-node@v3
466466
with:
467467
node-version: ${{ matrix.node_version }}
468468
- name: Maven - Configure cache
@@ -475,9 +475,9 @@ jobs:
475475
uses: actions/cache@v2
476476
with:
477477
path: |
478-
~/.cache/Cypress/10.7.x
478+
~/.cache/Cypress/10.9.x
479479
~/.cache/Cypress/cy
480-
key: ${{ runner.os }}-cypress-10.7.x
480+
key: ${{ runner.os }}-cypress-10.9.x
481481
- name: Retrieve saved Svelte Docker Image
482482
uses: actions/download-artifact@v2
483483
with:

.github/workflows/generator.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
os: [ubuntu-latest]
2121
steps:
2222
- uses: actions/checkout@v2
23-
- uses: actions/setup-node@v1
23+
- uses: actions/setup-node@v3
2424
with:
2525
node-version: ${{ matrix.node_version }}
2626
- run: npm ci

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
steps:
1111
- name: Checkout svelte generator repository
1212
uses: actions/checkout@v2
13-
- uses: actions/setup-node@v1
13+
- uses: actions/setup-node@v3
1414
with:
1515
node-version: '16.16'
1616
registry-url: 'https://registry.npmjs.org'
@@ -54,7 +54,7 @@ jobs:
5454
strategy:
5555
fail-fast: true
5656
steps:
57-
- uses: actions/setup-node@v1
57+
- uses: actions/setup-node@v3
5858
with:
5959
node-version: '16.x'
6060
- name: Checkout svelte generator repository
@@ -82,5 +82,5 @@ jobs:
8282
git config user.name "Vishal Mahajan"
8383
git config user.email [email protected]
8484
git add .
85-
git commit -m "Generated by JHipster v7.9.3 and Svelte blueprint v0.10.1"
85+
git commit -m "Generated by JHipster v7.9.3 and Svelte blueprint v0.10.2"
8686
git push

.github/workflows/scripts/sample-svelte-app.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"websocket": false,
1919
"databaseType": "sql",
2020
"devDatabaseType": "h2Disk",
21-
"prodDatabaseType": "mysql",
21+
"prodDatabaseType": "postgresql",
2222
"searchEngine": false,
2323
"messageBroker": false,
2424
"serviceDiscoveryType": false,

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,13 @@
44
55
## Current
66

7+
## [0.10.2] - 2022-10-2
8+
9+
### Changed
10+
11+
- ✅ Upgrade `Cypress` dependency to `10.9.x`. Use `cacheAcrossSpecs` option to cache session across specs [#1416](https://github.com/jhipster/generator-jhipster-svelte/pull/1416)
12+
- ✅ Upgrade `Svelte/Kit`, `Eslint` and other third party dependencies [#1416](https://github.com/jhipster/generator-jhipster-svelte/pull/1416)
13+
714
## [0.10.1] - 2022-09-11
815

916
### Fixed

Dockerfile-release

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ RUN \
5353
&& echo PATH="$NPM_PATH/bin:$PATH" >> "$HOME/.profile" \
5454
&& . "$HOME/.profile"
5555

56-
RUN npm install -g --no-audit --quiet [email protected].1
56+
RUN npm install -g --no-audit --quiet [email protected].2
5757

5858
WORKDIR $APP_PATH
5959

generators/client/templates/svelte/cypress/support/commands.js.ejs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ Cypress.Commands.add('loginByApi', (username, password) => {
5858
validate() {
5959
cy.request({ url: `api/account`, failOnStatusCode: false }).its('status').should('eq', 200)
6060
},
61+
cacheAcrossSpecs: true,
6162
}
6263
)
6364
})
@@ -102,6 +103,7 @@ Cypress.Commands.add('loginByApi', (username, password) => {
102103
.its('status')
103104
.should('eq', 200)
104105
},
106+
cacheAcrossSpecs: true,
105107
}
106108
)
107109
})
@@ -182,6 +184,7 @@ Cypress.Commands.add('loginByApi', (username, password) => {
182184
.its('status')
183185
.should('eq', 200)
184186
},
187+
cacheAcrossSpecs: true,
185188
}
186189
)
187190
})
Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
11
{
22
"dependencies": {
3-
"date-fns": "2.29.2",
3+
"date-fns": "2.29.3",
44
"@fortawesome/free-solid-svg-icons": "6.2.0"
55
},
66
"devDependencies": {
7-
"@sveltejs/adapter-static": "1.0.0-next.42",
8-
"@sveltejs/kit": "1.0.0-next.474",
7+
"@sveltejs/adapter-static": "1.0.0-next.43",
8+
"@sveltejs/kit": "1.0.0-next.506",
99
"@testing-library/jest-dom": "5.16.5",
1010
"@testing-library/svelte": "3.2.1",
11-
"autoprefixer": "10.4.8",
11+
"autoprefixer": "10.4.12",
1212
"cross-env": "7.0.3",
13-
"cypress": "10.7.0",
14-
"esbuild": "0.15.7",
15-
"eslint": "8.23.0",
13+
"cypress": "10.9.0",
14+
"esbuild": "0.15.10",
15+
"eslint": "8.24.0",
1616
"eslint-plugin-cypress": "2.12.1",
1717
"eslint-plugin-jest-dom": "4.0.2",
1818
"eslint-plugin-svelte3": "4.0.0",
19-
"eslint-plugin-testing-library": "5.6.2",
19+
"eslint-plugin-testing-library": "5.7.0",
2020
"husky": "8.0.1",
21-
"jest": "29.0.2",
22-
"jest-environment-jsdom": "29.0.2",
21+
"jest": "29.1.2",
22+
"jest-environment-jsdom": "29.1.2",
2323
"jest-junit": "14.0.1",
2424
"jest-sonar": "0.2.12",
2525
"jest-svelte-resolver": "1.0.0",
26-
"jhipster-svelte-library": "0.9.1",
27-
"postcss": "8.4.16",
26+
"jhipster-svelte-library": "0.9.2",
27+
"postcss": "8.4.17",
2828
"prettier": "2.7.1",
29-
"prettier-plugin-svelte": "2.7.0",
29+
"prettier-plugin-svelte": "2.7.1",
3030
"pretty-quick": "3.1.3",
3131
"rimraf": "3.0.2",
3232
"svelte": "3.50.1",
3333
"svelte-jester": "2.3.2",
3434
"tailwindcss": "3.1.8",
35-
"vite": "3.1.0"
35+
"vite": "3.1.4"
3636
}
3737
}

generators/client/templates/svelte/svelte.config.js.ejs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ const config = {
1111
appDir: '_app',
1212
files: {
1313
assets: '<%= CLIENT_MAIN_SRC_DIR %>static',
14-
hooks: '<%= CLIENT_MAIN_SRC_DIR %>hooks',
1514
lib: '<%= CLIENT_MAIN_SRC_DIR %>app/lib',
1615
routes: '<%= CLIENT_MAIN_SRC_DIR %>app/routes',
1716
serviceWorker: '<%= CLIENT_MAIN_SRC_DIR %>app/service-worker',

generators/client/templates/svelte/swagger/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"dependencies": {
3-
"swagger-ui-dist": "4.14.0"
3+
"swagger-ui-dist": "4.14.2"
44
},
55
"devDependencies": {
66
"rollup-plugin-copy": "3.4.0"

0 commit comments

Comments
 (0)