Merge pull request #31 from peccu/update2

Update2
peccu · Feb 16, 2024 · 6dd9641 · 6dd9641
2 parents b28cea2 + 4abaceb
commit 6dd9641
Show file tree

Hide file tree

Showing 25 changed files with 87 additions and 73 deletions.
diff --git a/.dependency-cruiser.cjs b/.dependency-cruiser.cjs
@@ -350,7 +350,7 @@ module.exports = {
         If you have a 'conditionNames' attribute in your webpack config, that one will
         have precedence over the one specified here.
       */
-      conditionNames: ["import", "require", "node", "default"],
+      conditionNames: ["import", "require", "node", "default", "types"],
       /*
          The extensions, by default are the same as the ones dependency-cruiser
          can access (run `npx depcruise --info` to see which ones that are in
@@ -486,4 +486,4 @@ module.exports = {
     }
   }
 };
-// generated: dependency-cruiser@16.0.0 on 2024-01-07T14:10:04.631Z
+// generated: dependency-cruiser@16.2.0 on 2024-02-16T14:20:52.716Z
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -66,7 +66,7 @@ jobs:
     name: 'Playwright Tests : running on playwright container and report to html'
     runs-on: ubuntu-latest
     container:
-      image: mcr.microsoft.com/playwright:v1.40.1-jammy
+      image: mcr.microsoft.com/playwright:v1.41.2-jammy
     steps:
       - uses: actions/checkout@v3
       - name: install unzip
@@ -116,7 +116,7 @@ jobs:
     name: 'Playwright Tests : running on playwright container and report to github'
     runs-on: ubuntu-latest
     container:
-      image: mcr.microsoft.com/playwright:v1.40.1-jammy
+      image: mcr.microsoft.com/playwright:v1.41.2-jammy
     steps:
       - uses: actions/checkout@v3
       - name: install unzip

diff --git a/.playwright/Dockerfile b/.playwright/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/playwright:v1.40.1-jammy
+FROM mcr.microsoft.com/playwright:v1.41.2-jammy
 
 # Install bun and add it to PATH
 ENV VER_bun=v1.0.20

diff --git a/bun.lockb b/bun.lockb
diff --git a/e2e-show-report.sh b/e2e-show-report.sh
@@ -7,7 +7,7 @@ echo 'show test report with "npm run test:e2e:show-report"'
 CONTAINER_NAME=playwright
 COMMAND="bun run test:e2e:show-report"
 PORT_MAPPINGS="-p 9323:9323"
-VOLUMES="-v $(PWD)/node_modules_container:/app/node_modules"
+VOLUMES="-v $PWD/node_modules_container:/app/node_modules"
 ENVIRONMENT=""
 
 source container.sh

diff --git a/e2e-update-snapshots.sh b/e2e-update-snapshots.sh
@@ -7,7 +7,7 @@ echo 'update snapshots with "npm run build && npm run test:e2e:update-snapshots"
 CONTAINER_NAME=playwright
 COMMAND="bun run build && bun run test:e2e:update-snapshots"
 PORT_MAPPINGS="-p 9323:9323"
-VOLUMES="-v $(PWD)/node_modules_container:/app/node_modules"
+VOLUMES="-v $PWD/node_modules_container:/app/node_modules"
 ENVIRONMENT=""
 
 source container.sh

diff --git a/e2e.sh b/e2e.sh
@@ -7,7 +7,7 @@ echo 'test with "npm run build && npm run test:e2e"'
 CONTAINER_NAME=playwright
 COMMAND="bun run build && bun run test:e2e"
 PORT_MAPPINGS="-p 9323:9323"
-VOLUMES="-v $(PWD)/node_modules_container:/app/node_modules"
+VOLUMES="-v $PWD/node_modules_container:/app/node_modules"
 ENVIRONMENT="--env CI=true"
 
 source container.sh

diff --git a/e2e/tsconfig.json b/e2e/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@tsconfig/node18/tsconfig.json",
+  "extends": "@tsconfig/node20/tsconfig.json",
   "include": ["./**/*"],
   "exclude": ["./vue-app/**/*"]
 }
diff --git a/package.json b/package.json
@@ -51,47 +51,47 @@
   },
   "dependencies": {
     "pinia": "^2.1.7",
-    "vue": "^3.3.11",
+    "vue": "^3.4.15",
     "vue-router": "^4.2.5"
   },
   "devDependencies": {
-    "@playwright/test": "^1.40.1",
+    "@playwright/test": "^1.41.1",
     "@rushstack/eslint-patch": "^1.3.3",
-    "@storybook/addon-essentials": "^7.6.7",
-    "@storybook/addon-interactions": "^7.6.7",
-    "@storybook/addon-links": "^7.6.7",
-    "@storybook/blocks": "^7.6.7",
-    "@storybook/test": "^7.6.7",
-    "@storybook/vue3": "^7.6.7",
-    "@storybook/vue3-vite": "^7.6.7",
-    "@tsconfig/node18": "^18.2.2",
+    "@storybook/addon-essentials": "^7.6.16",
+    "@storybook/addon-interactions": "^7.6.16",
+    "@storybook/addon-links": "^7.6.16",
+    "@storybook/blocks": "^7.6.16",
+    "@storybook/test": "^7.6.16",
+    "@storybook/vue3": "^7.6.16",
+    "@storybook/vue3-vite": "^7.6.16",
+    "@tsconfig/node20": "^20.1.2",
     "@types/jsdom": "^21.1.6",
-    "@types/node": "^18.19.3",
-    "@vitejs/plugin-vue": "^4.5.2",
-    "@vitest/coverage-v8": "^1.1.3",
-    "@vitest/ui": "^1.1.3",
+    "@types/node": "^20.11.10",
+    "@vitejs/plugin-vue": "^5.0.3",
+    "@vitest/coverage-v8": "^1.2.2",
+    "@vitest/ui": "^1.2.2",
     "@vue/eslint-config-prettier": "^8.0.0",
     "@vue/eslint-config-typescript": "^12.0.0",
-    "@vue/test-utils": "^2.4.3",
-    "@vue/tsconfig": "^0.5.0",
-    "autoprefixer": "^10.4.16",
-    "dependency-cruiser": "^16.0.0",
+    "@vue/test-utils": "^2.4.4",
+    "@vue/tsconfig": "^0.5.1",
+    "autoprefixer": "^10.4.17",
+    "dependency-cruiser": "^16.2.0",
     "eslint": "^8.49.0",
-    "eslint-plugin-storybook": "^0.6.15",
+    "eslint-plugin-storybook": "^0.8.0",
     "eslint-plugin-vue": "^9.17.0",
-    "jsdom": "^23.0.1",
+    "jsdom": "^24.0.0",
     "npm-run-all2": "^6.1.1",
-    "oxlint": "^0.1.2",
-    "postcss": "^8.4.33",
+    "oxlint": "^0.2.8",
+    "postcss": "^8.4.35",
     "prettier": "^3.0.3",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "storybook": "^7.6.7",
+    "storybook": "^7.6.16",
     "tailwindcss": "^3.4.1",
     "typescript": "~5.3.0",
-    "vite": "^5.0.10",
-    "vitest": "^1.0.4",
-    "vue-tsc": "^1.8.25"
+    "vite": "^5.0.11",
+    "vitest": "^1.2.2",
+    "vue-tsc": "^1.8.27"
   },
   "// engines": {
     "node": "16.x"

diff --git a/playwright.config.ts b/playwright.config.ts
@@ -1,3 +1,4 @@
+import process from 'node:process'
 import { defineConfig, devices } from '@playwright/test'
 
 const webServer = (): string => {

diff --git a/tsconfig.app.json b/tsconfig.app.json
@@ -4,7 +4,8 @@
   "exclude": ["src/**/__tests__/*"],
   "compilerOptions": {
     "composite": true,
-    "noEmit": true,
+    "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
+
     "baseUrl": ".",
     "paths": {
       "@/*": ["./src/*"]

diff --git a/tsconfig.node.json b/tsconfig.node.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@tsconfig/node18/tsconfig.json",
+  "extends": "@tsconfig/node20/tsconfig.json",
   "include": [
     "vite.config.*",
     "vitest.config.*",
@@ -10,6 +10,8 @@
   "compilerOptions": {
     "composite": true,
     "noEmit": true,
+    "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo",
+
     "module": "ESNext",
     "moduleResolution": "Bundler",
     "types": ["node"]

diff --git a/tsconfig.vitest.json b/tsconfig.vitest.json
@@ -3,6 +3,8 @@
   "exclude": [],
   "compilerOptions": {
     "composite": true,
+    "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.vitest.tsbuildinfo",
+
     "lib": [],
     "types": ["node", "jsdom"]
   }

diff --git a/update-from-template.sh b/update-from-template.sh
@@ -39,7 +39,8 @@ bunx tailwindcss init -p
 patch -p0 < ../patch/tailwind.patch
 
 # This uses node.js and npm. not supported bun yet
-CI=true bunx storybook@latest init --disable-telemetry --package-manager bun --skip-install --yes
+CI=true bunx storybook@latest init --disable-telemetry --package-manager bun --yes
+rm -rf node_modules package-lock.json
 bun i
 # does not supports storybook 7
 # bun add -d @storybook/addon-postcss
@@ -57,6 +58,7 @@ patch -p0 < ../patch/my-config.patch
 
 rm -rf node_modules
 rm bun.lockb
+find . '(' -name \*.orig ')' -delete
 
 cd ..
 

diff --git a/vitestui.sh b/vitestui.sh
@@ -5,7 +5,7 @@ echo port mapping is 51204:51204
 CONTAINER_NAME=vitestui
 COMMAND="npm run test:vitestui"
 PORT_MAPPINGS="-p 51204:51204"
-VOLUMES="-v $(PWD)/node_modules_vitestui:/app/node_modules"
+VOLUMES="-v $PWD/node_modules_vitestui:/app/node_modules"
 ENVIRONMENT=""
 
 source ./container.sh

diff --git a/vrt-prepare.sh b/vrt-prepare.sh
@@ -3,7 +3,7 @@
 CONTAINER_NAME=bun-vrt-prepare
 COMMAND="bun run test:vrt:prepare"
 PORT_MAPPINGS=""
-VOLUMES="-v $(PWD)/node_modules_container:/app/node_modules"
+VOLUMES="-v $PWD/node_modules_container:/app/node_modules"
 ENVIRONMENT=""
 
 source ./container.sh

diff --git a/vrt-preview.sh b/vrt-preview.sh
@@ -10,7 +10,7 @@ echo port mapping is 4173:4173
 CONTAINER_NAME=bun-vrt-preview
 COMMAND="bun run test:vrt:preview"
 PORT_MAPPINGS="-p 4173:4173"
-VOLUMES="-v $(PWD)/node_modules_container:/app/node_modules"
+VOLUMES="-v $PWD/node_modules_container:/app/node_modules"
 ENVIRONMENT=""
 
 source ./container.sh

diff --git a/vrt.sh b/vrt.sh
@@ -8,7 +8,7 @@ echo port mapping is 9323:9323
 CONTAINER_NAME=bun-vrt
 COMMAND="bun run test:vrt"
 PORT_MAPPINGS="-p 9323:9323"
-VOLUMES="-v $(PWD)/node_modules_container:/app/node_modules"
+VOLUMES="-v $PWD/node_modules_container:/app/node_modules"
 ENVIRONMENT=""
 
 source ./container.sh

diff --git a/vue-app/.dependency-cruiser.cjs b/vue-app/.dependency-cruiser.cjs
@@ -350,7 +350,7 @@ module.exports = {
         If you have a 'conditionNames' attribute in your webpack config, that one will
         have precedence over the one specified here.
       */
-      conditionNames: ["import", "require", "node", "default"],
+      conditionNames: ["import", "require", "node", "default", "types"],
       /*
          The extensions, by default are the same as the ones dependency-cruiser
          can access (run `npx depcruise --info` to see which ones that are in
@@ -486,4 +486,4 @@ module.exports = {
     }
   }
 };
-// generated: dependency-cruiser@16.0.0 on 2024-01-07T14:10:04.631Z
+// generated: dependency-cruiser@16.2.0 on 2024-02-16T14:20:52.716Z
diff --git a/vue-app/e2e/tsconfig.json b/vue-app/e2e/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@tsconfig/node18/tsconfig.json",
+  "extends": "@tsconfig/node20/tsconfig.json",
   "include": ["./**/*"],
   "exclude": ["./vue-app/**/*"]
 }
diff --git a/vue-app/package.json b/vue-app/package.json
@@ -18,46 +18,46 @@
   },
   "dependencies": {
     "pinia": "^2.1.7",
-    "vue": "^3.3.11",
+    "vue": "^3.4.15",
     "vue-router": "^4.2.5"
   },
   "devDependencies": {
-    "@playwright/test": "^1.40.1",
+    "@playwright/test": "^1.41.1",
     "@rushstack/eslint-patch": "^1.3.3",
-    "@storybook/addon-essentials": "^7.6.7",
-    "@storybook/addon-interactions": "^7.6.7",
-    "@storybook/addon-links": "^7.6.7",
-    "@storybook/blocks": "^7.6.7",
-    "@storybook/test": "^7.6.7",
-    "@storybook/vue3": "^7.6.7",
-    "@storybook/vue3-vite": "^7.6.7",
-    "@tsconfig/node18": "^18.2.2",
+    "@storybook/addon-essentials": "^7.6.16",
+    "@storybook/addon-interactions": "^7.6.16",
+    "@storybook/addon-links": "^7.6.16",
+    "@storybook/blocks": "^7.6.16",
+    "@storybook/test": "^7.6.16",
+    "@storybook/vue3": "^7.6.16",
+    "@storybook/vue3-vite": "^7.6.16",
+    "@tsconfig/node20": "^20.1.2",
     "@types/jsdom": "^21.1.6",
-    "@types/node": "^18.19.3",
-    "@vitejs/plugin-vue": "^4.5.2",
-    "@vitest/coverage-v8": "^1.1.3",
-    "@vitest/ui": "^1.1.3",
+    "@types/node": "^20.11.10",
+    "@vitejs/plugin-vue": "^5.0.3",
+    "@vitest/coverage-v8": "^1.2.2",
+    "@vitest/ui": "^1.2.2",
     "@vue/eslint-config-prettier": "^8.0.0",
     "@vue/eslint-config-typescript": "^12.0.0",
-    "@vue/test-utils": "^2.4.3",
-    "@vue/tsconfig": "^0.5.0",
-    "autoprefixer": "^10.4.16",
-    "dependency-cruiser": "^16.0.0",
+    "@vue/test-utils": "^2.4.4",
+    "@vue/tsconfig": "^0.5.1",
+    "autoprefixer": "^10.4.17",
+    "dependency-cruiser": "^16.2.0",
     "eslint": "^8.49.0",
-    "eslint-plugin-storybook": "^0.6.15",
+    "eslint-plugin-storybook": "^0.8.0",
     "eslint-plugin-vue": "^9.17.0",
-    "jsdom": "^23.0.1",
+    "jsdom": "^24.0.0",
     "npm-run-all2": "^6.1.1",
-    "oxlint": "^0.1.2",
-    "postcss": "^8.4.33",
+    "oxlint": "^0.2.8",
+    "postcss": "^8.4.35",
     "prettier": "^3.0.3",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "storybook": "^7.6.7",
+    "storybook": "^7.6.16",
     "tailwindcss": "^3.4.1",
     "typescript": "~5.3.0",
-    "vite": "^5.0.10",
-    "vitest": "^1.0.4",
-    "vue-tsc": "^1.8.25"
+    "vite": "^5.0.11",
+    "vitest": "^1.2.2",
+    "vue-tsc": "^1.8.27"
   }
 }
diff --git a/vue-app/playwright.config.ts b/vue-app/playwright.config.ts
@@ -1,3 +1,4 @@
+import process from 'node:process'
 import { defineConfig, devices } from '@playwright/test'
 
 const webServer = (): string => {

diff --git a/vue-app/tsconfig.app.json b/vue-app/tsconfig.app.json
@@ -4,7 +4,8 @@
   "exclude": ["src/**/__tests__/*"],
   "compilerOptions": {
     "composite": true,
-    "noEmit": true,
+    "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
+
     "baseUrl": ".",
     "paths": {
       "@/*": ["./src/*"]

diff --git a/vue-app/tsconfig.node.json b/vue-app/tsconfig.node.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@tsconfig/node18/tsconfig.json",
+  "extends": "@tsconfig/node20/tsconfig.json",
   "include": [
     "vite.config.*",
     "vitest.config.*",
@@ -10,6 +10,8 @@
   "compilerOptions": {
     "composite": true,
     "noEmit": true,
+    "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo",
+
     "module": "ESNext",
     "moduleResolution": "Bundler",
     "types": ["node"]

diff --git a/vue-app/tsconfig.vitest.json b/vue-app/tsconfig.vitest.json
@@ -3,6 +3,8 @@
   "exclude": [],
   "compilerOptions": {
     "composite": true,
+    "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.vitest.tsbuildinfo",
+
     "lib": [],
     "types": ["node", "jsdom"]
   }