Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump json5, terser and webpack, further minimize babel helpers #15833

Merged
merged 5 commits into from Aug 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/babel-core/package.json
Expand Up @@ -59,7 +59,7 @@
"convert-source-map": "^1.7.0",
"debug": "^4.1.0",
"gensync": "^1.0.0-beta.2",
"json5": "^2.2.2",
"json5": "^2.2.3",
"semver": "condition:BABEL_8_BREAKING ? ^7.3.4 : ^6.3.1"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/babel-helpers/package.json
Expand Up @@ -24,7 +24,7 @@
"@babel/helper-plugin-test-runner": "workspace:^",
"@babel/parser": "workspace:^",
"regenerator-runtime": "^0.14.0",
"terser": "^5.9.0"
"terser": "^5.19.2"
},
"engines": {
"node": ">=6.9.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/babel-helpers/scripts/generate-helpers.js
Expand Up @@ -46,7 +46,7 @@ export default Object.freeze({
const { minVersion } = minVersionMatch.groups;

const source = await minify(fileContents, {
mangle: false,
mangle: { keep_fnames: true },
// The _typeof helper has a custom directive that we must keep
compress: { directives: false },
});
Expand Down
42 changes: 21 additions & 21 deletions packages/babel-helpers/src/helpers-generated.ts

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/babel-preset-env/test/regressions.js
Expand Up @@ -73,7 +73,7 @@ describe("regressions", () => {
expect(consoleWarn).toHaveBeenCalled();

expect(out.code).toMatchInlineSnapshot(`
"function _checkInRHS(value) { if (Object(value) !== value) throw TypeError(\\"right-hand side of 'in' should be an object, got \\" + (null !== value ? typeof value : \\"null\\")); return value; }
"function _checkInRHS(e) { if (Object(e) !== e) throw TypeError(\\"right-hand side of 'in' should be an object, got \\" + (null !== e ? typeof e : \\"null\\")); return e; }
var _aBrandCheck = /*#__PURE__*/new WeakSet();
class A {
#a = void _aBrandCheck.add(this);
Expand Down
12 changes: 6 additions & 6 deletions packages/babel-runtime-corejs2/helpers/typeof.js
@@ -1,12 +1,12 @@
var _Symbol = require("core-js/library/fn/symbol/index.js");
var _Symbol$iterator = require("core-js/library/fn/symbol/iterator.js");
function _typeof(obj) {
function _typeof(o) {
"@babel/helpers - typeof";

return (module.exports = _typeof = "function" == typeof _Symbol && "symbol" == typeof _Symbol$iterator ? function (obj) {
return typeof obj;
} : function (obj) {
return obj && "function" == typeof _Symbol && obj.constructor === _Symbol && obj !== _Symbol.prototype ? "symbol" : typeof obj;
}, module.exports.__esModule = true, module.exports["default"] = module.exports), _typeof(obj);
return (module.exports = _typeof = "function" == typeof _Symbol && "symbol" == typeof _Symbol$iterator ? function (o) {
return typeof o;
} : function (o) {
return o && "function" == typeof _Symbol && o.constructor === _Symbol && o !== _Symbol.prototype ? "symbol" : typeof o;
}, module.exports.__esModule = true, module.exports["default"] = module.exports), _typeof(o);
}
module.exports = _typeof, module.exports.__esModule = true, module.exports["default"] = module.exports;
28 changes: 14 additions & 14 deletions packages/babel-runtime-corejs3/helpers/dispose.js
@@ -1,30 +1,30 @@
var _SuppressedError = require("core-js-pure/features/suppressed-error.js");
var _Object$create = require("core-js-pure/features/object/create.js");
var _Promise = require("core-js-pure/features/promise/index.js");
function dispose_SuppressedError(suppressed, error) {
return "undefined" != typeof _SuppressedError ? dispose_SuppressedError = _SuppressedError : (dispose_SuppressedError = function dispose_SuppressedError(suppressed, error) {
this.suppressed = suppressed, this.error = error, this.stack = new Error().stack;
function dispose_SuppressedError(r, e) {
return "undefined" != typeof _SuppressedError ? dispose_SuppressedError = _SuppressedError : (dispose_SuppressedError = function dispose_SuppressedError(r, e) {
this.suppressed = r, this.error = e, this.stack = new Error().stack;
}, dispose_SuppressedError.prototype = _Object$create(Error.prototype, {
constructor: {
value: dispose_SuppressedError,
writable: !0,
configurable: !0
}
})), new dispose_SuppressedError(suppressed, error);
})), new dispose_SuppressedError(r, e);
}
function _dispose(stack, error, hasError) {
function _dispose(r, e, s) {
function next() {
for (; stack.length > 0;) try {
var r = stack.pop(),
p = r.d.call(r.v);
if (r.a) return _Promise.resolve(p).then(next, err);
} catch (e) {
return err(e);
for (; r.length > 0;) try {
var o = r.pop(),
p = o.d.call(o.v);
if (o.a) return _Promise.resolve(p).then(next, err);
} catch (r) {
return err(r);
}
if (hasError) throw error;
if (s) throw e;
}
function err(e) {
return error = hasError ? new dispose_SuppressedError(e, error) : e, hasError = !0, next();
function err(r) {
return e = s ? new dispose_SuppressedError(r, e) : r, s = !0, next();
}
return next();
}
Expand Down
28 changes: 14 additions & 14 deletions packages/babel-runtime/helpers/dispose.js
@@ -1,27 +1,27 @@
function dispose_SuppressedError(suppressed, error) {
return "undefined" != typeof SuppressedError ? dispose_SuppressedError = SuppressedError : (dispose_SuppressedError = function dispose_SuppressedError(suppressed, error) {
this.suppressed = suppressed, this.error = error, this.stack = new Error().stack;
function dispose_SuppressedError(r, e) {
return "undefined" != typeof SuppressedError ? dispose_SuppressedError = SuppressedError : (dispose_SuppressedError = function dispose_SuppressedError(r, e) {
this.suppressed = r, this.error = e, this.stack = new Error().stack;
}, dispose_SuppressedError.prototype = Object.create(Error.prototype, {
constructor: {
value: dispose_SuppressedError,
writable: !0,
configurable: !0
}
})), new dispose_SuppressedError(suppressed, error);
})), new dispose_SuppressedError(r, e);
}
function _dispose(stack, error, hasError) {
function _dispose(r, e, s) {
function next() {
for (; stack.length > 0;) try {
var r = stack.pop(),
p = r.d.call(r.v);
if (r.a) return Promise.resolve(p).then(next, err);
} catch (e) {
return err(e);
for (; r.length > 0;) try {
var o = r.pop(),
p = o.d.call(o.v);
if (o.a) return Promise.resolve(p).then(next, err);
} catch (r) {
return err(r);
}
if (hasError) throw error;
if (s) throw e;
}
function err(e) {
return error = hasError ? new dispose_SuppressedError(e, error) : e, hasError = !0, next();
function err(r) {
return e = s ? new dispose_SuppressedError(r, e) : r, s = !0, next();
}
return next();
}
Expand Down
12 changes: 6 additions & 6 deletions packages/babel-runtime/helpers/typeof.js
@@ -1,10 +1,10 @@
function _typeof(obj) {
function _typeof(o) {
"@babel/helpers - typeof";

return (module.exports = _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) {
return typeof obj;
} : function (obj) {
return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
}, module.exports.__esModule = true, module.exports["default"] = module.exports), _typeof(obj);
return (module.exports = _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) {
return typeof o;
} : function (o) {
return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o;
}, module.exports.__esModule = true, module.exports["default"] = module.exports), _typeof(o);
}
module.exports = _typeof, module.exports.__esModule = true, module.exports["default"] = module.exports;
2 changes: 1 addition & 1 deletion test/runtime-integration/webpack-5/package.json
Expand Up @@ -4,7 +4,7 @@
"exports": "./index.js",
"devDependencies": {
"@babel/runtime": "workspace:^",
"webpack": "^5.74.0",
"webpack": "^5.88.2",
"webpack-cli": "^4.10.0"
},
"type": "commonjs"
Expand Down