fix(globals): import utils in test. fix build editor globals

build/build-editor-types.ts

@@ -14,21 +14,21 @@ for (let def of kitDefs) {
 	kitContent += await readFile(path.resolve("src", "types", def), "utf8")
 }
 
-let globalDefs = path.resolve(
-	"node_modules",
-	"@johnlindquist",
-	"globals",
-	"types"
-)
+// let globalDefs = path.resolve(
+// 	"node_modules",
+// 	"@johnlindquist",
+// 	"globals",
+// 	"types"
+// )
 
-let globalTypeDirs = (await readdir(globalDefs)).filter(
-	(dir) => !dir.endsWith(".ts")
-)
+// let globalTypeDirs = (await readdir(globalDefs)).filter(
+// 	(dir) => !dir.endsWith(".ts")
+// )
 
-console.log({ defs: kitDefs, globalTypeDirs })
+// console.log({ defs: kitDefs, globalTypeDirs })
 
 // GlobalsAPI
-kitContent += await readFile(path.resolve(globalDefs, "index.d.ts"), "utf8")
+// kitContent += await readFile(path.resolve(globalDefs, "index.d.ts"), "utf8")
 
 //       content = `declare module '@johnlindquist/kit' {
 

src/api/global.test.js

@@ -35,6 +35,7 @@ ava.serial("env should work with different params", async (t) => {
 ava.serial("All globals exist", async (t) => {
 	// TODO: Make platform independent...
 	/** @type {import("../platform/darwin")} */
+	await import(pathToFileURL(kitPath("core", "utils.js")).href)
 	await import(pathToFileURL(kitPath("platform", "darwin.js")).href)
 	await import(pathToFileURL(kitPath("target", "app.js")).href)
 	await import(pathToFileURL(kitPath("api", "pro.js")).href)

src/api/packages/shelljs.ts

@@ -14,6 +14,7 @@ const {
   tempdir,
   test,
   which,
+  cd,
 } = shelljs
 
 global.cp = cp
@@ -35,5 +36,6 @@ global.tempdir = tempdir
 global.test = test
 global.which = which
 global.pwd = pwd
+global.cd = cd
 
 export {}

src/globals/fs.ts

@@ -24,6 +24,7 @@ export let writeFileSync = (global.writeFileSync = fs.writeFileSync)
 export let appendFileSync = (global.appendFileSync = fs.appendFileSync)
 export let readdirSync = (global.readdirSync = fs.readdirSync)
 export let copyFileSync = (global.copyFileSync = fs.copyFileSync)
+export let renameSync = (global.renameSync = fs.renameSync)
 
 
 export let createReadStream = (global.createReadStream = fs.createReadStream)

src/types/packages.d.ts

@@ -58,10 +58,8 @@ export type OnTab = (name: string, fn: () => void) => void
 
 export type TmpPromise = typeof import("tmp-promise")
 
-export type Zx = typeof import("zx/build/index")
-
 export interface PackagesApi {
-	cd: Zx["cd"]
+	cd: typeof shelljs.cd
 	cp: typeof shelljs.cp
 	chmod: typeof shelljs.chmod
 	echo: typeof shelljs.echo
@@ -97,7 +95,7 @@ export interface IDegit {
 type Degit = (repo: string, options?: DegitOptions) => IDegit
 
 declare global {
-	var cd: Zx["cd"]
+	var cd: typeof shelljs.cd
 	var cp: typeof shelljs.cp
 	var chmod: typeof shelljs.chmod
 	var echo: typeof shelljs.echo