Merge pull request #433 from CobyPear/regen-lockfile

regenerate lockfile
pantheon-systems · Dec 2, 2022 · 0af36af · 0af36af
2 parents c85491a + a529abf
commit 0af36af
Show file tree

Hide file tree

Showing 14 changed files with 3,196 additions and 3,503 deletions.
diff --git a/.changeset/warm-fireants-push.md b/.changeset/warm-fireants-push.md
@@ -0,0 +1,5 @@
+---
+'@pantheon-systems/nextjs-kit': patch
+---
+
+Replaced `vite-plugin-dts` with `@rollup/plugin-typescript` for type bundling
diff --git a/.npmrc b/.npmrc
@@ -1,3 +1,2 @@
 lockfile-version=2
-auto-install-peers=true
 color=always
diff --git a/package.json b/package.json
@@ -112,7 +112,8 @@
 			"loader-utils@>=2.0.0 <2.0.4": ">=2.0.4",
 			"loader-utils@>=1.0.0 <1.4.2": ">=1.4.2",
 			"engine.io@>=4.0.0 <6.2.1": ">=6.2.1",
-			"decode-uri-component@<0.2.1": ">=0.2.1"
+			"decode-uri-component@<0.2.1": ">=0.2.1",
+			"graphql-compose": "<=9.0.9"
 		},
 		"peerDependencyRules": {
 			"ignoreMissing": [

diff --git a/packages/cms-kit/package.json b/packages/cms-kit/package.json
@@ -43,6 +43,7 @@
 		"@rollup/plugin-typescript": "^9.0.2",
 		"c8": "^7.12.0",
 		"eslint-plugin-prettier": "^4.2.1",
+		"prettier": "^2.8.0",
 		"vitest": "^0.23.4"
 	}
 }
diff --git a/packages/drupal-kit/package.json b/packages/drupal-kit/package.json
@@ -47,6 +47,7 @@
 		"react": "^16.8.0",
 		"react-dom": "^16.8.0",
 		"typescript": "^4.8.4",
+		"vite": "^3.1.4",
 		"vite-plugin-dts": "^1.6.1"
 	},
 	"dependencies": {

diff --git a/packages/nextjs-kit/package.json b/packages/nextjs-kit/package.json
@@ -25,8 +25,9 @@
 	},
 	"prettier": "@pantheon-systems/configs/prettier",
 	"scripts": {
-		"build": "tsc && vite build",
-		"watch": "tsc && vite build --watch",
+		"build": "pnpm clean && vite build",
+		"clean": "pnpm dlx rimraf ./dist",
+		"watch": "vite build --watch",
 		"typedoc": "typedoc",
 		"test": "vitest run",
 		"test:watch": "vitest",
@@ -40,17 +41,19 @@
 	"devDependencies": {
 		"@pantheon-systems/configs": "*",
 		"@pantheon-systems/eslint-config": "*",
+		"@rollup/plugin-typescript": "^9.0.2",
 		"@testing-library/react": "12.1.5",
 		"@vitejs/plugin-react": "^2.1.0",
 		"autoprefixer": "^10.4.12",
 		"c8": "^7.12.0",
 		"eslint-plugin-prettier": "^4.2.1",
 		"next": "^12.3.1",
 		"postcss": "^8.4.16",
+		"prettier": "^2.8.0",
 		"react": "17.0.2",
 		"react-dom": "17.0.2",
 		"tailwindcss": "^3.1.8",
-		"vite-plugin-dts": "^1.6.1",
+		"vite": "^3.1.4",
 		"vitest": "^0.23.4"
 	},
 	"peerDependencies": {

diff --git a/packages/nextjs-kit/tsconfig.json b/packages/nextjs-kit/tsconfig.json
@@ -1,6 +1,9 @@
 {
 	"extends": "../../tsconfig.json",
 	"compilerOptions": {
-		"jsx": "react-jsx"
-	}
+		"jsx": "react-jsx",
+		"declaration": true,
+		"declarationDir": "./dist"
+	},
+	"exclude": ["**/__tests__/**"]
 }
diff --git a/packages/nextjs-kit/vite.config.js b/packages/nextjs-kit/vite.config.js
@@ -1,12 +1,12 @@
 import { defineConfig } from 'vitest/config';
 import react from '@vitejs/plugin-react';
-import dts from 'vite-plugin-dts';
+import typescript from '@rollup/plugin-typescript';
 
 const globals = {
 	react: 'react',
 	'react-dom': 'reactDom',
-	'react/jsx-runtime': 'reactJsxRuntime',
 	next: 'next',
+	'react/jsx-runtime': 'jsx',
 	'next/link': 'Link',
 	'next/router': 'Router',
 };
@@ -22,7 +22,7 @@ const external = [
 /** @type {import('vite').defineConfig} */
 export default defineConfig(() => {
 	return {
-		plugins: [react(), dts({ insertTypesEntry: true })],
+		plugins: [react(), typescript()],
 		build: {
 			lib: {
 				entry: './index.ts',

diff --git a/packages/wordpress-kit/package.json b/packages/wordpress-kit/package.json
@@ -49,6 +49,7 @@
 		"@rollup/plugin-typescript": "^9.0.2",
 		"c8": "^7.12.0",
 		"msw": "^0.47.4",
+		"postcss": "^8.4.16",
 		"tailwindcss": "^3.1.8",
 		"vitest": "^0.25.2"
 	},