Skip to content

Commit 6008eff

Browse files
madsrasmussenmadsrasmussen
authored
Merge pull request #1197 from umbraco/feature/eslint-cyclic-import
Feature/eslint-cyclic-import
2 parents ca69d04 + df9e39a commit 6008eff

File tree

132 files changed

+241
-247
lines changed

Some content is hidden

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

132 files changed

+241
-247
lines changed

‎.eslintrc.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@
3838
"no-var": "error",
3939
"import/no-unresolved": "off",
4040
"import/order": "warn",
41+
"import/no-self-import": "error",
42+
"import/no-cycle": ["error", { "maxDepth": 2, "allowUnsafeDynamicCyclicDependency": true }],
4143
"local-rules/bad-type-import": "error",
4244
"local-rules/enforce-element-suffix-on-element-class-name": "error",
4345
"local-rules/enforce-umb-prefix-on-element-name": "error",

‎apps/auth/src/login.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { expect, fixture, html } from '@open-wc/testing';
2-
import { defaultA11yConfig } from '@umbraco-cms/internal/test-utils';
2+
import { type UmbTestRunnerWindow, defaultA11yConfig } from '@umbraco-cms/internal/test-utils';
33
import UmbLoginElement from './login.element.js';
44

55
describe('UmbLogin', () => {
@@ -13,7 +13,7 @@ describe('UmbLogin', () => {
1313
expect(element).to.be.instanceOf(UmbLoginElement);
1414
});
1515

16-
if ((window as any).__UMBRACO_TEST_RUN_A11Y_TEST) {
16+
if ((window as UmbTestRunnerWindow).__UMBRACO_TEST_RUN_A11Y_TEST) {
1717
it('passes the a11y audit', async () => {
1818
await expect(element).to.be.accessible(defaultA11yConfig);
1919
});

‎src/apps/installer/consent/installer-content.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { expect, fixture, html } from '@open-wc/testing';
22

33
import { UmbInstallerConsentElement } from './installer-consent.element.js';
4-
import { defaultA11yConfig } from '@umbraco-cms/internal/test-utils';
4+
import { type UmbTestRunnerWindow, defaultA11yConfig } from '@umbraco-cms/internal/test-utils';
55

66
// TODO: Write tests
77
describe('UmbInstallerConsentElement', () => {
@@ -15,7 +15,7 @@ describe('UmbInstallerConsentElement', () => {
1515
expect(element).to.be.instanceOf(UmbInstallerConsentElement);
1616
});
1717

18-
if ((window as any).__UMBRACO_TEST_RUN_A11Y_TEST) {
18+
if ((window as UmbTestRunnerWindow).__UMBRACO_TEST_RUN_A11Y_TEST) {
1919
it('passes the a11y audit', async () => {
2020
await expect(element).to.be.accessible(defaultA11yConfig);
2121
});

‎src/apps/installer/database/installer-database.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { expect, fixture, html } from '@open-wc/testing';
22

33
import { UmbInstallerDatabaseElement } from './installer-database.element.js';
4-
import { defaultA11yConfig } from '@umbraco-cms/internal/test-utils';
4+
import { type UmbTestRunnerWindow, defaultA11yConfig } from '@umbraco-cms/internal/test-utils';
55

66
// TODO: Write tests
77
describe('UmbInstallerDatabaseElement', () => {
@@ -15,7 +15,7 @@ describe('UmbInstallerDatabaseElement', () => {
1515
expect(element).to.be.instanceOf(UmbInstallerDatabaseElement);
1616
});
1717

18-
if ((window as any).__UMBRACO_TEST_RUN_A11Y_TEST) {
18+
if ((window as UmbTestRunnerWindow).__UMBRACO_TEST_RUN_A11Y_TEST) {
1919
it('passes the a11y audit', async () => {
2020
await expect(element).to.be.accessible(defaultA11yConfig);
2121
});

‎src/apps/installer/error/installer-error.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { expect, fixture, html } from '@open-wc/testing';
22

33
import { UmbInstallerErrorElement } from './installer-error.element.js';
4-
import { defaultA11yConfig } from '@umbraco-cms/internal/test-utils';
4+
import { type UmbTestRunnerWindow, defaultA11yConfig } from '@umbraco-cms/internal/test-utils';
55

66
// TODO: Write tests
77
describe('UmbInstallerErrorElement', () => {
@@ -15,7 +15,7 @@ describe('UmbInstallerErrorElement', () => {
1515
expect(element).to.be.instanceOf(UmbInstallerErrorElement);
1616
});
1717

18-
if ((window as any).__UMBRACO_TEST_RUN_A11Y_TEST) {
18+
if ((window as UmbTestRunnerWindow).__UMBRACO_TEST_RUN_A11Y_TEST) {
1919
it('passes the a11y audit', async () => {
2020
await expect(element).to.be.accessible(defaultA11yConfig);
2121
});

‎src/apps/installer/installer.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { expect, fixture, html } from '@open-wc/testing';
22

33
import { UmbInstallerElement } from './installer.element.js';
4-
import { defaultA11yConfig } from '@umbraco-cms/internal/test-utils';
4+
import { type UmbTestRunnerWindow, defaultA11yConfig } from '@umbraco-cms/internal/test-utils';
55

66
// TODO: Write tests
77
describe('UmbInstallerElement', () => {
@@ -15,7 +15,7 @@ describe('UmbInstallerElement', () => {
1515
expect(element).to.be.instanceOf(UmbInstallerElement);
1616
});
1717

18-
if ((window as any).__UMBRACO_TEST_RUN_A11Y_TEST) {
18+
if ((window as UmbTestRunnerWindow).__UMBRACO_TEST_RUN_A11Y_TEST) {
1919
it('passes the a11y audit', async () => {
2020
await expect(element).to.be.accessible(defaultA11yConfig);
2121
});

‎src/apps/installer/installing/installer-installing.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { expect, fixture, html } from '@open-wc/testing';
22

33
import { UmbInstallerInstallingElement } from './installer-installing.element.js';
4-
import { defaultA11yConfig } from '@umbraco-cms/internal/test-utils';
4+
import { type UmbTestRunnerWindow, defaultA11yConfig } from '@umbraco-cms/internal/test-utils';
55

66
// TODO: Write tests
77
describe('UmbInstallerInstallingElement', () => {
@@ -15,7 +15,7 @@ describe('UmbInstallerInstallingElement', () => {
1515
expect(element).to.be.instanceOf(UmbInstallerInstallingElement);
1616
});
1717

18-
if ((window as any).__UMBRACO_TEST_RUN_A11Y_TEST) {
18+
if ((window as UmbTestRunnerWindow).__UMBRACO_TEST_RUN_A11Y_TEST) {
1919
it('passes the a11y audit', async () => {
2020
await expect(element).to.be.accessible(defaultA11yConfig);
2121
});

‎src/apps/installer/shared/layout/installer-layout.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { expect, fixture, html } from '@open-wc/testing';
22

33
import { UmbInstallerLayoutElement } from './installer-layout.element.js';
4-
import { defaultA11yConfig } from '@umbraco-cms/internal/test-utils';
4+
import { type UmbTestRunnerWindow, defaultA11yConfig } from '@umbraco-cms/internal/test-utils';
55

66
// TODO: Write tests
77
describe('UmbInstallerLayoutElement', () => {
@@ -15,7 +15,7 @@ describe('UmbInstallerLayoutElement', () => {
1515
expect(element).to.be.instanceOf(UmbInstallerLayoutElement);
1616
});
1717

18-
if ((window as any).__UMBRACO_TEST_RUN_A11Y_TEST) {
18+
if ((window as UmbTestRunnerWindow).__UMBRACO_TEST_RUN_A11Y_TEST) {
1919
it('passes the a11y audit', async () => {
2020
await expect(element).to.be.accessible(defaultA11yConfig);
2121
});

‎src/apps/installer/user/installer-user.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { expect, fixture, html } from '@open-wc/testing';
22

33
import { UmbInstallerUserElement } from './installer-user.element.js';
4-
import { defaultA11yConfig } from '@umbraco-cms/internal/test-utils';
4+
import { type UmbTestRunnerWindow, defaultA11yConfig } from '@umbraco-cms/internal/test-utils';
55

66
// TODO: Write tests
77
describe('UmbInstallerUserElement', () => {
@@ -15,7 +15,7 @@ describe('UmbInstallerUserElement', () => {
1515
expect(element).to.be.instanceOf(UmbInstallerUserElement);
1616
});
1717

18-
if ((window as any).__UMBRACO_TEST_RUN_A11Y_TEST) {
18+
if ((window as UmbTestRunnerWindow).__UMBRACO_TEST_RUN_A11Y_TEST) {
1919
it('passes the a11y audit', async () => {
2020
await expect(element).to.be.accessible(defaultA11yConfig);
2121
});

‎src/apps/upgrader/upgrader-view.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { expect, fixture, html } from '@open-wc/testing';
22

33
import { UmbUpgraderViewElement } from './upgrader-view.element.js';
4-
import { defaultA11yConfig } from '@umbraco-cms/internal/test-utils';
4+
import { type UmbTestRunnerWindow, defaultA11yConfig } from '@umbraco-cms/internal/test-utils';
55

66
describe('UmbUpgraderView', () => {
77
let element: UmbUpgraderViewElement;
@@ -14,7 +14,7 @@ describe('UmbUpgraderView', () => {
1414
expect(element).to.be.instanceOf(UmbUpgraderViewElement);
1515
});
1616

17-
if ((window as any).__UMBRACO_TEST_RUN_A11Y_TEST) {
17+
if ((window as UmbTestRunnerWindow).__UMBRACO_TEST_RUN_A11Y_TEST) {
1818
it('passes the a11y audit', async () => {
1919
await expect(element).to.be.accessible(defaultA11yConfig);
2020
});

0 commit comments

Comments
 (0)