Merge pull request #4187 from BuckleScript/fix_4185

fix #4185

Author: bobzhang

.npmignore

@@ -32,3 +32,4 @@ vendor/cppo
 vendor/rollup.js
 package/
 *.tgz
+darwin/bsc

jscomp/artifacts.json

@@ -4,6 +4,7 @@
     ".gitmodules",
     "bsb",
     "bsc",
+    "bsrefmt",
     "COPYING",
     "LICENSE",
     "4061.json",
@@ -45,7 +46,6 @@
   ],
   "lib": [
     "bscc",
-    "bsrefmt",
     "bstracing",
     "minisocket.js",
     "jsconfig.json",
@@ -1126,7 +1126,7 @@
     "ninja.COPYING",
     "bsb_helper.exe",
     "bsb.exe",
-    "bsc.exe",    
+    "bsc.exe",
     "ninja.exe",
     "refmt.exe"
   ]

jscomp/bsb/bsb_templates.ml

@@ -6,46 +6,6 @@ let root = OCamlRes.Res.([
         "\n\
          \n\
          let () = Js.log \"Hello, BuckleScript\"")]) ;
-    Dir  (".vscode", [
-      File  ("tasks.json",
-        "{\n\
-        \    \"version\": \"${bsb:proj-version}\",\n\
-        \    \"command\": \"npm\",\n\
-        \    \"options\": {\n\
-        \        \"cwd\": \"${workspaceRoot}\"\n\
-        \    },\n\
-        \    \"isShellCommand\": true,\n\
-        \    \"args\": [\n\
-        \        \"run\",\n\
-        \        \"watch\"\n\
-        \    ],\n\
-        \    \"showOutput\": \"always\",\n\
-        \    \"isBackground\": true,\n\
-        \    \"problemMatcher\": {\n\
-        \        \"fileLocation\": \"absolute\",\n\
-        \        \"owner\": \"ocaml\",\n\
-        \        \"watching\": {\n\
-        \            \"activeOnStart\": false,\n\
-        \            \"beginsPattern\": \">>>> Start compiling\",\n\
-        \            \"endsPattern\": \">>>> Finish compiling\"\n\
-        \        },\n\
-        \        \"pattern\": [\n\
-        \            {\n\
-        \                \"regexp\": \"^File \\\"(.*)\\\", line (\\\\d+)(?:, characters (\\\\d+)-(\\\\d+))?:$\",\n\
-        \                \"file\": 1,\n\
-        \                \"line\": 2,\n\
-        \                \"column\": 3,\n\
-        \                \"endColumn\": 4\n\
-        \            },\n\
-        \            {\n\
-        \                \"regexp\": \"^(?:(?:Parse\\\\s+)?(Warning|[Ee]rror)(?:\\\\s+\\\\d+)?:)?\\\\s+(.*)$\",\n\
-        \                \"severity\": 1,\n\
-        \                \"message\": 2,\n\
-        \                \"loop\": true\n\
-        \            }\n\
-        \        ]\n\
-        \    }\n\
-         }")]) ;
     File  ("bsconfig.json",
       "{\n\
       \  \"name\": \"${bsb:name}\",\n\
@@ -126,62 +86,12 @@ let root = OCamlRes.Res.([
        npm run watch\n\
        ```\n\
        \n\
-       \n\
-       # Editor\n\
-       If you use `vscode`, Press `Windows + Shift + B` it will build automatically")]) ;
+       ")]) ;
   Dir  ("basic-reason", [
     Dir  ("src", [
       File  ("Demo.re",
         "Js.log(\"Hello, BuckleScript and Reason!\");\n\
          ")]) ;
-    Dir  (".vscode", [
-      File  ("tasks.json",
-        "{\n\
-        \    \"version\": \"${bsb:proj-version}\",\n\
-        \    \"command\": \"npm\",\n\
-        \    \"options\": {\n\
-        \      \"cwd\": \"${workspaceRoot}\",\n\
-        \      \"env\": {\n\
-        \        \"BS_VSCODE\" : \"true\"\n\
-        \      }\n\
-        \    },\n\
-        \    \"type\": \"shell\",\n\
-        \    \"args\": [\"run\", \"start\"],\n\
-        \    \"presentation\": {\n\
-        \      \"echo\": true,\n\
-        \      \"reveal\": \"always\",\n\
-        \      \"focus\": false,\n\
-        \      \"panel\": \"shared\"\n\
-        \    },\n\
-        \    \"isBackground\": true,\n\
-        \    \"problemMatcher\": {\n\
-        \      \"fileLocation\": \"absolute\",\n\
-        \      \"owner\": \"ocaml\",\n\
-        \      \"background\": {\n\
-        \        \"activeOnStart\": false,\n\
-        \        \"beginsPattern\": \">>>> Start compiling\",\n\
-        \        \"endsPattern\": \">>>> Finish compiling\"\n\
-        \      },\n\
-        \      \"pattern\": [\n\
-        \        {\n\
-        \          \"regexp\":\n\
-        \            \"^File \\\"(.*)\\\", line (\\\\d+)(?:, characters (\\\\d+)-(\\\\d+))?:$\",\n\
-        \          \"file\": 1,\n\
-        \          \"line\": 2,\n\
-        \          \"column\": 3,\n\
-        \          \"endColumn\": 4\n\
-        \        },\n\
-        \        {\n\
-        \          \"regexp\":\n\
-        \            \"^(?:(?:Parse\\\\s+)?(Warning|[Ee]rror)(?:\\\\s+\\\\d+)?:)?\\\\s+(.*)$\",\n\
-        \          \"severity\": 1,\n\
-        \          \"message\": 2,\n\
-        \          \"loop\": true\n\
-        \        }\n\
-        \      ]\n\
-        \    }\n\
-        \  }\n\
-         ")]) ;
     File  ("bsconfig.json",
       "{\n\
       \  \"name\": \"${bsb:name}\",\n\
@@ -251,15 +161,12 @@ let root = OCamlRes.Res.([
        \n\
        ```bash\n\
        # for yarn\n\
-       yarn\n\
+       yarn start\n\
        \n\
        # for npm\n\
        npm run start\n\
        ```\n\
        \n\
-       # Editor\n\
-       \n\
-       If you're using VS Code, press <kbd>cmd</kbd> + <kbd>shift</kbd> + <kbd>B</kbd> or <kbd>Windows</kbd> + <kbd>Shift</kbd> + <kbd>B</kbd> to build the project automatically.\n\
        ")]) ;
   Dir  ("generator", [
     Dir  ("src", [
@@ -845,7 +752,7 @@ let root = OCamlRes.Res.([
        function setUpWebSocket() {\n\
       \  if (websocketReloader == null || websocketReloader.readyState !== 1) {\n\
       \    try {\n\
-      \      websocketReloader = new WebSocket(`ws://localhost:${webSocketPort}`);\n\
+      \      websocketReloader = new WebSocket(`ws://${window.location.hostname}:${webSocketPort}`);\n\
       \      websocketReloader.onmessage = (message) => {\n\
       \        var newData = JSON.parse(message.data).LAST_SUCCESS_BUILD_STAMP;\n\
       \        if (newData > LAST_SUCCESS_BUILD_STAMP) {\n\
@@ -1813,7 +1720,7 @@ let root = OCamlRes.Res.([
        function setUpWebScoket() {\n\
       \    if (wsReloader == null || wsReloader.readyState !== 1) {\n\
       \        try {\n\
-      \            wsReloader = new WebSocket(`ws://localhost:${WS_PORT}`)\n\
+      \            wsReloader = new WebSocket(`ws://${window.location.hostname}:${WS_PORT}`)\n\
       \            wsReloader.onmessage = (msg) => {\n\
       \                var newData = JSON.parse(msg.data).LAST_SUCCESS_BUILD_STAMP\n\
       \                if (newData > LAST_SUCCESS_BUILD_STAMP) {\n\

jscomp/bsb/templates/basic-reason/.vscode/tasks.json

@@ -22,6 +22,3 @@ yarn start
 npm run start
 ```
 
-# Editor
-
-If you're using VS Code, press <kbd>cmd</kbd> + <kbd>shift</kbd> + <kbd>B</kbd> or <kbd>Windows</kbd> + <kbd>Shift</kbd> + <kbd>B</kbd> to build the project automatically.

jscomp/bsb/templates/basic-reason/README.md

@@ -11,6 +11,3 @@ npm run build
 npm run watch
 ```
 
-
-# Editor
-If you use `vscode`, Press `Windows + Shift + B` it will build automatically

jscomp/bsb/templates/basic/.vscode/tasks.json

@@ -22,7 +22,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)    
-let version = "7.2.0-dev.1"
+let version = "7.2.0-dev.4"
 let header = 
    "// Generated by BUCKLESCRIPT, PLEASE EDIT WITH CARE"  
 let package_name = "bs-platform"