Remove base file

Iron-Stag-Games · Nov 29, 2023 · 412905a · 412905a
1 parent 271612c
commit 412905a
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 39 deletions.
diff --git a/Lync/RobloxPluginSource/Plugin.lua b/Lync/RobloxPluginSource/Plugin.lua
@@ -19,7 +19,7 @@
 	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
 	USA
 ]]
-local VERSION = "Alpha 26"
+local VERSION = "Alpha 27"
 
 if not plugin or game:GetService("RunService"):IsRunning() and game:GetService("RunService"):IsClient() then return end
 

diff --git a/Lync/index.js b/Lync/index.js
@@ -18,7 +18,7 @@
 	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
 	USA
 */
-const VERSION = 'Alpha 26'
+const VERSION = 'Alpha 27'
 
 const { spawn, spawnSync } = require('child_process')
 const fs = require('fs')
@@ -107,18 +107,18 @@ const DEBUG = CONFIG.Debug
  */
 function argHelp(err) {
 	if (err) console.error(red('Argument error:'), yellow(err) + '\n')
-	console.log(`┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
-┃ LYNC HELP                          Displays the list of available arguments.          ┃
-┃      CONFIG                        Opens the config file.                             ┃
-┃      SERVE ${cyan('project.json', true)}? ${green('REMOTE', true)}?   Syncs the project.                                 ┃
-┃      OPEN  ${cyan('project.json', true)}? ${green('REMOTE', true)}?   Syncs the project and opens it in Roblox Studio.   ┃
-┃      BUILD ${cyan('project.json', true)}?           Builds the project to file.                        ┃
-┃      FETCH ${cyan('project.json', true)}?           Downloads the list of sources in the project file. ┃
-┣╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍┫
-┃ ${cyan('project.json', true)}?   The project file to read from and serve.                              ┃
-┃ ${green('REMOTE', true)}?         Connect to the project's ${green('remoteAddress')} instead of the localhost.    ┃
-┃                 ${red('Warning:')} ${yellow('REMOTE is unimplemented!')}                                     ┃
-┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛ 
+	console.log(`┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
+┃ LYNC HELP                          Displays the list of available arguments.              ┃
+┃      CONFIG                        Opens the config file.                                 ┃
+┃      SERVE ${cyan('project.json', true)}? ${green('REMOTE', true)}?   Syncs the project.                                     ┃
+┃      OPEN  ${cyan('project.json', true)}? ${green('REMOTE', true)}?   Builds, syncs, and opens the project in Roblox Studio. ┃
+┃      BUILD ${cyan('project.json', true)}?           Builds the project to file.                            ┃
+┃      FETCH ${cyan('project.json', true)}?           Downloads the list of sources in the project file.     ┃
+┣╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍┫
+┃ ${cyan('project.json', true)}?   The project file to read from and serve.                                  ┃
+┃ ${green('REMOTE', true)}?         Connect to the project's ${green('remoteAddress')} instead of the localhost.        ┃
+┃                 ${red('Warning:')} ${yellow('REMOTE is unimplemented!')}                                         ┃
+┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛ 
 `)
 	process.exit(err && -1 || 0)
 }
@@ -784,18 +784,6 @@ async function changedJson() {
 		globIgnorePathsArr.push(projectJson.globIgnorePaths)
 	globIgnorePaths = `{${globIgnorePathsArr.join(',')}}`
 	globIgnorePathsPicoMatch = picomatch(globIgnorePaths)
-	if (MODE == 'open' || MODE == 'build') {
-		if (projectJson.base == '') {
-			console.error(red('Terminated:'), green('base'), yellow('cannot be a blank string with OPEN or BUILD mode'))
-			process.exit()
-		} else if (!fs.existsSync(projectJson.base)) {
-			console.error(red('Terminated:'), yellow('Base'), cyan(projectJson.base), yellow('does not exist'))
-			process.exit()
-		} else if (projectJson.build == '') {
-			console.error(red('Terminated:'), green('build'), yellow('cannot be a blank string with OPEN or BUILD mode'))
-			process.exit()
-		}
-	}
 	if (DEBUG) console.log('Mapping', green(projectJson.name))
 	map = {}
 	const projectJsonStats = fs.statSync(PROJECT_JSON)
@@ -1069,12 +1057,6 @@ function runJobs(event, localPath) {
 	// Sync
 	} else {
 
-		// Copy base file
-		if (MODE == 'open') {
-			if (DEBUG) console.log('Copying', cyan(projectJson.base), '->', cyan(projectJson.build))
-			fs.copyFileSync(projectJson.base, projectJson.build)
-		}
-
 		// Copy plugin
 		const pluginsPath = path.resolve(PLATFORM == 'windows' && CONFIG.Path_RobloxPlugins.replace('%LOCALAPPDATA%', process.env.LOCALAPPDATA) || PLATFORM == 'macos' && CONFIG.Path_RobloxPlugins.replace('$HOME', process.env.HOME) || CONFIG.Path_RobloxPlugins)
 		if (!fs.existsSync(pluginsPath)) {

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

diff --git a/Sample Project/default.base.rbxl b/Sample Project/default.base.rbxl
diff --git a/Sample Project/default.project.json b/Sample Project/default.project.json
@@ -1,7 +1,6 @@
 {
 	"name": "Example Build",
 	"port": 34873,
-	"base": "default.base.rbxl",
 	"build": "BuildScripts/Build/Build.rbxl",
 	"sourcemapEnabled": {
 		"RBXM": true,