Skip to content

Commit 8b32827

Browse files
committed
Merge branch 'release/2.1.0'
2 parents 66069dc + 908ec87 commit 8b32827

9 files changed

Lines changed: 77 additions & 12 deletions

File tree

CHANGELOG.md

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,41 @@
11
# Changelog
22

3+
## v2.0.1 (21/04/2021)
4+
5+
#### closed
6+
7+
- [**closed**] performance improvements [#59](https://github.com/vankeisb/react-tea-cup/pull/59)
8+
- [**closed**] prettify all code [#60](https://github.com/vankeisb/react-tea-cup/pull/60)
9+
- [**closed**] fix raising errors from JSON parse to be strings [#56](https://github.com/vankeisb/react-tea-cup/pull/56)
10+
11+
#### dependencies
12+
13+
- [**dependencies**] Bump y18n from 3.2.1 to 3.2.2 [#58](https://github.com/vankeisb/react-tea-cup/pull/58)
14+
15+
---
16+
17+
## v2.0.0 (24/03/2021)
18+
19+
#### closed
20+
21+
- [**closed**] [breaking change] intra peer dependencies / no re-exports [#57](https://github.com/vankeisb/react-tea-cup/pull/57)
22+
23+
---
24+
25+
## v1.5.3 (23/03/2021)
26+
27+
#### closed
28+
29+
- [**closed**] Moved react to peer dependency [#55](https://github.com/vankeisb/react-tea-cup/pull/55)
30+
- [**closed**] program testing [#49](https://github.com/vankeisb/react-tea-cup/pull/49)
31+
- [**closed**] introduce updatePiped [#54](https://github.com/vankeisb/react-tea-cup/pull/54)
32+
33+
#### dependencies
34+
35+
- [**dependencies**] Bump elliptic from 6.5.3 to 6.5.4 [#53](https://github.com/vankeisb/react-tea-cup/pull/53)
36+
37+
---
38+
339
## v1.5.2 (14/12/2020)
440
*No changelog for this release.*
541

bump-version.js

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
const fs = require('fs');
2+
3+
const VERSION = process.env.VERSION;
4+
5+
console.log("Bumping to " + VERSION);
6+
7+
function withJsonFile(name, callback) {
8+
const text = fs.readFileSync(name);
9+
const json = JSON.parse(text);
10+
callback(json)
11+
fs.writeFileSync(name, JSON.stringify(json, null, " "))
12+
}
13+
14+
withJsonFile("./core/package.json", j => {
15+
j.version = VERSION;
16+
});
17+
18+
withJsonFile("./tea-cup/package.json", j => {
19+
j.version = VERSION;
20+
j.peerDependencies['tea-cup-core'] = '^' + VERSION;
21+
});
22+
23+
withJsonFile('./samples/package.json', j => {
24+
j.dependencies['tea-cup-core'] = VERSION;
25+
j.dependencies['react-tea-cup'] = VERSION;
26+
});
27+

core/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "tea-cup-core",
3-
"version": "2.0.1",
3+
"version": "2.1.0",
44
"description": "react-tea-cup core classes and utilities (Maybe etc)",
55
"author": "Rémi Van Keisbelck <remi@rvkb.com>",
66
"license": "MIT",
@@ -18,4 +18,4 @@
1818
"tsc": "tsc",
1919
"compile": "rimraf dist && tsc"
2020
}
21-
}
21+
}

core/src/TeaCup/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,4 @@ export * from './ObjectSerializer';
4343
export * from './Try';
4444
export * from './UUID';
4545
export * from './Port';
46+
export * from './UpdatePiped';

samples/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"react": "^16.7.0",
1212
"react-dom": "^16.7.0",
1313
"react-scripts": "3.4.3",
14-
"react-tea-cup": "^2.0.1",
15-
"tea-cup-core": "^2.0.1"
14+
"react-tea-cup": "2.1.0",
15+
"tea-cup-core": "2.1.0"
1616
},
1717
"scripts": {
1818
"start": "react-scripts start",
@@ -39,4 +39,4 @@
3939
"jest-fetch-mock": "^2.1.2",
4040
"ts-jest": "^24.1.0"
4141
}
42-
}
42+
}

tea-cup/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-tea-cup",
3-
"version": "2.0.1",
3+
"version": "2.1.0",
44
"description": "Put some TEA in your React.",
55
"author": "Rémi Van Keisbelck <remi@rvkb.com>",
66
"license": "MIT",
@@ -22,11 +22,11 @@
2222
"dependencies": {},
2323
"peerDependencies": {
2424
"react": "^16.7.0",
25-
"tea-cup-core": "^2.0.1"
25+
"tea-cup-core": "^2.1.0"
2626
},
2727
"devDependencies": {
2828
"@types/jsdom": "^16.2.5",
2929
"@types/react": "^16.7.22",
3030
"jsdom": "^16.4.0"
3131
}
32-
}
32+
}

tea-cup/src/TeaCup/Navigation.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ const router: Router<MyRoute> = new Router(
9797

9898
expectRoute('/', home());
9999
expectRoute('/songs', songs(nothing));
100+
expectRoute('/songs/', songs(nothing));
100101
expectRoute('/song/123', song(123));
101102
expectRoute('/song/123/edit', song(123, true));
102103
expectRoute('/songs?q=foobar', songs(just('foobar')));

tea-cup/src/TeaCup/Navigation.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ export class RouteDef<R> implements RouteBase<R> {
331331

332332
static sanitizePath(path: string): string {
333333
const p1 = path.startsWith('/') ? path.substring(1) : path;
334-
return p1.endsWith('/') ? p1.substring(0, p1.length - 2) : p1;
334+
return p1.endsWith('/') ? p1.substring(0, p1.length - 1) : p1;
335335
}
336336

337337
static splitPath(path: string): ReadonlyArray<string> {

yarn.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11705,9 +11705,9 @@ sshpk@^1.7.0:
1170511705
tweetnacl "~0.14.0"
1170611706

1170711707
ssri@^6.0.0, ssri@^6.0.1:
11708-
version "6.0.1"
11709-
resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
11710-
integrity sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==
11708+
version "6.0.2"
11709+
resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz#157939134f20464e7301ddba3e90ffa8f7728ac5"
11710+
integrity sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==
1171111711
dependencies:
1171211712
figgy-pudding "^3.5.1"
1171311713

0 commit comments

Comments
 (0)