git.fiddlerwoaroof.com
Browse code

Merge branch 'master' into doc-example

Ed Langley authored on 17/06/2017 00:32:01
Showing 5 changed files
... ...
@@ -24,4 +24,5 @@ yarn-debug.log*
24 24
 yarn-error.log*
25 25
 
26 26
 # TODO list
27
-TODO
28 27
\ No newline at end of file
28
+TODO
29
+/dist/*
... ...
@@ -1,39 +1,58 @@
1 1
 {
2
-  "name": "routedux",
3
-  "contributors": [
4
-    {
5
-      "name": "Maximilian Summe",
6
-      "email": "msumme@gmail.com"
2
+    "name": "routedux",
3
+    "contributors": [
4
+	{
5
+	    "name": "Maximilian Summe",
6
+	    "email": "msumme@gmail.com"
7
+	},
8
+	{
9
+	    "name": "Edward Langley",
10
+	    "email": "el-os@elangley.org"
11
+	}
12
+    ],
13
+    "main": "dist/index.js",
14
+    "version": "0.1.5",
15
+    "license": "MIT",
16
+    "dependencies": {
17
+	"ramda": "^0.24.1",
18
+	"redux": "^3.6.0"
7 19
     },
8
-    {
9
-      "name": "Edward Langley",
10
-      "email": "el-os@elangley.org"
20
+    "devDependencies": {
21
+	"babel-cli": "^6.24.1",
22
+	"babel-preset-flow": "^6.23.0",
23
+	"babel-preset-stage-3": "^6.24.1",
24
+	"enzyme": "^2.8.2",
25
+	"enzyme-to-json": "^1.5.1",
26
+	"flow": "^0.2.3",
27
+	"flow-bin": "^0.48.0",
28
+	"flow-typed": "^2.1.2",
29
+	"react": "^15.6.0",
30
+	"react-dom": "^15.6.0",
31
+	"react-scripts": "1.0.7",
32
+	"react-test-renderer": "^15.5.4"
33
+    },
34
+    "scripts": {
35
+	"start": "react-scripts start",
36
+	"build": "babel src -d dist",
37
+	"test": "react-scripts test --env=jsdom",
38
+	"eject": "react-scripts eject",
39
+	"flow": "flow"
40
+    },
41
+    "npmFileMap": [
42
+	{
43
+	    "basePath": "/dist/",
44
+	    "files": [
45
+		"*.js"
46
+	    ]
47
+	}
48
+    ],
49
+    "babel": {
50
+	"plugins": [
51
+	    "transform-react-jsx"
52
+	],
53
+	"presets": [
54
+	    "env",
55
+	    "stage-3"
56
+	]
11 57
     }
12
-  ],
13
-  "version": "0.1.3",
14
-  "license": "MIT",
15
-  "dependencies": {
16
-    "ramda": "^0.24.1",
17
-    "redux": "^3.6.0"
18
-  },
19
-  "devDependencies": {
20
-    "react": "^15.6.0",
21
-    "react-dom": "^15.6.0",
22
-    "babel-cli": "^6.24.1",
23
-    "babel-preset-flow": "^6.23.0",
24
-    "enzyme": "^2.8.2",
25
-    "enzyme-to-json": "^1.5.1",
26
-    "flow": "^0.2.3",
27
-    "flow-bin": "^0.48.0",
28
-    "flow-typed": "^2.1.2",
29
-    "react-scripts": "1.0.7",
30
-    "react-test-renderer": "^15.5.4"
31
-  },
32
-  "scripts": {
33
-    "start": "react-scripts start",
34
-    "build": "react-scripts build",
35
-    "test": "react-scripts test --env=jsdom",
36
-    "eject": "react-scripts eject",
37
-    "flow": "flow"
38
-  }
39 58
 }
... ...
@@ -208,8 +208,7 @@ it("router should throw on equally specific routes", () => {
208 208
   ];
209 209
 
210 210
   expect( () => {
211
-    const {actionsDispatched, fireUrlChange} = setupTest(routesConfig);
212
-    fireUrlChange('/somewhere/specific');
211
+    setupTest(routesConfig);
213 212
   }).toThrow();
214 213
 });
215 214
 
... ...
@@ -547,6 +547,10 @@ babel-plugin-syntax-async-functions@^6.8.0:
547 547
   version "6.13.0"
548 548
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95"
549 549
 
550
+babel-plugin-syntax-async-generators@^6.5.0:
551
+  version "6.13.0"
552
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.13.0.tgz#6bc963ebb16eccbae6b92b596eb7f35c342a8b9a"
553
+
550 554
 babel-plugin-syntax-class-properties@^6.8.0:
551 555
   version "6.13.0"
552 556
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz#d7eb23b79a317f8543962c505b827c7d6cac27de"
... ...
@@ -575,7 +579,15 @@ babel-plugin-syntax-trailing-function-commas@^6.22.0:
575 579
   version "6.22.0"
576 580
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz#ba0360937f8d06e40180a43fe0d5616fff532cf3"
577 581
 
578
-babel-plugin-transform-async-to-generator@^6.22.0:
582
+babel-plugin-transform-async-generator-functions@^6.24.1:
583
+  version "6.24.1"
584
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-generator-functions/-/babel-plugin-transform-async-generator-functions-6.24.1.tgz#f058900145fd3e9907a6ddf28da59f215258a5db"
585
+  dependencies:
586
+    babel-helper-remap-async-to-generator "^6.24.1"
587
+    babel-plugin-syntax-async-generators "^6.5.0"
588
+    babel-runtime "^6.22.0"
589
+
590
+babel-plugin-transform-async-to-generator@^6.22.0, babel-plugin-transform-async-to-generator@^6.24.1:
579 591
   version "6.24.1"
580 592
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz#6536e378aff6cb1d5517ac0e40eb3e9fc8d08761"
581 593
   dependencies:
... ...
@@ -760,7 +772,7 @@ babel-plugin-transform-es2015-unicode-regex@^6.22.0:
760 772
     babel-runtime "^6.22.0"
761 773
     regexpu-core "^2.0.0"
762 774
 
763
-babel-plugin-transform-exponentiation-operator@^6.22.0:
775
+babel-plugin-transform-exponentiation-operator@^6.22.0, babel-plugin-transform-exponentiation-operator@^6.24.1:
764 776
   version "6.24.1"
765 777
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz#2ab0c9c7f3098fa48907772bb813fe41e8de3a0e"
766 778
   dependencies:
... ...
@@ -775,7 +787,7 @@ babel-plugin-transform-flow-strip-types@^6.22.0:
775 787
     babel-plugin-syntax-flow "^6.18.0"
776 788
     babel-runtime "^6.22.0"
777 789
 
778
-babel-plugin-transform-object-rest-spread@6.23.0:
790
+babel-plugin-transform-object-rest-spread@6.23.0, babel-plugin-transform-object-rest-spread@^6.22.0:
779 791
   version "6.23.0"
780 792
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.23.0.tgz#875d6bc9be761c58a2ae3feee5dc4895d8c7f921"
781 793
   dependencies:
... ...
@@ -917,6 +929,16 @@ babel-preset-react@6.24.1:
917 929
     babel-plugin-transform-react-jsx-source "^6.22.0"
918 930
     babel-preset-flow "^6.23.0"
919 931
 
932
+babel-preset-stage-3@^6.24.1:
933
+  version "6.24.1"
934
+  resolved "https://registry.yarnpkg.com/babel-preset-stage-3/-/babel-preset-stage-3-6.24.1.tgz#836ada0a9e7a7fa37cb138fb9326f87934a48395"
935
+  dependencies:
936
+    babel-plugin-syntax-trailing-function-commas "^6.22.0"
937
+    babel-plugin-transform-async-generator-functions "^6.24.1"
938
+    babel-plugin-transform-async-to-generator "^6.24.1"
939
+    babel-plugin-transform-exponentiation-operator "^6.24.1"
940
+    babel-plugin-transform-object-rest-spread "^6.22.0"
941
+
920 942
 babel-register@^6.24.1:
921 943
   version "6.24.1"
922 944
   resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.24.1.tgz#7e10e13a2f71065bdfad5a1787ba45bca6ded75f"