Skip to content

Commit

Permalink
fix: rename category logger to logging
Browse files Browse the repository at this point in the history
  • Loading branch information
Ashwin Kumar committed Jan 5, 2024
1 parent 81753ce commit ed38a6e
Show file tree
Hide file tree
Showing 52 changed files with 1,385 additions and 899 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"packages/notifications",
"packages/rtn-push-notification",
"packages/aws-amplify",
"packages/logger",
"packages/logging",
"packages/rtn-web-browser",
"packages/react-native",
"packages/react-native/example",
Expand Down
20 changes: 10 additions & 10 deletions packages/aws-amplify/__tests__/exports.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ import * as analyticsKinesisFirehoseExports from '../src/analytics/kinesis-fireh
import * as analyticsPersonalizeExports from '../src/analytics/personalize';
import * as storageTopLevelExports from '../src/storage';
import * as storageS3Exports from '../src/storage/s3';
import * as loggerTopLevelExports from '../src/logger';
import * as loggerConsoleExports from '../src/logger/console';
import * as loggerCloudwatchExports from '../src/logger/cloudwatch';
import * as loggingTopLevelExports from '../src/logging';
import * as loggingConsoleExports from '../src/logging/console';
import * as loggingCloudwatchExports from '../src/logging/cloudwatch';

/**
* Describes exports from the aws-amplify umbrella package to ensure we're not polluting the export surface.
Expand Down Expand Up @@ -258,22 +258,22 @@ describe('aws-amplify Exports', () => {
});
});

describe('Logger exports', () => {
describe('Logging exports', () => {
it('should only export expected symbols from the top-level', () => {
expect(Object.keys(loggerTopLevelExports).sort()).toEqual(
['disable', 'enable', 'flushLogs', 'generateLogger'].sort()
expect(Object.keys(loggingTopLevelExports).sort()).toEqual(
['disable', 'enable', 'flushLogs', 'createLogger'].sort()
);
});

it('should only export expected symbols from the Console provider', () => {
expect(Object.keys(loggerConsoleExports).sort()).toEqual(
['disable', 'enable', 'getConsoleProvider'].sort()
expect(Object.keys(loggingConsoleExports).sort()).toEqual(
['disable', 'enable', 'getProvider'].sort()
);
});

it('should only export expected symbols from the Cloudwatch provider', () => {
expect(Object.keys(loggerCloudwatchExports).sort()).toEqual(
['disable', 'enable', 'getCloudWatchProvider'].sort()
expect(Object.keys(loggingCloudwatchExports).sort()).toEqual(
['disable', 'enable', 'getProvider'].sort()
);
});
});
Expand Down
8 changes: 0 additions & 8 deletions packages/aws-amplify/logger/cloudwatch/package.json

This file was deleted.

8 changes: 0 additions & 8 deletions packages/aws-amplify/logger/console/package.json

This file was deleted.

8 changes: 0 additions & 8 deletions packages/aws-amplify/logger/package.json

This file was deleted.

8 changes: 8 additions & 0 deletions packages/aws-amplify/logging/cloudwatch/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"name": "aws-amplify/logging/cloudwatch",
"main": "../../dist/cjs/logging/cloudwatch/index.js",
"react-native": "../../src/logging/cloudwatch/index.ts",
"browser": "../../dist/esm/logging/cloudwatch/index.mjs",
"module": "../../dist/esm/logging/cloudwatch/index.mjs",
"typings": "../../dist/esm/logging/cloudwatch/index.d.ts"
}
8 changes: 8 additions & 0 deletions packages/aws-amplify/logging/console/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"name": "aws-amplify/logging/console",
"main": "../../dist/cjs/logging/console/index.js",
"react-native": "../../src/logging/console/index.ts",
"browser": "../../dist/esm/logging/console/index.mjs",
"module": "../../dist/esm/logging/console/index.mjs",
"typings": "../../dist/esm/logging/console/index.d.ts"
}
8 changes: 8 additions & 0 deletions packages/aws-amplify/logging/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"name": "aws-amplify/logging",
"main": "../dist/cjs/logging/index.js",
"react-native": "../src/logging/index.ts",
"browser": "../dist/esm/logging/index.mjs",
"module": "../dist/esm/logging/index.mjs",
"typings": "../dist/esm/logging/index.d.ts"
}
50 changes: 25 additions & 25 deletions packages/aws-amplify/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -150,23 +150,23 @@
"import": "./dist/esm/adapterCore/index.mjs",
"require": "./dist/cjs/adapterCore/index.js"
},
"./logger": {
"types": "./dist/esm/logger/index.d.ts",
"import": "./dist/esm/logger/index.mjs",
"require": "./dist/cjs/logger/index.js",
"react-native": "./src/logger/index.ts"
},
"./logger/console": {
"types": "./dist/esm/logger/console/index.d.ts",
"import": "./dist/esm/logger/console/index.mjs",
"require": "./dist/cjs/logger/console/index.js",
"react-native": "./src/logger/console/index.ts"
},
"./logger/cloudwatch": {
"types": "./dist/esm/logger/cloudwatch/index.d.ts",
"import": "./dist/esm/logger/cloudwatch/index.mjs",
"require": "./dist/cjs/logger/cloudwatch/index.js",
"react-native": "./src/logger/cloudwatch/index.ts"
"./logging": {
"types": "./dist/esm/logging/index.d.ts",
"import": "./dist/esm/logging/index.mjs",
"require": "./dist/cjs/logging/index.js",
"react-native": "./src/logging/index.ts"
},
"./logging/console": {
"types": "./dist/esm/logging/console/index.d.ts",
"import": "./dist/esm/logging/console/index.mjs",
"require": "./dist/cjs/logging/console/index.js",
"react-native": "./src/logging/console/index.ts"
},
"./logging/cloudwatch": {
"types": "./dist/esm/logging/cloudwatch/index.d.ts",
"import": "./dist/esm/logging/cloudwatch/index.mjs",
"require": "./dist/cjs/logging/cloudwatch/index.js",
"react-native": "./src/logging/cloudwatch/index.ts"
},
"./package.json": "./package.json"
},
Expand Down Expand Up @@ -238,14 +238,14 @@
"adapter-core": [
"./dist/esm/adapterCore/index.d.ts"
],
"logger": [
"./dist/esm/logger/index.d.ts"
"logging": [
"./dist/esm/logging/index.d.ts"
],
"logger/console": [
"./dist/esm/logger/console/index.d.ts"
"logging/console": [
"./dist/esm/logging/console/index.d.ts"
],
"logger/cloudwatch": [
"./dist/esm/logger/cloudwatch/index.d.ts"
"logging/cloudwatch": [
"./dist/esm/logging/cloudwatch/index.d.ts"
]
}
},
Expand Down Expand Up @@ -289,7 +289,7 @@
"in-app-messaging",
"push-notifications",
"utils",
"logger"
"logging"
],
"dependencies": {
"@aws-amplify/analytics": "7.0.9",
Expand All @@ -299,7 +299,7 @@
"@aws-amplify/datastore": "5.0.9",
"@aws-amplify/notifications": "2.0.9",
"@aws-amplify/storage": "6.0.9",
"@aws-amplify/logger": "1.0.0",
"@aws-amplify/logging": "1.0.0",
"tslib": "^2.5.0"
},
"devDependencies": {
Expand Down
8 changes: 0 additions & 8 deletions packages/aws-amplify/src/logger/index.ts

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0

export * from '@aws-amplify/logger/cloudwatch';
export * from '@aws-amplify/logging/cloudwatch';
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0

export * from '@aws-amplify/logger/console';
export * from '@aws-amplify/logging/console';
8 changes: 8 additions & 0 deletions packages/aws-amplify/src/logging/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0

/*
This file maps exports from `aws-amplify/logging`.
It provides access to the logging providers and category utils.
*/
export * from '@aws-amplify/logging';
1 change: 0 additions & 1 deletion packages/aws-amplify/webpack-utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ const packageFolderMap = {
interactions: '@aws-amplify/interactions',
pubsub: '@aws-amplify/pubsub',
storage: '@aws-amplify/storage',
logger: '@aws-amplify/logger',
};

const folders = Object.keys(packageFolderMap);
Expand Down
3 changes: 0 additions & 3 deletions packages/logger/README.md

This file was deleted.

File renamed without changes.
3 changes: 3 additions & 0 deletions packages/logging/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
> INTERNAL USE ONLY
This package contains the AWS Amplify Logging category and is intended for internal use only. To integrate Amplify into your app, please use [aws-amplify](https://www.npmjs.com/package/aws-amplify).
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import { createLogger } from '../../src/apis';

// TODO: pending implementation
describe('Logger APIs: generateLogger', () => {
describe('Logging APIs: generateLogger', () => {
it('should generate logger', () => {
const logger = createLogger();
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import { disable } from '../../src/apis';

// TODO: pending implementation
describe('Logger APIs: disable', () => {
describe('Logging APIs: disable', () => {
it('should disable logging for all providers', () => {
disable();
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import { enable } from '../../src/apis';

// TODO: pending implementation
describe('Logger APIs: enable', () => {
describe('Logging APIs: enable', () => {
it('should enable logging for all providers', () => {
enable();
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import { flushLogs } from '../../src/apis';

// TODO: pending implementation
describe('Logger APIs: flushLogs', () => {
describe('Logging APIs: flushLogs', () => {
it('should call flushLogs on all providers', () => {
flushLogs();
});
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@aws-amplify/logger/cloudwatch",
"name": "@aws-amplify/logging/cloudwatch",
"main": "../dist/cjs/providers/cloudwatch/index.js",
"browser": "../dist/esm/providers/cloudwatch/index.mjs",
"module": "../dist/esm/providers/cloudwatch/index.mjs",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@aws-amplify/logger/console",
"name": "@aws-amplify/logging/console",
"main": "../dist/cjs/providers/console/index.js",
"browser": "../dist/esm/providers/console/index.mjs",
"module": "../dist/esm/providers/console/index.mjs",
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@aws-amplify/logger",
"name": "@aws-amplify/logging",
"version": "1.0.0",
"description": "Logger category of aws-amplify",
"description": "Logging category of aws-amplify",
"main": "./dist/cjs/index.js",
"module": "./dist/esm/index.mjs",
"react-native": "./src/index.ts",
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit ed38a6e

Please sign in to comment.