Consolidate deps to monorepo root, update vite, vitest, msw, tsup

pantheon-systems · Dec 12, 2023 · 2dfa492 · 2dfa492
1 parent 6b8a397
commit 2dfa492
Show file tree

Hide file tree

Showing 21 changed files with 1,545 additions and 2,940 deletions.
diff --git a/.changeset/rude-buckets-remember.md b/.changeset/rude-buckets-remember.md
@@ -0,0 +1,14 @@
+---
+'create-pantheon-decoupled-kit': patch
+'@pantheon-systems/decoupled-kit-health-check': patch
+'@pantheon-systems/eslint-config-decoupled-kit': patch
+'@pantheon-systems/decoupled-kit-configs': patch
+'@pantheon-systems/wordpress-kit': patch
+'@pantheon-systems/drupal-kit': patch
+'@pantheon-systems/nextjs-kit': patch
+'@pantheon-systems/react-kit': patch
+'@pantheon-systems/cms-kit': patch
+'@pantheon-systems/eslint-config': patch
+---
+
+Update dependencies
diff --git a/package.json b/package.json
@@ -62,17 +62,30 @@
 		"@pantheon-systems/eslint-config-decoupled-kit": "workspace:*",
 		"@pantheon-systems/workspace-configs": "workspace:*",
 		"@playwright/test": "^1.38.1",
+		"@testing-library/react": "^14.1.2",
 		"@types/eslint": "^8.44.3",
 		"@types/node": "^18.18.0",
+		"@types/react": "^18.2.43",
+		"@types/react-dom": "^18.2.17",
+		"@vitest/coverage-v8": "^1.0.4",
+		"esbuild": "^0.19.9",
 		"eslint": "^8.50.0",
+		"eslint-plugin-prettier": "^5.0.0",
+		"eslint-plugin-tailwindcss": "^3.13.0",
 		"husky": "^8.0.3",
 		"lint-staged": "^14.0.1",
+		"msw": "^2.0.11",
 		"prettier": "^3.0.3",
+		"react": "^18.2.0",
+		"react-dom": "^18.2.0",
+		"rimraf": "^5.0.5",
 		"tslib": "^2.6.2",
+		"tsup": "^8.0.1",
 		"tsx": "^3.13.0",
 		"typedoc": "^0.25.1",
 		"typescript": "^5.2.2",
-		"vite": "^4.5.0"
+		"vite": "^5.0.8",
+		"vitest": "^1.0.4"
 	},
 	"packageManager": "[email protected]",
 	"pnpm": {

diff --git a/packages/cms-kit/package.json b/packages/cms-kit/package.json
@@ -51,11 +51,6 @@
 	},
 	"devDependencies": {
 		"@pantheon-systems/eslint-config": "*",
-		"@pantheon-systems/workspace-configs": "*",
-		"@vitest/coverage-v8": "^0.34.5",
-		"prettier": "^3.0.3",
-		"rimraf": "^5.0.4",
-		"tsup": "^7.2.0",
-		"vitest": "^0.34.5"
+		"@pantheon-systems/workspace-configs": "*"
 	}
 }
diff --git a/packages/cms-kit/vite.config.js → packages/cms-kit/vite.config.mts b/packages/cms-kit/vite.config.js → packages/cms-kit/vite.config.mts
@@ -1,6 +1,5 @@
 import { defineConfig } from 'vitest/config';
 
-/** @type {import('vitest').defineConfig} */
 export default defineConfig(() => {
 	return {
 		test: {

diff --git a/packages/create-pantheon-decoupled-kit/esbuild.js b/packages/create-pantheon-decoupled-kit/esbuild.js
@@ -1,7 +1,6 @@
-import { build } from 'esbuild';
 import chalk from 'chalk';
+import { build } from 'esbuild';
 import { glob } from 'glob';
-import tsPaths from 'esbuild-ts-paths';
 
 /** @type {import('esbuild').BuildOptions} */
 const buildOptions = {
@@ -25,8 +24,6 @@ const buildOptions = {
 	supported: {
 		'import-assertions': true,
 	},
-	// eslint-disable-next-line @typescript-eslint/no-unsafe-call
-	plugins: [tsPaths('./tsconfig.json')],
 };
 try {
 	await build(buildOptions);

diff --git a/packages/create-pantheon-decoupled-kit/package.json b/packages/create-pantheon-decoupled-kit/package.json
@@ -55,17 +55,10 @@
 		"@types/minimist": "^1.2.2",
 		"@types/which-pm-runs": "^1.0.0",
 		"chalk": "^5.3.0",
-		"chokidar": "^3.5.3",
-		"esbuild": "0.19.3",
-		"esbuild-ts-paths": "^1.1.3",
-		"prettier": "^3.0.3",
-		"rimraf": "^5.0.4",
-		"tsx": "^3.13.0",
-		"vitest": "^0.34.5"
+		"chokidar": "^3.5.3"
 	},
 	"dependencies": {
 		"@csstools/postcss-global-data": "^2.1.0",
-		"@vitest/coverage-v8": "^0.34.5",
 		"autoprefixer": "^10.4.16",
 		"diff": "^5.1.0",
 		"fs-extra": "^11.1.1",

diff --git a/packages/create-pantheon-decoupled-kit/tsconfig.json b/packages/create-pantheon-decoupled-kit/tsconfig.json
@@ -2,10 +2,11 @@
 	"extends": "../../tsconfig.json",
 	"compilerOptions": {
 		"types": ["vitest/globals"],
-		"baseUrl": "./",
 		"paths": {
-			"@cli/*": ["./src/*"],
-			"@partials/*": ["./src/templates/partials/*"]
+			"@cli/*": ["./create-pantheon-decoupled-kit/src/*"],
+			"@partials/*": [
+				"./create-pantheon-decoupled-kit/src/templates/partials/*"
+			]
 		}
 	}
 }
diff --git a/packages/create-pantheon-decoupled-kit/tsconfig.typedoc.json b/packages/create-pantheon-decoupled-kit/tsconfig.typedoc.json
@@ -3,10 +3,11 @@
 	"compilerOptions": {
 		"types": ["vitest/globals"],
 		"jsx": "react-jsx",
-		"baseUrl": "./",
 		"paths": {
-			"@cli/*": ["./src/*"],
-			"@partials/*": ["./src/templates/partials/*"]
+			"@cli/*": ["./create-pantheon-decoupled-kit/src/*"],
+			"@partials/*": [
+				"./create-pantheon-decoupled-kit/src/templates/partials/*"
+			]
 		}
 	},
 	"exclude": [

diff --git a/...ate-pantheon-decoupled-kit/vite.config.js → ...te-pantheon-decoupled-kit/vite.config.mts b/...ate-pantheon-decoupled-kit/vite.config.js → ...te-pantheon-decoupled-kit/vite.config.mts
@@ -1,7 +1,6 @@
 import path from 'node:path';
 import { defineConfig } from 'vitest/config';
 
-/** @type {import('vite').defineConfig} */
 export default defineConfig(() => {
 	return {
 		plugins: [
@@ -12,7 +11,6 @@ export default defineConfig(() => {
 				// This can likely be removed once vitest has this support.
 				name: 'remove-import-assertion',
 				transform: (code) => {
-					const stringToFind = `const { default: pkg } = await import(pkgPath, {`;
 					const replace =
 						/const { default: pkg } = await import\(pkgPath, {[\n\t\s]*assert: { type: "json" }[\n\t\s]*}\)/gm;
 					if (replace.test(code)) {

diff --git a/packages/decoupled-kit-health-check/package.json b/packages/decoupled-kit-health-check/package.json
@@ -32,13 +32,7 @@
 	},
 	"devDependencies": {
 		"@pantheon-systems/eslint-config": "*",
-		"@pantheon-systems/workspace-configs": "*",
-		"@types/node": "^18.18.0",
-		"@vitest/coverage-v8": "^0.34.5",
-		"esbuild": "^0.19.3",
-		"msw": "0.0.0-fetch.rc-17",
-		"rimraf": "^5.0.4",
-		"vitest": "^0.34.5"
+		"@pantheon-systems/workspace-configs": "*"
 	},
 	"dependencies": {
 		"dotenv": "^16.3.1",

diff --git a/packages/decoupled-kit-health-check/tsconfig.json b/packages/decoupled-kit-health-check/tsconfig.json
@@ -5,7 +5,7 @@
 	},
 	"include": [
 		"src/**/*.ts",
-		"vite.config.ts",
+		"vite.config.mts",
 		"__tests__/vitest.d.ts",
 		"__tests__/**/*.test.ts"
 	]

diff --git a/...decoupled-kit-health-check/vite.config.ts → ...ecoupled-kit-health-check/vite.config.mts b/...decoupled-kit-health-check/vite.config.ts → ...ecoupled-kit-health-check/vite.config.mts
diff --git a/packages/drupal-kit/package.json b/packages/drupal-kit/package.json
@@ -44,12 +44,9 @@
 		"@pantheon-systems/eslint-config": "*",
 		"@pantheon-systems/workspace-configs": "*",
 		"@types/isomorphic-fetch": "^0.0.36",
-		"@vitest/coverage-v8": "^0.34.5",
 		"isomorphic-fetch": "^3.0.0",
 		"jsona": "^1.12.1",
-		"msw": "^1.3.1",
-		"rimraf": "^5.0.4",
-		"vitest": "^0.34.5"
+		"msw": "^1.3.1"
 	},
 	"dependencies": {
 		"@gdwc/drupal-state": "4.2.3",

diff --git a/packages/drupal-kit/vite.config.js → packages/drupal-kit/vite.config.mts b/packages/drupal-kit/vite.config.js → packages/drupal-kit/vite.config.mts
@@ -12,7 +12,6 @@ const external = [
 	'@pantheon-systems/cms-kit',
 ];
 
-/** @type {import('vite').defineConfig} */
 export default defineConfig(() => {
 	return {
 		build: {

diff --git a/packages/nextjs-kit/package.json b/packages/nextjs-kit/package.json
@@ -81,27 +81,17 @@
 		"@pantheon-systems/eslint-config": "*",
 		"@pantheon-systems/workspace-configs": "*",
 		"@tailwindcss/typography": "^0.5.10",
-		"@testing-library/react": "14.0.0",
-		"@types/react": "^18.2.28",
-		"@types/react-dom": "^18.2.13",
-		"@vitest/coverage-v8": "^0.34.5",
 		"autoprefixer": "^10.4.16",
 		"eslint-plugin-prettier": "^5.0.0",
 		"jsdom": "^22.1.0",
 		"next": "^13.5.6",
 		"postcss": "^8.4.30",
-		"prettier": "^3.0.3",
-		"react": "18.2.0",
-		"react-dom": "18.2.0",
-		"rimraf": "^5.0.4",
-		"tailwindcss": "^3.3.3",
-		"tsup": "^7.2.0",
-		"vitest": "^0.34.5"
+		"tailwindcss": "^3.3.3"
 	},
 	"peerDependencies": {
 		"next": "^13.5.6",
-		"react": "18.2.0",
-		"react-dom": "18.2.0",
+		"react": "^18.2.0",
+		"react-dom": "^18.2.0",
 		"tailwindcss": "^3.3.2"
 	}
 }
diff --git a/packages/nextjs-kit/vite.config.js → packages/nextjs-kit/vite.config.mts b/packages/nextjs-kit/vite.config.js → packages/nextjs-kit/vite.config.mts
@@ -1,6 +1,5 @@
 import { defineConfig } from 'vitest/config';
 
-/** @type {import('vitest/config').defineConfig} */
 export default defineConfig(() => {
 	return {
 		test: {