Skip to content

Commit

Permalink
Merge pull request #1224 from powerful23/amplify-v1
Browse files Browse the repository at this point in the history
minor change
  • Loading branch information
powerful23 authored Jul 12, 2018
2 parents d0dc736 + 281d2f1 commit 58d1137
Show file tree
Hide file tree
Showing 16 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "",
"scripts": {
"bootstrap": "lerna bootstrap",
"pre-commit": "lerna exec yarn test --scope aws-amplify",
"pre-commit": "lerna exec yarn test --scope @aws-amplify/core",
"test": "lerna exec yarn test",
"cypress": "lerna exec yarn cypress",
"cypress:open": "lerna exec yarn cypress:open",
Expand Down
3 changes: 1 addition & 2 deletions packages/analytics/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,11 @@
import AnalyticsClass from './Analytics';
import { AnalyticsProvider } from './types';

import {
import Amplify, {
ConsoleLogger as Logger,
Hub,
Linking,
AppState,
Amplify,
Platform
} from '@aws-amplify/core';

Expand Down
2 changes: 1 addition & 1 deletion packages/api/src/API.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { print } from 'graphql/language/printer';
import { parse } from 'graphql/language/parser';
import * as Observable from 'zen-observable';
import { RestClient as RestClass } from './RestClient';
import { ConsoleLogger as Logger, Credentials, Amplify } from '@aws-amplify/core';
import Amplify, { ConsoleLogger as Logger, Credentials } from '@aws-amplify/core';
import { GraphQLOptions, GraphQLResult } from './types';
import Cache from '@aws-amplify/cache';

Expand Down
2 changes: 1 addition & 1 deletion packages/api/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

import APIClass, { graphqlOperation } from './API';

import { ConsoleLogger as Logger, Amplify } from '@aws-amplify/core';
import Amplify, { ConsoleLogger as Logger } from '@aws-amplify/core';

const logger = new Logger('API');

Expand Down
2 changes: 1 addition & 1 deletion packages/auth/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

import AuthClass from './Auth';

import { ConsoleLogger as Logger, Credentials, Amplify } from '@aws-amplify/core';
import Amplify, { ConsoleLogger as Logger, Credentials } from '@aws-amplify/core';

const logger = new Logger('Auth');

Expand Down
2 changes: 1 addition & 1 deletion packages/aws-amplify-react/src/Categories.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Amplify } from '@aws-amplify/core';
import Amplify from '@aws-amplify/core';

const Auth = Amplify.Auth;
const API = Amplify.API;
Expand Down
3 changes: 1 addition & 2 deletions packages/aws-amplify/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,13 @@ import API, { APIClass, graphqlOperation } from '@aws-amplify/api';
import PubSub, { PubSubClass } from '@aws-amplify/pubsub';
import Cache from '@aws-amplify/cache';
import Interactions, { InteractionsClass } from '@aws-amplify/interactions';
import {
import Amplify, {
ConsoleLogger as Logger,
Hub,
JS,
ClientDevice,
Signer,
I18n,
Amplify,
ServiceWorker
} from '@aws-amplify/core';

Expand Down
2 changes: 1 addition & 1 deletion packages/cache/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* and limitations under the License.
*/

import { Amplify } from '@aws-amplify/core';
import Amplify from '@aws-amplify/core';
import BrowserStorageCache from './BrowserStorageCache';
import InMemoryCache from './InMemoryCache';
import { CacheConfig } from './types';
Expand Down
2 changes: 1 addition & 1 deletion packages/cache/src/reactnative.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* and limitations under the License.
*/

import { Amplify } from '@aws-amplify/core';
import Amplify from '@aws-amplify/core';
import {default as Cache, AsyncStorageCache} from './AsyncStorageCache';

export { AsyncStorageCache };
Expand Down
2 changes: 1 addition & 1 deletion packages/core/__tests__/Amplify-test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Amplify } from '../src';
import Amplify from '../src';

describe('Amplify config test', () => {
test('happy case', () => {
Expand Down
4 changes: 3 additions & 1 deletion packages/core/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import { AWS } from './Facet';
import { ConsoleLogger as Logger } from './Logger';
import './Polyfills';
import Amplify from './Amplify';

export * from './Facet';
export { default as ClientDevice } from './ClientDevice';
Expand All @@ -25,7 +26,6 @@ export { default as JS } from './JS';
export { default as Signer } from './Signer';
export { default as Parser } from './Parser';
export { FacebookOAuth, GoogleOAuth } from './OAuthHelper';
export { default as Amplify } from './Amplify';
export * from './RNComponents';
export { default as Credentials } from './Credentials';
export { default as ServiceWorker } from './ServiceWorker';
Expand All @@ -37,6 +37,8 @@ export const Constants = {
'userAgent': Platform.userAgent
};

export default Amplify;

const logger = new Logger('Core');

if (AWS['util']) {
Expand Down
2 changes: 1 addition & 1 deletion packages/interactions/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
import InteractionsClass from './Interactions';

import { ConsoleLogger as Logger, Amplify } from '@aws-amplify/core';
import Amplify, { ConsoleLogger as Logger } from '@aws-amplify/core';

const logger = new Logger('Interactions');

Expand Down
2 changes: 1 addition & 1 deletion packages/pubsub/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
import PubSubClass from './PubSub';

import { ConsoleLogger as Logger, Amplify } from '@aws-amplify/core';
import Amplify, { ConsoleLogger as Logger } from '@aws-amplify/core';

const logger = new Logger('PubSub');

Expand Down
2 changes: 1 addition & 1 deletion packages/pushnotification/src/PushNotification.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/

import { NativeModules, DeviceEventEmitter, AsyncStorage, PushNotificationIOS, Platform } from 'react-native';
import { ConsoleLogger as Logger, Amplify } from '@aws-amplify/core';
import Amplify, { ConsoleLogger as Logger } from '@aws-amplify/core';

const logger = new Logger('Notification');

Expand Down
2 changes: 1 addition & 1 deletion packages/pushnotification/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* and limitations under the License.
*/
import NotificationClass from './PushNotification';
import { ConsoleLogger as Logger, Amplify } from '@aws-amplify/core';
import Amplify, { ConsoleLogger as Logger } from '@aws-amplify/core';

const _instance = new NotificationClass(null);
const PushNotification = _instance;
Expand Down
2 changes: 1 addition & 1 deletion packages/storage/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

import StorageClass from './Storage';

import { ConsoleLogger as Logger, Amplify } from '@aws-amplify/core';
import Amplify, { ConsoleLogger as Logger } from '@aws-amplify/core';

const logger = new Logger('Storage');

Expand Down

0 comments on commit 58d1137

Please sign in to comment.