Cleanup project to cut a final release for React 15 support

wyze · wyze · commit 63a4beca5c40 · 2017-12-13T21:00:09.000-06:00
- Upgrades all dependencies
- Upgrade to Reason 3 syntax
- Use new BuckleScript package-specs
- Fix a few broken links
- Change travis build process
- Update example code in readme to Reason 3 syntax
- Force *.re to OCaml in linguist for GitHub
diff --git a/.gitattributes b/.gitattributes
@@ -1,2 +1,3 @@
 * text=auto
 *.js text eol=lf
+*.re linguist-language=OCaml
diff --git a/.gitignore b/.gitignore
@@ -2,7 +2,9 @@
 node_modules
 
 # Build
+src/**/*.bs.js
 lib
+.bsb.lock
 .merlin
 
 # Logs
diff --git a/.travis.yml b/.travis.yml
@@ -3,10 +3,16 @@ sudo: false
 language: node_js
 
 node_js:
-  - 7
+  - 9
+  - 8
   - 6
-  - 4
+
+before_install:
+  - curl -o- -L https://yarnpkg.com/install.sh | bash
+  - export PATH="$HOME/.yarn/bin:$PATH"
 
 cache:
+  yarn: true
   directories:
     - $HOME/.cache
+    - node_modules
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@
 [![dependencies][deps-image]][deps-url]
 [![devDependencies][depsdev-image]][depsdev-url]
 
-> [BuckleScript](//github.com/bloomberg/bucklescript) bindings for [react-test-renderer](//github.com/facebook/react/tree/master/packages/react-test-renderer).
+> [BuckleScript](//github.com/BuckleScript/bucklescript) bindings for [react-test-renderer](//github.com/facebook/react/tree/master/packages/react-test-renderer).
 
 ## Installation
 
@@ -31,33 +31,32 @@ $ npm install --save-dev bs-react-test-renderer
 
 #### With [`bs-jest`](//github.com/reasonml-community/bs-jest)
 
-```reason
-// Component_test.re
+```ocaml
+/* Component_test.re */
 
 open Jest;
-open ExpectJs;
 
-let _ =
+describe("Component", () => {
+  open ExpectJs;
 
-describe "Component" (fun _ => {
-  test "renders" (fun _ => {
-    let component = ReactShallowRenderer.renderWithRenderer <Component />;
+  test("renders", () => {
+    let component = ReactShallowRenderer.renderWithRenderer(<Component />);
 
-    expect (Js.Undefined.return component) |> toBeDefined;
+    expect(Js.Undefined.return(component)) |> toBeDefined;
   });
 });
 ```
 
 ## Examples
 
-See [`src/__tests__`](//github.com/BuckleTypes/bs-react-test-renderer/tree/master/src/__tests__) for some examples.
+See [`src/__tests__`](src/__tests__) for some examples.
 
 For examples with Snapshot testing with [`bs-jest`](//github.com/reasonml-community/bs-jest), see [`reason-calculator`](//github.com/wyze/reason-calculator).
 
 ## Development
 
 ```sh
-$ git clone https://github.com/BuckleTypes/bs-react-test-renderer.git
+$ git clone https://github.com/reasonml-community/bs-react-test-renderer.git
 $ cd bs-react-test-renderer
 $ yarn # or `npm install`
 ```
diff --git a/bsconfig.json b/bsconfig.json
@@ -1,7 +1,17 @@
 {
   "name": "bs-react-test-renderer",
-  "bsc-flags": ["-bs-super-errors"],
-  "reason": {"react-jsx": 2},
+  "bsc-flags": [
+    "-bs-super-errors"
+  ],
+  "reason": {
+    "react-jsx": 2
+  },
+  "refmt": 3,
+  "package-specs": {
+    "module": "commonjs",
+    "in-source": true
+  },
+  "suffix": ".bs.js",
   "bs-dependencies": [
     "reason-react"
   ],
diff --git a/changelog.md b/changelog.md
@@ -1,9 +1,9 @@
 ## Change Log
 
-### [v1.0.1](https://github.com/BuckleTypes/bs-react-test-renderer/releases/tag/v1.0.1) (2017-07-06)
+### [v1.0.1](https://github.com/reasonml-community/bs-react-test-renderer/releases/tag/v1.0.1) (2017-07-06)
 
-* [[`35a6736811`](https://github.com/BuckleTypes/bs-react-test-renderer/commit/35a6736811)] - Update to reason-react v0.2.1 (Cheng Lou)
+* [[`35a6736811`](https://github.com/reasonml-community/bs-react-test-renderer/commit/35a6736811)] - Update to reason-react v0.2.1 (Cheng Lou)
 
-### [v1.0.0](https://github.com/BuckleTypes/bs-react-test-renderer/releases/tag/v1.0.0) (2017-04-14)
+### [v1.0.0](https://github.com/reasonml-community/bs-react-test-renderer/releases/tag/v1.0.0) (2017-04-14)
 
-* [[`3b87107de8`](https://github.com/BuckleTypes/bs-react-test-renderer/commit/3b87107de8)] - Initial commit (Neil Kistner)
+* [[`3b87107de8`](https://github.com/reasonml-community/bs-react-test-renderer/commit/3b87107de8)] - Initial commit (Neil Kistner)
diff --git a/package.json b/package.json
@@ -15,34 +15,31 @@
   ],
   "scripts": {
     "build": "bsb -make-world",
-    "changelog": "changelog-maker --filter-release -- reasonml-community bs-react-test-renderer",
-    "clean": "npm-run-all clean:*",
+    "clean": "run-p clean:*",
     "clean:bsb": "bsb -clean-world",
     "clean:project": "rimraf lib .merlin",
     "jest": "jest",
     "prebuild": "npm run clean",
-    "test": "npm-run-all build jest",
-    "version": "node scripts/version.js"
+    "pretest": "npm run build",
+    "test": "npm run jest",
+    "version": "write-changelog"
   },
   "dependencies": {
-    "react-test-renderer": "^15.5.4"
+    "react-test-renderer": "^15.6.2"
   },
   "peerDependencies": {
-    "reason-react": "^0.1.0"
+    "reason-react": "^0.3.0 || ^0.2.0"
   },
   "devDependencies": {
-    "bs-jest": "reasonml-community/bs-jest",
-    "bs-platform": "^1.9.0",
-    "changelog-maker": "^2.2.5",
-    "execa": "^0.6.3",
-    "jest": "^19.0.2",
-    "np": "^2.13.1",
+    "bs-jest": "^0.2.0",
+    "bs-platform": "^2.1.0",
+    "jest": "^21.2.1",
     "npm-run-all": "^4.0.2",
-    "react": "^15.5.4",
-    "react-dom": "^15.5.4",
-    "read-pkg": "^2.0.0",
-    "reason-react": "^0.2.1",
-    "rimraf": "^2.6.1"
+    "react": "^15.6.2",
+    "react-dom": "^15.6.2",
+    "reason-react": "^0.3.0",
+    "rimraf": "^2.6.1",
+    "write-changelog": "^1.1.0"
   },
   "jest": {
     "testPathIgnorePatterns": [
diff --git a/scripts/version.js b/scripts/version.js
diff --git a/src/ReactShallowRenderer.re b/src/ReactShallowRenderer.re
@@ -1,15 +1,15 @@
 type t;
 
-external createRenderer :
-  unit => t = "" [@@bs.val] [@@bs.module "react-test-renderer/shallow"];
+[@bs.module "react-test-renderer/shallow"] [@bs.val] external createRenderer :
+  unit => t = "";
 
-external render :
-  t => ReasonReact.reactElement => option ReasonReact.reactElement = "" [@@bs.send];
+[@bs.send] external render :
+  t => ReasonReact.reactElement => option(ReasonReact.reactElement) = "";
 
-external getRenderOutput :
-  t => option ReasonReact.reactElement = "" [@@bs.send];
+[@bs.send] external getRenderOutput :
+  t => option(ReasonReact.reactElement) = "";
 
-external unmount :
-  t => unit = "" [@@bs.send];
+[@bs.send] external unmount :
+  t => unit = "";
 
-let renderWithRenderer = render (createRenderer ());
+let renderWithRenderer = render(createRenderer());
diff --git a/src/ReactTestRenderer.re b/src/ReactTestRenderer.re
@@ -1,7 +1,7 @@
 type t;
 
-external create :
-  ReasonReact.reactElement => t = "" [@@bs.val] [@@bs.module "react-test-renderer"];
+[@bs.module "react-test-renderer"] [@bs.val] external create :
+  ReasonReact.reactElement => t = "";
 
-external toJSON :
-  t => Js.Json.t = "" [@@bs.send];
+[@bs.send] external toJSON :
+  t => Js.Json.t = "";
diff --git a/src/__tests__/ReactShallowRenderer_test.re b/src/__tests__/ReactShallowRenderer_test.re
@@ -1,65 +1,63 @@
 open Jest;
-open ExpectJs;
 
-external toObject :
-  option ReasonReact.reactElement => Js.t {..} = "%identity";
+external toObject : option(ReasonReact.reactElement) => _ = "%identity";
 
 let element = {
   "type": "div",
   "key": Js.null,
   "ref": Js.null,
-  "props": Js.Obj.empty (),
+  "props": Js.Obj.empty(),
   "_owner": Js.null,
-  "_store": Js.Obj.empty (),
+  "_store": Js.Obj.empty()
 };
 
-let _ =
+describe("reactShallowRenderer", () => {
+  open ExpectJs;
 
-describe "reactShallowRenderer" (fun _ => {
-  test "createRenderer" (fun _ => {
-    let renderer = ReactShallowRenderer.createRenderer ();
+  test("createRenderer", () => {
+    let renderer = ReactShallowRenderer.createRenderer();
 
-    expect (Js.Undefined.return renderer) |> toBeDefined;
+    expect(Js.Undefined.return(renderer)) |> toBeDefined;
   });
 
-  test "render accepts renderer" (fun _ => {
-    let renderer = ReactShallowRenderer.createRenderer ();
-    let render = ReactShallowRenderer.render renderer;
+  test("render accepts renderer", () => {
+    let renderer = ReactShallowRenderer.createRenderer();
+    let render = ReactShallowRenderer.render(renderer);
 
-    expect (Js.typeof render) |> toBe "function";
+    expect(Js.typeof(render)) |> toBe("function");
   });
 
-  test "render will render a component" (fun _ => {
-    let renderer = ReactShallowRenderer.createRenderer ();
-    let component = ReactShallowRenderer.render renderer <Tester /> |> toObject;
+  test("render will render a component", () => {
+    let renderer = ReactShallowRenderer.createRenderer();
+    let component = ReactShallowRenderer.render(renderer, <Tester />) |> toObject;
 
-    expect component |> toMatchObject element;
+    expect(component) |> toMatchObject(element);
   });
 
-  test "renderWithRenderer will render a component" (fun _ => {
-    let component = ReactShallowRenderer.renderWithRenderer <Tester /> |> toObject;
+  test("renderWithRenderer will render a component", () => {
+    let component = ReactShallowRenderer.renderWithRenderer(<Tester />) |> toObject;
 
-    expect component |> toMatchObject element;
+    expect(component) |> toMatchObject(element);
   });
 
-  test "getRenderOutput returns element" (fun _ => {
-    let renderer = ReactShallowRenderer.createRenderer ();
+  test("getRenderOutput returns element", () => {
+    let renderer = ReactShallowRenderer.createRenderer();
 
-    let _ = ReactShallowRenderer.render renderer <Tester />;
+    ReactShallowRenderer.render(renderer, <Tester />) |> ignore;
 
-    let component = ReactShallowRenderer.getRenderOutput renderer |> toObject;
+    let component = ReactShallowRenderer.getRenderOutput(renderer) |> toObject;
 
-    expect component |> toMatchObject element;
+    expect(component) |> toMatchObject(element);
   });
 
-  test "unmount removes the node" (fun _ => {
-    let renderer = ReactShallowRenderer.createRenderer ();
+  test("unmount removes the node", () => {
+    let renderer = ReactShallowRenderer.createRenderer();
 
-    let _ = ReactShallowRenderer.render renderer <Tester />;
-    ReactShallowRenderer.unmount renderer;
+    ReactShallowRenderer.render(renderer, <Tester />) |> ignore;
+    ReactShallowRenderer.unmount(renderer);
 
-    let component = ReactShallowRenderer.getRenderOutput renderer |> toObject;
+    let component = ReactShallowRenderer.getRenderOutput(renderer) |> toObject;
 
-    expect (Js.Null.return component) |> toBeNull;
+    expect(Js.Null.return(component)) |> toBeNull;
   });
 });
diff --git a/src/__tests__/ReactTestRenderer_test.re b/src/__tests__/ReactTestRenderer_test.re
diff --git a/src/__tests__/fixtures/Tester.re b/src/__tests__/fixtures/Tester.re
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`* text=auto`
`2`	`2`	`*.js text eol=lf`
	`3`	`+*.re linguist-language=OCaml`