From e0cf26bbcd3517e4aa38fc7024321c143a2475b9 Mon Sep 17 00:00:00 2001 From: Tom VanAntwerp Date: Fri, 7 Oct 2022 15:15:05 -0400 Subject: [PATCH 1/4] Update Storybook mock configuration --- starters/remix-gql-tailwind/.storybook/main.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/starters/remix-gql-tailwind/.storybook/main.js b/starters/remix-gql-tailwind/.storybook/main.js index 48812b015..6d8fc43c8 100644 --- a/starters/remix-gql-tailwind/.storybook/main.js +++ b/starters/remix-gql-tailwind/.storybook/main.js @@ -5,9 +5,12 @@ module.exports = { return { ...config, resolve: { - alias: { - remix: path.resolve(__dirname, '../__mockRemix__'), - }, + alias: [ + { + find: '@remix-run/react', + replacement: path.resolve(__dirname, '../__mockRemix__'), + }, + ], }, }; }, From 99dc318d573698bfddbb48c63efcd8562e9da241 Mon Sep 17 00:00:00 2001 From: Tom VanAntwerp Date: Fri, 7 Oct 2022 15:20:15 -0400 Subject: [PATCH 2/4] Copy prettier rules and some eslint config from showcase --- starters/remix-gql-tailwind/.eslintrc.json | 4 ++-- starters/remix-gql-tailwind/.prettierrc | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/starters/remix-gql-tailwind/.eslintrc.json b/starters/remix-gql-tailwind/.eslintrc.json index 9e1876a1d..a618d63c2 100644 --- a/starters/remix-gql-tailwind/.eslintrc.json +++ b/starters/remix-gql-tailwind/.eslintrc.json @@ -1,8 +1,8 @@ { "root": true, - "extends": ["@remix-run/eslint-config"], + "extends": ["plugin:storybook/recommended", "@remix-run/eslint-config"], "plugins": ["unused-imports"], - "rules": { + "rules": { "no-unused-vars": "off", "unused-imports/no-unused-imports": "error", "unused-imports/no-unused-vars": [ diff --git a/starters/remix-gql-tailwind/.prettierrc b/starters/remix-gql-tailwind/.prettierrc index 6a5577e4d..611ced836 100644 --- a/starters/remix-gql-tailwind/.prettierrc +++ b/starters/remix-gql-tailwind/.prettierrc @@ -1,4 +1,8 @@ { "trailingComma": "es5", - "singleQuote": true -} \ No newline at end of file + "tabWidth": 2, + "singleQuote": true, + "jsxSingleQuote": true, + "bracketSpacing": true, + "endOfLine": "auto" +} From 25574b66b80d41f7d4ce7fa4b1ca94307f7b423e Mon Sep 17 00:00:00 2001 From: Tom VanAntwerp Date: Fri, 7 Oct 2022 15:27:01 -0400 Subject: [PATCH 3/4] Add husky, lint-staged, and a pre-commit hook --- starters/remix-gql-tailwind/.husky/pre-commit | 5 +++++ starters/remix-gql-tailwind/package.json | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 starters/remix-gql-tailwind/.husky/pre-commit diff --git a/starters/remix-gql-tailwind/.husky/pre-commit b/starters/remix-gql-tailwind/.husky/pre-commit new file mode 100644 index 000000000..ecb4e0003 --- /dev/null +++ b/starters/remix-gql-tailwind/.husky/pre-commit @@ -0,0 +1,5 @@ +#!/bin/sh +. "$(dirname "$0")/_/husky.sh" + +cd remix-gql-tailwind +npx lint-staged diff --git a/starters/remix-gql-tailwind/package.json b/starters/remix-gql-tailwind/package.json index 64e938d0b..fbf9effbd 100644 --- a/starters/remix-gql-tailwind/package.json +++ b/starters/remix-gql-tailwind/package.json @@ -35,7 +35,8 @@ "start": "remix-serve build", "test": "jest", "storybook": "concurrently -n css,storybook -c cyan,magenta \"npm run dev:css\" \"start-storybook -p 6006\"", - "build-storybook": "build-storybook" + "build-storybook": "build-storybook", + "prepare": "husky install" }, "msw": { "workerDirectory": "public" From 9f506adfe603c5c966acda91e49611fd71e1c1cf Mon Sep 17 00:00:00 2001 From: "Mark S. Shenouda" Date: Mon, 14 Aug 2023 18:26:59 +0300 Subject: [PATCH 4/4] upgrade the packages --- starters/remix-gql-tailwind/package.json | 74 ++++++++++++------------ 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/starters/remix-gql-tailwind/package.json b/starters/remix-gql-tailwind/package.json index fbf9effbd..414601517 100644 --- a/starters/remix-gql-tailwind/package.json +++ b/starters/remix-gql-tailwind/package.json @@ -42,44 +42,44 @@ "workerDirectory": "public" }, "dependencies": { - "@remix-run/node": "1.12.0", - "@remix-run/react": "1.12.0", - "@remix-run/serve": "1.12.0", - "cross-env": "7.0.3", - "graphql": "^16.6.0", - "graphql-request": "5.1.0", - "react": "18.2.0", - "react-dom": "18.2.0" + "@remix-run/node": "^1.19.3", + "@remix-run/react": "^1.19.3", + "@remix-run/serve": "^1.19.3", + "cross-env": "^7.0.3", + "graphql": "^16.7.1", + "graphql-request": "^6.1.0", + "react": "^18.2.0", + "react-dom": "^18.2.0" }, "devDependencies": { - "@mdx-js/preact": "2.3.0", - "@remix-run/dev": "1.12.0", - "@remix-run/eslint-config": "1.12.0", - "@storybook/addon-actions": "6.5.16", - "@storybook/addon-essentials": "6.5.16", - "@storybook/addon-links": "6.5.16", - "@storybook/addon-postcss": "2.0.0", - "@storybook/react": "6.5.16", - "@testing-library/jest-dom": "5.16.5", - "@testing-library/react": "13.4.0", - "@testing-library/user-event": "14.4.3", - "@types/jest": "29.4.0", - "@types/react": "18.0.28", - "@types/react-dom": "18.0.10", - "autoprefixer": "10.4.13", - "concurrently": "7.6.0", - "eslint": "8.34.0", - "eslint-plugin-storybook": "0.6.10", - "eslint-plugin-unused-imports": "2.0.0", - "jest": "29.4.2", - "jest-environment-jsdom": "^29.3.0", - "postcss": "8.4.21", - "postcss-cli": "10.1.0", - "prettier": "2.8.4", - "storybook-builder-vite": "0.1.18", - "tailwindcss": "3.2.6", - "ts-jest": "29.0.5", - "typescript": "4.9.5", - "vite": "3.2.5" + "@mdx-js/preact": "^2.3.0", + "@remix-run/dev": "^1.19.3", + "@remix-run/eslint-config": "^1.19.3", + "@storybook/addon-actions": "^7.2.3", + "@storybook/addon-essentials": "^7.2.3", + "@storybook/addon-links": "^7.2.3", + "@storybook/addon-postcss": "^2.0.0", + "@storybook/react": "^7.2.3", + "@testing-library/jest-dom": "^6.0.0", + "@testing-library/react": "^14.0.0", + "@testing-library/user-event": "^14.4.3", + "@types/jest": "^29.5.3", + "@types/react": "^18.2.20", + "@types/react-dom": "^18.2.7", + "autoprefixer": "^10.4.15", + "concurrently": "^8.2.0", + "eslint": "^8.47.0", + "eslint-plugin-storybook": "^0.6.13", + "eslint-plugin-unused-imports": "^3.0.0", + "jest": "^29.6.2", + "jest-environment-jsdom": "^29.6.2", + "postcss": "^8.4.27", + "postcss-cli": "^10.1.0", + "prettier": "^3.0.1", + "storybook-builder-vite": "^0.1.23", + "tailwindcss": "^3.3.3", + "ts-jest": "^29.1.1", + "typescript": "^5.1.6", + "vite": "^4.4.9" } }