Fix unbundled imports

Former-commit-id: f221da115c1afcd136648c9683d8e9907005a128

src/api/schema.d.ts

@@ -235,9 +235,9 @@ type uint32 = number;
 
   export interface JavascriptBundleContainer {
     bundle_format_version?: uint32;
-    bundle?: JavascriptBundle;
-    framework?: LoadedFramework;
     routes?: LoadedRouteConfig;
+    framework?: LoadedFramework;
+    bundle?: JavascriptBundle;
     code_length?: uint32;
   }
 

src/api/schema.js

@@ -373,16 +373,16 @@ function decodeJavascriptBundleContainer(bb) {
       result["bundle_format_version"] = bb.readUint32();
       break;
 
-    case 2:
-      result["bundle"] = decodeJavascriptBundle(bb);
+    case 3:
+      result["routes"] = decodeLoadedRouteConfig(bb);
       break;
 
-    case 3:
+    case 2:
       result["framework"] = decodeLoadedFramework(bb);
       break;
 
     case 4:
-      result["routes"] = decodeLoadedRouteConfig(bb);
+      result["bundle"] = decodeJavascriptBundle(bb);
       break;
 
     case 5:
@@ -403,22 +403,22 @@ function encodeJavascriptBundleContainer(message, bb) {
     bb.writeUint32(value);
   }
 
-  var value = message["bundle"];
+  var value = message["routes"];
   if (value != null) {
-    bb.writeByte(2);
-    encodeJavascriptBundle(value, bb);
+    bb.writeByte(3);
+    encodeLoadedRouteConfig(value, bb);
   }
 
   var value = message["framework"];
   if (value != null) {
-    bb.writeByte(3);
+    bb.writeByte(2);
     encodeLoadedFramework(value, bb);
   }
 
-  var value = message["routes"];
+  var value = message["bundle"];
   if (value != null) {
     bb.writeByte(4);
-    encodeLoadedRouteConfig(value, bb);
+    encodeJavascriptBundle(value, bb);
   }
 
   var value = message["code_length"];

src/api/schema.peechy

@@ -100,10 +100,11 @@ struct JavascriptBundle {
 message JavascriptBundleContainer {
   uint32 bundle_format_version = 1;
 
-  JavascriptBundle bundle = 2;
+  // These go first so if we change JavaScriptBundle we can still read these
+  LoadedRouteConfig routes = 3;
+  LoadedFramework framework = 2;
 
-  LoadedFramework framework = 3;
-  LoadedRouteConfig routes = 4;
+  JavascriptBundle bundle = 4;
 
   // Don't technically need to store this, but it may be helpful as a sanity check
   uint32 code_length = 5;

src/api/schema.zig

@@ -598,14 +598,14 @@ pub const JavascriptBundleContainer = struct {
 /// bundle_format_version
 bundle_format_version: ?u32 = null,
 
-/// bundle
-bundle: ?JavascriptBundle = null,
+/// routes
+routes: ?LoadedRouteConfig = null,
 
 /// framework
 framework: ?LoadedFramework = null,
 
-/// routes
-routes: ?LoadedRouteConfig = null,
+/// bundle
+bundle: ?JavascriptBundle = null,
 
 /// code_length
 code_length: ?u32 = null,
@@ -622,13 +622,13 @@ pub fn decode(reader: anytype) anyerror!JavascriptBundleContainer {
         this.bundle_format_version = try reader.readValue(u32); 
 },
       2 => {
-        this.bundle = try reader.readValue(JavascriptBundle); 
+        this.routes = try reader.readValue(LoadedRouteConfig); 
 },
       3 => {
         this.framework = try reader.readValue(LoadedFramework); 
 },
       4 => {
-        this.routes = try reader.readValue(LoadedRouteConfig); 
+        this.bundle = try reader.readValue(JavascriptBundle); 
 },
       5 => {
         this.code_length = try reader.readValue(u32); 
@@ -646,17 +646,17 @@ if (this.bundle_format_version) |bundle_format_version| {
   try writer.writeFieldID(1);
    try writer.writeInt(bundle_format_version);
 }
-if (this.bundle) |bundle| {
+if (this.routes) |routes| {
   try writer.writeFieldID(2);
-   try writer.writeValue(bundle);
+   try writer.writeValue(routes);
 }
 if (this.framework) |framework| {
   try writer.writeFieldID(3);
    try writer.writeValue(framework);
 }
-if (this.routes) |routes| {
+if (this.bundle) |bundle| {
   try writer.writeFieldID(4);
-   try writer.writeValue(routes);
+   try writer.writeValue(bundle);
 }
 if (this.code_length) |code_length| {
   try writer.writeFieldID(5);