Skip to content

Commit

Permalink
Merge pull request #2613 from BuckleScript/split_ppx_into_small_modules
Browse files Browse the repository at this point in the history 
split ppx into small modules
  • Loading branch information
@bobzhang
bobzhang committed Mar 13, 2018
2 parents 341b5d9 + d08c906 commit 03b944d
Show file tree
Hide file tree
Showing 19 changed files with 18,460 additions and 17,146 deletions.
4 changes: 4 additions & 0 deletions jscomp/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,10 @@ SYNTAX_SRCS= \
external_ffi_types\
external_process\
ast_util\
ast_exp_apply\
ast_exp_extension\
ast_core_type_class_type\
ast_tuple_pattern_flatten\
ppx_entry\
# not a good name ast_util
SYNTAX_CMXS=$(addprefix syntax/, $(addsuffix .cmx, $(SYNTAX_SRCS)))
Expand Down
30 changes: 24 additions & 6 deletions jscomp/all.depend
View file
Original file line number Diff line number Diff line change
Expand Up @@ -239,15 +239,29 @@ syntax/ast_util.cmx : ext/literals.cmx syntax/external_process.cmx \
syntax/ast_literal.cmx syntax/ast_external_mk.cmx syntax/ast_exp.cmx \
syntax/ast_core_type.cmx syntax/ast_comb.cmx syntax/ast_attributes.cmx \
syntax/ast_util.cmi
syntax/ast_exp_apply.cmx : ext/literals.cmx ext/ext_list.cmx \
syntax/bs_ast_mapper.cmx syntax/bs_ast_invariant.cmx syntax/ast_util.cmx \
syntax/ast_literal.cmx syntax/ast_attributes.cmx syntax/ast_exp_apply.cmi
syntax/ast_exp_extension.cmx : ext/literals.cmx ext/ext_string.cmx \
ext/ext_ref.cmx syntax/bs_ast_mapper.cmx syntax/ast_util.cmx \
syntax/ast_payload.cmx syntax/ast_literal.cmx syntax/ast_derive.cmx \
syntax/ast_core_type.cmx syntax/ast_comb.cmx syntax/ast_exp_extension.cmi
syntax/ast_core_type_class_type.cmx : ext/literals.cmx ext/ext_ref.cmx \
ext/ext_list.cmx syntax/bs_ast_mapper.cmx syntax/ast_util.cmx \
syntax/ast_literal.cmx syntax/ast_comb.cmx syntax/ast_attributes.cmx \
syntax/ast_core_type_class_type.cmi
syntax/ast_tuple_pattern_flatten.cmx : ext/ext_list.cmx \
syntax/bs_ast_mapper.cmx syntax/ast_tuple_pattern_flatten.cmi
syntax/ppx_entry.cmx : ext/string_map.cmx ext/literals.cmx \
syntax/external_process.cmx ext/ext_string.cmx ext/ext_ref.cmx \
ext/ext_list.cmx syntax/bs_ast_mapper.cmx syntax/bs_ast_invariant.cmx \
syntax/ast_util.cmx syntax/ast_utf8_string_interp.cmx \
syntax/ast_utf8_string.cmx syntax/ast_structure.cmx \
syntax/ast_signature.cmx syntax/ast_payload.cmx syntax/ast_literal.cmx \
syntax/external_process.cmx ext/ext_string.cmx ext/ext_list.cmx \
syntax/bs_ast_mapper.cmx syntax/bs_ast_invariant.cmx syntax/ast_util.cmx \
syntax/ast_utf8_string_interp.cmx syntax/ast_utf8_string.cmx \
syntax/ast_tuple_pattern_flatten.cmx syntax/ast_structure.cmx \
syntax/ast_signature.cmx syntax/ast_payload.cmx \
syntax/ast_exp_extension.cmx syntax/ast_exp_apply.cmx \
syntax/ast_derive_projector.cmx syntax/ast_derive_js_mapper.cmx \
syntax/ast_derive_abstract.cmx syntax/ast_derive.cmx \
syntax/ast_core_type.cmx syntax/ast_comb.cmx syntax/ast_attributes.cmx \
syntax/ast_core_type_class_type.cmx syntax/ast_attributes.cmx \
syntax/ppx_entry.cmi
syntax/bs_syntaxerr.cmi :
syntax/ast_utf8_string.cmi :
Expand Down Expand Up @@ -279,6 +293,10 @@ syntax/external_ffi_types.cmi : syntax/external_arg_spec.cmi
syntax/external_process.cmi : common/bs_loc.cmi syntax/ast_core_type.cmi \
syntax/ast_attributes.cmi
syntax/ast_util.cmi : syntax/bs_ast_mapper.cmi syntax/ast_payload.cmi
syntax/ast_exp_apply.cmi : syntax/bs_ast_mapper.cmi
syntax/ast_exp_extension.cmi : syntax/bs_ast_mapper.cmi
syntax/ast_core_type_class_type.cmi : syntax/bs_ast_mapper.cmi
syntax/ast_tuple_pattern_flatten.cmi : syntax/bs_ast_mapper.cmi
syntax/ppx_entry.cmi :
depends/bs_exception.cmi :
depends/ast_extract.cmi : ext/string_map.cmi ext/string_hashtbl.cmi \
Expand Down
128 changes: 99 additions & 29 deletions jscomp/bsb/bsb_templates.ml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -478,8 +478,11 @@ let root = OCamlRes.Res.([
"const path = require('path');\n\
const outputDir = path.join(__dirname, \"build/\");\n\
\n\
const isProd = process.env.NODE_ENV === 'production';\n\
\n\
module.exports = {\n\
\ entry: './src/Index.bs.js',\n\
\ mode: isProd ? 'production' : 'development',\n\
\ output: {\n\
\ path: outputDir,\n\
\ publicPath: outputDir,\n\
Expand All @@ -488,7 +491,78 @@ let root = OCamlRes.Res.([
};\n\
") ;
Dir ("src", [
File ("Page.re",
File ("Index.re",
"ReactDOMRe.renderToElementWithId(<Component1 message=\"Hello!\" />, \"index1\");\n\
\n\
ReactDOMRe.renderToElementWithId(<Component2 greeting=\"Hello!\" />, \"index2\");\n\
") ;
File ("index.html",
"<!DOCTYPE html>\n\
<html lang=\"en\">\n\
<head>\n\
\ <meta charset=\"UTF-8\">\n\
\ <title>ReasonReact Examples</title>\n\
</head>\n\
<body>\n\
\ Component 1:\n\
\ <div id=\"index1\"></div>\n\
\ Component 2:\n\
\ <div id=\"index2\"></div>\n\
\n\
\ <script src=\"../build/Index.js\"></script>\n\
</body>\n\
</html>\n\
") ;
File ("Component2.re",
"/* State declaration */\n\
type state = {\n\
\ count: int,\n\
\ show: bool,\n\
};\n\
\n\
/* Action declaration */\n\
type action =\n\
\ | Click\n\
\ | Toggle;\n\
\n\
/* Component template declaration.\n\
\ Needs to be **after** state and action declarations! */\n\
let component = ReasonReact.reducerComponent(\"Example\");\n\
\n\
/* greeting and children are props. `children` isn't used, therefore ignored.\n\
\ We ignore it by prepending it with an underscore */\n\
let make = (~greeting, _children) => {\n\
\ /* spread the other default fields of component here and override a few */\n\
\ ...component,\n\
\n\
\ initialState: () => {count: 0, show: true},\n\
\n\
\ /* State transitions */\n\
\ reducer: (action, state) =>\n\
\ switch (action) {\n\
\ | Click => ReasonReact.Update({...state, count: state.count + 1})\n\
\ | Toggle => ReasonReact.Update({...state, show: ! state.show})\n\
\ },\n\
\n\
\ render: self => {\n\
\ let message =\n\
\ \"You've clicked this \" ++ string_of_int(self.state.count) ++ \" times(s)\";\n\
\ <div>\n\
\ <button onClick=(_event => self.send(Click))>\n\
\ (ReasonReact.stringToElement(message))\n\
\ </button>\n\
\ <button onClick=(_event => self.send(Toggle))>\n\
\ (ReasonReact.stringToElement(\"Toggle greeting\"))\n\
\ </button>\n\
\ (\n\
\ self.state.show ?\n\
\ ReasonReact.stringToElement(greeting) : ReasonReact.nullElement\n\
\ )\n\
\ </div>;\n\
\ },\n\
};\n\
") ;
File ("Component1.re",
"/* This is the basic component. */\n\
let component = ReasonReact.statelessComponent(\"Page\");\n\
\n\
Expand All @@ -507,41 +581,35 @@ let root = OCamlRes.Res.([
\ `ReasonReact.element(Page.make(~message=\"hello\", [||]))` */\n\
let make = (~message, _children) => {\n\
\ ...component,\n\
\ render: (self) =>\n\
\ <div onClick=(self.handle(handleClick))> (ReasonReact.stringToElement(message)) </div>\n\
\ render: self =>\n\
\ <div onClick=(self.handle(handleClick))>\n\
\ (ReasonReact.stringToElement(message))\n\
\ </div>,\n\
};\n\
") ;
File ("Index.re",
"ReactDOMRe.renderToElementWithId(<Page message=\"Hello!\" />, \"index\");\n\
") ;
File ("index.html",
"<!DOCTYPE html>\n\
<html lang=\"en\">\n\
<head>\n\
\ <meta charset=\"UTF-8\">\n\
\ <title>Pure Reason Example</title>\n\
</head>\n\
<body>\n\
\ <div id=\"index\"></div>\n\
\ <script src=\"../build/Index.js\"></script>\n\
</body>\n\
</html>\n\
")]) ;
File ("README.md",
"# ${bsb:name}\n\
\n\
Run this project:\n\
## Run Project\n\
\n\
```\n\
```sh\n\
npm install\n\
npm start\n\
# in another tab\n\
npm run webpack\n\
```\n\
\n\
After you see the webpack compilation succeed (the `npm run webpack` step), open up the nested html files in `src/*` (**no server needed!**). Then modify whichever file in `src` and refresh the page to see the changes.\n\
After you see the webpack compilation succeed (the `npm run webpack` step), open up `src/index.html` (**no server needed!**). Then modify whichever `.re` file in `src` and refresh the page to see the changes.\n\
\n\
**For more elaborate ReasonReact examples**, please see https://github.com/reasonml-community/reason-react-example\n\
\n\
## Build for Production\n\
\n\
```sh\n\
npm run build\n\
npm run webpack:production\n\
```\n\
\n\
This will replace the development artifact `build/Index.js` for an optimized version.\n\
") ;
File ("package.json",
"{\n\
Expand All @@ -552,21 +620,23 @@ let root = OCamlRes.Res.([
\ \"start\": \"bsb -make-world -w\",\n\
\ \"clean\": \"bsb -clean-world\",\n\
\ \"test\": \"echo \\\"Error: no test specified\\\" && exit 1\",\n\
\ \"webpack\": \"webpack -w\"\n\
\ \"webpack\": \"webpack -w\",\n\
\ \"webpack:production\": \"NODE_ENV=production webpack\"\n\
\ },\n\
\ \"keywords\": [\n\
\ \"BuckleScript\"\n\
\ ],\n\
\ \"author\": \"\",\n\
\ \"license\": \"MIT\",\n\
\ \"dependencies\": {\n\
\ \"react\": \"^15.4.2\",\n\
\ \"react-dom\": \"^15.4.2\",\n\
\ \"reason-react\": \">=0.3.0\"\n\
\ \"react\": \"^16.2.0\",\n\
\ \"react-dom\": \"^16.2.0\",\n\
\ \"reason-react\": \">=0.3.4\"\n\
\ },\n\
\ \"devDependencies\": {\n\
\ \"bs-platform\": \"^${bsb:bs-version}\",\n\
\ \"webpack\": \"^3.8.1\"\n\
\ \"webpack\": \"^4.0.1\",\n\
\ \"webpack-cli\": \"^2.0.10\"\n\
\ }\n\
}\n\
") ;
Expand All @@ -585,7 +655,7 @@ let root = OCamlRes.Res.([
\ \"subdirs\" : true\n\
\ },\n\
\ \"package-specs\": [{\n\
\ \"module\": \"commonjs\",\n\
\ \"module\": \"es6\",\n\
\ \"in-source\": true\n\
\ }],\n\
\ \"suffix\": \".bs.js\",\n\
Expand Down

0 comments on commit 03b944d

Please sign in to comment.