Skip to content

Commit

Permalink
Merge branch 'release/1.0.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
vankeisb committed Sep 1, 2020
2 parents 34a6d32 + 87f3316 commit 149c8dc
Show file tree
Hide file tree
Showing 13 changed files with 1,648 additions and 1,105 deletions.
10 changes: 5 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
language: node_js
node_js:
- 'lts/dubnium'
- 'lts/erbium'

install:
- echo "//registry.npmjs.org/:_authToken=${CI_TOKEN}" > ~/.npmrc
- yarn install

script:
- ./build.sh

deploy:
provider: npm
email: '${CI_EMAIL}'
api_key: '${CI_API_KEY}'
provider: script
script: ./deploy.sh
skip_cleanup: true
on:
tags: true
branch: feature/test-release
21 changes: 21 additions & 0 deletions core/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2019 Rémi Van Keisbelck

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
2 changes: 1 addition & 1 deletion core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tea-cup-core",
"version": "1.0.0",
"version": "1.0.1",
"description": "react-tea-cup core classes and utilities (Maybe etc)",
"author": "Rémi Van Keisbelck <[email protected]>",
"license": "MIT",
Expand Down
4 changes: 3 additions & 1 deletion core/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
"declaration": true,
"outDir": "./dist",
"strict": true,
"jsx": "react"
"inlineSourceMap": true,
"inlineSources": true,
"esModuleInterop": false
},
"compileOnSave": true,
"exclude": ["node_modules", "dist"]
Expand Down
4 changes: 4 additions & 0 deletions deploy.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
cd ./core && \
yarn publish && \
cd ../tea-cup && \
yarn publish
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
"private": true,
"workspaces": ["core", "tea-cup", "samples"],
"devDependencies": {
"@types/jest": "24.0.15",
"jest": "24.7.1",
"jest": "24.9.0",
"prettier": "2.0.5",
"rimraf": "^2.6.3",
"ts-jest": "24.0.2",
Expand Down
4 changes: 2 additions & 2 deletions samples/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"jest-enzyme": "^7.1.1",
"react": "^16.7.0",
"react-dom": "^16.7.0",
"react-scripts": "3.0.1",
"react-tea-cup": "1.0.0"
"react-scripts": "3.4.1",
"react-tea-cup": "1.0.1"
},
"scripts": {
"start": "react-scripts start",
Expand Down
16 changes: 12 additions & 4 deletions samples/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
{
"compilerOptions": {
"target": "es5",
"lib": ["dom", "dom.iterable", "esnext"],
"target": "es6",
"lib": [
"dom",
"dom.iterable",
"esnext"
],
"allowJs": true,
"skipLibCheck": true,
"esModuleInterop": true,
Expand All @@ -13,7 +17,11 @@
"resolveJsonModule": true,
"noEmit": true,
"jsx": "preserve",
"isolatedModules": true
"isolatedModules": true,
"inlineSourceMap": true,
"inlineSources": true
},
"include": ["src", "../src"]
"include": [
"src"
]
}
21 changes: 21 additions & 0 deletions tea-cup/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2019 Rémi Van Keisbelck

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
4 changes: 2 additions & 2 deletions tea-cup/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-tea-cup",
"version": "1.0.0",
"version": "1.0.1",
"description": "Put some TEA in your React.",
"author": "Rémi Van Keisbelck <[email protected]>",
"license": "MIT",
Expand All @@ -19,7 +19,7 @@
"samples": "tsc --outFile ./dist/Samples/index.js && cp ./src/Samples/index.html ./dist/Samples"
},
"dependencies": {
"tea-cup-core": "1.0.0",
"tea-cup-core": "1.0.1",
"react": "^16.7.0"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions tea-cup/src/TeaCup/Program.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ interface ProgramState<Model> {
class Guid {
static newGuid() {
return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
var r = (Math.random() * 16) | 0,
const r = (Math.random() * 16) | 0,
v = c == 'x' ? r : (r & 0x3) | 0x8;
return v.toString(16);
});
Expand Down Expand Up @@ -155,7 +155,7 @@ export class Program<Model, Msg> extends Component<ProgramProps<Model, Msg>, Pro
}

setModel(model: Model, withSubs: boolean) {
this.setState((state, props) => {
this.setState(state => {
let newSub: Sub<Msg>;
if (withSubs) {
newSub = this.props.subscriptions(model);
Expand Down
5 changes: 4 additions & 1 deletion tea-cup/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@
"declaration": true,
"outDir": "./dist",
"strict": true,
"jsx": "react"
"jsx": "react",
"inlineSourceMap": true,
"inlineSources": true,
"esModuleInterop": true
},
"compileOnSave": true,
"exclude": ["node_modules", "dist"]
Expand Down
Loading

0 comments on commit 149c8dc

Please sign in to comment.