Reimplement base file as optional

Iron-Stag-Games · Dec 3, 2023 · eee597c · eee597c
1 parent 0333792
commit eee597c
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/Lync/index.js b/Lync/index.js
@@ -939,7 +939,7 @@ function runJobs(event, localPath) {
 	}
 
 	// Build
-	if (MODE == 'open' || MODE == 'build') {
+	if (MODE == 'open' && !('base' in projectJson) || MODE == 'build') {
 		const buildScriptPath = projectJson.build + '.luau'
 		const lunePath = PLATFORM == 'windows' && CONFIG.Path_Lune.replace('%LOCALAPPDATA%', process.env.LOCALAPPDATA)
 			|| PLATFORM == 'macos' && CONFIG.Path_Lune.replace('$HOME', process.env.HOME)
@@ -1070,6 +1070,24 @@ function runJobs(event, localPath) {
 		})
 	}
 
+	// Copy base file
+	if (MODE == 'open' && ('base' in projectJson)) {
+		if (DEBUG) console.log('Copying', cyan(projectJson.base), '->', cyan(projectJson.build))
+		fs.copyFileSync(projectJson.base, projectJson.build)
+
+		// Open Studio
+		for (const key in securityKeys) delete securityKeys[key]
+		if (PLATFORM == 'windows' || PLATFORM == 'macos') {
+			if (DEBUG) console.log('Opening', cyan(projectJson.build))
+			spawn((PLATFORM == 'macos' && 'open -n ' || '') + `"${projectJson.build}"`, [], {
+				stdio: 'ignore',
+				detached: true,
+				shell: true,
+				windowsHide: true
+			})
+		}
+	}
+
 	// Sync
 	if (MODE == 'serve' || MODE == 'open') {
 

diff --git a/Lync/validator/project.js b/Lync/validator/project.js
@@ -100,8 +100,9 @@ module.exports.validate = function(type, json, localPath) {
 			failed = true
 		}
 
-		if ('base' in json) {
-			console.error(fileError(localPath), yellow('Deprecated key'), green('base'))
+		if (('base' in json) && typeof json.base != 'string') {
+			console.error(jsonError(localPath, json, json, 'base'), yellow('Must be a string'))
+			failed = true
 		}
 
 		if (!('build' in json)) {