Skip to content

Commit 63b1a95

Browse files
chore: delete ui-components package (#23950)
* chore: delete ui-components package * add dependency to frontend-shared that was previously provided by ui-components * whoops * fix deps
1 parent bf590eb commit 63b1a95

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+78
-2054
lines changed

.circleci/config.yml

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1732,26 +1732,6 @@ jobs:
17321732
path: /tmp/artifacts
17331733
- store-npm-logs
17341734

1735-
ui-components-integration-tests:
1736-
<<: *defaults
1737-
steps:
1738-
- restore_cached_workspace
1739-
- run:
1740-
command: yarn build-for-tests
1741-
working_directory: packages/ui-components
1742-
- run:
1743-
command: |
1744-
CYPRESS_KONFIG_ENV=production \
1745-
CYPRESS_RECORD_KEY=$MAIN_RECORD_KEY \
1746-
yarn cypress:run --record --parallel --group ui-components
1747-
working_directory: packages/ui-components
1748-
- verify-mocha-results
1749-
- store_test_results:
1750-
path: /tmp/cypress
1751-
- store_artifacts:
1752-
path: /tmp/artifacts
1753-
- store-npm-logs
1754-
17551735
npm-webpack-preprocessor:
17561736
<<: *defaults
17571737
steps:
@@ -2502,10 +2482,6 @@ linux-x64-workflow: &linux-x64-workflow
25022482
context: [test-runner:cypress-record-key, test-runner:percy]
25032483
requires:
25042484
- build
2505-
- ui-components-integration-tests:
2506-
context: test-runner:cypress-record-key
2507-
requires:
2508-
- build
25092485
- npm-webpack-dev-server:
25102486
requires:
25112487
- system-tests-node-modules-install
@@ -2577,7 +2553,6 @@ linux-x64-workflow: &linux-x64-workflow
25772553
- server-integration-tests
25782554
- server-unit-tests
25792555
- test-kitchensink
2580-
- ui-components-integration-tests
25812556
- unit-tests
25822557
- unit-tests-release
25832558
- cli-visual-tests

npm/vite-dev-server/cypress/support/e2e.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
1414
// ***********************************************************
1515

1616
// Import commands.js using ES2015 syntax:
17-
import '@packages/frontend-shared/cypress/e2e/support/e2eSupport'
17+
import '@packages/frontend-shared/cypress/support/e2e'
1818
import './commands'

npm/webpack-dev-server/cypress/support/e2e.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
1414
// ***********************************************************
1515

1616
// Import commands.js using ES2015 syntax:
17-
import '@packages/frontend-shared/cypress/e2e/support/e2eSupport'
17+
import '@packages/frontend-shared/cypress/support/e2e'
1818
import './commands'

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
"test-scripts": "mocha -r packages/ts/register --reporter spec 'scripts/unit/**/*spec.js'",
6060
"test-scripts-watch": "yarn test-scripts --watch --watch-extensions 'ts,js'",
6161
"pretest-unit": "yarn ensure-deps",
62-
"test-unit": "lerna exec yarn test-unit --ignore \"'{@packages/{driver,root,static,web-config,net-stubbing,rewriter,ui-components},@cypress/{webpack-dev-server,eslint-plugin-dev}}'\"",
62+
"test-unit": "lerna exec yarn test-unit --ignore \"'{@packages/{driver,root,static,web-config,net-stubbing,rewriter},@cypress/{webpack-dev-server,eslint-plugin-dev}}'\"",
6363
"pretest-watch": "yarn ensure-deps",
6464
"test-watch": "lerna exec yarn test-watch --ignore \"'@packages/{driver,root,static,web-config}'\"",
6565
"type-check": "yarn lerna exec yarn type-check --scope @tooling/system-tests && node scripts/type_check",
@@ -90,7 +90,6 @@
9090
"@octokit/auth-app": "3.6.1",
9191
"@octokit/core": "3.6.0",
9292
"@percy/cli": "1.2.0",
93-
"@percy/cypress": "^3.1.1",
9493
"@semantic-release/changelog": "5.0.1",
9594
"@semantic-release/git": "9.0.0",
9695
"@types/bluebird": "3.5.29",

packages/app/cypress.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export default defineConfig({
3030
'just-my-luck',
3131
'combine-properties',
3232
'faker',
33-
'@packages/ui-components/cypress/support/customPercyCommand',
33+
'@packages/frontend-shared/cypress/support/customPercyCommand',
3434
],
3535
},
3636
},

packages/app/cypress/component/support/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import { setActivePinia } from 'pinia'
2727
import type { Pinia } from 'pinia'
2828
import 'cypress-real-events/support'
2929

30-
import { installCustomPercyCommand } from '@packages/ui-components/cypress/support/customPercyCommand'
30+
import { installCustomPercyCommand } from '@packages/frontend-shared/cypress/support/customPercyCommand'
3131

3232
let pinia: Pinia
3333

packages/app/cypress/e2e/support/e2eSupport.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import '@packages/frontend-shared/cypress/e2e/support/e2eSupport'
1+
import '@packages/frontend-shared/cypress/support/e2e'
22
import 'cypress-real-events/support'
33
import './execute-spec'
44

packages/frontend-shared/cypress.config.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,13 @@ export default defineConfig({
2020
viteConfig: {
2121
optimizeDeps: {
2222
include: [
23-
'@packages/ui-components/cypress/support/customPercyCommand',
23+
'cypress/support/customPercyCommand',
2424
],
2525
},
2626
},
2727
},
2828
},
2929
e2e: {
3030
baseUrl: 'http://localhost:5555',
31-
supportFile: 'cypress/e2e/support/e2eSupport.ts',
3231
},
3332
})

packages/frontend-shared/cypress/e2e/e2ePluginSetup.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import path from 'path'
22
import execa from 'execa'
33

4-
import type { CyTaskResult, OpenGlobalModeOptions, RemoteGraphQLInterceptor, ResetOptionsResult, WithCtxInjected, WithCtxOptions } from './support/e2eSupport'
4+
import type { CyTaskResult, OpenGlobalModeOptions, RemoteGraphQLInterceptor, ResetOptionsResult, WithCtxInjected, WithCtxOptions } from '../support/e2e'
55
import { fixtureDirs } from '@tooling/system-tests'
66
// import type { CloudExecuteRemote } from '@packages/data-context/src/sources'
77
import { makeGraphQLServer } from '@packages/graphql/src/makeGraphQLServer'

packages/frontend-shared/cypress/fixtures/config.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@
213213
"field": "scrollBehavior"
214214
},
215215
{
216-
"value": "cypress/e2e/support/e2eSupport.ts",
216+
"value": "cypress/support/e2e.ts",
217217
"from": "config",
218218
"field": "supportFile"
219219
},
@@ -290,7 +290,7 @@
290290
"just-my-luck",
291291
"combine-properties",
292292
"faker",
293-
"@packages/ui-components/cypress/support/customPercyCommand"
293+
"cypress/support/customPercyCommand"
294294
]
295295
}
296296
}

packages/frontend-shared/cypress/support/component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { registerMountFn, addVueCommand } from './common'
33
import '../../src/styles/shared.scss'
44
import 'virtual:windi.css'
55
import 'cypress-real-events/support'
6-
import { installCustomPercyCommand } from '@packages/ui-components/cypress/support/customPercyCommand'
6+
import { installCustomPercyCommand } from './customPercyCommand'
77
import { addNetworkCommands } from './onlineNetwork'
88
import { GQLStubRegistry } from './mock-graphql/stubgql-Registry'
99

packages/frontend-shared/cypress/e2e/support/e2eSupport.ts renamed to packages/frontend-shared/cypress/support/e2e.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
import '@testing-library/cypress/add-commands'
22
import { browsers } from '@packages/launcher/lib/browsers'
3-
import { installCustomPercyCommand } from '@packages/ui-components/cypress/support/customPercyCommand'
43
import { configure } from '@testing-library/cypress'
5-
import i18n from '../../../src/locales/en-US.json'
6-
import { addNetworkCommands } from '../../support/onlineNetwork'
74
import { fixtureDirs, ProjectFixtureDir } from '@tooling/system-tests'
8-
95
import type { DataContext } from '@packages/data-context'
106
import type { AuthenticatedUserShape } from '@packages/data-context/src/data'
117
import type { DocumentNode, ExecutionResult } from 'graphql'
128
import type { Browser, FoundBrowser, OpenModeOptions } from '@packages/types'
13-
import type { E2ETaskMap } from '../e2ePluginSetup'
9+
1410
import type { SinonStub } from 'sinon'
1511
import type sinon from 'sinon'
1612
import type pDefer from 'p-defer'
1713
import 'cypress-plugin-tab'
1814
import type { Response } from 'cross-fetch'
1915

16+
import type { E2ETaskMap } from '../e2e/e2ePluginSetup'
17+
import { installCustomPercyCommand } from './customPercyCommand'
18+
import i18n from '../../src/locales/en-US.json'
19+
import { addNetworkCommands } from './onlineNetwork'
20+
2021
configure({ testIdAttribute: 'data-cy' })
2122

2223
const NO_TIMEOUT = 1000 * 1000

packages/frontend-shared/package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"@iconify/json": "1.1.368",
2626
"@iconify/vue": "3.0.0-beta.1",
2727
"@intlify/vite-plugin-vue-i18n": "2.4.0",
28+
"@percy/core": "^1.0.0-beta.48",
2829
"@percy/cypress": "^3.1.0",
2930
"@testing-library/cypress": "8.0.0",
3031
"@toycode/markdown-it-class": "1.2.3",
@@ -40,6 +41,7 @@
4041
"@vue/compiler-sfc": "3.2.31",
4142
"@vueuse/core": "7.2.2",
4243
"axe-core": "4.4.1",
44+
"browser-logos": "github:alrra/browser-logos",
4345
"combine-properties": "0.1.0",
4446
"cross-env": "6.0.3",
4547
"cypress-axe": "0.14.0",

packages/frontend-shared/src/assets/browserLogos.ts

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
import chromeIcon from '../../../../node_modules/browser-logos/src/chrome/chrome.svg?url'
2-
import firefoxIcon from '../../../../node_modules/browser-logos/src/firefox/firefox.svg?url'
3-
import edgeIcon from '../../../../node_modules/browser-logos/src/edge/edge.svg?url'
4-
import electronIcon from '../../../../node_modules/browser-logos/src/electron/electron.svg?url'
5-
import canaryIcon from '../../../../node_modules/browser-logos/src/chrome-canary/chrome-canary.svg?url'
6-
import chromeBetaIcon from '../../../../node_modules/browser-logos/src/chrome-beta/chrome-beta.svg?url'
7-
import chromiumIcon from '../../../../node_modules/browser-logos/src/chromium/chromium.svg?url'
8-
import edgeBetaIcon from '../../../../node_modules/browser-logos/src/edge-beta/edge-beta.png'
9-
import edgeCanaryIcon from '../../../../node_modules/browser-logos/src/edge-canary/edge-canary.png'
10-
import edgeDevIcon from '../../../../node_modules/browser-logos/src/edge-dev/edge-dev.png'
11-
import firefoxNightlyIcon from '../../../../node_modules/browser-logos/src/firefox-nightly/firefox-nightly.svg?url'
12-
import firefoxDeveloperEditionIcon from '../../../../node_modules/browser-logos/src/firefox-developer-edition/firefox-developer-edition.svg?url'
13-
import webKitIcon from '../../../../node_modules/browser-logos/src/webkit/webkit.svg?url'
1+
import chromeIcon from 'browser-logos/src/chrome/chrome.svg?url'
2+
import firefoxIcon from 'browser-logos/src/firefox/firefox.svg?url'
3+
import edgeIcon from 'browser-logos/src/edge/edge.svg?url'
4+
import electronIcon from 'browser-logos/src/electron/electron.svg?url'
5+
import canaryIcon from 'browser-logos/src/chrome-canary/chrome-canary.svg?url'
6+
import chromeBetaIcon from 'browser-logos/src/chrome-beta/chrome-beta.svg?url'
7+
import chromiumIcon from 'browser-logos/src/chromium/chromium.svg?url'
8+
import edgeBetaIcon from 'browser-logos/src/edge-beta/edge-beta.png'
9+
import edgeCanaryIcon from 'browser-logos/src/edge-canary/edge-canary.png'
10+
import edgeDevIcon from 'browser-logos/src/edge-dev/edge-dev.png'
11+
import firefoxNightlyIcon from 'browser-logos/src/firefox-nightly/firefox-nightly.svg?url'
12+
import firefoxDeveloperEditionIcon from 'browser-logos/src/firefox-developer-edition/firefox-developer-edition.svg?url'
13+
import webKitIcon from 'browser-logos/src/webkit/webkit.svg?url'
1414
import genericBrowserLogo from '@packages/frontend-shared/src/assets/logos/generic-browser.svg?url'
1515

1616
export const allBrowsersIcons = {

packages/launchpad/cypress.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export default defineConfig({
2424
viteConfig: {
2525
optimizeDeps: {
2626
include: [
27-
'@packages/ui-components/cypress/support/customPercyCommand',
27+
'@packages/frontend-shared/cypress/support/customPercyCommand',
2828
],
2929
},
3030
},

packages/launchpad/cypress/component/support/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import 'cypress-real-events/support'
2424

2525
import './commands'
2626
import './attachFileWithPath'
27-
import { installCustomPercyCommand } from '@packages/ui-components/cypress/support/customPercyCommand'
27+
import { installCustomPercyCommand } from '@packages/frontend-shared/cypress/support/customPercyCommand'
2828

2929
installCustomPercyCommand({
3030
before: () => {},

packages/launchpad/cypress/e2e/support/e2eSupport.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
/// <reference path="../../../../frontend-shared/cypress/e2e/support/e2eSupport.ts" />
2-
require('../../../../frontend-shared/cypress/e2e/support/e2eSupport')
1+
/// <reference path="../../../../frontend-shared/cypress/support/e2e.ts" />
2+
require('../../../../frontend-shared/cypress/support/e2e')
33

44
require('./dropFileWithPath')
55
require('./containsPath')

packages/reporter/cypress/support/component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { mount } from 'cypress/react'
22
import 'cypress-real-events/support'
3-
import { installCustomPercyCommand } from '@packages/ui-components/cypress/support/customPercyCommand'
3+
import { installCustomPercyCommand } from '@packages/frontend-shared/cypress/support/customPercyCommand'
44

55
import '../../src/main.scss'
66

packages/reporter/cypress/support/e2e.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import 'cypress-real-events/support'
22
// @ts-ignore
3-
import { installCustomPercyCommand } from '@packages/ui-components/cypress/support/customPercyCommand'
3+
import { installCustomPercyCommand } from '@packages/frontend-shared/cypress/support/customPercyCommand'
44

55
installCustomPercyCommand({
66
before () {

packages/reporter/src/main-runner.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
@import 'lib/tag';
88
@import 'lib/tooltip';
99
@import '~@reach/dialog/styles.css';
10-
@import '../../ui-components/src/file-opener/file-opener';
1110
// import all other scss files in src except if they are in lib
1211
// or their file name is `selector-playground` or `main`
1312
// NOTE: no need to import scss files in their components

packages/reporter/src/main.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
@import 'lib/tag';
99
@import 'lib/tooltip';
1010
@import '~@reach/dialog/styles.css';
11-
@import '../../ui-components/src/file-opener/file-opener';
1211
// import all other scss files in src except if they are in lib
1312
// or their file name is `selecor-playground` or `main`
1413
// NOTA: no need to import scss files in their components

packages/runner/src/main.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,4 @@ $cy-tooltip-class: 'cy-tooltip';
99
// NOTA: no need to import scss files in their components
1010
@import '../../runner/src/!(lib)*/**/!(assertions-menu|main).scss';
1111

12-
@import '../../ui-components/src/dropdown';
1312
@import '../../reporter/src/main-runner';

packages/ui-components/.gitignore

Lines changed: 0 additions & 2 deletions
This file was deleted.

packages/ui-components/README.md

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)