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

[v3.0] Change default for output.generatedCode.reservedNamesAsProps #4568

Merged
merged 1 commit into from Jul 15, 2022
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion docs/999-big-list-of-options.md
Expand Up @@ -579,7 +579,7 @@ export default {
};
```

**output.generatedCode.reservedNamesAsProps**<br> Type: `boolean`<br> CLI: `--generatedCode.reservedNamesAsProps`/`--no-generatedCode.reservedNamesAsProps`<br> Default: `false`
**output.generatedCode.reservedNamesAsProps**<br> Type: `boolean`<br> CLI: `--generatedCode.reservedNamesAsProps`/`--no-generatedCode.reservedNamesAsProps`<br> Default: `true`

Determine whether reserved words like "default" can be used as prop names without using quotes. This will make the syntax of the generated code ES3 compliant. Note however that for full ES3 compliance, you may also need to polyfill some builtin functions like `Object.keys` or `Array.prototype.forEach`.

Expand Down
2 changes: 1 addition & 1 deletion src/utils/options/normalizeOutputOptions.ts
Expand Up @@ -359,7 +359,7 @@ const getGeneratedCode = (
arrowFunctions: configWithPreset.arrowFunctions === true,
constBindings: configWithPreset.constBindings === true || preferConst,
objectShorthand: configWithPreset.objectShorthand === true,
reservedNamesAsProps: configWithPreset.reservedNamesAsProps === true,
reservedNamesAsProps: configWithPreset.reservedNamesAsProps !== false,
symbols: configWithPreset.symbols === true
};
};
Expand Down
@@ -1,10 +1,10 @@
define(['exports', 'lib'], (function (exports, value) { 'use strict';

function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }

var value__default = /*#__PURE__*/_interopDefaultLegacy(value);

var dep = 2 * value__default["default"];
var dep = 2 * value__default.default;

exports.dep = dep;

Expand Down
Expand Up @@ -2,10 +2,10 @@

var value = require('lib');

function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }

var value__default = /*#__PURE__*/_interopDefaultLegacy(value);

var dep = 2 * value__default["default"];
var dep = 2 * value__default.default;

exports.dep = dep;
Expand Up @@ -3,7 +3,7 @@ System.register(['lib'], (function (exports) {
var value;
return {
setters: [function (module) {
value = module["default"];
value = module.default;
}],
execute: (function () {

Expand Down
Expand Up @@ -2,7 +2,7 @@ System.register(['starexternal1', 'external1', './generated-dep.js', 'starextern
'use strict';
var _starExcludes = {
main: 1,
'default': 1,
default: 1,
e: 1,
dep: 1
};
Expand Down
Expand Up @@ -2,7 +2,7 @@ System.register(['./generated-dep.js', 'external2', 'starexternal2'], (function
'use strict';
var _starExcludes = {
main: 1,
'default': 1,
default: 1,
dep: 1,
e: 1
};
Expand Down
Expand Up @@ -3,7 +3,7 @@ System.register(['./one.js'], (function (exports) {
var __icon__$1;
return {
setters: [function (module) {
__icon__$1 = module["default"];
__icon__$1 = module.default;
}],
execute: (function () {

Expand Down
Expand Up @@ -14,7 +14,7 @@ define(['require'], (function (require) { 'use strict';
}
});
}
n["default"] = e;
n.default = e;
return Object.freeze(n);
}

Expand Down
Expand Up @@ -14,7 +14,7 @@ function _interopNamespace(e) {
}
});
}
n["default"] = e;
n.default = e;
return Object.freeze(n);
}

Expand Down
Expand Up @@ -14,7 +14,7 @@ define(['require'], (function (require) { 'use strict';
}
});
}
n["default"] = e;
n.default = e;
return Object.freeze(n);
}

Expand Down
Expand Up @@ -14,7 +14,7 @@ function _interopNamespace(e) {
}
});
}
n["default"] = e;
n.default = e;
return Object.freeze(n);
}

Expand Down
@@ -1,6 +1,6 @@
define(['exports', './sub/index'], (function (exports, index) { 'use strict';

const baz = { bar: index["default"] };
const baz = { bar: index.default };

exports.foo = index.foo;
exports.baz = baz;
Expand Down
Expand Up @@ -3,7 +3,7 @@ define(['exports'], (function (exports) { 'use strict';
const foo = 'bar';
var bar = () => {};

exports["default"] = bar;
exports.default = bar;
exports.foo = foo;

Object.defineProperty(exports, '__esModule', { value: true });
Expand Down
Expand Up @@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });

var index = require('./sub/index.js');

const baz = { bar: index["default"] };
const baz = { bar: index.default };

exports.foo = index.foo;
exports.baz = baz;
Expand Up @@ -5,5 +5,5 @@ Object.defineProperty(exports, '__esModule', { value: true });
const foo = 'bar';
var bar = () => {};

exports["default"] = bar;
exports.default = bar;
exports.foo = foo;
Expand Up @@ -3,7 +3,7 @@ System.register('bundle', ['./sub/index.js'], (function (exports) {
var bar;
return {
setters: [function (module) {
bar = module["default"];
bar = module.default;
exports('foo', module.foo);
}],
execute: (function () {
Expand Down
@@ -1,11 +1,11 @@
define(['external-true'], (function (externalTrue) { 'use strict';

function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }

var externalTrue__default = /*#__PURE__*/_interopDefaultLegacy(externalTrue);



return externalTrue__default["default"];
return externalTrue__default.default;

}));
Expand Up @@ -2,10 +2,10 @@

var externalTrue = require('external-true');

function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }

var externalTrue__default = /*#__PURE__*/_interopDefaultLegacy(externalTrue);



module.exports = externalTrue__default["default"];
module.exports = externalTrue__default.default;
Expand Up @@ -2,7 +2,7 @@ System.register(['external-false'], (function (exports) {
'use strict';
return {
setters: [function (module) {
exports('default', module["default"]);
exports('default', module.default);
}],
execute: (function () {

Expand Down
Expand Up @@ -2,7 +2,7 @@ System.register(['external-true'], (function (exports) {
'use strict';
return {
setters: [function (module) {
exports('default', module["default"]);
exports('default', module.default);
}],
execute: (function () {

Expand Down
@@ -1,6 +1,6 @@
define(['require'], (function (require) { 'use strict';

function _interopNamespaceDefaultOnly (e) { return Object.freeze(Object.defineProperty({ __proto__: null, 'default': e }, Symbol.toStringTag, { value: 'Module' })); }
function _interopNamespaceDefaultOnly (e) { return Object.freeze(Object.defineProperty({ __proto__: null, default: e }, Symbol.toStringTag, { value: 'Module' })); }

new Promise(function (resolve, reject) { require(['./foo'], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefaultOnly(m)); }, reject); }).then(console.log);

Expand Down
@@ -1,5 +1,5 @@
'use strict';

function _interopNamespaceDefaultOnly (e) { return Object.freeze(Object.defineProperty({ __proto__: null, 'default': e }, Symbol.toStringTag, { value: 'Module' })); }
function _interopNamespaceDefaultOnly (e) { return Object.freeze(Object.defineProperty({ __proto__: null, default: e }, Symbol.toStringTag, { value: 'Module' })); }

Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefaultOnly(require('./foo.js')); }).then(console.log);
@@ -1,6 +1,6 @@
define(['require', './default', './named'], (function (require, _default, named) { 'use strict';

function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, 'default': e }); }
function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, default: e }); }

console.log(_default, named.value);

Expand Down
Expand Up @@ -3,7 +3,7 @@
var _default = require('./default.js');
var named = require('./named.js');

function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, 'default': e }); }
function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, default: e }); }

console.log(_default, named.value);

Expand Down
Expand Up @@ -3,8 +3,8 @@ System.register(['./default.js', './named.js'], (function (exports, module) {
var foo, value;
return {
setters: [function (module) {
foo = module["default"];
exports('default', module["default"]);
foo = module.default;
exports('default', module.default);
}, function (module) {
value = module.value;
}],
Expand Down
@@ -1,10 +1,10 @@
define(['external', './other', './_virtual/other'], (function (require$$0, other$1, other) { 'use strict';

function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }

var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0);

const external = require$$0__default["default"];
const external = require$$0__default.default;
const { value } = other.__exports;

console.log(external, value);
Expand Down
@@ -1,9 +1,9 @@
define(['./commonjs', 'external'], (function (commonjs, require$$0) { 'use strict';

function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }

var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0);

console.log(commonjs, require$$0__default["default"]);
console.log(commonjs, require$$0__default.default);

}));
Expand Up @@ -4,11 +4,11 @@ var require$$0 = require('external');
require('./other.js');
var other = require('./_virtual/other.js');

function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }

var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0);

const external = require$$0__default["default"];
const external = require$$0__default.default;
const { value } = other.__exports;

console.log(external, value);
Expand Down
Expand Up @@ -3,8 +3,8 @@
var commonjs = require('./commonjs.js');
var require$$0 = require('external');

function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }

var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0);

console.log(commonjs, require$$0__default["default"]);
console.log(commonjs, require$$0__default.default);
Expand Up @@ -3,7 +3,7 @@ System.register(['external', './other.js', './_virtual/other.js'], (function (ex
var require$$0, other;
return {
setters: [function (module) {
require$$0 = module["default"];
require$$0 = module.default;
}, function () {}, function (module) {
other = module.__exports;
}],
Expand Down
Expand Up @@ -3,9 +3,9 @@ System.register(['./commonjs.js', 'external'], (function () {
var commonjs, require$$0;
return {
setters: [function (module) {
commonjs = module["default"];
commonjs = module.default;
}, function (module) {
require$$0 = module["default"];
require$$0 = module.default;
}],
execute: (function () {

Expand Down
Expand Up @@ -2,9 +2,9 @@ System.register(['./m2.js', './m3.js'], (function (exports) {
'use strict';
return {
setters: [function (module) {
exports('m2', module["default"]);
exports('m2', module.default);
}, function (module) {
exports('m3', module["default"]);
exports('m3', module.default);
}],
execute: (function () {

Expand Down
Expand Up @@ -3,7 +3,7 @@ System.register(['./two.js'], (function () {
var a;
return {
setters: [function (module) {
a = module["default"];
a = module.default;
}],
execute: (function () {

Expand Down
Expand Up @@ -2,13 +2,13 @@ System.register(['./foo-system-0e2d8e48.js', './nested/bar-system-a72f6c95.js',
'use strict';
return {
setters: [function (module) {
exports('foo', module["default"]);
exports('foo', module.default);
}, function (module) {
exports('bar', module["default"]);
exports('bar', module.default);
}, function (module) {
exports('baz', module["default"]);
exports('baz', module.default);
}, function (module) {
exports('noExt', module["default"]);
exports('noExt', module.default);
}],
execute: (function () {

Expand Down
Expand Up @@ -3,11 +3,11 @@ System.register(['./_virtual/_one.js', './_virtual/_One2.js', './_virtual/_One1.
var a, b, c;
return {
setters: [function (module) {
a = module["default"];
a = module.default;
}, function (module) {
b = module["default"];
b = module.default;
}, function (module) {
c = module["default"];
c = module.default;
}],
execute: (function () {

Expand Down
Expand Up @@ -2,7 +2,7 @@ define(['exports'], (function (exports) { 'use strict';

var foo = 'default';

exports["default"] = foo;
exports.default = foo;

Object.defineProperty(exports, '__esModule', { value: true });

Expand Down
@@ -1,11 +1,11 @@
define(['require', 'exports', './default', './named'], (function (require, exports, _default, named) { 'use strict';

console.log(_default["default"], named.value);
console.log(_default.default, named.value);

new Promise(function (resolve, reject) { require(['./default'], resolve, reject); }).then(result => console.log(result.default));
new Promise(function (resolve, reject) { require(['./named'], resolve, reject); }).then(result => console.log(result.value));

exports["default"] = _default["default"];
exports.default = _default.default;

Object.defineProperty(exports, '__esModule', { value: true });

Expand Down
Expand Up @@ -4,4 +4,4 @@ Object.defineProperty(exports, '__esModule', { value: true });

var foo = 'default';

exports["default"] = foo;
exports.default = foo;