Address feedback from hajimehoshi

myitcv · myitcv · commit b1995ab36b3a · 2018-04-16T20:41:01.000+01:00
diff --git a/circle.yml b/circle.yml
@@ -10,7 +10,7 @@ dependencies:
   post:
     - mv ./gopherjs $HOME/bin
     - npm install --global node-gyp
-    - npm install
+    - npm install # install our (dev) dependencies from package.json
     - cd node-syscall && node-gyp rebuild && mkdir -p ~/.node_libraries/ && cp build/Release/syscall.node ~/.node_libraries/syscall.node
 
 test:
diff --git a/compiler/prelude/genmin.go b/compiler/prelude/genmin.go
@@ -36,23 +36,22 @@ func run() error {
 	cmd := exec.Command(args[0], args[1:]...)
 	cmd.Stdin = strings.NewReader(prelude.Prelude)
 
-	out, err := cmd.CombinedOutput()
+	byts, err := cmd.CombinedOutput()
 	if err != nil {
 		return fmt.Errorf("failed to run %v: %v\n%s", strings.Join(args, " "), err, string(out))
 	}
 
 	fn := "prelude_min.go"
 
-	safeOut := strings.Replace(string(out), "`", "\\0060", -1)
-
-	err = ioutil.WriteFile(fn, []byte(`// Code generated by genmin. DO NOT EDIT.
+	out := fmt.Sprintf(`// Code generated by genmin. DO NOT EDIT
 
 package prelude
 
 // Minified is an uglifyjs-minified version of Prelude
-const Minified = `+"`"+safeOut+"`\n"), 0644)
+const Minified = %q
+`, byts)
 
-	if err != nil {
+	if err := ioutil.WriteFile(fn, []byte(out), 0644); err != nil {
 		return fmt.Errorf("failed to write to %v: %v", fn, err)
 	}
 
diff --git a/compiler/prelude/prelude_min.go b/compiler/prelude/prelude_min.go
