From 00a6184bbca7fe986f25d7682dbd03d148e29225 Mon Sep 17 00:00:00 2001 From: suntianrui Date: Tue, 20 Sep 2022 17:01:07 +0800 Subject: [PATCH 1/6] Create node.js.yml --- .github/workflows/node.js.yml | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 .github/workflows/node.js.yml diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml new file mode 100644 index 0000000..e649e15 --- /dev/null +++ b/.github/workflows/node.js.yml @@ -0,0 +1,32 @@ +# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node +# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions + +name: Node.js CI + +on: + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] + +jobs: + build: + + runs-on: ubuntu-latest + + strategy: + matrix: + # node-version: [14.x, 16.x, 18.x] + # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ + + steps: + - uses: actions/checkout@v3 + - name: Setup pnpm + # You may pin to the exact commit or the version. + # uses: pnpm/action-setup@10693b3829bf86eb2572aef5f3571dcf5ca9287d + uses: pnpm/action-setup@v2.2.2 + with: + # Version of pnpm to install + version: 7.8.0 + - run: pnpm i + - run: pnpm test From 631e0a4c9c387c115e10ad503ba97f004d706d64 Mon Sep 17 00:00:00 2001 From: suntianrui Date: Tue, 20 Sep 2022 17:01:47 +0800 Subject: [PATCH 2/6] Update node.js.yml --- .github/workflows/node.js.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index e649e15..b492219 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -14,8 +14,8 @@ jobs: runs-on: ubuntu-latest - strategy: - matrix: + # strategy: + # matrix: # node-version: [14.x, 16.x, 18.x] # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ From d29430bc0bc51d2eec3a8d7424beb34d84aa310c Mon Sep 17 00:00:00 2001 From: suntianrui Date: Tue, 20 Sep 2022 17:02:52 +0800 Subject: [PATCH 3/6] Update node.js.yml --- .github/workflows/node.js.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index b492219..e34e4c4 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -28,5 +28,5 @@ jobs: with: # Version of pnpm to install version: 7.8.0 - - run: pnpm i + - run: pnpm install --no-frozen-lockfile - run: pnpm test From 26cca0512a148380d2c1a17808c66e298f448b87 Mon Sep 17 00:00:00 2001 From: suntianrui Date: Tue, 20 Sep 2022 17:06:16 +0800 Subject: [PATCH 4/6] npmrc --- .npmrc | 1 + 1 file changed, 1 insertion(+) create mode 100644 .npmrc diff --git a/.npmrc b/.npmrc new file mode 100644 index 0000000..fa4e095 --- /dev/null +++ b/.npmrc @@ -0,0 +1 @@ +strict-peer-dependencies=false \ No newline at end of file From 80f510893434b856cafee721732e48ae1e320c0f Mon Sep 17 00:00:00 2001 From: suntianrui Date: Wed, 21 Sep 2022 18:02:50 +0800 Subject: [PATCH 5/6] github workflow --- .github/workflows/{node.js.yml => unitTest.yml} | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) rename .github/workflows/{node.js.yml => unitTest.yml} (94%) diff --git a/.github/workflows/node.js.yml b/.github/workflows/unitTest.yml similarity index 94% rename from .github/workflows/node.js.yml rename to .github/workflows/unitTest.yml index e34e4c4..0a1f7f4 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/unitTest.yml @@ -1,11 +1,9 @@ # This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node # For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions -name: Node.js CI +name: unit test on: - push: - branches: [ "main" ] pull_request: branches: [ "main" ] From 5ad78bf7e22a143f172146875b9f7ed265874ee6 Mon Sep 17 00:00:00 2001 From: suntianrui Date: Wed, 28 Sep 2022 16:04:38 +0800 Subject: [PATCH 6/6] unit test & workflow --- .github/workflows/unitTest.yml | 1 + packages/nice-dag-core/package.json | 4 ++-- packages/nice-dag-core/src/utils.ts | 1 - packages/nice-dag-core/tsconfig.build.json | 7 +++++++ packages/nice-dag-core/tsconfig.json | 3 ++- 5 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 packages/nice-dag-core/tsconfig.build.json diff --git a/.github/workflows/unitTest.yml b/.github/workflows/unitTest.yml index 0a1f7f4..a9e7cb4 100644 --- a/.github/workflows/unitTest.yml +++ b/.github/workflows/unitTest.yml @@ -27,4 +27,5 @@ jobs: # Version of pnpm to install version: 7.8.0 - run: pnpm install --no-frozen-lockfile + - run: pnpm build - run: pnpm test diff --git a/packages/nice-dag-core/package.json b/packages/nice-dag-core/package.json index e5831ba..c68df5a 100644 --- a/packages/nice-dag-core/package.json +++ b/packages/nice-dag-core/package.json @@ -12,8 +12,8 @@ }, "scripts": { "build": "rm -rf lib && pnpm build:esm && pnpm build:cjs", - "build:esm": "tsc", - "build:cjs": "tsc --module commonjs --outDir lib/cjs", + "build:esm": "tsc -p ./tsconfig.build.json", + "build:cjs": "tsc -p ./tsconfig.build.json --module commonjs --outDir lib/cjs", "dev": "tsc -w", "codecov": "codecov", "gendoc": "typedoc", diff --git a/packages/nice-dag-core/src/utils.ts b/packages/nice-dag-core/src/utils.ts index 891e718..789253d 100644 --- a/packages/nice-dag-core/src/utils.ts +++ b/packages/nice-dag-core/src/utils.ts @@ -1,5 +1,4 @@ import { - Padding, Node, StyleObjectType, ElementAttributesType, diff --git a/packages/nice-dag-core/tsconfig.build.json b/packages/nice-dag-core/tsconfig.build.json new file mode 100644 index 0000000..da5beea --- /dev/null +++ b/packages/nice-dag-core/tsconfig.build.json @@ -0,0 +1,7 @@ +{ + "extends": "./tsconfig.json", + "exclude": [ + "src/**/*.spec.ts", + "src/**/*.test.ts" + ] + } \ No newline at end of file diff --git a/packages/nice-dag-core/tsconfig.json b/packages/nice-dag-core/tsconfig.json index 215f448..c2782d4 100644 --- a/packages/nice-dag-core/tsconfig.json +++ b/packages/nice-dag-core/tsconfig.json @@ -31,6 +31,7 @@ "exclude": [ "node_modules", "lib", - "src/setupTests.ts" + "src/setupTests.ts", + "**/__tests/**" ] } \ No newline at end of file