Skip to content

Commit 84cb321

Browse files
committed
Initial commit: Full-stack framework setup
1 parent f142bc4 commit 84cb321

File tree

21 files changed

+4889
-11
lines changed

21 files changed

+4889
-11
lines changed

.gitignore

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,50 @@
1+
<<<<<<< HEAD
12
# dependencies
23
/node_modules
34

45
# IDE
56
/.idea
67
/.awcache
78
/.vscode
9+
=======
10+
# Dependencies
11+
node_modules/
12+
**/node_modules/
13+
.pnp/
14+
.pnp.js
15+
16+
# Testing
17+
coverage/
18+
**/coverage/
19+
20+
# Production
21+
dist/
22+
**/dist/
23+
build/
24+
**/build/
25+
26+
# Misc
27+
.DS_Store
28+
.env
29+
.env.local
30+
.env.development.local
31+
.env.test.local
32+
.env.production.local
33+
34+
# Logs
35+
npm-debug.log*
36+
yarn-debug.log*
37+
yarn-error.log*
38+
39+
# IDE
40+
.idea/
41+
.vscode/
42+
*.swp
43+
*.swo
44+
45+
# TypeScript
46+
*.tsbuildinfo
47+
>>>>>>> fc196e7 (Initial commit: Full-stack framework setup)
848

949
# misc
1050
npm-debug.log
@@ -15,9 +55,12 @@ npm-debug.log
1555
/coverage
1656
/.nyc_output
1757

58+
<<<<<<< HEAD
1859
# dist
1960
dist
2061

62+
=======
63+
>>>>>>> fc196e7 (Initial commit: Full-stack framework setup)
2164
# temporary reports
2265
eslint_report.json
2366

integrations/sample-app/package.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,11 @@
4949
"@aws-sdk/client-s3": "^3.689.0",
5050
"@aws-sdk/credential-providers": "^3.687.0",
5151
"@aws-sdk/s3-request-presigner": "^3.689.0",
52+
<<<<<<< HEAD
5253
"@intentjs/core": "workspace:*",
54+
=======
55+
"@intentjs/core": "*",
56+
>>>>>>> fc196e7 (Initial commit: Full-stack framework setup)
5357
"bcrypt": "^5.1.1",
5458
"class-transformer": "^0.5.1",
5559
"class-validator": "^0.14.1",
@@ -66,8 +70,13 @@
6670
"winston": "^3.14.2"
6771
},
6872
"devDependencies": {
73+
<<<<<<< HEAD
6974
"@intentjs/cli": "workspace:*",
7075
"@intentjs/tooling": "workspace:*",
76+
=======
77+
"@intentjs/cli": "*",
78+
"@intentjs/tooling": "*",
79+
>>>>>>> fc196e7 (Initial commit: Full-stack framework setup)
7180
"@nestjs/testing": "^10.0.0",
7281
"@rollup/plugin-typescript": "^12.1.2",
7382
"@rspack/cli": "^1.2.8",

0 commit comments

Comments
 (0)