Skip to content

Commit

Permalink
Merge pull request #791 from userdive/release/v1.3.0
Browse files Browse the repository at this point in the history
Release/v1.3.0
  • Loading branch information
Surgo authored Aug 1, 2018
2 parents 63dbd9a + 6198c00 commit 2933b5e
Show file tree
Hide file tree
Showing 20 changed files with 212 additions and 236 deletions.
6 changes: 6 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ stages:
- name: cross-browser
if: type = pull_request OR branch = master
- deploy
- name: pre-release
if: branch =~ ^release
jobs:
include:
- stage: test
Expand All @@ -36,6 +38,10 @@ jobs:
script:
- npm run test
- npm run coverage
- stage: pre-release
env: Dry Run
script:
- npm run dry-release
- stage: cross-browser
env: Cross browser
script:
Expand Down
16 changes: 9 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,15 @@

This repository is a monorepo that we manage using [Lerna](https://github.com/lerna/lerna). That means that we actually publish [packages](./packages) to npm from the same codebase, including:

| Package | Version |
| --------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------- |
| **[@userdive/agent](/packages/agent)** | [![npm version](https://badge.fury.io/js/%40userdive%2Fagent.svg)](https://www.npmjs.com/package/@userdive/agent) |
| **[@userdive/linker](/packages/linker)** | [![npm version](https://badge.fury.io/js/%40userdive%2Flinker.svg)](https://www.npmjs.com/package/@userdive/linker) |
| **[@userdive/kaizenplatform-plugin](/packages/kaizenplatform)** | [![npm version](https://badge.fury.io/js/%40userdive%2Fkaizenplatform-plugin.svg)](https://www.npmjs.com/package/userdive) |
| **[@userdive/vwo-plugin](/packages/vwo)** | [![npm version](https://badge.fury.io/js/%40userdive%2Fvwo-plugin.svg)](https://www.npmjs.com/package/@userdive/vwo-plugin) |
| **[userdive](/packages/userdive)** | [![npm version](https://badge.fury.io/js/userdive.svg)](https://www.npmjs.com/package/userdive) |
| Package | Version |
| --------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------- |
| **[@userdive/agent](/packages/agent)** | [![npm version](https://badge.fury.io/js/%40userdive%2Fagent.svg)](https://www.npmjs.com/package/@userdive/agent) |
| **[@userdive/linker](/packages/linker)** | [![npm version](https://badge.fury.io/js/%40userdive%2Flinker.svg)](https://www.npmjs.com/package/@userdive/linker) |
| **[@userdive/kaizenplatform-plugin](/packages/kaizenplatform)** | [![npm version](https://badge.fury.io/js/%40userdive%2Fkaizenplatform-plugin.svg)](https://www.npmjs.com/package/userdive) |
| **[@userdive/vwo-plugin](/packages/vwo)** | [![npm version](https://badge.fury.io/js/%40userdive%2Fvwo-plugin.svg)](https://www.npmjs.com/package/@userdive/vwo-plugin) |
| **[@userdive/optimizely-x-plugin](/packages/optimizely_x)** | [![npm version](https://badge.fury.io/js/%40userdive%2Foptimizely-x-plugin.svg)](https://www.npmjs.com/package/@userdive/optimizely-x-plugin) |
| **[@userdive/provider](/packages/provider)** | [![npm version](https://badge.fury.io/js/%40userdive%2Fprovider.svg)](https://www.npmjs.com/package/@userdive/provider) |
| **[userdive](/packages/userdive)** | [![npm version](https://badge.fury.io/js/userdive.svg)](https://www.npmjs.com/package/userdive) |

## Support Browsers

Expand Down
6 changes: 3 additions & 3 deletions examples/built-in/package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "built-in",
"version": "1.2.1",
"version": "1.3.0",
"dependencies": {
"@userdive/agent": "^1.2.0",
"@userdive/linker": "^1.2.1"
"@userdive/agent": "^1.3.0",
"@userdive/linker": "^1.3.0"
},
"license": "MIT",
"main": "n/a",
Expand Down
2 changes: 1 addition & 1 deletion examples/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "userdive-examples",
"version": "1.2.1",
"version": "1.3.0",
"devDependencies": {
"@types/query-string": "6.1.0",
"gh-pages": "1.2.0",
Expand Down
7 changes: 4 additions & 3 deletions examples/plugin-create/package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
{
"name": "plugin-create",
"version": "1.1.0",
"version": "1.3.0",
"dependencies": {
"userdive": "^1.1.0"
"userdive": "^1.3.0"
},
"license": "MIT",
"main": "index.js"
"main": "index.js",
"private": true
}
4 changes: 2 additions & 2 deletions examples/with-angular/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "with-angular",
"version": "1.2.0",
"version": "1.3.0",
"dependencies": {
"@angular/common": "5.2.10",
"@angular/compiler": "5.2.10",
Expand All @@ -14,7 +14,7 @@
"core-js": "2.5.7",
"reflect-metadata": "0.1.12",
"systemjs": "0.21.4",
"userdive": "^1.1.0",
"userdive": "^1.3.0",
"zone.js": "0.8.26"
},
"private": true
Expand Down
4 changes: 2 additions & 2 deletions examples/with-angular1/package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "with-angular1",
"version": "1.2.0",
"version": "1.3.0",
"dependencies": {
"@types/angular": "1.6.49",
"@uirouter/angularjs": "1.0.19",
"angular": "1.7.2",
"userdive": "^1.1.0"
"userdive": "^1.3.0"
},
"private": true
}
4 changes: 2 additions & 2 deletions examples/with-react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "with-react",
"version": "1.2.1",
"version": "1.3.0",
"dependencies": {
"@types/react": "16.4.7",
"@types/react-dom": "16.0.6",
Expand All @@ -9,7 +9,7 @@
"react": "16.4.1",
"react-dom": "16.4.1",
"react-router-dom": "4.3.1",
"userdive": "^1.1.0"
"userdive": "^1.3.0"
},
"private": true
}
4 changes: 2 additions & 2 deletions examples/with-vue/package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "with-vue",
"version": "1.2.0",
"version": "1.3.0",
"dependencies": {
"userdive": "^1.1.0",
"userdive": "^1.3.0",
"vue": "2.5.16",
"vue-router": "3.0.1"
},
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
},
"npmClient": "yarn",
"useWorkspaces": true,
"version": "1.2.1"
"version": "1.3.0"
}
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@
"clean": "lerna clean --yes && lerna run clean && rimraf cdn coverage",
"coverage": "codecov -f ./coverage/lcov.info",
"deploy:examples": "gh-pages -d examples/build/agent.js -m '[ci skip] Updates'",
"dry-release": "lerna exec --no-bail -- 'can-npm-publish && npm root'",
"e2e": "lerna run e2e",
"lint": "run-p lint:*",
"lint:md": "textlint 'packages/*/*.md' README.md docs",
Expand All @@ -98,7 +99,7 @@
"postbuild": "webpack --mode production && size-limit && find cdn -type f | grep -v js | xargs rm && cp robots.txt ./cdn",
"precommit": "lint-staged",
"prepare": "lerna run build --scope userdive --scope @userdive/* --stream",
"release": "lerna exec --bail=false -- 'can-npm-publish && npm publish'",
"release": "lerna exec --no-bail -- 'can-npm-publish && npm publish --access public'",
"start": "lerna run start --scope userdive-examples --scope userdive-developers --stream",
"test": "karma start"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/agent/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@userdive/agent",
"description": "webpage tracking agent",
"version": "1.2.0",
"version": "1.3.0",
"author": "UNCOVER TRUTH Inc.",
"bugs": {
"url": "https://github.com/userdive/agent.js/issues"
Expand All @@ -12,7 +12,7 @@
"object-assign": "^4.1.1",
"raven-js": "^3.23.1",
"ui-event-observer": "^2.0.0",
"userdive": "^1.1.0",
"userdive": "^1.3.0",
"uuid": "^3.2.1"
},
"devDependencies": {
Expand Down
8 changes: 4 additions & 4 deletions packages/kaizenplatform/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "@userdive/kaizenplatform-plugin",
"description": "a plugin to integrate Kaizen Platform A/B testing",
"version": "1.2.1",
"version": "1.3.0",
"author": "UNCOVER TRUTH Inc.",
"bugs": {
"url": "https://github.com/userdive/agent.js/issues"
},
"dependencies": {
"@userdive/agent": "^1.2.0",
"@userdive/provider": "^1.2.0",
"userdive": "^1.1.0"
"@userdive/agent": "^1.3.0",
"@userdive/provider": "^1.3.0",
"userdive": "^1.3.0"
},
"engine": {
"node": "> 6"
Expand Down
8 changes: 4 additions & 4 deletions packages/linker/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "@userdive/linker",
"description": "webpage tracking agent linker plugin",
"version": "1.2.1",
"version": "1.3.0",
"author": "UNCOVER TRUTH Inc.",
"bugs": {
"url": "https://github.com/userdive/agent.js/issues"
},
"dependencies": {
"@userdive/agent": "^1.2.0",
"@userdive/provider": "^1.2.0",
"userdive": "^1.1.0"
"@userdive/agent": "^1.3.0",
"@userdive/provider": "^1.3.0",
"userdive": "^1.3.0"
},
"engine": {
"node": "> 5"
Expand Down
8 changes: 4 additions & 4 deletions packages/optimizely_x/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "@userdive/optimizely-x-plugin",
"description": "a plugin to integrate Optimizely X A/B testing",
"version": "1.2.1",
"version": "1.3.0",
"author": "UNCOVER TRUTH Inc.",
"bugs": {
"url": "https://github.com/userdive/agent.js/issues"
},
"dependencies": {
"@userdive/agent": "^1.2.0",
"@userdive/provider": "^1.2.0",
"userdive": "^1.1.0"
"@userdive/agent": "^1.3.0",
"@userdive/provider": "^1.3.0",
"userdive": "^1.3.0"
},
"engine": {
"node": "> 6"
Expand Down
6 changes: 3 additions & 3 deletions packages/provider/package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"name": "@userdive/provider",
"description": "webpage tracking agent linker plugin",
"version": "1.2.0",
"version": "1.3.0",
"author": "UNCOVER TRUTH Inc.",
"bugs": {
"url": "https://github.com/userdive/agent.js/issues"
},
"dependencies": {
"@userdive/agent": "^1.2.0",
"userdive": "^1.1.0"
"@userdive/agent": "^1.3.0",
"userdive": "^1.3.0"
},
"engine": {
"node": "> 6"
Expand Down
2 changes: 1 addition & 1 deletion packages/userdive/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "userdive",
"description": "load @userdve/agent from cdn",
"version": "1.1.0",
"version": "1.3.0",
"author": "UNCOVER TRUTH Inc",
"bugs": {
"url": "https://github.com/userdive/agent.js/issues"
Expand Down
8 changes: 4 additions & 4 deletions packages/vwo/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "@userdive/vwo-plugin",
"description": "a plugin to integrate Visual Website Optimizer",
"version": "1.2.1",
"version": "1.3.0",
"author": "UNCOVER TRUTH Inc.",
"bugs": {
"url": "https://github.com/userdive/agent.js/issues"
},
"dependencies": {
"@userdive/agent": "^1.2.0",
"@userdive/provider": "^1.2.0",
"userdive": "^1.1.0"
"@userdive/agent": "^1.3.0",
"@userdive/provider": "^1.3.0",
"userdive": "^1.3.0"
},
"engine": {
"node": "> 6"
Expand Down
2 changes: 1 addition & 1 deletion website/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "userdive-developers",
"version": "1.2.1",
"version": "1.3.0",
"dependencies": {
"docusaurus": "1.3.2"
},
Expand Down
Loading

0 comments on commit 2933b5e

Please sign in to comment.