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

chore(internal, tests): correctly configure maybeEmbroider #279

Closed
wants to merge 5 commits into from
Closed

chore(internal, tests): correctly configure maybeEmbroider #279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3b127fc
chore(internal): enable embroider testing
NullVoxPopuli Dec 5, 2021
bb25de3
chore(ember-try): test embroider only with ember 4+
NullVoxPopuli Dec 5, 2021
828beae
fix(cache): specify file extension to appease embroider
NullVoxPopuli Jan 16, 2022
3c407d6
Seems like embroider + v2 addons are totally broken (dep-resolution i…
NullVoxPopuli Jan 23, 2022
ef42855
eh
NullVoxPopuli Jan 23, 2022
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
2 changes: 1 addition & 1 deletion ember-resources/src/-private/ember-concurrency.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// typed-ember has not publihsed types for this yet
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
import { getValue } from '@glimmer/tracking/primitives/cache';
import { getValue } from '@glimmer/tracking/primitives/cache.js';
import { assert } from '@ember/debug';
// typed-ember has not publihsed types for this yet
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
Expand Down
2 changes: 1 addition & 1 deletion ember-resources/src/-private/resources/lifecycle.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// typed-ember has not published types for this yet
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
import { createCache, getValue } from '@glimmer/tracking/primitives/cache';
import { createCache, getValue } from '@glimmer/tracking/primitives/cache.js';
import { setOwner } from '@ember/application';
import { associateDestroyableChild, registerDestructor } from '@ember/destroyable';
// typed-ember has not published types for this yet
Expand Down
2 changes: 1 addition & 1 deletion ember-resources/src/-private/resources/simple.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// typed-ember has not published types for this yet
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
import { createCache, getValue } from '@glimmer/tracking/primitives/cache';
import { createCache, getValue } from '@glimmer/tracking/primitives/cache.js';
import { getOwner, setOwner } from '@ember/application';
import { associateDestroyableChild, destroy } from '@ember/destroyable';
// typed-ember has not published types for this yet
Expand Down
2 changes: 1 addition & 1 deletion ember-resources/src/-private/tracked-function.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// typed-ember has not publihsed types for this yet
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
import { getValue } from '@glimmer/tracking/primitives/cache';
import { getValue } from '@glimmer/tracking/primitives/cache.js';
import { assert } from '@ember/debug';
// typed-ember has not publihsed types for this yet
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
Expand Down
2 changes: 1 addition & 1 deletion ember-resources/src/-private/use-function.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// typed-ember has not publihsed types for this yet
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
import { getValue } from '@glimmer/tracking/primitives/cache';
import { getValue } from '@glimmer/tracking/primitives/cache.js';
import { assert } from '@ember/debug';
// typed-ember has not publihsed types for this yet
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
Expand Down
2 changes: 1 addition & 1 deletion ember-resources/src/-private/use-helper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// typed-ember has not publihsed types for this yet
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
import { getValue } from '@glimmer/tracking/primitives/cache';
import { getValue } from '@glimmer/tracking/primitives/cache.js';
// typed-ember has not publihsed types for this yet
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
Expand Down
2 changes: 1 addition & 1 deletion ember-resources/src/-private/use-resource.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// typed-ember has not publihsed types for this yet
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
import { getValue } from '@glimmer/tracking/primitives/cache';
import { getValue } from '@glimmer/tracking/primitives/cache.js';
import { assert } from '@ember/debug';
// typed-ember has not publihsed types for this yet
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
Expand Down
24 changes: 22 additions & 2 deletions testing/ember-app/config/ember-try.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,28 @@ module.exports = async function () {
},
},
},
embroiderSafe(),
embroiderOptimized(),
embroiderSafe({
npm: {
dependencies: {
'ember-auto-import': '^2.0.0',
},
devDependencies: {
'ember-source': await getChannelURL('release'),
webpack: '^5.0.0',
},
},
}),
embroiderOptimized({
npm: {
dependencies: {
'ember-auto-import': '^2.0.0',
},
devDependencies: {
'ember-source': await getChannelURL('release'),
webpack: '^5.0.0',
},
},
}),
],
};
};
4 changes: 3 additions & 1 deletion testing/ember-app/ember-cli-build.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,7 @@ module.exports = function (defaults) {
// please specify an object with the list of modules as keys
// along with the exports of each module as its value.

return app.toTree();
const { maybeEmbroider } = require('@embroider/test-setup');

return maybeEmbroider(app);
};
60 changes: 30 additions & 30 deletions testing/ember-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,52 +23,52 @@
"test:ember": "ember test"
},
"dependencies": {
"@embroider/macros": "^0.48.1",
"@embroider/macros": "^1.0.0",
"ember-concurrency": "^2.0.0",
"ember-concurrency-ts": "^0.3.1",
"ember-resources": "*"
},
"devDependencies": {
"@ember/optional-features": "^2.0.0",
"@ember/test-helpers": "^2.6.0",
"@ember/test-waiters": "^3.0.0",
"@embroider/test-setup": "^0.48.1",
"@ember/test-waiters": "^3.0.1",
"@embroider/test-setup": "^1.0.0",
"@glimmer/component": "^1.0.4",
"@glimmer/tracking": "^1.0.4",
"@nullvoxpopuli/eslint-configs": "^2.1.1",
"@types/ember-data": "^3.16.15",
"@types/ember-data__adapter": "^3.16.1",
"@types/ember-data__model": "^3.16.2",
"@types/ember-data__serializer": "^3.16.1",
"@types/ember-data__store": "^3.16.1",
"@types/ember-qunit": "^3.4.15",
"@types/ember-data": "^4.0.0",
"@types/ember-data__adapter": "^4.0.0",
"@types/ember-data__model": "^4.0.0",
"@types/ember-data__serializer": "^4.0.0",
"@types/ember-data__store": "^4.0.0",
"@types/ember-qunit": "^5.0.0",
"@types/ember-resolver": "^5.0.10",
"@types/ember__application": "^3.16.3",
"@types/ember__array": "^3.16.4",
"@types/ember__component": "^3.16.6",
"@types/ember__controller": "^3.16.6",
"@types/ember__debug": "^3.16.5",
"@types/ember__engine": "^3.16.3",
"@types/ember__error": "^3.16.1",
"@types/ember__object": "^3.12.6",
"@types/ember__polyfills": "^3.12.1",
"@types/ember__routing": "^3.16.15",
"@types/ember__runloop": "^3.16.3",
"@types/ember__service": "^3.16.1",
"@types/ember__application": "^4.0.0",
"@types/ember__array": "^4.0.0",
"@types/ember__component": "^4.0.0",
"@types/ember__controller": "^4.0.0",
"@types/ember__debug": "^4.0.0",
"@types/ember__engine": "^4.0.0",
"@types/ember__error": "^4.0.0",
"@types/ember__object": "^4.0.0",
"@types/ember__polyfills": "^4.0.0",
"@types/ember__routing": "^4.0.0",
"@types/ember__runloop": "^4.0.0",
"@types/ember__service": "^4.0.0",
"@types/ember__string": "^3.16.3",
"@types/ember__template": "^3.16.1",
"@types/ember__test": "^3.16.1",
"@types/ember__template": "^4.0.0",
"@types/ember__test": "^4.0.0",
"@types/ember__test-helpers": "^2.0.2",
"@types/ember__utils": "^3.16.2",
"@types/htmlbars-inline-precompile": "^1.0.1",
"@types/ember__utils": "^4.0.0",
"@types/htmlbars-inline-precompile": "^3.0.0",
"@types/qunit": "^2.11.2",
"@types/rsvp": "^4.0.4",
"babel-eslint": "^10.1.0",
"broccoli-asset-rev": "^3.0.0",
"ember-auto-import": "2.2.4",
"ember-cli": "~4.0.1",
"ember-auto-import": "2.4.0",
"ember-cli": "~4.1.0",
"ember-cli-app-version": "^5.0.0",
"ember-cli-babel": "^7.26.6",
"ember-cli-babel": "^7.26.11",
"ember-cli-dependency-checker": "^3.2.0",
"ember-cli-htmlbars": "^6.0.0",
"ember-cli-inject-live-reload": "^2.1.0",
Expand All @@ -84,7 +84,7 @@
"ember-page-title": "^7.0.0",
"ember-qunit": "^5.1.4",
"ember-resolver": "^8.0.2",
"ember-source": "~4.0.1",
"ember-source": "~4.1.0",
"ember-source-channel-url": "^3.0.0",
"ember-template-lint": "^3.6.0",
"ember-try": "^2.0.0",
Expand All @@ -101,7 +101,7 @@
"qunit": "^2.16.0",
"qunit-dom": "^2.0.0",
"typescript": "^4.4.4",
"webpack": "^5.61.0"
"webpack": "^5.66.0"
},
"engines": {
"node": "12.* || 14.* || >= 16"
Expand Down
56 changes: 28 additions & 28 deletions testing/ember-concurrency-v1/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,44 +32,44 @@
"devDependencies": {
"@ember/optional-features": "^2.0.0",
"@ember/test-helpers": "^2.6.0",
"@ember/test-waiters": "^3.0.0",
"@embroider/test-setup": "^0.48.1",
"@ember/test-waiters": "^3.0.1",
"@embroider/test-setup": "^1.0.0",
"@glimmer/component": "^1.0.4",
"@glimmer/tracking": "^1.0.4",
"@nullvoxpopuli/eslint-configs": "^2.1.1",
"@types/ember-data": "^3.16.15",
"@types/ember-data__adapter": "^3.16.1",
"@types/ember-data__model": "^3.16.2",
"@types/ember-data__serializer": "^3.16.1",
"@types/ember-data__store": "^3.16.1",
"@types/ember-qunit": "^3.4.15",
"@types/ember-data": "^4.0.0",
"@types/ember-data__adapter": "^4.0.0",
"@types/ember-data__model": "^4.0.0",
"@types/ember-data__serializer": "^4.0.0",
"@types/ember-data__store": "^4.0.0",
"@types/ember-qunit": "^5.0.0",
"@types/ember-resolver": "^5.0.10",
"@types/ember__application": "^3.16.3",
"@types/ember__array": "^3.16.4",
"@types/ember__component": "^3.16.6",
"@types/ember__controller": "^3.16.6",
"@types/ember__debug": "^3.16.5",
"@types/ember__engine": "^3.16.3",
"@types/ember__error": "^3.16.1",
"@types/ember__object": "^3.12.6",
"@types/ember__polyfills": "^3.12.1",
"@types/ember__routing": "^3.16.15",
"@types/ember__runloop": "^3.16.3",
"@types/ember__service": "^3.16.1",
"@types/ember__application": "^4.0.0",
"@types/ember__array": "^4.0.0",
"@types/ember__component": "^4.0.0",
"@types/ember__controller": "^4.0.0",
"@types/ember__debug": "^4.0.0",
"@types/ember__engine": "^4.0.0",
"@types/ember__error": "^4.0.0",
"@types/ember__object": "^4.0.0",
"@types/ember__polyfills": "^4.0.0",
"@types/ember__routing": "^4.0.0",
"@types/ember__runloop": "^4.0.0",
"@types/ember__service": "^4.0.0",
"@types/ember__string": "^3.16.3",
"@types/ember__template": "^3.16.1",
"@types/ember__test": "^3.16.1",
"@types/ember__template": "^4.0.0",
"@types/ember__test": "^4.0.0",
"@types/ember__test-helpers": "^2.6.0",
"@types/ember__utils": "^3.16.2",
"@types/htmlbars-inline-precompile": "^1.0.1",
"@types/ember__utils": "^4.0.0",
"@types/htmlbars-inline-precompile": "^3.0.0",
"@types/qunit": "^2.11.2",
"@types/rsvp": "^4.0.4",
"babel-eslint": "^10.1.0",
"broccoli-asset-rev": "^3.0.0",
"ember-auto-import": "2.2.4",
"ember-cli": "~4.0.1",
"ember-auto-import": "2.4.0",
"ember-cli": "~4.1.0",
"ember-cli-app-version": "^5.0.0",
"ember-cli-babel": "^7.26.6",
"ember-cli-babel": "^7.26.11",
"ember-cli-dependency-checker": "^3.2.0",
"ember-cli-htmlbars": "^6.0.0",
"ember-cli-inject-live-reload": "^2.1.0",
Expand Down Expand Up @@ -102,7 +102,7 @@
"qunit": "^2.16.0",
"qunit-dom": "^2.0.0",
"typescript": "^4.5.2",
"webpack": "^5.61.0"
"webpack": "^5.66.0"
},
"engines": {
"node": "12.* || 14.* || >= 16"
Expand Down
Loading