Merge pull request #13 from johanbrandhorst/remove-dependency-on-gene…

…rated-files

Remove dependency on generated javascript files

.circleci/config.yml

@@ -14,15 +14,11 @@ jobs:
     working_directory: /go/src/github.com/johanbrandhorst/protobuf
     steps:
       - checkout
-      - run:
-          name: Install webpack
-          command: |
-            curl -sL https://deb.nodesource.com/setup_8.x | bash -
-            apt-get install -y nodejs
-            npm install -g webpack
       - run:
           name: Install protoc
           command: >
+            apt-get update
+
             apt-get install -y unzip git wget python3
 
             rm -rf /var/lib/apt/lists/*

jspb/errors.go

@@ -0,0 +1,19 @@
+package jspb
+
+import "github.com/gopherjs/gopherjs/js"
+
+// catchException recovers any JS exceptions and
+// stores the error in the parameter
+func catchException(err *error) {
+	e := recover()
+
+	if e == nil {
+		return
+	}
+
+	if e, ok := e.(*js.Error); ok {
+		*err = e
+	} else {
+		panic(e)
+	}
+}

jspb/include.go

@@ -20,6 +20,6 @@
 
 package jspb
 
-// JspbPackageIsVersion1 is referenced from generated protocol buffer files
+// JspbPackageIsVersion2 is referenced from generated protocol buffer files
 // to assert that that code is compatible with this version of the package.
-const JspbPackageIsVersion1 = true
+const JspbPackageIsVersion2 = true