Merge branch 'main' into fix/button-group-warning

themesberg · Apr 1, 2024 · 8f1b296 · 8f1b296
2 parents 728aa5a + cccda3e
commit 8f1b296
Show file tree

Hide file tree

Showing 13 changed files with 10 additions and 16 deletions.
diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
@@ -13,7 +13,6 @@ runs:
       uses: actions/setup-node@v4
       with:
         node-version: 20
-        registry-url: "https://registry.npmjs.org"
 
     - name: Install packages
       shell: bash

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -25,5 +25,4 @@ jobs:
           publish: bun run release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
diff --git a/apps/storybook/package.json b/apps/storybook/package.json
@@ -2,7 +2,6 @@
   "name": "storybook",
   "version": "0.0.0",
   "private": true,
-  "type": "module",
   "scripts": {
     "build": "storybook build",
     "clean": "rimraf .turbo node_modules storybook-static",

diff --git a/apps/storybook/postcss.config.js → apps/storybook/postcss.config.cjs b/apps/storybook/postcss.config.js → apps/storybook/postcss.config.cjs
@@ -1,4 +1,4 @@
-export default {
+module.exports = {
   plugins: {
     tailwindcss: {},
     autoprefixer: {},

diff --git a/apps/storybook/tailwind.config.js → apps/storybook/tailwind.config.cjs b/apps/storybook/tailwind.config.js → apps/storybook/tailwind.config.cjs
diff --git a/apps/storybook/vite.config.ts → apps/storybook/vite.config.mjs b/apps/storybook/vite.config.ts → apps/storybook/vite.config.mjs
diff --git a/apps/web/.eslintrc.js → apps/web/.eslintrc.cjs b/apps/web/.eslintrc.js → apps/web/.eslintrc.cjs
diff --git a/apps/web/postcss.config.js → apps/web/postcss.config.cjs b/apps/web/postcss.config.js → apps/web/postcss.config.cjs
diff --git a/apps/web/tailwind.config.js → apps/web/tailwind.config.cjs b/apps/web/tailwind.config.js → apps/web/tailwind.config.cjs
diff --git a/packages/ui/.eslintrc.cjs b/packages/ui/.eslintrc.cjs
@@ -3,11 +3,11 @@ module.exports = {
   root: true,
   env: {
     browser: true,
+    commonjs: true,
     es2021: true,
   },
   extends: [
     "eslint:recommended",
-    "plugin:@typescript-eslint/recommended",
     "plugin:react/recommended",
     "plugin:react/jsx-runtime",
     "plugin:vitest/recommended",
@@ -17,21 +17,20 @@ module.exports = {
   ],
   overrides: [
     {
-      env: {
-        node: true,
-      },
-      files: [".eslintrc.{js,cjs}"],
-      parserOptions: {
-        sourceType: "script",
+      files: ["**/*.{ts,tsx}"],
+      plugins: ["@typescript-eslint"],
+      parser: "@typescript-eslint/parser",
+      extends: ["plugin:@typescript-eslint/recommended"],
+      rules: {
+        "@typescript-eslint/no-unused-vars": "off",
       },
     },
   ],
-  parser: "@typescript-eslint/parser",
   parserOptions: {
     ecmaVersion: "latest",
     sourceType: "module",
   },
-  plugins: ["@typescript-eslint", "react", "vitest"],
+  plugins: ["react", "vitest"],
   settings: {
     react: {
       version: "detect",
@@ -49,6 +48,5 @@ module.exports = {
     "react/no-unescaped-entities": "off",
     "tailwindcss/classnames-order": "off",
     "tailwindcss/enforces-shorthand": "off",
-    "@typescript-eslint/no-unused-vars": "off",
   },
 };
diff --git a/packages/ui/package.json b/packages/ui/package.json
@@ -19,7 +19,6 @@
     "directory": "packages/ui"
   },
   "license": "MIT",
-  "type": "module",
   "exports": {
     ".": {
       "types": "./lib/esm/index.d.ts",

diff --git a/packages/ui/postcss.config.js → packages/ui/postcss.config.cjs b/packages/ui/postcss.config.js → packages/ui/postcss.config.cjs
@@ -1,4 +1,4 @@
-export default {
+module.exports = {
   plugins: {
     tailwindcss: {},
     autoprefixer: {},

diff --git a/packages/ui/tailwind.config.js → packages/ui/tailwind.config.cjs b/packages/ui/tailwind.config.js → packages/ui/tailwind.config.cjs