diff --git a/change/@fluentui-react-f5fd080f-c867-41c4-be33-6b4e115a92ce.json b/change/@fluentui-react-f5fd080f-c867-41c4-be33-6b4e115a92ce.json new file mode 100644 index 00000000000000..2faf05c530984d --- /dev/null +++ b/change/@fluentui-react-f5fd080f-c867-41c4-be33-6b4e115a92ce.json @@ -0,0 +1,7 @@ +{ + "type": "none", + "comment": "fix: configure e2e target properly in order to make fix affected e2e target execution on ci", + "packageName": "@fluentui/react", + "email": "martinhochel@microsoft.com", + "dependentChangeType": "none" +} diff --git a/change/@fluentui-web-components-6b58d04a-1f48-4aa3-ba16-e2ea9b0201de.json b/change/@fluentui-web-components-6b58d04a-1f48-4aa3-ba16-e2ea9b0201de.json new file mode 100644 index 00000000000000..69403a0430a27e --- /dev/null +++ b/change/@fluentui-web-components-6b58d04a-1f48-4aa3-ba16-e2ea9b0201de.json @@ -0,0 +1,7 @@ +{ + "type": "none", + "comment": "fix: configure e2e target properly in order to make fix affected e2e target execution on ci", + "packageName": "@fluentui/web-components", + "email": "martinhochel@microsoft.com", + "dependentChangeType": "none" +} diff --git a/lage.config.js b/lage.config.js index 45685bfcfe360e..84878a13ac0132 100644 --- a/lage.config.js +++ b/lage.config.js @@ -5,6 +5,7 @@ module.exports = { 'build:info': [], bundle: ['build'], 'bundle-size': ['build'], + 'build-storybook': [], // adding temporary back until import plugin rule is resolved https://github.com/microsoft/fluentui/issues/27727 lint: ['build'], clean: [], @@ -16,6 +17,8 @@ module.exports = { 'update-snapshots': ['^update-snapshots'], '@fluentui/docs#build': ['@fluentui/react-northstar#build:info'], 'verify-packaging': ['build'], + e2e: [], + '@fluentui/web-components#e2e': ['build-storybook'], }, // Adds some ADO-specific logging commands for reporting failures diff --git a/nx.json b/nx.json index 378704959b0587..3999f28c3eaf7d 100644 --- a/nx.json +++ b/nx.json @@ -26,6 +26,11 @@ "inputs": ["production", "^production"], "cache": true }, + "build-storybook": { + "dependsOn": [], + "inputs": ["default", "{workspaceRoot}/.storybook/**", "{projectRoot}/.storybook/**"], + "cache": true + }, "generate-api": { "dependsOn": ["^generate-api"], "cache": true @@ -46,6 +51,11 @@ "test-ssr": { "cache": true }, + "e2e": { + "dependsOn": [], + "cache": true, + "inputs": ["default", "{projectRoot}/cypress.config.ts", "!{projectRoot}/**/?(*.)+cy.[jt]s?(x)?"] + }, "lint": { "dependsOn": ["build"], "cache": true, diff --git a/packages/react/package.json b/packages/react/package.json index 15eae8b5eae183..6272d9619fdb3c 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -22,8 +22,8 @@ "clean": "just-scripts clean", "code-style": "just-scripts code-style", "codepen": "node ../../scripts/executors/src/local-codepen.js", - "e2e": "yarn workspace @fluentui/react-examples cypress run --component", - "e2e:local": "yarn workspace @fluentui/react-examples cypress open --component", + "e2e": "yarn lage e2e --to @fluentui/react-examples --verbose", + "e2e:local": "yarn workspace @fluentui/react-examples e2e:local", "just": "just-scripts", "lint": "just-scripts lint", "start": "cross-env NODE_OPTIONS=--max-old-space-size=3072 just-scripts dev:storybook", diff --git a/packages/web-components/project.json b/packages/web-components/project.json index e8c955cdba2d62..7c6dd1b6f54034 100644 --- a/packages/web-components/project.json +++ b/packages/web-components/project.json @@ -3,5 +3,8 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "projectType": "library", "implicitDependencies": [], - "tags": ["platform:web", "web-components"] + "tags": ["platform:web", "web-components"], + "targets": { + "e2e": { "dependsOn": ["build-storybook"] } + } }