diff --git a/waspc/cli/src/Wasp/Cli/Command/Build.hs b/waspc/cli/src/Wasp/Cli/Command/Build.hs
index 8b75b2e7f7..26c83d2fec 100644
--- a/waspc/cli/src/Wasp/Cli/Command/Build.hs
+++ b/waspc/cli/src/Wasp/Cli/Command/Build.hs
@@ -69,7 +69,9 @@ buildIO waspProjectDir buildDir = compileIOWithOptions options waspProjectDir bu
where
options =
CompileOptions
- { externalCodeDirPath = waspProjectDir Common.extCodeDirInWaspProjectDir,
+ { externalClientCodeDirPath = waspProjectDir Common.extClientCodeDirInWaspProjectDir,
+ externalServerCodeDirPath = waspProjectDir Common.extServerCodeDirInWaspProjectDir,
+ externalSharedCodeDirPath = waspProjectDir Common.extSharedCodeDirInWaspProjectDir,
isBuild = True,
sendMessage = cliSendMessage,
-- Ignore "DB needs migration warnings" during build, as that is not a required step.
diff --git a/waspc/cli/src/Wasp/Cli/Command/Compile.hs b/waspc/cli/src/Wasp/Cli/Command/Compile.hs
index dd92a34330..bb9231ceb4 100644
--- a/waspc/cli/src/Wasp/Cli/Command/Compile.hs
+++ b/waspc/cli/src/Wasp/Cli/Command/Compile.hs
@@ -114,7 +114,9 @@ compileIOWithOptions options waspProjectDir outDir =
defaultCompileOptions :: Path' Abs (Dir WaspProjectDir) -> CompileOptions
defaultCompileOptions waspProjectDir =
CompileOptions
- { externalCodeDirPath = waspProjectDir Common.extCodeDirInWaspProjectDir,
+ { externalServerCodeDirPath = waspProjectDir Common.extServerCodeDirInWaspProjectDir,
+ externalClientCodeDirPath = waspProjectDir Common.extClientCodeDirInWaspProjectDir,
+ externalSharedCodeDirPath = waspProjectDir Common.extSharedCodeDirInWaspProjectDir,
isBuild = False,
sendMessage = cliSendMessage,
generatorWarningsFilter = id
diff --git a/waspc/cli/src/Wasp/Cli/Command/CreateNewProject.hs b/waspc/cli/src/Wasp/Cli/Command/CreateNewProject.hs
index a6fb057103..d57c2637f1 100644
--- a/waspc/cli/src/Wasp/Cli/Command/CreateNewProject.hs
+++ b/waspc/cli/src/Wasp/Cli/Command/CreateNewProject.hs
@@ -6,18 +6,18 @@ where
import Control.Monad.Except (throwError)
import Control.Monad.IO.Class (liftIO)
import Data.List (intercalate)
-import StrongPath (Abs, Dir, File', Path', Rel, reldir, relfile, ())
-import qualified StrongPath as SP
-import System.Directory (createDirectory, getCurrentDirectory)
-import qualified System.Directory
+import Path.IO (copyDirRecur, doesDirExist)
+import StrongPath (Abs, Dir, Path, Path', System, fromAbsFile, parseAbsDir, reldir, relfile, ())
+import StrongPath.Path (toPathAbsDir)
+import System.Directory (getCurrentDirectory)
import qualified System.FilePath as FP
import Text.Printf (printf)
import Wasp.Analyzer.Parser (isValidWaspIdentifier)
-import Wasp.AppSpec.ExternalCode (SourceExternalCodeDir)
import Wasp.Cli.Command (Command, CommandError (..))
import qualified Wasp.Cli.Command.Common as Command.Common
-import qualified Wasp.Cli.Common as Common
-import qualified Wasp.Data
+import Wasp.Common (WaspProjectDir)
+import qualified Wasp.Common as Common (WaspProjectDir)
+import qualified Wasp.Data as Data
import Wasp.Util (indent, kebabToCamelCase)
import qualified Wasp.Util.Terminal as Term
import qualified Wasp.Version as WV
@@ -27,14 +27,30 @@ data ProjectInfo = ProjectInfo
_appName :: String
}
+createNewProject :: String -> Command ()
+createNewProject projectNameCandidate = do
+ projectInfo <- parseProjectInfo projectNameCandidate
+ createWaspProjectDir projectInfo
+ liftIO $ printGettingStartedInstructions $ _projectName projectInfo
+ where
+ printGettingStartedInstructions :: String -> IO ()
+ printGettingStartedInstructions projectName = do
+ putStrLn $ Term.applyStyles [Term.Green] ("Created new Wasp app in ./" ++ projectName ++ " directory!")
+ putStrLn "To run it, do:"
+ putStrLn ""
+ putStrLn $ Term.applyStyles [Term.Bold] (" cd " ++ projectName)
+ putStrLn $ Term.applyStyles [Term.Bold] " wasp start"
+ putStrLn ""
+ putStrLn Command.Common.alphaWarningMessage
+
-- Takes a project name String
-- Returns either the ProjectInfo type that contains both the Project name
-- and the App name (which might be the same), or an error describing why the name is invalid
-parseProjectInfo :: String -> Either String ProjectInfo
+parseProjectInfo :: String -> Command ProjectInfo
parseProjectInfo name
- | isValidWaspIdentifier appName = Right (ProjectInfo name appName)
+ | isValidWaspIdentifier appName = return $ ProjectInfo name appName
| otherwise =
- Left $
+ throwProjectCreationError $
intercalate
"\n"
[ "The project's name is not in the valid format!",
@@ -45,81 +61,36 @@ parseProjectInfo name
where
appName = kebabToCamelCase name
-createNewProject :: String -> Command ()
-createNewProject name =
- case parseProjectInfo name of
- Right projectInfo -> createNewProject' projectInfo
- Left parsedError ->
- throwError $
- CommandError "Project creation failed" parsedError
-
-createNewProject' :: ProjectInfo -> Command ()
-createNewProject' (ProjectInfo projectName appName) = do
+createWaspProjectDir :: ProjectInfo -> Command ()
+createWaspProjectDir projectInfo = do
+ absWaspProjectDir <- getAbsoluteWaspProjectDir projectInfo
+ dirExists <- doesDirExist $ toPathAbsDir absWaspProjectDir
+ if dirExists
+ then throwProjectCreationError $ show absWaspProjectDir ++ " is an existing directory"
+ else liftIO $ do
+ initializeProjectFromSkeleton absWaspProjectDir
+ writeMainWaspFile absWaspProjectDir projectInfo
+
+getAbsoluteWaspProjectDir :: ProjectInfo -> Command (Path System Abs (Dir WaspProjectDir))
+getAbsoluteWaspProjectDir (ProjectInfo projectName _) = do
absCwd <- liftIO getCurrentDirectory
- waspProjectDir <- case SP.parseAbsDir $ absCwd FP. projectName of
- Left err ->
- throwError $
- CommandError
- "Project creation failed"
- ( "Failed to parse absolute path to wasp project dir: "
- ++ show err
- )
+ case parseAbsDir $ absCwd FP. projectName of
Right sp -> return sp
- liftIO $ do
- createDirectorySP waspProjectDir
- writeFileSP (waspProjectDir mainWaspFileInWaspProjectDir) mainWaspFileContent
- writeFileSP (waspProjectDir gitignoreFileInWaspProjectDir) gitignoreFileContent
- writeFileSP
- (waspProjectDir Common.dotWaspRootFileInWaspProjectDir)
- "File marking the root of Wasp project."
-
- let extCodeDir = waspProjectDir Common.extCodeDirInWaspProjectDir
- liftIO $ do
- createDirectorySP extCodeDir
- dataDir <- Wasp.Data.getAbsDataDirPath
-
- let copyTemplateFile' = copyTemplateFile dataDir extCodeDir
-
- writeFileSP (extCodeDir waspignoreFileInExtCodeDir) waspignoreFileContent
-
- copyTemplateFile'
- [relfile|new/ext/MainPage.js|]
- mainPageJsFileInExtCodeDir
-
- copyTemplateFile'
- [relfile|new/ext/Main.css|]
- mainCssFileInExtCodeDir
-
- copyTemplateFile'
- [relfile|new/ext/waspLogo.png|]
- waspLogoFileInExtCodeDir
-
- liftIO $ do
- putStrLn $ Term.applyStyles [Term.Green] ("Created new Wasp app in ./" ++ projectName ++ " directory!")
- putStrLn "To run it, do:"
- putStrLn ""
- putStrLn $ Term.applyStyles [Term.Bold] (" cd " ++ projectName)
- putStrLn $ Term.applyStyles [Term.Bold] " wasp start"
- putStrLn ""
- putStrLn Command.Common.alphaWarningMessage
+ Left err ->
+ throwProjectCreationError $
+ "Failed to parse absolute path to wasp project dir: " ++ show err
+
+-- Copies prepared files to the new project directory.
+initializeProjectFromSkeleton :: Path' Abs (Dir Common.WaspProjectDir) -> IO ()
+initializeProjectFromSkeleton absWaspProjectDir = do
+ dataDir <- Data.getAbsDataDirPath
+ let absSkeletonDir = dataDir [reldir|Cli/templates/new|]
+ copyDirRecur (toPathAbsDir absSkeletonDir) (toPathAbsDir absWaspProjectDir)
+
+writeMainWaspFile :: Path System Abs (Dir WaspProjectDir) -> ProjectInfo -> IO ()
+writeMainWaspFile waspProjectDir (ProjectInfo projectName appName) = writeFile absMainWaspFile mainWaspFileContent
where
- copyTemplateFile ::
- Path' Abs (Dir Wasp.Data.DataDir) ->
- Path' Abs (Dir SourceExternalCodeDir) ->
- Path' (Rel Common.CliTemplatesDir) File' ->
- Path' (Rel SourceExternalCodeDir) File' ->
- IO ()
- copyTemplateFile dataDir extCodeDir srcTmplFile dstExtDirFile =
- System.Directory.copyFile
- (SP.fromAbsFile (dataDir cliTemplatesDirInDataDir srcTmplFile))
- (SP.fromAbsFile (extCodeDir dstExtDirFile))
-
- cliTemplatesDirInDataDir :: Path' (Rel Wasp.Data.DataDir) (Dir Common.CliTemplatesDir)
- cliTemplatesDirInDataDir = [reldir|Cli/templates|]
-
- mainWaspFileInWaspProjectDir :: Path' (Rel Common.WaspProjectDir) File'
- mainWaspFileInWaspProjectDir = [relfile|main.wasp|]
-
+ absMainWaspFile = fromAbsFile $ waspProjectDir [relfile|main.wasp|]
mainWaspFileContent =
unlines
[ "app %s {" `printf` appName,
@@ -131,38 +102,9 @@ createNewProject' (ProjectInfo projectName appName) = do
"",
"route RootRoute { path: \"/\", to: MainPage }",
"page MainPage {",
- " component: import Main from \"@ext/MainPage.js\"",
+ " component: import Main from \"@client/MainPage.js\"",
"}"
]
- gitignoreFileInWaspProjectDir :: Path' (Rel Common.WaspProjectDir) File'
- gitignoreFileInWaspProjectDir = [relfile|.gitignore|]
-
- gitignoreFileContent =
- unlines
- [ "/.wasp/",
- "/.env.server",
- "/.env.client"
- ]
-
- waspignoreFileInExtCodeDir :: Path' (Rel SourceExternalCodeDir) File'
- waspignoreFileInExtCodeDir = [relfile|.waspignore|]
-
- waspignoreFileContent =
- unlines
- [ "# Ignore editor tmp files",
- "**/*~",
- "**/#*#"
- ]
-
- mainPageJsFileInExtCodeDir :: Path' (Rel SourceExternalCodeDir) File'
- mainPageJsFileInExtCodeDir = [relfile|MainPage.js|]
-
- mainCssFileInExtCodeDir :: Path' (Rel SourceExternalCodeDir) File'
- mainCssFileInExtCodeDir = [relfile|Main.css|]
-
- waspLogoFileInExtCodeDir :: Path' (Rel SourceExternalCodeDir) File'
- waspLogoFileInExtCodeDir = [relfile|waspLogo.png|]
-
- writeFileSP = writeFile . SP.fromAbsFile
- createDirectorySP = createDirectory . SP.fromAbsDir
+throwProjectCreationError :: String -> Command a
+throwProjectCreationError = throwError . CommandError "Project creation failed"
diff --git a/waspc/cli/src/Wasp/Cli/Command/Deps.hs b/waspc/cli/src/Wasp/Cli/Command/Deps.hs
index 68b3ca94be..ed7d5acd39 100644
--- a/waspc/cli/src/Wasp/Cli/Command/Deps.hs
+++ b/waspc/cli/src/Wasp/Cli/Command/Deps.hs
@@ -5,7 +5,6 @@ where
import Control.Monad.Except (throwError)
import Control.Monad.IO.Class (liftIO)
-import Data.List.NonEmpty (toList)
import Wasp.AppSpec (AppSpec)
import qualified Wasp.AppSpec.App.Dependency as AS.Dependency
import Wasp.Cli.Command (Command, CommandError (..))
@@ -21,14 +20,14 @@ import qualified Wasp.Util.Terminal as Term
deps :: Command ()
deps = do
waspProjectDir <- findWaspProjectRootDirFromCwd
- (_, appSpecOrAnalyzerErrors) <- liftIO $ analyzeWaspProject waspProjectDir (defaultCompileOptions waspProjectDir)
+ appSpecOrAnalyzerErrors <- liftIO $ analyzeWaspProject waspProjectDir (defaultCompileOptions waspProjectDir)
appSpec <-
either
- (throwError . CommandError "Determining dependencies failed due to a compilation error in your Wasp project" . unwords . toList)
+ (throwError . CommandError "Determining dependencies failed due to a compilation error in your Wasp project" . unwords)
return
appSpecOrAnalyzerErrors
- liftIO . putStrLn $ depsMessage appSpec
+ liftIO $ putStrLn $ depsMessage appSpec
depsMessage :: AppSpec -> String
depsMessage appSpec =
diff --git a/waspc/cli/src/Wasp/Cli/Command/Info.hs b/waspc/cli/src/Wasp/Cli/Command/Info.hs
index 92a533ecfa..97b670ffa7 100644
--- a/waspc/cli/src/Wasp/Cli/Command/Info.hs
+++ b/waspc/cli/src/Wasp/Cli/Command/Info.hs
@@ -5,14 +5,14 @@ module Wasp.Cli.Command.Info
)
where
-import Control.Arrow (ArrowChoice (left))
-import Control.Monad.IO.Class (liftIO)
+import Control.Arrow
+import Control.Monad.Except
import StrongPath (Abs, Dir, Path', fromAbsFile, fromRelFile, toFilePath)
import StrongPath.Operations
import System.Directory (doesFileExist, getFileSize)
import qualified Wasp.Analyzer as Analyzer
-import qualified Wasp.AppSpec as AS
import qualified Wasp.AppSpec.App as AS.App
+import qualified Wasp.AppSpec.Core.Decl as AS (Decl, takeDecls)
import Wasp.Cli.Command (Command)
import Wasp.Cli.Command.Common (findWaspProjectRootDirFromCwd)
import Wasp.Cli.Command.Message (cliSendMessageC)
@@ -26,30 +26,23 @@ import Wasp.Util.IO (listDirectoryDeep)
import qualified Wasp.Util.Terminal as Term
info :: Command ()
-info =
- do
- waspDir <- findWaspProjectRootDirFromCwd
- compileInfo <- liftIO $ readCompileInformation waspDir
- projectSize <- liftIO $ readDirectorySizeMB waspDir
- declsOrError <- liftIO $ parseWaspFile waspDir
- case declsOrError of
- Left err -> cliSendMessageC $ Msg.Failure "Info failed" err
- Right decls -> do
- cliSendMessageC $
- Msg.Info $
- unlines
- [ "",
- title "Project information",
- printInfo
- "Name"
- (fst $ head $ AS.takeDecls @AS.App.App decls),
- printInfo
- "Last compile"
- compileInfo,
- printInfo
- "Project size"
- projectSize
- ]
+info = do
+ waspDir <- findWaspProjectRootDirFromCwd
+ compileInfo <- liftIO $ readCompileInformation waspDir
+ projectSize <- liftIO $ readDirectorySizeMB waspDir
+ declsOrError <- liftIO $ parseWaspFile waspDir
+ case declsOrError of
+ Left err -> cliSendMessageC $ Msg.Failure "Info failed" err
+ Right decls -> do
+ cliSendMessageC $
+ Msg.Info $
+ unlines
+ [ "",
+ title "Project information",
+ printInfo "Name" (fst $ head $ AS.takeDecls @AS.App.App decls),
+ printInfo "Last compile" compileInfo,
+ printInfo "Project size" projectSize
+ ]
printInfo :: String -> String -> String
printInfo key value = Term.applyStyles [Term.Cyan] key ++ ": " <> Term.applyStyles [Term.White] value
@@ -70,17 +63,12 @@ readCompileInformation waspDir = do
else return "No compile information found"
parseWaspFile :: Path' Abs (Dir WaspProjectDir) -> IO (Either String [AS.Decl])
-parseWaspFile waspDir = do
- maybeWaspFile <- findWaspFile waspDir
- case maybeWaspFile of
- Nothing -> return (Left "Couldn't find a single *.wasp file.")
- Just waspFile ->
- do
- waspStr <- readFile (toFilePath waspFile)
- return $
- left
- ( ("Couldn't parse .wasp file:\n" <>)
- . showCompilerErrorForTerminal (waspFile, waspStr)
- . Analyzer.getErrorMessageAndCtx
- )
- $ Analyzer.analyze waspStr
+parseWaspFile waspDir = runExceptT $ do
+ waspFile <- ExceptT $ findWaspFile waspDir
+ waspStr <- liftIO $ readFile $ toFilePath waspFile
+ liftEither $ left (annotateErrorForCli waspFile waspStr) $ Analyzer.analyze waspStr
+ where
+ annotateErrorForCli waspFile waspStr =
+ ("Couldn't parse .wasp file:\n" ++)
+ . showCompilerErrorForTerminal (waspFile, waspStr)
+ . Analyzer.getErrorMessageAndCtx
diff --git a/waspc/cli/src/Wasp/Cli/Command/Watch.hs b/waspc/cli/src/Wasp/Cli/Command/Watch.hs
index 33fddb7f00..9dd10bb2c9 100644
--- a/waspc/cli/src/Wasp/Cli/Command/Watch.hs
+++ b/waspc/cli/src/Wasp/Cli/Command/Watch.hs
@@ -39,18 +39,11 @@ watch ::
watch waspProjectDir outDir ongoingCompilationResultMVar = FSN.withManager $ \mgr -> do
currentTime <- getCurrentTime
chan <- newChan
- _ <-
- FSN.watchDirChan
- mgr
- (SP.fromAbsDir waspProjectDir)
- eventFilter
- chan
- _ <-
- FSN.watchTreeChan
- mgr
- (SP.fromAbsDir $ waspProjectDir Common.extCodeDirInWaspProjectDir)
- eventFilter
- chan
+ _ <- FSN.watchDirChan mgr (SP.fromAbsDir waspProjectDir) eventFilter chan
+ let watchProjectSubdirTree path = FSN.watchTreeChan mgr (SP.fromAbsDir $ waspProjectDir path) eventFilter chan
+ _ <- watchProjectSubdirTree Common.extClientCodeDirInWaspProjectDir
+ _ <- watchProjectSubdirTree Common.extServerCodeDirInWaspProjectDir
+ _ <- watchProjectSubdirTree Common.extSharedCodeDirInWaspProjectDir
listenForEvents chan currentTime
where
listenForEvents :: Chan FSN.Event -> UTCTime -> IO ()
@@ -87,7 +80,7 @@ watch waspProjectDir outDir ongoingCompilationResultMVar = FSN.withManager $ \mg
waitUntilNoNewEvents chan lastCompileTime secondsToDelay = do
eventOrDelay <- race (readChan chan) (threadDelaySeconds secondsToDelay)
case eventOrDelay of
- Left event -> do
+ Left event ->
unless (isStaleEvent event lastCompileTime) $
-- We have a new event, restart waiting process.
waitUntilNoNewEvents chan lastCompileTime secondsToDelay
diff --git a/waspc/cli/src/Wasp/Cli/Common.hs b/waspc/cli/src/Wasp/Cli/Common.hs
index dc60e6cbbd..cece47fefc 100644
--- a/waspc/cli/src/Wasp/Cli/Common.hs
+++ b/waspc/cli/src/Wasp/Cli/Common.hs
@@ -5,7 +5,9 @@ module Wasp.Cli.Common
dotWaspDirInWaspProjectDir,
dotWaspRootFileInWaspProjectDir,
dotWaspInfoFileInGeneratedCodeDir,
- extCodeDirInWaspProjectDir,
+ extServerCodeDirInWaspProjectDir,
+ extClientCodeDirInWaspProjectDir,
+ extSharedCodeDirInWaspProjectDir,
generatedCodeDirInDotWaspDir,
buildDirInDotWaspDir,
waspSays,
@@ -41,8 +43,14 @@ dotWaspRootFileInWaspProjectDir = [relfile|.wasproot|]
dotWaspInfoFileInGeneratedCodeDir :: Path' (Rel Wasp.Generator.Common.ProjectRootDir) File'
dotWaspInfoFileInGeneratedCodeDir = [relfile|.waspinfo|]
-extCodeDirInWaspProjectDir :: Path' (Rel WaspProjectDir) (Dir SourceExternalCodeDir)
-extCodeDirInWaspProjectDir = [reldir|ext|]
+extServerCodeDirInWaspProjectDir :: Path' (Rel WaspProjectDir) (Dir SourceExternalCodeDir)
+extServerCodeDirInWaspProjectDir = [reldir|src/server|]
+
+extClientCodeDirInWaspProjectDir :: Path' (Rel WaspProjectDir) (Dir SourceExternalCodeDir)
+extClientCodeDirInWaspProjectDir = [reldir|src/client|]
+
+extSharedCodeDirInWaspProjectDir :: Path' (Rel WaspProjectDir) (Dir SourceExternalCodeDir)
+extSharedCodeDirInWaspProjectDir = [reldir|src/shared|]
waspSays :: String -> IO ()
waspSays what = putStrLn $ Term.applyStyles [Term.Yellow] what
diff --git a/waspc/data/Cli/templates/new/.gitignore b/waspc/data/Cli/templates/new/.gitignore
new file mode 100644
index 0000000000..c51177f6dc
--- /dev/null
+++ b/waspc/data/Cli/templates/new/.gitignore
@@ -0,0 +1,3 @@
+/.wasp/
+/.env.server
+/.env.client
diff --git a/waspc/data/Cli/templates/new/.wasproot b/waspc/data/Cli/templates/new/.wasproot
new file mode 100644
index 0000000000..ca2cfdb482
--- /dev/null
+++ b/waspc/data/Cli/templates/new/.wasproot
@@ -0,0 +1 @@
+File marking the root of Wasp project.
diff --git a/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/ext/.waspignore b/waspc/data/Cli/templates/new/src/.waspignore
similarity index 100%
rename from waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/ext/.waspignore
rename to waspc/data/Cli/templates/new/src/.waspignore
diff --git a/waspc/data/Cli/templates/new/src/client/.gitkeep b/waspc/data/Cli/templates/new/src/client/.gitkeep
new file mode 100644
index 0000000000..878bca16e5
--- /dev/null
+++ b/waspc/data/Cli/templates/new/src/client/.gitkeep
@@ -0,0 +1 @@
+This file forces Git to commit an empty directory.
diff --git a/waspc/data/Cli/templates/new/ext/Main.css b/waspc/data/Cli/templates/new/src/client/Main.css
similarity index 100%
rename from waspc/data/Cli/templates/new/ext/Main.css
rename to waspc/data/Cli/templates/new/src/client/Main.css
diff --git a/waspc/data/Cli/templates/new/ext/MainPage.js b/waspc/data/Cli/templates/new/src/client/MainPage.js
similarity index 100%
rename from waspc/data/Cli/templates/new/ext/MainPage.js
rename to waspc/data/Cli/templates/new/src/client/MainPage.js
diff --git a/waspc/data/Cli/templates/new/ext/waspLogo.png b/waspc/data/Cli/templates/new/src/client/waspLogo.png
similarity index 100%
rename from waspc/data/Cli/templates/new/ext/waspLogo.png
rename to waspc/data/Cli/templates/new/src/client/waspLogo.png
diff --git a/waspc/data/Cli/templates/new/src/server/.gitkeep b/waspc/data/Cli/templates/new/src/server/.gitkeep
new file mode 100644
index 0000000000..878bca16e5
--- /dev/null
+++ b/waspc/data/Cli/templates/new/src/server/.gitkeep
@@ -0,0 +1 @@
+This file forces Git to commit an empty directory.
diff --git a/waspc/data/Cli/templates/new/src/shared/.gitkeep b/waspc/data/Cli/templates/new/src/shared/.gitkeep
new file mode 100644
index 0000000000..878bca16e5
--- /dev/null
+++ b/waspc/data/Cli/templates/new/src/shared/.gitkeep
@@ -0,0 +1 @@
+This file forces Git to commit an empty directory.
diff --git a/waspc/e2e-test/Tests/WaspJobTest.hs b/waspc/e2e-test/Tests/WaspJobTest.hs
index 6faba23b1c..bb2295fd53 100644
--- a/waspc/e2e-test/Tests/WaspJobTest.hs
+++ b/waspc/e2e-test/Tests/WaspJobTest.hs
@@ -16,7 +16,7 @@ waspJob = do
" job MySpecialJob { \n\
\ executor: PgBoss, \n\
\ perform: { \n\
- \ fn: import { foo } from \"@ext/jobs/bar.js\" \n\
+ \ fn: import { foo } from \"@server/jobs/bar.js\" \n\
\ } \n\
\ } \n"
@@ -31,6 +31,6 @@ waspJob = do
cdIntoCurrentProject,
setDbToPSQL,
appendToWaspFile entityDecl,
- createFile jobFile "./ext/jobs" "bar.js",
+ createFile jobFile "./src/server/jobs" "bar.js",
waspCliCompile
]
diff --git a/waspc/e2e-test/test-outputs/waspBuild-golden/files.manifest b/waspc/e2e-test/test-outputs/waspBuild-golden/files.manifest
index 617d2bb6d6..fa92ad53d9 100644
--- a/waspc/e2e-test/test-outputs/waspBuild-golden/files.manifest
+++ b/waspc/e2e-test/test-outputs/waspBuild-golden/files.manifest
@@ -11,9 +11,7 @@ waspBuild/.wasp/build/server/src/config.js
waspBuild/.wasp/build/server/src/core/AuthError.js
waspBuild/.wasp/build/server/src/core/HttpError.js
waspBuild/.wasp/build/server/src/dbClient.js
-waspBuild/.wasp/build/server/src/ext-src/Main.css
-waspBuild/.wasp/build/server/src/ext-src/MainPage.js
-waspBuild/.wasp/build/server/src/ext-src/waspLogo.png
+waspBuild/.wasp/build/server/src/ext-src/.gitkeep
waspBuild/.wasp/build/server/src/jobs/core/Job.js
waspBuild/.wasp/build/server/src/jobs/core/SubmittedJob.js
waspBuild/.wasp/build/server/src/jobs/core/allJobs.js
@@ -23,6 +21,7 @@ waspBuild/.wasp/build/server/src/jobs/core/simpleJob.js
waspBuild/.wasp/build/server/src/routes/index.js
waspBuild/.wasp/build/server/src/routes/operations/index.js
waspBuild/.wasp/build/server/src/server.js
+waspBuild/.wasp/build/server/src/shared/.gitkeep
waspBuild/.wasp/build/server/src/utils.js
waspBuild/.wasp/build/web-app/.npmrc
waspBuild/.wasp/build/web-app/README.md
@@ -35,6 +34,7 @@ waspBuild/.wasp/build/web-app/src/actions/core.js
waspBuild/.wasp/build/web-app/src/actions/index.js
waspBuild/.wasp/build/web-app/src/api.js
waspBuild/.wasp/build/web-app/src/config.js
+waspBuild/.wasp/build/web-app/src/ext-src/.gitkeep
waspBuild/.wasp/build/web-app/src/ext-src/Main.css
waspBuild/.wasp/build/web-app/src/ext-src/MainPage.js
waspBuild/.wasp/build/web-app/src/ext-src/waspLogo.png
@@ -48,10 +48,14 @@ waspBuild/.wasp/build/web-app/src/queries/index.js
waspBuild/.wasp/build/web-app/src/queryClient.js
waspBuild/.wasp/build/web-app/src/router.js
waspBuild/.wasp/build/web-app/src/serviceWorker.js
+waspBuild/.wasp/build/web-app/src/shared/.gitkeep
waspBuild/.wasp/build/web-app/src/utils.js
waspBuild/.wasproot
-waspBuild/ext/.waspignore
-waspBuild/ext/Main.css
-waspBuild/ext/MainPage.js
-waspBuild/ext/waspLogo.png
waspBuild/main.wasp
+waspBuild/src/.waspignore
+waspBuild/src/client/.gitkeep
+waspBuild/src/client/Main.css
+waspBuild/src/client/MainPage.js
+waspBuild/src/client/waspLogo.png
+waspBuild/src/server/.gitkeep
+waspBuild/src/shared/.gitkeep
diff --git a/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/.waspchecksums b/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/.waspchecksums
index 0107cd4c2d..039c3b6cce 100644
--- a/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/.waspchecksums
+++ b/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/.waspchecksums
@@ -86,23 +86,9 @@
[
[
"file",
- "server/src/ext-src/Main.css"
+ "server/src/ext-src/.gitkeep"
],
- "1583ce49887ea575e563dab0c7ad6d2e2e3e6a351ed7c2f80c310641b1456417"
- ],
- [
- [
- "file",
- "server/src/ext-src/MainPage.js"
- ],
- "c9ed9b5271f648715373095f43d60a2ab3e47f159c6dd6f3337ed22e5b73e80c"
- ],
- [
- [
- "file",
- "server/src/ext-src/waspLogo.png"
- ],
- "0f05a89eb945d6d7326110e88776e402833b356202b06d0a8bf652e118d3fd2f"
+ "3c93961ee5013ddc0149b57c9eb7b469aea5f3cb197429bded0d20498a267b06"
],
[
[
@@ -167,6 +153,13 @@
],
"e19bdae598265cbe2457ff1e2d8524aa821666482cb7d21644e290a68daf94a5"
],
+ [
+ [
+ "file",
+ "server/src/shared/.gitkeep"
+ ],
+ "3c93961ee5013ddc0149b57c9eb7b469aea5f3cb197429bded0d20498a267b06"
+ ],
[
[
"file",
@@ -258,6 +251,13 @@
],
"a30d5ae7c1b317a7132cac93f4b5bffc3daf11f4f07b5e0d977d063810ffdd11"
],
+ [
+ [
+ "file",
+ "web-app/src/ext-src/.gitkeep"
+ ],
+ "3c93961ee5013ddc0149b57c9eb7b469aea5f3cb197429bded0d20498a267b06"
+ ],
[
[
"file",
@@ -349,6 +349,13 @@
],
"0b097cb6e2c83821630a33de933893bf75de49731b18ce3c25fc5384866fbac0"
],
+ [
+ [
+ "file",
+ "web-app/src/shared/.gitkeep"
+ ],
+ "3c93961ee5013ddc0149b57c9eb7b469aea5f3cb197429bded0d20498a267b06"
+ ],
[
[
"file",
diff --git a/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/server/src/ext-src/.gitkeep b/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/server/src/ext-src/.gitkeep
new file mode 100644
index 0000000000..878bca16e5
--- /dev/null
+++ b/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/server/src/ext-src/.gitkeep
@@ -0,0 +1 @@
+This file forces Git to commit an empty directory.
diff --git a/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/server/src/shared/.gitkeep b/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/server/src/shared/.gitkeep
new file mode 100644
index 0000000000..878bca16e5
--- /dev/null
+++ b/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/server/src/shared/.gitkeep
@@ -0,0 +1 @@
+This file forces Git to commit an empty directory.
diff --git a/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/web-app/src/ext-src/.gitkeep b/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/web-app/src/ext-src/.gitkeep
new file mode 100644
index 0000000000..878bca16e5
--- /dev/null
+++ b/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/web-app/src/ext-src/.gitkeep
@@ -0,0 +1 @@
+This file forces Git to commit an empty directory.
diff --git a/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/web-app/src/shared/.gitkeep b/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/web-app/src/shared/.gitkeep
new file mode 100644
index 0000000000..878bca16e5
--- /dev/null
+++ b/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/web-app/src/shared/.gitkeep
@@ -0,0 +1 @@
+This file forces Git to commit an empty directory.
diff --git a/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasproot b/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasproot
index 3caa053db5..ca2cfdb482 100644
--- a/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasproot
+++ b/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasproot
@@ -1 +1 @@
-File marking the root of Wasp project.
\ No newline at end of file
+File marking the root of Wasp project.
diff --git a/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/main.wasp b/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/main.wasp
index a2d95169c5..4bbd625756 100644
--- a/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/main.wasp
+++ b/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/main.wasp
@@ -8,5 +8,5 @@ app waspBuild {
route RootRoute { path: "/", to: MainPage }
page MainPage {
- component: import Main from "@ext/MainPage.js"
+ component: import Main from "@client/MainPage.js"
}
diff --git a/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/ext/.waspignore b/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/src/.waspignore
similarity index 100%
rename from waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/ext/.waspignore
rename to waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/src/.waspignore
diff --git a/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/src/client/.gitkeep b/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/src/client/.gitkeep
new file mode 100644
index 0000000000..878bca16e5
--- /dev/null
+++ b/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/src/client/.gitkeep
@@ -0,0 +1 @@
+This file forces Git to commit an empty directory.
diff --git a/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/server/src/ext-src/Main.css b/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/src/client/Main.css
similarity index 100%
rename from waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/server/src/ext-src/Main.css
rename to waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/src/client/Main.css
diff --git a/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/server/src/ext-src/MainPage.js b/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/src/client/MainPage.js
similarity index 100%
rename from waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/server/src/ext-src/MainPage.js
rename to waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/src/client/MainPage.js
diff --git a/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/server/src/ext-src/waspLogo.png b/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/src/client/waspLogo.png
similarity index 100%
rename from waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/server/src/ext-src/waspLogo.png
rename to waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/src/client/waspLogo.png
diff --git a/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/src/server/.gitkeep b/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/src/server/.gitkeep
new file mode 100644
index 0000000000..878bca16e5
--- /dev/null
+++ b/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/src/server/.gitkeep
@@ -0,0 +1 @@
+This file forces Git to commit an empty directory.
diff --git a/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/src/shared/.gitkeep b/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/src/shared/.gitkeep
new file mode 100644
index 0000000000..878bca16e5
--- /dev/null
+++ b/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/src/shared/.gitkeep
@@ -0,0 +1 @@
+This file forces Git to commit an empty directory.
diff --git a/waspc/e2e-test/test-outputs/waspCompile-golden/files.manifest b/waspc/e2e-test/test-outputs/waspCompile-golden/files.manifest
index 064eee5e84..fca2497fd6 100644
--- a/waspc/e2e-test/test-outputs/waspCompile-golden/files.manifest
+++ b/waspc/e2e-test/test-outputs/waspCompile-golden/files.manifest
@@ -11,9 +11,7 @@ waspCompile/.wasp/out/server/src/config.js
waspCompile/.wasp/out/server/src/core/AuthError.js
waspCompile/.wasp/out/server/src/core/HttpError.js
waspCompile/.wasp/out/server/src/dbClient.js
-waspCompile/.wasp/out/server/src/ext-src/Main.css
-waspCompile/.wasp/out/server/src/ext-src/MainPage.js
-waspCompile/.wasp/out/server/src/ext-src/waspLogo.png
+waspCompile/.wasp/out/server/src/ext-src/.gitkeep
waspCompile/.wasp/out/server/src/jobs/core/Job.js
waspCompile/.wasp/out/server/src/jobs/core/SubmittedJob.js
waspCompile/.wasp/out/server/src/jobs/core/allJobs.js
@@ -23,6 +21,7 @@ waspCompile/.wasp/out/server/src/jobs/core/simpleJob.js
waspCompile/.wasp/out/server/src/routes/index.js
waspCompile/.wasp/out/server/src/routes/operations/index.js
waspCompile/.wasp/out/server/src/server.js
+waspCompile/.wasp/out/server/src/shared/.gitkeep
waspCompile/.wasp/out/server/src/utils.js
waspCompile/.wasp/out/web-app/.npmrc
waspCompile/.wasp/out/web-app/README.md
@@ -35,6 +34,7 @@ waspCompile/.wasp/out/web-app/src/actions/core.js
waspCompile/.wasp/out/web-app/src/actions/index.js
waspCompile/.wasp/out/web-app/src/api.js
waspCompile/.wasp/out/web-app/src/config.js
+waspCompile/.wasp/out/web-app/src/ext-src/.gitkeep
waspCompile/.wasp/out/web-app/src/ext-src/Main.css
waspCompile/.wasp/out/web-app/src/ext-src/MainPage.js
waspCompile/.wasp/out/web-app/src/ext-src/waspLogo.png
@@ -48,10 +48,14 @@ waspCompile/.wasp/out/web-app/src/queries/index.js
waspCompile/.wasp/out/web-app/src/queryClient.js
waspCompile/.wasp/out/web-app/src/router.js
waspCompile/.wasp/out/web-app/src/serviceWorker.js
+waspCompile/.wasp/out/web-app/src/shared/.gitkeep
waspCompile/.wasp/out/web-app/src/utils.js
waspCompile/.wasproot
-waspCompile/ext/.waspignore
-waspCompile/ext/Main.css
-waspCompile/ext/MainPage.js
-waspCompile/ext/waspLogo.png
waspCompile/main.wasp
+waspCompile/src/.waspignore
+waspCompile/src/client/.gitkeep
+waspCompile/src/client/Main.css
+waspCompile/src/client/MainPage.js
+waspCompile/src/client/waspLogo.png
+waspCompile/src/server/.gitkeep
+waspCompile/src/shared/.gitkeep
diff --git a/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/.waspchecksums b/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/.waspchecksums
index d40f933c53..4628b22155 100644
--- a/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/.waspchecksums
+++ b/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/.waspchecksums
@@ -86,23 +86,9 @@
[
[
"file",
- "server/src/ext-src/Main.css"
+ "server/src/ext-src/.gitkeep"
],
- "1583ce49887ea575e563dab0c7ad6d2e2e3e6a351ed7c2f80c310641b1456417"
- ],
- [
- [
- "file",
- "server/src/ext-src/MainPage.js"
- ],
- "c9ed9b5271f648715373095f43d60a2ab3e47f159c6dd6f3337ed22e5b73e80c"
- ],
- [
- [
- "file",
- "server/src/ext-src/waspLogo.png"
- ],
- "0f05a89eb945d6d7326110e88776e402833b356202b06d0a8bf652e118d3fd2f"
+ "3c93961ee5013ddc0149b57c9eb7b469aea5f3cb197429bded0d20498a267b06"
],
[
[
@@ -167,6 +153,13 @@
],
"e19bdae598265cbe2457ff1e2d8524aa821666482cb7d21644e290a68daf94a5"
],
+ [
+ [
+ "file",
+ "server/src/shared/.gitkeep"
+ ],
+ "3c93961ee5013ddc0149b57c9eb7b469aea5f3cb197429bded0d20498a267b06"
+ ],
[
[
"file",
@@ -258,6 +251,13 @@
],
"a30d5ae7c1b317a7132cac93f4b5bffc3daf11f4f07b5e0d977d063810ffdd11"
],
+ [
+ [
+ "file",
+ "web-app/src/ext-src/.gitkeep"
+ ],
+ "3c93961ee5013ddc0149b57c9eb7b469aea5f3cb197429bded0d20498a267b06"
+ ],
[
[
"file",
@@ -349,6 +349,13 @@
],
"0b097cb6e2c83821630a33de933893bf75de49731b18ce3c25fc5384866fbac0"
],
+ [
+ [
+ "file",
+ "web-app/src/shared/.gitkeep"
+ ],
+ "3c93961ee5013ddc0149b57c9eb7b469aea5f3cb197429bded0d20498a267b06"
+ ],
[
[
"file",
diff --git a/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/server/src/ext-src/.gitkeep b/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/server/src/ext-src/.gitkeep
new file mode 100644
index 0000000000..878bca16e5
--- /dev/null
+++ b/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/server/src/ext-src/.gitkeep
@@ -0,0 +1 @@
+This file forces Git to commit an empty directory.
diff --git a/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/server/src/shared/.gitkeep b/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/server/src/shared/.gitkeep
new file mode 100644
index 0000000000..878bca16e5
--- /dev/null
+++ b/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/server/src/shared/.gitkeep
@@ -0,0 +1 @@
+This file forces Git to commit an empty directory.
diff --git a/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/web-app/src/ext-src/.gitkeep b/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/web-app/src/ext-src/.gitkeep
new file mode 100644
index 0000000000..878bca16e5
--- /dev/null
+++ b/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/web-app/src/ext-src/.gitkeep
@@ -0,0 +1 @@
+This file forces Git to commit an empty directory.
diff --git a/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/web-app/src/shared/.gitkeep b/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/web-app/src/shared/.gitkeep
new file mode 100644
index 0000000000..878bca16e5
--- /dev/null
+++ b/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/web-app/src/shared/.gitkeep
@@ -0,0 +1 @@
+This file forces Git to commit an empty directory.
diff --git a/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasproot b/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasproot
index 3caa053db5..ca2cfdb482 100644
--- a/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasproot
+++ b/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasproot
@@ -1 +1 @@
-File marking the root of Wasp project.
\ No newline at end of file
+File marking the root of Wasp project.
diff --git a/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/main.wasp b/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/main.wasp
index fe8dec46a0..e1f9b611e7 100644
--- a/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/main.wasp
+++ b/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/main.wasp
@@ -7,5 +7,5 @@ app waspCompile {
route RootRoute { path: "/", to: MainPage }
page MainPage {
- component: import Main from "@ext/MainPage.js"
+ component: import Main from "@client/MainPage.js"
}
diff --git a/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/ext/.waspignore b/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/src/.waspignore
similarity index 100%
rename from waspc/e2e-test/test-outputs/waspJob-golden/waspJob/ext/.waspignore
rename to waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/src/.waspignore
diff --git a/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/src/client/.gitkeep b/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/src/client/.gitkeep
new file mode 100644
index 0000000000..878bca16e5
--- /dev/null
+++ b/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/src/client/.gitkeep
@@ -0,0 +1 @@
+This file forces Git to commit an empty directory.
diff --git a/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/ext/Main.css b/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/src/client/Main.css
similarity index 100%
rename from waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/ext/Main.css
rename to waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/src/client/Main.css
diff --git a/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/ext/MainPage.js b/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/src/client/MainPage.js
similarity index 100%
rename from waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/ext/MainPage.js
rename to waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/src/client/MainPage.js
diff --git a/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/ext/waspLogo.png b/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/src/client/waspLogo.png
similarity index 100%
rename from waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/ext/waspLogo.png
rename to waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/src/client/waspLogo.png
diff --git a/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/src/server/.gitkeep b/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/src/server/.gitkeep
new file mode 100644
index 0000000000..878bca16e5
--- /dev/null
+++ b/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/src/server/.gitkeep
@@ -0,0 +1 @@
+This file forces Git to commit an empty directory.
diff --git a/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/src/shared/.gitkeep b/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/src/shared/.gitkeep
new file mode 100644
index 0000000000..878bca16e5
--- /dev/null
+++ b/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/src/shared/.gitkeep
@@ -0,0 +1 @@
+This file forces Git to commit an empty directory.
diff --git a/waspc/e2e-test/test-outputs/waspJob-golden/files.manifest b/waspc/e2e-test/test-outputs/waspJob-golden/files.manifest
index e908fed6ee..56dbc8c783 100644
--- a/waspc/e2e-test/test-outputs/waspJob-golden/files.manifest
+++ b/waspc/e2e-test/test-outputs/waspJob-golden/files.manifest
@@ -11,10 +11,8 @@ waspJob/.wasp/out/server/src/config.js
waspJob/.wasp/out/server/src/core/AuthError.js
waspJob/.wasp/out/server/src/core/HttpError.js
waspJob/.wasp/out/server/src/dbClient.js
-waspJob/.wasp/out/server/src/ext-src/Main.css
-waspJob/.wasp/out/server/src/ext-src/MainPage.js
+waspJob/.wasp/out/server/src/ext-src/.gitkeep
waspJob/.wasp/out/server/src/ext-src/jobs/bar.js
-waspJob/.wasp/out/server/src/ext-src/waspLogo.png
waspJob/.wasp/out/server/src/jobs/MySpecialJob.js
waspJob/.wasp/out/server/src/jobs/core/Job.js
waspJob/.wasp/out/server/src/jobs/core/SubmittedJob.js
@@ -25,6 +23,7 @@ waspJob/.wasp/out/server/src/jobs/core/simpleJob.js
waspJob/.wasp/out/server/src/routes/index.js
waspJob/.wasp/out/server/src/routes/operations/index.js
waspJob/.wasp/out/server/src/server.js
+waspJob/.wasp/out/server/src/shared/.gitkeep
waspJob/.wasp/out/server/src/utils.js
waspJob/.wasp/out/web-app/.npmrc
waspJob/.wasp/out/web-app/README.md
@@ -37,9 +36,9 @@ waspJob/.wasp/out/web-app/src/actions/core.js
waspJob/.wasp/out/web-app/src/actions/index.js
waspJob/.wasp/out/web-app/src/api.js
waspJob/.wasp/out/web-app/src/config.js
+waspJob/.wasp/out/web-app/src/ext-src/.gitkeep
waspJob/.wasp/out/web-app/src/ext-src/Main.css
waspJob/.wasp/out/web-app/src/ext-src/MainPage.js
-waspJob/.wasp/out/web-app/src/ext-src/jobs/bar.js
waspJob/.wasp/out/web-app/src/ext-src/waspLogo.png
waspJob/.wasp/out/web-app/src/index.js
waspJob/.wasp/out/web-app/src/logo.png
@@ -51,11 +50,15 @@ waspJob/.wasp/out/web-app/src/queries/index.js
waspJob/.wasp/out/web-app/src/queryClient.js
waspJob/.wasp/out/web-app/src/router.js
waspJob/.wasp/out/web-app/src/serviceWorker.js
+waspJob/.wasp/out/web-app/src/shared/.gitkeep
waspJob/.wasp/out/web-app/src/utils.js
waspJob/.wasproot
-waspJob/ext/.waspignore
-waspJob/ext/Main.css
-waspJob/ext/MainPage.js
-waspJob/ext/jobs/bar.js
-waspJob/ext/waspLogo.png
waspJob/main.wasp
+waspJob/src/.waspignore
+waspJob/src/client/.gitkeep
+waspJob/src/client/Main.css
+waspJob/src/client/MainPage.js
+waspJob/src/client/waspLogo.png
+waspJob/src/server/.gitkeep
+waspJob/src/server/jobs/bar.js
+waspJob/src/shared/.gitkeep
diff --git a/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/.waspchecksums b/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/.waspchecksums
index a62ee0eb35..1a1fdc2383 100644
--- a/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/.waspchecksums
+++ b/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/.waspchecksums
@@ -86,16 +86,9 @@
[
[
"file",
- "server/src/ext-src/Main.css"
+ "server/src/ext-src/.gitkeep"
],
- "1583ce49887ea575e563dab0c7ad6d2e2e3e6a351ed7c2f80c310641b1456417"
- ],
- [
- [
- "file",
- "server/src/ext-src/MainPage.js"
- ],
- "c9ed9b5271f648715373095f43d60a2ab3e47f159c6dd6f3337ed22e5b73e80c"
+ "3c93961ee5013ddc0149b57c9eb7b469aea5f3cb197429bded0d20498a267b06"
],
[
[
@@ -104,13 +97,6 @@
],
"2e126f35b3a3e9a289e0dcfd8707fe903c6a053e0cf85899fb5f686d77dd3eb5"
],
- [
- [
- "file",
- "server/src/ext-src/waspLogo.png"
- ],
- "0f05a89eb945d6d7326110e88776e402833b356202b06d0a8bf652e118d3fd2f"
- ],
[
[
"file",
@@ -181,6 +167,13 @@
],
"6287f825b427f4a4ada5cc5a99c2d0a3379a7c59cea474653e22129df7d2ad39"
],
+ [
+ [
+ "file",
+ "server/src/shared/.gitkeep"
+ ],
+ "3c93961ee5013ddc0149b57c9eb7b469aea5f3cb197429bded0d20498a267b06"
+ ],
[
[
"file",
@@ -275,23 +268,23 @@
[
[
"file",
- "web-app/src/ext-src/Main.css"
+ "web-app/src/ext-src/.gitkeep"
],
- "1583ce49887ea575e563dab0c7ad6d2e2e3e6a351ed7c2f80c310641b1456417"
+ "3c93961ee5013ddc0149b57c9eb7b469aea5f3cb197429bded0d20498a267b06"
],
[
[
"file",
- "web-app/src/ext-src/MainPage.js"
+ "web-app/src/ext-src/Main.css"
],
- "c9ed9b5271f648715373095f43d60a2ab3e47f159c6dd6f3337ed22e5b73e80c"
+ "1583ce49887ea575e563dab0c7ad6d2e2e3e6a351ed7c2f80c310641b1456417"
],
[
[
"file",
- "web-app/src/ext-src/jobs/bar.js"
+ "web-app/src/ext-src/MainPage.js"
],
- "2e126f35b3a3e9a289e0dcfd8707fe903c6a053e0cf85899fb5f686d77dd3eb5"
+ "c9ed9b5271f648715373095f43d60a2ab3e47f159c6dd6f3337ed22e5b73e80c"
],
[
[
@@ -370,6 +363,13 @@
],
"0b097cb6e2c83821630a33de933893bf75de49731b18ce3c25fc5384866fbac0"
],
+ [
+ [
+ "file",
+ "web-app/src/shared/.gitkeep"
+ ],
+ "3c93961ee5013ddc0149b57c9eb7b469aea5f3cb197429bded0d20498a267b06"
+ ],
[
[
"file",
diff --git a/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/server/src/ext-src/.gitkeep b/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/server/src/ext-src/.gitkeep
new file mode 100644
index 0000000000..878bca16e5
--- /dev/null
+++ b/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/server/src/ext-src/.gitkeep
@@ -0,0 +1 @@
+This file forces Git to commit an empty directory.
diff --git a/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/server/src/shared/.gitkeep b/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/server/src/shared/.gitkeep
new file mode 100644
index 0000000000..878bca16e5
--- /dev/null
+++ b/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/server/src/shared/.gitkeep
@@ -0,0 +1 @@
+This file forces Git to commit an empty directory.
diff --git a/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/web-app/src/ext-src/.gitkeep b/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/web-app/src/ext-src/.gitkeep
new file mode 100644
index 0000000000..878bca16e5
--- /dev/null
+++ b/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/web-app/src/ext-src/.gitkeep
@@ -0,0 +1 @@
+This file forces Git to commit an empty directory.
diff --git a/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/web-app/src/shared/.gitkeep b/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/web-app/src/shared/.gitkeep
new file mode 100644
index 0000000000..878bca16e5
--- /dev/null
+++ b/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/web-app/src/shared/.gitkeep
@@ -0,0 +1 @@
+This file forces Git to commit an empty directory.
diff --git a/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasproot b/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasproot
index 3caa053db5..ca2cfdb482 100644
--- a/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasproot
+++ b/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasproot
@@ -1 +1 @@
-File marking the root of Wasp project.
\ No newline at end of file
+File marking the root of Wasp project.
diff --git a/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/ext/Main.css b/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/ext/Main.css
deleted file mode 100644
index b6e7ed3f13..0000000000
--- a/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/ext/Main.css
+++ /dev/null
@@ -1,89 +0,0 @@
-* {
- -webkit-font-smoothing: antialiased;
- -moz-osx-font-smoothing: grayscale;
- box-sizing: border-box;
-}
-
-body {
- margin: 0;
- padding: 0;
- font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen",
- "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue",
- sans-serif;
-}
-
-.container {
- min-height: 100vh;
- display: flex;
- flex-direction: column;
- justify-content: center;
- align-items: center;
-}
-
-main {
- padding: 5rem 0;
- flex: 1;
- display: flex;
- flex-direction: column;
- justify-content: center;
- align-items: center;
-}
-
-main p {
- font-size: 1.2rem;
-}
-
-.logo {
- margin-bottom: 2rem;
-}
-
-.logo img {
- max-height: 200px;
-}
-
-.welcome-title {
- font-weight: 500;
-}
-
-.welcome-subtitle {
- font-weight: 400;
- margin-bottom: 3rem;
-}
-
-.buttons {
- display: flex;
- flex-direction: row;
-}
-
-.buttons .button:not(:last-child) {
- margin-right: 0.5rem;
-}
-
-.button {
- border-radius: 3px;
- font-size: 1.2rem;
- padding: 1rem 2rem;
- text-align: center;
- font-weight: 700;
- text-decoration: none;
-}
-
-.button-filled {
- border: 2px solid #bf9900;
- background-color: #bf9900;
- color: #f4f4f4;
-}
-
-.button-outline {
- border: 2px solid #8a9cff;
- color: #8a9cff;
- background-color: none;
-}
-
-code {
- border-radius: 5px;
- padding: 0.2rem;
- background: #efefef;
- font-family: Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono,
- Bitstream Vera Sans Mono, Courier New, monospace;
-}
diff --git a/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/ext/MainPage.js b/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/ext/MainPage.js
deleted file mode 100644
index 529a4f2860..0000000000
--- a/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/ext/MainPage.js
+++ /dev/null
@@ -1,41 +0,0 @@
-import React from 'react'
-import waspLogo from './waspLogo.png'
-import './Main.css'
-
-const MainPage = () => {
- return (
-
-
-
-
-
Welcome to Wasp - you just started a new app!
-
- This is page MainPage located at route /.
- Open ext/MainPage.js to edit it.
-
-
-
-
-
-
-
-
-
Welcome to Wasp - you just started a new app!
-
- This is page MainPage located at route /.
- Open ext/MainPage.js to edit it.
-
-
-
-
-
-
-
-
-
Welcome to Wasp - you just started a new app!
-
- This is page MainPage located at route /.
- Open ext/MainPage.js to edit it.
-
-
-
-
-
-
-
-
-
Welcome to Wasp - you just started a new app!
-
- This is page MainPage located at route /.
- Open ext/MainPage.js to edit it.
-
-
-
-
-