Skip to content
This repository was archived by the owner on Oct 29, 2024. It is now read-only.

Commit ee9fbf0

Browse files
chancancodechancancode
authored
Merge pull request #379 from NullVoxPopuli/fix-ci-34f8a7e7ps
fix ci
2 parents 4a52ecb + 60b5237 commit ee9fbf0

File tree

31 files changed

+6475
-5670
lines changed

31 files changed

+6475
-5670
lines changed

‎.github/workflows/ci.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,13 @@ jobs:
5151

5252
strategy:
5353
matrix:
54-
ember-version: [default, release, beta, canary, lts-3.12, lts-3.16]
54+
ember-version:
55+
- default
56+
- release
57+
- beta
58+
- canary
59+
- lts-3.24
60+
- lts-3.28
5561

5662
steps:
5763
- uses: actions/checkout@v2

‎package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,11 @@
3939
]
4040
},
4141
"resolutions": {
42-
"amd-name-resolver": "https://github.com/ember-cli/amd-name-resolver.git"
42+
"amd-name-resolver": "https://github.com/ember-cli/amd-name-resolver.git",
43+
"ember-cli-lodash-subset": "2.0.1"
4344
},
4445
"devDependencies": {
45-
"@babel/core": "^7.9.0",
46+
"@babel/core": "^7.17.4",
4647
"@babel/plugin-proposal-class-properties": "^7.8.3",
4748
"@babel/plugin-proposal-decorators": "^7.8.3",
4849
"@babel/preset-env": "^7.9.0",
@@ -61,7 +62,7 @@
6162
"mkdirp": "^1.0.3",
6263
"npm-run-all": "^4.1.5",
6364
"prettier": "^2.0.2",
64-
"qunit": "^2.9.3",
65+
"qunit": "^2.18.0",
6566
"release-it": "^13.5.7",
6667
"release-it-lerna-changelog": "^2.3.0",
6768
"release-it-yarn-workspaces": "^1.4.0",
@@ -117,7 +118,7 @@
117118
"npm": false
118119
},
119120
"volta": {
120-
"node": "12.16.1",
121+
"node": "12.22.10",
121122
"yarn": "1.22.4"
122123
}
123124
}

‎packages/@glimmer/babel-preset/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
},
1212
"dependencies": {
1313
"@babel/plugin-proposal-class-properties": "^7.8.3",
14-
"@babel/plugin-proposal-private-methods": "^7.13.0",
1514
"@babel/plugin-proposal-decorators": "^7.8.3",
16-
"@glimmer/compiler": "0.77.6",
17-
"@glimmer/vm-babel-plugins": "0.77.6",
15+
"@babel/plugin-proposal-private-methods": "^7.13.0",
16+
"@glimmer/compiler": "0.84.0",
17+
"@glimmer/vm-babel-plugins": "0.84.0",
1818
"babel-plugin-debug-macros": "^0.3.4",
1919
"babel-plugin-htmlbars-inline-precompile": "^5.2.0"
2020
},

‎packages/@glimmer/babel-preset/test/fixtures/debug/output.js

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ import { createTemplateFactory as _createTemplateFactory } from "@glimmer/core";
44

55
function _initializerDefineProperty(target, property, descriptor, context) { if (!descriptor) return; Object.defineProperty(target, property, { enumerable: descriptor.enumerable, configurable: descriptor.configurable, writable: descriptor.writable, value: descriptor.initializer ? descriptor.initializer.call(context) : void 0 }); }
66

7+
function _classPrivateMethodInitSpec(obj, privateSet) { _checkPrivateRedeclaration(obj, privateSet); privateSet.add(obj); }
8+
9+
function _classPrivateFieldInitSpec(obj, privateMap, value) { _checkPrivateRedeclaration(obj, privateMap); privateMap.set(obj, value); }
10+
11+
function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
12+
713
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
814

915
function _applyDecoratedDescriptor(target, property, decorators, descriptor, context) { var desc = {}; Object.keys(descriptor).forEach(function (key) { desc[key] = descriptor[key]; }); desc.enumerable = !!desc.enumerable; desc.configurable = !!desc.configurable; if ('value' in desc || desc.initializer) { desc.writable = true; } desc = decorators.slice().reverse().reduce(function (desc, decorator) { return decorator(target, property, desc) || desc; }, desc); if (context && desc.initializer !== void 0) { desc.value = desc.initializer ? desc.initializer.call(context) : void 0; desc.initializer = undefined; } if (desc.initializer === void 0) { Object.defineProperty(target, property, desc); desc = null; } return desc; }
@@ -23,13 +29,13 @@ if (true
2329
(true && !(false) && deprecate('this is deprecated', false, {
2430
id: 'foo'
2531
}));
26-
let Test = (_class = (_dog = new WeakMap(), _cat = new WeakSet(), class Test {
32+
let Test = (_class = (_dog = /*#__PURE__*/new WeakMap(), _cat = /*#__PURE__*/new WeakSet(), class Test {
2733
constructor() {
28-
_cat.add(this);
34+
_classPrivateMethodInitSpec(this, _cat);
2935

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

32-
_dog.set(this, {
38+
_classPrivateFieldInitSpec(this, _dog, {
3339
writable: true,
3440
value: "dog"
3541
});
@@ -56,6 +62,5 @@ _createTemplateFactory(
5662
"id": null,
5763
"block": "[[[1,\"Hello, world!\"]],[],false,[]]",
5864
"moduleName": "(unknown template module)",
59-
"scope": null,
6065
"isStrictMode": true
61-
});
66+
});

‎packages/@glimmer/babel-preset/test/fixtures/production/output.js

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ import { createTemplateFactory as _createTemplateFactory } from "@glimmer/core";
44

55
function _initializerDefineProperty(target, property, descriptor, context) { if (!descriptor) return; Object.defineProperty(target, property, { enumerable: descriptor.enumerable, configurable: descriptor.configurable, writable: descriptor.writable, value: descriptor.initializer ? descriptor.initializer.call(context) : void 0 }); }
66

7+
function _classPrivateMethodInitSpec(obj, privateSet) { _checkPrivateRedeclaration(obj, privateSet); privateSet.add(obj); }
8+
9+
function _classPrivateFieldInitSpec(obj, privateMap, value) { _checkPrivateRedeclaration(obj, privateMap); privateMap.set(obj, value); }
10+
11+
function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
12+
713
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
814

915
function _applyDecoratedDescriptor(target, property, decorators, descriptor, context) { var desc = {}; Object.keys(descriptor).forEach(function (key) { desc[key] = descriptor[key]; }); desc.enumerable = !!desc.enumerable; desc.configurable = !!desc.configurable; if ('value' in desc || desc.initializer) { desc.writable = true; } desc = decorators.slice().reverse().reduce(function (desc, decorator) { return decorator(target, property, desc) || desc; }, desc); if (context && desc.initializer !== void 0) { desc.value = desc.initializer ? desc.initializer.call(context) : void 0; desc.initializer = undefined; } if (desc.initializer === void 0) { Object.defineProperty(target, property, desc); desc = null; } return desc; }
@@ -23,13 +29,13 @@ if (false
2329
(false && !(false) && deprecate('this is deprecated', false, {
2430
id: 'foo'
2531
}));
26-
let Test = (_class = (_dog = new WeakMap(), _cat = new WeakSet(), class Test {
32+
let Test = (_class = (_dog = /*#__PURE__*/new WeakMap(), _cat = /*#__PURE__*/new WeakSet(), class Test {
2733
constructor() {
28-
_cat.add(this);
34+
_classPrivateMethodInitSpec(this, _cat);
2935

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

32-
_dog.set(this, {
38+
_classPrivateFieldInitSpec(this, _dog, {
3339
writable: true,
3440
value: "dog"
3541
});
@@ -56,6 +62,5 @@ _createTemplateFactory(
5662
"id": null,
5763
"block": "[[[1,\"Hello, world!\"]],[],false,[]]",
5864
"moduleName": "(unknown template module)",
59-
"scope": null,
6065
"isStrictMode": true
61-
});
66+
});

‎packages/@glimmer/blueprint/files/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"qunit-dom": "^1.1.0",
4545
"style-loader": "^1.1.3",
4646
"testem": "^3.0.3",
47-
"typescript": "~3.8.3",
47+
"typescript": "~4.2.3",
4848
"webpack": "^4.42.1",
4949
"webpack-cli": "^3.3.11",
5050
"webpack-dev-server": "^3.10.3"

‎packages/@glimmer/component/addon/-private/base-component-manager.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ export interface Constructor<T> {
88
}
99

1010
export default abstract class BaseComponentManager<GlimmerComponent extends BaseComponent>
11-
implements ComponentManager<GlimmerComponent> {
11+
implements ComponentManager<GlimmerComponent>
12+
{
1213
abstract capabilities: ComponentCapabilities;
1314

1415
private owner: unknown;

‎packages/@glimmer/component/addon/-private/ember-component-manager.ts

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { DEBUG } from '@glimmer/env';
2-
import Ember from 'ember';
32
import { set } from '@ember/object';
3+
import { destroy } from '@ember/destroyable';
44
import { capabilities } from '@ember/component';
55
import { schedule } from '@ember/runloop';
66
import { gte } from 'ember-compatibility-helpers';
@@ -21,14 +21,12 @@ const CAPABILITIES = gte('3.13.0-beta.1')
2121
asyncLifeCycleCallbacks: false,
2222
});
2323

24-
function scheduledDestroyComponent(component: GlimmerComponent, meta: EmberMeta): void {
24+
function scheduledDestroyComponent(component: GlimmerComponent): void {
2525
if (component.isDestroyed) {
2626
return;
2727
}
2828

29-
Ember.destroy(component);
30-
31-
meta.setSourceDestroyed();
29+
destroy(component);
3230
setDestroyed(component);
3331
}
3432

@@ -46,13 +44,10 @@ class EmberGlimmerComponentManager extends BaseComponentManager<GlimmerComponent
4644
return;
4745
}
4846

49-
const meta = Ember.meta(component);
50-
51-
meta.setSourceDestroying();
5247
setDestroying(component);
5348

5449
schedule('actions', component, component.willDestroy);
55-
schedule('destroy', this, scheduledDestroyComponent, component, meta);
50+
schedule('destroy', this, scheduledDestroyComponent, component);
5651
}
5752
}
5853

‎packages/@glimmer/component/config/ember-try.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,18 @@ module.exports = function () {
1212
useYarn: true,
1313
scenarios: [
1414
{
15-
name: 'ember-lts-3.12',
15+
name: 'ember-lts-3.24',
1616
npm: {
1717
devDependencies: {
18-
'ember-source': '~3.12.0',
18+
'ember-source': '~3.24.0',
1919
},
2020
},
2121
},
2222
{
23-
name: 'ember-lts-3.16',
23+
name: 'ember-lts-3.28',
2424
npm: {
2525
devDependencies: {
26-
'ember-source': '~3.16.0',
26+
'ember-source': '~3.28.0',
2727
},
2828
},
2929
},

‎packages/@glimmer/component/ember-cli-build.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,12 @@ module.exports = function (defaults) {
2525
behave. You most likely want to be modifying `./index.js` or app's build file
2626
*/
2727

28-
return app.toTree();
28+
const { maybeEmbroider } = require('@embroider/test-setup');
29+
return maybeEmbroider(app, {
30+
skipBabel: [
31+
{
32+
package: 'qunit',
33+
},
34+
],
35+
});
2936
};

‎packages/@glimmer/component/package.json

Lines changed: 46 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -26,73 +26,80 @@
2626
"test:all": "ember try:each"
2727
},
2828
"dependencies": {
29-
"@glimmer/env": "^0.1.7",
30-
"@glimmer/util": "0.77.6",
3129
"@glimmer/core": "2.0.0-beta.17",
30+
"@glimmer/env": "^0.1.7",
31+
"@glimmer/util": "0.84.0",
3232
"broccoli-file-creator": "^2.1.1",
3333
"broccoli-merge-trees": "^3.0.2",
34-
"ember-cli-babel": "^7.7.3",
34+
"ember-cli-babel": "^7.23.0",
3535
"ember-cli-get-component-path-option": "^1.0.0",
3636
"ember-cli-is-package-missing": "^1.0.0",
3737
"ember-cli-normalize-entity-name": "^1.0.0",
3838
"ember-cli-path-utils": "^1.0.0",
3939
"ember-cli-string-utils": "^1.1.0",
40-
"ember-cli-typescript": "^3.0.0",
40+
"ember-cli-typescript": "^5.0.0",
4141
"ember-compatibility-helpers": "^1.1.2"
4242
},
4343
"devDependencies": {
44-
"@ember/optional-features": "^0.6.1",
44+
"@ember/optional-features": "^2.0.0",
45+
"@ember/test-helpers": "^2.6.0",
46+
"@embroider/test-setup": "^1.2.0",
4547
"@glimmer/application-test-helpers": "^1.0.0",
46-
"@glimmer/compiler": "0.77.6",
47-
"@glimmer/interfaces": "0.77.6",
48-
"@glimmer/resolver": "^0.3.0",
48+
"@glimmer/compiler": "0.84.0",
49+
"@glimmer/interfaces": "0.84.0",
50+
"@glimmer/resolver": "^0.4.3",
4951
"@glimmer/tracking": "2.0.0-beta.17",
50-
"@glimmer/wire-format": "0.77.6",
51-
"@types/ember": "~3.0.29",
52-
"@types/ember-qunit": "~3.4.3",
53-
"@types/ember-test-helpers": "~1.0.6",
54-
"@types/ember-testing-helpers": "^0.0.3",
55-
"@types/ember__test-helpers": "~0.7.6",
52+
"@glimmer/wire-format": "0.84.0",
53+
"@types/ember": "~4.0.0",
54+
"@types/ember-qunit": "~5.0.0",
55+
"@types/ember-testing-helpers": "^0.0.4",
56+
"@types/ember__destroyable": "^4.0.0",
57+
"@types/ember__test-helpers": "~2.6.1",
5658
"@types/qunit": "^2.5.3",
5759
"@types/rsvp": "^4.0.2",
58-
"babel-eslint": "^8.2.6",
60+
"babel-eslint": "^10.1.0",
5961
"broccoli-asset-rev": "^2.7.0",
6062
"broccoli-funnel": "^2.0.1",
61-
"ember-ajax": "^3.0.0",
62-
"ember-cli": "~3.4.0-beta.1",
63+
"ember-auto-import": "^2.4.0",
64+
"ember-cli": "~3.27.0",
6365
"ember-cli-blueprint-test-helpers": "^0.19.1",
64-
"ember-cli-dependency-checker": "^2.0.0",
65-
"ember-cli-htmlbars": "^2.0.3",
66-
"ember-cli-htmlbars-inline-precompile": "^1.0.3",
67-
"ember-cli-inject-live-reload": "^1.4.1",
68-
"ember-cli-sri": "^2.1.0",
69-
"ember-cli-uglify": "^2.1.0",
70-
"ember-decorators-polyfill": "^1.0.6",
71-
"ember-disable-prototype-extensions": "^1.1.2",
72-
"ember-export-application-global": "^2.0.0",
73-
"ember-load-initializers": "^1.1.0",
66+
"ember-cli-dependency-checker": "^3.2.0",
67+
"ember-cli-htmlbars": "^6.0.0",
68+
"ember-cli-inject-live-reload": "^2.0.2",
69+
"ember-disable-prototype-extensions": "^1.1.3",
70+
"ember-export-application-global": "^2.0.1",
71+
"ember-load-initializers": "^2.1.2",
7472
"ember-maybe-import-regenerator": "^0.1.6",
75-
"ember-qunit": "^4.6.0",
76-
"ember-resolver": "^5.0.0",
77-
"ember-source": "~3.16.0",
78-
"ember-source-channel-url": "^1.0.1",
79-
"ember-try": "^1.0.0-beta.3",
80-
"eslint-plugin-ember": "^5.0.0",
81-
"eslint-plugin-node": "^6.0.1",
82-
"loader.js": "^4.2.3",
83-
"qunit-dom": "^0.7.1",
84-
"typescript": "~3.8.2"
73+
"ember-qunit": "^5.1.1",
74+
"ember-resolver": "^8.0.2",
75+
"ember-source": "~3.24.0",
76+
"ember-source-channel-url": "^3.0.0",
77+
"ember-try": "^1.3.0",
78+
"eslint-config-prettier": "^7.1.0",
79+
"eslint-plugin-ember": "^10.1.1",
80+
"eslint-plugin-node": "^11.1.0",
81+
"eslint-plugin-prettier": "^3.3.1",
82+
"loader.js": "^4.7.0",
83+
"npm-run-all": "^4.1.5",
84+
"prettier": "^2.2.1",
85+
"qunit": "^2.13.0",
86+
"qunit-dom": "^2.0.0",
87+
"typescript": "~4.2.3",
88+
"webpack": "^5.69.0"
8589
},
8690
"engines": {
87-
"node": ">= 12.0"
91+
"node": "12.* || 14.* || >= 16"
92+
},
93+
"ember": {
94+
"edition": "octane"
8895
},
8996
"ember-addon": {
9097
"configPath": "tests/dummy/config",
9198
"defaultBlueprint": "install-glimmer-component",
9299
"main": "ember-addon-main.js"
93100
},
94101
"volta": {
95-
"node": "12.16.1",
102+
"node": "12.22.10",
96103
"yarn": "1.22.4"
97104
}
98105
}

‎packages/@glimmer/component/test/ember/dummy/config/optional-features.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
{
2-
"jquery-integration": false
2+
"application-template-wrapper": false,
3+
"default-async-observers": true,
4+
"jquery-integration": false,
5+
"template-only-glimmer-components": true
36
}

‎packages/@glimmer/component/test/ember/helpers/.gitkeep

Whitespace-only changes.

‎packages/@glimmer/component/test/ember/index.html

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,14 @@
2121
{{content-for "body"}}
2222
{{content-for "test-body"}}
2323

24-
<script src="/testem.js" integrity=""></script>
24+
<div id="qunit"></div>
25+
<div id="qunit-fixture">
26+
<div id="ember-testing-container">
27+
<div id="ember-testing"></div>
28+
</div>
29+
</div>
30+
31+
<script src="/testem.js" integrity="" data-embroider-ignore></script>
2532
<script src="{{rootURL}}assets/vendor.js"></script>
2633
<script src="{{rootURL}}assets/test-support.js"></script>
2734
<script src="{{rootURL}}assets/dummy.js"></script>

‎packages/@glimmer/component/test/ember/integration/components/glimmer-component-guide-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { module, test } from 'qunit';
22
import { setupRenderingTest } from 'ember-qunit';
33
import { render, click } from '@ember/test-helpers';
4-
import hbs from 'htmlbars-inline-precompile';
4+
import { hbs } from 'ember-cli-htmlbars';
55

66
module('Integration | Component | glimmer.js guide example', function (hooks) {
77
setupRenderingTest(hooks);

‎packages/@glimmer/component/test/ember/integration/components/glimmer-component-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import GlimmerComponent from '@glimmer/component';
22
import { module, test } from 'qunit';
33
import { setupRenderingTest } from 'ember-qunit';
44
import { render, clearRender, click } from '@ember/test-helpers';
5-
import hbs from 'htmlbars-inline-precompile';
5+
import { hbs } from 'ember-cli-htmlbars';
66
import { getOwner } from '@ember/application';
77
import { set, computed } from '@ember/object';
88

0 commit comments

Comments
 (0)