wasp-lang/wasp
1
1
Fork 0
mirror of https://github.com/wasp-lang/wasp.git synced 2024-12-27 19:14:52 +03:00
Code Issues Projects Releases Wiki Activity

Fixes bundler setup (#1728)

Browse Source
This commit is contained in:
Mihovil Ilakovac 2024-02-08 12:37:20 +01:00 committed by GitHub
parent dbc2a7f5ea
commit 985825bcd8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
waspc/data/Generator/templates/server/rollup.config.js
View File

@ -1,8 +1,11 @@
{{={= =}=}}
import esbuild from 'rollup-plugin-esbuild'
export default [
createBundle('src/server.ts', 'bundle/server.js'),
{=# areDbSeedsDefined =}
createBundle('src/dbSeed.ts', 'bundle/dbSeed.js'),
{=/ areDbSeedsDefined =}
]
function createBundle(inputFilePath, outputFilePath) {

13
waspc/src/Wasp/Generator/ServerGenerator.hs
View File

@ -50,7 +50,7 @@ import Wasp.Generator.ServerGenerator.Auth.OAuthAuthG (depsRequiredByPassport)
import Wasp.Generator.ServerGenerator.AuthG (genAuth)
import qualified Wasp.Generator.ServerGenerator.Common as C
import Wasp.Generator.ServerGenerator.CrudG (genCrud)
import Wasp.Generator.ServerGenerator.Db.Seed (genDbSeed, getPackageJsonPrismaSeedField)
import Wasp.Generator.ServerGenerator.Db.Seed (genDbSeed, getDbSeeds, getPackageJsonPrismaSeedField)
import Wasp.Generator.ServerGenerator.JobGenerator (depsRequiredByJobs, genJobExecutors, genJobs)
import Wasp.Generator.ServerGenerator.JsImport (extImportToImportJson, getAliasedJsImportStmtAndIdentifier)
import Wasp.Generator.ServerGenerator.OperationsG (genOperations)
@ -66,7 +66,7 @@ genServer spec =
sequence
[ genFileCopy [relfile|README.md|],
genFileCopy [relfile|nodemon.json|],
genFileCopy [relfile|rollup.config.js|],
genRollupConfigJs spec,
genTsConfigJson,
genPackageJson spec (npmDepsForWasp spec),
genNpmrc,
@ -347,3 +347,12 @@ genOperationsMiddleware spec =
(Just tmplData)
where
tmplData = object ["isAuthEnabled" .= (isAuthEnabled spec :: Bool)]
genRollupConfigJs :: AppSpec -> Generator FileDraft
genRollupConfigJs spec =
return $
C.mkTmplFdWithData [relfile|rollup.config.js|] (Just tmplData)
where
tmplData = object ["areDbSeedsDefined" .= areDbSeedsDefined]
areDbSeedsDefined = maybe False (not . null) $ getDbSeeds spec

1
waspc/src/Wasp/Generator/ServerGenerator/Db/Seed.hs
View File

@ -2,6 +2,7 @@ module Wasp.Generator.ServerGenerator.Db.Seed
( genDbSeed,
getPackageJsonPrismaSeedField,
dbSeedNameEnvVarName,
getDbSeeds,
)
where