Merge remote-tracking branch 'origin/main' into manual-json-schema

src/Umbraco.Web.UI.Client/utils/move-libs.js

@@ -0,0 +1,58 @@
+// Load all .d.ts files from the dist/libs folder
+// and replace all imports from @umbraco-cms/backoffice with relative imports
+// Example: import { Foo } from '@umbraco-cms/backoffice/element' -> import { Foo } from './element'
+// This is needed because the d.ts files are not in the same folder as the source files
+// and the absolute paths are not valid when the d.ts files are copied to the dist folder
+// This is only used when building the d.ts files
+//
+// Usage: node utils/transform-dts.js
+//
+// Note: This script is not used in the build process, it is only used to transform the d.ts files
+//       when the d.ts files are copied to the dist folder
+
+// Note: Updated to help copy the two JSON files generated from webcomponant analyzer tool
+// One is specific to VSCode HTMLCutomData for intellisense and the other is a more broad format used in storybook etc
+
+import { readdirSync, readFileSync, writeFileSync, cpSync, mkdirSync } from 'fs';
+
+const rootDir = './';
+const srcDir = './libs';
+const inputDir = './dist/libs';
+const outputDir = '../Umbraco.Cms.StaticAssets/wwwroot/umbraco/backoffice/libs';
+
+// Copy package files
+cpSync(`${srcDir}/package.json`, `${inputDir}/package.json`, { recursive: true });
+cpSync(`${srcDir}/README.md`, `${inputDir}/README.md`, { recursive: true });
+cpSync(`${rootDir}/custom-elements.json`, `${inputDir}/custom-elements.json`, { recursive: true });
+cpSync(`${rootDir}/vscode-html-custom-data.json`, `${inputDir}/vscode-html-custom-data.json`, { recursive: true });
+
+const libs = readdirSync(inputDir);
+
+// Create output folder
+try {
+	mkdirSync(outputDir, { recursive: true });
+} catch {
+	// Ignore
+}
+
+// Transform all .d.ts files and copy all other files to the output folder
+libs.forEach(lib => {
+
+	console.log(`Transforming ${lib}`);
+
+	const dtsFile = `${inputDir}/${lib}`;
+
+	let code = readFileSync(dtsFile, 'utf8');
+
+	// Replace all absolute imports with relative imports
+	if (lib.endsWith('.d.ts')) {
+		code = code.replace(/from '(@umbraco-cms\/backoffice\/[^']+)'/g, (match, p1) => {
+			return `from './${p1.split('/').pop()}'`;
+		});
+	}
+
+	writeFileSync(dtsFile, code, 'utf8');
+
+	cpSync(dtsFile, `${outputDir}/${lib}`, { recursive: true });
+
+});

src/Umbraco.Web.UI.Client/utils/rollup.config.js

@@ -1,27 +0,0 @@
-import esbuild from 'rollup-plugin-esbuild';
-import pluginJson from '@rollup/plugin-json';
-import { nodeResolve } from '@rollup/plugin-node-resolve';
-import dts from 'rollup-plugin-dts';
-
-/** @type {import('rollup').RollupOptions[]} */
-export default [
-	{
-		input: 'index.ts',
-		external: [/^@umbraco-cms\//, /^lit/],
-		output: {
-			file: 'dist/index.js',
-			format: 'es',
-			sourcemap: true
-		},
-		plugins: [nodeResolve(), pluginJson(), esbuild()]
-	},
-	{
-		input: 'index.ts',
-		external: [/^@umbraco-cms\//, /^lit/, /^rxjs/],
-		output: {
-			file: './dist/index.d.ts',
-			format: 'es'
-		},
-		plugins: [dts({ respectExternal: true })],
-	}
-];

src/Umbraco.Web.UI.Client/utils/test-utils.ts

@@ -0,0 +1,3 @@
+export const defaultA11yConfig = {
+	ignoredRules: [],
+};