diff --git a/.github/actions/setup-node/action.yml b/.github/actions/setup-node/action.yml index ac66a90f52..a9c0801fa4 100644 --- a/.github/actions/setup-node/action.yml +++ b/.github/actions/setup-node/action.yml @@ -10,6 +10,7 @@ runs: - uses: pnpm/action-setup@v2 with: version: 8 + - name: Set up Node.js uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d #v3.8.1 with: @@ -18,15 +19,15 @@ runs: scope: '@talend' cache: 'pnpm' - # - name: Get pnpm cache directory path - # id: pnpm-cache-dir-path - # shell: bash - # run: echo "dir=$(pnpm store path)" >> $GITHUB_OUTPUT + - name: Get pnpm cache directory path + id: pnpm-cache-dir-path + shell: bash + run: echo "dir=$(pnpm store path)" >> $GITHUB_OUTPUT - # - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 #v3.3.2 - # id: pnpm-cache # use this to check for `cache-hit` (`steps.pnpm-cache.outputs.cache-hit != 'true'`) - # with: - # path: ${{ steps.pnpm-cache-dir-path.outputs.dir }} - # key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }} - # restore-keys: | - # ${{ runner.os }}-pnpm- + - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 #v3.3.2 + id: pnpm-cache # use this to check for `cache-hit` (`steps.pnpm-cache.outputs.cache-hit != 'true'`) + with: + path: ${{ steps.pnpm-cache-dir-path.outputs.dir }} + key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }} + restore-keys: | + ${{ runner.os }}-pnpm- diff --git a/fork/dynamic-cdn-webpack-plugin/src/find.js b/fork/dynamic-cdn-webpack-plugin/src/find.js index 6a6d731507..cca9c5257d 100644 --- a/fork/dynamic-cdn-webpack-plugin/src/find.js +++ b/fork/dynamic-cdn-webpack-plugin/src/find.js @@ -86,7 +86,8 @@ function findPackages(scope, name, buff = []) { const result = buff.concat( ...roots.map(root => findPackagesFromNonScopeFolder(scope, name, root)), ); - return [...new Set(result)]; + // return [...new Set(result)]; + return result; } module.exports = { diff --git a/fork/dynamic-cdn-webpack-plugin/src/find.test.js b/fork/dynamic-cdn-webpack-plugin/src/find.test.js index b549b2afec..86d68f64c4 100644 --- a/fork/dynamic-cdn-webpack-plugin/src/find.test.js +++ b/fork/dynamic-cdn-webpack-plugin/src/find.test.js @@ -27,7 +27,7 @@ describe('findPackages', () => { require('fs').__setMockFiles(MOCK_FILE_INFO); }); - test.only('should find root and nested package', () => { + test('should find root and nested package', () => { // when const result = findPackages(undefined, 'react'); diff --git a/package.json b/package.json index 05f181efec..17be2aa3ee 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "webpack": "^5.73.0" }, "scripts": { - "postinstall": "pnpm --sort -r run build:lib", + "postinstall": "pnpm --sort -r --stream run build:lib", "pre-release": "pnpm -r run pre-release", "start": "pnpm --filter @talend/ui-playground run start", "start-storybook": "pnpm --filter @talend/ui-storybook-one run start",