diff --git a/.github/workflows/ci-a11y-vrt-experimental.yml b/.github/workflows/ci-a11y-vrt-experimental.yml
deleted file mode 100644
index 7ae641d77c9..00000000000
--- a/.github/workflows/ci-a11y-vrt-experimental.yml
+++ /dev/null
@@ -1,119 +0,0 @@
-name: Accessibility and Visual Regression Experimental Tests
-
-on:
- push:
- branches:
- - main
- - next
- paths:
- - 'polaris-react/src/**'
- - 'polaris-react/playground/**'
- - 'polaris-react/.storybook/**'
- - 'polaris-tokens/src/**'
- pull_request:
- paths:
- - 'polaris-react/src/**'
- - 'polaris-react/playground/**'
- - 'polaris-react/.storybook/**'
- - 'polaris-tokens/src/**'
-
-jobs:
- accessibility_test:
- name: 'Accessibility test'
- runs-on: ubuntu-latest
- steps:
- - name: Checkout branch
- uses: actions/checkout@v3
-
- - name: Free up space on GitHub image
- run: |
- # Based on the official advice:
- # https://github.com/actions/virtual-environments/issues/2840#issuecomment-790492173
- sudo rm -rf /usr/share/dotnet
- sudo rm -rf /opt/ghc
- sudo rm -rf "/usr/local/share/boost"
- sudo rm -rf "$AGENT_TOOLSDIRECTORY"
-
- - name: Setup Node with v18.12.0
- uses: actions/setup-node@v3
- with:
- node-version: 18.12.0
- cache: yarn
-
- - name: Restore cache
- uses: actions/cache@v3
- with:
- path: |
- **/.turbo
- node_modules/.cache/turbo
- polaris-react/build-internal/cache
- key: ${{ runner.os }}-accessibility-test-experimental-${{ github.sha }}
- restore-keys: |
- ${{ runner.os }}-accessibility-test-experimental-
-
- - name: Install dependencies
- run: yarn --frozen-lockfile
-
- - name: Build packages
- run: yarn build --filter=@shopify/polaris
-
- - name: Build Storybook
- run: STORYBOOK_SE23='on' yarn workspace @shopify/polaris run storybook:build --quiet
-
- - name: Run accessibility test
- run: node ./polaris-react/scripts/accessibility-check.js
- env:
- STORYBOOK_DISABLE_DOCS: 1
-
- visual_regression_test:
- name: 'Visual regression test'
- runs-on: ubuntu-latest
- steps:
- - name: Checkout branch
- uses: actions/checkout@v3
- with:
- fetch-depth: 0 # Chromatic git history to track changes
-
- - name: Setup Node with v18.12.0
- uses: actions/setup-node@v3
- with:
- node-version: 18.12.0
- cache: yarn
-
- - name: Restore cache
- uses: actions/cache@v3
- with:
- path: |
- **/.turbo
- node_modules/.cache/turbo
- polaris-react/build-internal/cache
- key: ${{ runner.os }}-visual-regression-test-experimental-${{ github.sha }}
- restore-keys: |
- ${{ runner.os }}-visual-regression-test-experimental-
-
- - name: Install dependencies
- run: yarn --frozen-lockfile
-
- - name: Build packages
- run: yarn build --filter=@shopify/polaris
-
- - name: Build Storybook
- run: yarn workspace @shopify/polaris run storybook:build --quiet
- env:
- STORYBOOK_GITHUB_SHA: ${{ github.sha }}
- STORYBOOK_GITHUB_REPO_URL: ${{ github.server_url }}/${{ github.repository }}
- STORYBOOK_GITHUB_PR: ${{ github.event.number }}
-
- - name: Run Chromatic tests
- uses: chromaui/action@v1
- with:
- token: ${{ secrets.GITHUB_TOKEN }}
- projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
- autoAcceptChanges: 'main'
- storybookBuildDir: 'polaris-react/build-internal/storybook/static'
- exitZeroOnChanges: true
- exitOnceUploaded: true
- env:
- STORYBOOK_GITHUB_SHA: ${{ github.sha }}
- STORYBOOK_GITHUB_REPO_URL: ${{ github.server_url }}/${{ github.repository }}
- STORYBOOK_GITHUB_PR: ${{ github.event.number }}
diff --git a/.github/workflows/ci-a11y-vrt.yml b/.github/workflows/ci-a11y-vrt.yml
index f4138b811a8..62e056b6dcf 100644
--- a/.github/workflows/ci-a11y-vrt.yml
+++ b/.github/workflows/ci-a11y-vrt.yml
@@ -8,11 +8,13 @@ on:
paths:
- 'polaris-react/src/**'
- 'polaris-react/playground/**'
+ - 'polaris-react/.storybook/**'
- 'polaris-tokens/src/**'
pull_request:
paths:
- 'polaris-react/src/**'
- 'polaris-react/playground/**'
+ - 'polaris-react/.storybook/**'
- 'polaris-tokens/src/**'
jobs:
@@ -45,9 +47,9 @@ jobs:
**/.turbo
node_modules/.cache/turbo
polaris-react/build-internal/cache
- key: ${{ runner.os }}-accessibility-test-v1-${{ github.sha }}
+ key: ${{ runner.os }}-accessibility-test-v2-${{ github.sha }}
restore-keys: |
- ${{ runner.os }}-accessibility-test-v1-
+ ${{ runner.os }}-accessibility-test-v2-
- name: Install dependencies
run: yarn --frozen-lockfile
@@ -85,9 +87,9 @@ jobs:
**/.turbo
node_modules/.cache/turbo
polaris-react/build-internal/cache
- key: ${{ runner.os }}-visual-regression-test-v1-${{ github.sha }}
+ key: ${{ runner.os }}-visual-regression-test-v2-${{ github.sha }}
restore-keys: |
- ${{ runner.os }}-visual-regression-test-v1-
+ ${{ runner.os }}-visual-regression-test-v2-
- name: Install dependencies
run: yarn --frozen-lockfile
diff --git a/polaris-react/.storybook/manager.js b/polaris-react/.storybook/manager.js
index 2cd722c71bd..cb27b74c2ba 100644
--- a/polaris-react/.storybook/manager.js
+++ b/polaris-react/.storybook/manager.js
@@ -71,20 +71,7 @@ addons.register('polaris/global-controls', () => {
});
});
-export const featureFlagOptions = {
- polarisSummerEditions2023: {
- name: 'polarisSummerEditions2023',
- description: 'Toggle the summer editions feature flag',
- defaultValue: true,
- control: {type: 'boolean'},
- },
- polarisSummerEditions2023ShadowBevelOptOut: {
- name: 'polarisSummerEditions2023ShadowBevelOptOut',
- description: 'Toggle the shadow-bevel opt out feature flag',
- defaultValue: false,
- control: {type: 'boolean'},
- },
-};
+export const featureFlagOptions = {};
export const gridOptions = {
showGrid: {
diff --git a/polaris-react/.storybook/preview.js b/polaris-react/.storybook/preview.js
index d6469c3aa1b..3b9bd1ced31 100644
--- a/polaris-react/.storybook/preview.js
+++ b/polaris-react/.storybook/preview.js
@@ -25,21 +25,12 @@ function AppProviderDecorator(Story, context) {
document.getElementById('inter-font-link').removeAttribute('href');
}
- const {
- polarisSummerEditions2023,
- polarisSummerEditions2023ShadowBevelOptOut,
- } = context.globals;
-
if (context.args.omitAppProvider) return ;
return (