Merge pull request #1501 from vishal423/bump-dependencies

chore: Bump dependencies, stick to node 16
jhipster · Nov 20, 2022 · 74c987c · 74c987c
2 parents 17e9701 + 7d53104
commit 74c987c
Show file tree

Hide file tree

Showing 9 changed files with 106 additions and 74 deletions.
diff --git a/.github/workflows/applications.yml b/.github/workflows/applications.yml
@@ -49,7 +49,7 @@ jobs:
                         'monolithic-session-maven-reactive.jdl',
                     ]
                 os: [ubuntu-latest]
-                node_version: [16.16]
+                node_version: [16.x]
         steps:
             - uses: actions/checkout@v2
             - name: Download latest chrome binary
@@ -79,9 +79,9 @@ jobs:
               uses: actions/cache@v2
               with:
                   path: |
-                      ~/.cache/Cypress/10.9.x
+                      ~/.cache/Cypress/11.1.x
                       ~/.cache/Cypress/cy
-                  key: ${{ runner.os }}-cypress-10.9.x
+                  key: ${{ runner.os }}-cypress-11.1.x
             - name: Retrieve saved Svelte Docker Image
               uses: actions/download-artifact@v2
               with:
@@ -168,7 +168,7 @@ jobs:
                         'gateway-jwt-maven-postgres-prod.jdl',
                     ]
                 os: [ubuntu-latest]
-                node_version: [16.16]
+                node_version: [16.x]
         steps:
             - uses: actions/checkout@v2
             - name: Download latest chrome binary
@@ -201,9 +201,9 @@ jobs:
               uses: actions/cache@v2
               with:
                   path: |
-                      ~/.cache/Cypress/10.9.x
+                      ~/.cache/Cypress/11.1.x
                       ~/.cache/Cypress/cy
-                  key: ${{ runner.os }}-cypress-10.9.x
+                  key: ${{ runner.os }}-cypress-11.1.x
             - name: Retrieve saved Svelte Docker Image
               uses: actions/download-artifact@v2
               with:
@@ -295,7 +295,7 @@ jobs:
             matrix:
                 apps: ['microservices-oidc-maven-prod.jdl']
                 os: [ubuntu-latest]
-                node_version: [16.16]
+                node_version: [16.x]
         steps:
             - uses: actions/checkout@v2
             - name: Download latest chrome binary
@@ -328,9 +328,9 @@ jobs:
               uses: actions/cache@v2
               with:
                   path: |
-                      ~/.cache/Cypress/10.9.x
+                      ~/.cache/Cypress/11.1.x
                       ~/.cache/Cypress/cy
-                  key: ${{ runner.os }}-cypress-10.9.x
+                  key: ${{ runner.os }}-cypress-11.1.x
             - name: Retrieve saved Svelte Docker Image
               uses: actions/download-artifact@v2
               with:
@@ -448,7 +448,7 @@ jobs:
             matrix:
                 apps: ['svelte-app-session-lighthouse.jdl']
                 os: [ubuntu-latest]
-                node_version: [16.16]
+                node_version: [16.x]
         steps:
             - uses: actions/checkout@v2
               with:
@@ -475,7 +475,7 @@ jobs:
               uses: actions/cache@v2
               with:
                   path: |
-                      ~/.cache/Cypress/10.9.x
+                      ~/.cache/Cypress/11.1.x
                       ~/.cache/Cypress/cy
                   key: ${{ runner.os }}-cypress-10.9.x
             - name: Retrieve saved Svelte Docker Image

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,16 @@
 
 ## Current
 
+### Fixed
+
+-   ✅ Fix issues observed during `npm start` execution. [#1480](https://github.com/jhipster/generator-jhipster-svelte/pull/1480)
+-   ✅ Fix GitHub Actions CI build by downgrading `node.js` to use `v16.x` in the docker image. JHipster CLI is not yet compatible with `v18.x`. [#1501](https://github.com/jhipster/generator-jhipster-svelte/pull/1501)
+
+### Changed
+
+-   ✅ Upgrade `Cypress` dependency to `11.1.x` [#1501](https://github.com/jhipster/generator-jhipster-svelte/pull/1501)
+-   ✅ Upgrade `Svelte/Kit`, `Eslint` and other third party dependencies [#1501](https://github.com/jhipster/generator-jhipster-svelte/pull/1501)
+
 ## [0.10.2] - 2022-10-2
 
 ### Changed

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:lts-alpine3.15
+FROM node:16-alpine3.15
 
 LABEL maintainer="Vishal Mahajan"
 

diff --git a/Dockerfile-release b/Dockerfile-release
@@ -1,4 +1,4 @@
-FROM node:lts-alpine3.15
+FROM node:16-alpine3.15
 
 LABEL maintainer="Vishal Mahajan"
 

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.3",
-		"@fortawesome/free-solid-svg-icons": "6.2.0"
+		"@fortawesome/free-solid-svg-icons": "6.2.1"
 	},
 	"devDependencies": {
-		"@sveltejs/adapter-static": "1.0.0-next.44",
-		"@sveltejs/kit": "1.0.0-next.517",
+		"@sveltejs/adapter-static": "1.0.0-next.48",
+		"@sveltejs/kit": "1.0.0-next.553",
 		"@testing-library/jest-dom": "5.16.5",
 		"@testing-library/svelte": "3.2.2",
-		"autoprefixer": "10.4.12",
+		"autoprefixer": "10.4.13",
 		"cross-env": "7.0.3",
-		"cypress": "10.9.0",
-		"esbuild": "0.15.11",
-		"eslint": "8.25.0",
+		"cypress": "11.1.0",
+		"esbuild": "0.15.14",
+		"eslint": "8.28.0",
 		"eslint-plugin-cypress": "2.12.1",
-		"eslint-plugin-jest-dom": "4.0.2",
+		"eslint-plugin-jest-dom": "4.0.3",
 		"eslint-plugin-svelte3": "4.0.0",
-		"eslint-plugin-testing-library": "5.7.3",
-		"husky": "8.0.1",
-		"jest": "29.2.1",
-		"jest-environment-jsdom": "29.1.2",
-		"jest-junit": "14.0.1",
+		"eslint-plugin-testing-library": "5.9.1",
+		"husky": "8.0.2",
+		"jest": "29.3.1",
+		"jest-environment-jsdom": "29.3.1",
+		"jest-junit": "15.0.0",
 		"jest-sonar": "0.2.12",
 		"jest-svelte-resolver": "1.0.0",
-		"jhipster-svelte-library": "0.9.2",
-		"postcss": "8.4.18",
+		"jhipster-svelte-library": "0.10.0",
+		"postcss": "8.4.19",
 		"prettier": "2.7.1",
-		"prettier-plugin-svelte": "2.8.0",
+		"prettier-plugin-svelte": "2.8.1",
 		"pretty-quick": "3.1.3",
 		"rimraf": "3.0.2",
-		"svelte": "3.52.0",
+		"svelte": "3.53.1",
 		"svelte-jester": "2.3.2",
-		"tailwindcss": "3.1.8",
-		"vite": "3.1.8"
+		"tailwindcss": "3.2.4",
+		"vite": "3.2.4"
 	}
 }
diff --git a/generators/client/templates/svelte/src/main/webapp/app/lib/layout/navbar.svelte.ejs b/generators/client/templates/svelte/src/main/webapp/app/lib/layout/navbar.svelte.ejs
@@ -1,6 +1,7 @@
 <script>
 	import { faBars, faSignInAlt<% if (authenticationType !== 'oauth2' && !skipUserManagement) { %>, faUserPlus<% } %> } from '@fortawesome/free-solid-svg-icons'
-
+	import { page } from '$app/stores'
+	import { browser } from '$app/environment'
 	import NavItem from 'jhipster-svelte-library/layout/nav-item.svelte'
 
 	import Icon from 'jhipster-svelte-library/icon.svelte'
@@ -16,6 +17,8 @@
 	function toggleToolbar() {
 		isToolbarOpen = !isToolbarOpen
 	}
+
+	$: pathname = $page && $page.url && $page.url.pathname
 </script>
 
 <header
@@ -41,7 +44,7 @@
 		</div>
 		<div class="flex flex-row justify-items-end items-center">
 			<div class="block sm:hidden mr-2">
-				<ThemeModeToggle />
+                <ThemeModeToggle browser="{browser}" />
 			</div>
 			<div class="sm:hidden">
 				<button
@@ -60,7 +63,7 @@
 	</div>
 	<div class:hidden="{!isToolbarOpen}" class="sm:flex sm:items-center">
 		<div class="hidden sm:block">
-			<ThemeModeToggle />
+            <ThemeModeToggle browser="{browser}" />
 		</div>
 		{#if $auth}
 			<div data-testid="svlEntityMenu" class="sm:ml-4">
@@ -86,6 +89,7 @@
 				<%_ } else { _%>
 					route="/login"
 				<%_ } _%>
+                    pathname="{pathname}"
 				/>
 			</div>
 <%_ if (authenticationType !== 'oauth2' && !skipUserManagement) { _%>
@@ -95,6 +99,7 @@
 					label="Sign up"
 					icon="{faUserPlus}"
 					route="/account/register"
+                    pathname="{pathname}"
 				/>
 			</div>
 <%_ } _%>

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.2"
+		"swagger-ui-dist": "4.15.5"
 	},
 	"devDependencies": {
 		"rollup-plugin-copy": "3.4.0"