Skip to content

Commit edf3d25

Browse files
Merge branch 'main' into v14/bugfix/hide-content-workspace-view-when-no-properties
2 parents 79974ef + 9f9dc56 commit edf3d25

File tree

192 files changed

+23038
-15116
lines changed

Some content is hidden

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

192 files changed

+23038
-15116
lines changed
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
import { defineConfig } from '@hey-api/openapi-ts';
2+
3+
export default defineConfig({
4+
client: 'fetch',
5+
input: 'https://raw.githubusercontent.com/umbraco/Umbraco-CMS/v14/dev/src/Umbraco.Cms.Api.Management/OpenApi.json',
6+
output: {
7+
path: 'src/external/backend-api/src',
8+
format: 'prettier',
9+
lint: 'eslint',
10+
},
11+
schemas: false,
12+
services: {
13+
asClass: true,
14+
},
15+
types: {
16+
enums: 'typescript',
17+
},
18+
});
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
import { defineConfig } from '@hey-api/openapi-ts';
2+
3+
export default defineConfig({
4+
client: 'fetch',
5+
debug: true,
6+
input: 'http://localhost:11000/umbraco/swagger/management/swagger.json',
7+
output: {
8+
path: 'src/external/backend-api/src',
9+
format: 'prettier',
10+
lint: 'eslint',
11+
},
12+
schemas: false,
13+
services: {
14+
asClass: true,
15+
},
16+
types: {
17+
enums: 'typescript',
18+
},
19+
});
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
import { defineConfig } from '@hey-api/openapi-ts';
2+
3+
export default defineConfig({
4+
client: 'fetch',
5+
debug: true,
6+
input: '../Umbraco.Cms.Api.Management/OpenApi.json',
7+
output: {
8+
path: 'src/external/backend-api/src',
9+
format: 'prettier',
10+
lint: 'eslint',
11+
},
12+
schemas: false,
13+
services: {
14+
asClass: true,
15+
},
16+
types: {
17+
enums: 'typescript',
18+
},
19+
});

package-lock.json

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

package.json

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,9 @@
139139
"./src/packages/webhook",
140140
"./src/packages/health-check",
141141
"./src/packages/tags",
142-
"./src/packages/templating"
142+
"./src/packages/templating",
143+
"./src/packages/property-editors",
144+
"./src/packages/media"
143145
],
144146
"scripts": {
145147
"backoffice:test:e2e": "npx playwright test",
@@ -159,9 +161,9 @@
159161
"example": "node ./devops/example-runner/index.js",
160162
"format:fix": "npm run format -- --write",
161163
"format": "prettier 'src/**/*.ts' --check",
162-
"generate:server-api-local": "openapi-ts --input ../Umbraco.Cms.Api.Management/OpenApi.json --output src/external/backend-api/src --debug true --enums typescript --lint true --schemas false",
163-
"generate:server-api-dev": "openapi-ts --input http://localhost:11000/umbraco/swagger/management/swagger.json --output src/external/backend-api/src --debug true --enums typescript --lint true --schemas false",
164-
"generate:server-api": "openapi-ts --input https://raw.githubusercontent.com/umbraco/Umbraco-CMS/v14/dev/src/Umbraco.Cms.Api.Management/OpenApi.json --output src/external/backend-api/src --debug true --enums typescript --lint true --schemas false",
164+
"generate:server-api-local": "openapi-ts --file devops/openapi-ts/openapi-ts.local.config.js",
165+
"generate:server-api-dev": "openapi-ts --file devops/openapi-ts/openapi-ts.dev.config.js",
166+
"generate:server-api": "openapi-ts --file devops/openapi-ts/openapi-ts.config.js",
165167
"generate:icons": "node ./devops/icons/index.js",
166168
"generate:overrides": "node ./devops/tsc/index.js",
167169
"generate:jsonschema:dist": "typescript-json-schema --required --include \"./src/packages/core/extension-registry/umbraco-package.ts\" --out dist-cms/umbraco-package-schema.json tsconfig.json UmbracoPackage",
@@ -178,7 +180,7 @@
178180
"test:dev": "web-test-runner --config ./web-test-runner.dev.config.mjs",
179181
"test:dev-watch": "web-test-runner --watch --config ./web-test-runner.dev.config.mjs",
180182
"test:watch": "web-test-runner --watch",
181-
"test": "web-test-runner --coverage",
183+
"test": "web-test-runner",
182184
"wc-analyze:vscode": "wca **/*.element.ts --format vscode --outFile dist-cms/vscode-html-custom-data.json",
183185
"wc-analyze": "wca **/*.element.ts --outFile dist-cms/custom-elements.json",
184186
"generate:tsconfig": "node ./devops/tsconfig/index.js",
@@ -211,10 +213,10 @@
211213
"devDependencies": {
212214
"@babel/core": "^7.24.3",
213215
"@eslint/js": "^9.6.0",
214-
"@hey-api/openapi-ts": "^0.37.3",
216+
"@hey-api/openapi-ts": "^0.48.1",
215217
"@mdx-js/react": "^3.0.0",
216218
"@open-wc/testing": "^4.0.0",
217-
"@playwright/test": "^1.41.1",
219+
"@playwright/test": "^1.45.1",
218220
"@rollup/plugin-commonjs": "^25.0.7",
219221
"@rollup/plugin-json": "^6.1.0",
220222
"@rollup/plugin-node-resolve": "^15.2.3",

0 commit comments

Comments
 (0)