Skip to content

Commit

Permalink
Make the setting consistent with Map (#28)
Browse files Browse the repository at this point in the history
  • Loading branch information
vthwang authored Jul 11, 2023
1 parent 0113730 commit 6e15882
Show file tree
Hide file tree
Showing 10 changed files with 3,821 additions and 6,343 deletions.
3 changes: 3 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
node_modules
public
api
5 changes: 1 addition & 4 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
{
"extends": ["@remix-run/eslint-config", "@remix-run/eslint-config/node"],
"env": {
"jest": true
}
"extends": ["@remix-run/eslint-config", "@remix-run/eslint-config/node"]
}
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
/.idea
node_modules
.DS_Store

.cache
.env
.vercel
.output

/node_modules
/build/
/public/build
/api/index.js
Expand Down
7 changes: 4 additions & 3 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

npm run validate && git add . && npx lint-staged
# npm test
npx lint-staged
10,064 changes: 3,786 additions & 6,278 deletions package-lock.json

Large diffs are not rendered by default.

58 changes: 23 additions & 35 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,68 +4,56 @@
"license": "GPLv3",
"private": true,
"scripts": {
"build": "npm run build:css && remix build",
"build:css": "tailwindcss -m -i ./styles/app.css -o app/styles/app.css",
"dev": "concurrently \"npm run dev:css\" \"remix dev\"",
"dev:css": "tailwindcss -w -i ./styles/app.css -o app/styles/app.css",
"postinstall": "remix setup node",
"build": "run-s \"build:*\"",
"build:css": "npm run generate:css -- --minify",
"build:remix": "remix build",
"dev": "run-p \"dev:*\"",
"dev:css": "npm run generate:css -- --watch",
"dev:remix": "remix dev",
"generate:css": "npx tailwindcss -i styles/app.css -o ./app/styles/app.css",
"start": "remix-serve build",
"lint": "eslint --ignore-path .gitignore --ext .js --ext .jsx .",
"lint-fix": "eslint --ignore-path .gitignore --ext .js --ext .jsx . --fix",
"prettier": "prettier --ignore-path .gitignore \"**/*.+(js|jsx|json)\"",
"format": "npm run prettier -- --write",
"validate": "npm run lint && npm run format && npm run build",
"prepare": "husky install",
"test": "vitest run --config ./vitest.config.js",
"test:watch": "vitest watch"
"prepare": "husky install"
},
"eslintConfig": {
"extends": [
"eslint-config-prettier"
]
},
"lint-staged": {
"src/**/*.+(js|jsx)": [
"eslint --fix"
],
"src/**/*.+(js|jsx|json)": [
"prettier --write"
"**/*.{js,jsx}": [
"npm run lint-fix",
"npm run format"
]
},
"dependencies": {
"@murmurations/jsig": "^1.0.0",
"@murmurations/jsrfg": "^1.0.0",
"@remix-run/node": "^1.15.0",
"@remix-run/react": "^1.15.0",
"@remix-run/vercel": "^1.15.0",
"@vercel/node": "^2.10.3",
"@remix-run/react": "^1.18.1",
"@vercel/node": "^2.15.3",
"bcryptjs": "^2.4.3",
"cuid": "^2.1.8",
"mongodb": "^5.2.0",
"mongodb": "^5.7.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-hot-toast": "^2.4.0"
"react-hot-toast": "^2.4.1"
},
"devDependencies": {
"@remix-run/dev": "^1.15.0",
"@remix-run/eslint-config": "^1.15.0",
"@remix-run/serve": "^1.15.0",
"@remix-run/dev": "^1.18.1",
"@remix-run/eslint-config": "^1.18.1",
"@remix-run/serve": "^1.18.1",
"@tailwindcss/forms": "^0.5.3",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^14.0.0",
"autoprefixer": "^10.4.14",
"concurrently": "^8.0.1",
"eslint": "^8.44.0",
"eslint-config-prettier": "^8.8.0",
"husky": "^8.0.3",
"jsdom": "^21.1.1",
"lint-staged": "^13.2.1",
"lint-staged": "^13.2.3",
"npm-run-all": "^4.1.5",
"postcss": "^8.4.21",
"postcss-cli": "^10.1.0",
"prettier": "^2.8.7",
"prettier-plugin-tailwindcss": "^0.2.7",
"tailwindcss": "^3.3.2",
"vitest": "^0.30.1"
"prettier": "^3.0.0",
"prettier-plugin-tailwindcss": "^0.3.0",
"tailwindcss": "^3.3.2"
},
"engines": {
"node": ">=14"
Expand Down
5 changes: 0 additions & 5 deletions postcss.config.js

This file was deleted.

8 changes: 2 additions & 6 deletions remix.config.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
/** @type {import('@remix-run/dev').AppConfig} */
module.exports = {
// When running locally in development mode, we use the built in remix
// server. This does not understand the vercel lambda module format,
// so we default back to the standard build output.
server: process.env.NODE_ENV === 'development' ? undefined : './server.js',
ignoredRouteFiles: ['**/.*'],
appDirectory: 'app',
assetsBuildDirectory: 'public/build',
publicPath: '/build/',
serverBuildPath: 'api/index.js',
serverMainFields: ['main', 'module'],
serverModuleFormat: 'cjs',
serverPlatform: 'node',
Expand All @@ -17,6 +12,7 @@ module.exports = {
v2_errorBoundary: true,
v2_routeConvention: true,
v2_meta: true,
v2_normalizeFormMethod: true
v2_normalizeFormMethod: true,
v2_headers: true
}
}
4 changes: 0 additions & 4 deletions server.js

This file was deleted.

7 changes: 0 additions & 7 deletions vitest.config.js

This file was deleted.

1 comment on commit 6e15882

@vercel
Copy link

@vercel vercel bot commented on 6e15882 Jul 11, 2023

Choose a reason for hiding this comment

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

Please sign in to comment.