diff --git a/waspc/data/Generator/templates/sdk/wasp/package.json b/waspc/data/Generator/templates/sdk/wasp/package.json index 440c10e913..3e6c67d56f 100644 --- a/waspc/data/Generator/templates/sdk/wasp/package.json +++ b/waspc/data/Generator/templates/sdk/wasp/package.json @@ -45,7 +45,7 @@ {=! expose it here (which leaks it to our users). We could avoid this by =} {=! using relative imports inside SDK code (instead of library imports), =} {=! but I didn't have time to implement it. =} - "./ext-src/*": "./dist/ext-src/*.js", + "./src/*": "./dist/src/*.js", {=! Used by our code, uncodumented (but accessible) for users. =} "./operations/*": "./dist/operations/*", {=! Used by our code, uncodumented (but accessible) for users. =} diff --git a/waspc/src/Wasp/Generator/SdkGenerator/Common.hs b/waspc/src/Wasp/Generator/SdkGenerator/Common.hs index 5a0311e13f..1aaa378601 100644 --- a/waspc/src/Wasp/Generator/SdkGenerator/Common.hs +++ b/waspc/src/Wasp/Generator/SdkGenerator/Common.hs @@ -63,7 +63,7 @@ sdkTemplatesDirInTemplatesDir :: Path' (Rel TemplatesDir) (Dir SdkTemplatesDir) sdkTemplatesDirInTemplatesDir = [reldir|sdk/wasp|] extSrcDirInSdkRootDir :: Path' (Rel SdkRootDir) (Dir GeneratedExternalCodeDir) -extSrcDirInSdkRootDir = [reldir|ext-src|] +extSrcDirInSdkRootDir = [reldir|src|] relDirToRelFileP :: Path Posix (Rel d) Dir' -> Path Posix (Rel d) File' relDirToRelFileP path = fromJust $ SP.parseRelFileP $ removeTrailingSlash $ SP.fromRelDirP path @@ -73,9 +73,6 @@ relDirToRelFileP path = fromJust $ SP.parseRelFileP $ removeTrailingSlash $ SP.f makeSdkImportPath :: Path Posix (Rel SdkRootDir) File' -> Path Posix (Rel s) File' makeSdkImportPath path = [reldirP|wasp|] path -extCodeDirInSdkRootDir :: Path' (Rel SdkRootDir) Dir' -extCodeDirInSdkRootDir = [reldir|ext-src|] - clientTemplatesDirInSdkTemplatesDir :: Path' (Rel SdkTemplatesDir) (Dir ClientTemplatesDir) clientTemplatesDirInSdkTemplatesDir = [reldir|client|] diff --git a/waspc/src/Wasp/Generator/SdkGenerator/Server/OperationsGenerator.hs b/waspc/src/Wasp/Generator/SdkGenerator/Server/OperationsGenerator.hs index ea8ffbfd81..e22ca0141f 100644 --- a/waspc/src/Wasp/Generator/SdkGenerator/Server/OperationsGenerator.hs +++ b/waspc/src/Wasp/Generator/SdkGenerator/Server/OperationsGenerator.hs @@ -174,5 +174,5 @@ extImportToJsImport extImport@(EI.ExtImport extImportName extImportPath) = } where importPath = C.makeSdkImportPath $ dropExtensionFromImportPath $ extCodeDirP SP.castRel extImportPath - extCodeDirP = fromJust $ SP.relDirToPosix C.extCodeDirInSdkRootDir + extCodeDirP = fromJust $ SP.relDirToPosix C.extSrcDirInSdkRootDir importName = GJI.extImportNameToJsImportName extImportName diff --git a/waspc/src/Wasp/Project/ExternalConfig/TsConfig.hs b/waspc/src/Wasp/Project/ExternalConfig/TsConfig.hs index e12ca1e591..3423f9ce35 100644 --- a/waspc/src/Wasp/Project/ExternalConfig/TsConfig.hs +++ b/waspc/src/Wasp/Project/ExternalConfig/TsConfig.hs @@ -37,4 +37,4 @@ readTsConfigFile :: Path' Abs (File f) -> IO (Either String T.TsConfig) readTsConfigFile tsConfigFile = do tsConfigContent <- IOUtil.readFileBytes tsConfigFile parseResult <- parseJsonWithComments . BS.toString $ tsConfigContent - return $ left ("Failed to parse tsconfig file" ++) parseResult + return $ left ("Failed to parse tsconfig file: " ++) parseResult