Remove ext-src leftovers in code

Author: sodic

waspc/data/Generator/templates/react-app/tsconfig.node.json

@@ -8,7 +8,6 @@
     "allowSyntheticDefaultImports": true,
   },
   "include": [
-    "vite.config.ts",
-    "./src/ext-src/vite.config.ts"
+    "vite.config.ts"
   ]
-}
+}

waspc/src/Wasp/Generator/ExternalCodeGenerator/Common.hs

@@ -3,11 +3,11 @@ module Wasp.Generator.ExternalCodeGenerator.Common
   )
 where
 
--- todo(filip): Where should I put this?
+-- TODO: (filip) Where should we put this?
 -- TODO: consider refactoring the usage of GeneratedExternalCodeDir since
--- generated code might end up in multiple places (e.g. ext-src/ but also public/).
--- Name should probably be narrowed down to something that represent only the ext-src/
--- directory. Maybe GeneratedExtSrcDir?
+-- generated code might end up in multiple places (e.g. src/ but also public/).
+-- Name should probably be narrowed down to something that represents only the
+-- src/ directory. Maybe GeneratedExtSrcDir?
 
--- | Path to the directory where ext code will be generated.
+-- | Path to the directory where we generate the external user code.
 data GeneratedExternalCodeDir

waspc/src/Wasp/Generator/ServerGenerator/JsImport.hs

@@ -52,7 +52,9 @@ extImportToJsImport ::
   JsImport
 extImportToJsImport = GJI.extImportToJsImport serverExtDir
   where
-    -- filip: Instead of generating the ext-src folder with the user's code and referencing that, we reference user code directly.
-    -- This gives us proper error messages (with user's file names and line numbers).
-    -- It works great with Vite (Vite outputs absolute file paths), but less great on the server (TS outputs relative paths, resulting in ../../src/something)
+    -- NOTE: Instead of generating the `src` folder with the user's code and
+    -- referencing that, we reference user code directly. This gives us proper
+    -- error messages (with user's file names and line numbers). It works great
+    -- with Vite (Vite outputs absolute file paths), but less great on the
+    -- server (TS outputs relative paths, resulting in ../../src/something).
     serverExtDir = [reldirP|../../../../src|]

waspc/test/Generator/JsImportTest.hs

@@ -12,7 +12,7 @@ import Wasp.JsImport as JI
 spec_GeneratorJsImportTest :: Spec
 spec_GeneratorJsImportTest = do
   describe "extImportToJsImport" $ do
-    let pathToExtCodeDir = [SP.reldirP|ext-src|] :: (Path Posix (Rel ServerSrcDir) (Dir GeneratedExternalCodeDir))
+    let pathToExtCodeDir = [SP.reldirP|src|] :: (Path Posix (Rel ServerSrcDir) (Dir GeneratedExternalCodeDir))
         pathFromImportLocationToExtCodeDir = [SP.reldirP|../|]
         extImport =
           ExtImport
@@ -22,7 +22,7 @@ spec_GeneratorJsImportTest = do
     it "makes a JsImport from ExtImport" $ do
       extImportToJsImport pathToExtCodeDir pathFromImportLocationToExtCodeDir extImport
         `shouldBe` JI.JsImport
-          { JI._path = JI.RelativeImportPath [SP.relfileP|../ext-src/folder/test.js|],
+          { JI._path = JI.RelativeImportPath [SP.relfileP|../src/folder/test.js|],
             JI._name = JsImportModule "test",
             JI._importAlias = Nothing
           }

waspc/test/JsImportTest.hs

@@ -50,9 +50,9 @@ spec_JsImportTest = do
           `shouldBe` ("import test from '" ++ generatedImportPathForModuleImportPath ++ "'", "test")
   where
     testRelativeImportPath :: JsImportPath
-    testRelativeImportPath = RelativeImportPath $ [SP.reldirP|ext-src|] </> [SP.relfileP|folder/test.js|]
+    testRelativeImportPath = RelativeImportPath $ [SP.reldirP|src|] </> [SP.relfileP|folder/test.js|]
 
-    generatedImportPathForRelativeImportPath = "./ext-src/folder/test.js"
+    generatedImportPathForRelativeImportPath = "./src/folder/test.js"
 
     testModuleImportPath :: JsImportPath
     testModuleImportPath = ModuleImportPath [SP.relfileP|wasp/server/api|]