fix: root directory resolution

Author: Aylur

cmd/bundle.go

@@ -12,6 +12,7 @@ var (
 	defines    []string
 	usePackage bool
 	gtkVersion int
+	workingDir string
 )
 
 var bundleCommand = &cobra.Command{
@@ -36,10 +37,11 @@ var bundleCommand = &cobra.Command{
 		}
 
 		opts := lib.BundleOpts{
-			Outfile:    outfile,
-			UsePackage: usePackage,
-			Defines:    defines,
-			GtkVersion: gtkVersion,
+			Outfile:          outfile,
+			UsePackage:       usePackage,
+			Defines:          defines,
+			GtkVersion:       gtkVersion,
+			WorkingDirectory: workingDir,
 		}
 
 		if info.IsDir() {
@@ -54,12 +56,9 @@ var bundleCommand = &cobra.Command{
 
 func init() {
 	f := bundleCommand.Flags()
+	f.StringVarP(&workingDir, "root", "r", "", "root directory of the project")
 	f.StringArrayVarP(&defines, "define", "d", []string{}, "replace global identifiers with constant expressions")
 	f.BoolVarP(&usePackage, "package", "p", false, "use astal package as defined in package.json")
 	f.IntVar(&gtkVersion, "gtk", 3, "gtk version")
 	f.MarkHidden("gtk")
-
-	f.String("src", "", "source directory of the bundle")
-	f.MarkHidden("src")
-	f.MarkDeprecated("src", `use cd /path/to/src && bundle --define="SRC='/path/to/src'"`)
 }

cmd/run.go

@@ -35,13 +35,13 @@ var runCommand = &cobra.Command{
 			}
 
 			if info.IsDir() {
-				run(getAppEntry(path))
+				run(getAppEntry(path), "")
 			} else {
-				run(path)
+				run(path, "")
 			}
 
 		} else {
-			run(getAppEntry(targetDir))
+			run(getAppEntry(targetDir), targetDir)
 		}
 	},
 }
@@ -107,19 +107,20 @@ func logging() (io.Writer, io.Writer, *os.File) {
 	return io.MultiWriter(os.Stdout, file), io.MultiWriter(os.Stderr, file), file
 }
 
-func run(infile string) {
+func run(infile string, rootdir string) {
 	gtk := 3
 	if gtk4 {
 		gtk = 4
 	}
 
 	outfile := getOutfile()
 	lib.Bundle(lib.BundleOpts{
-		Infile:     infile,
-		Outfile:    outfile,
-		Defines:    defines,
-		UsePackage: usePackage,
-		GtkVersion: gtk,
+		Infile:           infile,
+		Outfile:          outfile,
+		Defines:          defines,
+		UsePackage:       usePackage,
+		GtkVersion:       gtk,
+		WorkingDirectory: rootdir,
 	})
 
 	if gtk4 {

docs/guide/bundling.md

@@ -21,6 +21,7 @@ Flags:
   -d, --define stringArray   replace global identifiers with constant expressions
   -h, --help                 help for bundle
   -p, --package              use astal package as defined in package.json
+  -r, --root string          root directory of the project
 ```
 
 Currently there are 3 builtin plugins.
@@ -209,6 +210,7 @@ a good practice would be to:
       find_program('ags'),
       'bundle',
       '--define', 'DATADIR="' + pkgdatadir + '"',
+      '--root', meson.project_source_root(),
       meson.project_source_root() / 'app.ts',
       meson.project_name(),
     ],
@@ -255,6 +257,7 @@ custom_target(
   command: [
     find_program('ags'),
     'bundle',
+    '--root', meson.project_source_root(),
     meson.project_source_root() / 'app.ts',
     main,
   ],

lib/esbuild.go

@@ -131,19 +131,19 @@ func sliceToKV(keyValuePairs []string) map[string]string {
 }
 
 type BundleOpts struct {
-	Infile     string
-	Outfile    string
-	UsePackage bool // use astal from package.json
-	Defines    []string
-	GtkVersion int
+	Infile           string
+	Outfile          string
+	UsePackage       bool // use astal from package.json
+	Defines          []string
+	GtkVersion       int
+	WorkingDirectory string
 }
 
 // TODO: bundle plugins
 // svg loader
 // other css preproceccors
 // http plugin with caching
 func Bundle(opts BundleOpts) {
-	tsconfig := GetTsconfig(Cwd(), opts.GtkVersion)
 	defines := sliceToKV(opts.Defines)
 
 	if _, ok := defines["SRC"]; !ok {
@@ -159,7 +159,6 @@ func Bundle(opts BundleOpts) {
 		Outfile:     opts.Outfile,
 		Format:      api.FormatESModule,
 		Platform:    api.PlatformNeutral,
-		TsconfigRaw: tsconfig,
 		Define:      defines,
 		Target:      api.ES2022,
 		Sourcemap:   api.SourceMapInline,
@@ -186,6 +185,18 @@ func Bundle(opts BundleOpts) {
 		},
 	}
 
+	if opts.WorkingDirectory != "" {
+		dir, err := filepath.Abs(opts.WorkingDirectory)
+		if err != nil {
+			Err(err)
+		}
+
+		buildOpts.AbsWorkingDir = dir
+		buildOpts.TsconfigRaw = GetTsconfig(dir, opts.GtkVersion)
+	} else {
+		buildOpts.TsconfigRaw = GetTsconfig(Cwd(), opts.GtkVersion)
+	}
+
 	if !opts.UsePackage {
 		buildOpts.Alias = map[string]string{
 			"astal": astalGjs,

version

@@ -1 +1 @@
-2.2.0
+2.2.1