Skip to content

Commit 031c7b4

Browse files
authored
Merge branch 'main' into feat/skeleton
2 parents c2eff4d + cccda3e commit 031c7b4

11 files changed

+10
-14
lines changed

apps/storybook/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"name": "storybook",
33
"version": "0.0.0",
44
"private": true,
5-
"type": "module",
65
"scripts": {
76
"build": "storybook build",
87
"clean": "rimraf .turbo node_modules storybook-static",

apps/storybook/postcss.config.js renamed to apps/storybook/postcss.config.cjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
export default {
1+
module.exports = {
22
plugins: {
33
tailwindcss: {},
44
autoprefixer: {},
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

packages/ui/.eslintrc.cjs

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ module.exports = {
33
root: true,
44
env: {
55
browser: true,
6+
commonjs: true,
67
es2021: true,
78
},
89
extends: [
910
"eslint:recommended",
10-
"plugin:@typescript-eslint/recommended",
1111
"plugin:react/recommended",
1212
"plugin:react/jsx-runtime",
1313
"plugin:vitest/recommended",
@@ -17,21 +17,20 @@ module.exports = {
1717
],
1818
overrides: [
1919
{
20-
env: {
21-
node: true,
22-
},
23-
files: [".eslintrc.{js,cjs}"],
24-
parserOptions: {
25-
sourceType: "script",
20+
files: ["**/*.{ts,tsx}"],
21+
plugins: ["@typescript-eslint"],
22+
parser: "@typescript-eslint/parser",
23+
extends: ["plugin:@typescript-eslint/recommended"],
24+
rules: {
25+
"@typescript-eslint/no-unused-vars": "off",
2626
},
2727
},
2828
],
29-
parser: "@typescript-eslint/parser",
3029
parserOptions: {
3130
ecmaVersion: "latest",
3231
sourceType: "module",
3332
},
34-
plugins: ["@typescript-eslint", "react", "vitest"],
33+
plugins: ["react", "vitest"],
3534
settings: {
3635
react: {
3736
version: "detect",
@@ -49,6 +48,5 @@ module.exports = {
4948
"react/no-unescaped-entities": "off",
5049
"tailwindcss/classnames-order": "off",
5150
"tailwindcss/enforces-shorthand": "off",
52-
"@typescript-eslint/no-unused-vars": "off",
5351
},
5452
};

packages/ui/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
"directory": "packages/ui"
2020
},
2121
"license": "MIT",
22-
"type": "module",
2322
"exports": {
2423
".": {
2524
"types": "./lib/esm/index.d.ts",

packages/ui/postcss.config.js renamed to packages/ui/postcss.config.cjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
export default {
1+
module.exports = {
22
plugins: {
33
tailwindcss: {},
44
autoprefixer: {},
File renamed without changes.

0 commit comments

Comments
 (0)