From 78fdfef7181e6e8ff4965258630b5cc5ba1b6b85 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 9 Jun 2023 14:21:00 +0000 Subject: [PATCH 1/6] Bump @web/dev-server-import-maps from 0.0.7 to 0.1.1 Bumps [@web/dev-server-import-maps](https://github.com/modernweb-dev/web/tree/HEAD/packages/dev-server-import-maps) from 0.0.7 to 0.1.1. - [Release notes](https://github.com/modernweb-dev/web/releases) - [Changelog](https://github.com/modernweb-dev/web/blob/master/packages/dev-server-import-maps/CHANGELOG.md) - [Commits](https://github.com/modernweb-dev/web/commits/@web/dev-server-import-maps@0.1.1/packages/dev-server-import-maps) --- updated-dependencies: - dependency-name: "@web/dev-server-import-maps" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Umbraco.Web.UI.Client/package-lock.json | 70 +++++++++------------ src/Umbraco.Web.UI.Client/package.json | 2 +- 2 files changed, 32 insertions(+), 40 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json index 44ea830a1a..ba9964a4c5 100644 --- a/src/Umbraco.Web.UI.Client/package-lock.json +++ b/src/Umbraco.Web.UI.Client/package-lock.json @@ -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", @@ -7355,49 +7355,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": { @@ -7406,28 +7419,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": { @@ -7451,12 +7449,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", diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json index 830d88d70e..9dca9df075 100644 --- a/src/Umbraco.Web.UI.Client/package.json +++ b/src/Umbraco.Web.UI.Client/package.json @@ -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", From a163230ac67f701773caf445a7efa27e17116846 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 9 Jun 2023 14:42:19 +0000 Subject: [PATCH 2/6] Bump @rollup/plugin-node-resolve from 15.0.2 to 15.1.0 Bumps [@rollup/plugin-node-resolve](https://github.com/rollup/plugins/tree/HEAD/packages/node-resolve) from 15.0.2 to 15.1.0. - [Changelog](https://github.com/rollup/plugins/blob/master/packages/node-resolve/CHANGELOG.md) - [Commits](https://github.com/rollup/plugins/commits/commonjs-v15.1.0/packages/node-resolve) --- updated-dependencies: - dependency-name: "@rollup/plugin-node-resolve" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Umbraco.Web.UI.Client/package-lock.json | 8 ++++---- src/Umbraco.Web.UI.Client/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json index 92f989037a..49d0771047 100644 --- a/src/Umbraco.Web.UI.Client/package-lock.json +++ b/src/Umbraco.Web.UI.Client/package-lock.json @@ -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", @@ -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", diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json index 92c5e04e13..0564fca871 100644 --- a/src/Umbraco.Web.UI.Client/package.json +++ b/src/Umbraco.Web.UI.Client/package.json @@ -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", From 851dc77f1b4e06ecddde15d5c801db8deb5e8a3a Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Mon, 19 Jun 2023 14:16:25 +0200 Subject: [PATCH 3/6] change to interface and add 'id' to match server packages --- .../core/extension-registry/umbraco-package.ts | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/umbraco-package.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/umbraco-package.ts index bc2d9b4a5c..efa8ca584d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/umbraco-package.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/umbraco-package.ts @@ -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[]; } From f3e7471c701f2241bf4a26156893263dd5641c5c Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Mon, 19 Jun 2023 14:17:36 +0200 Subject: [PATCH 4/6] update backend api --- .../external/backend-api/src/services/DocumentTypeResource.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/external/backend-api/src/services/DocumentTypeResource.ts b/src/Umbraco.Web.UI.Client/src/external/backend-api/src/services/DocumentTypeResource.ts index 775098175e..8f120b22ea 100644 --- a/src/Umbraco.Web.UI.Client/src/external/backend-api/src/services/DocumentTypeResource.ts +++ b/src/Umbraco.Web.UI.Client/src/external/backend-api/src/services/DocumentTypeResource.ts @@ -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`, }, }); } From 3f441e3b7646fa1bad9e67da3bb42f5ea8794032 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Mon, 19 Jun 2023 14:25:04 +0200 Subject: [PATCH 5/6] change publish to next tag --- .../.github/workflows/npm-publish-github-packages.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/.github/workflows/npm-publish-github-packages.yml b/src/Umbraco.Web.UI.Client/.github/workflows/npm-publish-github-packages.yml index bab658e4b9..77f8e0791f 100644 --- a/src/Umbraco.Web.UI.Client/.github/workflows/npm-publish-github-packages.yml +++ b/src/Umbraco.Web.UI.Client/.github/workflows/npm-publish-github-packages.yml @@ -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}} From 12eff14d48b06d683741c244e0377148c0bcdbbc Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Mon, 19 Jun 2023 14:26:19 +0200 Subject: [PATCH 6/6] include all commands in build:for:npm --- src/Umbraco.Web.UI.Client/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json index 5e8f806d65..5758466dba 100644 --- a/src/Umbraco.Web.UI.Client/package.json +++ b/src/Umbraco.Web.UI.Client/package.json @@ -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",