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

Add support for components using private methods #343

Merged
merged 1 commit into from
Apr 26, 2021
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 20 additions & 3 deletions packages/@glimmer/babel-preset/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,13 @@ module.exports = function (api, options) {

let precompile, templateCompilerPath;

const looseProps =
typeof options.loose === 'object' &&
options.loose !== null &&
typeof options.loose.properties === 'boolean'
? options.loose.properties
: false;

if (options.precompile) {
precompile = options.precompile;
} else {
Expand Down Expand Up @@ -75,9 +82,19 @@ module.exports = function (api, options) {
{ legacy: true },
],

__loadPlugins
? require('@babel/plugin-proposal-class-properties')
: require.resolve('@babel/plugin-proposal-class-properties'),
[
__loadPlugins
? require('@babel/plugin-proposal-class-properties')
: require.resolve('@babel/plugin-proposal-class-properties'),
{ loose: looseProps },
],

[
__loadPlugins
? require('@babel/plugin-proposal-private-methods')
: require.resolve('@babel/plugin-proposal-private-methods'),
{ loose: looseProps },
],
],
};
};
3 changes: 2 additions & 1 deletion packages/@glimmer/babel-preset/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@
"license": "MIT",
"private": false,
"scripts": {
"test": "mocha -r esm"
"test": "mocha -r esm --timeout 10000"
},
"dependencies": {
"@babel/plugin-proposal-class-properties": "^7.8.3",
"@babel/plugin-proposal-private-methods": "^7.13.0",
"@babel/plugin-proposal-decorators": "^7.8.3",
"@glimmer/compiler": "0.77.6",
"@glimmer/vm-babel-plugins": "0.77.6",
Expand Down
4 changes: 4 additions & 0 deletions packages/@glimmer/babel-preset/test/fixtures/debug/code.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ deprecate('this is deprecated', false, { id: 'foo' });

class Test {
@tracked bar = 123;

#dog = "dog";

#cat() { return "cat" }
}

precompileTemplate('Hello, world!', { strictMode: true, scope: { Test } });
19 changes: 15 additions & 4 deletions packages/@glimmer/babel-preset/test/fixtures/debug/output.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var _class, _descriptor, _temp;
var _class, _descriptor, _dog, _cat;

import { createTemplateFactory as _createTemplateFactory } from "@glimmer/core";

Expand All @@ -23,12 +23,19 @@ if (true
(true && !(false) && deprecate('this is deprecated', false, {
id: 'foo'
}));
let Test = (_class = (_temp = class Test {
let Test = (_class = (_dog = new WeakMap(), _cat = new WeakSet(), class Test {
constructor() {
_cat.add(this);

_initializerDefineProperty(this, "bar", _descriptor, this);

_dog.set(this, {
writable: true,
value: "dog"
});
}

}, _temp), (_descriptor = _applyDecoratedDescriptor(_class.prototype, "bar", [tracked], {
}), (_descriptor = _applyDecoratedDescriptor(_class.prototype, "bar", [tracked], {
configurable: true,
enumerable: true,
writable: true,
Expand All @@ -37,6 +44,10 @@ let Test = (_class = (_temp = class Test {
}
})), _class);

function _cat2() {
return "cat";
}

_createTemplateFactory(
/*
Hello, world!
Expand All @@ -47,4 +58,4 @@ _createTemplateFactory(
"moduleName": "(unknown template module)",
"scope": null,
"isStrictMode": true
});
});
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"presets": [
["@glimmer/babel-preset", { "isDebug": false }]
[
"@glimmer/babel-preset",
{
"isDebug": false
}
]
]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ deprecate('this is deprecated', false, { id: 'foo' });

class Test {
@tracked bar = 123;

#dog = "dog";

#cat() { return "cat" }
}

precompileTemplate('Hello, world!', { strictMode: true, scope: { Test } });
19 changes: 15 additions & 4 deletions packages/@glimmer/babel-preset/test/fixtures/production/output.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var _class, _descriptor, _temp;
var _class, _descriptor, _dog, _cat;

import { createTemplateFactory as _createTemplateFactory } from "@glimmer/core";

Expand All @@ -23,12 +23,19 @@ if (false
(false && !(false) && deprecate('this is deprecated', false, {
id: 'foo'
}));
let Test = (_class = (_temp = class Test {
let Test = (_class = (_dog = new WeakMap(), _cat = new WeakSet(), class Test {
constructor() {
_cat.add(this);

_initializerDefineProperty(this, "bar", _descriptor, this);

_dog.set(this, {
writable: true,
value: "dog"
});
}

}, _temp), (_descriptor = _applyDecoratedDescriptor(_class.prototype, "bar", [tracked], {
}), (_descriptor = _applyDecoratedDescriptor(_class.prototype, "bar", [tracked], {
configurable: true,
enumerable: true,
writable: true,
Expand All @@ -37,6 +44,10 @@ let Test = (_class = (_temp = class Test {
}
})), _class);

function _cat2() {
return "cat";
}

_createTemplateFactory(
/*
Hello, world!
Expand All @@ -47,4 +58,4 @@ _createTemplateFactory(
"moduleName": "(unknown template module)",
"scope": null,
"isStrictMode": true
});
});
Loading