Sort out restructuring leftovers

2024-12-27 19:14:52 +03:00 · 2024-01-29 17:20:35 +01:00 · 2024-01-29 17:20:35 +01:00 · f7587a2c9c
commit f7587a2c9c
parent 0c178c0719
4 changed files with 9 additions and 149 deletions
--- a/waspc/cli/src/Wasp/Cli/Command/Watch.hs
+++ b/waspc/cli/src/Wasp/Cli/Command/Watch.hs
@ -25,11 +25,13 @@ import Wasp.Project.Common (extPublicDirInWaspProjectDir, srcDirInWaspProjectDir
 --   .wasp dir, and users can easily add any custom stuff they want ignored. But, we also have to
 --   be ready for the case when there is no .gitignore, that could be possible.

-- | Forever listens for any file changes at the very top level of @waspProjectDir@, and also for
-- any changes at any depth in the @waspProjectDir@/src/ dir. If there is a change, compiles Wasp
-- source files in @waspProjectDir@ and regenerates files in @outDir@. It will defer recompilation
-- until no new change was detected in the last second. It also takes 'ongoingCompilationResultMVar'
-- MVar, into which it stores the result (warnings, errors) of the latest (re)compile whenever it
+-- | Forever listens for any file changes at the very top level of
+-- @waspProjectDir@, and also for any changes at any depth in the
+-- @waspProjectDir@/src/ and @WaspProjectDir@/public dirs. If there is a change,
+-- compiles Wasp source files in @waspProjectDir@ and regenerates files in
+-- @outDir@. It will defer recompilation until no new change was detected in the
+-- last second. It also takes 'ongoingCompilationResultMVar' MVar, into which it
+-- stores the result (warnings, errors) of the latest (re)compile whenever it
 -- happens. If there is already something in the MVar, it will get overwritten.
 watch ::
  Path' Abs (Dir WaspProjectDir) ->
--- a/waspc/data/Cli/templates/basic/package.json
+++ b/waspc/data/Cli/templates/basic/package.json
@ -9,15 +9,5 @@
    "vite": "^4.3.9",
    "@types/react": "^18.0.37",
    "prisma": "4.16.2"
-  },
-  "//": [
-    "COMMENTS:",
-    {
-      "devDependencies.prisma": [
-        "We on purpose specify exact version for prisma.",
-        "Check this GH comment for the reasoning behind it:",
-        "https://github.com/wasp-lang/wasp/pull/634#issuecomment-1158802302 ."
-      ]
-    }
-  ]
+  }
 }
--- a/waspc/data/Generator/templates/sdk/dependencies.txt
+++ b/waspc/data/Generator/templates/sdk/dependencies.txt
@ -1,132 +0,0 @@
-Dependencies:
-
-("@prisma/client", show prismaVersion), // sdk
-("@tanstack/react-query", "^4.29.0"),  // sdk 
-("axios", "^1.4.0"), // sdk
-("cookie-parser", "~1.4.6"), // 
-("cors", "^2.8.5"), // 
-("dotenv", "16.0.2"), //
-("express", "~4.18.1"), // sdk (for types)
-("helmet", "^6.0.0"), // 
-("jsonwebtoken", "^8.5.1"), // sdk
-("lodash.merge", "^4.6.2"), // 
-("mitt", "3.0.0"), // sdk
-("morgan", "~1.10.0"), //
-("patch-package", "^6.4.7"), //
-("rate-limiter-flexible", "^2.4.1"), //
-("react", "^18.2.0"), // sdk 
-("react-dom", "^18.2.0"), //
-("react-hook-form", "^7.45.4") //
-("react-router-dom", "^5.3.3"), // sdk
-("secure-password", "^4.0.0"), // sdk
-("superjson", "^1.12.2"), // sdk
-("uuid", "^9.0.0"), //
-          
-Dev dependencies:
-("@tsconfig/node" ++ show (major NodeVersion.latestMajorNodeVersion), "^1.0.1"),
-("@tsconfig/vite-react", "^2.0.0")
-("@types/cors", "^2.8.5")
-("@types/express", "^4.17.13"),
-("@types/express-serve-static-core", "^4.17.13"),
-("@types/node", "^18.11.9"),
-("@types/react", "^18.0.37"),
-("@types/react-dom", "^18.0.11"),
-("@types/react-router-dom", "^5.3.3"),
-("@types/uuid", "^9.0.0"),
-("@vitejs/plugin-react-swc", "^3.0.0"),
-("dotenv", "^16.0.3"), // duplicate
-("nodemon", "^2.0.19"), //
-("prisma", show prismaVersion), //
-("standard", "^17.0.0"), //
-("typescript", "^5.1.0"), //
-("vite", "^4.3.9"), //
-
-Their package.json:
-("react", "^18.2.0"),
-("typescript", "^5.1.0")
-
-
-Server 
-
-("cookie-parser", "~1.4.6"),
- [Framework] Generator/templates/server/src/middleware/globalMiddleware.ts
-
-("cors", "^2.8.5"),
- [Framework] Generator/templates/server/src/middleware/globalMiddleware.ts
-
-("express", "~4.18.1"),
- Generator/templates/server/src/auth/providers/config/local.ts
- Generator/templates/server/src/auth/providers/config/email.ts
- Generator/templates/server/src/routes/crud/index.ts
- Generator/templates/server/src/routes/crud/_crud.ts
- Generator/templates/server/src/routes/operations/index.js
- Generator/templates/server/src/routes/index.js
- Generator/templates/server/src/auth/providers/index.ts
- Generator/templates/server/src/auth/providers/oauth/createRouter.ts
- Generator/templates/server/src/routes/apis/index.ts
- Generator/templates/server/src/auth/providers/types.ts
- Generator/templates/server/src/types/index.ts
- Generator/templates/server/src/middleware/globalMiddleware.ts
- Generator/templates/server/src/app.js
- Generator/templates/server/src/auth/providers/email/signup.ts
- Generator/templates/server/src/routes/auth/index.js
- Generator/templates/server/src/auth/providers/email/login.ts
- Generator/templates/server/src/auth/providers/email/resetPassword.ts
- Generator/templates/server/src/auth/providers/email/requestPasswordReset.ts
- Generator/templates/server/src/auth/providers/email/verifyEmail.ts
- Generator/templates/server/src/_types/index.ts
- Generator/templates/server/src/apis/types.ts
- 
-("morgan", "~1.10.0"),
- [Framework] Generator/templates/server/src/middleware/globalMiddleware.ts
-
-("@prisma/client", show prismaVersion),
- [SDK] Generator/templates/react-app/src/entities/index.ts
- [SDK] Generator/templates/server/src/dbClient.ts
- [Framework] Generator/templates/server/src/utils.js
- Generator/templates/server/src/auth/utils.ts
- Generator/templates/server/src/entities/index.ts
- Generator/templates/server/src/auth/providers/oauth/types.ts
- Generator/templates/server/src/crud/_operations.ts
- Generator/templates/server/src/dbSeed/types.ts
-
-
-("jsonwebtoken", "^8.5.1"),
-- NOTE: secure-password has a package.json override for sodium-native.
-("secure-password", "^4.0.0"),
-("dotenv", "16.0.2"),
-("helmet", "^6.0.0"),
-("patch-package", "^6.4.7"),
-("uuid", "^9.0.0"),
-("lodash.merge", "^4.6.2"),
-("rate-limiter-flexible", "^2.4.1"),
-("superjson", "^1.12.2")
-
-depsRequiredByPassport spec
-
-depsRequiredByJobs spec
-
-depsRequiredByEmail spec
-
-depsRequiredByWebSockets spec,
-      N.waspDevDependencies =
-        AS.Dependency.fromList
-          [ ("nodemon", "^2.0.19"),
-            ("standard", "^17.0.0"),
-            ("prisma", show prismaVersion),
-            -- TODO: Allow users to choose whether they want to use TypeScript
-            -- in their projects and install these dependencies accordingly.
-            ("typescript", "^5.1.0"),
-            ("@types/express", "^4.17.13"),
-            ("@types/express-serve-static-core", "^4.17.13"),
-            ("@types/node", "^18.11.9"),
-            ("@tsconfig/node" ++ show (major NodeVersion.latestMajorNodeVersion), "^1.0.1"),
-            ("@types/uuid", "^9.0.0"),
-            ("@types/cors", "^2.8.5")
-          ]
-    }
-
-
-LOG:
- react moved from web-app to project package.json
- react-dom moved from web-app to project package.json
--- a/waspc/examples/todo-typescript/src/task/actions.ts
+++ b/waspc/examples/todo-typescript/src/task/actions.ts
@ -21,7 +21,7 @@ export const createTask: CreateTask<CreateArgs, Task> = async (
    to: 'test@test.com',
    from: {
      name: 'Test',
-      email: 'test@test.com'
+      email: 'test@test.com',
    },
    subject: 'Test email',
    text: 'Thank you for using our app!',