Initial commit: Full-stack framework setup

.gitignore

@@ -1,10 +1,50 @@
+<<<<<<< HEAD
 # dependencies
 /node_modules
 
 # IDE
 /.idea
 /.awcache
 /.vscode
+=======
+# Dependencies
+node_modules/
+**/node_modules/
+.pnp/
+.pnp.js
+
+# Testing
+coverage/
+**/coverage/
+
+# Production
+dist/
+**/dist/
+build/
+**/build/
+
+# Misc
+.DS_Store
+.env
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+# Logs
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# IDE
+.idea/
+.vscode/
+*.swp
+*.swo
+
+# TypeScript
+*.tsbuildinfo
+>>>>>>> fc196e7 (Initial commit: Full-stack framework setup)
 
 # misc
 npm-debug.log
@@ -15,9 +55,12 @@ npm-debug.log
 /coverage
 /.nyc_output
 
+<<<<<<< HEAD
 # dist
 dist
 
+=======
+>>>>>>> fc196e7 (Initial commit: Full-stack framework setup)
 # temporary reports
 eslint_report.json
 

integrations/sample-app/package.json

@@ -49,7 +49,11 @@
     "@aws-sdk/client-s3": "^3.689.0",
     "@aws-sdk/credential-providers": "^3.687.0",
     "@aws-sdk/s3-request-presigner": "^3.689.0",
+<<<<<<< HEAD
     "@intentjs/core": "workspace:*",
+=======
+    "@intentjs/core": "*",
+>>>>>>> fc196e7 (Initial commit: Full-stack framework setup)
     "bcrypt": "^5.1.1",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.1",
@@ -66,8 +70,13 @@
     "winston": "^3.14.2"
   },
   "devDependencies": {
+<<<<<<< HEAD
     "@intentjs/cli": "workspace:*",
     "@intentjs/tooling": "workspace:*",
+=======
+    "@intentjs/cli": "*",
+    "@intentjs/tooling": "*",
+>>>>>>> fc196e7 (Initial commit: Full-stack framework setup)
     "@nestjs/testing": "^10.0.0",
     "@rollup/plugin-typescript": "^12.1.2",
     "@rspack/cli": "^1.2.8",