Skip to content

Updates based on Remix kit audit #317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
+58 −45
Open

Updates based on Remix kit audit #317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e0cf26b
Update Storybook mock configuration
tvanantwerp Oct 7, 2022
99dc318
Copy prettier rules and some eslint config from showcase
tvanantwerp Oct 7, 2022
25574b6
Add husky, lint-staged, and a pre-commit hook
tvanantwerp Oct 7, 2022
9f506ad
upgrade the packages
marks-sre-is Aug 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions starters/remix-gql-tailwind/.eslintrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down
5 changes: 5 additions & 0 deletions starters/remix-gql-tailwind/.husky/pre-commit
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

cd remix-gql-tailwind
npx lint-staged
8 changes: 6 additions & 2 deletions starters/remix-gql-tailwind/.prettierrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
{
"trailingComma": "es5",
"singleQuote": true
}
"tabWidth": 2,
Copy link
Contributor

@dustinsgoodman dustinsgoodman Oct 10, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we turn on tabs instead of spaces here?

"singleQuote": true,
"jsxSingleQuote": true,
"bracketSpacing": true,
"endOfLine": "auto"
}
9 changes: 6 additions & 3 deletions starters/remix-gql-tailwind/.storybook/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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__'),
},
],
},
};
},
Expand Down
77 changes: 39 additions & 38 deletions starters/remix-gql-tailwind/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,50 +35,51 @@
"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"
},
"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"
}
}