chore: remove redundant names from package json resources (#20239)

* chore: remove redundant names from package json resources

* chore: update remaining package names with a scope

flow-client/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@vaadin/flow-deps",
+  "name": "@vaadin/flow-client",
   "description": "Flow client package",
   "version": "0.0.1",
   "main": "src/main/resources/META-INF/frontend/Flow",

flow-polymer2lit/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "flow-polymer2lit",
+  "name": "@vaadin/flow-polymer2lit",
   "version": "0.0.1",
   "description": "A migration tool for Polymer to Lit for selected cases",
   "author": "Vaadin Ltd",

flow-server/src/main/resources/com/vaadin/flow/server/frontend/dependencies/default/package.json

@@ -1,13 +1,6 @@
 {
-  "name": "flow-default-dependencies",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "Artur Signell",
-  "license": "Apache-2.0",
+  "private": true,
+  "description": "A list of default Flow dependencies",
   "dependencies": {
     "@polymer/polymer": "3.5.2",
     "@vaadin/common-frontend": "0.0.19",

flow-server/src/main/resources/com/vaadin/flow/server/frontend/dependencies/react-router/package.json

@@ -1,13 +1,6 @@
 {
-  "name": "flow-default-react-router-dependencies",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "",
-  "license": "Apache-2.0",
+  "private": true,
+  "description": "A list of Flow dependencies when using React router",
   "dependencies": {
     "react": "18.3.1",
     "react-dom": "18.3.1",

flow-server/src/main/resources/com/vaadin/flow/server/frontend/dependencies/vaadin-router/package.json

@@ -1,13 +1,6 @@
 {
-  "name": "flow-vaadin-router-dependencies",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "",
-  "license": "Apache-2.0",
+  "private": true,
+  "description": "A list of Flow dependencies when using Vaadin router for Web Components",
   "dependencies": {
     "@vaadin/router": "2.0.0"
   },

flow-server/src/main/resources/com/vaadin/flow/server/frontend/dependencies/vite/package.json

@@ -1,7 +1,6 @@
 {
-  "name": "flow-vite-dependencies",
-  "version": "1.0.0",
-  "description": "",
+  "private": true,
+  "description": "A ",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

flow-server/src/main/resources/plugins/react-function-location-plugin/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "react-function-location-plugin",
+  "name": "@vaadin/react-function-location-plugin",
   "version": "1.0.0",
   "description": "A Vite plugin for gather development information about source location of React functions",
   "main": "react-function-location-plugin.js",

flow-server/src/test/resources/com/vaadin/flow/server/frontend/dependencies/hilla/components/lit/package.json

@@ -1,13 +1,6 @@
 {
-  "name": "hilla-components-dependencies",
-  "version": "1.0.0",
+  "private": true,
   "description": "A list of Hilla Lit components that are added by Flow automatically to package.json",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "",
-  "license": "Apache-2.0",
   "dependencies": {
     "@vaadin/hilla-lit-form": "24.4.0-alpha2"
   },

flow-server/src/test/resources/com/vaadin/flow/server/frontend/dependencies/hilla/components/no-deps/package.json

@@ -1,11 +1,4 @@
 {
-  "name": "hilla-components-dependencies",
-  "version": "1.0.0",
-  "description": "A list of Hilla React components that are added by Flow automatically to package.json",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "",
-  "license": "Apache-2.0"
+  "private": true,
+  "description": "A list of Hilla React components that are added by Flow automatically to package.json"
 }

flow-server/src/test/resources/com/vaadin/flow/server/frontend/dependencies/hilla/components/react/package.json

@@ -1,13 +1,6 @@
 {
-  "name": "hilla-components-dependencies",
-  "version": "1.0.0",
+  "private": true,
   "description": "A list of Hilla React components that are added by Flow automatically to package.json",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "",
-  "license": "Apache-2.0",
   "dependencies": {
     "@vaadin/hilla-react-auth": "24.4.0-alpha2",
     "@vaadin/hilla-react-crud": "24.4.0-alpha2",

flow-server/src/test/resources/versions/no_vaadin_package.json

@@ -1,5 +1,5 @@
 {
-  "name": "no-name",
+  "private": true,
   "license": "UNLICENSED",
   "dependencies": {
     "@polymer/iron-list": "3.0.0",

flow-server/src/test/resources/versions/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "no-name",
+  "private": true,
   "license": "UNLICENSED",
   "vaadin": {
     "dependencies": {

flow-server/src/test/resources/versions/user_package.json

@@ -1,5 +1,5 @@
 {
-  "name": "no-name",
+  "private": true,
   "license": "UNLICENSED",
   "vaadin": {
     "dependencies": {

flow-tests/test-frontend/vite-basics/package.json

@@ -1,15 +1,15 @@
 {
-  "name": "no-name",
+  "private": true,
   "license": "UNLICENSED",
   "type": "module",
   "scripts": {
     "postinstall": "node -e \"fs.writeFileSync('target/classes/main.postinstall', 'hello')\""
   },
   "dependencies": {
     "@polymer/polymer": "3.5.1",
-    "@testscope/all": "../vite-test-assets/packages/@testscope/all",
-    "@testscope/button": "../vite-test-assets/packages/@testscope/button",
-    "@testscope/map": "../vite-test-assets/packages/@testscope/map",
+    "@vaadin/testscope-all": "../vite-test-assets/packages/@vaadin/testscope-all",
+    "@vaadin/testscope-button": "../vite-test-assets/packages/@vaadin/testscope-button",
+    "@vaadin/testscope-map": "../vite-test-assets/packages/@vaadin/testscope-map",
     "@vaadin/bundles": "../vite-test-assets/packages/@vaadin/bundles",
     "@vaadin/common-frontend": "0.0.19",
     "@vaadin/polymer-legacy-adapter": "24.4.9",
@@ -19,8 +19,8 @@
     "construct-style-sheets-polyfill": "3.1.0",
     "copy-to-clipboard": "^3.3.1",
     "lit": "3.2.0",
-    "package-outside-npm": "file:../vite-test-assets/packages/package-outside-npm",
-    "package2-outside-npm": "../vite-test-assets/packages/package2-outside-npm",
+    "@vaadin/test-package-outside-npm": "file:../vite-test-assets/packages/@vaadin/test-package-outside-npm",
+    "@vaadin/test-package2-outside-npm": "../vite-test-assets/packages/@vaadin/test-package2-outside-npm",
     "react": "18.3.1",
     "react-dom": "18.3.1",
     "react-router-dom": "6.26.2"
@@ -47,12 +47,12 @@
     "workbox-precaching": "7.1.0"
   },
   "overrides": {
-    "@testscope/all": "$@testscope/all",
-    "@testscope/button": "$@testscope/button",
+    "@vaadin/testscope-all": "$@vaadin/testscope-all",
+    "@vaadin/testscope-button": "$@vaadin/testscope-button",
     "@vaadin/bundles": "$@vaadin/bundles",
     "copy-to-clipboard": "$copy-to-clipboard",
-    "package-outside-npm": "$package-outside-npm",
-    "package2-outside-npm": "$package2-outside-npm",
+    "@vaadin/test-package-outside-npm": "$@vaadin/test-package-outside-npm",
+    "@vaadin/test-package2-outside-npm": "$@vaadin/test-package2-outside-npm",
     "glob": "$glob",
     "rollup-plugin-brotli": "$rollup-plugin-brotli",
     "typescript": "$typescript",

flow-tests/test-frontend/vite-basics/src/main/frontend/testscopebuttonloader.js

@@ -1,4 +1,4 @@
-import '@testscope/all';
+import '@vaadin/testscope-all';
 
-import { Button } from '@testscope/button';
+import { Button } from '@vaadin/testscope-button';
 window.BundleButtonClass = Button;

flow-tests/test-frontend/vite-basics/src/main/frontend/testscopemaploader.js

@@ -1,4 +1,4 @@
-import '@testscope/all';
+import '@vaadin/testscope-all';
 
-import { Map } from '@testscope/map';
+import { Map } from '@vaadin/testscope-map';
 window.BundleMapClass = Map;

flow-tests/test-frontend/vite-basics/src/main/java/com/vaadin/viteapp/views/empty/MainView.java

@@ -13,8 +13,8 @@
 
 @Route("")
 @JsModule("./jsonloader.js")
-@JsModule("package-outside-npm/index.js")
-@JsModule("package2-outside-npm/index.js")
+@JsModule("@vaadin/test-package-outside-npm/index.js")
+@JsModule("@vaadin/test-package2-outside-npm/index.js")
 @JsModule("./testscopebuttonloader.js")
 @JsModule("./testscopemaploader.js")
 @JsModule("./importdir.js")

flow-tests/test-frontend/vite-basics/src/test/java/com/vaadin/viteapp/BundlesIT.java

@@ -41,9 +41,9 @@ public void optimizeDepsExcludesBundles() {
 
     @Test
     public void optimizeDepsExcludeBundleContents() {
-        Assert.assertTrue(isExcluded("@testscope/all"));
-        Assert.assertTrue(isExcluded("@testscope/button"));
-        Assert.assertTrue(isExcluded("@testscope/map"));
+        Assert.assertTrue(isExcluded("@vaadin/testscope-all"));
+        Assert.assertTrue(isExcluded("@vaadin/testscope-button"));
+        Assert.assertTrue(isExcluded("@vaadin/testscope-map"));
     }
 
     private boolean isExcluded(String dependency) {

flow-tests/test-frontend/vite-context-path/package.json

@@ -1,12 +1,12 @@
 {
-  "name": "no-name",
+  "private": true,
   "license": "UNLICENSED",
   "type": "module",
   "dependencies": {
     "@polymer/polymer": "3.5.1",
-    "@testscope/all": "../vite-test-assets/packages/@testscope/all",
-    "@testscope/button": "../vite-test-assets/packages/@testscope/button",
-    "@testscope/map": "../vite-test-assets/packages/@testscope/map",
+    "@vaadin/testscope-all": "../vite-test-assets/packages/@vaadin/testscope-all",
+    "@vaadin/testscope-button": "../vite-test-assets/packages/@vaadin/testscope-button",
+    "@vaadin/testscope-map": "../vite-test-assets/packages/@vaadin/testscope-map",
     "@vaadin/bundles": "../vite-test-assets/packages/@vaadin/bundles-old",
     "@vaadin/common-frontend": "0.0.19",
     "@vaadin/polymer-legacy-adapter": "24.4.9",

flow-tests/test-frontend/vite-context-path/src/main/java/com/vaadin/viteapp/views/empty/MainView.java

@@ -7,7 +7,7 @@
 import com.vaadin.flow.router.Route;
 
 @Route("")
-@JsModule("@testscope/all")
+@JsModule("@vaadin/testscope-all")
 public class MainView extends Div {
     public MainView() {
         add(new H2("Hello world!"), new HtmlComponent("testscope-button"),

flow-tests/test-frontend/vite-context-path/src/test/java/com/vaadin/viteapp/BundlesIT.java

@@ -23,8 +23,8 @@ public void bundlesIsNotUsedWhenHasVersionMismatch() {
 
     @Test
     public void optimizeDepsNotExcludeBundleContents() {
-        Assert.assertFalse(isExcluded("@testscope/all"));
-        Assert.assertFalse(isExcluded("@testscope/button"));
+        Assert.assertFalse(isExcluded("@vaadin/testscope-all"));
+        Assert.assertFalse(isExcluded("@vaadin/testscope-button"));
     }
 
     private boolean isExcluded(String dependency) {

flow-tests/test-frontend/vite-production/package.json

@@ -1,12 +1,12 @@
 {
-  "name": "no-name",
+  "private": true,
   "license": "UNLICENSED",
   "type": "module",
   "dependencies": {
     "@polymer/polymer": "3.5.1",
-    "@testscope/all": "../vite-test-assets/packages/@testscope/all",
-    "@testscope/button": "../vite-test-assets/packages/@testscope/button",
-    "@testscope/map": "../vite-test-assets/packages/@testscope/map",
+    "@vaadin/testscope-all": "../vite-test-assets/packages/@vaadin/testscope-all",
+    "@vaadin/testscope-button": "../vite-test-assets/packages/@vaadin/testscope-button",
+    "@vaadin/testscope-map": "../vite-test-assets/packages/@vaadin/testscope-map",
     "@vaadin/bundles": "../vite-test-assets/packages/@vaadin/bundles",
     "@vaadin/common-frontend": "0.0.19",
     "@vaadin/polymer-legacy-adapter": "24.4.9",
@@ -15,8 +15,8 @@
     "@vaadin/vaadin-themable-mixin": "24.4.9",
     "construct-style-sheets-polyfill": "3.1.0",
     "lit": "3.2.0",
-    "package-outside-npm": "file:../vite-test-assets/packages/package-outside-npm",
-    "package2-outside-npm": "../vite-test-assets/packages/package2-outside-npm",
+    "@vaadin/test-package-outside-npm": "file:../vite-test-assets/packages/@vaadin/test-package-outside-npm",
+    "@vaadin/test-package2-outside-npm": "../vite-test-assets/packages/@vaadin/test-package2-outside-npm",
     "react": "18.3.1",
     "react-dom": "18.3.1",
     "react-router-dom": "6.26.2"

flow-tests/test-frontend/vite-production/src/main/java/com/vaadin/viteapp/views/empty/MainView.java

@@ -11,10 +11,10 @@
 import com.vaadin.flow.router.Route;
 
 @Route("")
-@JsModule("@testscope/button")
-@JsModule("@testscope/map")
-@JsModule("package-outside-npm/index.js")
-@JsModule("package2-outside-npm/index.js")
+@JsModule("@vaadin/testscope-button")
+@JsModule("@vaadin/testscope-map")
+@JsModule("@vaadin/test-package-outside-npm/index.js")
+@JsModule("@vaadin/test-package2-outside-npm/index.js")
 @CssImport("./image.css")
 public class MainView extends Div {
 

flow-tests/test-frontend/vite-test-assets/packages/@vaadin/bundles-old/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@test/bundles",
+  "name": "@vaadin/bundles-old",
   "version": "0.1.0",
   "description": "",
   "type": "module",

flow-tests/test-frontend/vite-test-assets/packages/@vaadin/bundles-old/vaadin-bundle.json

@@ -1,6 +1,6 @@
 {
   "packages": {
-    "@testscope/all": {
+    "@vaadin/testscope-all": {
       "version": "0.1.0",
       "exposes": {
         "./all.js": {
@@ -9,19 +9,19 @@
         ".": {
           "exports": [
             {
-              "source": "@testscope/all/all.js"
+              "source": "@vaadin/testscope-all/all.js"
             }
           ]
         }
       }
     },
-    "@testscope/button": {
+    "@vaadin/testscope-button": {
       "version": "1.0.0-alpha1",
       "exposes": {
         "./testscope-button.js": {
           "exports": [
             {
-              "source": "@testscope/button/src/testscope-button.js"
+              "source": "@vaadin/testscope-button/src/testscope-button.js"
             }
           ]
         },
@@ -33,19 +33,19 @@
         ".": {
           "exports": [
             {
-              "source": "@testscope/button/testscope-button.js"
+              "source": "@vaadin/testscope-button/testscope-button.js"
             }
           ]
         }
       }
     },
-    "@testscope/map": {
+    "@vaadin/testscope-map": {
       "version": "1.0.0-alpha1",
       "exposes": {
         "./testscope-map.js": {
           "exports": [
             {
-              "source": "@testscope/map/src/testscope-map.js"
+              "source": "@vaadin/testscope-map/src/testscope-map.js"
             }
           ]
         },
@@ -62,7 +62,7 @@
         ".": {
           "exports": [
             {
-              "source": "@testscope/map/testscope-map.js"
+              "source": "@vaadin/testscope-map/testscope-map.js"
             }
           ]
         }