@ui5/webcomponents-tools 2.3.0-rc.2 → 2.3.0

package/CHANGELOG.md

@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.3.0](https://github.com/SAP/ui5-webcomponents/compare/v2.3.0-rc.3...v2.3.0) (2024-10-02)
+
+**Note:** Version bump only for package @ui5/webcomponents-tools
+
+
+
+
+
+# [2.3.0-rc.3](https://github.com/SAP/ui5-webcomponents/compare/v2.3.0-rc.2...v2.3.0-rc.3) (2024-09-26)
+
+
+### Bug Fixes
+
+* nps.js works with the JS flow ([#9942](https://github.com/SAP/ui5-webcomponents/issues/9942)) ([b42ef95](https://github.com/SAP/ui5-webcomponents/commit/b42ef9567bcbd187a5f8d183e7d5014492ee845a))
+
+
+
+
+
 # [2.3.0-rc.2](https://github.com/SAP/ui5-webcomponents/compare/v2.3.0-rc.1...v2.3.0-rc.2) (2024-09-19)
 
 **Note:** Version bump only for package @ui5/webcomponents-tools

package/components-package/cypress.config.js

@@ -1,6 +1,5 @@
 const { defineConfig } = require('cypress')
 const path = require("path");
-const rootConfig = require("../../../vite.config.js");
 
 module.exports = defineConfig({
 	component: {
@@ -10,7 +9,6 @@ module.exports = defineConfig({
 		devServer: {
 			framework: 'cypress-ct-lit',
 			bundler: 'vite',
-			viteConfig: rootConfig,
 		}
 	},
 	video: false,

package/components-package/nps.js

@@ -68,7 +68,7 @@ const getScripts = (options) => {
 			styleRelated: "nps build.styles build.jsonImports build.jsImports",
 		},
 		prepare: {
-			default: `${tsCrossEnv} nps clean prepare.all copyProps prepare.typescript generateAPI`,
+			default: `${tsCrossEnv} nps clean prepare.all ${options.legacy ? "copy" : ""} copyProps prepare.typescript generateAPI`,
 			all: 'concurrently "nps build.templates" "nps build.i18n" "nps prepare.styleRelated" "nps build.illustrations"',
 			styleRelated: "nps build.styles build.jsonImports build.jsImports",
 			typescript: tsCommandOld,
@@ -100,12 +100,18 @@ const getScripts = (options) => {
 			illustrations: createIllustrationsJSImportsScript,
 		},
 		copyProps: `node "${LIB}/copy-and-watch/index.js" --silent "src/i18n/*.properties" dist/`,
+		copy: {
+			default: "nps copy.src copy.props",
+			src: `node "${LIB}/copy-and-watch/index.js" --silent "src/**/*.{js,json}" dist/`,
+			props: `node "${LIB}/copy-and-watch/index.js" --silent "src/i18n/*.properties" dist/`,
+		},
 		watch: {
-			default: `${tsCrossEnv} concurrently "nps watch.templates" "nps watch.typescript" "nps watch.styles" "nps watch.i18n" "nps watch.props"`,
+			default: `${tsCrossEnv} concurrently "nps watch.templates" "nps watch.typescript" ${options.legacy ? '"nps watch.src"' : ""} "nps watch.styles" "nps watch.i18n" "nps watch.props"`,
 			devServer: 'concurrently "nps watch.default" "nps watch.bundle"',
+			src: 'nps "copy.src --watch --safe --skip-initial-copy"',
 			typescript: tsWatchCommandStandalone,
 			props: 'nps "copyProps --watch --safe --skip-initial-copy"',
-			bundle: `node ${LIB}/dev-server/dev-server.js ${viteConfig}`,
+			bundle: `node ${LIB}/dev-server/dev-server.mjs ${viteConfig}`,
 			styles: {
 				default: 'concurrently "nps watch.styles.themes" "nps watch.styles.components"',
 				themes: 'nps "build.styles.themes -w"',
@@ -132,7 +138,7 @@ const getScripts = (options) => {
 			},
 			watchWithBundle: 'concurrently "nps scope.watch" "nps scope.bundle" ',
 			watch: 'concurrently "nps watch.templates" "nps watch.props" "nps watch.styles"',
-			bundle: `node ${LIB}/dev-server/dev-server.js ${viteConfig}`,
+			bundle: `node ${LIB}/dev-server/dev-server.mjs ${viteConfig}`,
 		},
 		generateAPI: {
 			default: tsOption ? "nps generateAPI.generateCEM generateAPI.validateCEM" : "",

package/lib/dev-server/{dev-server.js → dev-server.mjs}

@@ -1,7 +1,7 @@
-const fs = require("fs/promises");
-const { createServer } = require('vite');
-const yargs = require('yargs/yargs')
-const { hideBin } = require('yargs/helpers')
+import fs from "fs/promises";
+import { createServer } from 'vite';
+import yargs from 'yargs/yargs';
+import { hideBin }  from 'yargs/helpers';
 
 const argv = yargs(hideBin(process.argv))
 	.alias("c", "config")

package/lib/i18n/defaults.js

@@ -69,7 +69,7 @@ const generate = async () => {
 		const texts = textKeys.map(prop => getTextInfo(prop, properties[prop], defaultLanguageProperties && defaultLanguageProperties[prop])).join('');
 
 		// tabs are intentionally mixed to have proper identation in the produced file
-		return `${tsMode ? `import { I18nText } from "@ui5/webcomponents-base/dist/i18nBundle.js";` : ""}
+		return `${tsMode ? `import type { I18nText } from "@ui5/webcomponents-base/dist/i18nBundle.js";` : ""}
 ${texts}
 export {${textKeys.join()}};`;
 	};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ui5/webcomponents-tools",
-  "version": "2.3.0-rc.2",
+  "version": "2.3.0",
   "description": "UI5 Web Components: webcomponents.tools",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -68,12 +68,12 @@
     "resolve": "^1.20.0",
     "rimraf": "^3.0.2",
     "slash": "3.0.0",
-    "vite": "^4.4.9",
+    "vite": "^5.4.8",
     "wdio-chromedriver-service": "^7.3.2"
   },
   "peerDependencies": {
     "chromedriver": "*",
-    "typescript": "^5.2.2"
+    "typescript": "^5.6.2"
   },
   "peerDependenciesMeta": {
     "typescript": {
@@ -86,5 +86,5 @@
     "esbuild": "^0.19.9",
     "yargs": "^17.5.1"
   },
-  "gitHead": "0b5a320e502e0b83a5e7dc45898e1115dce13b81"
+  "gitHead": "ce9e1d4d18110e7d6352f63347ed80249588aff9"
 }

package/tsconfig.json

@@ -1,5 +1,6 @@
 {
 	"compilerOptions": {
+		"module": "NodeNext",
 		"target": "ES2021",
 		"lib": [
 			"DOM",
@@ -11,6 +12,5 @@
 		"sourceMap": true,
 		"inlineSources": true,
 		"strict": true,
-		"moduleResolution": "node"
 	}
 }

package/lib/dev-server/ssr-dom-shim-loader.js

@@ -1,26 +0,0 @@
-const fs = require("fs");
-
-/**
- * UI5Elements loads the ssr-dom.js file with a package specifier to use the export conditions
- * in the package.json so that a shim for the dom can be loaded from SSR environments
- * This however makes the TS Checker plugin used for development try to load the file from dist as input
- * This plugin loads an empty file and TS ignores the file completely
- */
-
-const ssrDomShimLoader = async () => {
-	return {
-		name: 'ssr-dom-shim-loader',
-		resolveId(id) {
-			if (id === "@ui5/webcomponents-base/dist/ssr-dom.js") {
-				return "\0shim"
-			}
-		},
-		load(id) {
-			if (id === "\0shim") {
-				return "";
-			}
-		}
-	}
-};
-
-module.exports = ssrDomShimLoader;