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.

Sign up for GitHub

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

Jump to bottom

safe hasOwnProperty call #5010

Merged
merged 21 commits into from Jul 5, 2023
Merged

safe hasOwnProperty call #5010

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
babd87a
safe hasOwnProperty call
LongTengDao May 23, 2023
a1d4e28
Create _config.js
LongTengDao Jul 1, 2023
3e02280
Create main.js
LongTengDao Jul 1, 2023
c3b1e6f
Create mod.js
LongTengDao Jul 1, 2023
d9e5b0c
Create external.js
LongTengDao Jul 2, 2023
6c844d2
Update _config.js
LongTengDao Jul 2, 2023
3a07e14
Update external.js
LongTengDao Jul 2, 2023
21efe1a
Merge branch 'master' into master
LongTengDao Jul 2, 2023
fac40fe
Update main.js
LongTengDao Jul 2, 2023
df9c943
Update main.js
LongTengDao Jul 2, 2023
ed7e71c
Delete mod.js
LongTengDao Jul 2, 2023
aefeea3
Update _config.js
LongTengDao Jul 2, 2023
4795b20
Update _config.js
LongTengDao Jul 2, 2023
e7cf4c6
Update external.js
LongTengDao Jul 2, 2023
02ac323
Update _config.js
LongTengDao Jul 2, 2023
473b3f1
Update _config.js
LongTengDao Jul 2, 2023
9f618fd
update forms
LongTengDao Jul 2, 2023
966141a
Update _config.js
LongTengDao Jul 2, 2023
e09cdbb
forms
LongTengDao Jul 2, 2023
617a323
forms
LongTengDao Jul 2, 2023
fd6b228
Update _config.js
LongTengDao Jul 2, 2023
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
4 changes: 2 additions & 2 deletions docs/configuration-options/index.md
View file
Open in desktop
Expand Up @@ -729,7 +729,7 @@ export * from 'external';
var external = require('external');

Object.keys(external).forEach(function (k) {
if (k !== 'default' && !exports.hasOwnProperty(k))
if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k))
Object.defineProperty(exports, k, {
enumerable: true,
get: function () {
Expand All @@ -742,7 +742,7 @@ Object.keys(external).forEach(function (k) {
const external = require('external');

for (const k in external) {
if (k !== 'default' && !exports.hasOwnProperty(k))
if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k))
Object.defineProperty(exports, k, {
enumerable: true,
get: () => external[k]
Expand Down
2 changes: 1 addition & 1 deletion src/finalisers/shared/getExportBlock.ts
View file
Open in desktop
Expand Up @@ -90,7 +90,7 @@ export function getExportBlock(
for (const specifier of reexports) {
if (specifier.reexported === '*') {
if (exportBlock) exportBlock += n;
const copyPropertyIfNecessary = `{${n}${t}if${_}(k${_}!==${_}'default'${_}&&${_}!exports.hasOwnProperty(k))${_}${getDefineProperty(
const copyPropertyIfNecessary = `{${n}${t}if${_}(k${_}!==${_}'default'${_}&&${_}!Object.prototype.hasOwnProperty.call(exports,${_}k))${_}${getDefineProperty(
name,
specifier.needsLiveBinding,
t,
Expand Down
2 changes: 1 addition & 1 deletion test/chunking-form/samples/chunking-star-external/_expected/amd/main1.js
View file
Open in desktop
Expand Up @@ -9,7 +9,7 @@ define(['exports', 'starexternal1', 'external1', './generated-dep', 'starexterna
exports.dep = dep.dep;
exports.main = main;
Object.keys(starexternal1).forEach(function (k) {
if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
enumerable: true,
get: function () { return starexternal1[k]; }
});
Expand Down
2 changes: 1 addition & 1 deletion test/chunking-form/samples/chunking-star-external/_expected/amd/main2.js
View file
Open in desktop
Expand Up @@ -9,7 +9,7 @@ define(['exports', './generated-dep', 'external2', 'starexternal2'], (function (
});
exports.main = main;
Object.keys(starexternal2).forEach(function (k) {
if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
enumerable: true,
get: function () { return starexternal2[k]; }
});
Expand Down
2 changes: 1 addition & 1 deletion test/chunking-form/samples/chunking-star-external/_expected/cjs/main1.js
View file
Open in desktop
Expand Up @@ -15,7 +15,7 @@ Object.defineProperty(exports, 'e', {
exports.dep = dep.dep;
exports.main = main;
Object.keys(starexternal1).forEach(function (k) {
if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
enumerable: true,
get: function () { return starexternal1[k]; }
});
Expand Down
2 changes: 1 addition & 1 deletion test/chunking-form/samples/chunking-star-external/_expected/cjs/main2.js
View file
Open in desktop
Expand Up @@ -13,7 +13,7 @@ Object.defineProperty(exports, 'e', {
});
exports.main = main;
Object.keys(starexternal2).forEach(function (k) {
if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
enumerable: true,
get: function () { return starexternal2[k]; }
});
Expand Down
2 changes: 1 addition & 1 deletion test/form/samples/export-all-before-named/_expected/amd.js
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@ define(['exports', 'external'], (function (exports, external) { 'use strict';

exports.internalFn = internalFn;
Object.keys(external).forEach(function (k) {
if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
enumerable: true,
get: function () { return external[k]; }
});
Expand Down
2 changes: 1 addition & 1 deletion test/form/samples/export-all-before-named/_expected/cjs.js
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@ function internalFn(path) {

exports.internalFn = internalFn;
Object.keys(external).forEach(function (k) {
if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
enumerable: true,
get: function () { return external[k]; }
});
Expand Down
2 changes: 1 addition & 1 deletion test/form/samples/export-all-before-named/_expected/iife.js
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@ var exposedInternals = (function (exports, external) {

exports.internalFn = internalFn;
Object.keys(external).forEach(function (k) {
if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
enumerable: true,
get: function () { return external[k]; }
});
Expand Down
2 changes: 1 addition & 1 deletion test/form/samples/export-all-before-named/_expected/umd.js
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@

exports.internalFn = internalFn;
Object.keys(external).forEach(function (k) {
if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
enumerable: true,
get: function () { return external[k]; }
});
Expand Down
6 changes: 3 additions & 3 deletions test/form/samples/export-all-multiple/_expected/amd.js
View file
Open in desktop
Expand Up @@ -3,19 +3,19 @@ define(['exports', 'foo', 'bar', 'baz'], (function (exports, foo, bar, baz) { 'u


Object.keys(foo).forEach(function (k) {
if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
enumerable: true,
get: function () { return foo[k]; }
});
});
Object.keys(bar).forEach(function (k) {
if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
enumerable: true,
get: function () { return bar[k]; }
});
});
Object.keys(baz).forEach(function (k) {
if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
enumerable: true,
get: function () { return baz[k]; }
});
Expand Down
6 changes: 3 additions & 3 deletions test/form/samples/export-all-multiple/_expected/cjs.js
View file
Open in desktop
Expand Up @@ -7,19 +7,19 @@ var baz = require('baz');


Object.keys(foo).forEach(function (k) {
if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
enumerable: true,
get: function () { return foo[k]; }
});
});
Object.keys(bar).forEach(function (k) {
if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
enumerable: true,
get: function () { return bar[k]; }
});
});
Object.keys(baz).forEach(function (k) {
if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
enumerable: true,
get: function () { return baz[k]; }
});
Expand Down
6 changes: 3 additions & 3 deletions test/form/samples/export-all-multiple/_expected/iife.js
View file
Open in desktop
Expand Up @@ -4,19 +4,19 @@ var myBundle = (function (exports, foo, bar, baz) {


Object.keys(foo).forEach(function (k) {
if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
enumerable: true,
get: function () { return foo[k]; }
});
});
Object.keys(bar).forEach(function (k) {
if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
enumerable: true,
get: function () { return bar[k]; }
});
});
Object.keys(baz).forEach(function (k) {
if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
enumerable: true,
get: function () { return baz[k]; }
});
Expand Down
6 changes: 3 additions & 3 deletions test/form/samples/export-all-multiple/_expected/umd.js
View file
Open in desktop
Expand Up @@ -5,19 +5,19 @@
})(this, (function (exports, foo, bar, baz) { 'use strict';

Object.keys(foo).forEach(function (k) {
if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
enumerable: true,
get: function () { return foo[k]; }
});
});
Object.keys(bar).forEach(function (k) {
if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
enumerable: true,
get: function () { return bar[k]; }
});
});
Object.keys(baz).forEach(function (k) {
if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
enumerable: true,
get: function () { return baz[k]; }
});
Expand Down
2 changes: 1 addition & 1 deletion test/form/samples/generated-code-compact/arrow-functions-false/_expected/amd.js
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion test/form/samples/generated-code-compact/arrow-functions-false/_expected/cjs.js
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion test/form/samples/generated-code-compact/arrow-functions-false/_expected/iife.js
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion test/form/samples/generated-code-compact/arrow-functions-false/_expected/umd.js
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion test/form/samples/generated-code-compact/arrow-functions-true/_expected/amd.js
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion test/form/samples/generated-code-compact/arrow-functions-true/_expected/cjs.js
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion test/form/samples/generated-code-compact/arrow-functions-true/_expected/iife.js
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion test/form/samples/generated-code-compact/arrow-functions-true/_expected/umd.js
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion test/form/samples/generated-code-compact/const-bindings-false/_expected/amd.js
View file
Open in desktop

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