From 40e4e8725cb3ad4119893c07959ff860cbbf7c0c Mon Sep 17 00:00:00 2001 From: SutuSebastian Date: Fri, 29 Mar 2024 17:41:39 +0200 Subject: [PATCH 1/2] ci(release, action): remove redundant changes --- .github/actions/setup/action.yml | 1 - .github/workflows/release.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index f773303c2..2b8d831d8 100644 --- 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 index 9e7e0e9b6..344331497 100644 --- 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 }} From cccda3ec688a19536bd094790f8a4c15ec1ca2b7 Mon Sep 17 00:00:00 2001 From: SutuSebastian Date: Sun, 31 Mar 2024 12:50:37 +0300 Subject: [PATCH 2/2] fix: align config files extentions (js/cjs/mjs) + remove `"type": "module"` from `package.json` [ui, storybook] --- apps/storybook/package.json | 1 - .../{postcss.config.js => postcss.config.cjs} | 2 +- ...{tailwind.config.js => tailwind.config.cjs} | 0 .../{vite.config.ts => vite.config.mjs} | 0 apps/web/{.eslintrc.js => .eslintrc.cjs} | 0 .../{postcss.config.js => postcss.config.cjs} | 0 ...{tailwind.config.js => tailwind.config.cjs} | 0 packages/ui/.eslintrc.cjs | 18 ++++++++---------- packages/ui/package.json | 1 - .../{postcss.config.js => postcss.config.cjs} | 2 +- ...{tailwind.config.js => tailwind.config.cjs} | 0 11 files changed, 10 insertions(+), 14 deletions(-) rename apps/storybook/{postcss.config.js => postcss.config.cjs} (77%) rename apps/storybook/{tailwind.config.js => tailwind.config.cjs} (100%) rename apps/storybook/{vite.config.ts => vite.config.mjs} (100%) rename apps/web/{.eslintrc.js => .eslintrc.cjs} (100%) rename apps/web/{postcss.config.js => postcss.config.cjs} (100%) rename apps/web/{tailwind.config.js => tailwind.config.cjs} (100%) rename packages/ui/{postcss.config.js => postcss.config.cjs} (77%) rename packages/ui/{tailwind.config.js => tailwind.config.cjs} (100%) diff --git a/apps/storybook/package.json b/apps/storybook/package.json index 29b0c2a0e..b332a44ff 100644 --- 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 b/apps/storybook/postcss.config.cjs similarity index 77% rename from apps/storybook/postcss.config.js rename to apps/storybook/postcss.config.cjs index 2aa7205d4..12a703d90 100644 --- a/apps/storybook/postcss.config.js +++ b/apps/storybook/postcss.config.cjs @@ -1,4 +1,4 @@ -export default { +module.exports = { plugins: { tailwindcss: {}, autoprefixer: {}, diff --git a/apps/storybook/tailwind.config.js b/apps/storybook/tailwind.config.cjs similarity index 100% rename from apps/storybook/tailwind.config.js rename to apps/storybook/tailwind.config.cjs diff --git a/apps/storybook/vite.config.ts b/apps/storybook/vite.config.mjs similarity index 100% rename from apps/storybook/vite.config.ts rename to apps/storybook/vite.config.mjs diff --git a/apps/web/.eslintrc.js b/apps/web/.eslintrc.cjs similarity index 100% rename from apps/web/.eslintrc.js rename to apps/web/.eslintrc.cjs diff --git a/apps/web/postcss.config.js b/apps/web/postcss.config.cjs similarity index 100% rename from apps/web/postcss.config.js rename to apps/web/postcss.config.cjs diff --git a/apps/web/tailwind.config.js b/apps/web/tailwind.config.cjs similarity index 100% rename from apps/web/tailwind.config.js rename to apps/web/tailwind.config.cjs diff --git a/packages/ui/.eslintrc.cjs b/packages/ui/.eslintrc.cjs index 677ff6c89..e147886ea 100644 --- 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 index 7548bc92c..919b9e337 100644 --- 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 b/packages/ui/postcss.config.cjs similarity index 77% rename from packages/ui/postcss.config.js rename to packages/ui/postcss.config.cjs index 2aa7205d4..12a703d90 100644 --- a/packages/ui/postcss.config.js +++ b/packages/ui/postcss.config.cjs @@ -1,4 +1,4 @@ -export default { +module.exports = { plugins: { tailwindcss: {}, autoprefixer: {}, diff --git a/packages/ui/tailwind.config.js b/packages/ui/tailwind.config.cjs similarity index 100% rename from packages/ui/tailwind.config.js rename to packages/ui/tailwind.config.cjs