Skip to content

Commit

Permalink
Merge 3efc6d6 into 25a6e36
Browse files Browse the repository at this point in the history
  • Loading branch information
@bobzhang
bobzhang committed Feb 12, 2018
2 parents 25a6e36 + 3efc6d6 commit 0eac91b
Show file tree
Hide file tree
Showing 5 changed files with 108 additions and 87 deletions.
93 changes: 51 additions & 42 deletions jscomp/bsb/bsb_templates.ml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,47 +128,9 @@ let root = OCamlRes.Res.([
*.mlast\n\
*.mliast\n\
.vscode\n\
.merlin")]) ;
.merlin\n\
.bsb.lock")]) ;
Dir ("basic-reason", [
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\
}") ;
Dir ("src", [
File ("Demo.re",
"Js.log(\"Hello, BuckleScript and Reason!\");\n\
Expand Down Expand Up @@ -237,6 +199,51 @@ let root = OCamlRes.Res.([
\ \"refmt\": 3\n\
}\n\
") ;
Dir (".vscode", [
File ("tasks.json",
"{\n\
\ \"version\": \"${bsb:proj-version}\",\n\
\ \"command\": \"npm\",\n\
\ \"options\": {\n\
\ \"cwd\": \"${workspaceRoot}\"\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 (".gitignore",
".DS_Store\n\
.merlin\n\
Expand Down Expand Up @@ -341,7 +348,8 @@ let root = OCamlRes.Res.([
*.mlast\n\
*.mliast\n\
.vscode\n\
.merlin")]) ;
.merlin\n\
.bsb.lock")]) ;
Dir ("minimal", [
Dir ("src", [ File ("main.ml", "")]) ;
File ("README.md",
Expand Down Expand Up @@ -463,7 +471,8 @@ let root = OCamlRes.Res.([
*.mlast\n\
*.mliast\n\
.vscode\n\
.merlin")]) ;
.merlin\n\
.bsb.lock")]) ;
Dir ("react", [
File ("webpack.config.js",
"const path = require('path');\n\
Expand Down
3 changes: 2 additions & 1 deletion jscomp/bsb/templates/basic/.gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ lib/bs
*.mlast
*.mliast
.vscode
.merlin
.merlin
.bsb.lock
3 changes: 2 additions & 1 deletion jscomp/bsb/templates/generator/.gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ lib/bs
*.mlast
*.mliast
.vscode
.merlin
.merlin
.bsb.lock
3 changes: 2 additions & 1 deletion jscomp/bsb/templates/node/.gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ lib/bs
*.mlast
*.mliast
.vscode
.merlin
.merlin
.bsb.lock
93 changes: 51 additions & 42 deletions lib/bsb.ml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13061,47 +13061,9 @@ let root = OCamlRes.Res.([
*.mlast\n\
*.mliast\n\
.vscode\n\
.merlin")]) ;
.merlin\n\
.bsb.lock")]) ;
Dir ("basic-reason", [
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\
}") ;
Dir ("src", [
File ("Demo.re",
"Js.log(\"Hello, BuckleScript and Reason!\");\n\
Expand Down Expand Up @@ -13170,6 +13132,51 @@ let root = OCamlRes.Res.([
\ \"refmt\": 3\n\
}\n\
") ;
Dir (".vscode", [
File ("tasks.json",
"{\n\
\ \"version\": \"${bsb:proj-version}\",\n\
\ \"command\": \"npm\",\n\
\ \"options\": {\n\
\ \"cwd\": \"${workspaceRoot}\"\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 (".gitignore",
".DS_Store\n\
.merlin\n\
Expand Down Expand Up @@ -13274,7 +13281,8 @@ let root = OCamlRes.Res.([
*.mlast\n\
*.mliast\n\
.vscode\n\
.merlin")]) ;
.merlin\n\
.bsb.lock")]) ;
Dir ("minimal", [
Dir ("src", [ File ("main.ml", "")]) ;
File ("README.md",
Expand Down Expand Up @@ -13396,7 +13404,8 @@ let root = OCamlRes.Res.([
*.mlast\n\
*.mliast\n\
.vscode\n\
.merlin")]) ;
.merlin\n\
.bsb.lock")]) ;
Dir ("react", [
File ("webpack.config.js",
"const path = require('path');\n\
Expand Down

0 comments on commit 0eac91b

Please sign in to comment.