Merge pull request #2131 from CDCgov/test

Test

Author: adamdoe

.eslintrc.json

@@ -4,19 +4,15 @@
     "ecmaVersion": "latest",
     "sourceType": "module"
   },
-  "plugins": [
-    "@typescript-eslint"
-  ],
+  "plugins": ["@typescript-eslint", "eslint-plugin-prettier"],
   "extends": [
-    "plugin:jsx-a11y/recommended",
+    // "plugin:jsx-a11y/recommended",
     "prettier",
     "plugin:react-hooks/recommended"
   ],
   "rules": {
-    "import/no-named-as-default": 0,
-    "no-labels": 0,
-    "no-unused-labels": 0,
-    "no-console": 1,
-    "import/no-anonymous-default-export": 0
+    "no-console": ["error", { "allow": ["error"] }],
+    "no-debugger": "error",
+    "react-hooks/exhaustive-deps": "off"
   }
-}
+}

.github/workflows/lint_staged.yml

@@ -0,0 +1,33 @@
+name: Lint Staged Files
+
+on:
+  pull_request:
+    paths:
+      - 'packages/**/*.{js,jsx,ts,tsx}'
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: '16'  # or the version you're using
+
+      - name: Install dependencies
+        run: |
+          npm install
+
+      - name: Lint staged files
+        run: |
+          STAGED_FILES=$(git diff --cached --name-only --diff-filter=AM | grep -E '\.(js|jsx|ts|tsx)$' || true)
+
+          if [ -n "$STAGED_FILES" ]; then
+            npx eslint $STAGED_FILES
+          else
+            echo "No staged files to lint."
+          fi

.github/workflows/reject_scss_files.yml

@@ -0,0 +1,29 @@
+name: Reject PRs with new .scss Files
+
+on:
+  pull_request:
+    types: [opened, synchronize]
+
+jobs:
+  check-scss-files:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Fetch base branch
+        run: git fetch origin ${{ github.event.pull_request.base.ref }}
+
+      - name: Check for new .scss files in the PR
+        run: |
+          # Get the list of changed files in the PR
+          added_files=$(git diff --diff-filter=A --name-only origin/${{ github.event.pull_request.base.ref }} ${{ github.sha }})
+
+          # Check if any .scss files are present
+          if echo "$added_files" | grep -q '\.scss$'; then
+            echo "Error: PR contains newly added .scss files."
+            exit 1
+          else
+            echo "No new .scss files found in the PR."
+          fi

.github/workflows/test_storybook.yml

@@ -0,0 +1,39 @@
+name: Test Storybook
+
+on:
+  workflow_dispatch:
+
+jobs:
+  storybook-tests:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Setup Node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+          cache: yarn
+
+      - name: Install dependencies
+        run: yarn install --frozen-lockfile
+
+      - name: Build Packages
+        run: lerna run build
+
+      - name: Build Storybook
+        run: yarn build-storybook --output-dir storybook-static
+
+      - name: Add Playwright
+        run: npx playwright install
+
+      - name: Start Storybook
+        run: yarn storybook -p 6006 &
+
+      - name: Wait for Storybook to be available
+        run: npx wait-on http://localhost:6006
+
+      - name: Run Storybook tests
+        run: yarn test-storybook

.husky/pre-commit

@@ -0,0 +1,5 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+# Run lint-staged to check for eslint issues before commit
+npx lint-staged

.prettierignore

@@ -1,8 +1 @@
 node_modules
-packages/map/src/data/us-topo.json
-packages/map/src/data/world-topo.json
-packages/map/src/data/us-hex.json
-packages/map/src/data/us-regions-topo.json
-packages/map/src/data/us-regions-topo-2.json
-packages/map/src/data/county-topo.json
-packages/map/src/data/county-map.json

.storybook/main.ts

@@ -6,15 +6,16 @@ import svgr from 'vite-plugin-svgr' // Svg Support
 const config: StorybookConfig = {
   stories: [
     '../_stories/*.mdx',
-    '../packages/**/_stories/*.stories.@(js|jsx|ts|tsx)',
+    '../packages/**/_stories/*.stories.@(js|jsx|ts|tsx|mdx)',
     '../_stories/private/**/*.stories.@(js|jsx|ts|tsx)'
   ],
   addons: [
     '@storybook/addon-links',
     '@storybook/addon-essentials',
     '@storybook/addon-interactions',
     'storybook-addon-fetch-mock',
-    '@storybook/addon-a11y'
+    '@storybook/addon-a11y',
+    '@storybook/addon-docs'
   ],
   staticDirs: ['./assets'],
   framework: {

generateViteConfig.js

@@ -14,7 +14,12 @@ dns.setDefaultResultOrder('verbatim')
 // - Active dev servers ('lerna run start') must be restarted in order to view the changed settings.
 const generateViteConfig = (componentName, configOptions = {}, reactOptions = {}) => {
   let configOptionsDefault = {
-    server: { port: 8080 },
+    server: {
+      port: 8080,
+      headers: {
+        'Access-Control-Allow-Origin': '*'
+      }
+    },
     build: {
       commonjsOptions: {
         include: [/@cdc\/core/, /node_modules/]

package.json

@@ -24,18 +24,20 @@
     "@storybook/manager-api": "^7.4.6",
     "@storybook/react": "^7.4.6",
     "@storybook/react-vite": "^7.4.6",
+    "@storybook/test-runner": "0.12.0",
     "@storybook/testing-library": "^0.2.2",
     "@storybook/theming": "^7.4.6",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^14.0.0",
+    "@types/chroma-js": "^3.1.1",
+    "@types/papaparse": "^5.3.15",
     "@types/react": "^18.0.26",
     "@types/react-dom": "^18.0.9",
     "@types/resize-observer-browser": "^0.1.5",
     "@typescript-eslint/eslint-plugin": "^6.8.0",
     "@typescript-eslint/parser": "^7.0.1",
-    "@visx/group": "^3.0.0",
+    "@visx/group": "3.12.0",
     "@visx/heatmap": "^3.0.0",
-    "@visx/scale": "^3.0.0",
     "@vitejs/plugin-react": "^4.3.4",
     "@vitest/coverage-c8": "^0.29.2",
     "@vitest/ui": "^0.29.2",
@@ -53,11 +55,11 @@
     "eslint-plugin-react-hooks": "^4.6.0",
     "eslint-plugin-storybook": "^0.6.11",
     "gh-pages": "^5.0.0",
-    "html-react-parser": "^3.0.8",
-    "husky": "^4.3.0",
+    "html-react-parser": "5.2.3",
+    "husky": "^8.0.0",
     "jsdom": "^22.1.0",
     "lerna": "^7.1.3",
-    "lint-staged": "^10.4.0",
+    "lint-staged": "^15.5.1",
     "lodash": "^4.17.21",
     "lodash.get": "^4.4.2",
     "lodash.merge": "^4.6.2",
@@ -69,7 +71,7 @@
     "react": "^18.2.0",
     "react-dnd": "^16.0.1",
     "react-dom": "^18.2.0",
-    "react-tooltip": "^5.7.2",
+    "react-tooltip": "5.8.2-beta.3",
     "react-visibility-sensor": "^5.1.1",
     "resize-observer-polyfill": "^1.5.1",
     "rollup-plugin-node-externals": "^6.1.2",
@@ -82,31 +84,37 @@
     "vite-plugin-md": "^0.21.5",
     "vite-plugin-svgr": "^2.4.0",
     "vitest": "^1.2.2",
-    "whatwg-fetch": "^3.6.2"
+    "whatwg-fetch": "3.6.20"
   },
   "lint-staged": {
     "./packages/*/src/**/*.{js,jsx,ts,tsx}": [
-      "npx prettier --write",
-      "eslint --config .eslintrc.json"
+      "eslint --config .eslintrc.json",
+      "npx prettier --write"
     ]
   },
   "scripts": {
     "clean": "find . -name 'node_modules' -type d -prune -exec rm -rf '{}' +",
     "publish": "npx lerna publish",
     "storybook": "storybook dev -p 6006",
+    "test-storybook": "npx test-storybook",
     "storybook-docs": "storybook dev --docs",
     "build-storybook": "storybook build",
     "predeploy": "storybook build --output-dir .storybook_build && touch .storybook_build/.nojekyll",
-    "deploy": "gh-pages -d .storybook_build -t true"
+    "deploy": "gh-pages -d .storybook_build -t true",
+    "lint": "eslint packages/*/src/**/*.{js,jsx,ts,tsx}",
+    "prepare": "husky install"
   },
   "dependencies": {
     "@visx/annotation": "^3.3.0",
     "@visx/brush": "^3.0.1",
-    "@visx/legend": "^3.0.0",
+    "@visx/legend": "3.12.0",
     "@visx/pattern": "^3.0.0",
     "@visx/responsive": "^2.10.0",
     "@vitest/coverage-v8": "^1.2.2",
-    "dompurify": "^3.1.5"
+    "chroma-js": "3.1.2",
+    "dompurify": "^3.1.5",
+    "papaparse": "5.5.2",
+    "react-table": "7.8.0"
   },
   "resolutions": {
     "jackspeak": "2.1.1"

packages/chart/index.html

@@ -45,7 +45,8 @@
   -->
 
     <!-- GENERIC CHART TYPES -->
-    <div class="react-container" data-config="/examples/private/ari-other-conditions-1.json"></div>
+    <!-- <div class="react-container" data-config="/examples/private/ari-other-conditions-1.json"></div> -->
+    <!-- <div class="react-container" data-config="/examples/private/Viral-Respiratory-Deaths-Age.json"></div> -->
     <!--    <div class="react-container" data-config="/examples/cases-year.json"></div>-->
     <!-- <div class="react-container" data-config="/examples/test.json"></div> -->
     <!-- <div class="react-container" data-config="/examples/feature/line/line-chart.json"></div> -->