Merge branch 'release/2.0.0'

Author: vankeisb

core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tea-cup-core",
-  "version": "1.5.3",
+  "version": "2.0.0",
   "description": "react-tea-cup core classes and utilities (Maybe etc)",
   "author": "Rémi Van Keisbelck <remi@rvkb.com>",
   "license": "MIT",

samples/package.json

@@ -11,7 +11,8 @@
     "react": "^16.7.0",
     "react-dom": "^16.7.0",
     "react-scripts": "3.4.3",
-    "react-tea-cup": "^1.5.3"
+    "react-tea-cup": "^2.0.0",
+    "tea-cup-core": "^2.0.0"
   },
   "scripts": {
     "start": "react-scripts start",

samples/src/App.tsx

@@ -26,24 +26,26 @@
 import React from 'react';
 import {
   Cmd,
-  DevTools,
   Dispatcher,
   just,
   map,
   Maybe,
   maybeOf,
-  newUrl,
   noCmd,
   nothing,
+  Sub,
+  Task,
+} from 'tea-cup-core';
+import {
+  DevTools,
+  newUrl,
   ProgramWithNav,
   QueryParams,
   route0,
   route1,
   route2,
   Router,
   str,
-  Sub,
-  Task,
   withReduxDevTools,
 } from 'react-tea-cup';
 import * as Counter from './Samples/Counter';

samples/src/Samples/ClassMsgs.tsx

@@ -23,7 +23,7 @@
  *
  */
 
-import { Cmd, Dispatcher, noCmd } from 'react-tea-cup';
+import { Cmd, Dispatcher, noCmd } from 'tea-cup-core';
 import * as React from 'react';
 
 export type Model = number;

samples/src/Samples/Counter.tsx

@@ -24,7 +24,7 @@
  */
 
 import * as React from 'react';
-import { Dispatcher, Cmd, Sub, noCmd } from 'react-tea-cup';
+import { Dispatcher, Cmd, Sub, noCmd } from 'tea-cup-core';
 
 // model can be anything of course. Here, it
 // is just a number...

samples/src/Samples/EventsSample.tsx

@@ -24,7 +24,8 @@
  */
 
 import * as React from 'react';
-import { Dispatcher, Cmd, Sub, noCmd, nothing, just, Maybe, DocumentEvents, WindowEvents } from 'react-tea-cup';
+import { Dispatcher, Cmd, Sub, noCmd, nothing, just, Maybe } from 'tea-cup-core';
+import {DocumentEvents, WindowEvents} from "react-tea-cup";
 
 export type Model = {
   clicked: Maybe<MousePosition>

samples/src/Samples/ParentChild.tsx

@@ -24,7 +24,7 @@
  */
 
 import * as Counter from './Counter';
-import { Dispatcher, map, Cmd, Sub } from 'react-tea-cup';
+import { Dispatcher, map, Cmd, Sub } from 'tea-cup-core';
 import * as React from 'react';
 
 export type Model = ReadonlyArray<Counter.Model>;

samples/src/Samples/Perf.tsx

@@ -23,8 +23,9 @@
  *
  */
 
-import { Cmd, Dispatcher, memo, noCmd } from 'react-tea-cup';
+import { Cmd, Dispatcher, noCmd } from 'tea-cup-core';
 import * as React from 'react';
+import { memo } from 'react-tea-cup';
 
 export type Model = Readonly<{
   value: number;

samples/src/Samples/ProgramSample.test.tsx

@@ -1,38 +1,40 @@
-import { mount, ReactWrapper } from 'enzyme';
-import { extendJest, Cmd, Sub, Task, Program, ProgramProps, updateUntilIdle } from "react-tea-cup";
-import React, { ReactNode } from 'react';
-import { Dispatcher } from 'tea-cup-core';
+import { mount } from 'enzyme';
+import { Cmd, Dispatcher, Sub, Task } from 'tea-cup-core';
+import { extendJest, ProgramProps, updateUntilIdle } from 'react-tea-cup';
+import React from 'react';
 
 extendJest(expect);
 
 const init1: () => [number, Cmd<string>] = () => {
-    return [0, toCmd('go')];
-}
+  return [0, toCmd('go')];
+};
 
-const view1: (dispatch: Dispatcher<string>, model: number) => React.ReactNode = (dispatch: Dispatcher<string>, model: number) => {
-    return (<div className={'count'}>{model}</div>);
-}
+const view1: (dispatch: Dispatcher<string>, model: number) => React.ReactNode = (
+  dispatch: Dispatcher<string>,
+  model: number,
+) => {
+  return <div className={'count'}>{model}</div>;
+};
 
 const update1: (msg: string, model: number) => [number, Cmd<string>] = (msg: string, model: number) => {
-    return [model + 1, model < 5 ? toCmd('go') : Cmd.none()];
-}
+  return [model + 1, model < 5 ? toCmd('go') : Cmd.none()];
+};
 
 // const toCmd = (msg: string) => Task.perform(Time.in(0), () => msg);
 const toCmd = (msg: string) => Task.perform(Task.succeed(0), () => msg);
 
 describe('Test Program', () => {
-
-    it('expect when program is idle', () => {
-        const props: ProgramProps<number, string> = {
-            init: init1,
-            view: view1,
-            update: update1,
-            subscriptions: () => Sub.none<string>()
-        }
-        return updateUntilIdle(props, mount).then(([model, wrapper]) => {
-            expect(model).toEqual(6)
-            // expect(wrapper).toHaveHTML('')
-            expect(wrapper.find('.count')).toHaveText('6')
-        })
-    })
-})
+  it('expect when program is idle', () => {
+    const props: ProgramProps<number, string> = {
+      init: init1,
+      view: view1,
+      update: update1,
+      subscriptions: () => Sub.none<string>(),
+    };
+    return updateUntilIdle(props, mount).then(([model, wrapper]) => {
+      expect(model).toEqual(6);
+      // expect(wrapper).toHaveHTML('')
+      expect(wrapper.find('.count')).toHaveText('6');
+    });
+  });
+});

samples/src/Samples/Raf.tsx

@@ -23,7 +23,7 @@
  *
  */
 
-import { Dispatcher, Cmd, noCmd, Sub, onAnimationFrame } from 'react-tea-cup';
+import { Dispatcher, Cmd, noCmd, Sub, onAnimationFrame } from 'tea-cup-core';
 import * as React from 'react';
 
 export interface Model {