Skip to content

Commit

Permalink
safe hasOwnProperty call (#5010)
Browse files Browse the repository at this point in the history
* safe hasOwnProperty call

* Create _config.js

* Create main.js

* Create mod.js

* Create external.js

* Update _config.js

* Update external.js

* Update main.js

* Update main.js

* Delete mod.js

* Update _config.js

* Update _config.js

* Update external.js

* Update _config.js

* Update _config.js

* update forms

* Update _config.js

* forms

* forms

* Update _config.js
  • Loading branch information
LongTengDao committed Jul 5, 2023
1 parent 1b62c33 commit 9e6e7f5
Show file tree
Hide file tree
Showing 77 changed files with 110 additions and 83 deletions.
4 changes: 2 additions & 2 deletions docs/configuration-options/index.md
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
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
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
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
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
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
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
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
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
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
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
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
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
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

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

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

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

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

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

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

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

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

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

0 comments on commit 9e6e7f5

Please sign in to comment.