From 17e026fa9d610c8df485530122a0619f8b9504fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Maisse?= Date: Mon, 12 Jul 2021 20:49:55 +0200 Subject: [PATCH 1/4] chore: fix Verdaccio config for addon-measure --- scripts/verdaccio.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/scripts/verdaccio.yaml b/scripts/verdaccio.yaml index 995aa3734305..6beeb4654648 100644 --- a/scripts/verdaccio.yaml +++ b/scripts/verdaccio.yaml @@ -59,10 +59,6 @@ packages: access: $all publish: $all proxy: npmjs - '@storybook/addon-measure': - access: $all - publish: $all - proxy: npmjs # storybook packages are NOT proxied to global registry # allowing us to republish any version during tests From 983ce9c41040213b0f6da31eea7b4d9a9b5e50e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Maisse?= Date: Mon, 12 Jul 2021 21:38:33 +0200 Subject: [PATCH 2/4] chore: improve the way Cypress records are handled as CircleCI artefacts --- .circleci/config.yml | 8 ++++---- scripts/run-e2e.ts | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b5259168ea40..445608a1fc38 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -198,7 +198,7 @@ jobs: command: yarn test:e2e-framework --clean --all --skip angular11 --skip angular --skip vue3 --skip web_components_typescript --skip cra no_output_timeout: 5m - store_artifacts: - path: /tmp/storybook/cypress + path: /tmp/cypress-record destination: cypress e2e-tests-core: executor: @@ -224,7 +224,7 @@ jobs: command: yarn test:e2e-framework vue3 angular angular11 web_components_typescript web_components_lit2 no_output_timeout: 5m - store_artifacts: - path: /tmp/storybook/cypress + path: /tmp/cypress-record destination: cypress cra-bench: executor: @@ -271,7 +271,7 @@ jobs: name: run e2e tests command: yarn test:e2e-framework --pnp sfcVue cra - store_artifacts: - path: /tmp/storybook/cypress + path: /tmp/cypress-record destination: cypress e2e-tests-examples: executor: @@ -293,7 +293,7 @@ jobs: name: cypress run command: yarn test:e2e-examples - store_artifacts: - path: /tmp/storybook/cypress + path: /tmp/cypress-record destination: cypress smoke-tests: executor: diff --git a/scripts/run-e2e.ts b/scripts/run-e2e.ts index 1148b68e1682..ad69a4917573 100644 --- a/scripts/run-e2e.ts +++ b/scripts/run-e2e.ts @@ -53,10 +53,10 @@ const serveStorybook = async ({ cwd }: Options, port: string) => { return serve(staticDirectory, port); }; -const runCypress = async (location: string) => { +const runCypress = async (location: string, name: string) => { const cypressCommand = openCypressInUIMode ? 'open' : 'run'; await exec( - `yarn cypress ${cypressCommand} --config pageLoadTimeout=4000,execTimeout=4000,taskTimeout=4000,responseTimeout=4000,integrationFolder="cypress/generated" --env location="${location}"`, + `yarn cypress ${cypressCommand} --config pageLoadTimeout=4000,execTimeout=4000,taskTimeout=4000,responseTimeout=4000,defaultCommandTimeout=4000,integrationFolder="cypress/generated",videosFolder="/tmp/cypress-record/${name}" --env location="${location}"`, { cwd: rootDir }, { startMessage: `🤖 Running Cypress tests`, @@ -115,7 +115,7 @@ const runTests = async ({ name, ...rest }: Parameters) => { logger.log(); try { - await runCypress('http://localhost:4000'); + await runCypress('http://localhost:4000', name); logger.info(`🎉 Storybook is working great with ${name}!`); } catch (e) { logger.info(`🥺 Storybook has some issues with ${name}!`); From ff483f6028a376a391613a7f4b4b785531679782 Mon Sep 17 00:00:00 2001 From: Yann Braga Date: Mon, 12 Jul 2021 23:12:23 +0200 Subject: [PATCH 3/4] fix(angular): extract type from compodoc propertiesClass - An update has been released in compodoc 1.1.12 which changed how the componentData is filled. Now the propertiesClass is filled together with inputClass so the check has to be updated --- addons/docs/src/frameworks/angular/compodoc.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/docs/src/frameworks/angular/compodoc.ts b/addons/docs/src/frameworks/angular/compodoc.ts index 08f8edd0ca62..d4de090bc0b2 100644 --- a/addons/docs/src/frameworks/angular/compodoc.ts +++ b/addons/docs/src/frameworks/angular/compodoc.ts @@ -190,7 +190,7 @@ export const extractArgTypesFromData = (componentData: Class | Directive | Injec const section = mapItemToSection(key, item); const defaultValue = isMethod(item) ? undefined : extractDefaultValue(item as Property); const type = - isMethod(item) || section !== 'inputs' + isMethod(item) || (section !== 'inputs' && section !== 'properties') ? { name: 'void' } : extractType(item as Property, defaultValue); const action = section === 'outputs' ? { action: item.name } : {}; From c3ea5c7de1312ca89a53cee0dd03643db13d17c6 Mon Sep 17 00:00:00 2001 From: Yann Braga Date: Mon, 12 Jul 2021 23:48:16 +0200 Subject: [PATCH 4/4] fix(angular): update argTypes test snapshots - following the changes of ff483f6028a --- .../angular/__testfixtures__/doc-button/argtypes.snapshot | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/docs/src/frameworks/angular/__testfixtures__/doc-button/argtypes.snapshot b/addons/docs/src/frameworks/angular/__testfixtures__/doc-button/argtypes.snapshot index 70866177760b..19fcc9ec96f7 100644 --- a/addons/docs/src/frameworks/angular/__testfixtures__/doc-button/argtypes.snapshot +++ b/addons/docs/src/frameworks/angular/__testfixtures__/doc-button/argtypes.snapshot @@ -14,7 +14,7 @@ Object { }, }, "type": Object { - "name": "void", + "name": "string", }, }, "_value": Object { @@ -30,7 +30,7 @@ Object { }, }, "type": Object { - "name": "void", + "name": "string", }, }, "accent": Object { @@ -129,7 +129,7 @@ Object { }, }, "type": Object { - "name": "void", + "name": "string", }, }, "isDisabled": Object { @@ -225,7 +225,7 @@ Object { }, }, "type": Object { - "name": "void", + "name": "object", }, }, "protectedMethod": Object {