yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into feature/template-query-logic-

Browse Source
This commit is contained in:
Julia Gru
2023-06-20 09:18:39 +02:00
parent 5fea9af612 5c47486b8d
commit 22897afacf
5 changed files with 50 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Umbraco.Web.UI.Client/.github/workflows/npm-publish-github-packages.yml vendored
View File

@@ -37,14 +37,11 @@ jobs:
scope: '@umbraco-cms'
- run: npm ci
- run: npm run build:for:npm
- run: npm run generate:jsonschema:dist
- run: npm run wc-analyze
- run: npm run wc-analyze:vscode
- name: Version and publish
run: |
SHA_SHORT=$(echo $GITHUB_SHA | cut -c1-8)
npm whoami
npm version 1.0.0-next.$SHA_SHORT --allow-same-version --no-git-tag-version
npm publish --tag latest --access public
npm version 14.0.0-$SHA_SHORT --allow-same-version --no-git-tag-version
npm publish --tag next --access public
env:
NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}

78
src/Umbraco.Web.UI.Client/package-lock.json generated
View File

@@ -27,7 +27,7 @@
"@playwright/test": "^1.30.0",
"@rollup/plugin-commonjs": "^25.0.0",
"@rollup/plugin-json": "^6.0.0",
"@rollup/plugin-node-resolve": "^15.0.1",
"@rollup/plugin-node-resolve": "^15.1.0",
"@storybook/addon-a11y": "7.0.20",
"@storybook/addon-actions": "7.0.20",
"@storybook/addon-essentials": "7.0.20",
@@ -42,7 +42,7 @@
"@typescript-eslint/eslint-plugin": "^5.59.9",
"@typescript-eslint/parser": "^5.59.9",
"@web/dev-server-esbuild": "^0.3.3",
"@web/dev-server-import-maps": "^0.0.7",
"@web/dev-server-import-maps": "^0.1.1",
"@web/dev-server-rollup": "^0.3.21",
"@web/test-runner": "^0.16.1",
"@web/test-runner-playwright": "^0.10.0",
@@ -3814,9 +3814,9 @@
}
},
"node_modules/@rollup/plugin-node-resolve": {
"version": "15.0.2",
"resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.0.2.tgz",
"integrity": "sha512-Y35fRGUjC3FaurG722uhUuG8YHOJRJQbI6/CkbRkdPotSpDj9NtIN85z1zrcyDcCQIW4qp5mgG72U+gJ0TAFEg==",
"version": "15.1.0",
"resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.1.0.tgz",
"integrity": "sha512-xeZHCgsiZ9pzYVgAo9580eCGqwh/XCEUM9q6iQfGNocjgkufHAqC3exA+45URvhiYV8sBF9RlBai650eNs7AsA==",
"dev": true,
"dependencies": {
"@rollup/pluginutils": "^5.0.1",
@@ -7632,49 +7632,62 @@
}
},
"node_modules/@web/dev-server-import-maps": {
"version": "0.0.7",
"resolved": "https://registry.npmjs.org/@web/dev-server-import-maps/-/dev-server-import-maps-0.0.7.tgz",
"integrity": "sha512-uq8SFRkh3Zic71boDP/GeNwc7BtOWFWLDam3JJF3G0L9gMZVm7WteeDxxn9ppdbGxRhvlJtxqBlSOvf3pl75qw==",
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/@web/dev-server-import-maps/-/dev-server-import-maps-0.1.1.tgz",
"integrity": "sha512-Et/uswWE2K9tFLM2xNArsvoDtFmBPyFrwJRm5O5ls5u0F3ZNE8vXk4kUONakillQ/041uSE30wIfesljl1ZKsg==",
"dev": true,
"dependencies": {
"@import-maps/resolve": "^1.0.1",
"@types/parse5": "^6.0.1",
"@web/dev-server-core": "^0.3.19",
"@web/parse5-utils": "^1.3.0",
"@web/dev-server-core": "^0.5.1",
"@web/parse5-utils": "^2.0.0",
"parse5": "^6.0.1",
"picomatch": "^2.2.2"
},
"engines": {
"node": ">=10.0.0"
"node": ">=16.0.0"
}
},
"node_modules/@web/dev-server-import-maps/node_modules/@web/dev-server-core": {
"version": "0.3.19",
"resolved": "https://registry.npmjs.org/@web/dev-server-core/-/dev-server-core-0.3.19.tgz",
"integrity": "sha512-Q/Xt4RMVebLWvALofz1C0KvP8qHbzU1EmdIA2Y1WMPJwiFJFhPxdr75p9YxK32P2t0hGs6aqqS5zE0HW9wYzYA==",
"version": "0.5.1",
"resolved": "https://registry.npmjs.org/@web/dev-server-core/-/dev-server-core-0.5.1.tgz",
"integrity": "sha512-pXgb4bjDmPIaIQT9luixTSqTvRQxttUEzSKOZqLNl6pVgrl4n47ZtmZte936G2tM7nHmpT+oaMDDtCM0CgbQNQ==",
"dev": true,
"dependencies": {
"@types/koa": "^2.11.6",
"@types/ws": "^7.4.0",
"@web/parse5-utils": "^1.2.0",
"@web/parse5-utils": "^2.0.0",
"chokidar": "^3.4.3",
"clone": "^2.1.2",
"es-module-lexer": "^1.0.0",
"get-stream": "^6.0.0",
"is-stream": "^2.0.0",
"isbinaryfile": "^4.0.6",
"isbinaryfile": "^5.0.0",
"koa": "^2.13.0",
"koa-etag": "^4.0.0",
"koa-send": "^5.0.1",
"koa-static": "^5.0.0",
"lru-cache": "^6.0.0",
"lru-cache": "^8.0.4",
"mime-types": "^2.1.27",
"parse5": "^6.0.1",
"picomatch": "^2.2.2",
"ws": "^7.4.2"
},
"engines": {
"node": ">=10.0.0"
"node": ">=16.0.0"
}
},
"node_modules/@web/dev-server-import-maps/node_modules/@web/parse5-utils": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/@web/parse5-utils/-/parse5-utils-2.0.0.tgz",
"integrity": "sha512-9pxjAg1k0Ie3t4gTQr/nmoTrvq6wmP40MNPwaetaN+jPc328MpO+WzmEApvJOW65v7lamjlvYFDsdvG8Lrd87Q==",
"dev": true,
"dependencies": {
"@types/parse5": "^6.0.1",
"parse5": "^6.0.1"
},
"engines": {
"node": ">=16.0.0"
}
},
"node_modules/@web/dev-server-import-maps/node_modules/es-module-lexer": {
@@ -7683,28 +7696,13 @@
"integrity": "sha512-9978wrXM50Y4rTMmW5kXIC09ZdXQZqkE4mxhwkd8VbzsGkXGPgV4zWuqQJgCEzYngdo2dYDa0l8xhX4fkSwJSg==",
"dev": true
},
"node_modules/@web/dev-server-import-maps/node_modules/isbinaryfile": {
"version": "4.0.10",
"resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.10.tgz",
"integrity": "sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw==",
"dev": true,
"engines": {
"node": ">= 8.0.0"
},
"funding": {
"url": "https://github.com/sponsors/gjtorikian/"
}
},
"node_modules/@web/dev-server-import-maps/node_modules/lru-cache": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
"version": "8.0.5",
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-8.0.5.tgz",
"integrity": "sha512-MhWWlVnuab1RG5/zMRRcVGXZLCXrZTgfwMikgzCegsPnG62yDQo5JnqKkrK4jO5iKqDAZGItAqN5CtKBCBWRUA==",
"dev": true,
"dependencies": {
"yallist": "^4.0.0"
},
"engines": {
"node": ">=10"
"node": ">=16.14"
}
},
"node_modules/@web/dev-server-import-maps/node_modules/ws": {
@@ -7728,12 +7726,6 @@
}
}
},
"node_modules/@web/dev-server-import-maps/node_modules/yallist": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
"dev": true
},
"node_modules/@web/dev-server-rollup": {
"version": "0.3.21",
"resolved": "https://registry.npmjs.org/@web/dev-server-rollup/-/dev-server-rollup-0.3.21.tgz",

6
src/Umbraco.Web.UI.Client/package.json
View File

@@ -86,7 +86,7 @@
"build:vite": "tsc && vite build --mode staging",
"build:for:static": "vite build",
"build:for:cms": "npm run build && node ./devops/build/copy-to-cms.js",
"build:for:npm": "npm run build && tsc-alias -f -p src/tsconfig.json",
"build:for:npm": "npm run build && tsc-alias -f -p src/tsconfig.json && npm run generate:jsonschema:dist && npm run wc-analyze && npm run wc-analyze:vscode",
"preview": "vite preview --open",
"test": "web-test-runner --coverage",
"test:watch": "web-test-runner --watch",
@@ -136,7 +136,7 @@
"@playwright/test": "^1.30.0",
"@rollup/plugin-commonjs": "^25.0.0",
"@rollup/plugin-json": "^6.0.0",
"@rollup/plugin-node-resolve": "^15.0.1",
"@rollup/plugin-node-resolve": "^15.1.0",
"@storybook/addon-a11y": "7.0.20",
"@storybook/addon-actions": "7.0.20",
"@storybook/addon-essentials": "7.0.20",
@@ -151,7 +151,7 @@
"@typescript-eslint/eslint-plugin": "^5.59.9",
"@typescript-eslint/parser": "^5.59.9",
"@web/dev-server-esbuild": "^0.3.3",
"@web/dev-server-import-maps": "^0.0.7",
"@web/dev-server-import-maps": "^0.1.1",
"@web/dev-server-rollup": "^0.3.21",
"@web/test-runner": "^0.16.1",
"@web/test-runner-playwright": "^0.10.0",

2
src/Umbraco.Web.UI.Client/src/external/backend-api/src/services/DocumentTypeResource.ts vendored
View File

@@ -27,10 +27,8 @@ export class DocumentTypeResource {
url: '/umbraco/management/api/v1/document-type',
body: requestBody,
mediaType: 'application/json',
responseHeader: 'location',
errors: {
400: `Bad Request`,
404: `Not Found`,
},
});
}

13
src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/umbraco-package.ts
View File

@@ -3,11 +3,17 @@ import type { ManifestTypes } from './models/index.js';
/**
* Umbraco package manifest JSON
*/
export class UmbracoPackage {
export interface UmbracoPackage {
/**
* @title The unique identifier of the Umbraco package
*/
id?: string;
/**
* @title The name of the Umbraco package
* @required
*/
name?: string;
name: string;
/**
* @title The version of the Umbraco package in the style of semver
@@ -23,6 +29,7 @@ export class UmbracoPackage {
/**
* @title An array of Umbraco package manifest types that will be installed
* @required
*/
extensions?: ManifestTypes[];
extensions: ManifestTypes[];
}