Skip to content

Commit 42f1488

Browse files
committed
v0.0.2 exports decoratprs and CSP
1 parent 44a5e95 commit 42f1488

14 files changed

+73
-121
lines changed

CHANGELOG.md

+5-110
Original file line numberDiff line numberDiff line change
@@ -1,117 +1,12 @@
1-
# React Resolver Changelog
1+
# React Resolver Csp Changelog
22

3-
### Upcoming...
43

5-
- [Error Handling](https://github.com/ericclemmons/react-resolver/issues/2)
6-
- [Handling Reject/Catch](https://github.com/ericclemmons/react-resolver/issues/2)
7-
- [React Native](https://github.com/ericclemmons/react-resolver/issues/18)
8-
- [Bootstrapping Client](https://github.com/ericclemmons/react-resolver/issues/22)
9-
+ <https://github.com/ericclemmons/react-resolver/pull/34>
10-
- [Owner/Parent Differ](https://github.com/ericclemmons/react-resolver/issues/29)
11-
- [Support Callbacks](https://github.com/ericclemmons/react-resolver/issues/35)
12-
- [Decorators](https://github.com/ericclemmons/react-resolver/pull/31)
4+
### v0.0.2 (2015-06-07)
135

6+
- Includes decorators & exports csp
147

15-
### v1.1.7 - (2015-04-25)
168

17-
- [Clear Nested States](https://github.com/ericclemmons/react-resolver/pull/37)
9+
### v0.0.1 (2015-06-06)
1810

11+
- Initial version
1912

20-
### v1.1.6 - (2015-04-25)
21-
22-
- [Clear Cache After Render](https://github.com/ericclemmons/react-resolver/issues/33)
23-
+ Fix [Not resolving again when transitioning to sibling state](https://github.com/ericclemmons/react-resolver/issues/17)
24-
25-
26-
### v1.1.5 - (2015-04-25)
27-
28-
- Update `dist/` from `v1.1.4`
29-
30-
31-
### v1.1.4 - (2015-04-25)
32-
33-
- [require react/lib/cloneWithProps directly instead of through addons](https://github.com/ericclemmons/react-resolver/pull/32)
34-
+ [Browserify Bundling Twice](https://github.com/ericclemmons/react-resolver/issues/27)
35-
36-
37-
### v1.1.3 - (2015-04-15)
38-
39-
- [#28](https://github.com/ericclemmons/react-resolver/issues/28)
40-
_Another_ attempt to fix `Resolver` being named `resolver.js`
41-
42-
43-
### v1.1.2 - (2015-04-15)
44-
45-
- [#28](https://github.com/ericclemmons/react-resolver/issues/28)
46-
Attempt to fix `Resolver` being named `resolver.js`
47-
48-
49-
### v1.1.1 - (2015-04-13)
50-
51-
- Ignore more files via NPM (6c6fb03)
52-
53-
54-
### v1.1.0 - (2015-04-13)
55-
56-
- [Contexts](https://github.com/ericclemmons/react-resolver/pull/21)
57-
58-
59-
### v1.0.0 - (2015-04-13)
60-
61-
- Complete rewrite for React v0.13
62-
- "Higher-order Components" via `Resolver.createContainer`
63-
- Remove all dependencies (!)
64-
+ [#9](https://github.com/ericclemmons/react-resolver/issues/9)
65-
+ [#14](https://github.com/ericclemmons/react-resolver/issues/14)
66-
+ [#15](https://github.com/ericclemmons/react-resolver/issues/15)
67-
68-
69-
### v0.2.0 - (2015-02-25)
70-
71-
- Remove [`resolver.handle`][11]
72-
73-
74-
### v0.1.2 (2015-02-25)
75-
76-
- Fix [examples/contacts](https://github.com/ericclemmons/react-resolver/tree/e026a3b1cbf16995c10c825c18d2f20b6277f62f/examples/contacts)
77-
78-
79-
### v0.1.1 (2015-02-25)
80-
81-
- Move `react-router` from `optionalDependencies` to `peerDependencies`
82-
83-
84-
### v0.1.0 (2015-02-24)
85-
86-
- [#7][7] - Add `react` and `react-router` as `peerDependencies`.
87-
- [#8][8] - Support React v0.13
88-
89-
90-
### v0.0.4 (2015-02-24)
91-
92-
- [#4][4] - NPM package is ES5, not ES6.
93-
- [#5][5] - Clarify use of `Resolver.mixin`.
94-
- [#6][6] - README comparison to Relay.
95-
96-
97-
### v0.0.3 (2015-02-19)
98-
99-
- Public release
100-
101-
102-
### v0.0.2 (2015-02-18)
103-
104-
- Working prototype with context
105-
106-
107-
### v0.0.1 (2015-01-29)
108-
109-
- Initial commit
110-
111-
112-
[4]: https://github.com/ericclemmons/react-resolver/pull/4
113-
[5]: https://github.com/ericclemmons/react-resolver/issues/5
114-
[6]: https://github.com/ericclemmons/react-resolver/issues/6
115-
[7]: https://github.com/ericclemmons/react-resolver/issues/7
116-
[8]: https://github.com/ericclemmons/react-resolver/issues/8
117-
[11]: https://github.com/ericclemmons/react-resolver/issues/11

dist/decorators/index.js

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
"use strict";
2+
3+
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
4+
5+
var _dataDependencies = require("./dataDependencies");
6+
7+
var _dataDependencies2 = _interopRequireDefault(_dataDependencies);
8+
9+
var _displayName = require("./displayName");
10+
11+
var _displayName2 = _interopRequireDefault(_displayName);
12+
13+
module.exports.dataDependencies = _dataDependencies2["default"];
14+
module.exports.displayName = _displayName2["default"];

dist/index.js

+11-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,16 @@ var _ResolverError = require("./ResolverError");
1414

1515
var _ResolverError2 = _interopRequireDefault(_ResolverError);
1616

17+
var _decoratorsIndex = require("./decorators/index");
18+
19+
var _decoratorsIndex2 = _interopRequireDefault(_decoratorsIndex);
20+
21+
var _jsCsp = require("./js-csp");
22+
23+
var _jsCsp2 = _interopRequireDefault(_jsCsp);
24+
1725
module.exports.Container = _Container2["default"];
1826
module.exports.Error = _ResolverError2["default"];
19-
module.exports.Resolver = _Resolver2["default"];
27+
module.exports.Resolver = _Resolver2["default"];
28+
module.exports.csp = _jsCsp2["default"];
29+
module.exports.decorators = _decoratorsIndex2["default"];

dist/js-csp/index.js

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
"use strict";
2+
3+
var csp = require("./src/csp");
4+
5+
module.exports = csp;

package.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-resolver-csp",
3-
"version": "0.0.1",
3+
"version": "0.0.2",
44
"description": "Isomorphic library to lazy-load data for React components with csp",
55
"main": "dist/index.js",
66
"directories": {
@@ -43,6 +43,5 @@
4343
},
4444
"homepage": "https://github.com/gilesbradshaw/react-resolver-csp",
4545
"dependencies": {
46-
"immutable": "^3.7.3"
4746
}
4847
}

test/decorators/dataDependencies.js renamed to src/decorators/dataDependencies.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {Resolver} from "../../dist/index";
1+
import {Resolver} from "../index";
22

33
export default (resolve)=>
44
(target)=> Resolver.createContainer(target, {resolve});
File renamed without changes.

src/decorators/index.js

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import dataDependencies from "./dataDependencies";
2+
import displayName from "./displayName";
3+
4+
module.exports.dataDependencies = dataDependencies;
5+
module.exports.displayName = displayName;

src/index.js

+4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
import Container from "./Container";
22
import Resolver from "./Resolver";
33
import ResolverError from "./ResolverError";
4+
import decorators from "./decorators/index";
5+
import csp from "./js-csp";
46

57
module.exports.Container = Container;
68
module.exports.Error = ResolverError;
79
module.exports.Resolver = Resolver;
10+
module.exports.csp = csp;
11+
module.exports.decorators = decorators;

src/js-csp/index.js

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
"use strict";
2+
3+
var csp = require("./src/csp");
4+
5+
module.exports = csp;

test/Resolver.dom.test.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ import csp, {chan, alts, take, put, go, timeout} from "../dist/js-csp/src/csp";
66
import PropsFixtureContainer from "./support/PropsFixtureContainer";
77
import jsdom from "jsdom";
88
import cheerio from "cheerio";
9-
import displayName from "./decorators/displayName";
10-
import dataDependencies from "./decorators/dataDependencies";
9+
import {displayName, dataDependencies} from "../dist/decorators";
1110

1211

1312

test/Resolver.nested.test.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import csp, {chan, alts, take, put, go, timeout} from "../dist/js-csp/src/csp";
66
import PropsFixtureContainer from "./support/PropsFixtureContainer";
77
import jsdom from "jsdom";
88

9-
import displayName from "./decorators/displayName";
10-
import dataDependencies from "./decorators/dataDependencies";
9+
import {displayName, dataDependencies} from "../dist/decorators";
10+
1111

1212

1313

test/Resolver.renderToString.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import assert from "assert";
22
import React from "react";
33
import { Resolver } from "../dist";
4-
import csp, {chan, alts, take, put, go, timeout} from "../dist/js-csp/src/csp"; /*eslint no-unused-vars:0 */
4+
import csp, {chan, alts, take, put, go, timeout} from "../dist/js-csp"; /*eslint no-unused-vars:0 */
55

66
import PropsFixtureContainer from "./support/PropsFixtureContainer";
77

test/exports.test.js

+18-2
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,14 @@ import exported from "../dist";
44
import Container from "../dist/Container";
55
import Resolver from "../dist/Resolver";
66
import ResolverError from "../dist/ResolverError";
7+
import decorators from "../dist/decorators";
8+
import csp from "../dist/js-csp";
79

810
describe("exports", function() {
9-
it("should only specify `Container`, `Error`, & `Resolver`", function() {
11+
it("should only specify `Container`, `Error`, `Resolver`, `csp` & `decorators`", function() {
1012
const keys = Object.keys(exported);
1113

12-
assert.deepEqual(keys, ["Container", "Error", "Resolver"]);
14+
assert.deepEqual(keys, ["Container", "Error", "Resolver", "csp", "decorators"]);
1315
});
1416

1517
describe(".Container", function() {
@@ -32,4 +34,18 @@ describe("exports", function() {
3234
assert.equal(exported.Resolver, Resolver);
3335
});
3436
});
37+
38+
describe(".csp", function() {
39+
it("should be csp", function() {
40+
assert(exported.csp);
41+
assert.equal(exported.csp, csp);
42+
});
43+
});
44+
45+
describe(".decorators", function() {
46+
it("should be decorators", function() {
47+
assert(exported.decorators);
48+
assert.equal(exported.decorators, decorators);
49+
});
50+
});
3551
});

0 commit comments

Comments
 (0)