From d0dde61b141acc3f7415915123b4d1dc5177e97f Mon Sep 17 00:00:00 2001 From: Rohit Kulkarni Date: Thu, 29 Aug 2024 06:23:45 +0530 Subject: [PATCH 1/3] target es5 --- tsconfig.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tsconfig.json b/tsconfig.json index d5c2b6a..3d493b5 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -3,7 +3,7 @@ "baseUrl": ".", "outDir": "./dist/esm", "module": "ESNext", - "target": "ES6", + "target": "ES5", "moduleResolution": "node", "sourceMap": true, // "inlineSourceMap": true, @@ -16,7 +16,8 @@ "experimentalDecorators": true, "emitDecoratorMetadata": true, "esModuleInterop": true, - "importHelpers": true, + // "importHelpers": true, + "downlevelIteration": true, // "isolatedModules": true, // "strict": true, "noUncheckedIndexedAccess": true, @@ -29,4 +30,4 @@ }, "include": [ "src/**/*.ts" ], "exclude": [ "**/*.test.ts" ], -} \ No newline at end of file +} From d4cb384b88d1c7183ad8ed6ba2168a33ffe4e3a5 Mon Sep 17 00:00:00 2001 From: therohk Date: Thu, 29 Aug 2024 06:36:55 +0530 Subject: [PATCH 2/3] fix version --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index ea735f1..0e7cb7e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "datum-merge", - "version": "0.5.1", + "version": "0.5.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "datum-merge", - "version": "0.5.1", + "version": "0.5.3", "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.3", diff --git a/package.json b/package.json index 1ab0971..27b5e27 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "datum-merge", - "version": "0.5.1", + "version": "0.5.3", "author": "Rohit Kulkarni ", "repository": { "type": "git", From d06b23b193593cbac50ce056c20eaedf2abc210b Mon Sep 17 00:00:00 2001 From: therohk Date: Thu, 29 Aug 2024 08:47:12 +0530 Subject: [PATCH 3/3] support commonjs --- .github/workflows/build.yml | 2 ++ .github/workflows/publish.yml | 6 +++--- package-lock.json | 4 ++-- package.json | 16 ++++++++++------ tsconfig.json | 15 ++++++--------- 5 files changed, 23 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4bc9d1f..03362b6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,5 +24,7 @@ jobs: run: npm install - name: unit-test run: npm run test + - name: cjs-build + run: npm run build:cjs - name: esm-build run: npm run build:esm diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 78f6739..f34ff1b 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -1,4 +1,4 @@ -name: build +name: publish on: release: types: [created] @@ -17,8 +17,8 @@ jobs: node-version: '20.x' registry-url: https://registry.npmjs.org - name: clean-build - run: npm ci && npm run build:esm - - name: publish + run: npm ci && npm run build + - name: npm-publish run: npm publish --provenance --access public env: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} diff --git a/package-lock.json b/package-lock.json index 0e7cb7e..f8ca267 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "datum-merge", - "version": "0.5.3", + "version": "0.5.4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "datum-merge", - "version": "0.5.3", + "version": "0.5.4", "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.3", diff --git a/package.json b/package.json index 27b5e27..0cf754d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "datum-merge", - "version": "0.5.3", + "version": "0.5.4", "author": "Rohit Kulkarni ", "repository": { "type": "git", @@ -9,8 +9,12 @@ "license": "MIT", "description": "Simplified diff and merging for deeply nested objects.", "keywords": ["merge", "diff", "compare", "patch", "update"], - "main": "dist/esm/index.js", - "types": "dist/esm/index.d.ts", + "main": "./dist/cjs/index.js", + "types": "./dist/cjs/index.d.ts", + "exports": { + "require": "./dist/cjs/index.js", + "import": "./dist/esm/index.js" + }, "files": [ "dist", "src" @@ -21,11 +25,11 @@ }, "scripts": { "lint": "npx eslint src", - "pretty": "prettier -c src", + "pretty": "prettier -c ./src", "scantask": "findstr /s /i todo src\\*.*", "test": "jest", - "build:esm": "tsc", - "build:cjs": "tsc --module CommonJS --outDir dist/cjs", + "build:cjs": "tsc --outDir dist/cjs", + "build:esm": "tsc --module ESNext --outDir dist/esm", "build": "run-s test build:*", "compile": "tsc -noEmit -skipLibCheck", "cyccheck": "dpdm --exit-code circular:1 --no-tree ./src" diff --git a/tsconfig.json b/tsconfig.json index 3d493b5..e9c9b6e 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,15 +1,16 @@ { "compilerOptions": { "baseUrl": ".", - "outDir": "./dist/esm", - "module": "ESNext", - "target": "ES5", + "outDir": "./dist/cjs", + "module": "CommonJS", + "target": "ES6", "moduleResolution": "node", "sourceMap": true, // "inlineSourceMap": true, // "inlineSources": true, "removeComments": true, "declaration": true, + "declarationMap": true, "allowJs": false, // "checkJs": true, "allowSyntheticDefaultImports": true, @@ -17,16 +18,12 @@ "emitDecoratorMetadata": true, "esModuleInterop": true, // "importHelpers": true, - "downlevelIteration": true, + // "downlevelIteration": true, // "isolatedModules": true, // "strict": true, "noUncheckedIndexedAccess": true, "noImplicitOverride": true, - "lib": [ - "ES5", - "ES6", - "ES7" - ] + "lib": ["ES6"] }, "include": [ "src/**/*.ts" ], "exclude": [ "**/*.test.ts" ],