Fix lockfile not being updated for 6.0.0-rc.3

CHANGELOG.md

@@ -2,7 +2,11 @@
 
 ## Unreleased Changes
 
-## [6.0.0 Release Candidate 2](https://github.com/rojo-rbx/rojo/releases/tag/v6.0.0-rc.1) (November 19, 2020)
+## [6.0.0 Release Candidate 3](https://github.com/rojo-rbx/rojo/releases/tag/v6.0.0-rc.3) (November 19, 2020)
+* Fixed the Rojo plugin attempted to write the non-scriptable properties `Instance.SourceAssetId` and `HttpServer.HttpEnabled`.
+* Fixed the Rojo plugin's handling of null referents.
+
+## [6.0.0 Release Candidate 2](https://github.com/rojo-rbx/rojo/releases/tag/v6.0.0-rc.2) (November 19, 2020)
 * Fixed crash when malformed CSV files are put into a project. ([#310](https://github.com/rojo-rbx/rojo/issues/310))
 * Fixed incorrect string escaping when producing Lua code from JSON files. ([#314](https://github.com/rojo-rbx/rojo/issues/314))
 * Fixed performance issues introduced in Rojo 6.0.0-rc.1. ([#317](https://github.com/rojo-rbx/rojo/issues/317))

Cargo.lock

@@ -1973,7 +1973,7 @@ dependencies = [
 
 [[package]]
 name = "rojo"
-version = "6.0.0-rc.2"
+version = "6.0.0-rc.3"
 dependencies = [
  "anyhow",
  "backtrace",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rojo"
-version = "6.0.0-rc.2"
+version = "6.0.0-rc.3"
 authors = ["Lucien Greathouse <me@lpghatguy.com>"]
 description = "Enables professional-grade development tools for Roblox developers"
 license = "MPL-2.0"

memofs/CHANGELOG.md

@@ -1,6 +1,8 @@
 # memofs Changelog
 
 ## Unreleased Changes
+
+## 0.1.3 (2020-11-19)
 * Added `set_watch_enabled` to `Vfs` and `VfsLock` to allow turning off file watching.
 
 ## 0.1.2 (2020-03-29)

plugin/rbx_dom_lua/src/ReflectionDatabase/classes.lua

@@ -6283,7 +6283,7 @@ return {
 				isCanonical = true,
 				canonicalName = nil,
 				serializedName = nil,
-				scriptability = "ReadWrite",
+				scriptability = "None",
 				serializes = true,
 			},
 		},
@@ -7543,7 +7543,7 @@ return {
 				isCanonical = true,
 				canonicalName = nil,
 				serializedName = nil,
-				scriptability = "ReadWrite",
+				scriptability = "None",
 				serializes = true,
 			},
 			Tags = {
@@ -19580,4 +19580,4 @@ return {
 		defaults = {
 		},
 	},
-}
+}

plugin/src/Config.lua

@@ -5,7 +5,7 @@ local isDevBuild = script.Parent.Parent:FindFirstChild("ROJO_DEV_BUILD") ~= nil
 return strict("Config", {
 	isDevBuild = isDevBuild,
 	codename = "Epiphany",
-	version = {6, 0, 0, "-rc.2"},
+	version = {6, 0, 0, "-rc.3"},
 	expectedServerVersionString = "6.0 or newer",
 	protocolVersion = 3,
 	defaultHost = "localhost",

plugin/src/Reconciler/decodeValue.lua

@@ -9,6 +9,10 @@ local Error = require(script.Parent.Error)
 local function decodeValue(virtualValue, instanceMap)
 	-- Refs are represented as IDs in the same space that Rojo's protocol uses.
 	if virtualValue.Type == "Ref" then
+		if virtualValue.Value == nil then
+			return true, nil
+		end
+
 		local instance = instanceMap.fromIds[virtualValue.Value]
 
 		if instance ~= nil then

plugin/src/Reconciler/reify.lua

@@ -136,15 +136,21 @@ function applyDeferredRefs(instanceMap, deferredRefs, unappliedPatch)
 	end
 
 	for _, entry in ipairs(deferredRefs) do
-		local targetInstance = instanceMap.fromIds[entry.virtualValue.Value]
+		local virtualValue = entry.virtualValue
+
+		if virtualValue.Value == nil then
+			continue
+		end
+
+		local targetInstance = instanceMap.fromIds[virtualValue.Value]
 		if targetInstance == nil then
-			markFailed(entry.id, entry.propertyName, entry.virtualValue)
+			markFailed(entry.id, entry.propertyName, virtualValue)
 			continue
 		end
 
 		local ok = setProperty(entry.instance, entry.propertyName, targetInstance)
 		if not ok then
-			markFailed(entry.id, entry.propertyName, entry.virtualValue)
+			markFailed(entry.id, entry.propertyName, virtualValue)
 		end
 	end
 end