Skip to content

Commit

Permalink
Merge pull request #2 from bonisb/aws-amplify-analytics-firehose
Browse files Browse the repository at this point in the history
Aws amplify analytics firehose
  • Loading branch information
seang96 authored Jul 17, 2019
2 parents 88f4dc5 + 8624b9a commit 92521a0
Show file tree
Hide file tree
Showing 101 changed files with 9,684 additions and 16,385 deletions.
6 changes: 4 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ jobs:
name: "Run cypress tests for React Authenticator Sample"
command: |
cd amplify-js-samples-staging
yarn cypress:react
yarn cypress:react --spec "cypress/integration/auth/authenticator.spec.js"
- store_artifacts:
path: amplify-js-samples-staging/cypress/videos
- store_artifacts:
Expand Down Expand Up @@ -151,7 +151,7 @@ jobs:
name: "Run cypress tests for Vue Authenticator Sample"
command: |
cd amplify-js-samples-staging
yarn cypress:vue
yarn cypress:vue --spec "cypress/integration/auth/authenticator.spec.js"
- store_artifacts:
path: amplify-js-samples-staging/cypress/videos
- store_artifacts:
Expand All @@ -174,6 +174,8 @@ jobs:
npm whoami
git config --global user.email $GITHUB_EMAIL
git config --global user.name $GITHUB_USER
git status
git diff
yarn run publish:$CIRCLE_BRANCH
else
echo "Skipping deploy."
Expand Down
16 changes: 16 additions & 0 deletions .github/stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
daysUntilStale: 30
daysUntilClose: 7
exemptLabels:
- pinned
- security
- feature-request
- to-be-triaged
- bug
staleLabel: pending-close-response-required
markComment: >
This issue has been automatically marked as stale because it has not had
recent activity. It will be closed if no further activity occurs. Thank you
for your contributions.
closeComment: >
This issue has been automatically closed because of inactivity.
Please open a new issue if are still encountering problems.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@ packages/**/es/
.idea
*.log
.npm/
packages/**/cypress/videos/
packages/**/cypress/videos/
package-lock.json
1 change: 0 additions & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"lerna": "2.4.0",
"npmClient": "yarn",
"useWorkspaces": true,
"packages": [
Expand Down
39 changes: 21 additions & 18 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,26 +1,29 @@
{
"name": "aws-amplify",
"name": "aws-amplify-monorepo",
"private": true,
"version": "0.1.30",
"description": "",
"scripts": {
"setup-dev": "yarn && yarn bootstrap && yarn link-all && yarn build",
"bootstrap": "lerna bootstrap",
"pre-commit": "lerna exec yarn test --scope @aws-amplify/core",
"test": "lerna exec yarn test",
"test": "lerna run test",
"cypress": "lerna run cypress",
"cypress:open": "lerna run cypress:open",
"coverage": "codecov || exit 0",
"docs": "typedoc packages/**/src --name amplify-js --hideGenerator --excludePrivate --ignoreCompilerErrors --mode file --out docs/api --theme docs/amplify-theme/typedoc/",
"build": "lerna exec yarn build",
"clean": "lerna run -- clean",
"format": "lerna run -- format",
"lint": "lerna run -- lint",
"link": "lerna exec yarn link",
"publish:master": "lerna publish --conventional-commits --cd-version=prerelease --yes --independent --npm-tag=unstable --preid=unstable --message 'chore(release): Publish [ci skip]' --exact",
"publish:beta": "lerna publish --conventional-commits --cd-version=prerelease --yes --independent --npm-tag=beta --preid=beta --message 'chore(release): Publish [ci skip]' --exact",
"publish:release": "lerna publish --conventional-commits --yes --independent --message 'chore(release): Publish [ci skip]'"
"build": "lerna run build",
"clean": "lerna run clean",
"format": "lerna run format",
"lint": "lerna run lint",
"link-all": "yarn unlink-all && lerna exec --parallel yarn link",
"unlink-all": "lerna exec --parallel --bail=false yarn unlink",
"publish:master": "lerna publish --canary --yes --dist-tag=unstable --preid=unstable --exact",
"publish:beta": "lerna publish --canary --yes --dist-tag=beta --preid=beta --exact",
"publish:release": "lerna publish --conventional-commits --yes --message 'chore(release): Publish [ci skip]'"
},
"husky": {
"hooks": {}
},
"pre-commit": [
"pre-commit"
],
"private": true,
"workspaces": [
"packages/*"
],
Expand All @@ -39,18 +42,18 @@
"@types/node": "^8.9.5",
"codecov": "^1.0.1",
"compression-webpack-plugin": "^1.1.3",
"cypress": "^3.2.0",
"husky": "^1.3.1",
"jest": "^22.4.3",
"json-loader": "^0.5.7",
"lerna": "2.11.0",
"pre-commit": "^1.2.2",
"lerna": "^3.13.1",
"rimraf": "^2.6.2",
"source-map-loader": "^0.2.1",
"ts-jest": "^22.0.0",
"tslint": "^5.7.0",
"tslint-config-airbnb": "^5.8.0",
"typedoc": "^0.11.0",
"typescript": "^2.9.2",
"typescript-formatter": "^6.0.0",
"uglifyjs-webpack-plugin": "^0.4.6",
"webpack": "^3.5.5"
},
Expand Down
8 changes: 8 additions & 0 deletions packages/amazon-cognito-identity-js/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

<a name="3.0.13"></a>
## [3.0.13](https://github.com/aws/aws-amplify/compare/amazon-cognito-identity-js@3.0.13-unstable.0...amazon-cognito-identity-js@3.0.13) (2019-06-17)




**Note:** Version bump only for package amazon-cognito-identity-js

<a name="3.0.13-unstable.0"></a>
## [3.0.13-unstable.0](https://github.com/aws/aws-amplify/compare/amazon-cognito-identity-js@3.0.12...amazon-cognito-identity-js@3.0.13-unstable.0) (2019-05-28)

Expand Down
7 changes: 4 additions & 3 deletions packages/amazon-cognito-identity-js/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "amazon-cognito-identity-js",
"description": "Amazon Cognito Identity Provider JavaScript SDK",
"version": "3.0.13-unstable.0",
"version": "3.0.13",
"author": {
"name": "Amazon Web Services",
"email": "aws@amazon.com",
Expand Down Expand Up @@ -49,8 +49,9 @@
"build": "npm run clean && npm run build:commonjs && npm run build:es && npm run build:umd",
"doc": "jsdoc src -d docs",
"lint": "eslint src",
"test": "eslint src",
"lint2": "eslint enhance-rn.js"
"lint2": "eslint enhance-rn.js",
"test": "jest --passWithNoTests",
"format": "echo \"Not implemented\""
},
"main": "lib/index.js",
"react-native": {
Expand Down
19 changes: 19 additions & 0 deletions packages/amplify-ui/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,25 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

<a name="1.0.21-unstable.0"></a>
## [1.0.21-unstable.0](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui@1.0.20...@aws-amplify/ui@1.0.21-unstable.0) (2019-07-12)


### Bug Fixes

* **@aws-amplify/ui:** Fix the issue that window is not defined in [@aws-amplify](https://github.com/aws-amplify)/ui in NodeJS ([#3512](https://github.com/aws-amplify/amplify-js/issues/3512)) ([f290a00](https://github.com/aws-amplify/amplify-js/commit/f290a00))




<a name="1.0.20"></a>
## [1.0.20](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui@1.0.20-unstable.1...@aws-amplify/ui@1.0.20) (2019-06-17)




**Note:** Version bump only for package @aws-amplify/ui

<a name="1.0.20-unstable.1"></a>
## [1.0.20-unstable.1](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui@1.0.20-unstable.0...@aws-amplify/ui@1.0.20-unstable.1) (2019-06-03)

Expand Down
3 changes: 2 additions & 1 deletion packages/amplify-ui/package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
{
"name": "@aws-amplify/ui",
"version": "1.0.20-unstable.1",
"version": "1.0.21-unstable.0",
"main": "dist/aws-amplify-ui.js",
"types": "lib/index.d.ts",
"publishConfig": {
"access": "public"
},
"scripts": {
"format": "echo \"Not implemented\"",
"test": "webpack",
"start": "webpack-dev-server",
"clean": "rimraf dist lib",
Expand Down
1 change: 1 addition & 0 deletions packages/amplify-ui/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ module.exports = {
library: "aws_amplify_ui",
libraryTarget: "umd",
umdNamedDefine: true,
globalObject: 'this',
devtoolModuleFilenameTemplate: require("../aws-amplify/webpack-utils")
.devtoolModuleFilenameTemplate
},
Expand Down
54 changes: 54 additions & 0 deletions packages/analytics/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,60 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

<a name="1.2.19-unstable.0"></a>
## [1.2.19-unstable.0](https://github.com/aws/aws-amplify/compare/@aws-amplify/analytics@1.2.18...@aws-amplify/analytics@1.2.19-unstable.0) (2019-07-12)


### Bug Fixes

* **@aws-amplify/analytics:** use startsWith to filter the updateEndpoint error message ([#3589](https://github.com/aws/aws-amplify/issues/3589)) ([0bd68f9](https://github.com/aws/aws-amplify/commit/0bd68f9))




<a name="1.2.18"></a>
## [1.2.18](https://github.com/aws/aws-amplify/compare/@aws-amplify/analytics@1.2.18-unstable.1...@aws-amplify/analytics@1.2.18) (2019-07-09)




**Note:** Version bump only for package @aws-amplify/analytics

<a name="1.2.18-unstable.1"></a>
## [1.2.18-unstable.1](https://github.com/aws/aws-amplify/compare/@aws-amplify/analytics@1.2.18-unstable.0...@aws-amplify/analytics@1.2.18-unstable.1) (2019-07-09)


### Bug Fixes

* **@aws-amplify/analytics:** do not send events when analytics modules not configured ([#3614](https://github.com/aws/aws-amplify/issues/3614)) ([82e6f28](https://github.com/aws/aws-amplify/commit/82e6f28))




<a name="1.2.18-unstable.0"></a>
## [1.2.18-unstable.0](https://github.com/aws/aws-amplify/compare/@aws-amplify/analytics@1.2.17...@aws-amplify/analytics@1.2.18-unstable.0) (2019-06-18)




**Note:** Version bump only for package @aws-amplify/analytics

<a name="1.2.17"></a>
## [1.2.17](https://github.com/aws/aws-amplify/compare/@aws-amplify/analytics@1.2.17-unstable.3...@aws-amplify/analytics@1.2.17) (2019-06-17)




**Note:** Version bump only for package @aws-amplify/analytics

<a name="1.2.17-unstable.3"></a>
## [1.2.17-unstable.3](https://github.com/aws/aws-amplify/compare/@aws-amplify/analytics@1.2.17-unstable.2...@aws-amplify/analytics@1.2.17-unstable.3) (2019-06-14)




**Note:** Version bump only for package @aws-amplify/analytics

<a name="1.2.17-unstable.2"></a>
## [1.2.17-unstable.2](https://github.com/aws/aws-amplify/compare/@aws-amplify/analytics@1.2.17-unstable.1...@aws-amplify/analytics@1.2.17-unstable.2) (2019-06-07)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -770,7 +770,7 @@ describe("AnalyticsProvider test", () => {
options
);
const spyon = jest.spyOn(Pinpoint.prototype, 'updateEndpoint').mockImplementationOnce((params, callback) => {
callback('err', null);
callback({ message: 'error' }, null);
});

jest.spyOn(Credentials, 'get').mockImplementationOnce(() => {
Expand Down
Loading

0 comments on commit 92521a0

Please sign in to comment.