From 232898927a09e34ca4b8712c12e49a9d4cbae02c Mon Sep 17 00:00:00 2001 From: Hongbo Zhang Date: Tue, 25 Feb 2020 11:16:44 +0800 Subject: [PATCH 1/3] update artifacts/install --- .npmignore | 1 + jscomp/artifacts.json | 4 ++-- scripts/install.js | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.npmignore b/.npmignore index 473c14ab51..d0e8da82e9 100644 --- a/.npmignore +++ b/.npmignore @@ -32,3 +32,4 @@ vendor/cppo vendor/rollup.js package/ *.tgz +darwin/bsc \ No newline at end of file diff --git a/jscomp/artifacts.json b/jscomp/artifacts.json index eadf249986..3342a19c45 100644 --- a/jscomp/artifacts.json +++ b/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" ] diff --git a/scripts/install.js b/scripts/install.js index 3bf6e6ee1c..4e880ce6ca 100644 --- a/scripts/install.js +++ b/scripts/install.js @@ -207,7 +207,7 @@ function provideCompiler() { cwd: lib_dir, stdio: [0, 1, 2] }); - cp.execFileSync(ninja_bin_output, ["-f", "release.ninja"], { + cp.execFileSync(ninja_bin_output, ["-f", "release.ninja","-v"], { cwd: lib_dir, stdio: [0, 1, 2] }); From cb72dc7bcf2038a09fb51afa3570ddfbf8c75ea6 Mon Sep 17 00:00:00 2001 From: Hongbo Zhang Date: Tue, 25 Feb 2020 11:17:09 +0800 Subject: [PATCH 2/3] bump version --- jscomp/common/bs_version.ml | 2 +- lib/4.06.1/bsb.ml | 2 +- lib/4.06.1/bsdep.ml | 2 +- lib/4.06.1/unstable/bsb_native.ml | 2 +- lib/4.06.1/unstable/js_compiler.ml | 2 +- lib/4.06.1/unstable/js_refmt_compiler.ml | 2 +- lib/4.06.1/whole_compiler.ml | 2 +- package-lock.json | 2 +- package.json | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/jscomp/common/bs_version.ml b/jscomp/common/bs_version.ml index b7bc07f519..0216104429 100644 --- a/jscomp/common/bs_version.ml +++ b/jscomp/common/bs_version.ml @@ -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" diff --git a/lib/4.06.1/bsb.ml b/lib/4.06.1/bsb.ml index b7406284f5..ba01a619be 100644 --- a/lib/4.06.1/bsb.ml +++ b/lib/4.06.1/bsb.ml @@ -55,7 +55,7 @@ end = struct * 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" diff --git a/lib/4.06.1/bsdep.ml b/lib/4.06.1/bsdep.ml index 9c172c1223..070cf921eb 100644 --- a/lib/4.06.1/bsdep.ml +++ b/lib/4.06.1/bsdep.ml @@ -6505,7 +6505,7 @@ end = struct * 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" diff --git a/lib/4.06.1/unstable/bsb_native.ml b/lib/4.06.1/unstable/bsb_native.ml index 3e236708d7..6482f06649 100644 --- a/lib/4.06.1/unstable/bsb_native.ml +++ b/lib/4.06.1/unstable/bsb_native.ml @@ -55,7 +55,7 @@ end = struct * 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" diff --git a/lib/4.06.1/unstable/js_compiler.ml b/lib/4.06.1/unstable/js_compiler.ml index 0dc7b8d5d1..3e36a46587 100644 --- a/lib/4.06.1/unstable/js_compiler.ml +++ b/lib/4.06.1/unstable/js_compiler.ml @@ -313790,7 +313790,7 @@ end = struct * 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" diff --git a/lib/4.06.1/unstable/js_refmt_compiler.ml b/lib/4.06.1/unstable/js_refmt_compiler.ml index dcdc0f26e3..ff22e2fb57 100644 --- a/lib/4.06.1/unstable/js_refmt_compiler.ml +++ b/lib/4.06.1/unstable/js_refmt_compiler.ml @@ -313790,7 +313790,7 @@ end = struct * 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" diff --git a/lib/4.06.1/whole_compiler.ml b/lib/4.06.1/whole_compiler.ml index 8203334686..d0126dec64 100644 --- a/lib/4.06.1/whole_compiler.ml +++ b/lib/4.06.1/whole_compiler.ml @@ -303953,7 +303953,7 @@ end = struct * 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" diff --git a/package-lock.json b/package-lock.json index b1d47a77e6..5ef4657804 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "bs-platform", - "version": "7.2.0-dev.3", + "version": "7.2.0-dev.4", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 97c02b8ea0..394fabff43 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "postinstall": "node scripts/install.js" }, "name": "bs-platform", - "version": "7.2.0-dev.1", + "version": "7.2.0-dev.4", "description": "bucklescript compiler, ocaml standard libary by bucklescript and its required runtime support", "repository": { "type": "git", From 9186e032b365e27d1ee754101b76d13e39ace78d Mon Sep 17 00:00:00 2001 From: Hongbo Zhang Date: Tue, 25 Feb 2020 11:25:51 +0800 Subject: [PATCH 3/3] remove staled tasks.json, snapshot --- jscomp/bsb/bsb_templates.ml | 101 +----------------- .../templates/basic-reason/.vscode/tasks.json | 45 -------- jscomp/bsb/templates/basic-reason/README.md | 3 - jscomp/bsb/templates/basic/.vscode/tasks.json | 38 ------- jscomp/bsb/templates/basic/README.md | 3 - lib/4.06.1/bsb.ml | 101 +----------------- lib/4.06.1/unstable/bsb_native.ml | 101 +----------------- 7 files changed, 12 insertions(+), 380 deletions(-) delete mode 100644 jscomp/bsb/templates/basic-reason/.vscode/tasks.json delete mode 100644 jscomp/bsb/templates/basic/.vscode/tasks.json diff --git a/jscomp/bsb/bsb_templates.ml b/jscomp/bsb/bsb_templates.ml index feca57d748..82a78d17af 100644 --- a/jscomp/bsb/bsb_templates.ml +++ b/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 cmd + shift + B or Windows + Shift + B 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\ diff --git a/jscomp/bsb/templates/basic-reason/.vscode/tasks.json b/jscomp/bsb/templates/basic-reason/.vscode/tasks.json deleted file mode 100644 index 2c0e9f6458..0000000000 --- a/jscomp/bsb/templates/basic-reason/.vscode/tasks.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "version": "${bsb:proj-version}", - "command": "npm", - "options": { - "cwd": "${workspaceRoot}", - "env": { - "BS_VSCODE" : "true" - } - }, - "type": "shell", - "args": ["run", "start"], - "presentation": { - "echo": true, - "reveal": "always", - "focus": false, - "panel": "shared" - }, - "isBackground": true, - "problemMatcher": { - "fileLocation": "absolute", - "owner": "ocaml", - "background": { - "activeOnStart": false, - "beginsPattern": ">>>> Start compiling", - "endsPattern": ">>>> Finish compiling" - }, - "pattern": [ - { - "regexp": - "^File \"(.*)\", line (\\d+)(?:, characters (\\d+)-(\\d+))?:$", - "file": 1, - "line": 2, - "column": 3, - "endColumn": 4 - }, - { - "regexp": - "^(?:(?:Parse\\s+)?(Warning|[Ee]rror)(?:\\s+\\d+)?:)?\\s+(.*)$", - "severity": 1, - "message": 2, - "loop": true - } - ] - } - } diff --git a/jscomp/bsb/templates/basic-reason/README.md b/jscomp/bsb/templates/basic-reason/README.md index cb0465bdae..a3da26c7b4 100644 --- a/jscomp/bsb/templates/basic-reason/README.md +++ b/jscomp/bsb/templates/basic-reason/README.md @@ -22,6 +22,3 @@ yarn start npm run start ``` -# Editor - -If you're using VS Code, press cmd + shift + B or Windows + Shift + B to build the project automatically. diff --git a/jscomp/bsb/templates/basic/.vscode/tasks.json b/jscomp/bsb/templates/basic/.vscode/tasks.json deleted file mode 100644 index 9dda7365fe..0000000000 --- a/jscomp/bsb/templates/basic/.vscode/tasks.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "version": "${bsb:proj-version}", - "command": "npm", - "options": { - "cwd": "${workspaceRoot}" - }, - "isShellCommand": true, - "args": [ - "run", - "watch" - ], - "showOutput": "always", - "isBackground": true, - "problemMatcher": { - "fileLocation": "absolute", - "owner": "ocaml", - "watching": { - "activeOnStart": false, - "beginsPattern": ">>>> Start compiling", - "endsPattern": ">>>> Finish compiling" - }, - "pattern": [ - { - "regexp": "^File \"(.*)\", line (\\d+)(?:, characters (\\d+)-(\\d+))?:$", - "file": 1, - "line": 2, - "column": 3, - "endColumn": 4 - }, - { - "regexp": "^(?:(?:Parse\\s+)?(Warning|[Ee]rror)(?:\\s+\\d+)?:)?\\s+(.*)$", - "severity": 1, - "message": 2, - "loop": true - } - ] - } -} \ No newline at end of file diff --git a/jscomp/bsb/templates/basic/README.md b/jscomp/bsb/templates/basic/README.md index 1c02d2a072..b20ab1bade 100644 --- a/jscomp/bsb/templates/basic/README.md +++ b/jscomp/bsb/templates/basic/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 \ No newline at end of file diff --git a/lib/4.06.1/bsb.ml b/lib/4.06.1/bsb.ml index ba01a619be..04c79950ad 100644 --- a/lib/4.06.1/bsb.ml +++ b/lib/4.06.1/bsb.ml @@ -14289,46 +14289,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\ @@ -14409,62 +14369,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\ @@ -14534,15 +14444,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 cmd + shift + B or Windows + Shift + B to build the project automatically.\n\ ")]) ; Dir ("generator", [ Dir ("src", [ @@ -15128,7 +15035,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\ @@ -16096,7 +16003,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\ diff --git a/lib/4.06.1/unstable/bsb_native.ml b/lib/4.06.1/unstable/bsb_native.ml index 6482f06649..f3a2d7f98a 100644 --- a/lib/4.06.1/unstable/bsb_native.ml +++ b/lib/4.06.1/unstable/bsb_native.ml @@ -14411,46 +14411,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\ @@ -14531,62 +14491,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\ @@ -14656,15 +14566,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 cmd + shift + B or Windows + Shift + B to build the project automatically.\n\ ")]) ; Dir ("generator", [ Dir ("src", [ @@ -15250,7 +15157,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\ @@ -16218,7 +16125,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\