Merge branch 'main' into feature/master-template-selector

src/Umbraco.Web.UI.Client/.github/workflows/azure-static-web-apps-ashy-bay-09f36a803.yml

@@ -14,7 +14,7 @@ env:
 
 jobs:
   build_and_deploy_job:
-    if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
+    if: false && github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
     runs-on: ubuntu-latest
     name: Build and Deploy Job
     steps:

src/Umbraco.Web.UI.Client/.github/workflows/npm-publish-github-packages.yml

@@ -7,6 +7,13 @@ name: Node.js Package
 on:
   push:
     branches: [main]
+    paths:
+      - 'src/**'
+      - 'package.json'
+      - 'package-lock.json'
+      - 'tsconfig.json'
+      - 'staticwebapp.config.json'
+      - 'README.md'
   workflow_dispatch:
 
 env:
@@ -29,7 +36,6 @@ jobs:
           scope: '@umbraco-cms'
       - run: npm ci
       - run: npm run build:for:npm
-      - run: npm run generate:jsonschema
       - run: npm run wc-analyze
       - run: npm run wc-analyze:vscode
       - name: Version and publish
@@ -37,6 +43,6 @@ jobs:
           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 next --access public
+          npm publish --tag latest --access public
         env:
           NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}

src/Umbraco.Web.UI.Client/.storybook/preview.js

@@ -13,7 +13,7 @@ import { UmbDocumentTypeStore } from '../src/packages/documents/document-types/r
 import { UmbDocumentStore } from '../src/packages/documents/documents/repository/document.store.ts';
 import { UmbDocumentTreeStore } from '../src/packages/documents/documents/repository/document.tree.store.ts';
 
-import customElementManifests from '../dist/libs/custom-elements.json';
+import customElementManifests from '../dist-cms/custom-elements.json';
 import { UmbIconRegistry } from '../src/shared/icon-registry/icon.registry';
 import { onUnhandledRequest } from '../src/mocks';
 import { handlers } from '../src/mocks/browser-handlers';

src/Umbraco.Web.UI.Client/README.md

@@ -5,7 +5,7 @@ This package contains the types for the Umbraco Backoffice.
 ## Installation
 
 ```bash
-npm install -D @umbraco-cms/backoffice@next
+npm install -D @umbraco-cms/backoffice
 ```
 
 ## Usage

src/Umbraco.Web.UI.Client/devops/build/copy-to-cms.js

@@ -1,8 +1,8 @@
 import { cpSync } from 'fs';
 
-// TODO: Simplified version of utils/move-libs.js
-// We need to update this to support the same parts as move-libs.js
 const srcDir = './dist-cms';
 const outputDir = '../Umbraco.Cms.StaticAssets/wwwroot/umbraco/backoffice';
+const outputWebDir = '../Umbraco.Web.UI.New';
 
 cpSync(srcDir, outputDir, { recursive: true });
+cpSync(`${srcDir}/umbraco-package-schema.json`, `${outputWebDir}/umbraco-package-schema.json`);

src/Umbraco.Web.UI.Client/devops/publish/cleanse-pkg.js

@@ -0,0 +1,12 @@
+import { readFileSync, writeFileSync } from 'fs';
+
+const packageFile = './package.json';
+const packageJson = JSON.parse(readFileSync(packageFile, 'utf8'));
+
+/**
+ * Here we will modify the package.json to remove dependencies that are not needed in the CMS or does not work on npm.
+ */
+delete packageJson.dependencies['router-slot'];
+
+// Write the package.json back to disk
+writeFileSync(packageFile, JSON.stringify(packageJson, null, 2), 'utf8');

src/Umbraco.Web.UI.Client/package.json

@@ -62,7 +62,7 @@
 	},
 	"scripts": {
 		"dev": "vite",
-		"build": "tsc --project ./src/tsconfig.json && rollup -c ./src/rollup.config.js",
+		"build": "tsc --project ./src/tsconfig.json && rollup -c ./src/rollup.config.js && npm run generate:jsonschema",
 		"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",
@@ -89,7 +89,8 @@
 		"wc-analyze:vscode": "wca **/*.element.ts --format vscode --outFile dist-cms/vscode-html-custom-data.json",
 		"new-extension": "plop  --plopfile ./devops/plop/plop.js",
 		"compile": "tsc",
-		"check": "npm run lint && npm run compile && npm run build-storybook"
+		"check": "npm run lint && npm run compile && npm run build-storybook",
+		"prepublish": "node ./devops/publish/cleanse-pkg.js"
 	},
 	"engines": {
 		"node": ">=18.14 <19",
@@ -100,7 +101,7 @@
 		"@umbraco-ui/uui": "1.3.0-rc.1",
 		"@umbraco-ui/uui-css": "1.3.0-rc.1",
 		"element-internals-polyfill": "^1.1.19",
-		"lit": "^2.7.0",
+		"lit": "^2.7.4",
 		"lodash-es": "4.17.21",
 		"monaco-editor": "^0.36.1",
 		"router-slot": "file:router-slot-2.1.0.tgz",
@@ -115,13 +116,13 @@
 		"@rollup/plugin-commonjs": "^25.0.0",
 		"@rollup/plugin-json": "^6.0.0",
 		"@rollup/plugin-node-resolve": "^15.0.1",
-		"@storybook/addon-a11y": "^7.0.11",
-		"@storybook/addon-actions": "^7.0.11",
-		"@storybook/addon-essentials": "^7.0.11",
-		"@storybook/addon-links": "^7.0.11",
+		"@storybook/addon-a11y": "^7.0.17",
+		"@storybook/addon-actions": "^7.0.17",
+		"@storybook/addon-essentials": "^7.0.17",
+		"@storybook/addon-links": "^7.0.17",
 		"@storybook/mdx2-csf": "^1.1.0",
-		"@storybook/web-components": "^7.0.11",
-		"@storybook/web-components-vite": "^7.0.11",
+		"@storybook/web-components": "^7.0.17",
+		"@storybook/web-components-vite": "^7.0.17",
 		"@types/chai": "^4.3.4",
 		"@types/lodash-es": "^4.17.6",
 		"@types/mocha": "^10.0.0",
@@ -156,11 +157,11 @@
 		"rollup-plugin-dts": "^5.2.0",
 		"rollup-plugin-esbuild": "^5.0.0",
 		"rollup-plugin-url": "^3.0.1",
-		"storybook": "^7.0.11",
+		"storybook": "^7.0.17",
 		"tiny-glob": "^0.2.9",
 		"tsc-alias": "^1.8.6",
 		"typescript": "^5.0.3",
-		"typescript-json-schema": "^0.55.0",
+		"typescript-json-schema": "^0.56.0",
 		"vite": "^4.3.3",
 		"vite-plugin-static-copy": "^0.14.0",
 		"vite-tsconfig-paths": "^4.2.0",

src/Umbraco.Web.UI.Client/src/external/router-slot/index.ts

@@ -1,3 +1,14 @@
 export * from 'router-slot';
-export * from 'router-slot/model';
+export type {
+	Guard,
+	IRoute,
+	IRoutingInfo,
+	IComponentRoute,
+	IRedirectRoute,
+	IResolverRoute,
+	IRouterSlot,
+	PageComponent,
+	Component,
+	Params,
+} from 'router-slot/model';
 export * from 'router-slot/util';

src/Umbraco.Web.UI.Client/src/packages/settings/data-types/index.ts

@@ -4,5 +4,5 @@ export const DATA_TYPE_ROOT_ENTITY_TYPE = 'data-type-root';
 export const DATA_TYPE_ENTITY_TYPE = 'data-type';
 export const DATA_TYPE_FOLDER_ENTITY_TYPE = 'data-type-folder';
 
-export * from './models.js';
+export type { UmbDataTypeModel } from './models.js';
 export * from './repository/index.js';