Skip to content

Commit f4c0a4f

Browse files
committed
Merge branch 'master' into npm-pack
# Conflicts: # packages/datafile-manager/package.json # packages/optimizely-sdk/package.json
2 parents 168c50b + 8eedd63 commit f4c0a4f

File tree

151 files changed

+29776
-22069
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

151 files changed

+29776
-22069
lines changed

.travis.yml

Lines changed: 23 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@ branches:
1111
- /^\d+\.\d+\.(\d|[x])
1212
env:
1313
global:
14-
# BROWSER_STACK_USERNAME
15-
- secure: WnyM4gMsi2n69O/YZUD/pYwHJXdKDcBv3Hwft2cCw52yYc+z75uuRgdaLKs4BPisckBtnR17dH7hKlPX3HWwjCoqQm1q5qNpbJrArWaEcbotWGF2YFy21ZZ4rKNQmJqdgRj6XFZhLHbncA8v2gQPK7F6GUJ0vsJF/kiTfxAUjefR23oorcKSQrh9BfOxNAYu2Ma92qlaaMmHYbBdlNDM45/EQE+LnPCfboCiJD/5zTYq4Q+XhKLPV01vUDU60pj9ckDNXyLj9X2BwMbAzGAPGE4qTAB/IrMndVsUXblsahtwKQ6yrsUrsdTASz8/3oNkImtY7fqU874jSeG3d7PNBfZs47zkXEVy73ZWNBgM9rzVS5cPaIU3wqpuBoXFntDJcdHQhNTWEYdxmtcTUmxKt5TdUzDhrrkcti2WVLabU3N52aOBeOM0XBpfLkbV+HT6oWi3bNUb+EDMHvCxOxsP4IoEDfFs9HMzNIO3mmC3+2DFbI7s2Mb2oacAut38MbJDYSDTOLL4smG8scA3E0RQO4r8+TNk4aRIMQc7vCKqz7PpbO7Aj9dXSpeHrDmIszSmEoQqmaaGsRBwbXRom2P8fB9FcTbd/wbsfgoFNEPz5DlbtCtCmt0pQMa+3myWveKH52WC5KlFijBSDjYOMUnXbLnj5fK5eKaWp+z6/qcNwU8=
16-
# BROWSER_STACK_ACCESS_KEY
17-
- secure: U0GGZw46rJowBtH9gVluIrerB40u2b3uZpH0HsOdLlsXCCaTVk4JXX/JPVPashWAFLC7Enk3UOE4ofeEpVd0wbG6CxtG9/gklc2U2tvkqsdPpFZKaRrXoUzCyyPOmHEC2mXDXctbrncmttM4APaceRfbdTBEZIIfyLJadomjWylA61szFE9IZjvJpiwJO2xa5HI9GVRu3yXJci+riJux+JsDmfJ1hNwv3waMeeg/scddUH0hfgq69ftGs8cpMlYiO20eh32S7uPF7/IJTH1fDJjVKYQZwpypkF6AeI+od5CFTY1ajb25eaBNXThLS0Bo9ZJE/8Sogvon21dEJkt/ClY6R341InbAFXZvz7jyQAisvh0I4zxcu0VUCfh7bEUl6GXMO8VJnyxHEfqB+AIT2RoMXckkhulwiNUsJYH1yJ8mjnLvZq85mWBCp4n4jg0K6Wf46lHpjnHOVpLyLyoFGfiPf90AQVL02AJ3/ia8RkMuj0Ax+AGtiTC/+wy7dsDQOif/VpBNJcx/RciQ24mYOGzAMh4GsUWnXaZ9vXSxliogVNrmIefK5invJ0omv9pIx8NZHTHYGaulh4w6JsliiEq2kH78SlyvSrcsFGTwCY97LLaxiLm/75/Zf+F7LajKC23Fbtnj/LQizitFZqGMJ09DnR52krBAeultqRq8QLM=
1814
- SDK=javascript
1915
- SDK_BRANCH=$TRAVIS_PULL_REQUEST_BRANCH
2016
before_install: cd packages/optimizely-sdk
@@ -24,10 +20,11 @@ after_success: npm run coveralls
2420

2521
# Integration tests need to run first to reset the PR build status to pending
2622
stages:
27-
- name: 'Lint markdown files'
23+
- 'Source Clear'
24+
- 'Lint markdown files'
2825
- 'Lint'
2926
- 'Integration tests'
30-
- 'Benchmarking tests'
27+
- 'Full stack production tests'
3128
- 'Cross-browser and umd unit tests'
3229
- 'Test'
3330
- 'Test sub packages'
@@ -43,25 +40,12 @@ jobs:
4340
notifications:
4441
email: false
4542

46-
- stage: 'Lint markdown files'
47-
os: linux
48-
language: generic
49-
before_install: skip
50-
install:
51-
- npm i -g markdown-spellcheck
52-
before_script:
53-
- wget --quiet https://raw.githubusercontent.com/optimizely/mdspell-config/master/.spelling
54-
script:
55-
- mdspell -a -n -r --en-us '**/*.md'
56-
after_success: skip
57-
5843
- stage: 'Lint'
5944
node_js: '12'
6045
script: npm run lint
46+
6147
- &integrationtest
6248
stage: 'Integration tests'
63-
addons:
64-
srcclr: true
6549
merge_mode: replace
6650
cache: false
6751
language: minimal
@@ -73,13 +57,15 @@ jobs:
7357
- CLIENT=node $HOME/travisci-tools/trigger-script-with-status-update.sh
7458
- CLIENT=browser $HOME/travisci-tools/trigger-script-with-status-update.sh
7559
after_success: travis_terminate 0
60+
7661
- <<: *integrationtest
77-
script:
78-
- CLIENT=react-native-android REPO_SLUG=optimizely/react-native-testapp $HOME/travisci-tools/trigger-script-with-status-update.sh
79-
- CLIENT=react-native-ios REPO_SLUG=optimizely/react-native-testapp $HOME/travisci-tools/trigger-script-with-status-update.sh
80-
- <<: *integrationtest
81-
stage: 'Benchmarking tests'
82-
env: FULLSTACK_TEST_REPO=Benchmarking
62+
stage: 'Full stack production tests'
63+
env:
64+
SDK=javascript
65+
SDK_BRANCH=$TRAVIS_PULL_REQUEST_BRANCH
66+
FULLSTACK_TEST_REPO=ProdTesting
67+
script: $HOME/travisci-tools/trigger-script-with-status-update.sh
68+
8369
- stage: Cross-browser and umd unit tests
8470
node_js: '8'
8571
script: npm run test-ci
@@ -92,5 +78,15 @@ jobs:
9278
- <<: *packagetest
9379
before_install: cd packages/logging
9480
- <<: *packagetest
95-
before_script: npm install "@react-native-community/async-storage"
9681
before_install: cd packages/datafile-manager
82+
83+
- stage: 'Source Clear'
84+
if: type = cron
85+
addons:
86+
srcclr: true
87+
before_install: cd packages/optimizely-sdk
88+
install: skip
89+
before_script: skip
90+
script: skip
91+
after_script: skip
92+
after_success: skip

README.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,15 @@ Optimizely Rollouts is free feature flags for development teams. Easily roll out
1313

1414
## Packages
1515

16-
This repository is a monorepo that we manage using [Lerna](https://github.com/lerna/lerna). Only one package lives here currently, but that may change in the future.
16+
This repository is a monorepo. It houses the main Javascript SDK and its supporting packages.
1717

1818
| Package | Version | Docs | Description |
1919
| ------------------------------------------------------ | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------- |
20-
| [`@optimizely/optimizely-sdk`](/packages/optimizely-sdk) | [![npm](https://img.shields.io/npm/v/%40optimizely%2Foptimizely-sdk.svg)](https://www.npmjs.com/package/@optimizely/optimizely-sdk) | [![](https://img.shields.io/badge/API%20Docs-site-green.svg?style=flat-square)](https://developers.optimizely.com/x/solutions/sdks/reference/?language=javascript) | The Optimizely SDK |
20+
| [`@optimizely/optimizely-sdk`](/packages/optimizely-sdk) | [![npm](https://img.shields.io/npm/v/%40optimizely%2Foptimizely-sdk.svg)](https://www.npmjs.com/package/@optimizely/optimizely-sdk) | [![](https://img.shields.io/badge/API%20Docs-site-green.svg?style=flat-square)](https://docs.developers.optimizely.com/full-stack/docs/javascript-node-sdk) | The Optimizely SDK |
21+
| [`@optimizely/js-sdk-datafile-manager`](/packages/datafile-manager) | [![npm](https://img.shields.io/npm/v/%40optimizely%2Fjs-sdk-datafile-manager.svg)](https://www.npmjs.com/package/@optimizely/js-sdk-datafile-manager) | [![](https://img.shields.io/badge/API%20Docs-site-green.svg?style=flat-square)](https://docs.developers.optimizely.com/full-stack/docs/initialize-sdk-javascript-node#customize-datafile-management-behavior) | Datafile Manager for Optimizely SDK
22+
| [`@optimizely/js-sdk-event-processor`](/packages/event-processor) | [![npm](https://img.shields.io/npm/v/%40optimizely%2Fjs-sdk-event-processor.svg)](https://www.npmjs.com/package/@optimizely/js-sdk-event-processor) | [![](https://img.shields.io/badge/API%20Docs-site-green.svg?style=flat-square)](https://docs.developers.optimizely.com/full-stack/docs/event-batching-javascript-node) | Event Batching support for Optimizely SDK
23+
| [`@optimizely/js-sdk-logging`](/packages/logging) | [![npm](https://img.shields.io/npm/v/%40optimizely%2Fjs-sdk-logging.svg)](https://www.npmjs.com/package/@optimizely/js-sdk-logging) | [![](https://img.shields.io/badge/API%20Docs-site-green.svg?style=flat-square)](https://docs.developers.optimizely.com/full-stack/docs/customize-logger-javascript-node) | Logging Manager for Optimizely SDK
24+
| [`@optimizely/js-sdk-utils`](/packages/utils) | [![npm](https://img.shields.io/npm/v/%40optimizely%2Fjs-sdk-utils.svg)](https://www.npmjs.com/package/@optimizely/js-sdk-utils) | | Utility functions for Optimizely packages
2125

2226
## About
2327

@@ -38,7 +42,7 @@ Prod dependencies are as follows:
3842

3943
```json
4044
{
41-
"json-schema@0.2.3": {
45+
"json-schema@0.4.0": {
4246
"licenses": [
4347
"AFLv2.1",
4448
"BSD"

lerna.json

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)