Skip to content

Commit

Permalink
fix: support dual package
Browse files Browse the repository at this point in the history
  • Loading branch information
hg-pyun committed Jul 23, 2023
1 parent f04a502 commit b14bab5
Show file tree
Hide file tree
Showing 10 changed files with 53 additions and 88 deletions.
14 changes: 0 additions & 14 deletions .babelrc

This file was deleted.

25 changes: 14 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
{
"name": "axios-logger",
"version": "2.6.2",
"version": "3.0.0",
"description": "Beautify Axios Logging Messages",
"main": "lib/index.js",
"main": "lib/cjs/index.js",
"module": "lib/esm/index.js",
"type": "module",
"exports": {
"./lib": {
"types": "./types/index.d.ts" ,
"require": "./cjs/index.js",
"import": "./esm/index.js"
}
},
"keywords": [
"javascript",
"nodejs",
Expand All @@ -27,12 +36,6 @@
},
"homepage": "https://github.com/hg-pyun/axios-logger#readme",
"devDependencies": {
"@babel/cli": "^7.22.9",
"@babel/core": "^7.22.9",
"@babel/plugin-proposal-class-properties": "^7.18.6",
"@babel/plugin-proposal-object-rest-spread": "^7.20.7",
"@babel/preset-env": "^7.22.9",
"@babel/preset-typescript": "^7.22.5",
"@types/dateformat": "^5.0.0",
"@types/jest": "^29.5.3",
"@types/node": "^20.4.4",
Expand Down Expand Up @@ -66,9 +69,9 @@
"scripts": {
"type-check": "tsc --noEmit",
"type-check:watch": "npm run type-check -- --watch",
"build": "rm -rf ./lib && npm run build:types && npm run build:js",
"build:types": "tsc --emitDeclarationOnly",
"build:js": "cross-env BABEL_ENV=production babel src --out-dir lib --extensions \".ts,.tsx\" --source-maps inline",
"build": "npm run build:clean && npm run build:ts",
"build:clean": "rm -rf ./lib",
"build:ts": "tsc -b ./tsconfig.cjs.json ./tsconfig.esm.json ./tsconfig.types.json",
"test": "jest --silent",
"test:watch": "jest --watchAll",
"test:server": "node ./test/server.js",
Expand Down
2 changes: 1 addition & 1 deletion src/common/string-builder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ class StringBuilder {
return this;
}

makeData(data: object) {
makeData(data: string | object) {
if (this.config.data && data) {
const str = typeof data === `string` ? data : JSON.stringify(data);
this.printQueue.push(str);
Expand Down
4 changes: 2 additions & 2 deletions src/logger/error.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ function errorLoggerWithoutPromise(error: AxiosError, config: ErrorLogConfig = {
.makeUrl(url, baseURL)
.makeParams(params)
.makeStatus(status, statusText)
.makeHeader(headers)
.makeData(data)
.makeHeader(headers as unknown as { [key: string]: { value: string } }) // TODO: fix type
.makeData(data as (string | object)) // TODO: fix type
.build();

buildConfig.logger(log);
Expand Down
2 changes: 1 addition & 1 deletion src/logger/request.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ function requestLogger(request: AxiosRequestConfig, config: RequestLogConfig = {
.makeMethod(method)
.makeUrl(url, baseURL)
.makeParams(params)
.makeHeader(headers)
.makeHeader(headers as unknown as { [key: string]: { value: string } }) // TODO: fix type
.makeData(data)
.build();

Expand Down
2 changes: 1 addition & 1 deletion src/logger/response.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ function responseLogger(response: AxiosResponse, config: ResponseLogConfig = {})
.makeUrl(url, baseURL)
.makeParams(params)
.makeStatus(status, statusText)
.makeHeader(headers)
.makeHeader(headers as unknown as { [key: string]: { value: string } }) // TODO: fix type
.makeData(data)
.build();

Expand Down
7 changes: 7 additions & 0 deletions tsconfig.cjs.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"outDir": "./lib/cjs",
"module": "commonjs"
}
}
7 changes: 7 additions & 0 deletions tsconfig.esm.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"outDir": "./lib/esm",
"module": "esnext"
}
}
70 changes: 12 additions & 58 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,61 +1,15 @@
{
"exclude": ["node_modules", "lib", "tools", "**/*.test.ts"],
"compilerOptions": {
/* Basic Options */
"target": "esnext" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'. */,
"module": "commonjs" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */,
// "lib": [], /* Specify library files to be included in the compilation. */
// "allowJs": true, /* Allow javascript files to be compiled. */
// "checkJs": true, /* Report errors in .js files. */
// "jsx": "preserve", /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
"declaration": true /* Generates corresponding '.d.ts' file. */,
// "declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */
// "sourceMap": true, /* Generates corresponding '.map' file. */
// "outFile": "./", /* Concatenate and emit output to single file. */
"outDir": "lib" /* Redirect output structure to the directory. */,
// "rootDir": "./", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
// "composite": true, /* Enable project compilation */
// "removeComments": true, /* Do not emit comments to output. */
// "noEmit": true, /* Do not emit outputs. */
// "importHelpers": true, /* Import emit helpers from 'tslib'. */
// "downlevelIteration": true, /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
// "isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */

/* Strict Type-Checking Options */
"strict": true /* Enable all strict type-checking options. */,
// "noImplicitAny": true, /* Raise error on expressions and declarations with an implied 'any' type. */
// "strictNullChecks": true, /* Enable strict null checks. */
// "strictFunctionTypes": true, /* Enable strict checking of function types. */
// "strictBindCallApply": true, /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
// "strictPropertyInitialization": true, /* Enable strict checking of property initialization in classes. */
// "noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */
// "alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */

/* Additional Checks */
// "noUnusedLocals": true, /* Report errors on unused locals. */
// "noUnusedParameters": true, /* Report errors on unused parameters. */
// "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */
// "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */

/* Module Resolution Options */
// "moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
// "baseUrl": "./", /* Base directory to resolve non-absolute module names. */
// "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
// "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */
// "typeRoots": [], /* List of folders to include type definitions from. */
// "types": [], /* Type declaration files to be included in compilation. */
"allowSyntheticDefaultImports": true /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */,
"esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
// "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */

/* Source Map Options */
// "sourceRoot": "", /* Specify the location where debugger should locate TypeScript files instead of source locations. */
// "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */
// "inlineSourceMap": true, /* Emit a single file with source maps instead of having a separate file. */
// "inlineSources": true, /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */

/* Experimental Options */
// "experimentalDecorators": true, /* Enables experimental support for ES7 decorators. */
// "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */
},
"exclude": ["node_modules", "lib", "tools", "**/*.test.ts"]
"target": "es2016",
"moduleResolution": "node",
"sourceMap": true,
"outDir": "lib",
"removeComments": true,
"inlineSources": true,
"esModuleInterop": true,
"forceConsistentCasingInFileNames": true,
"strict": true,
"skipLibCheck": true
}
}
8 changes: 8 additions & 0 deletions tsconfig.types.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"outDir": "./lib/types",
"declaration": true,
"emitDeclarationOnly": true
}
}

0 comments on commit b14bab5

Please sign in to comment.