- fix for punycode warning

- bump BUNDLE_VERSION
This commit is contained in:
denihs
2024-10-28 11:53:33 -04:00
parent 72d97338e8
commit f40eac3dc7
5 changed files with 114 additions and 69 deletions

2
meteor
View File

@@ -1,6 +1,6 @@
#!/usr/bin/env bash
BUNDLE_VERSION=22.10.0.3
BUNDLE_VERSION=22.10.0.4
# OS Check. Put here because here is where we download the precompiled

View File

@@ -56,74 +56,74 @@
}
},
"@aws-sdk/client-cognito-identity": {
"version": "3.677.0",
"resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.677.0.tgz",
"integrity": "sha512-wGhbHAZGa5VeVLCyAfhyFWXl+JfsHSgSl0eodH6xqKoR60LTDJZbBgQZizUwSj8EoSzsglBvgPLYZaLfXTKM/g=="
"version": "3.678.0",
"resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.678.0.tgz",
"integrity": "sha512-cSIWC9q3GBFjTzqTZTOHILxWln9YQGce3o7Jx1m4XCN16ITRiliFgiw3rbAc1H1vtYy4LfvymhC55iU80jB+4A=="
},
"@aws-sdk/client-sso": {
"version": "3.677.0",
"resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.677.0.tgz",
"integrity": "sha512-/y6EskFhOa2w9VwXaXoyOrGeBjnOj/72wsxDOslS908qH+nf7m40pBK6e/iBelg04vlx0gqhlbfK8hLbaT6KHA=="
"version": "3.678.0",
"resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.678.0.tgz",
"integrity": "sha512-5Fg2BkR1En8iBbiZ18STvLDGPK9Re5MyCmX+hfIhQzPsEf1FRkAkOluEXX79aBva8iWn2oCD/xKBUku4x3eusw=="
},
"@aws-sdk/client-sso-oidc": {
"version": "3.677.0",
"resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.677.0.tgz",
"integrity": "sha512-2zgZkRIU7DsnUVOy+9bjfJ0IYMzi9ONWXQt/WqMa7HOnj4RfenfpipyhHYxGZR5kmehgv53EI79yvUu+SAfGNg=="
"version": "3.678.0",
"resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.678.0.tgz",
"integrity": "sha512-sgj9Y4zGiwLePLDjqhGoghoZgseh88JkKkwWH558IIte/cf/ix7ezOvptnA0WUlI5Z/329LtkN6O8TRqSJ7MWw=="
},
"@aws-sdk/client-sts": {
"version": "3.677.0",
"resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.677.0.tgz",
"integrity": "sha512-N5fs1GLSthnwrs44b4IJI//dcShuIT42g4pM8FCUJZwbrWn9Sp9F876R1mvb8A9TAy2S4qCXi7TkHS0REnuicQ=="
"version": "3.678.0",
"resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.678.0.tgz",
"integrity": "sha512-oRtDnbqIuTbBq0xd7XlaugDA41EqRFzWLpPNr4uwkH8L7xwtIByfJG/qXx2OtOiFFasAhMWJLu/DDqWZyp819A=="
},
"@aws-sdk/core": {
"version": "3.677.0",
"resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.677.0.tgz",
"integrity": "sha512-5auvc1wmXmd7u9Y9nM95Ia+VX7J2FiZLuADitHqE4mHPH9riDgOY+uK/yM+UKr+lfq4zKiZQG7i8cfabZlCY8g=="
"version": "3.678.0",
"resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.678.0.tgz",
"integrity": "sha512-ZTzybFZqSaPQymgRkTl08vk6xilaxr8LnJOc0h3KhcHLK4TJmdOcxqPpa6QxrBKcn2rmxzGiPRbAHLGI+BIxBw=="
},
"@aws-sdk/credential-provider-cognito-identity": {
"version": "3.677.0",
"resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.677.0.tgz",
"integrity": "sha512-ODw8MKhT41KLpKlGIH1yFO2FIOCAW3Nnn2uCu1eAm807aI0OK31ntUNrY+GFzXX7ixv+KFoiJu3ih+w+Oxw5gA=="
"version": "3.678.0",
"resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.678.0.tgz",
"integrity": "sha512-t9bgu2Kc0H8FdQsSrkIJ42vis0CaVxUlA0wmmNyh268ZZyT9lKXUmf91QIhWbZ1zHx8Ek2u301xusoIaj4mLHA=="
},
"@aws-sdk/credential-provider-env": {
"version": "3.677.0",
"resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.677.0.tgz",
"integrity": "sha512-0ctcqKzclr9TiNIkB8I+YRogjWH/4mLWQGv/bgb8ElHqph+rPy4pOubj1Ax01sbs7XdwDaImjBYV5xXE+BEsYw=="
"version": "3.678.0",
"resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.678.0.tgz",
"integrity": "sha512-29uhXAB7uJqHtvJ2U3pi1YkMfv0WefW9EmSMoFAunjudXXBVktwTlWg0lyCM+KHrGKLkQyfs5UF/A9IelS8tdQ=="
},
"@aws-sdk/credential-provider-http": {
"version": "3.677.0",
"resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.677.0.tgz",
"integrity": "sha512-c4TnShdzk37dhL1HGGzZ2PDKIIEmo1IbT/4y5hSRdNc8Z8fu6spE5GoeVsv6p/HdSGPS7XTy6aOFCMCk4AeIzQ=="
"version": "3.678.0",
"resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.678.0.tgz",
"integrity": "sha512-EvpmP0nc7ddRp0qwJOSu0uBXa+MMk4+OLlyEJcdaHnZI4/BoyVWr5fJUD5eQYZk11LZPZSvnsliYXWwLyVNXHQ=="
},
"@aws-sdk/credential-provider-ini": {
"version": "3.677.0",
"resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.677.0.tgz",
"integrity": "sha512-hW+oHj5zplPLzTk74LG+gZVOKQnmBPyRIbwg3uZWr23xfOxh/Osu9Wq8qwgu2+UyFHr+6/DRFjZJ6avNA2jpKw=="
"version": "3.678.0",
"resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.678.0.tgz",
"integrity": "sha512-8kHy7V5rRO73EpBCUclykP9T/QIBVi0SkQsc88ZRxpdh59/JY2N6DT5khMTzrz9+Vvlw3FDMJN4AI/qWjJHhdw=="
},
"@aws-sdk/credential-provider-node": {
"version": "3.677.0",
"resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.677.0.tgz",
"integrity": "sha512-DwFriiDx2SSdj7VhRv/0fm8UIK7isy+WZAlqUdZ9xDsX4x1AD5KwMv9AwGhJrMuTjnPSxRSwjt23S7ZXwUfhdw=="
"version": "3.678.0",
"resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.678.0.tgz",
"integrity": "sha512-KGRBVD/oNr/aD+Wy5zc5AjfeSv5b4ahAu5eAUbOz+eGjGpGgrMtjY+R2rDY/3i3wFj9/DvOIfFGeZQMwtDzIuA=="
},
"@aws-sdk/credential-provider-process": {
"version": "3.677.0",
"resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.677.0.tgz",
"integrity": "sha512-pBqHjIFvHBJb2NOsVqdIHWcOzXDoNXBokxTvMggb3WYML6ixwrH7kpd1CAzegeQlvZD4SCcRoy3ahv5rbuR+og=="
"version": "3.678.0",
"resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.678.0.tgz",
"integrity": "sha512-5TpzzHKwPOvUJig0bvTt+brtXfLPaSVLwea9re+XGrS5T6Hz65IaX2RL6uY1GQ0UVOqgwQ5nAti1WOfBoSJ5BA=="
},
"@aws-sdk/credential-provider-sso": {
"version": "3.677.0",
"resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.677.0.tgz",
"integrity": "sha512-OkRP3z8yI22t9LS9At5fYr6RN7zKSDiGgeyjEnrqiGHOWGPMJN2GKa8IAFC4dgXt4Nm/EfmEW7UweiqzEKJKOA=="
"version": "3.678.0",
"resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.678.0.tgz",
"integrity": "sha512-PXydLUsLYd1rkhZ7zwf0613u5sofxIEhh7C1QGP1MSY3L1jt8bu7pZIcMzubfvmaGZI5k84aHhhjQEiAJUxIMg=="
},
"@aws-sdk/credential-provider-web-identity": {
"version": "3.677.0",
"resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.677.0.tgz",
"integrity": "sha512-yjuI6hSt1rLFqBQiNKx/nF75Ao72xR8ybqKztzebtFNCrYl8oXVkRiigg5XKNCDmelsx1lcU9IcSiuPHzlGtUQ=="
"version": "3.678.0",
"resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.678.0.tgz",
"integrity": "sha512-fcYZjTTFcef99l+BhcEAhHS4tEK1kE6Xj5Zz5lT4tFA07BkQt3d6kUKRVVfJnsbcHH4RDBUCnLhU8HPfc/kvjA=="
},
"@aws-sdk/credential-providers": {
"version": "3.677.0",
"resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.677.0.tgz",
"integrity": "sha512-fUEDkRI2GuN+p9xyZewlRQC2vFXjxPOoQGugQTmOawTxVUYkFpssg4ID0HUtkKuJYHjaoD2bCyKvOcnL1JU6AA=="
"version": "3.678.0",
"resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.678.0.tgz",
"integrity": "sha512-cF6IvQI1Jf5nJrK/Q7y3yFSQ8hv6MQ1g7HmZNo1tZTkywhfB3/zKcIFe6YftQul/s6RGHotXC2fr8jDkYQFDSQ=="
},
"@aws-sdk/middleware-host-header": {
"version": "3.667.0",
@@ -141,9 +141,9 @@
"integrity": "sha512-U5glWD3ehFohzpUpopLtmqAlDurGWo2wRGPNgi4SwhWU7UDt6LS7E/UvJjqC0CUrjlzOw+my2A+Ncf+fisMhxQ=="
},
"@aws-sdk/middleware-user-agent": {
"version": "3.677.0",
"resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.677.0.tgz",
"integrity": "sha512-A3gzUsTsvyv/JCmD0p2fkbiOyp+tpAiAADDwzi+eYeyzH4xzqnrzSkGk5KSb58uUQo27eeBzRXHd46d0u+sMrQ=="
"version": "3.678.0",
"resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.678.0.tgz",
"integrity": "sha512-tg9cC5COgGP0cznD2ys9kxPtVeKUygPZshDWXLAfA/cH/4m2ZUBvoEVv1SxkIbvOjnPwa976rdPLQUwRZvsL0g=="
},
"@aws-sdk/region-config-resolver": {
"version": "3.667.0",
@@ -166,9 +166,9 @@
"integrity": "sha512-X22SYDAuQJWnkF1/q17pkX3nGw5XMD9YEUbmt87vUnRq7iyJ3JOpl6UKOBeUBaL838wA5yzdbinmCITJ/VZ1QA=="
},
"@aws-sdk/util-locate-window": {
"version": "3.568.0",
"resolved": "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.568.0.tgz",
"integrity": "sha512-3nh4TINkXYr+H41QaPelCceEB2FXP3fxp93YZXB/kqJvX0U9j0N0Uk45gvsjmEPzG8XxkPEeLIfT2I1M7A6Lig=="
"version": "3.679.0",
"resolved": "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.679.0.tgz",
"integrity": "sha512-zKTd48/ZWrCplkXpYDABI74rQlbR0DNHs8nH95htfSLj9/mWRSwaGptoxwcihaq/77vi/fl2X3y0a1Bo8bt7RA=="
},
"@aws-sdk/util-user-agent-browser": {
"version": "3.675.0",
@@ -176,9 +176,9 @@
"integrity": "sha512-HW4vGfRiX54RLcsYjLuAhcBBJ6lRVEZd7njfGpAwBB9s7BH8t48vrpYbyA5XbbqbTvXfYBnugQCUw9HWjEa1ww=="
},
"@aws-sdk/util-user-agent-node": {
"version": "3.677.0",
"resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.677.0.tgz",
"integrity": "sha512-gFhL0zVY/um0Eu2aWil82pjWaZL4yBmOnjz0+RDz18okFBHaz1Om8o/H+1Vvj+xsnuDYV4ezVMyAaXVtTcYOnw=="
"version": "3.678.0",
"resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.678.0.tgz",
"integrity": "sha512-bKRemCdHMPAlEYE9KuQiMQG9/b4n8C+9DlJAL/X00Q7Zvm9Gv6h0+i5EZ+Xx8sbHq5oUv9a4W4tb+nkUZ0ltpw=="
},
"@mongodb-js/saslprep": {
"version": "1.1.9",

View File

@@ -11,6 +11,7 @@ var packageJson = {
// Explicit dependency because we are replacing it with a bundled version
// and we want to make sure there are no dependencies on a higher version
npm: "10.9.0",
"module-alias": "2.2.3",
"node-gyp": "10.2.0",
"@mapbox/node-pre-gyp": "1.0.11",
typescript: "5.6.3",

View File

@@ -1,23 +1,28 @@
const { getChildProcess } = require('./cli/dev-bundle-bin-commands')
const { getChildProcess } = require("./cli/dev-bundle-bin-commands");
const { setupAlias } = require("./module-alias-setup");
getChildProcess({ isFirstTry: true }).then((child) => {
if (! child) {
// Use process.nextTick here to prevent the Promise from swallowing
// errors from the rest of the setup code.
process.nextTick(continueSetup);
}
// If we spawned a process to handle a dev_bundle/bin command like
// `meteor npm` or `meteor node`, then don't run any other tool code.
}, (error) => {
process.nextTick(function () {
throw error;
});
});
getChildProcess({ isFirstTry: true })
.then(setupAlias)
.then(
(child) => {
if (!child) {
// Use process.nextTick here to prevent the Promise from swallowing
// errors from the rest of the setup code.
process.nextTick(continueSetup);
}
// If we spawned a process to handle a dev_bundle/bin command like
// `meteor npm` or `meteor node`, then don't run any other tool code.
},
(error) => {
process.nextTick(function () {
throw error;
});
}
);
function continueSetup() {
// Set up the Babel transpiler
require('./tool-env/install-babel');
require("./tool-env/install-babel");
// Run the Meteor command line tool
require('./cli/main');
require("./cli/main");
}

View File

@@ -0,0 +1,39 @@
const path = require("path");
const moduleAlias = require("module-alias");
const { getDevBundleDir } = require("./cli/dev-bundle");
moduleAlias.addAlias("punycode", "punycode/");
/*
* A warning was introduced in Node 22:
*
* "The `punycode` module is deprecated. Please use a userland alternative instead."
*
* The problem is that punycode is deeply integrated in the Node system. It's not a
* simple direct dependency.
*
* Check these issues for more details:
* https://github.com/mathiasbynens/punycode.js/issues/137
* https://stackoverflow.com/questions/68774489/punycode-is-deprecated-in-npm-what-should-i-replace-it-with/78946745
*
* This warning was, besides being annoying, breaking our tests.
*
* The solution below uses module-alias to "change" the punycode's name.
*/
async function setupPunycodeAlias() {
const devBundleDir = await getDevBundleDir();
const nodeModulesPath = path.join(devBundleDir, "lib", "node_modules");
process.env.NODE_OPTIONS = `${process.env.NODE_OPTIONS || ""} -r ${path.join(
nodeModulesPath,
"module-alias",
"register"
)}`;
}
async function setupAlias() {
return setupPunycodeAlias();
}
module.exports = {
setupAlias,
};