Skip to content

Commit 146d4b5

Browse files
iOvergaardiOvergaard
authored
Merge branch 'main' into v14/feature/block-custom-views
2 parents a20d592 + b22724d commit 146d4b5

File tree

180 files changed

+395
-384
lines changed

Some content is hidden

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

180 files changed

+395
-384
lines changed

‎eslint.config.js

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import js from "@eslint/js";
2-
import globals from "globals";
3-
import importPlugin from "eslint-plugin-import";
4-
import localRules from "eslint-plugin-local-rules";
5-
import wcPlugin from "eslint-plugin-wc";
6-
import litPlugin from "eslint-plugin-lit";
7-
import litA11yPlugin from "eslint-plugin-lit-a11y";
8-
import storybookPlugin from "eslint-plugin-storybook";
1+
import js from '@eslint/js';
2+
import globals from 'globals';
3+
import importPlugin from 'eslint-plugin-import';
4+
import localRules from 'eslint-plugin-local-rules';
5+
import wcPlugin from 'eslint-plugin-wc';
6+
import litPlugin from 'eslint-plugin-lit';
7+
import litA11yPlugin from 'eslint-plugin-lit-a11y';
8+
import storybookPlugin from 'eslint-plugin-storybook';
99
import eslintPluginPrettierRecommended from 'eslint-plugin-prettier/recommended';
1010
import tseslint from 'typescript-eslint';
1111

@@ -18,11 +18,11 @@ export default [
1818
// Global ignores
1919
{
2020
ignores: [
21-
"**/rollup.config.js",
22-
"**/vite.config.ts",
23-
"src/external",
24-
"src/packages/core/icon-registry/icons",
25-
"src/packages/core/icon-registry/icons.ts"
21+
'**/rollup.config.js',
22+
'**/vite.config.ts',
23+
'src/external',
24+
'src/packages/core/icon-registry/icons',
25+
'src/packages/core/icon-registry/icons.ts',
2626
],
2727
},
2828

@@ -35,52 +35,52 @@ export default [
3535
},
3636
globals: {
3737
...globals.browser,
38-
}
38+
},
3939
},
4040
plugins: {
4141
import: importPlugin,
42-
"local-rules": localRules,
43-
"wc": wcPlugin,
44-
"lit": litPlugin,
45-
"lit-a11y": litA11yPlugin,
46-
"storybook": storybookPlugin
42+
'local-rules': localRules,
43+
wc: wcPlugin,
44+
lit: litPlugin,
45+
'lit-a11y': litA11yPlugin,
46+
storybook: storybookPlugin,
4747
},
4848
rules: {
49-
semi: ["warn", "always"],
50-
"no-unused-vars": "warn",
51-
"no-var": "error",
52-
"import/no-unresolved": "off",
53-
"import/order": ["warn", { "groups": ["builtin", "parent", "sibling", "index", "external"] }],
54-
"import/no-self-import": "error",
55-
"import/no-cycle": ["error", { "maxDepth": 6, "allowUnsafeDynamicCyclicDependency": true }],
56-
"local-rules/bad-type-import": "error",
57-
"local-rules/enforce-element-suffix-on-element-class-name": "error",
58-
"local-rules/enforce-umb-prefix-on-element-name": "error",
59-
"local-rules/ensure-relative-import-use-js-extension": "error",
60-
"local-rules/no-direct-api-import": "warn",
61-
"local-rules/prefer-import-aliases": "error",
62-
"local-rules/prefer-static-styles-last": "warn",
63-
"local-rules/umb-class-prefix": "error",
64-
"local-rules/no-relative-import-to-import-map-module": "error",
65-
"local-rules/enforce-umbraco-external-imports": [
66-
"error",
49+
semi: ['warn', 'always'],
50+
'no-unused-vars': 'off', //Let '@typescript-eslint/no-unused-vars' catch the errors to allow unused function parameters (ex: in interfaces)
51+
'no-var': 'error',
52+
'import/no-unresolved': 'off',
53+
'import/order': ['warn', { groups: ['builtin', 'parent', 'sibling', 'index', 'external'] }],
54+
'import/no-self-import': 'error',
55+
'import/no-cycle': ['error', { maxDepth: 6, allowUnsafeDynamicCyclicDependency: true }],
56+
'local-rules/bad-type-import': 'error',
57+
'local-rules/enforce-element-suffix-on-element-class-name': 'error',
58+
'local-rules/enforce-umb-prefix-on-element-name': 'error',
59+
'local-rules/ensure-relative-import-use-js-extension': 'error',
60+
'local-rules/no-direct-api-import': 'warn',
61+
'local-rules/prefer-import-aliases': 'error',
62+
'local-rules/prefer-static-styles-last': 'warn',
63+
'local-rules/umb-class-prefix': 'error',
64+
'local-rules/no-relative-import-to-import-map-module': 'error',
65+
'local-rules/enforce-umbraco-external-imports': [
66+
'error',
6767
{
68-
"exceptions": ["@umbraco-cms", "@open-wc/testing", "@storybook", "msw", ".", "vite"]
69-
}
68+
exceptions: ['@umbraco-cms', '@open-wc/testing', '@storybook', 'msw', '.', 'vite'],
69+
},
7070
],
71-
"local-rules/exported-string-constant-naming": [
72-
"error",
71+
'local-rules/exported-string-constant-naming': [
72+
'error',
7373
{
74-
"excludedFileNames": ["umbraco-package", "input-tiny-mce.defaults"] // TODO: what to do about the tiny mce defaults?
75-
}
74+
excludedFileNames: ['umbraco-package', 'input-tiny-mce.defaults'], // TODO: what to do about the tiny mce defaults?
75+
},
7676
],
77-
"@typescript-eslint/no-non-null-assertion": "off",
78-
"@typescript-eslint/no-explicit-any": "warn",
79-
"@typescript-eslint/no-unused-vars": "warn",
80-
"@typescript-eslint/consistent-type-exports": "error",
81-
"@typescript-eslint/consistent-type-imports": "error",
82-
"@typescript-eslint/no-import-type-side-effects": "warn"
83-
}
77+
'@typescript-eslint/no-non-null-assertion': 'off',
78+
'@typescript-eslint/no-explicit-any': 'warn',
79+
'@typescript-eslint/no-unused-vars': 'error',
80+
'@typescript-eslint/consistent-type-exports': 'error',
81+
'@typescript-eslint/consistent-type-imports': 'error',
82+
'@typescript-eslint/no-import-type-side-effects': 'warn',
83+
},
8484
},
8585

8686
// Pattern-specific overrides
@@ -90,7 +90,7 @@ export default [
9090
languageOptions: {
9191
globals: {
9292
...globals.node,
93-
}
94-
}
93+
},
94+
},
9595
},
9696
];

‎package-lock.json

Lines changed: 44 additions & 36 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,8 @@
140140
"./src/packages/health-check",
141141
"./src/packages/tags",
142142
"./src/packages/templating",
143-
"./src/packages/property-editors"
143+
"./src/packages/property-editors",
144+
"./src/packages/media"
144145
],
145146
"scripts": {
146147
"backoffice:test:e2e": "npx playwright test",
@@ -179,7 +180,7 @@
179180
"test:dev": "web-test-runner --config ./web-test-runner.dev.config.mjs",
180181
"test:dev-watch": "web-test-runner --watch --config ./web-test-runner.dev.config.mjs",
181182
"test:watch": "web-test-runner --watch",
182-
"test": "web-test-runner --coverage",
183+
"test": "web-test-runner",
183184
"wc-analyze:vscode": "wca **/*.element.ts --format vscode --outFile dist-cms/vscode-html-custom-data.json",
184185
"wc-analyze": "wca **/*.element.ts --outFile dist-cms/custom-elements.json",
185186
"generate:tsconfig": "node ./devops/tsconfig/index.js",
@@ -215,7 +216,7 @@
215216
"@hey-api/openapi-ts": "^0.48.1",
216217
"@mdx-js/react": "^3.0.0",
217218
"@open-wc/testing": "^4.0.0",
218-
"@playwright/test": "^1.41.1",
219+
"@playwright/test": "^1.45.1",
219220
"@rollup/plugin-commonjs": "^25.0.7",
220221
"@rollup/plugin-json": "^6.1.0",
221222
"@rollup/plugin-node-resolve": "^15.2.3",

‎src/libs/controller-api/controller.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ describe('UmbController', () => {
5151
let hostElement: UmbControllerHostElement;
5252

5353
beforeEach(() => {
54-
hostElement = document.createElement('test-my-controller-host') as UmbControllerHostElement;
54+
hostElement = new UmbTestControllerHostElement();
5555
});
5656

5757
describe('Controller Host Public API', () => {

‎src/libs/element-api/element.test.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ describe('UmbElementMixin', () => {
152152
expect(hostElement.hasUmbController(ctrl)).to.be.true;
153153

154154
const ctrl2 = hostElement.observe(myObservable, (value) => {
155+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
155156
const a = value + 'bla';
156157
});
157158

@@ -172,6 +173,7 @@ describe('UmbElementMixin', () => {
172173
const ctrl2 = hostElement.observe(
173174
undefined,
174175
() => {
176+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
175177
const a = 1;
176178
},
177179
'observer',

0 commit comments

Comments
 (0)