diff --git a/.circleci/config.yml b/.circleci/config.yml index 5082db950b20..b212c825ddc2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -43,7 +43,7 @@ executors: default: "small" working_directory: /tmp/storybook docker: - - image: mcr.microsoft.com/playwright:v1.41.1-jammy + - image: mcr.microsoft.com/playwright:v1.36.0-focal environment: NODE_OPTIONS: --max_old_space_size=6144 resource_class: <> @@ -359,19 +359,6 @@ jobs: clone_options: "--depth 1 --verbose" - attach_workspace: at: . - - run: - name: Swap node versions - command: | - set +e - wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.1/install.sh | bash - export NVM_DIR="$HOME/.nvm" - [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" - [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" - nvm install v18.14.0 - nvm alias default 18.14.0 - - echo 'export NVM_DIR="$HOME/.nvm"' >> $BASH_ENV - echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"' >> $BASH_ENV - run: name: Running Test Runner command: yarn task --task test-runner --template $(yarn get-template --cadence << pipeline.parameters.workflow >> --task test-runner) --no-link --start-from=never --junit @@ -392,19 +379,6 @@ jobs: clone_options: "--depth 1 --verbose" - attach_workspace: at: . - - run: - name: Swap node versions - command: | - set +e - wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.1/install.sh | bash - export NVM_DIR="$HOME/.nvm" - [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" - [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" - nvm install v18.14.0 - nvm alias default 18.14.0 - - echo 'export NVM_DIR="$HOME/.nvm"' >> $BASH_ENV - echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"' >> $BASH_ENV - run: name: Running Test Runner in Dev mode command: yarn task --task test-runner-dev --template $(yarn get-template --cadence << pipeline.parameters.workflow >> --task test-runner-dev) --no-link --start-from=never --junit @@ -444,19 +418,6 @@ jobs: clone_options: "--depth 1 --verbose" - attach_workspace: at: . - - run: - name: Swap node versions - command: | - set +e - wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.1/install.sh | bash - export NVM_DIR="$HOME/.nvm" - [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" - [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" - nvm install v18.14.0 - nvm alias default 18.14.0 - - echo 'export NVM_DIR="$HOME/.nvm"' >> $BASH_ENV - echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"' >> $BASH_ENV - run: name: Running E2E Tests command: yarn task --task e2e-tests --template $(yarn get-template --cadence << pipeline.parameters.workflow >> --task e2e-tests) --no-link --start-from=never --junit @@ -480,19 +441,6 @@ jobs: clone_options: "--depth 1 --verbose" - attach_workspace: at: . - - run: - name: Swap node versions - command: | - set +e - wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.1/install.sh | bash - export NVM_DIR="$HOME/.nvm" - [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" - [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" - nvm install v18.14.0 - nvm alias default 18.14.0 - - echo 'export NVM_DIR="$HOME/.nvm"' >> $BASH_ENV - echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"' >> $BASH_ENV - run: name: Running E2E Tests command: yarn task --task e2e-tests-dev --template $(yarn get-template --cadence << pipeline.parameters.workflow >> --task e2e-tests-dev) --no-link --start-from=never --junit @@ -516,19 +464,6 @@ jobs: clone_options: "--depth 1 --verbose" - attach_workspace: at: . - - run: - name: Swap node versions - command: | - set +e - wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.1/install.sh | bash - export NVM_DIR="$HOME/.nvm" - [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" - [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" - nvm install v18.14.0 - nvm alias default 18.14.0 - - echo 'export NVM_DIR="$HOME/.nvm"' >> $BASH_ENV - echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"' >> $BASH_ENV - run: name: Running Bench command: yarn task --task bench --template $(yarn get-template --cadence << pipeline.parameters.workflow >> --task bench) --no-link --start-from=never --junit diff --git a/code/package.json b/code/package.json index e813ddf3ae86..415410b1cdff 100644 --- a/code/package.json +++ b/code/package.json @@ -76,18 +76,18 @@ "defaults" ], "resolutions": { - "@playwright/test": "1.41.1", + "@playwright/test": "1.36.0", "@storybook/theming": "workspace:*", "@vitest/expect@1.1.3": "patch:@vitest/expect@npm%3A1.1.3#~/.yarn/patches/@vitest-expect-npm-1.1.3-2062bf533f.patch", "esbuild": "^0.18.0", - "playwright": "1.41.1", - "playwright-core": "1.41.1", + "playwright": "1.36.0", + "playwright-core": "1.36.0", "serialize-javascript": "^3.1.0", "type-fest": "~2.19" }, "dependencies": { "@nx/workspace": "17.0.2", - "@playwright/test": "1.41.1", + "@playwright/test": "1.36.0", "@storybook/addon-a11y": "workspace:*", "@storybook/addon-actions": "workspace:*", "@storybook/addon-backgrounds": "workspace:*", diff --git a/code/yarn.lock b/code/yarn.lock index 135de6c3f84e..3eb52a8fc859 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -4238,14 +4238,19 @@ __metadata: languageName: node linkType: hard -"@playwright/test@npm:1.41.1": - version: 1.41.1 - resolution: "@playwright/test@npm:1.41.1" +"@playwright/test@npm:1.36.0": + version: 1.36.0 + resolution: "@playwright/test@npm:1.36.0" dependencies: - playwright: "npm:1.41.1" + "@types/node": "npm:*" + fsevents: "npm:2.3.2" + playwright-core: "npm:1.36.0" + dependenciesMeta: + fsevents: + optional: true bin: playwright: cli.js - checksum: 72bd5bb67c512027d214b9c54c2a22a469bd19d7809771e53a5bfdcc11330591e01579bb22f807d1ebbcdcea35d625e0fc9eb9791cebcc63bf55b82dd1cdefdd + checksum: 9d06764f55ae10569981d518838d588d820678a4e6a8a1bbfab78b7b4b4245cf055e94a0dea90fe2ecf1ce4559d06e02986757270e7c54a52d0bdf1963cb03e6 languageName: node linkType: hard @@ -6311,7 +6316,7 @@ __metadata: dependencies: "@chromaui/addon-visual-tests": "npm:^0.0.124" "@nx/workspace": "npm:17.0.2" - "@playwright/test": "npm:1.41.1" + "@playwright/test": "npm:1.36.0" "@storybook/addon-a11y": "workspace:*" "@storybook/addon-actions": "workspace:*" "@storybook/addon-backgrounds": "workspace:*" @@ -22917,27 +22922,23 @@ __metadata: languageName: node linkType: hard -"playwright-core@npm:1.41.1": - version: 1.41.1 - resolution: "playwright-core@npm:1.41.1" +"playwright-core@npm:1.36.0": + version: 1.36.0 + resolution: "playwright-core@npm:1.36.0" bin: playwright-core: cli.js - checksum: cdd91267ca23e3f65d519100e956859c70e3e9ca29e3fe00e700b457903129e41dfa17752f1ea37ad0a8a7c6330baf9f3be503e4cbfa3e8833e80a037f899aee + checksum: 5b5d32495e222ddd4351d1d8b116a25a7d93ea5f3439dceaceeb916d0abdce6d5b0b84f80df0b239168d55a100e7aecc9db4774ff20ba0210d8de027f258b544 languageName: node linkType: hard -"playwright@npm:1.41.1": - version: 1.41.1 - resolution: "playwright@npm:1.41.1" +"playwright@npm:1.36.0": + version: 1.36.0 + resolution: "playwright@npm:1.36.0" dependencies: - fsevents: "npm:2.3.2" - playwright-core: "npm:1.41.1" - dependenciesMeta: - fsevents: - optional: true + playwright-core: "npm:1.36.0" bin: playwright: cli.js - checksum: 32d48c1f8ff881770a19c9245fb4191fc36b5e97ab5f48effa0b1cf5e83fa958f6fdd7e4268dd984aa306ac5fe9e4324510211910751fb52cebb9bae819d13ca + checksum: dc39eb6271b22901cb6219a8ecdd44736169edd789d2a8be5885ded5414ee2a9e2c73a19e24d55336ddbae6f9d69522b46f1fe92998740745f1cb78d58b6cb6e languageName: node linkType: hard diff --git a/scripts/package.json b/scripts/package.json index da6aa2f41c2c..1d150aca19df 100644 --- a/scripts/package.json +++ b/scripts/package.json @@ -149,8 +149,8 @@ "ora": "^5.4.1", "p-limit": "^3.1.0", "p-retry": "^5.1.2", - "playwright": "1.41.1", - "playwright-core": "1.41.1", + "playwright": "1.36.0", + "playwright-core": "1.36.0", "prettier": "^3.1.1", "pretty-bytes": "^6.1.0", "pretty-hrtime": "^1.0.0", diff --git a/scripts/utils/yarn.ts b/scripts/utils/yarn.ts index 919e380f119c..a2fb82e1fa6a 100644 --- a/scripts/utils/yarn.ts +++ b/scripts/utils/yarn.ts @@ -25,9 +25,9 @@ export const addPackageResolutions = async ({ cwd, dryRun }: YarnOptions) => { ...storybookVersions, 'enhanced-resolve': '~5.10.0', // TODO, remove this // this is for our CI test, ensure we use the same version as docker image, it should match version specified in `./code/package.json` and `.circleci/config.yml` - playwright: '1.41.1', - 'playwright-core': '1.41.1', - '@playwright/test': '1.41.1', + playwright: '1.36.0', + 'playwright-core': '1.36.0', + '@playwright/test': '1.36.0', }; await writeJSON(packageJsonPath, packageJson, { spaces: 2 }); }; diff --git a/scripts/yarn.lock b/scripts/yarn.lock index 22f0f9ce9da2..f846c07ffb0e 100644 --- a/scripts/yarn.lock +++ b/scripts/yarn.lock @@ -2789,8 +2789,8 @@ __metadata: ora: "npm:^5.4.1" p-limit: "npm:^3.1.0" p-retry: "npm:^5.1.2" - playwright: "npm:1.41.1" - playwright-core: "npm:1.41.1" + playwright: "npm:1.36.0" + playwright-core: "npm:1.36.0" prettier: "npm:^3.1.1" pretty-bytes: "npm:^6.1.0" pretty-hrtime: "npm:^1.0.0" @@ -7672,16 +7672,6 @@ __metadata: languageName: node linkType: hard -"fsevents@npm:2.3.2": - version: 2.3.2 - resolution: "fsevents@npm:2.3.2" - dependencies: - node-gyp: "npm:latest" - checksum: be78a3efa3e181cda3cf7a4637cb527bcebb0bd0ea0440105a3bb45b86f9245b307dc10a2507e8f4498a7d4ec349d1910f4d73e4d4495b16103106e07eee735b - conditions: os=darwin - languageName: node - linkType: hard - "fsevents@npm:~2.3.2, fsevents@npm:~2.3.3": version: 2.3.3 resolution: "fsevents@npm:2.3.3" @@ -7692,15 +7682,6 @@ __metadata: languageName: node linkType: hard -"fsevents@patch:fsevents@npm%3A2.3.2#optional!builtin": - version: 2.3.2 - resolution: "fsevents@patch:fsevents@npm%3A2.3.2#optional!builtin::version=2.3.2&hash=df0bf1" - dependencies: - node-gyp: "npm:latest" - conditions: os=darwin - languageName: node - linkType: hard - "fsevents@patch:fsevents@npm%3A~2.3.2#optional!builtin, fsevents@patch:fsevents@npm%3A~2.3.3#optional!builtin": version: 2.3.3 resolution: "fsevents@patch:fsevents@npm%3A2.3.3#optional!builtin::version=2.3.3&hash=df0bf1" @@ -12258,27 +12239,23 @@ __metadata: languageName: node linkType: hard -"playwright-core@npm:1.41.1": - version: 1.41.1 - resolution: "playwright-core@npm:1.41.1" +"playwright-core@npm:1.36.0": + version: 1.36.0 + resolution: "playwright-core@npm:1.36.0" bin: playwright-core: cli.js - checksum: cdd91267ca23e3f65d519100e956859c70e3e9ca29e3fe00e700b457903129e41dfa17752f1ea37ad0a8a7c6330baf9f3be503e4cbfa3e8833e80a037f899aee + checksum: 5b5d32495e222ddd4351d1d8b116a25a7d93ea5f3439dceaceeb916d0abdce6d5b0b84f80df0b239168d55a100e7aecc9db4774ff20ba0210d8de027f258b544 languageName: node linkType: hard -"playwright@npm:1.41.1": - version: 1.41.1 - resolution: "playwright@npm:1.41.1" +"playwright@npm:1.36.0": + version: 1.36.0 + resolution: "playwright@npm:1.36.0" dependencies: - fsevents: "npm:2.3.2" - playwright-core: "npm:1.41.1" - dependenciesMeta: - fsevents: - optional: true + playwright-core: "npm:1.36.0" bin: playwright: cli.js - checksum: 32d48c1f8ff881770a19c9245fb4191fc36b5e97ab5f48effa0b1cf5e83fa958f6fdd7e4268dd984aa306ac5fe9e4324510211910751fb52cebb9bae819d13ca + checksum: dc39eb6271b22901cb6219a8ecdd44736169edd789d2a8be5885ded5414ee2a9e2c73a19e24d55336ddbae6f9d69522b46f1fe92998740745f1cb78d58b6cb6e languageName: node linkType: hard