Merge branch 'master' into wtf/editablefiles

Author: alihcsumer

packages/generator-widget/CHANGELOG.md

@@ -6,6 +6,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+### Changed
+
+-   We migrated the generated unit tests to use React Testing Library instead of enzyme.
+
+-   We changed the copyright prompt to prefill the current year.
+
+-   We now enforce validation when choosing an organization name for a widget.
+
 ## [10.24.0] - 2025-09-24
 
 ### Changed

packages/generator-widget/generators/app/lib/prompttexts.js

@@ -9,7 +9,7 @@ function promptWidgetProperties(mxProjectDir, widgetName) {
                 if (/^([a-zA-Z]+)$/.test(input)) {
                     return true;
                 }
-                return "Your widget name can only contain one or more letters (a-z & A-Z). Please provide a valid name";
+                return "Your widget name may only contain characters matching [a-zA-Z]. Please provide a valid name.";
             },
             message: "What is the name of your widget?",
             default: widgetName ? widgetName : "MyWidget"
@@ -23,6 +23,15 @@ function promptWidgetProperties(mxProjectDir, widgetName) {
         {
             type: "input",
             name: "organization",
+            validate: input => {
+                if (/[^a-zA-Z0-9_.-]/.test(input)) {
+                    return "Your organization name may only contain characters matching [a-zA-Z0-9_.-]. Please provide a valid name.";
+                }
+                if (!/^([a-zA-Z0-9_-]+.)*[a-zA-Z0-9_-]+$/.test(input)) {
+                    return "Your organization name must follow the structure (namespace.)org-name, for example 'mendix' or 'com.mendix.widgets'. Please provide a valid name.";
+                }
+                return true;
+            },
             message: "Organization name",
             default: "Mendix",
             store: true
@@ -31,7 +40,7 @@ function promptWidgetProperties(mxProjectDir, widgetName) {
             type: "input",
             name: "copyright",
             message: "Add a copyright",
-            default: "© Mendix Technology BV 2022. All rights reserved.",
+            default: `© Mendix Technology BV ${new Date().getFullYear()}. All rights reserved.`,
             store: true
         },
         {

packages/generator-widget/generators/app/templates/packages/__tests__/outputs/package_native.json-js-unit.json

@@ -27,7 +27,7 @@
     "output": "./dist/testresults/TESTS-Jest.xml"
   },
   "devDependencies": {
-    "@mendix/pluggable-widgets-tools": "^10.15.0"
+    "@mendix/pluggable-widgets-tools": "^11.3.1"
   },
   "dependencies": {
 

packages/generator-widget/generators/app/templates/packages/__tests__/outputs/package_native.json-js.json

@@ -22,7 +22,7 @@
     "release": "pluggable-widgets-tools release:native"
   },
   "devDependencies": {
-    "@mendix/pluggable-widgets-tools": "^10.15.0"
+    "@mendix/pluggable-widgets-tools": "^11.3.1"
   },
   "dependencies": {
 

packages/generator-widget/generators/app/templates/packages/__tests__/outputs/package_native.json-ts-unit.json

@@ -27,7 +27,7 @@
     "output": "./dist/testresults/TESTS-Jest.xml"
   },
   "devDependencies": {
-    "@mendix/pluggable-widgets-tools": "^10.15.0",
+    "@mendix/pluggable-widgets-tools": "^11.3.1",
     "@types/big.js": "^6.0.2",
     "@types/jest": "^29.0.0"
   },

packages/generator-widget/generators/app/templates/packages/__tests__/outputs/package_native.json-ts.json

@@ -22,7 +22,7 @@
     "release": "pluggable-widgets-tools release:native"
   },
   "devDependencies": {
-    "@mendix/pluggable-widgets-tools": "^10.15.0",
+    "@mendix/pluggable-widgets-tools": "^11.3.1",
     "@types/big.js": "^6.0.2"
   },
   "dependencies": {

packages/generator-widget/generators/app/templates/packages/__tests__/outputs/package_web.json-js-e2e.json

@@ -26,18 +26,20 @@
     "release": "pluggable-widgets-tools release:web"
   },
   "devDependencies": {
-    "@mendix/pluggable-widgets-tools": "^10.15.0",
+    "@mendix/pluggable-widgets-tools": "^11.3.1",
     "cypress": "^10.10.0"
   },
   "dependencies": {
     "classnames": "^2.2.6"
   },
   "resolutions": {
     "react": "^18.2.0",
+    "react-dom": "18.2.0",
     "react-native": "0.72.7"
   },
   "overrides": {
     "react": "^18.2.0",
+    "react-dom": "18.2.0",
     "react-native": "0.72.7"
   }
 }

packages/generator-widget/generators/app/templates/packages/__tests__/outputs/package_web.json-js-unit-e2e.json

@@ -21,25 +21,27 @@
     "build": "pluggable-widgets-tools build:web",
     "lint": "pluggable-widgets-tools lint",
     "lint:fix": "pluggable-widgets-tools lint:fix",
-    "test": "pluggable-widgets-tools test:unit:web --no-cache --ci && npm run test:e2e",
-    "test:unit": "pluggable-widgets-tools test:unit:web --coverage",
+    "test": "pluggable-widgets-tools test:unit:web && npm run test:e2e",
+    "test:unit": "pluggable-widgets-tools test:unit:web",
     "test:e2e": "npx cypress open --browser chrome --e2e",
     "prerelease": "npm run lint",
     "release": "pluggable-widgets-tools release:web"
   },
   "devDependencies": {
-    "@mendix/pluggable-widgets-tools": "^10.15.0",
+    "@mendix/pluggable-widgets-tools": "^11.3.1",
     "cypress": "^10.10.0"
   },
   "dependencies": {
     "classnames": "^2.2.6"
   },
   "resolutions": {
     "react": "^18.2.0",
+    "react-dom": "18.2.0",
     "react-native": "0.72.7"
   },
   "overrides": {
     "react": "^18.2.0",
+    "react-dom": "18.2.0",
     "react-native": "0.72.7"
   }
 }

packages/generator-widget/generators/app/templates/packages/__tests__/outputs/package_web.json-js-unit.json

@@ -21,23 +21,25 @@
     "build": "pluggable-widgets-tools build:web",
     "lint": "pluggable-widgets-tools lint",
     "lint:fix": "pluggable-widgets-tools lint:fix",
-    "test": "pluggable-widgets-tools test:unit:web --no-cache --ci",
-    "test:unit": "pluggable-widgets-tools test:unit:web --coverage",
+    "test": "pluggable-widgets-tools test:unit:web",
+    "test:unit": "pluggable-widgets-tools test:unit:web",
     "prerelease": "npm run lint",
     "release": "pluggable-widgets-tools release:web"
   },
   "devDependencies": {
-    "@mendix/pluggable-widgets-tools": "^10.15.0"
+    "@mendix/pluggable-widgets-tools": "^11.3.1"
   },
   "dependencies": {
     "classnames": "^2.2.6"
   },
   "resolutions": {
     "react": "^18.2.0",
+    "react-dom": "18.2.0",
     "react-native": "0.72.7"
   },
   "overrides": {
     "react": "^18.2.0",
+    "react-dom": "18.2.0",
     "react-native": "0.72.7"
   }
 }

packages/generator-widget/generators/app/templates/packages/__tests__/outputs/package_web.json-js.json

@@ -25,17 +25,19 @@
     "release": "pluggable-widgets-tools release:web"
   },
   "devDependencies": {
-    "@mendix/pluggable-widgets-tools": "^10.15.0"
+    "@mendix/pluggable-widgets-tools": "^11.3.1"
   },
   "dependencies": {
     "classnames": "^2.2.6"
   },
   "resolutions": {
     "react": "^18.2.0",
+    "react-dom": "18.2.0",
     "react-native": "0.72.7"
   },
   "overrides": {
     "react": "^18.2.0",
+    "react-dom": "18.2.0",
     "react-native": "0.72.7"
   }
 }