Skip to content

Commit

Permalink
Merge pull request #22 from a-ignatov-parc/react-integration
Browse files Browse the repository at this point in the history
React.js integration
  • Loading branch information
a-ignatov-parc authored Dec 26, 2017
2 parents 3061e1a + 6004e37 commit d19dac4
Show file tree
Hide file tree
Showing 19 changed files with 1,743 additions and 2,454 deletions.
61 changes: 54 additions & 7 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: 2
job-configuration: &job-configuration
working_directory: ~/app
docker:
- image: circleci/node:6.10
- image: circleci/node:8.9.1

prepare-git: &prepare-git
name: Preparing git working directory
Expand All @@ -28,12 +28,9 @@ jobs:
- checkout
- restore_cache:
key: dependency-cache-{{ checksum "yarn.lock" }}
- run:
name: Install local yarn
command: npm run yarn:install
- run:
name: Install dependencies using local yarn
command: npm run yarn:install-deps
command: npm run install-deps
- save_cache:
key: dependency-cache-{{ checksum "yarn.lock" }}
paths:
Expand Down Expand Up @@ -97,6 +94,19 @@ jobs:
paths:
- dist

publish-next:
<<: *job-configuration
steps:
- attach_workspace:
at: ./
- run:
name: Prepare .npmrc
command: |
echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc
- run:
name: Publish to npm
command: npm publish --tag next

publish:
<<: *job-configuration
steps:
Expand All @@ -110,6 +120,19 @@ jobs:
name: Publish to npm
command: npm publish

release-premajor:
<<: *job-configuration
steps:
- attach_workspace:
at: ./
- run:
<<: *prepare-git
- run:
name: Bump pre major version
command: npm version premajor -m "%s [skip ci]"
- run:
<<: *publish-to-git

release-major:
<<: *job-configuration
steps:
Expand Down Expand Up @@ -166,19 +189,32 @@ workflows:
filters:
tags:
only: /.*/
- approve-publish-next:
type: approval
requires:
- build
filters:
tags:
only: /[-]+/
- publish-next:
requires:
- approve-publish-next
filters:
tags:
only: /[-]+/
- approve-publish:
type: approval
requires:
- build
filters:
tags:
only: /.*/
only: /[^-]+/
- publish:
requires:
- approve-publish
filters:
tags:
only: /.*/
only: /[^-]+/

test-and-release:
jobs:
Expand All @@ -189,6 +225,14 @@ workflows:
- lint:
requires:
- install-deps
- approve-premajor:
type: approval
requires:
- test
- lint
filters:
branches:
only: master
- approve-major:
type: approval
requires:
Expand All @@ -213,6 +257,9 @@ workflows:
filters:
branches:
only: master
- release-premajor:
requires:
- approve-premajor
- release-major:
requires:
- approve-major
Expand Down
11 changes: 10 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@
"extends": "airbnb",
"rules": {
"max-len": ["error", 80],
"no-console": ["error", { allow: ["info", "warn", "error"] }]
"no-console": ["error", {
allow: ["info", "warn", "error"]
}],
"no-param-reassign": ["error", {
"props": false
}],
"no-underscore-dangle": ["error", {
"allow": ["_sink", "_internalRoot", "_reactRootContainer"]
}],
"no-prototype-builtins": "off"
},
}
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.10
8.9.0
Loading

0 comments on commit d19dac4

Please sign in to comment.