diff --git a/ally.js b/ally.js deleted file mode 100644 index cec26d0ebc5..00000000000 --- a/ally.js +++ /dev/null @@ -1,20 +0,0 @@ -module.exports = { - plugins: ['jsx-a11y'], - rules: { - 'jsx-a11y/no-autofocus': 'error', - 'jsx-a11y/role-has-required-aria-props': 'error', - 'jsx-a11y/iframe-has-title': 'error', - 'jsx-a11y/no-noninteractive-tabindex': 'error', - 'jsx-a11y/tabindex-no-positive': 'error', - 'jsx-a11y/no-static-element-interactions': 'error', - 'jsx-a11y/click-events-have-key-events': 'error', - 'jsx-a11y/interactive-supports-focus': 'error', - 'jsx-a11y/alt-text': 'error', - 'jsx-a11y/no-redundant-roles': 'error', - 'jsx-a11y/label-has-associated-control': 'error', - 'jsx-a11y/img-redundant-alt': 'error', - 'jsx-a11y/anchor-is-valid': 'error', - 'jsx-a11y/aria-role': 'error', - 'jsx-a11y/role-supports-aria-props': 'error', - }, -}; diff --git a/apps/ai-content-generator/package-lock.json b/apps/ai-content-generator/package-lock.json index c157026b8b2..ab4ed7d796a 100644 --- a/apps/ai-content-generator/package-lock.json +++ b/apps/ai-content-generator/package-lock.json @@ -35,7 +35,7 @@ "@vitejs/plugin-react": "4.0.4", "@vitest/coverage-v8": "0.34.6", "eslint": "^8.46.0", - "eslint-plugin-jsx-a11y": "^6.9.0", + "@contentful/eslint-plugin-contentful-apps": "^0.1.4", "eslint-plugin-react": "^7.33.1", "eslint-plugin-react-hooks": "^4.6.0", "happy-dom": "6.0.4", diff --git a/apps/ai-content-generator/package.json b/apps/ai-content-generator/package.json index beb685366d6..33c5e0e73e2 100644 --- a/apps/ai-content-generator/package.json +++ b/apps/ai-content-generator/package.json @@ -56,7 +56,7 @@ "@vitejs/plugin-react": "4.0.4", "@vitest/coverage-v8": "0.34.6", "eslint": "^8.46.0", - "eslint-plugin-jsx-a11y": "^6.9.0", + "@contentful/eslint-plugin-contentful-apps": "^0.1.4", "eslint-plugin-react": "^7.33.1", "eslint-plugin-react-hooks": "^4.6.0", "happy-dom": "6.0.4", diff --git a/apps/ai-image-generator/frontend/.eslintrc.js b/apps/ai-image-generator/frontend/.eslintrc.js index 5b2c199a9ac..216d5c46d1c 100644 --- a/apps/ai-image-generator/frontend/.eslintrc.js +++ b/apps/ai-image-generator/frontend/.eslintrc.js @@ -9,14 +9,13 @@ module.exports = { 'plugin:react/recommended', 'plugin:react/jsx-runtime', 'plugin:react-hooks/recommended', - require.resolve('../../../ally.js'), ], parser: '@typescript-eslint/parser', parserOptions: { ecmaVersion: 'latest', sourceType: 'module', }, - plugins: ['@typescript-eslint', 'react'], + plugins: ['@typescript-eslint', 'react', '@contentful/eslint-plugin-contentful-apps'], rules: { 'react/no-unknown-property': ['error', { ignore: ['css'] }], }, diff --git a/apps/aws-amplify/package.json b/apps/aws-amplify/package.json index bc7870773ff..caf7cc20e54 100644 --- a/apps/aws-amplify/package.json +++ b/apps/aws-amplify/package.json @@ -56,7 +56,7 @@ "cross-env": "7.0.3", "esbuild": "^0.23.0", "eslint": "^8.46.0", - "eslint-plugin-jsx-a11y": "^6.9.0", + "@contentful/eslint-plugin-contentful-apps": "^0.1.4", "eslint-plugin-react": "^7.33.1", "eslint-plugin-react-hooks": "^4.6.0", "typescript": "4.9.5" diff --git a/apps/bedrock-content-generator/package-lock.json b/apps/bedrock-content-generator/package-lock.json index 41e8196d035..692ed4ab693 100644 --- a/apps/bedrock-content-generator/package-lock.json +++ b/apps/bedrock-content-generator/package-lock.json @@ -37,7 +37,7 @@ "@vitejs/plugin-react": "4.0.4", "@vitest/coverage-v8": "0.34.6", "eslint": "^8.46.0", - "eslint-plugin-jsx-a11y": "^6.9.0", + "@contentful/eslint-plugin-contentful-apps": "^0.1.4", "eslint-plugin-react": "^7.33.1", "eslint-plugin-react-hooks": "^4.6.0", "happy-dom": "6.0.4", diff --git a/apps/bedrock-content-generator/package.json b/apps/bedrock-content-generator/package.json index bc3063692d3..f84dad46eb2 100644 --- a/apps/bedrock-content-generator/package.json +++ b/apps/bedrock-content-generator/package.json @@ -58,7 +58,7 @@ "@vitejs/plugin-react": "4.0.4", "@vitest/coverage-v8": "0.34.6", "eslint": "^8.46.0", - "eslint-plugin-jsx-a11y": "^6.9.0", + "@contentful/eslint-plugin-contentful-apps": "^0.1.4", "eslint-plugin-react": "^7.33.1", "eslint-plugin-react-hooks": "^4.6.0", "happy-dom": "6.0.4", diff --git a/apps/microsoft-teams/frontend/.eslintrc.js b/apps/microsoft-teams/frontend/.eslintrc.js index bd3cba38ce1..1ce4af7dbd5 100644 --- a/apps/microsoft-teams/frontend/.eslintrc.js +++ b/apps/microsoft-teams/frontend/.eslintrc.js @@ -8,14 +8,13 @@ module.exports = { 'plugin:@typescript-eslint/recommended', 'plugin:react/recommended', 'plugin:react/jsx-runtime', - require.resolve('../../../ally.js'), ], parser: '@typescript-eslint/parser', parserOptions: { ecmaVersion: 'latest', sourceType: 'module', }, - plugins: ['@typescript-eslint', 'react'], + plugins: ['@typescript-eslint', 'react', '@contentful/eslint-plugin-contentful-apps'], rules: {}, settings: { react: { diff --git a/apps/microsoft-teams/frontend/package-lock.json b/apps/microsoft-teams/frontend/package-lock.json index 31006bedb80..58d3a90da6f 100644 --- a/apps/microsoft-teams/frontend/package-lock.json +++ b/apps/microsoft-teams/frontend/package-lock.json @@ -35,7 +35,7 @@ "@vitejs/plugin-react": "4.0.1", "@vitest/coverage-v8": "^0.34.6", "eslint": "^8.52.0", - "eslint-plugin-jsx-a11y": "^6.9.0", + "@contentful/eslint-plugin-contentful-apps": "^0.1.4", "eslint-plugin-react": "^7.33.2", "happy-dom": "9.20.3", "msw": "^2.2.0", diff --git a/apps/microsoft-teams/frontend/package.json b/apps/microsoft-teams/frontend/package.json index a8199a8568c..cae99837a99 100644 --- a/apps/microsoft-teams/frontend/package.json +++ b/apps/microsoft-teams/frontend/package.json @@ -38,7 +38,7 @@ "@vitejs/plugin-react": "4.0.1", "@vitest/coverage-v8": "^0.34.6", "eslint": "^8.52.0", - "eslint-plugin-jsx-a11y": "^6.9.0", + "@contentful/eslint-plugin-contentful-apps": "^0.1.4", "eslint-plugin-react": "^7.33.2", "happy-dom": "9.20.3", "msw": "^2.2.0", diff --git a/apps/mux/frontend/.eslintrc.js b/apps/mux/frontend/.eslintrc.js index 1703b20c3d3..580c9f5c99e 100644 --- a/apps/mux/frontend/.eslintrc.js +++ b/apps/mux/frontend/.eslintrc.js @@ -1,11 +1,7 @@ module.exports = { - extends: [ - 'eslint:recommended', - 'plugin:@typescript-eslint/recommended', - require.resolve('../../../ally.js'), - ], + extends: ['eslint:recommended', 'plugin:@typescript-eslint/recommended'], parser: '@typescript-eslint/parser', - plugins: ['@typescript-eslint'], + plugins: ['@typescript-eslint', '@contentful/eslint-plugin-contentful-apps'], root: true, env: { node: true, diff --git a/apps/slack/frontend/.eslintrc.js b/apps/slack/frontend/.eslintrc.js index 3f775c7cccb..2d818b325c0 100644 --- a/apps/slack/frontend/.eslintrc.js +++ b/apps/slack/frontend/.eslintrc.js @@ -9,7 +9,6 @@ module.exports = { 'plugin:react-hooks/recommended', 'plugin:@typescript-eslint/recommended', 'prettier', - require.resolve('../../../ally.js'), ], parser: '@typescript-eslint/parser', rules: { @@ -30,4 +29,5 @@ module.exports = { version: 'detect', }, }, + plugins: ['@contentful/eslint-plugin-contentful-apps'], }; diff --git a/package.json b/package.json index 8fab352034c..b1b735ef7be 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "prettier": "^2.8.8" }, "scripts": { - "bootstrap": "lerna bootstrap --no-ci --since master --include-dependencies", + "bootstrap": "lerna bootstrap --no-ci --since master", "bootstrap:ci": "lerna bootstrap --ci --concurrency=1 --since=${SINCE:-master} --include-dependencies", "clean": "lerna clean", "lint": "lerna run lint --concurrency=3 --since=${SINCE:-master} --include-dependencies",