Merge pull request #1418 from jhipster/main

Sync release branch to prepare for next patch release
jhipster · Oct 1, 2022 · adfb019 · adfb019
2 parents 756bd49 + a16a19a
commit adfb019
Show file tree

Hide file tree

Showing 12 changed files with 91 additions and 82 deletions.
diff --git a/.github/workflows/applications.yml b/.github/workflows/applications.yml
@@ -79,9 +79,9 @@ jobs:
               uses: actions/cache@v2
               with:
                   path: |
-                      ~/.cache/Cypress/10.7.x
+                      ~/.cache/Cypress/10.9.x
                       ~/.cache/Cypress/cy
-                  key: ${{ runner.os }}-cypress-10.7.x
+                  key: ${{ runner.os }}-cypress-10.9.x
             - name: Retrieve saved Svelte Docker Image
               uses: actions/download-artifact@v2
               with:
@@ -180,7 +180,7 @@ jobs:
             - uses: actions/setup-java@v1
               with:
                   java-version: '11'
-            - uses: actions/setup-node@v1
+            - uses: actions/setup-node@v3
               with:
                   node-version: ${{ matrix.node_version }}
             - name: Gradle - Configure cache
@@ -201,9 +201,9 @@ jobs:
               uses: actions/cache@v2
               with:
                   path: |
-                      ~/.cache/Cypress/10.7.x
+                      ~/.cache/Cypress/10.9.x
                       ~/.cache/Cypress/cy
-                  key: ${{ runner.os }}-cypress-10.7.x
+                  key: ${{ runner.os }}-cypress-10.9.x
             - name: Retrieve saved Svelte Docker Image
               uses: actions/download-artifact@v2
               with:
@@ -307,7 +307,7 @@ jobs:
             - uses: actions/setup-java@v1
               with:
                   java-version: '11'
-            - uses: actions/setup-node@v1
+            - uses: actions/setup-node@v3
               with:
                   node-version: ${{ matrix.node_version }}
             - name: Gradle - Configure cache
@@ -328,9 +328,9 @@ jobs:
               uses: actions/cache@v2
               with:
                   path: |
-                      ~/.cache/Cypress/10.7.x
+                      ~/.cache/Cypress/10.9.x
                       ~/.cache/Cypress/cy
-                  key: ${{ runner.os }}-cypress-10.7.x
+                  key: ${{ runner.os }}-cypress-10.9.x
             - name: Retrieve saved Svelte Docker Image
               uses: actions/download-artifact@v2
               with:
@@ -462,7 +462,7 @@ jobs:
             - uses: actions/setup-java@v1
               with:
                   java-version: '11'
-            - uses: actions/setup-node@v1
+            - uses: actions/setup-node@v3
               with:
                   node-version: ${{ matrix.node_version }}
             - name: Maven - Configure cache
@@ -475,9 +475,9 @@ jobs:
               uses: actions/cache@v2
               with:
                   path: |
-                      ~/.cache/Cypress/10.7.x
+                      ~/.cache/Cypress/10.9.x
                       ~/.cache/Cypress/cy
-                  key: ${{ runner.os }}-cypress-10.7.x
+                  key: ${{ runner.os }}-cypress-10.9.x
             - name: Retrieve saved Svelte Docker Image
               uses: actions/download-artifact@v2
               with:

diff --git a/.github/workflows/generator.yml b/.github/workflows/generator.yml
@@ -20,7 +20,7 @@ jobs:
                 os: [ubuntu-latest]
         steps:
             - uses: actions/checkout@v2
-            - uses: actions/setup-node@v1
+            - uses: actions/setup-node@v3
               with:
                   node-version: ${{ matrix.node_version }}
             - run: npm ci

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -10,7 +10,7 @@ jobs:
         steps:
             - name: Checkout svelte generator repository
               uses: actions/checkout@v2
-            - uses: actions/setup-node@v1
+            - uses: actions/setup-node@v3
               with:
                   node-version: '16.16'
                   registry-url: 'https://registry.npmjs.org'
@@ -54,7 +54,7 @@ jobs:
         strategy:
             fail-fast: true
         steps:
-            - uses: actions/setup-node@v1
+            - uses: actions/setup-node@v3
               with:
                   node-version: '16.x'
             - name: Checkout svelte generator repository
@@ -82,5 +82,5 @@ jobs:
                   git config user.name "Vishal Mahajan"
                   git config user.email [email protected]
                   git add .
-                  git commit -m "Generated by JHipster v7.9.3 and Svelte blueprint v0.10.1"
+                  git commit -m "Generated by JHipster v7.9.3 and Svelte blueprint v0.10.2"
                   git push
diff --git a/.github/workflows/scripts/sample-svelte-app.json b/.github/workflows/scripts/sample-svelte-app.json
@@ -18,7 +18,7 @@
 		"websocket": false,
 		"databaseType": "sql",
 		"devDatabaseType": "h2Disk",
-		"prodDatabaseType": "mysql",
+		"prodDatabaseType": "postgresql",
 		"searchEngine": false,
 		"messageBroker": false,
 		"serviceDiscoveryType": false,

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,13 @@
 
 ## Current
 
+## [0.10.2] - 2022-10-2
+
+### Changed
+
+-   ✅ 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)
+-   ✅ Upgrade `Svelte/Kit`, `Eslint` and other third party dependencies [#1416](https://github.com/jhipster/generator-jhipster-svelte/pull/1416)
+
 ## [0.10.1] - 2022-09-11
 
 ### Fixed

diff --git a/Dockerfile-release b/Dockerfile-release
@@ -53,7 +53,7 @@ RUN \
 	&& echo PATH="$NPM_PATH/bin:$PATH" >> "$HOME/.profile" \
 	&& . "$HOME/.profile"
 
-RUN npm install -g --no-audit --quiet [email protected].1
+RUN npm install -g --no-audit --quiet [email protected].2
 
 WORKDIR $APP_PATH
 

diff --git a/generators/client/templates/svelte/cypress/support/commands.js.ejs b/generators/client/templates/svelte/cypress/support/commands.js.ejs
@@ -58,6 +58,7 @@ Cypress.Commands.add('loginByApi', (username, password) => {
 			validate() {
 				cy.request({ url: `api/account`,  failOnStatusCode: false }).its('status').should('eq', 200)
 			},
+			cacheAcrossSpecs: true,
 		}
 	)
 })
@@ -102,6 +103,7 @@ Cypress.Commands.add('loginByApi', (username, password) => {
 					.its('status')
 					.should('eq', 200)
 			},
+			cacheAcrossSpecs: true,
 		}
 	)
 })
@@ -182,6 +184,7 @@ Cypress.Commands.add('loginByApi', (username, password) => {
 					.its('status')
 					.should('eq', 200)
 			},
+			cacheAcrossSpecs: true,
 		}
 	)
 })

diff --git a/generators/client/templates/svelte/package.json b/generators/client/templates/svelte/package.json
@@ -1,37 +1,37 @@
 {
 	"dependencies": {
-		"date-fns": "2.29.2",
+		"date-fns": "2.29.3",
 		"@fortawesome/free-solid-svg-icons": "6.2.0"
 	},
 	"devDependencies": {
-		"@sveltejs/adapter-static": "1.0.0-next.42",
-		"@sveltejs/kit": "1.0.0-next.474",
+		"@sveltejs/adapter-static": "1.0.0-next.43",
+		"@sveltejs/kit": "1.0.0-next.506",
 		"@testing-library/jest-dom": "5.16.5",
 		"@testing-library/svelte": "3.2.1",
-		"autoprefixer": "10.4.8",
+		"autoprefixer": "10.4.12",
 		"cross-env": "7.0.3",
-		"cypress": "10.7.0",
-		"esbuild": "0.15.7",
-		"eslint": "8.23.0",
+		"cypress": "10.9.0",
+		"esbuild": "0.15.10",
+		"eslint": "8.24.0",
 		"eslint-plugin-cypress": "2.12.1",
 		"eslint-plugin-jest-dom": "4.0.2",
 		"eslint-plugin-svelte3": "4.0.0",
-		"eslint-plugin-testing-library": "5.6.2",
+		"eslint-plugin-testing-library": "5.7.0",
 		"husky": "8.0.1",
-		"jest": "29.0.2",
-		"jest-environment-jsdom": "29.0.2",
+		"jest": "29.1.2",
+		"jest-environment-jsdom": "29.1.2",
 		"jest-junit": "14.0.1",
 		"jest-sonar": "0.2.12",
 		"jest-svelte-resolver": "1.0.0",
-		"jhipster-svelte-library": "0.9.1",
-		"postcss": "8.4.16",
+		"jhipster-svelte-library": "0.9.2",
+		"postcss": "8.4.17",
 		"prettier": "2.7.1",
-		"prettier-plugin-svelte": "2.7.0",
+		"prettier-plugin-svelte": "2.7.1",
 		"pretty-quick": "3.1.3",
 		"rimraf": "3.0.2",
 		"svelte": "3.50.1",
 		"svelte-jester": "2.3.2",
 		"tailwindcss": "3.1.8",
-		"vite": "3.1.0"
+		"vite": "3.1.4"
 	}
 }
diff --git a/generators/client/templates/svelte/svelte.config.js.ejs b/generators/client/templates/svelte/svelte.config.js.ejs
@@ -11,7 +11,6 @@ const config = {
 		appDir: '_app',
 		files: {
 			assets: '<%= CLIENT_MAIN_SRC_DIR %>static',
-			hooks: '<%= CLIENT_MAIN_SRC_DIR %>hooks',
 			lib: '<%= CLIENT_MAIN_SRC_DIR %>app/lib',
 			routes: '<%= CLIENT_MAIN_SRC_DIR %>app/routes',
 			serviceWorker: '<%= CLIENT_MAIN_SRC_DIR %>app/service-worker',

diff --git a/generators/client/templates/svelte/swagger/package.json b/generators/client/templates/svelte/swagger/package.json
@@ -1,6 +1,6 @@
 {
 	"dependencies": {
-		"swagger-ui-dist": "4.14.0"
+		"swagger-ui-dist": "4.14.2"
 	},
 	"devDependencies": {
 		"rollup-plugin-copy": "3.4.0"