diff --git a/juno.config.ts b/juno.config.ts index caa0213c..b6927919 100644 --- a/juno.config.ts +++ b/juno.config.ts @@ -6,8 +6,10 @@ export default defineConfig({ development: '', production: '' }, - source: 'e2e/fixtures', - precompress: false, + hosting: { + source: 'e2e/fixtures', + precompress: false + }, collections: { datastore: [ { diff --git a/package-lock.json b/package-lock.json index 2294c08e..48735280 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,17 +12,17 @@ "@dfinity/utils": "^4.2.1", "@icp-sdk/canisters": "^3.5.2", "@icp-sdk/core": "^5.2.1", - "@junobuild/admin": "^4.3.2", - "@junobuild/cdn": "^2.4.2", - "@junobuild/cli-tools": "^0.13.3", - "@junobuild/config": "^2.15.1", - "@junobuild/config-loader": "^0.4.10", - "@junobuild/core": "^5.3.1", - "@junobuild/functions-tools": "^0.6.3", - "@junobuild/ic-client": "^8.1.2", - "@junobuild/schema": "^1.2.1", - "@junobuild/storage": "^2.4.1", - "@junobuild/utils": "^1.0.2", + "@junobuild/admin": "^4.3.3", + "@junobuild/cdn": "^2.5.0", + "@junobuild/cli-tools": "^0.14.0", + "@junobuild/config": "^3.0.0", + "@junobuild/config-loader": "^0.4.11", + "@junobuild/core": "^5.4.0", + "@junobuild/functions-tools": "^0.6.4", + "@junobuild/ic-client": "^8.1.3", + "@junobuild/schema": "^1.2.2", + "@junobuild/storage": "^2.4.2", + "@junobuild/utils": "^1.0.3", "chokidar": "^5.0.0", "conf": "^15.1.0", "open": "^11.0.0", @@ -39,7 +39,7 @@ "@eslint/eslintrc": "^3.3.3", "@eslint/js": "^9.39.2", "@junobuild/emulator-playwright": "^0.1.1", - "@junobuild/functions": "^0.8.2", + "@junobuild/functions": "^0.8.3", "@playwright/test": "^1.58.1", "@types/node": "24.10.9", "@types/prompts": "^2.4.9", @@ -1717,9 +1717,9 @@ } }, "node_modules/@junobuild/admin": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/@junobuild/admin/-/admin-4.3.2.tgz", - "integrity": "sha512-RY78gfIyMwfMljoa01vM6A7VXdqcLftIrxog9NCAoOH/51JsCck5YTsS9VoAqUqk0AMtztVCgy67W/e7N0k8mw==", + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/@junobuild/admin/-/admin-4.3.3.tgz", + "integrity": "sha512-l8cgcctrt7lBazFWPeBwZs1HtiERnDi5CulBomPe6th8cakjcuPVcbzO/ml1XlOIeDV+P4qyFyyw05iPJ3/taw==", "license": "MIT", "peerDependencies": { "@icp-sdk/canisters": "^3.3", @@ -1732,9 +1732,9 @@ } }, "node_modules/@junobuild/auth": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@junobuild/auth/-/auth-4.1.1.tgz", - "integrity": "sha512-0xD4GZ3TCsNi2R5Ge/ycllOa9Tg+DBcHPQ0ydNo6FxP3iNPCIxI7lUwnEX9vJnopzGGWCBoFAZYLLz0w9I1yQA==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/@junobuild/auth/-/auth-4.1.2.tgz", + "integrity": "sha512-AR6qDeg6cUN4YabM92kD8P0oDK5NeP1ZA8kD/E5WAknUpDIyqSIE8/AXXj9YJlb6WUgrHhDK8JhRaTxlRdRRVw==", "license": "MIT", "peerDependencies": { "@icp-sdk/core": "^5", @@ -1743,14 +1743,13 @@ } }, "node_modules/@junobuild/cdn": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@junobuild/cdn/-/cdn-2.4.2.tgz", - "integrity": "sha512-gpdJzX6ixJ5pWeHrJepSR234U9lXFqcWhkf3qU1PO+2WqrIGtMdMeTQzPty8rHXOmGgz/nL+sZI2ZgIwyYguJg==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@junobuild/cdn/-/cdn-2.5.0.tgz", + "integrity": "sha512-ZErAIAxcJG/QYNUkD++VDV9CYfZrFjhKhA7PeUdjvYgkYUUtY+tGi+WP6YbLbNQ42iRbu/IKC+FNEPKz6302QQ==", "license": "MIT", "peerDependencies": { "@icp-sdk/canisters": "^3.3", "@icp-sdk/core": "^5", - "@junobuild/config": "*", "@junobuild/ic-client": "^8.1", "@junobuild/storage": "^2.4", "@junobuild/utils": "^1.0.2", @@ -1758,9 +1757,9 @@ } }, "node_modules/@junobuild/cli-tools": { - "version": "0.13.3", - "resolved": "https://registry.npmjs.org/@junobuild/cli-tools/-/cli-tools-0.13.3.tgz", - "integrity": "sha512-N2RCF+SC6sdcRqdloa0lwsdq/6x4f1W5ii9aq7pSjqlSFb7SghWE7RhvMTSFXhjvP6T0UVd77nypzJplZi092A==", + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/@junobuild/cli-tools/-/cli-tools-0.14.0.tgz", + "integrity": "sha512-akkzWI9TfqjT9G9T9xpffQn9O1zfEefMu+0Gp7yQwyKMRK9c4ardNEPDZg7Mzpq0D3TDuNn5FkwDb/mTzsSJXA==", "license": "MIT", "dependencies": { "file-type": "^22.0.0", @@ -1770,7 +1769,7 @@ }, "peerDependencies": { "@junobuild/cdn": "^2.4", - "@junobuild/config": "^2.14", + "@junobuild/config": "^3", "@junobuild/functions-tools": "^0.6", "@junobuild/storage": "^2.4", "@junobuild/utils": "^1.0.2", @@ -1779,9 +1778,9 @@ } }, "node_modules/@junobuild/config": { - "version": "2.15.1", - "resolved": "https://registry.npmjs.org/@junobuild/config/-/config-2.15.1.tgz", - "integrity": "sha512-UVVZQNe8pOjE6Vwo7YxN1E+iZ8aBwnEs9/E7DurW2yqs9aNH0V72ziNUi5/urEq/GE8zY8M9u2MF0uUKQyJcrA==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@junobuild/config/-/config-3.0.0.tgz", + "integrity": "sha512-JP3T0V1IWh7o1HYyhK5Bq8eAMO7K2A52zqrP3PxA7jsb7QGstzVphjKVxrsLGrXbwMTBw1xTHEQkYHavG1D0LA==", "license": "MIT", "peerDependencies": { "@junobuild/schema": "^1.2", @@ -1789,9 +1788,9 @@ } }, "node_modules/@junobuild/config-loader": { - "version": "0.4.10", - "resolved": "https://registry.npmjs.org/@junobuild/config-loader/-/config-loader-0.4.10.tgz", - "integrity": "sha512-Hr5VrouGq9nnLaED+/No+tIfDU0pPl2W/3VkmpFGiN9ZNlD6qXYg7NSKArS3JdZ7ChZfTdai7v+8JhPpoL3nZQ==", + "version": "0.4.11", + "resolved": "https://registry.npmjs.org/@junobuild/config-loader/-/config-loader-0.4.11.tgz", + "integrity": "sha512-8T2/WfKMP6kKOZnsFCjayc0Ha6YRLdisqmmQLmGPatGp7HPzyTWXkzEvubLzHVJg5DjqMi3Qm7Pg1tb7ZXLQgA==", "license": "MIT", "peerDependencies": { "@babel/core": "7.28.4", @@ -1801,9 +1800,9 @@ } }, "node_modules/@junobuild/core": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/@junobuild/core/-/core-5.3.1.tgz", - "integrity": "sha512-w+5pC1vU4KqfRihSN5DsT1RPJ3YqZHFQBDIMXeuG6peXuzy3IHs5NpAp9CrKH2xlX9PFn9wPoQzV5sraRZlGMg==", + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/@junobuild/core/-/core-5.4.0.tgz", + "integrity": "sha512-XW2O8S7HxNt8zPM9loxhd5z6st+ISY7ffGiYRdk2rzQsjlzGDlNdKdTjFcZqEC7mStnQJjsypJyFHhEzj81C8A==", "license": "MIT", "dependencies": { "@junobuild/auth": "^4.1", @@ -1836,15 +1835,15 @@ } }, "node_modules/@junobuild/errors": { - "version": "0.2.6", - "resolved": "https://registry.npmjs.org/@junobuild/errors/-/errors-0.2.6.tgz", - "integrity": "sha512-B+0qKmUZUaCCRC54DE/J7vSW5Nr3UE4mcUQnIXQJG79wUKjT8ydYvye5D5vUsUDFspQGs5xGGdElPKVSDLusKQ==", + "version": "0.2.8", + "resolved": "https://registry.npmjs.org/@junobuild/errors/-/errors-0.2.8.tgz", + "integrity": "sha512-n2rXof9nIqGDCARHZETXcicG3JH6+1JGB9iTuFzkziPZm7q/G1KSzh8gRJYzrFC3XrSGPRWvhX4hKEnoxAbisQ==", "license": "MIT" }, "node_modules/@junobuild/functions": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/@junobuild/functions/-/functions-0.8.2.tgz", - "integrity": "sha512-CjZAYKI1kbcB5HHZaeFkqixgMSxDsMNPLXTnBHVUwV3e2fvro8K2MZuWTh8gMYEerkujJqwOgBWHXeMHii87bA==", + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/@junobuild/functions/-/functions-0.8.3.tgz", + "integrity": "sha512-EcgxNxN8NZ3p1MiEpzxcBxYnenaQWN9PaMT4uSzCqCIZlJlNCRGHTJ1ukopA/WZfcRgckkKfkHlSEanrDLD3Cw==", "license": "MIT", "peerDependencies": { "@icp-sdk/core": "^5", @@ -1854,9 +1853,9 @@ } }, "node_modules/@junobuild/functions-tools": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/@junobuild/functions-tools/-/functions-tools-0.6.3.tgz", - "integrity": "sha512-sb4mYZUlZhVN7a2kQ2Q16IFtx01ZTCnnHfoNdYv0P8uD9+2I/fIjaAPWqgNUHNNx8Ix+4uomeDLCk8X2Pxjh3A==", + "version": "0.6.4", + "resolved": "https://registry.npmjs.org/@junobuild/functions-tools/-/functions-tools-0.6.4.tgz", + "integrity": "sha512-9FFADzRzH6rjbwUonZN86DkPa2wK0fLn0aOxJrB1garI3YuBxgZCdTDR68mTDDpFh4Q0qHEoejYxXKCdFfjJMA==", "license": "MIT", "peerDependencies": { "@babel/core": "7.28.4", @@ -1872,9 +1871,9 @@ } }, "node_modules/@junobuild/ic-client": { - "version": "8.1.2", - "resolved": "https://registry.npmjs.org/@junobuild/ic-client/-/ic-client-8.1.2.tgz", - "integrity": "sha512-sUaCeWqfkbk4VVcgYbsO4J16A0Vag37+qDACl+1qjcgaN661HmksTtyn+W85NTNZ3TzbgAgK5HvpdHsSQvpWSA==", + "version": "8.1.3", + "resolved": "https://registry.npmjs.org/@junobuild/ic-client/-/ic-client-8.1.3.tgz", + "integrity": "sha512-vRgPiOaoezxn8KXz4FAn0hoyssP2yETIarIREMT+Dj8rA8ibuDZ1msEJAvufI085NLF+CAdyHVwIPJuAD39aOg==", "license": "MIT", "peerDependencies": { "@icp-sdk/core": "^5", @@ -1883,9 +1882,9 @@ } }, "node_modules/@junobuild/schema": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@junobuild/schema/-/schema-1.2.1.tgz", - "integrity": "sha512-jaBt9Ob7qeqnSzepeaSungOs+z1bYzNLxbOnOhhQalOBxC2OTJHAUbiQKMfjn+TXl0zTxUeeiBihtiZSLKQDfg==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/@junobuild/schema/-/schema-1.2.2.tgz", + "integrity": "sha512-llWsGZfgKszVnYJwC7pBn3fIZT6ip6QEKYFA82P+JgKtRskFP+RaCvuk6i8SqtT3dmhFRpBRXvESQuBUJJKl9A==", "license": "MIT", "dependencies": { "@dfinity/zod-schemas": "^3.2" @@ -1895,9 +1894,9 @@ } }, "node_modules/@junobuild/storage": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/@junobuild/storage/-/storage-2.4.1.tgz", - "integrity": "sha512-vDAPvzMC7aojV8hXPAmvWVOvHO3OqqL+l6icSncZLDSqDU8Yb/EX9n0Pjmn29HNC0FJAz6FlNkpO5dMIlAU88g==", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/@junobuild/storage/-/storage-2.4.2.tgz", + "integrity": "sha512-2rI2S/P8pCW7h8FtQjeKDzJ/OSFrdqWDMuAIxCkqjzhmUwS05TMmQJ5JUqBBS2DnwnlVj5rpOxEHNfT4ISVvmQ==", "license": "MIT", "peerDependencies": { "@icp-sdk/core": "^5", @@ -1906,9 +1905,9 @@ } }, "node_modules/@junobuild/utils": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@junobuild/utils/-/utils-1.0.2.tgz", - "integrity": "sha512-GMkupzpm2OrhOF9zWQ+2ZcVuJGNJEab18h0X9p7nxIu0KuuXQJXMCEmag/Y8N9RE0KBvYEmBbQVRMqRfH+9Dyg==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@junobuild/utils/-/utils-1.0.3.tgz", + "integrity": "sha512-jeO1VthkesaT940cG7+Qjm13ndSynkQulx1JGxtXKKhR79ummxaWLAvFJqMPRQl/KsPT8LcPoJQximUuv84CZg==", "license": "MIT", "peerDependencies": { "@icp-sdk/core": "^5" @@ -7888,27 +7887,27 @@ } }, "@junobuild/admin": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/@junobuild/admin/-/admin-4.3.2.tgz", - "integrity": "sha512-RY78gfIyMwfMljoa01vM6A7VXdqcLftIrxog9NCAoOH/51JsCck5YTsS9VoAqUqk0AMtztVCgy67W/e7N0k8mw==", + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/@junobuild/admin/-/admin-4.3.3.tgz", + "integrity": "sha512-l8cgcctrt7lBazFWPeBwZs1HtiERnDi5CulBomPe6th8cakjcuPVcbzO/ml1XlOIeDV+P4qyFyyw05iPJ3/taw==", "requires": {} }, "@junobuild/auth": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@junobuild/auth/-/auth-4.1.1.tgz", - "integrity": "sha512-0xD4GZ3TCsNi2R5Ge/ycllOa9Tg+DBcHPQ0ydNo6FxP3iNPCIxI7lUwnEX9vJnopzGGWCBoFAZYLLz0w9I1yQA==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/@junobuild/auth/-/auth-4.1.2.tgz", + "integrity": "sha512-AR6qDeg6cUN4YabM92kD8P0oDK5NeP1ZA8kD/E5WAknUpDIyqSIE8/AXXj9YJlb6WUgrHhDK8JhRaTxlRdRRVw==", "requires": {} }, "@junobuild/cdn": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@junobuild/cdn/-/cdn-2.4.2.tgz", - "integrity": "sha512-gpdJzX6ixJ5pWeHrJepSR234U9lXFqcWhkf3qU1PO+2WqrIGtMdMeTQzPty8rHXOmGgz/nL+sZI2ZgIwyYguJg==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@junobuild/cdn/-/cdn-2.5.0.tgz", + "integrity": "sha512-ZErAIAxcJG/QYNUkD++VDV9CYfZrFjhKhA7PeUdjvYgkYUUtY+tGi+WP6YbLbNQ42iRbu/IKC+FNEPKz6302QQ==", "requires": {} }, "@junobuild/cli-tools": { - "version": "0.13.3", - "resolved": "https://registry.npmjs.org/@junobuild/cli-tools/-/cli-tools-0.13.3.tgz", - "integrity": "sha512-N2RCF+SC6sdcRqdloa0lwsdq/6x4f1W5ii9aq7pSjqlSFb7SghWE7RhvMTSFXhjvP6T0UVd77nypzJplZi092A==", + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/@junobuild/cli-tools/-/cli-tools-0.14.0.tgz", + "integrity": "sha512-akkzWI9TfqjT9G9T9xpffQn9O1zfEefMu+0Gp7yQwyKMRK9c4ardNEPDZg7Mzpq0D3TDuNn5FkwDb/mTzsSJXA==", "requires": { "file-type": "^22.0.0", "listr2": "^10.2.1", @@ -7917,21 +7916,21 @@ } }, "@junobuild/config": { - "version": "2.15.1", - "resolved": "https://registry.npmjs.org/@junobuild/config/-/config-2.15.1.tgz", - "integrity": "sha512-UVVZQNe8pOjE6Vwo7YxN1E+iZ8aBwnEs9/E7DurW2yqs9aNH0V72ziNUi5/urEq/GE8zY8M9u2MF0uUKQyJcrA==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@junobuild/config/-/config-3.0.0.tgz", + "integrity": "sha512-JP3T0V1IWh7o1HYyhK5Bq8eAMO7K2A52zqrP3PxA7jsb7QGstzVphjKVxrsLGrXbwMTBw1xTHEQkYHavG1D0LA==", "requires": {} }, "@junobuild/config-loader": { - "version": "0.4.10", - "resolved": "https://registry.npmjs.org/@junobuild/config-loader/-/config-loader-0.4.10.tgz", - "integrity": "sha512-Hr5VrouGq9nnLaED+/No+tIfDU0pPl2W/3VkmpFGiN9ZNlD6qXYg7NSKArS3JdZ7ChZfTdai7v+8JhPpoL3nZQ==", + "version": "0.4.11", + "resolved": "https://registry.npmjs.org/@junobuild/config-loader/-/config-loader-0.4.11.tgz", + "integrity": "sha512-8T2/WfKMP6kKOZnsFCjayc0Ha6YRLdisqmmQLmGPatGp7HPzyTWXkzEvubLzHVJg5DjqMi3Qm7Pg1tb7ZXLQgA==", "requires": {} }, "@junobuild/core": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/@junobuild/core/-/core-5.3.1.tgz", - "integrity": "sha512-w+5pC1vU4KqfRihSN5DsT1RPJ3YqZHFQBDIMXeuG6peXuzy3IHs5NpAp9CrKH2xlX9PFn9wPoQzV5sraRZlGMg==", + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/@junobuild/core/-/core-5.4.0.tgz", + "integrity": "sha512-XW2O8S7HxNt8zPM9loxhd5z6st+ISY7ffGiYRdk2rzQsjlzGDlNdKdTjFcZqEC7mStnQJjsypJyFHhEzj81C8A==", "requires": { "@junobuild/auth": "^4.1", "@junobuild/errors": "*", @@ -7947,46 +7946,46 @@ "requires": {} }, "@junobuild/errors": { - "version": "0.2.6", - "resolved": "https://registry.npmjs.org/@junobuild/errors/-/errors-0.2.6.tgz", - "integrity": "sha512-B+0qKmUZUaCCRC54DE/J7vSW5Nr3UE4mcUQnIXQJG79wUKjT8ydYvye5D5vUsUDFspQGs5xGGdElPKVSDLusKQ==" + "version": "0.2.8", + "resolved": "https://registry.npmjs.org/@junobuild/errors/-/errors-0.2.8.tgz", + "integrity": "sha512-n2rXof9nIqGDCARHZETXcicG3JH6+1JGB9iTuFzkziPZm7q/G1KSzh8gRJYzrFC3XrSGPRWvhX4hKEnoxAbisQ==" }, "@junobuild/functions": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/@junobuild/functions/-/functions-0.8.2.tgz", - "integrity": "sha512-CjZAYKI1kbcB5HHZaeFkqixgMSxDsMNPLXTnBHVUwV3e2fvro8K2MZuWTh8gMYEerkujJqwOgBWHXeMHii87bA==", + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/@junobuild/functions/-/functions-0.8.3.tgz", + "integrity": "sha512-EcgxNxN8NZ3p1MiEpzxcBxYnenaQWN9PaMT4uSzCqCIZlJlNCRGHTJ1ukopA/WZfcRgckkKfkHlSEanrDLD3Cw==", "requires": {} }, "@junobuild/functions-tools": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/@junobuild/functions-tools/-/functions-tools-0.6.3.tgz", - "integrity": "sha512-sb4mYZUlZhVN7a2kQ2Q16IFtx01ZTCnnHfoNdYv0P8uD9+2I/fIjaAPWqgNUHNNx8Ix+4uomeDLCk8X2Pxjh3A==", + "version": "0.6.4", + "resolved": "https://registry.npmjs.org/@junobuild/functions-tools/-/functions-tools-0.6.4.tgz", + "integrity": "sha512-9FFADzRzH6rjbwUonZN86DkPa2wK0fLn0aOxJrB1garI3YuBxgZCdTDR68mTDDpFh4Q0qHEoejYxXKCdFfjJMA==", "requires": {} }, "@junobuild/ic-client": { - "version": "8.1.2", - "resolved": "https://registry.npmjs.org/@junobuild/ic-client/-/ic-client-8.1.2.tgz", - "integrity": "sha512-sUaCeWqfkbk4VVcgYbsO4J16A0Vag37+qDACl+1qjcgaN661HmksTtyn+W85NTNZ3TzbgAgK5HvpdHsSQvpWSA==", + "version": "8.1.3", + "resolved": "https://registry.npmjs.org/@junobuild/ic-client/-/ic-client-8.1.3.tgz", + "integrity": "sha512-vRgPiOaoezxn8KXz4FAn0hoyssP2yETIarIREMT+Dj8rA8ibuDZ1msEJAvufI085NLF+CAdyHVwIPJuAD39aOg==", "requires": {} }, "@junobuild/schema": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@junobuild/schema/-/schema-1.2.1.tgz", - "integrity": "sha512-jaBt9Ob7qeqnSzepeaSungOs+z1bYzNLxbOnOhhQalOBxC2OTJHAUbiQKMfjn+TXl0zTxUeeiBihtiZSLKQDfg==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/@junobuild/schema/-/schema-1.2.2.tgz", + "integrity": "sha512-llWsGZfgKszVnYJwC7pBn3fIZT6ip6QEKYFA82P+JgKtRskFP+RaCvuk6i8SqtT3dmhFRpBRXvESQuBUJJKl9A==", "requires": { "@dfinity/zod-schemas": "^3.2" } }, "@junobuild/storage": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/@junobuild/storage/-/storage-2.4.1.tgz", - "integrity": "sha512-vDAPvzMC7aojV8hXPAmvWVOvHO3OqqL+l6icSncZLDSqDU8Yb/EX9n0Pjmn29HNC0FJAz6FlNkpO5dMIlAU88g==", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/@junobuild/storage/-/storage-2.4.2.tgz", + "integrity": "sha512-2rI2S/P8pCW7h8FtQjeKDzJ/OSFrdqWDMuAIxCkqjzhmUwS05TMmQJ5JUqBBS2DnwnlVj5rpOxEHNfT4ISVvmQ==", "requires": {} }, "@junobuild/utils": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@junobuild/utils/-/utils-1.0.2.tgz", - "integrity": "sha512-GMkupzpm2OrhOF9zWQ+2ZcVuJGNJEab18h0X9p7nxIu0KuuXQJXMCEmag/Y8N9RE0KBvYEmBbQVRMqRfH+9Dyg==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@junobuild/utils/-/utils-1.0.3.tgz", + "integrity": "sha512-jeO1VthkesaT940cG7+Qjm13ndSynkQulx1JGxtXKKhR79ummxaWLAvFJqMPRQl/KsPT8LcPoJQximUuv84CZg==", "requires": {} }, "@noble/curves": { diff --git a/package.json b/package.json index 5731ea8d..329c5aee 100644 --- a/package.json +++ b/package.json @@ -32,17 +32,17 @@ "@dfinity/utils": "^4.2.1", "@icp-sdk/canisters": "^3.5.2", "@icp-sdk/core": "^5.2.1", - "@junobuild/admin": "^4.3.2", - "@junobuild/cdn": "^2.4.2", - "@junobuild/cli-tools": "^0.13.3", - "@junobuild/config": "^2.15.1", - "@junobuild/config-loader": "^0.4.10", - "@junobuild/core": "^5.3.1", - "@junobuild/functions-tools": "^0.6.3", - "@junobuild/ic-client": "^8.1.2", - "@junobuild/schema": "^1.2.1", - "@junobuild/storage": "^2.4.1", - "@junobuild/utils": "^1.0.2", + "@junobuild/admin": "^4.3.3", + "@junobuild/cdn": "^2.5.0", + "@junobuild/cli-tools": "^0.14.0", + "@junobuild/config": "^3.0.0", + "@junobuild/config-loader": "^0.4.11", + "@junobuild/core": "^5.4.0", + "@junobuild/functions-tools": "^0.6.4", + "@junobuild/ic-client": "^8.1.3", + "@junobuild/schema": "^1.2.2", + "@junobuild/storage": "^2.4.2", + "@junobuild/utils": "^1.0.3", "chokidar": "^5.0.0", "conf": "^15.1.0", "open": "^11.0.0", @@ -56,7 +56,7 @@ "@eslint/eslintrc": "^3.3.3", "@eslint/js": "^9.39.2", "@junobuild/emulator-playwright": "^0.1.1", - "@junobuild/functions": "^0.8.2", + "@junobuild/functions": "^0.8.3", "@playwright/test": "^1.58.1", "@types/node": "24.10.9", "@types/prompts": "^2.4.9", diff --git a/src/configs/juno.config.ts b/src/configs/juno.config.ts index 72e5e296..ff84f5c0 100644 --- a/src/configs/juno.config.ts +++ b/src/configs/juno.config.ts @@ -55,7 +55,9 @@ export const writeJunoConfigPlaceholder = async ({ case 'ts': case 'js': { const { - satellite: {source} + satellite: { + hosting: {source} + } } = config; const withPredeploy = nonNullish(pm); @@ -74,7 +76,7 @@ export const writeJunoConfigPlaceholder = async ({ }); let content = template - .replace('', source ?? DEPLOY_DEFAULT_SOURCE) + .replace('', source) .replace('', pm === 'npm' ? 'npm run' : (pm ?? '')); if (nonNullish(emulatorConfig)) { diff --git a/src/services/assets/_deploy/deploy.execute.services.ts b/src/services/assets/_deploy/deploy.execute.services.ts index dcbc0892..d83d919a 100644 --- a/src/services/assets/_deploy/deploy.execute.services.ts +++ b/src/services/assets/_deploy/deploy.execute.services.ts @@ -64,6 +64,7 @@ const executeDeploy = async < const {satellite, satelliteConfig: satelliteConfigRead} = await assertConfigAndLoadSatelliteContext(); + /** @deprecated */ const precompress = satelliteConfigRead.precompress ?? (nonNullish(deprecatedGzip) @@ -77,7 +78,7 @@ const executeDeploy = async < ...(nonNullish(precompress) && {precompress}) }; - await cliPreDeploy({config: satelliteConfig}); + await cliPreDeploy({config: satelliteConfig.hosting ?? satelliteConfig}); const result = await deployWithMethod({ ...rest, @@ -90,7 +91,7 @@ const executeDeploy = async < process.exit(0); } - await cliPostDeploy({config: satelliteConfig}); + await cliPostDeploy({config: satelliteConfig.hosting ?? satelliteConfig}); return result; }; @@ -121,7 +122,7 @@ const deployWithMethod = async < }); const deployParams: DeployParams = { - config: satelliteConfig, + config: satelliteConfig.hosting ?? satelliteConfig, listAssets: listExistingAssets, assertSourceDirExists, assertMemory, @@ -170,7 +171,7 @@ const assertSourceDirExists = (source: string) => { console.log( `${red( 'Cannot proceed deployment.' - )}\nAre you sure the folder containing your built app (the "source" tag in the configuration file for Juno) files is correctly configured, or have you built your app?` + )}\nAre you sure the folder containing your built app files is correctly configured (in your juno.config "hosting > source"), or have you built your app?` ); process.exit(1); } diff --git a/src/services/assets/prune.services.ts b/src/services/assets/prune.services.ts index 3938703b..21d4786d 100644 --- a/src/services/assets/prune.services.ts +++ b/src/services/assets/prune.services.ts @@ -42,7 +42,7 @@ export const executePrune = async (params: {dryRun?: boolean; batchSize?: number const result = await pruneServices({ params: { - config: satelliteConfig, + config: satelliteConfig.hosting ?? satelliteConfig, listAssets: listExistingAssets, assertSourceDirExists, ...params diff --git a/src/services/config/init.services.ts b/src/services/config/init.services.ts index 1c2aec72..b530804e 100644 --- a/src/services/config/init.services.ts +++ b/src/services/config/init.services.ts @@ -94,7 +94,9 @@ export const initConfigNoneInteractive = async ({ await writeJunoConfigPlaceholder({ ...rest, config: { - satellite: {source} + satellite: { + hosting: {source} + } }, emulatorConfig }); diff --git a/src/types/config.ts b/src/types/config.ts index 7e680f8a..98cf3b99 100644 --- a/src/types/config.ts +++ b/src/types/config.ts @@ -1,4 +1,4 @@ -import type {JunoConfig, OrbiterConfig, SatelliteConfig} from '@junobuild/config'; +import type {HostingConfig, JunoConfig, OrbiterConfig, SatelliteConfig} from '@junobuild/config'; export type JunoConfigWithSatelliteId = Omit & { satellite: Omit & Required>; @@ -6,5 +6,7 @@ export type JunoConfigWithSatelliteId = Omit & { - satellite: Pick; + satellite: { + hosting: Pick; + }; }; diff --git a/src/types/deploy.ts b/src/types/deploy.ts index b1f60dc0..a473aed3 100644 --- a/src/types/deploy.ts +++ b/src/types/deploy.ts @@ -9,6 +9,7 @@ import type {OnUploadProgress} from '@junobuild/storage'; import type {SatelliteParametersWithId} from './satellite'; export interface DeployOptions { + /** @deprecated */ deprecatedGzip?: string; uploadBatchSize: number | undefined; } diff --git a/templates/init/juno.config.js b/templates/init/juno.config.js index 9508104a..eb314347 100644 --- a/templates/init/juno.config.js +++ b/templates/init/juno.config.js @@ -7,7 +7,9 @@ export default defineConfig({ development: '', production: '' }, - source: '' + hosting: { + source: '' + } }, orbiter: { id: '' diff --git a/templates/init/juno.config.ts b/templates/init/juno.config.ts index 5636a0dc..4eef813f 100644 --- a/templates/init/juno.config.ts +++ b/templates/init/juno.config.ts @@ -6,7 +6,9 @@ export default defineConfig({ development: '', production: '' }, - source: '' + hosting: { + source: '' + } }, orbiter: { id: '' diff --git a/templates/init/juno.predeploy.config.js b/templates/init/juno.predeploy.config.js index 454b130c..d3b6a1a0 100644 --- a/templates/init/juno.predeploy.config.js +++ b/templates/init/juno.predeploy.config.js @@ -7,8 +7,10 @@ export default defineConfig({ development: '', production: '' }, - source: '', - predeploy: [' build'] + hosting: { + source: '', + predeploy: [' build'] + } }, orbiter: { id: '' diff --git a/templates/init/juno.predeploy.config.ts b/templates/init/juno.predeploy.config.ts index ff7772cc..b6ca90cb 100644 --- a/templates/init/juno.predeploy.config.ts +++ b/templates/init/juno.predeploy.config.ts @@ -6,8 +6,10 @@ export default defineConfig({ development: '', production: '' }, - source: '', - predeploy: [' build'] + hosting: { + source: '', + predeploy: [' build'] + } }, orbiter: { id: '' diff --git a/templates/init/juno.runner.config.js b/templates/init/juno.runner.config.js index 58d34fad..f65b6de8 100644 --- a/templates/init/juno.runner.config.js +++ b/templates/init/juno.runner.config.js @@ -7,7 +7,9 @@ export default defineConfig({ development: '', production: '' }, - source: '' + hosting: { + source: '' + } }, emulator: { runner: { diff --git a/templates/init/juno.runner.config.ts b/templates/init/juno.runner.config.ts index eef4a23e..0b246df7 100644 --- a/templates/init/juno.runner.config.ts +++ b/templates/init/juno.runner.config.ts @@ -6,7 +6,9 @@ export default defineConfig({ development: '', production: '' }, - source: '' + hosting: { + source: '' + } }, emulator: { runner: { diff --git a/templates/init/juno.runner.predeploy.config.js b/templates/init/juno.runner.predeploy.config.js index 6a73ffd0..5677e78e 100644 --- a/templates/init/juno.runner.predeploy.config.js +++ b/templates/init/juno.runner.predeploy.config.js @@ -7,8 +7,10 @@ export default defineConfig({ development: '', production: '' }, - source: '', - predeploy: [' build'] + hosting: { + source: '', + predeploy: [' build'] + } }, emulator: { runner: { diff --git a/templates/init/juno.runner.predeploy.config.ts b/templates/init/juno.runner.predeploy.config.ts index 5fe206bd..4a686f77 100644 --- a/templates/init/juno.runner.predeploy.config.ts +++ b/templates/init/juno.runner.predeploy.config.ts @@ -6,8 +6,10 @@ export default defineConfig({ development: '', production: '' }, - source: '', - predeploy: [' build'] + hosting: { + source: '', + predeploy: [' build'] + } }, emulator: { runner: { diff --git a/templates/init/juno.skylab.config.js b/templates/init/juno.skylab.config.js index 3f12cb8d..a245d62a 100644 --- a/templates/init/juno.skylab.config.js +++ b/templates/init/juno.skylab.config.js @@ -7,6 +7,8 @@ export default defineConfig({ development: '', production: '' }, - source: '' + hosting: { + source: '' + } } }); diff --git a/templates/init/juno.skylab.config.ts b/templates/init/juno.skylab.config.ts index 0e4aa9b5..5340d02c 100644 --- a/templates/init/juno.skylab.config.ts +++ b/templates/init/juno.skylab.config.ts @@ -6,6 +6,8 @@ export default defineConfig({ development: '', production: '' }, - source: '' + hosting: { + source: '' + } } }); diff --git a/templates/init/juno.skylab.predeploy.config.js b/templates/init/juno.skylab.predeploy.config.js index cd28e8b5..12130bfd 100644 --- a/templates/init/juno.skylab.predeploy.config.js +++ b/templates/init/juno.skylab.predeploy.config.js @@ -7,7 +7,9 @@ export default defineConfig({ development: '', production: '' }, - source: '', - predeploy: [' build'] + hosting: { + source: '', + predeploy: [' build'] + } } }); diff --git a/templates/init/juno.skylab.predeploy.config.ts b/templates/init/juno.skylab.predeploy.config.ts index 5052e5d2..150b4f12 100644 --- a/templates/init/juno.skylab.predeploy.config.ts +++ b/templates/init/juno.skylab.predeploy.config.ts @@ -6,7 +6,9 @@ export default defineConfig({ development: '', production: '' }, - source: '', - predeploy: [' build'] + hosting: { + source: '', + predeploy: [' build'] + } } });