@ui5/webcomponents-tools 0.0.0-9261ac932 → 0.0.0-95afb1087

package/lib/test-runner/test-runner.js

@@ -3,69 +3,77 @@ const { readFileSync } = require("fs");
 const path = require("path");
 const fs = require("fs");
 
-// search for dev-server port 
+function testFn() {
+// search for dev-server port
 // start in current folder
 // traversing upwards in case of mono repo tests and dev-server running in root folder of repository
-let devServerFolder = process.cwd();
-let devServerPort;
-while (true) {
-    try {
-        devServerPort = readFileSync(path.join(devServerFolder, ".dev-server-port")).toString();
-        break; // found
-    } catch (e) {
-        // file not found
-        if (devServerFolder === path.dirname(devServerFolder)) {
-            break; // reached root folder "/"
-        }
-        devServerFolder = path.dirname(devServerFolder);
-    }
-}
+	let devServerFolder = process.cwd();
+	let devServerPort;
+	while (true) {
+		try {
+			devServerPort = readFileSync(path.join(devServerFolder, ".dev-server-port")).toString();
+			break; // found
+		} catch (e) {
+			// file not found
+			if (devServerFolder === path.dirname(devServerFolder)) {
+				break; // reached root folder "/"
+			}
+			devServerFolder = path.dirname(devServerFolder);
+		}
+	}
 
 // check if we are in a monorepo and extract path from package.json
-let packageRepositoryPath = "";
-const pkg = require(path.join(process.cwd(), "package.json"));
-packageRepositoryPath = pkg.repository ? pkg.repository.directory : "";
+	let packageRepositoryPath = "";
+	const pkg = require(path.join(process.cwd(), "package.json"));
+	packageRepositoryPath = pkg.repository ? pkg.repository.directory : "";
 
 // construct base url
 // use devServerPort if a dev server is running, otherwise let the baseUrl in the wdio config be used
 // if a dev server is running in the root of a mono repo, append tha package path like this
 // http://localhost:${devServerPort}/packages/main/
-let baseUrl = "";
-if (devServerPort) {
-    console.log(`Found port ${devServerPort} from '${path.join(devServerFolder, ".dev-server-port")}'`);
-    const devServerInRoot = !devServerFolder.includes(packageRepositoryPath);
-    if (devServerInRoot) {
-        baseUrl = `--base-url http://localhost:${devServerPort}/${packageRepositoryPath}/`;
-    } else {
-        baseUrl = `--base-url http://localhost:${devServerPort}/`;
-    }
-}
+	let baseUrl = "";
+	if (devServerPort) {
+		console.log(`Found port ${devServerPort} from '${path.join(devServerFolder, ".dev-server-port")}'`);
+		const devServerInRoot = !devServerFolder.includes(packageRepositoryPath);
+		if (devServerInRoot) {
+			baseUrl = `--base-url http://localhost:${devServerPort}/${packageRepositoryPath}/`;
+		} else {
+			baseUrl = `--base-url http://localhost:${devServerPort}/`;
+		}
+	}
 
-if (!baseUrl) {
-    console.log("No dev server running, running tests served from `dist`, make sure it is up to date");
-}
+	if (!baseUrl) {
+		console.log("No dev server running, running tests served from `dist`, make sure it is up to date");
+	}
 
 // add single spec parameter if passed
-let spec = "";
-if (process.argv.length === 3) {
-    const specFile = process.argv[2];
-    spec = `--spec ${specFile}`;
-}
+	let spec = "";
+	if (process.argv.length === 3) {
+		const specFile = process.argv[2];
+		spec = `--spec ${specFile}`;
+	}
 
 // more parameters - pass them to wdio
-let restParams = "";
-if (process.argv.length > 3) {
-    restParams = process.argv.slice(2).join(" ");
+	let restParams = "";
+	if (process.argv.length > 3) {
+		restParams = process.argv.slice(2).join(" ");
+	}
+
+	let wdioConfig = "";
+	if (fs.existsSync("config/wdio.conf.cjs")) {
+		wdioConfig = "config/wdio.conf.cjs";
+	} else if (fs.existsSync("config/wdio.conf.js")) {
+		wdioConfig = "config/wdio.conf.js";
+	}
+
+// run wdio with calculated parameters
+	const cmd = `yarn cross-env WDIO_LOG_LEVEL=error wdio ${wdioConfig} ${spec} ${baseUrl} ${restParams}`;
+	console.log(`executing: ${cmd}`);
+	child_process.execSync(cmd, {stdio: 'inherit'});
 }
 
-let wdioConfig = "";
-if (fs.existsSync("config/wdio.conf.cjs")) {
-    wdioConfig = "config/wdio.conf.cjs";
-} else if (fs.existsSync("config/wdio.conf.js")) {
-    wdioConfig = "config/wdio.conf.js";
+if (require.main === module) {
+	testFn(process.argv)
 }
 
-// run wdio with calculated parameters
-const cmd = `yarn cross-env WDIO_LOG_LEVEL=error wdio ${wdioConfig} ${spec} ${baseUrl} ${restParams}`;
-console.log(`executing: ${cmd}`);
-child_process.execSync(cmd, {stdio: 'inherit'});
+exports._ui5mainFn = testFn;

package/lib/vite-bundler/vite-bundler.mjs

@@ -0,0 +1,35 @@
+import { build } from 'vite';
+import yargs from 'yargs';
+import { hideBin } from 'yargs/helpers';
+import { pathToFileURL } from "url";
+
+async function start(outArgv) {
+    const argv = yargs(hideBin(outArgv))
+        .alias("c", "config")
+        .alias("mode", "mode")
+        .alias("base", "base")
+        .argv;
+
+    try {
+        await build({
+            configFile: argv.config || undefined,
+            mode: argv.mode || undefined,
+            base: argv.base || undefined,
+            logLevel: 'info',
+        });
+    } catch (e) {
+        console.error(e)
+        process.exit(1);
+    }
+};
+
+const filePath = process.argv[1];
+const fileUrl = pathToFileURL(filePath).href;
+
+if (import.meta.url === fileUrl) {
+    start(process.argv)
+}
+
+export default {
+    _ui5mainFn: start
+}

package/package.json

@@ -1,28 +1,26 @@
 {
   "name": "@ui5/webcomponents-tools",
-  "version": "0.0.0-9261ac932",
+  "version": "0.0.0-95afb1087",
   "description": "UI5 Web Components: webcomponents.tools",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
-  "private": false,
   "keywords": [
     "openui5",
     "sapui5",
     "ui5"
   ],
-  "types": "./types/index.d.ts",
-  "scripts": {},
   "bin": {
-    "wc-dev": "bin/dev.js",
-    "wc-create-ui5-element": "bin/create-ui5-element.js"
+    "ui5nps": "bin/ui5nps.js",
+    "wc-create-ui5-element": "bin/create-ui5-element.js",
+    "wc-dev": "bin/dev.js"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/SAP/ui5-webcomponents.git",
+    "url": "https://github.com/UI5/webcomponents.git",
     "directory": "packages/tools"
   },
   "dependencies": {
-    "@custom-elements-manifest/analyzer": "^0.8.4",
+    "@custom-elements-manifest/analyzer": "^0.10.10",
     "@typescript-eslint/eslint-plugin": "^6.9.0",
     "@typescript-eslint/parser": "^6.9.0",
     "@wdio/cli": "^7.19.7",
@@ -36,29 +34,25 @@
     "chai": "^4.3.4",
     "child_process": "^1.0.2",
     "chokidar": "^3.6.0",
-    "chokidar-cli": "^3.0.0",
     "command-line-args": "^5.1.1",
     "comment-parser": "^1.4.0",
-    "concurrently": "^6.0.0",
     "cross-env": "^7.0.3",
     "custom-element-jet-brains-integration": "^1.4.4",
-    "cypress": "^13.11.0",
-    "cypress-real-events": "^1.12.0",
+    "dotenv": "^16.5.0",
     "escodegen": "^2.0.0",
     "eslint": "^7.22.0",
     "eslint-config-airbnb-base": "^14.2.1",
-    "eslint-plugin-cypress": "^3.4.0",
-    "eslint-plugin-import": "^2.22.1",
+    "eslint-plugin-import": "^2.31.0",
+    "eslint-plugin-jsx-no-leaked-values": "^0.1.24",
     "esprima": "^4.0.1",
     "getopts": "^2.3.0",
     "glob": "^7.1.6",
     "glob-parent": "^6.0.2",
     "globby": "^13.1.1",
     "handlebars": "^4.7.7",
+    "ignore": "^7.0.5",
     "is-port-reachable": "^3.1.0",
     "json-beautify": "^1.1.1",
-    "mkdirp": "^1.0.4",
-    "nps": "^5.10.0",
     "postcss": "^8.4.5",
     "postcss-cli": "^9.1.0",
     "postcss-selector-parser": "^6.0.10",
@@ -66,9 +60,10 @@
     "properties-reader": "^2.2.0",
     "recursive-readdir": "^2.2.2",
     "resolve": "^1.20.0",
-    "rimraf": "^3.0.2",
     "slash": "3.0.0",
+    "string-argv": "^0.3.2",
     "vite": "^5.4.8",
+    "vite-plugin-istanbul": "^6.0.2",
     "wdio-chromedriver-service": "^7.3.2"
   },
   "peerDependencies": {
@@ -80,10 +75,12 @@
       "optional": true
     }
   },
+  "engines": {
+    "node": "^20.19.0 || >=22.12.0"
+  },
   "devDependencies": {
-    "cypress-ct-lit": "^0.4.0",
-    "cypress-real-events": "^1.12.0",
-    "esbuild": "^0.19.9",
+    "esbuild": "^0.25.0",
     "yargs": "^17.5.1"
-  }
-}
+  },
+  "gitHead": "1b7f451f1e43ae13626dfc69b3c2bfa8b0d32219"
+}

package/tsconfig.json

@@ -12,5 +12,7 @@
 		"inlineSources": true,
 		"strict": true,
 		"moduleResolution": "node",
+		"jsx": "react-jsx",
+		"jsxImportSource": "@ui5/webcomponents-base",
 	}
 }

package/components-package/cypress/support/commands.js

@@ -1,39 +0,0 @@
-/// <reference types="cypress" />
-// ***********************************************
-// This example commands.ts shows you how to
-// create various custom commands and overwrite
-// existing commands.
-//
-// For more comprehensive examples of custom
-// commands please read more here:
-// https://on.cypress.io/custom-commands
-// ***********************************************
-//
-//
-// -- This is a parent command --
-// Cypress.Commands.add('login', (email, password) => { ... })
-//
-//
-// -- This is a child command --
-// Cypress.Commands.add('drag', { prevSubject: 'element'}, (subject, options) => { ... })
-//
-//
-// -- This is a dual command --
-// Cypress.Commands.add('dismiss', { prevSubject: 'optional'}, (subject, options) => { ... })
-//
-//
-// -- This will overwrite an existing command --
-// Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... })
-//
-// declare global {
-//   namespace Cypress {
-//     interface Chainable {
-//       login(email: string, password: string): Chainable<void>
-//       drag(subject: string, options?: Partial<TypeOptions>): Chainable<Element>
-//       dismiss(subject: string, options?: Partial<TypeOptions>): Chainable<Element>
-//       visit(originalFn: CommandOriginalFn, url: string, options: Partial<VisitOptions>): Chainable<Element>
-//     }
-//   }
-// }
-
-import "cypress-real-events";

package/components-package/cypress/support/component-index.html

@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-	<meta charset="utf-8">
-	<meta http-equiv="X-UA-Compatible" content="IE=edge">
-	<meta name="viewport" content="width=device-width,initial-scale=1.0">
-	<meta name="sap-allowedThemeOrigins" content="https://example.com">
-	<title>Components App</title>
-	<script data-ui5-config type="application/json">{}</script>
-</head>
-
-<body>
-	<div data-cy-root></div>
-</body>
-
-</html>

package/components-package/cypress/support/component.d.ts

@@ -1,23 +0,0 @@
-/// <reference types="cypress" />
-import { RenderOptions, HTMLTemplateResult } from 'lit';
-import "cypress-real-events";
-
-export type Renderable = HTMLTemplateResult;
-export interface MountUI5Options extends MountLitTemplateOptions {
-	ui5Configuration: object;
-}
-export type MountOptions = Partial<MountUI5Options>;
-export declare function mount<T extends keyof HTMLElementTagNameMap = any>(component: string | Renderable, options?: MountOptions): Cypress.Chainable<JQuery<HTMLElementTagNameMap[T]>>;
-declare global {
-	namespace Cypress {
-		interface Chainable {
-			/**
-			 * Mount your component into Cypress sandbox
-			 * @param component content to render by lit-html render function
-			 * @param options render options for custom rendering
-			 */
-			mount: typeof mount;
-		}
-	}
-}
-

package/components-package/cypress/support/component.js

@@ -1,34 +0,0 @@
-import { setupHooks } from '@cypress/mount-utils';
-import { unsafeHTML } from 'lit-html/directives/unsafe-html.js';
-import { mount } from 'cypress-ct-lit'
-import "./commands.js";
-
-let dispose;
-
-function cleanup() {
-	dispose?.();
-}
-
-function ui5Mount(component, options = {}) {
-	const configurationScript = document.head.querySelector("script[data-ui5-config]")
-	cleanup();
-
-	if (options.ui5Configuration) {
-		configurationScript.innerHTML = JSON.stringify(options.ui5Configuration);
-
-	}
-
-	dispose = () => {
-		configurationScript.innerHTML = "{}";
-	}
-
-	if (typeof component === "string") {
-		return mount(unsafeHTML(component), options)
-	}
-
-	return mount(component, options)
-}
-
-setupHooks(cleanup);
-
-Cypress.Commands.add('mount', ui5Mount)

package/components-package/cypress.config.js

@@ -1,19 +0,0 @@
-const { defineConfig } = require('cypress')
-const path = require("path");
-
-module.exports = defineConfig({
-	component: {
-		supportFile: path.join(__dirname, "cypress/support/component.js"),
-		indexHtmlFile: path.join(__dirname, "cypress/support/component-index.html"),
-		specPattern: ["**/specs/*.cy.{js,ts}", "**/specs/**/*.cy.{js,ts}"],
-		devServer: {
-			framework: 'cypress-ct-lit',
-			bundler: 'vite',
-		}
-	},
-	video: false,
-	screenshotOnRunFailure: false,
-	scrollBehavior: false,
-	viewportHeight: 1080,
-	viewportWidth: 1440,
-})

package/types/index.d.ts

@@ -1 +0,0 @@
-import "../components-package/cypress/support/component"