chore: Modularise rollup config (#5238)

* Update github workflows * Test modular rollup config * Modularise rollup builds * Use svelte vite preprocessor * Fix test:types command * Fix pr.yml * Remove references/aliases * Add nx-set-shas * Test examples on PR * Fix vue example builds * Fix root tsconfig * Fix nx.json dependsOn * Better build/dev commands * Update test:pr * Fix import.meta.url warning
TanStack · Dec 29, 2023 · 72c7ed6 · 72c7ed6
1 parent 7f68e42
commit 72c7ed6
Show file tree

Hide file tree

Showing 105 changed files with 1,500 additions and 1,576 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,15 +1,19 @@
 name: ci
+
+on:
+  push:
+    branches: ['main', 'alpha', 'beta', 'rc']
+
 concurrency:
-  group: publish-${{ github.github.base_ref }}
+  group: ${{ github.workflow }}-${{ github.event.number || github.ref }}
   cancel-in-progress: true
-on: [push]
+
 jobs:
   test-and-publish:
-    if: github.event_name != 'pull_request'
-    name: 'Test & Publish'
+    name: Test & Publish
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: '0'
       - name: Setup pnpm
@@ -21,8 +25,9 @@ jobs:
         with:
           node-version-file: .nvmrc
           cache: pnpm
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
       - run: |
-          pnpm install --frozen-lockfile
           git config --global user.name 'Tanner Linsley'
           git config --global user.email 'tannerlinsley@users.noreply.github.com'
           pnpm run cipublish

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -1,12 +1,25 @@
 name: pr
-on: [pull_request]
+
+on:
+  pull_request:
+    paths-ignore:
+      - 'docs/**'
+      - 'media/**'
+      - '**/*.md'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   test:
     name: 'Test'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       - name: Setup pnpm
         uses: pnpm/action-setup@v2
         with:
@@ -18,5 +31,9 @@ jobs:
           cache: pnpm
       - name: Install Dependencies
         run: pnpm install --frozen-lockfile
+      - name: Get appropriate base and head commits for `nx affected` commands
+        uses: nrwl/nx-set-shas@v3
+        with:
+          main-branch-name: 'main'
       - name: Run Checks
-        run: pnpm run pr
+        run: pnpm run test:pr
diff --git a/examples/react/basic/tsconfig.dev.json b/examples/react/basic/tsconfig.dev.json
@@ -1,7 +1,7 @@
 {
-  "composite": true,
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.json",
   "compilerOptions": {
+    "composite": true,
     "outDir": "./build/types"
   },
   "files": ["src/main.tsx"],

diff --git a/examples/react/bootstrap/tsconfig.dev.json b/examples/react/bootstrap/tsconfig.dev.json
@@ -1,7 +1,7 @@
 {
-  "composite": true,
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.json",
   "compilerOptions": {
+    "composite": true,
     "outDir": "./build/types"
   },
   "files": ["src/main.tsx"],

diff --git a/examples/react/column-dnd/tsconfig.dev.json b/examples/react/column-dnd/tsconfig.dev.json
@@ -1,7 +1,7 @@
 {
-  "composite": true,
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.json",
   "compilerOptions": {
+    "composite": true,
     "outDir": "./build/types"
   },
   "files": ["src/main.tsx"],

diff --git a/examples/react/column-groups/tsconfig.dev.json b/examples/react/column-groups/tsconfig.dev.json
@@ -1,7 +1,7 @@
 {
-  "composite": true,
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.json",
   "compilerOptions": {
+    "composite": true,
     "outDir": "./build/types"
   },
   "files": ["src/main.tsx"],

diff --git a/examples/react/column-ordering/tsconfig.dev.json b/examples/react/column-ordering/tsconfig.dev.json
@@ -1,7 +1,7 @@
 {
-  "composite": true,
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.json",
   "compilerOptions": {
+    "composite": true,
     "outDir": "./build/types"
   },
   "files": ["src/main.tsx"],

diff --git a/examples/react/column-pinning/tsconfig.dev.json b/examples/react/column-pinning/tsconfig.dev.json
@@ -1,7 +1,7 @@
 {
-  "composite": true,
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.json",
   "compilerOptions": {
+    "composite": true,
     "outDir": "./build/types"
   },
   "files": ["src/main.tsx"],

diff --git a/examples/react/column-resizing-performant/tsconfig.dev.json b/examples/react/column-resizing-performant/tsconfig.dev.json
@@ -1,7 +1,7 @@
 {
-  "composite": true,
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.json",
   "compilerOptions": {
+    "composite": true,
     "outDir": "./build/types"
   },
   "files": ["src/main.tsx"],

diff --git a/examples/react/column-sizing/tsconfig.dev.json b/examples/react/column-sizing/tsconfig.dev.json
@@ -1,7 +1,7 @@
 {
-  "composite": true,
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.json",
   "compilerOptions": {
+    "composite": true,
     "outDir": "./build/types"
   },
   "files": ["src/main.tsx"],

diff --git a/examples/react/column-visibility/tsconfig.dev.json b/examples/react/column-visibility/tsconfig.dev.json
@@ -1,7 +1,7 @@
 {
-  "composite": true,
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.json",
   "compilerOptions": {
+    "composite": true,
     "outDir": "./build/types"
   },
   "files": ["src/main.tsx"],

diff --git a/examples/react/editable-data/tsconfig.dev.json b/examples/react/editable-data/tsconfig.dev.json
@@ -1,7 +1,7 @@
 {
-  "composite": true,
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.json",
   "compilerOptions": {
+    "composite": true,
     "outDir": "./build/types"
   },
   "files": ["src/main.tsx"],

diff --git a/examples/react/expanding/tsconfig.dev.json b/examples/react/expanding/tsconfig.dev.json
@@ -1,7 +1,7 @@
 {
-  "composite": true,
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.json",
   "compilerOptions": {
+    "composite": true,
     "outDir": "./build/types"
   },
   "files": ["src/main.tsx"],

diff --git a/examples/react/filters/tsconfig.dev.json b/examples/react/filters/tsconfig.dev.json
@@ -1,7 +1,7 @@
 {
-  "composite": true,
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.json",
   "compilerOptions": {
+    "composite": true,
     "outDir": "./build/types"
   },
   "files": ["src/main.tsx"],

diff --git a/examples/react/full-width-resizable-table/tsconfig.dev.json b/examples/react/full-width-resizable-table/tsconfig.dev.json
@@ -1,7 +1,7 @@
 {
-  "composite": true,
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.json",
   "compilerOptions": {
+    "composite": true,
     "outDir": "./build/types"
   },
   "files": ["src/main.tsx"],

diff --git a/examples/react/full-width-table/tsconfig.dev.json b/examples/react/full-width-table/tsconfig.dev.json
@@ -1,7 +1,7 @@
 {
-  "composite": true,
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.json",
   "compilerOptions": {
+    "composite": true,
     "outDir": "./build/types"
   },
   "files": ["src/main.tsx"],

diff --git a/examples/react/fully-controlled/tsconfig.dev.json b/examples/react/fully-controlled/tsconfig.dev.json
@@ -1,7 +1,7 @@
 {
-  "composite": true,
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.json",
   "compilerOptions": {
+    "composite": true,
     "outDir": "./build/types"
   },
   "files": ["src/main.tsx"],

diff --git a/examples/react/grouping/tsconfig.dev.json b/examples/react/grouping/tsconfig.dev.json
@@ -1,7 +1,7 @@
 {
-  "composite": true,
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.json",
   "compilerOptions": {
+    "composite": true,
     "outDir": "./build/types"
   },
   "files": ["src/main.tsx"],

diff --git a/examples/react/kitchen-sink/tsconfig.dev.json b/examples/react/kitchen-sink/tsconfig.dev.json
@@ -1,8 +1,8 @@
 {
-  "allowSyntheticDefaultImports": true,
-  "composite": true,
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.json",
   "compilerOptions": {
+    "allowSyntheticDefaultImports": true,
+    "composite": true,
     "outDir": "./build/types"
   },
   "jsxImportSource": "@emotion/react",

diff --git a/examples/react/material-ui-pagination/tsconfig.dev.json b/examples/react/material-ui-pagination/tsconfig.dev.json
@@ -1,7 +1,7 @@
 {
-  "composite": true,
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.json",
   "compilerOptions": {
+    "composite": true,
     "outDir": "./build/types"
   },
   "files": ["src/main.tsx"],

diff --git a/examples/react/pagination-controlled/tsconfig.dev.json b/examples/react/pagination-controlled/tsconfig.dev.json
@@ -1,7 +1,7 @@
 {
-  "composite": true,
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.json",
   "compilerOptions": {
+    "composite": true,
     "outDir": "./build/types"
   },
   "files": ["src/main.tsx"],

diff --git a/examples/react/pagination/tsconfig.dev.json b/examples/react/pagination/tsconfig.dev.json
@@ -1,7 +1,7 @@
 {
-  "composite": true,
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.json",
   "compilerOptions": {
+    "composite": true,
     "outDir": "./build/types"
   },
   "files": ["src/main.tsx"],

diff --git a/examples/react/row-dnd/tsconfig.dev.json b/examples/react/row-dnd/tsconfig.dev.json
@@ -1,7 +1,7 @@
 {
-  "composite": true,
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.json",
   "compilerOptions": {
+    "composite": true,
     "outDir": "./build/types"
   },
   "files": ["src/main.tsx"],

diff --git a/examples/react/row-pinning/tsconfig.dev.json b/examples/react/row-pinning/tsconfig.dev.json
@@ -1,7 +1,7 @@
 {
-  "composite": true,
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.json",
   "compilerOptions": {
+    "composite": true,
     "outDir": "./build/types"
   },
   "files": ["src/main.tsx"],

diff --git a/examples/react/row-selection/tsconfig.dev.json b/examples/react/row-selection/tsconfig.dev.json
@@ -1,7 +1,7 @@
 {
-  "composite": true,
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.json",
   "compilerOptions": {
+    "composite": true,
     "outDir": "./build/types"
   },
   "files": ["src/main.tsx"],

diff --git a/examples/react/sorting/tsconfig.dev.json b/examples/react/sorting/tsconfig.dev.json
@@ -1,7 +1,7 @@
 {
-  "composite": true,
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.json",
   "compilerOptions": {
+    "composite": true,
     "outDir": "./build/types"
   },
   "files": ["src/main.tsx"],

diff --git a/examples/react/sub-components/tsconfig.dev.json b/examples/react/sub-components/tsconfig.dev.json
@@ -1,7 +1,7 @@
 {
-  "composite": true,
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.json",
   "compilerOptions": {
+    "composite": true,
     "outDir": "./build/types"
   },
   "files": ["src/main.tsx"],

diff --git a/examples/react/virtualized-infinite-scrolling/tsconfig.dev.json b/examples/react/virtualized-infinite-scrolling/tsconfig.dev.json
@@ -1,7 +1,7 @@
 {
-  "composite": true,
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.json",
   "compilerOptions": {
+    "composite": true,
     "outDir": "./build/types"
   },
   "files": ["src/main.tsx"],

diff --git a/examples/react/virtualized-rows/tsconfig.dev.json b/examples/react/virtualized-rows/tsconfig.dev.json
@@ -1,7 +1,7 @@
 {
-  "composite": true,
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.json",
   "compilerOptions": {
+    "composite": true,
     "outDir": "./build/types"
   },
   "files": ["src/main.tsx"],

diff --git a/examples/solid/basic/package.json b/examples/solid/basic/package.json
@@ -10,7 +10,7 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "typescript": "5.3.3",
+    "typescript": "5.2.2",
     "vite": "^3.2.3",
     "vite-plugin-solid": "^2.2.6"
   },

diff --git a/examples/solid/basic/tsconfig.dev.json b/examples/solid/basic/tsconfig.dev.json
@@ -1,6 +1,7 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.json",
   "compilerOptions": {
+    "composite": true,
     "outDir": "./build/types",
     "jsxImportSource": "solid-js",
     "jsx": "preserve"

diff --git a/examples/solid/bootstrap/package.json b/examples/solid/bootstrap/package.json
@@ -11,7 +11,7 @@
   "license": "MIT",
   "devDependencies": {
     "@faker-js/faker": "^8.3.1",
-    "typescript": "5.3.3",
+    "typescript": "5.2.2",
     "vite": "^3.2.3",
     "vite-plugin-solid": "^2.4.0"
   },

diff --git a/examples/solid/bootstrap/tsconfig.dev.json b/examples/solid/bootstrap/tsconfig.dev.json
@@ -1,6 +1,7 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.json",
   "compilerOptions": {
+    "composite": true,
     "outDir": "./build/types",
     "jsxImportSource": "solid-js",
     "jsx": "preserve"

diff --git a/examples/solid/column-groups/package.json b/examples/solid/column-groups/package.json
@@ -10,7 +10,7 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "typescript": "5.3.3",
+    "typescript": "5.2.2",
     "vite": "^3.2.3",
     "vite-plugin-solid": "^2.2.6"
   },