lint clean up

.github/workflows/ci.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        browser: [ChromeHeadless, FirefoxHeadless]
+        browser: [chromium, firefox]
         os: [ubuntu-latest, windows-latest, macOS-latest]
     steps:
       - name: Checkout
@@ -27,19 +27,14 @@ jobs:
         if: matrix.os == 'macOS-latest'
         run: brew update
 
-      - name: Install Chrome (macOS)
-        if: matrix.os == 'macOS-latest' && matrix.browser == 'ChromeHeadless'
-        run: brew install --cask google-chrome
-
-      - name: Install Firefox (macOS)
-        if: matrix.os == 'macOS-latest' && matrix.browser == 'FirefoxHeadless'
-        run: brew install --cask firefox
-
       - name: Install Dependencies
         run: yarn bootstrap
 
+      - name: Install Playwright Browsers
+        run: yarn playwright install --with-deps
+
       - name: Run Tests
-        run: yarn test
+        run: yarn test --browser.name=$BROWSER --browser.headless
         env:
           BROWSER: ${{ matrix.browser }}
 

package.json

@@ -52,7 +52,7 @@
     "build:pick": "cherry-pick --cwd=lib --input-dir=../src --cjs-dir=cjs --esm-dir=esm",
     "build:popper": "rollup src/popper.ts --file lib/cjs/popper.js --format cjs --name popper --plugin @rollup/plugin-node-resolve",
     "deploy-docs": "yarn --cwd www deploy",
-    "lint": "eslint www/*.js www/src src test *.js  --ext .js,.ts,.tsx",
+    "lint": "eslint www/*.js www/src src test *.ts  --ext .js,.ts,.tsx",
     "prepublishOnly": "yarn build",
     "release": "rollout",
     "start": "yarn --cwd www start",

src/NavItem.tsx

@@ -117,23 +117,21 @@ export function useNavItem({
   return [props, { isActive }] as const;
 }
 
-const NavItem: DynamicRefForwardingComponent<
-  typeof Button,
-  NavItemProps
-> = React.forwardRef<HTMLElement, NavItemProps>(
-  ({ as: Component = Button, active, eventKey, ...options }, ref) => {
-    const [props, meta] = useNavItem({
-      key: makeEventKey(eventKey, options.href),
-      active,
-      ...options,
-    });
-
-    // @ts-ignore
-    props[dataAttr('active')] = meta.isActive;
-
-    return <Component {...options} {...props} ref={ref} />;
-  },
-);
+const NavItem: DynamicRefForwardingComponent<typeof Button, NavItemProps> =
+  React.forwardRef<HTMLElement, NavItemProps>(
+    ({ as: Component = Button, active, eventKey, ...options }, ref) => {
+      const [props, meta] = useNavItem({
+        key: makeEventKey(eventKey, options.href),
+        active,
+        ...options,
+      });
+
+      // @ts-ignore
+      props[dataAttr('active')] = meta.isActive;
+
+      return <Component {...options} {...props} ref={ref} />;
+    },
+  );
 
 NavItem.displayName = 'NavItem';