Merge branch 'main' into update-size-spacing-pages

jpmorganchase · Sep 19, 2023 · 329af40 · 329af40
2 parents 81ddadc + 7cef67a
commit 329af40
Show file tree

Hide file tree

Showing 92 changed files with 2,330 additions and 2,032 deletions.
diff --git a/.changeset/clever-garlics-rescue.md b/.changeset/clever-garlics-rescue.md
diff --git a/.changeset/cuddly-kings-count.md b/.changeset/cuddly-kings-count.md
diff --git a/.changeset/early-dogs-itch.md b/.changeset/early-dogs-itch.md
diff --git a/.changeset/empty-pumpkins-shout.md b/.changeset/empty-pumpkins-shout.md
diff --git a/.changeset/empty-tips-thank.md b/.changeset/empty-tips-thank.md
diff --git a/.changeset/few-rockets-unite.md b/.changeset/few-rockets-unite.md
diff --git a/.changeset/funny-ways-argue.md b/.changeset/funny-ways-argue.md
diff --git a/.changeset/kind-humans-explode.md b/.changeset/kind-humans-explode.md
diff --git a/.changeset/late-beds-melt.md b/.changeset/late-beds-melt.md
diff --git a/.changeset/lovely-taxis-glow.md b/.changeset/lovely-taxis-glow.md
diff --git a/.changeset/pink-bees-greet.md b/.changeset/pink-bees-greet.md
diff --git a/.changeset/proud-ducks-swim.md b/.changeset/proud-ducks-swim.md
diff --git a/.changeset/silver-goats-grow.md b/.changeset/silver-goats-grow.md
diff --git a/.changeset/stupid-turkeys-exercise.md b/.changeset/stupid-turkeys-exercise.md
diff --git a/.changeset/two-bobcats-cross.md b/.changeset/two-bobcats-cross.md
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -4,8 +4,9 @@ module.exports = {
   parserOptions: {
     project: [
       "./tsconfig.json",
-      "./packages/*/tsconfig.json",
+      "./cypress/tsconfig.json",
       "./site/tsconfig.json",
+      "playground/*/tsconfig.json",
     ],
   },
   plugins: ["@typescript-eslint", "eslint-plugin-local-rules"],
@@ -16,6 +17,7 @@ module.exports = {
     "plugin:react-hooks/recommended",
     "prettier",
     "plugin:storybook/recommended",
+    "plugin:import/typescript", // Or Error: Unable to resolve path to module
   ],
   rules: {
     "import/no-extraneous-dependencies": "off",
@@ -66,4 +68,5 @@ module.exports = {
       version: "detect",
     },
   },
+  ignorePatterns: [".eslintrc.js", "**/vite.config.ts"],
 };
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -91,7 +91,7 @@ jobs:
           cache: "yarn"
       - name: Install dependencies
         run: yarn
-      - run: yarn run test --watchAll=false
+      - run: yarn run test
   cypress-tests:
     strategy:
       fail-fast: false

diff --git a/modular/setupEnvironment.ts b/modular/setupEnvironment.ts
diff --git a/modular/setupTests.ts b/modular/setupTests.ts
diff --git a/package.json b/package.json
@@ -27,7 +27,7 @@
     "build:window": "modular build @salt-ds/window",
     "build:styles": "modular build @salt-ds/styles",
     "build:ag-grid-theme": "yarn workspace @salt-ds/ag-grid-theme build",
-    "test": "modular test",
+    "test": "vitest",
     "test:components": "cypress run --component --browser chrome --headless",
     "test:components:local": "cypress open --component --browser electron",
     "lint": "eslint . --cache --report-unused-disable-directives --ext .js,.ts,.tsx",
@@ -42,10 +42,7 @@
     "lint:style:lab": "yarn stylelint -f verbose \"packages/lab/src/**/*.css\"",
     "storybook": "start-storybook -p 6006",
     "build-storybook": "yarn build:ag-grid-theme && build-storybook",
-    "typecheck": "yarn typecheck:modular && yarn typecheck:toolkit:test && yarn typecheck:toolkit:e2e",
-    "typecheck:modular": "modular typecheck",
-    "typecheck:toolkit:test": "tsc --noEmit --project packages/core/src/__tests__/tsconfig.json",
-    "typecheck:toolkit:e2e": "tsc --noEmit --project packages/core/src/__tests__/__e2e__/tsconfig.json",
+    "typecheck": "tsc --noEmit",
     "chromatic": "chromatic"
   },
   "dependencies": {
@@ -69,10 +66,7 @@
     "@tanstack/react-query": "^4.28.0",
     "@testing-library/cypress": "^9.0.0",
     "@testing-library/dom": "^9.0.0",
-    "@testing-library/jest-dom": "^5.14.1",
     "@testing-library/react": "^12.1.0",
-    "@testing-library/user-event": "^13.2.1",
-    "@types/jest": "^26.0.20",
     "@types/no-scroll": "^2.1.0",
     "@types/node": "^14.14.20",
     "@types/react": "^18.0.0",
@@ -118,6 +112,7 @@
     "vite": "^3.1.0",
     "vite-plugin-istanbul": "^4.0.0",
     "vite-tsconfig-paths": "^4.0.3",
+    "vitest": "^0.34.4",
     "webpack": "5.74.0",
     "yup": "^1.0.2"
   },
@@ -142,11 +137,6 @@
       "last 1 safari version"
     ]
   },
-  "jest": {
-    "transformIgnorePatterns": [
-      "<rootDir>/node_modules/csstree-validator"
-    ]
-  },
   "packageManager": "yarn@3.6.1",
   "msw": {
     "workerDirectory": "docs/public"

diff --git a/packages/ag-grid-theme/CHANGELOG.md b/packages/ag-grid-theme/CHANGELOG.md
@@ -1,5 +1,26 @@
 # @salt-ds/ag-grid-theme
 
+## 1.3.1
+
+### Patch Changes
+
+- 7e3a6053: Fixed bugs:
+
+  - Filter icon incorrect color in HD compact theme
+  - Vertical alignment of cells
+  - Column group cell
+  - Alignment of header cell separators with column group cell separators
+  - Status bar style enhancements
+  - Clipping of sort arrow in header row
+  - New floating filter design
+  - Pinned right columns styling
+
+- 0d0bdeb4: Fixed invalid CSS being generated for heights
+- 0d0bdeb4: Removed extra CSS from the theme.
+- 402e13f7: Browser compatibility CSS changes.
+
+  Added missing prefix to `appearance` and revert `padding-inline`, `padding-block` and `margin-block` to improve browser compatibility with Chrome 79
+
 ## 1.3.0
 
 ### Minor Changes