Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync modularization with ui-components/master #5215

Merged
merged 61 commits into from
Mar 27, 2020
Merged

Sync modularization with ui-components/master #5215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
99dbe4c
Adding database abstraction for AsyncStorage
Ashish-Nanda Feb 12, 2020
9e48b18
Add storage adapter for React Native using AsyncStorage
Ashish-Nanda Feb 12, 2020
619cd9c
Add separate default adapters for Web and React Native
Ashish-Nanda Feb 12, 2020
c259d9c
Make error messages more meaningful
Ashish-Nanda Feb 12, 2020
5d61f39
Add support for Reachability in React Native
Ashish-Nanda Feb 12, 2020
6153dc6
Add @react-native-community/netinfo to devDependencies
Ashish-Nanda Feb 12, 2020
3525333
Pin down the version of crypto-js
Ashish-Nanda Feb 12, 2020
2f1bca4
Merge pull request #4896 from Ashish-Nanda/react-native-datastore-fea…
Ashish-Nanda Feb 12, 2020
9690af0
Enable publish from rn-datastore branch
Ashish-Nanda Feb 12, 2020
0d78e16
Merge pull request #4899 from Ashish-Nanda/react-native-datastore-fea…
Ashish-Nanda Feb 12, 2020
16b0845
Preparing release
elorzafe Feb 14, 2020
92c922e
chore(release): Publish [ci skip]
Feb 14, 2020
5309c61
Allow in PubSub to add async custom headers
SebSchwartz Feb 17, 2020
3744cc9
chore(deps-dev): bump codecov from 1.0.1 to 3.6.5 (#4951)
dependabot[bot] Feb 19, 2020
a577935
(fix:@aws-amplify/pubsub) Fix for unsubscription new subscription rac…
elorzafe Feb 20, 2020
ef6a365
Merge branch 'master' of github.com:aws-amplify/amplify-js into rn-da…
Ashish-Nanda Feb 20, 2020
7f60396
Fix to initialize only once and handle disconnection from network (#…
manueliglesias Feb 24, 2020
ce7ca96
chore(deps): bump nokogiri from 1.10.4 to 1.10.8 in /docs (#4974)
dependabot[bot] Feb 25, 2020
3cd2468
Use the db instance property of the Adapter class for all database op…
Ashish-Nanda Feb 27, 2020
bcb9a3a
Merge branch 'master' into rn-datastore
Ashish-Nanda Feb 27, 2020
788d64b
Removing unused code
Ashish-Nanda Feb 27, 2020
1682c0e
Remove rn-datastore branch publish config
Ashish-Nanda Feb 28, 2020
14157f7
Merge pull request #4996 from aws-amplify/rn-datastore
Ashish-Nanda Feb 28, 2020
e825ce1
Preparing release
Ashish-Nanda Feb 28, 2020
f2efeb1
chore(release): Publish [ci skip]
Feb 28, 2020
fedf0b3
fix(core): move react-native dependency from dev
iartemiev Feb 28, 2020
b2a22e5
fix(core): revert dep addition. Add to peer and devDeps
iartemiev Feb 28, 2020
bbd0271
ci: Add React Native integration testing with Detox (#5007)
iartemiev Feb 28, 2020
8f6acca
Make deploy wait on integ_rn_ios_storage (#5009)
iartemiev Feb 28, 2020
44b4faf
feat(@aws-amplify/api): pass additionalHeaders to graphql function (#…
jensbodal Mar 3, 2020
69d9fd4
chore(@aws-amplify/api): fix non-breaking typo in function (#5034)
jensbodal Mar 3, 2020
fdca554
fix(@aws-amplify/datastore): Fix query and delete types (#5032)
manueliglesias Mar 4, 2020
dae4824
Fix(@aws-amplify/interactions) fixes 4750 to properly use the spread …
manueliglesias Mar 4, 2020
0e79eea
Merge branch 'master' into patch-1
manueliglesias Mar 5, 2020
28ff4c9
fix(@aws-amplify/datastore) Adding socket disconnection detection (#5…
elorzafe Mar 13, 2020
0f7b0fc
Merge branch 'master' into patch-1
ashika01 Mar 13, 2020
fbbe244
fix(@aws-amplify/pubsub): Allow to add async custom headers (#4931)
manueliglesias Mar 13, 2020
6ad01c6
Export necessary providers and types from the package root to avoid i…
Amplifiyer Mar 13, 2020
49f8bfe
fix(aws-amplify-react): Fix Federated icons when using React Bo… (#5073)
ericclemmons Mar 16, 2020
d46fe99
Upgrade aws-sdk clients which resolves react native issues (#5124)
Amplifiyer Mar 17, 2020
a81cdd7
Enable integration tests on modularization branch (#5125)
Amplifiyer Mar 17, 2020
97b3186
chore: Fix setup-dev script (#5035)
manueliglesias Mar 17, 2020
0ddb6af
fix(@aws-amplify/datastore): Storage should be re-initialized after D…
yirako Mar 18, 2020
1cad8b9
fix(aws-amplify-react): BREAKING - Remove "import '@aws-amplify… (#5138)
ericclemmons Mar 18, 2020
b884ea2
feat(@aws-amplify/datastore): Support non-@model types in DataStore (…
manueliglesias Mar 19, 2020
ab08e38
chore: remove datastore form RN integ tests (#5139)
manueliglesias Mar 19, 2020
dcbc70b
Merge branch 'master' into modularization
Amplifiyer Mar 19, 2020
9b6201d
Merge branch 'master' into modularization
Amplifiyer Mar 19, 2020
599d9e9
Merge branch 'modularization' of github.com:aws-amplify/amplify-js in…
Amplifiyer Mar 19, 2020
0e717ff
Fix export type of datastore storage in unit tests
Amplifiyer Mar 19, 2020
22406f1
test(@aws-amplify/datastore): Fix unit tests
manueliglesias Mar 19, 2020
49d295e
[RN] Migrate zen-observable to zen-observable-ts and fix zen-push imp…
Amplifiyer Mar 20, 2020
70576d1
Merge branch 'modularization' of github.com:aws-amplify/amplify-js in…
jordanranz Mar 20, 2020
68cfdf6
Pin aws-sdk versions and rename presignRequest to presign (#5171)
Amplifiyer Mar 23, 2020
81489b0
Merge branch 'ui-components/master' of github.com:aws-amplify/amplify…
jordanranz Mar 26, 2020
2a7fd81
Upgrade aws-sdk clients from alpha to beta (#5209)
Amplifiyer Mar 27, 2020
9f2aa5b
Merge branch 'ui-components/master' of github.com:aws-amplify/amplify…
jordanranz Mar 27, 2020
becfe45
Merge branch 'modularization' of github.com:aws-amplify/amplify-js in…
jordanranz Mar 27, 2020
78a55e8
Fix jest failures, update snapshot
jordanranz Mar 27, 2020
d8b3818
Update storage changelog
jordanranz Mar 27, 2020
2e99554
Merge branch 'ui-components/master' of github.com:aws-amplify/amplify…
jordanranz Mar 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
140 changes: 139 additions & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# Check https://circleci.com/docs/2.0/language-javascript/ for more details
#
version: 2
version: 2.1
machine:
environment:
PATH: '${PATH}:${HOME}/${CIRCLE_PROJECT_REPONAME}/node_modules/.bin'
Expand All @@ -14,6 +14,26 @@ defaults: &defaults
## this enables colors in the output
TERM: xterm

defaults_rn: &defaults_rn
macos:
xcode: '11.3.1'
working_directory: ~/amplify-js-samples-staging

commands:
restore_pods:
steps:
- restore_cache:
keys:
- v1-storage-app-pods-{{ checksum "ios/Podfile.lock" }}
- v1-storage-app-pods-

save_pods:
steps:
- save_cache:
key: v1-storage-app-pods-{{ checksum "ios/Podfile.lock" }}
paths:
- ios/Pods

jobs:
build:
<<: *defaults
Expand Down Expand Up @@ -47,6 +67,7 @@ jobs:
yarn run test --scope @aws-amplify/analytics
yarn run test --scope @aws-amplify/cache
yarn run test --scope @aws-amplify/core
yarn run test --scope @aws-amplify/datastore
yarn run test --scope @aws-amplify/interactions
yarn run test --scope @aws-amplify/pubsub
yarn run test --scope @aws-amplify/predictions
Expand Down Expand Up @@ -251,6 +272,108 @@ jobs:
path: amplify-js-samples-staging/cypress/videos
- store_artifacts:
path: amplify-js-samples-staging/cypress/screenshots

integ_rn_ios_storage:
<<: *defaults_rn
working_directory: ~/amplify-js-samples-staging/samples/react-native/storage/StorageApp
steps:
- attach_workspace:
at: ~/
- run:
name: Yarn Install
command: yarn install --non-interactive --no-lockfile
# Metro Bundler doesn't work with linked packages so we're copying them from amplify-js
# TODO: utilize Verdaccio for this instead
- run:
name: 'Link aws-amplify'
command: |
cp -rf ~/amplify-js/packages/aws-amplify/dist ./node_modules/aws-amplify/dist
cp -rf ~/amplify-js/packages/aws-amplify/lib ./node_modules/aws-amplify/lib
cp -rf ~/amplify-js/packages/aws-amplify/lib-esm ./node_modules/aws-amplify/lib-esm

cp -rf ~/amplify-js/packages/amazon-cognito-identity-js/dist ./node_modules/amazon-cognito-identity-js/dist
cp -rf ~/amplify-js/packages/amazon-cognito-identity-js/lib ./node_modules/amazon-cognito-identity-js/lib

cp -rf ~/amplify-js/packages/analytics/dist ./node_modules/@aws-amplify/analytics/dist
cp -rf ~/amplify-js/packages/analytics/lib ./node_modules/@aws-amplify/analytics/lib
cp -rf ~/amplify-js/packages/analytics/lib-esm ./node_modules/@aws-amplify/analytics/lib-esm

cp -rf ~/amplify-js/packages/api/dist ./node_modules/@aws-amplify/api/dist
cp -rf ~/amplify-js/packages/api/lib ./node_modules/@aws-amplify/api/lib
cp -rf ~/amplify-js/packages/api/lib-esm ./node_modules/@aws-amplify/api/lib-esm

cp -rf ~/amplify-js/packages/auth/dist ./node_modules/@aws-amplify/auth/dist
cp -rf ~/amplify-js/packages/auth/lib ./node_modules/@aws-amplify/auth/lib
cp -rf ~/amplify-js/packages/auth/lib-esm ./node_modules/@aws-amplify/auth/lib-esm

cp -rf ~/amplify-js/packages/cache/dist ./node_modules/@aws-amplify/cache/dist
cp -rf ~/amplify-js/packages/cache/lib ./node_modules/@aws-amplify/cache/lib
cp -rf ~/amplify-js/packages/cache/lib-esm ./node_modules/@aws-amplify/cache/lib-esm

cp -rf ~/amplify-js/packages/core/dist ./node_modules/@aws-amplify/core/dist
cp -rf ~/amplify-js/packages/core/lib ./node_modules/@aws-amplify/core/lib
cp -rf ~/amplify-js/packages/core/lib-esm ./node_modules/@aws-amplify/core/lib-esm

cp -rf ~/amplify-js/packages/interactions/dist ./node_modules/@aws-amplify/interactions/dist
cp -rf ~/amplify-js/packages/interactions/lib ./node_modules/@aws-amplify/interactions/lib
cp -rf ~/amplify-js/packages/interactions/lib-esm ./node_modules/@aws-amplify/interactions/lib-esm

cp -rf ~/amplify-js/packages/predictions/dist ./node_modules/@aws-amplify/predictions/dist
cp -rf ~/amplify-js/packages/predictions/lib ./node_modules/@aws-amplify/predictions/lib
cp -rf ~/amplify-js/packages/predictions/lib-esm ./node_modules/@aws-amplify/predictions/lib-esm

cp -rf ~/amplify-js/packages/pubsub/dist ./node_modules/@aws-amplify/pubsub/dist
cp -rf ~/amplify-js/packages/pubsub/lib ./node_modules/@aws-amplify/pubsub/lib
cp -rf ~/amplify-js/packages/pubsub/lib-esm ./node_modules/@aws-amplify/pubsub/lib-esm

cp -rf ~/amplify-js/packages/storage/dist ./node_modules/@aws-amplify/storage/dist
cp -rf ~/amplify-js/packages/storage/lib ./node_modules/@aws-amplify/storage/lib
cp -rf ~/amplify-js/packages/storage/lib-esm ./node_modules/@aws-amplify/storage/lib-esm

cp -rf ~/amplify-js/packages/amplify-ui/dist ./node_modules/@aws-amplify/ui/dist
cp -rf ~/amplify-js/packages/amplify-ui/lib ./node_modules/@aws-amplify/ui/lib

cp -rf ~/amplify-js/packages/xr/dist ./node_modules/@aws-amplify/xr/dist
cp -rf ~/amplify-js/packages/xr/lib ./node_modules/@aws-amplify/xr/lib
cp -rf ~/amplify-js/packages/xr/lib-esm ./node_modules/@aws-amplify/xr/lib-esm

- restore_pods
- run:
name: Install CocoaPods
command: |
cd ios
pod install
- save_pods
- run:
background: true
command: xcrun simctl boot "iPhone 11" || true
name: Start iOS simulator (background)
- run:
background: true
command: yarn start
name: Start Metro Packager (background)
- run:
name: Configure Detox
environment:
HOMEBREW_NO_AUTO_UPDATE: 1
command: |
brew tap wix/brew
brew install applesimutils
yarn global add detox-cli
- run:
name: Detox Build
command: detox build -c ios.sim.debug
- run:
environment:
JEST_JUNIT_OUTPUT_DIR: 'reports/junit'
JEST_JUNIT_OUTPUT_NAME: 'detox-test-results.xml'
name: Detox Test
command: detox test -c ios.sim.debug -u
- store_test_results:
path: reports/junit
- store_artifacts:
path: reports/junit

deploy:
<<: *defaults
working_directory: ~/amplify-js
Expand Down Expand Up @@ -292,6 +415,7 @@ workflows:
- master
- ui-components/master
- 1.0-stable
- modularization
requires:
- build
- integ_react_predictions:
Expand All @@ -302,6 +426,7 @@ workflows:
- master
- ui-components/master
- 1.0-stable
- modularization
requires:
- integ_setup
- integ_react_auth:
Expand All @@ -312,6 +437,7 @@ workflows:
- master
- ui-components/master
- 1.0-stable
- modularization
requires:
- integ_setup
- integ_angular_auth:
Expand All @@ -321,9 +447,20 @@ workflows:
- release
- master
- 1.0-stable
- modularization
requires:
- integ_setup
- integ_vue_auth:
filters:
branches:
only:
- release
- master
- 1.0-stable
- modularization
requires:
- integ_setup
- integ_rn_ios_storage:
filters:
branches:
only:
Expand All @@ -348,3 +485,4 @@ workflows:
- integ_react_auth
- integ_angular_auth
- integ_vue_auth
- integ_rn_ios_storage
2 changes: 1 addition & 1 deletion docs/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ GEM
minitest (5.11.3)
multipart-post (2.0.0)
net-dns (0.8.0)
nokogiri (1.10.4)
nokogiri (1.10.8)
mini_portile2 (~> 2.4.0)
octokit (4.8.0)
sawyer (~> 0.8.0, >= 0.5.3)
Expand Down
176 changes: 88 additions & 88 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,90 +1,90 @@
{
"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",
"test": "lerna run test --stream",
"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/ --readme README.md",
"build": "lerna run build --stream",
"build:esm:watch": "lerna run build:esm:watch --parallel",
"build:cjs:watch": "lerna run build:cjs:watch --parallel",
"clean": "lerna run clean --parallel",
"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 --force-publish \"*\" --yes --dist-tag=unstable --preid=unstable --exact",
"publish:beta": "lerna publish --canary --force-publish \"*\" --yes --dist-tag=beta --preid=beta --exact",
"publish:release": "lerna publish --conventional-commits --yes --message 'chore(release): Publish [ci skip]'",
"publish:1.0-stable": "lerna publish --conventional-commits --yes --dist-tag=stable-1.0 --message 'chore(release): Publish [ci skip]'",
"publish:modularization": "lerna publish --canary --force-publish \"*\" --yes --dist-tag=preview --preid=preview --exact",
"publish:ui-components/master": "lerna publish --canary --force-publish \"*\" --yes --dist-tag=ui-preview --preid=ui-preview --exact"
},
"husky": {
"hooks": {
"pre-commit": "pretty-quick --staged"
}
},
"workspaces": [
"packages/*"
],
"repository": {
"type": "git",
"url": "/~https://github.com/aws-amplify/amplify-js.git"
},
"author": "Amazon Web Services",
"license": "Apache-2.0",
"bugs": {
"url": "/~https://github.com/aws-amplify/amplify-js/issues"
},
"homepage": "https://aws-amplify.github.io/",
"devDependencies": {
"@babel/cli": "^7.0.0",
"@babel/core": "^7.0.0",
"@babel/preset-env": "^7.0.0",
"@babel/preset-react": "^7.0.0",
"@types/jest": "^24.0.18",
"@types/node": "^8.9.5",
"@types/puppeteer": "1.12.4",
"babel-loader": "^8.0.0",
"codecov": "^1.0.1",
"compression-webpack-plugin": "^1.1.3",
"cypress": "^3.2.0",
"husky": "^3.0.5",
"jest": "^24.x.x",
"jest-config": "24.8.0",
"json-loader": "^0.5.7",
"lerna": "^3.13.1",
"prettier": "^1.19.0",
"pretty-quick": "^1.11.1",
"rimraf": "^2.6.2",
"rollup": "^0.67.4",
"rollup-plugin-commonjs": "^9.2.0",
"rollup-plugin-json": "^3.1.0",
"rollup-plugin-node-resolve": "^4.0.0",
"rollup-plugin-sourcemaps": "^0.4.2",
"rollup-plugin-typescript": "^1.0.0",
"source-map-loader": "^0.2.1",
"ts-jest": "^24.x.x",
"tslint": "^5.7.0",
"tslint-config-airbnb": "^5.8.0",
"typedoc": "^0.16.9",
"typescript": "~3.6.4",
"uglifyjs-webpack-plugin": "^0.4.6",
"uuid-validate": "^0.0.3",
"webpack": "^4.32.0",
"webpack-bundle-analyzer": "^3.3.2",
"webpack-cli": "^3.1.0",
"winston": "^3.2.1"
},
"jest": {
"resetMocks": true,
"verbose": true
}
"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",
"test": "lerna run test --stream",
"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/ --readme README.md",
"build": "lerna run build --stream",
"build:esm:watch": "lerna run build:esm:watch --parallel",
"build:cjs:watch": "lerna run build:cjs:watch --parallel",
"clean": "lerna run clean --parallel",
"format": "lerna run format",
"lint": "lerna run lint",
"link-all": "yarn unlink-all && lerna exec --no-bail --parallel yarn link",
"unlink-all": "lerna exec --no-bail --parallel -- yarn unlink; exit 0",
"publish:master": "lerna publish --canary --force-publish \"*\" --yes --dist-tag=unstable --preid=unstable --exact",
"publish:beta": "lerna publish --canary --force-publish \"*\" --yes --dist-tag=beta --preid=beta --exact",
"publish:release": "lerna publish --conventional-commits --yes --message 'chore(release): Publish [ci skip]'",
"publish:1.0-stable": "lerna publish --conventional-commits --yes --dist-tag=stable-1.0 --message 'chore(release): Publish [ci skip]'",
"publish:modularization": "lerna publish --canary --force-publish \"*\" --yes --dist-tag=preview --preid=preview --exact",
"publish:ui-components/master": "lerna publish --canary --force-publish \"*\" --yes --dist-tag=ui-preview --preid=ui-preview --exact"
},
"husky": {
"hooks": {
"pre-commit": "pretty-quick --staged"
}
},
"workspaces": [
"packages/*"
],
"repository": {
"type": "git",
"url": "/~https://github.com/aws-amplify/amplify-js.git"
},
"author": "Amazon Web Services",
"license": "Apache-2.0",
"bugs": {
"url": "/~https://github.com/aws-amplify/amplify-js/issues"
},
"homepage": "https://aws-amplify.github.io/",
"devDependencies": {
"@babel/cli": "^7.0.0",
"@babel/core": "^7.0.0",
"@babel/preset-env": "^7.0.0",
"@babel/preset-react": "^7.0.0",
"@types/jest": "^24.0.18",
"@types/node": "^8.9.5",
"@types/puppeteer": "1.3.0",
"babel-loader": "^8.0.0",
"codecov": "^3.6.5",
"compression-webpack-plugin": "^1.1.3",
"cypress": "^3.2.0",
"husky": "^3.0.5",
"jest": "^24.x.x",
"jest-config": "24.8.0",
"json-loader": "^0.5.7",
"lerna": "^3.13.1",
"prettier": "^1.19.0",
"pretty-quick": "^1.11.1",
"rimraf": "^2.6.2",
"rollup": "^0.67.4",
"rollup-plugin-commonjs": "^9.2.0",
"rollup-plugin-json": "^3.1.0",
"rollup-plugin-node-resolve": "^4.0.0",
"rollup-plugin-sourcemaps": "^0.4.2",
"rollup-plugin-typescript": "^1.0.0",
"source-map-loader": "^0.2.1",
"ts-jest": "^24.x.x",
"tslint": "^5.7.0",
"tslint-config-airbnb": "^5.8.0",
"typedoc": "^0.16.9",
"typescript": "~3.6.4",
"uglifyjs-webpack-plugin": "^0.4.6",
"uuid-validate": "^0.0.3",
"webpack": "^4.32.0",
"webpack-bundle-analyzer": "^3.3.2",
"webpack-cli": "^3.1.0",
"winston": "^3.2.1"
},
"jest": {
"resetMocks": true,
"verbose": true
}
}
Loading