Skip to content

Commit a23202e

Browse files
rphlmrrphlmr
authored
Feat/v2 routes (#12)
* update libs * prepare remix v2 * downgrade stripe * migrate to node 18
1 parent e24bb34 commit a23202e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+12254
-27190
lines changed

‎.eslintrc‎

Lines changed: 72 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,74 @@
11
{
2-
"plugins": ["tailwindcss"],
3-
"extends": [
4-
"@remix-run/eslint-config",
5-
"@remix-run/eslint-config/node",
6-
"plugin:tailwindcss/recommended",
7-
"prettier"
8-
],
9-
"parserOptions": {
10-
"project": ["./tsconfig.json"]
11-
},
12-
"settings": {
13-
// Help eslint-plugin-tailwindcss to parse Tailwind classes outside of className
14-
"tailwindcss": {
15-
"callees": ["tw"]
16-
},
17-
"jest": {
18-
"version": 27
19-
}
20-
},
21-
"rules": {
22-
"no-console": "warn",
23-
"arrow-body-style": ["warn", "as-needed"],
24-
// @typescript-eslint
25-
"@typescript-eslint/no-duplicate-imports": "error",
26-
"@typescript-eslint/consistent-type-imports": "error",
27-
"@typescript-eslint/no-unused-vars": [
28-
"warn",
29-
{
30-
"vars": "all",
31-
"args": "all",
32-
"argsIgnorePattern": "^_",
33-
"destructuredArrayIgnorePattern": "^_",
34-
"ignoreRestSiblings": false
35-
}
36-
],
37-
//import
38-
"import/no-cycle": "error",
39-
"import/no-unresolved": "error",
40-
"import/no-default-export": "warn",
41-
"import/order": [
42-
"error",
43-
{
44-
"groups": ["builtin", "external", "internal"],
45-
"pathGroups": [
46-
{
47-
"pattern": "react",
48-
"group": "external",
49-
"position": "before"
50-
}
51-
],
52-
"pathGroupsExcludedImportTypes": ["react"],
53-
"newlines-between": "always",
54-
"alphabetize": {
55-
"order": "asc",
56-
"caseInsensitive": true
57-
}
58-
}
59-
]
60-
},
61-
"overrides": [
62-
{
63-
"files": [
64-
"./app/root.tsx",
65-
"./app/entry.client.tsx",
66-
"./app/entry.server.tsx",
67-
"./app/routes/**/*.tsx"
68-
],
69-
"rules": {
70-
"import/no-default-export": "off"
71-
}
72-
}
73-
]
2+
"plugins": ["tailwindcss"],
3+
"extends": [
4+
"@remix-run/eslint-config",
5+
"@remix-run/eslint-config/node",
6+
"plugin:tailwindcss/recommended",
7+
"prettier"
8+
],
9+
"parserOptions": {
10+
"project": ["./tsconfig.json"]
11+
},
12+
"settings": {
13+
// Help eslint-plugin-tailwindcss to parse Tailwind classes outside of className
14+
"tailwindcss": {
15+
"callees": ["tw"]
16+
},
17+
"jest": {
18+
"version": 27
19+
}
20+
},
21+
"rules": {
22+
"no-console": "warn",
23+
"arrow-body-style": ["warn", "as-needed"],
24+
// @typescript-eslint
25+
"@typescript-eslint/no-duplicate-imports": "error",
26+
"@typescript-eslint/consistent-type-imports": "error",
27+
"@typescript-eslint/no-unused-vars": [
28+
"warn",
29+
{
30+
"vars": "all",
31+
"args": "all",
32+
"argsIgnorePattern": "^_",
33+
"destructuredArrayIgnorePattern": "^_",
34+
"ignoreRestSiblings": false
35+
}
36+
],
37+
//import
38+
"import/no-cycle": "error",
39+
"import/no-unresolved": "error",
40+
"import/no-default-export": "warn",
41+
"import/order": [
42+
"error",
43+
{
44+
"groups": ["builtin", "external", "internal"],
45+
"pathGroups": [
46+
{
47+
"pattern": "react",
48+
"group": "external",
49+
"position": "before"
50+
}
51+
],
52+
"pathGroupsExcludedImportTypes": ["react"],
53+
"newlines-between": "always",
54+
"alphabetize": {
55+
"order": "asc",
56+
"caseInsensitive": true
57+
}
58+
}
59+
]
60+
},
61+
"overrides": [
62+
{
63+
"files": [
64+
"./app/root.tsx",
65+
"./app/entry.client.tsx",
66+
"./app/entry.server.tsx",
67+
"./app/routes/**/*.tsx"
68+
],
69+
"rules": {
70+
"import/no-default-export": "off"
71+
}
72+
}
73+
]
7474
}

‎.github/workflows/for-this-stack-repo-only.yml‎

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,60 @@
11
name: 🚀 Check Stack
22
on:
3-
push:
4-
branches:
5-
- main
6-
- dev
7-
pull_request: {}
3+
push:
4+
branches:
5+
- main
6+
- dev
7+
pull_request: {}
88
permissions:
9-
actions: write
10-
contents: read
9+
actions: write
10+
contents: read
1111

1212
jobs:
13-
lint:
14-
name: ⬣ ESLint
15-
runs-on: ubuntu-latest
16-
steps:
17-
- name: 🛑 Cancel Previous Runs
18-
uses: styfle/cancel-workflow-action@0.11.0
19-
20-
- name: ⬇️ Checkout repo
21-
uses: actions/checkout@v3
22-
23-
- name: ⎔ Setup node
24-
uses: actions/setup-node@v3
25-
with:
26-
node-version: 16
27-
28-
- name: 📥 Download deps
29-
uses: bahmutov/npm-install@v1
30-
with:
31-
useLockFile: false
32-
33-
- name: ⚙️ Build CSS
34-
run: npm run generate:css
35-
36-
- name: 🔬 Lint
37-
run: npm run lint
38-
39-
typecheck:
40-
name: ʦ TypeScript
41-
runs-on: ubuntu-latest
42-
steps:
43-
- name: 🛑 Cancel Previous Runs
44-
uses: styfle/cancel-workflow-action@0.11.0
45-
46-
- name: ⬇️ Checkout repo
47-
uses: actions/checkout@v3
48-
49-
- name: ⎔ Setup node
50-
uses: actions/setup-node@v3
51-
with:
52-
node-version: 16
53-
54-
- name: 📥 Download deps
55-
uses: bahmutov/npm-install@v1
56-
with:
57-
useLockFile: false
58-
59-
- name: 🔎 Type check
60-
run: npm run typecheck --if-present
13+
lint:
14+
name: ⬣ ESLint
15+
runs-on: ubuntu-latest
16+
steps:
17+
- name: 🛑 Cancel Previous Runs
18+
uses: styfle/cancel-workflow-action@0.11.0
19+
20+
- name: ⬇️ Checkout repo
21+
uses: actions/checkout@v3
22+
23+
- name: ⎔ Setup node
24+
uses: actions/setup-node@v3
25+
with:
26+
node-version: 16
27+
28+
- name: 📥 Download deps
29+
uses: bahmutov/npm-install@v1
30+
with:
31+
useLockFile: false
32+
33+
- name: ⚙️ Build CSS
34+
run: npm run generate:css
35+
36+
- name: 🔬 Lint
37+
run: npm run lint
38+
39+
typecheck:
40+
name: ʦ TypeScript
41+
runs-on: ubuntu-latest
42+
steps:
43+
- name: 🛑 Cancel Previous Runs
44+
uses: styfle/cancel-workflow-action@0.11.0
45+
46+
- name: ⬇️ Checkout repo
47+
uses: actions/checkout@v3
48+
49+
- name: ⎔ Setup node
50+
uses: actions/setup-node@v3
51+
with:
52+
node-version: 16
53+
54+
- name: 📥 Download deps
55+
uses: bahmutov/npm-install@v1
56+
with:
57+
useLockFile: false
58+
59+
- name: 🔎 Type check
60+
run: npm run typecheck --if-present

‎.gitignore‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,7 @@ node_modules
55
.env
66
.cache
77

8-
/app/styles/tailwind.css
8+
# lock files
9+
package-lock.json
10+
yarn.lock
11+
pnpm-lock.yaml

‎.prettierrc.cjs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
/** @type {import("prettier").Options} */
2+
module.exports = {
3+
tabWidth: 4,
4+
useTabs: true,
5+
};

‎.vscode/settings.json‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
{
2-
"tailwindCSS.experimental.classRegex": [
3-
["tw\\(([^)]*)\\)", "[\"'`]([^\"'`]*).*?[\"'`]"]
4-
]
2+
"tailwindCSS.experimental.classRegex": [
3+
["tw\\(([^)]*)\\)", "[\"'`]([^\"'`]*).*?[\"'`]"]
4+
],
5+
"typescript.tsdk": "node_modules/typescript/lib",
6+
"editor.tabSize": 4,
7+
"editor.insertSpaces": false,
58
}

‎Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# base node image
2-
FROM node:16-bullseye-slim as base
2+
FROM node:18-bookworm-slim as base
33

44
# set for base and all layer that inherit from it
55
ENV NODE_ENV production
@@ -12,7 +12,7 @@ FROM base as deps
1212

1313
WORKDIR /myapp
1414

15-
ADD package.json package-lock.json ./
15+
ADD package.json ./
1616
RUN npm install --production=false
1717

1818
# Setup production node_modules
@@ -21,7 +21,7 @@ FROM base as production-deps
2121
WORKDIR /myapp
2222

2323
COPY --from=deps /myapp/node_modules /myapp/node_modules
24-
ADD package.json package-lock.json ./
24+
ADD package.json ./
2525
RUN npm prune --production
2626

2727
# Build the app

0 commit comments

Comments
 (0)