Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

move Wasp/Generator/Node/Version to Wasp/Node/Version #1226

Merged
merged 1 commit into from
Jun 5, 2023
Merged

move Wasp/Generator/Node/Version to Wasp/Node/Version #1226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion waspc/cli/exe/Main.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ import Wasp.Cli.Command.Uninstall (uninstall)
import Wasp.Cli.Command.WaspLS (runWaspLS)
import Wasp.Cli.Message (cliSendMessage)
import Wasp.Cli.Terminal (title)
import qualified Wasp.Generator.Node.Version as NodeVersion
import qualified Wasp.Message as Message
import qualified Wasp.Node.Version as NodeVersion
import Wasp.Util (indent)
import qualified Wasp.Util.Terminal as Term
import Wasp.Version (waspVersion)
Expand Down
2 changes: 1 addition & 1 deletion waspc/src/Wasp/Generator/DockerGenerator.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ import Wasp.Generator.DbGenerator.Common
import Wasp.Generator.FileDraft (FileDraft (..), createTemplateFileDraft)
import qualified Wasp.Generator.FileDraft.TemplateFileDraft as TmplFD
import Wasp.Generator.Monad (Generator, GeneratorError, runGenerator)
import Wasp.Generator.Node.Version (latestMajorNodeVersion)
import Wasp.Generator.Templates (TemplatesDir, compileAndRenderTemplate)
import Wasp.Node.Version (latestMajorNodeVersion)
import qualified Wasp.SemanticVersion as SV
import Wasp.Util (getEnvVarDefinition)

Expand Down
2 changes: 1 addition & 1 deletion waspc/src/Wasp/Generator/Job/Process.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import qualified System.Info
import qualified System.Process as P
import UnliftIO.Exception (bracket)
import qualified Wasp.Generator.Job as J
import qualified Wasp.Generator.Node.Version as NodeVersion
import qualified Wasp.Node.Version as NodeVersion

-- TODO:
-- Switch from Data.Conduit.Process to Data.Conduit.Process.Typed.
Expand Down
2 changes: 1 addition & 1 deletion waspc/src/Wasp/Generator/ServerGenerator.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ import Wasp.Generator.Common
import Wasp.Generator.ExternalCodeGenerator (genExternalCodeDir)
import Wasp.Generator.FileDraft (FileDraft, createTextFileDraft)
import Wasp.Generator.Monad (Generator)
import qualified Wasp.Generator.Node.Version as NodeVersion
import qualified Wasp.Generator.NpmDependencies as N
import Wasp.Generator.ServerGenerator.ApiRoutesG (genApis)
import Wasp.Generator.ServerGenerator.Auth.OAuthAuthG (depsRequiredByPassport)
Expand All @@ -64,6 +63,7 @@ import Wasp.Generator.ServerGenerator.JobGenerator (depsRequiredByJobs, genJobEx
import Wasp.Generator.ServerGenerator.JsImport (extImportToImportJson, getAliasedJsImportStmtAndIdentifier)
import Wasp.Generator.ServerGenerator.OperationsG (genOperations)
import Wasp.Generator.ServerGenerator.OperationsRoutesG (genOperationsRoutes)
import qualified Wasp.Node.Version as NodeVersion
import Wasp.Project.Db (databaseUrlEnvVarName)
import Wasp.SemanticVersion (major)
import Wasp.Util (toLowerFirst, (<++>))
Expand Down
2 changes: 1 addition & 1 deletion waspc/src/Wasp/Generator/WebAppGenerator.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ import qualified Wasp.Generator.ConfigFile as G.CF
import Wasp.Generator.ExternalCodeGenerator (genExternalCodeDir)
import Wasp.Generator.FileDraft
import Wasp.Generator.Monad (Generator)
import qualified Wasp.Generator.Node.Version as NodeVersion
import qualified Wasp.Generator.NpmDependencies as N
import Wasp.Generator.WebAppGenerator.AuthG (genAuth)
import qualified Wasp.Generator.WebAppGenerator.Common as C
Expand All @@ -46,6 +45,7 @@ import Wasp.Generator.WebAppGenerator.ExternalCodeGenerator
import Wasp.Generator.WebAppGenerator.JsImport (extImportToImportJson)
import Wasp.Generator.WebAppGenerator.OperationsGenerator (genOperations)
import Wasp.Generator.WebAppGenerator.RouterGenerator (genRouter)
import qualified Wasp.Node.Version as NodeVersion
import qualified Wasp.SemanticVersion as SV
import Wasp.Util ((<++>))

Expand Down
2 changes: 1 addition & 1 deletion waspc/src/Wasp/Generator/Node/Version.hs → waspc/src/Wasp/Node/Version.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module Wasp.Generator.Node.Version
module Wasp.Node.Version
( getAndCheckNodeVersion,
getNodeVersion,
nodeVersionRange,
Expand Down
2 changes: 1 addition & 1 deletion waspc/waspc.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,6 @@ library
Wasp.Generator.AuthProviders.OAuth
Wasp.Generator.AuthProviders.Local
Wasp.Generator.AuthProviders.Email
Wasp.Generator.Node.Version
Wasp.Generator.ServerGenerator
Wasp.Generator.ServerGenerator.JsImport
Wasp.Generator.ServerGenerator.ApiRoutesG
Expand Down Expand Up @@ -291,6 +290,7 @@ library
Wasp.Generator.WebAppGenerator.Start
Wasp.Generator.WebAppGenerator.Test
Wasp.Generator.WriteFileDrafts
Wasp.Node.Version
Wasp.Project
Wasp.Project.Analyze
Wasp.Project.Common
Expand Down