From a87cb57ae94717ef3c562806b0ba23b8c780a9a6 Mon Sep 17 00:00:00 2001 From: poonam yadav Date: Fri, 27 Oct 2023 14:43:01 +0530 Subject: [PATCH 1/3] ELEMENTS-1685: update initial packages for the node 18 upgrade --- .github/workflows/cross-repo.yaml | 2 +- .github/workflows/lint.yaml | 2 +- .github/workflows/main.yaml | 2 +- .github/workflows/preview.yaml | 2 +- .github/workflows/promote.yaml | 2 +- .github/workflows/storybook.yaml | 4 +++- .github/workflows/test.yaml | 4 ++-- karma.conf.js | 1 + package.json | 3 ++- 9 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.github/workflows/cross-repo.yaml b/.github/workflows/cross-repo.yaml index e22951d85..19b0187bc 100644 --- a/.github/workflows/cross-repo.yaml +++ b/.github/workflows/cross-repo.yaml @@ -36,7 +36,7 @@ jobs: inputs: | branch_name: ${{ env.BRANCH_NAME }} sauce_labs: true - skip_ftests: false + skip_ftests: true skip_a11y: false skip_unit_tests: false generate_metrics: false diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 36fbbddb1..a1a801276 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -29,7 +29,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: 14 + node-version: 18 registry-url: 'https://packages.nuxeo.com/repository/npm-public/' scope: '@nuxeo' diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 93677aac1..f1ad56f39 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -41,7 +41,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: 14 + node-version: 18 registry-url: 'https://packages.nuxeo.com/repository/npm-public/' scope: '@nuxeo' diff --git a/.github/workflows/preview.yaml b/.github/workflows/preview.yaml index 06e1d919e..de5dc22d7 100644 --- a/.github/workflows/preview.yaml +++ b/.github/workflows/preview.yaml @@ -21,7 +21,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-node@v3 with: - node-version: 14 + node-version: 18 registry-url: 'https://packages.nuxeo.com/repository/npm-public/' scope: '@nuxeo' diff --git a/.github/workflows/promote.yaml b/.github/workflows/promote.yaml index 41c8ed0d6..90b9cf32c 100644 --- a/.github/workflows/promote.yaml +++ b/.github/workflows/promote.yaml @@ -25,7 +25,7 @@ jobs: steps: - uses: actions/setup-node@v3 with: - node-version: 14 + node-version: 18 registry-url: 'https://packages.nuxeo.com/repository/npm-public/' scope: '@nuxeo' diff --git a/.github/workflows/storybook.yaml b/.github/workflows/storybook.yaml index 7e7b36013..c3d8964f3 100644 --- a/.github/workflows/storybook.yaml +++ b/.github/workflows/storybook.yaml @@ -29,7 +29,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: 14 + node-version: 18 registry-url: 'https://packages.nuxeo.com/repository/npm-public/' scope: '@nuxeo' @@ -45,6 +45,8 @@ jobs: - name: Build storybook working-directory: storybook + env: + NODE_OPTIONS: --openssl-legacy-provider run: | npx build-storybook -o dist -s ./public diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 1cf3d0dae..30ad10fbf 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -32,7 +32,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: 14 + node-version: 18 registry-url: 'https://packages.nuxeo.com/repository/npm-public/' scope: '@nuxeo' @@ -47,4 +47,4 @@ jobs: env: SAUCE_USERNAME: nuxeo-elements SAUCE_ACCESS_KEY: ${{ secrets.SAUCE_ACCESS_KEY }} - run: npm run test + run: npm run test \ No newline at end of file diff --git a/karma.conf.js b/karma.conf.js index ddca2e34e..2b79b4629 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -50,6 +50,7 @@ module.exports = (config) => { config.set({ sauceLabs, + hostname: '127.0.0.1', basePath: '', singleRun: true, browsers: config.browsers && config.browsers.length > 0 ? config.browsers : Object.keys(customLaunchers), diff --git a/package.json b/package.json index f3c94a02c..32452d438 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "author": "Nuxeo", "license": "Apache-2.0", "engines": { - "node": ">=14.0.0" + "node": ">=18.0.0" }, "scripts": { "postinstall": "check-engine --ignore", @@ -84,6 +84,7 @@ "dependencies": { "@nuxeo/moment": "^2.24.0-nx.0", "@nuxeo/paper-typeahead": "^0.6.0-nx.0", + "@nuxeo/testing-helpers": "^3.0.17", "@polymer/iron-autogrow-textarea": "^3.0.1", "@polymer/iron-collapse": "^3.0.0", "@polymer/iron-flex-layout": "^3.0.0", From 79fd0bb1e0fbda93d33dc3261b25050399652966 Mon Sep 17 00:00:00 2001 From: poonam yadav Date: Tue, 9 Jan 2024 18:38:14 +0530 Subject: [PATCH 2/3] storybook testing --- .github/workflows/storybook.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/storybook.yaml b/.github/workflows/storybook.yaml index c3d8964f3..1b11c0c67 100644 --- a/.github/workflows/storybook.yaml +++ b/.github/workflows/storybook.yaml @@ -51,6 +51,7 @@ jobs: npx build-storybook -o dist -s ./public - name: Deploy + echo "name is $(env.BRANCH_NAME)" if: ${{ env.BRANCH_NAME == 'maintenance-3.0.x' }} env: GH_TOKEN: ${{ github.actor }}:${{ secrets.GITHUB_TOKEN }} From a46682fa70a18c118898561c80446e45138147ac Mon Sep 17 00:00:00 2001 From: poonam yadav Date: Tue, 9 Jan 2024 19:50:22 +0530 Subject: [PATCH 3/3] update storybook --- .github/workflows/storybook.yaml | 1 - karma.conf.js | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/storybook.yaml b/.github/workflows/storybook.yaml index 1b11c0c67..c3d8964f3 100644 --- a/.github/workflows/storybook.yaml +++ b/.github/workflows/storybook.yaml @@ -51,7 +51,6 @@ jobs: npx build-storybook -o dist -s ./public - name: Deploy - echo "name is $(env.BRANCH_NAME)" if: ${{ env.BRANCH_NAME == 'maintenance-3.0.x' }} env: GH_TOKEN: ${{ github.actor }}:${{ secrets.GITHUB_TOKEN }} diff --git a/karma.conf.js b/karma.conf.js index 2b79b4629..d9afcccb1 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -54,7 +54,7 @@ module.exports = (config) => { basePath: '', singleRun: true, browsers: config.browsers && config.browsers.length > 0 ? config.browsers : Object.keys(customLaunchers), - browserDisconnectTimeout: 10 * 1000, + browserDisconnectTimeout: 10 * 10 * 1000, browserDisconnectTolerance: 1, browserNoActivityTimeout: 5 * 60 * 1000, captureTimeout: 120000, @@ -125,7 +125,7 @@ module.exports = (config) => { mocha: { reporter: 'html', ui: 'tdd', - timeout: 3000, + timeout: 30000, }, chai: { includeStack: true,