diff --git a/flow-server/src/main/java/com/vaadin/flow/server/frontend/NodeUpdater.java b/flow-server/src/main/java/com/vaadin/flow/server/frontend/NodeUpdater.java index 710a46814ba..c015f1c33ea 100644 --- a/flow-server/src/main/java/com/vaadin/flow/server/frontend/NodeUpdater.java +++ b/flow-server/src/main/java/com/vaadin/flow/server/frontend/NodeUpdater.java @@ -420,6 +420,7 @@ Map getDefaultDevDependencies() { defaults.put("workbox-core", WORKBOX_VERSION); defaults.put("workbox-precaching", WORKBOX_VERSION); defaults.put("glob", "7.1.6"); + defaults.put("async", "3.2.2"); return defaults; } diff --git a/flow-tests/test-frontend/test-npm/package-lock.json b/flow-tests/test-frontend/test-npm/package-lock.json index 4816c0492ae..ff9db40b610 100644 --- a/flow-tests/test-frontend/test-npm/package-lock.json +++ b/flow-tests/test-frontend/test-npm/package-lock.json @@ -16,6 +16,7 @@ "lit": "2.2.1" }, "devDependencies": { + "async": "3.2.2", "chokidar": "^3.5.0", "compression-webpack-plugin": "4.0.1", "css-loader": "5.2.7", @@ -3030,13 +3031,10 @@ } }, "node_modules/async": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", - "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", - "dev": true, - "dependencies": { - "lodash": "^4.17.14" - } + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.2.tgz", + "integrity": "sha512-H0E+qZaDEfx/FY4t7iLRv1W2fFI6+pyCeTw1uN20AQPiwqwM6ojPxHxdLv4z8hi2DtnW9BOckSspLucW7pIE5g==", + "dev": true }, "node_modules/at-least-node": { "version": "1.0.0", @@ -9037,6 +9035,15 @@ "node": ">= 0.12.0" } }, + "node_modules/portfinder/node_modules/async": { + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz", + "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==", + "dev": true, + "dependencies": { + "lodash": "^4.17.14" + } + }, "node_modules/portfinder/node_modules/debug": { "version": "3.2.7", "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", @@ -13752,7 +13759,7 @@ "resolved": "https://registry.npmjs.org/@polymer/iron-flex-layout/-/iron-flex-layout-3.0.1.tgz", "integrity": "sha512-7gB869czArF+HZcPTVSgvA7tXYFze9EKckvM95NB7SqYF+NnsQyhoXgKnpFwGyo95lUjUW9TFDLUwDXnCYFtkw==", "requires": { - "@polymer/polymer": "3.4.1" + "@polymer/polymer": "^3.0.0" } }, "@polymer/iron-icon": { @@ -13762,7 +13769,7 @@ "requires": { "@polymer/iron-flex-layout": "^3.0.0-pre.26", "@polymer/iron-meta": "^3.0.0-pre.26", - "@polymer/polymer": "3.4.1" + "@polymer/polymer": "^3.0.0" } }, "@polymer/iron-iconset-svg": { @@ -13771,7 +13778,7 @@ "integrity": "sha512-XNwURbNHRw6u2fJe05O5fMYye6GSgDlDqCO+q6K1zAnKIrpgZwf2vTkBd5uCcZwsN0FyCB3mvNZx4jkh85dRDw==", "requires": { "@polymer/iron-meta": "^3.0.0-pre.26", - "@polymer/polymer": "3.4.1" + "@polymer/polymer": "^3.0.0" } }, "@polymer/iron-meta": { @@ -13779,7 +13786,7 @@ "resolved": "https://registry.npmjs.org/@polymer/iron-meta/-/iron-meta-3.0.1.tgz", "integrity": "sha512-pWguPugiLYmWFV9UWxLWzZ6gm4wBwQdDy4VULKwdHCqR7OP7u98h+XDdGZsSlDPv6qoryV/e3tGHlTIT0mbzJA==", "requires": { - "@polymer/polymer": "3.4.1" + "@polymer/polymer": "^3.0.0" } }, "@polymer/polymer": { @@ -14098,7 +14105,7 @@ "integrity": "sha512-mclsSx9suUXSPNWwlCOv1Hd0XFGXgK8ktCi1YuEVyr1T4T7Rmu2T9E6c2jLq65Dk7aT4XKZo+1oLkghbsLIxEA==", "requires": { "@open-wc/dedupe-mixin": "^1.3.0", - "@polymer/polymer": "3.4.1", + "@polymer/polymer": "^3.0.0", "@vaadin/component-base": "23.1.0-alpha2", "@vaadin/vaadin-lumo-styles": "23.1.0-alpha2", "@vaadin/vaadin-material-styles": "23.1.0-alpha2", @@ -14119,10 +14126,10 @@ "integrity": "sha512-pTlz7oMV0SegD0iZj2/Qfum2RO0bfpn8H6FvaiwtYSPKo7jXIEzVm/YUmLi/WobcfPO2xC3tAXM4ybYCEN8wqw==", "requires": { "@open-wc/dedupe-mixin": "^1.3.0", - "@polymer/polymer": "3.4.1", + "@polymer/polymer": "^3.0.0", "@vaadin/vaadin-development-mode-detector": "^2.0.0", "@vaadin/vaadin-usage-statistics": "^2.1.0", - "lit": "2.2.1" + "lit": "^2.0.0" } }, "@vaadin/email-field": { @@ -14130,7 +14137,7 @@ "resolved": "https://registry.npmjs.org/@vaadin/email-field/-/email-field-23.1.0-alpha2.tgz", "integrity": "sha512-PPq7YYZx5IMAgJfLzbf/58ik0zX2p6UiGtqlhg8qYXSKX8c4YBzEQtkHF0jjsPjxXQwWmnE1tDWcZ6j4ivWDqA==", "requires": { - "@polymer/polymer": "3.4.1", + "@polymer/polymer": "^3.0.0", "@vaadin/component-base": "23.1.0-alpha2", "@vaadin/text-field": "23.1.0-alpha2", "@vaadin/vaadin-lumo-styles": "23.1.0-alpha2", @@ -14144,9 +14151,9 @@ "integrity": "sha512-PdKunCuyL2McsecHicgr/T2ni3QFQD5HziAYASiFI4uDqD6mQWCv50kK136pLoTlWicrB2tUCzS/hd/tkZ/maw==", "requires": { "@open-wc/dedupe-mixin": "^1.3.0", - "@polymer/polymer": "3.4.1", + "@polymer/polymer": "^3.0.0", "@vaadin/component-base": "23.1.0-alpha2", - "lit": "2.2.1" + "lit": "^2.0.0" } }, "@vaadin/flow-frontend": { @@ -14157,11 +14164,11 @@ "resolved": "https://registry.npmjs.org/@vaadin/icon/-/icon-23.1.0-alpha2.tgz", "integrity": "sha512-+C9Llh2PtucCHtuNzmBIYZ5E4U0xgds7kfXWf1+ts5cPJzhlnHKQ9SgUQvDCiM9KqLeienhzRriixavGAlVJjA==", "requires": { - "@polymer/polymer": "3.4.1", + "@polymer/polymer": "^3.0.0", "@vaadin/component-base": "23.1.0-alpha2", "@vaadin/vaadin-lumo-styles": "23.1.0-alpha2", "@vaadin/vaadin-themable-mixin": "23.1.0-alpha2", - "lit": "2.2.1" + "lit": "^2.0.0" } }, "@vaadin/input-container": { @@ -14169,7 +14176,7 @@ "resolved": "https://registry.npmjs.org/@vaadin/input-container/-/input-container-23.1.0-alpha2.tgz", "integrity": "sha512-BaP4xsQnvD7vb0kKMXRCOyjHD7mBN7IgI0gh2RirGrwbjVKx3Y4xGs9tFQjnt4ZcbBFqda/xyPCK/rv417vH0w==", "requires": { - "@polymer/polymer": "3.4.1", + "@polymer/polymer": "^3.0.0", "@vaadin/component-base": "23.1.0-alpha2", "@vaadin/vaadin-lumo-styles": "23.1.0-alpha2", "@vaadin/vaadin-material-styles": "23.1.0-alpha2", @@ -14181,7 +14188,7 @@ "resolved": "https://registry.npmjs.org/@vaadin/integer-field/-/integer-field-23.1.0-alpha2.tgz", "integrity": "sha512-MArEXTYYrxAe+XrplS+di3FCdUAdoUAtgCLMKuUWs7FB9tuaZb3G3Tid1sKZwwtnt4Nwu4Qvb71O9Kb1OMSCtA==", "requires": { - "@polymer/polymer": "3.4.1", + "@polymer/polymer": "^3.0.0", "@vaadin/number-field": "23.1.0-alpha2", "@vaadin/vaadin-lumo-styles": "23.1.0-alpha2", "@vaadin/vaadin-material-styles": "23.1.0-alpha2" @@ -14192,7 +14199,7 @@ "resolved": "https://registry.npmjs.org/@vaadin/number-field/-/number-field-23.1.0-alpha2.tgz", "integrity": "sha512-s4WjPOwey2mOGAukjR48LOAOg6SmPMy0sjGxTfooWLZMYQ8K2f40XXkp7njsSMxTvqxIRoY5Mu/NF1zid2wITg==", "requires": { - "@polymer/polymer": "3.4.1", + "@polymer/polymer": "^3.0.0", "@vaadin/component-base": "23.1.0-alpha2", "@vaadin/field-base": "23.1.0-alpha2", "@vaadin/input-container": "23.1.0-alpha2", @@ -14206,7 +14213,7 @@ "resolved": "https://registry.npmjs.org/@vaadin/password-field/-/password-field-23.1.0-alpha2.tgz", "integrity": "sha512-3cJsEO8OYNqXtXZMqdfV/t6ifjVaXOSPKDPF3ErPavPOzOLKXRc+bmuQUI7q0vG6/tewSl/S0og0sG33tutNTw==", "requires": { - "@polymer/polymer": "3.4.1", + "@polymer/polymer": "^3.0.0", "@vaadin/button": "23.1.0-alpha2", "@vaadin/text-field": "23.1.0-alpha2", "@vaadin/vaadin-lumo-styles": "23.1.0-alpha2", @@ -14227,7 +14234,7 @@ "resolved": "https://registry.npmjs.org/@vaadin/text-area/-/text-area-23.1.0-alpha2.tgz", "integrity": "sha512-AsoVByQABQCyBIynkPtqusADGDuv0dBOyO7UxPDl4LFuUdhWXKFUTxpVdHuuR2TliDEz0mU1Yy+M+dWEYDtKHg==", "requires": { - "@polymer/polymer": "3.4.1", + "@polymer/polymer": "^3.0.0", "@vaadin/component-base": "23.1.0-alpha2", "@vaadin/field-base": "23.1.0-alpha2", "@vaadin/input-container": "23.1.0-alpha2", @@ -14241,7 +14248,7 @@ "resolved": "https://registry.npmjs.org/@vaadin/text-field/-/text-field-23.1.0-alpha2.tgz", "integrity": "sha512-2XjiY5Pde6iPXsg0TTriLxlUjxbVO6WMIL6SYTcEuBqzMNhO5Vrcmyli/rp7yj+zPMwHchqH40HuRoYPM6sG3g==", "requires": { - "@polymer/polymer": "3.4.1", + "@polymer/polymer": "^3.0.0", "@vaadin/component-base": "23.1.0-alpha2", "@vaadin/field-base": "23.1.0-alpha2", "@vaadin/input-container": "23.1.0-alpha2", @@ -14262,7 +14269,7 @@ "requires": { "@polymer/iron-icon": "^3.0.0", "@polymer/iron-iconset-svg": "^3.0.0", - "@polymer/polymer": "3.4.1", + "@polymer/polymer": "^3.0.0", "@vaadin/icon": "23.1.0-alpha2", "@vaadin/vaadin-themable-mixin": "23.1.0-alpha2" } @@ -14272,7 +14279,7 @@ "resolved": "https://registry.npmjs.org/@vaadin/vaadin-material-styles/-/vaadin-material-styles-23.1.0-alpha2.tgz", "integrity": "sha512-TuM20Ivf98rtEVuGZc21a6TemeyNMWKratjaWAEKi2D8Az0dR2Rfqp4SrfrAll8hUGBD0u/e6RS2K6RVS7IN+w==", "requires": { - "@polymer/polymer": "3.4.1", + "@polymer/polymer": "^3.0.0", "@vaadin/vaadin-themable-mixin": "23.1.0-alpha2" } }, @@ -14296,7 +14303,7 @@ "integrity": "sha512-SUdKKVQhyKiDyJiPN4ps3SNgJEQXaKjoLy1BpTaD1U5fFjfB/GF8ubsfHm5cTHTxeFtlqcaNKXVs6NX6yJV2mQ==", "requires": { "@open-wc/dedupe-mixin": "^1.3.0", - "lit": "2.2.1" + "lit": "^2.0.0" } }, "@vaadin/vaadin-usage-statistics": { @@ -14721,13 +14728,10 @@ "dev": true }, "async": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", - "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", - "dev": true, - "requires": { - "lodash": "^4.17.14" - } + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.2.tgz", + "integrity": "sha512-H0E+qZaDEfx/FY4t7iLRv1W2fFI6+pyCeTw1uN20AQPiwqwM6ojPxHxdLv4z8hi2DtnW9BOckSspLucW7pIE5g==", + "dev": true }, "at-least-node": { "version": "1.0.0", @@ -19508,6 +19512,15 @@ "mkdirp": "^0.5.5" }, "dependencies": { + "async": { + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz", + "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==", + "dev": true, + "requires": { + "lodash": "^4.17.14" + } + }, "debug": { "version": "3.2.7", "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", diff --git a/flow-tests/test-frontend/test-pnpm/pnpm-lock.yaml b/flow-tests/test-frontend/test-pnpm/pnpm-lock.yaml index 129953ab2f5..c5dfa9d3eb5 100644 --- a/flow-tests/test-frontend/test-pnpm/pnpm-lock.yaml +++ b/flow-tests/test-frontend/test-pnpm/pnpm-lock.yaml @@ -6,6 +6,7 @@ specifiers: '@vaadin/flow-frontend': ./target/flow-frontend '@vaadin/router': 1.7.4 '@vaadin/vaadin-text-field': 23.1.0-alpha2 + async: 3.2.2 chokidar: ^3.5.0 compression-webpack-plugin: 4.0.1 construct-style-sheets-polyfill: 3.1.0 @@ -39,6 +40,7 @@ dependencies: lit: 2.2.1 devDependencies: + async: 3.2.2 chokidar: 3.5.3 compression-webpack-plugin: 4.0.1_webpack@4.46.0 css-loader: 5.2.7_webpack@4.46.0 @@ -2020,14 +2022,8 @@ packages: engines: {node: '>=0.10.0'} dev: true - /async/0.9.2: - resolution: {integrity: sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=} - dev: true - - /async/2.6.4: - resolution: {integrity: sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==} - dependencies: - lodash: 4.17.21 + /async/3.2.2: + resolution: {integrity: sha512-H0E+qZaDEfx/FY4t7iLRv1W2fFI6+pyCeTw1uN20AQPiwqwM6ojPxHxdLv4z8hi2DtnW9BOckSspLucW7pIE5g==} dev: true /at-least-node/1.0.0: @@ -4620,7 +4616,7 @@ packages: engines: {node: '>=10'} hasBin: true dependencies: - async: 0.9.2 + async: 3.2.2 chalk: 4.1.2 filelist: 1.0.2 minimatch: 3.1.2 @@ -5490,7 +5486,7 @@ packages: resolution: {integrity: sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==} engines: {node: '>= 0.12.0'} dependencies: - async: 2.6.4 + async: 3.2.2 debug: 3.2.7 mkdirp: 0.5.6 dev: true diff --git a/flow-tests/test-frontend/vite-basics/package.json b/flow-tests/test-frontend/vite-basics/package.json index 28626961398..f444e024b6e 100644 --- a/flow-tests/test-frontend/vite-basics/package.json +++ b/flow-tests/test-frontend/vite-basics/package.json @@ -19,6 +19,7 @@ }, "devDependencies": { "@rollup/plugin-replace": "3.1.0", + "async": "3.2.2", "glob": "7.1.6", "mkdirp": "1.0.4", "rollup-plugin-brotli": "3.1.0", @@ -29,24 +30,6 @@ "workbox-core": "6.5.0", "workbox-precaching": "6.5.0" }, - "overrides": { - "@testscope/all": "$@testscope/all", - "@testscope/button": "$@testscope/button", - "@vaadin/bundles": "$@vaadin/bundles", - "copy-to-clipboard": "$copy-to-clipboard", - "package-outside-npm": "$package-outside-npm", - "package2-outside-npm": "$package2-outside-npm", - "glob": "$glob", - "mkdirp": "$mkdirp", - "rollup-plugin-brotli": "$rollup-plugin-brotli", - "typescript": "$typescript", - "vite": "$vite", - "vite-plugin-checker": "$vite-plugin-checker", - "workbox-build": "$workbox-build", - "workbox-core": "$workbox-core", - "workbox-precaching": "$workbox-precaching", - "@rollup/plugin-replace": "$@rollup/plugin-replace" - }, "vaadin": { "dependencies": { "@polymer/polymer": "3.4.1", @@ -59,6 +42,7 @@ }, "devDependencies": { "@rollup/plugin-replace": "3.1.0", + "async": "3.2.2", "glob": "7.1.6", "mkdirp": "1.0.4", "rollup-plugin-brotli": "3.1.0", @@ -69,6 +53,30 @@ "workbox-core": "6.5.0", "workbox-precaching": "6.5.0" }, - "hash": "dc4619814206e4dc257425a00b057ad9a9cff83a993020e0c534d1c4aedbcbde" + "hash": "44f86e6049ac654c8a85a7d04f95147e2f087973a41b2d8f806009b624948c02" + }, + "overrides": { + "@polymer/polymer": "$@polymer/polymer", + "@testscope/all": "$@testscope/all", + "@testscope/button": "$@testscope/button", + "@vaadin/bundles": "$@vaadin/bundles", + "@vaadin/common-frontend": "$@vaadin/common-frontend", + "@vaadin/router": "$@vaadin/router", + "@vaadin/vaadin-lumo-styles": "$@vaadin/vaadin-lumo-styles", + "construct-style-sheets-polyfill": "$construct-style-sheets-polyfill", + "copy-to-clipboard": "$copy-to-clipboard", + "lit": "$lit", + "package-outside-npm": "$package-outside-npm", + "package2-outside-npm": "$package2-outside-npm", + "glob": "$glob", + "mkdirp": "$mkdirp", + "rollup-plugin-brotli": "$rollup-plugin-brotli", + "typescript": "$typescript", + "vite": "$vite", + "vite-plugin-checker": "$vite-plugin-checker", + "workbox-build": "$workbox-build", + "workbox-core": "$workbox-core", + "workbox-precaching": "$workbox-precaching", + "@rollup/plugin-replace": "$@rollup/plugin-replace" } } diff --git a/flow-tests/test-frontend/vite-context-path/package.json b/flow-tests/test-frontend/vite-context-path/package.json index 16d0b32cc42..9e474bf608c 100644 --- a/flow-tests/test-frontend/vite-context-path/package.json +++ b/flow-tests/test-frontend/vite-context-path/package.json @@ -16,6 +16,7 @@ }, "devDependencies": { "@rollup/plugin-replace": "3.1.0", + "async": "3.2.2", "glob": "7.1.6", "mkdirp": "1.0.4", "rollup-plugin-brotli": "3.1.0", @@ -38,6 +39,7 @@ }, "devDependencies": { "@rollup/plugin-replace": "3.1.0", + "async": "3.2.2", "glob": "7.1.6", "mkdirp": "1.0.4", "rollup-plugin-brotli": "3.1.0", @@ -48,6 +50,6 @@ "workbox-core": "6.5.0", "workbox-precaching": "6.5.0" }, - "hash": "d3d70487cecf9942736f464c39718b194a1d15c2200bc53d28a171e69d510539" + "hash": "45d79381fa261b6af5420f67c6e6bb53fa132cc5430549e3e383ef2375c340d8" } } diff --git a/flow-tests/test-frontend/vite-production/package.json b/flow-tests/test-frontend/vite-production/package.json index 81b269ec9b7..bc3a38d470f 100644 --- a/flow-tests/test-frontend/vite-production/package.json +++ b/flow-tests/test-frontend/vite-production/package.json @@ -16,6 +16,7 @@ }, "devDependencies": { "@rollup/plugin-replace": "3.1.0", + "async": "3.2.2", "glob": "7.1.6", "mkdirp": "1.0.4", "rollup-plugin-brotli": "3.1.0", @@ -38,6 +39,7 @@ }, "devDependencies": { "@rollup/plugin-replace": "3.1.0", + "async": "3.2.2", "glob": "7.1.6", "mkdirp": "1.0.4", "rollup-plugin-brotli": "3.1.0", @@ -48,6 +50,6 @@ "workbox-core": "6.5.0", "workbox-precaching": "6.5.0" }, - "hash": "2d41b5c074c90501f8097addcd698a739fb108199a62aa25f7ac04aec797d4d8" + "hash": "f2fa734df59ae2432dff7a0c3c8f8ded1b6961558b0d1338719bd98428336d20" } }