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

Update ember-cli to v4.12 #736

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Update ember-cli to v4.12 #736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
99df549
Run ember-cli-update --to 4.12
fsmanuel Oct 25, 2023
ea63707
Disable stylelint for now
fsmanuel Oct 25, 2023
40f65b6
Use @ember-data/model import
fsmanuel Oct 25, 2023
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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ jobs:
- ember-release
- ember-beta
- ember-canary
# - embroider-safe
# - embroider-optimized
- embroider-safe
- embroider-optimized

steps:
- uses: actions/checkout@v3
Expand Down
4 changes: 3 additions & 1 deletion addon/utils/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@ import {
} from '@embroider/macros';

let DS;
let Model;
if (macroCondition(dependencySatisfies('ember-data', '*'))) {
DS = importSync('ember-data').default;
Model = importSync('@ember-data/model').default;
}

export { getDependentKeys, isDescriptor } from '../-private/ember-internals';
Expand Down Expand Up @@ -44,7 +46,7 @@ export function isPromise(p) {
}

export function isDsModel(o) {
return !!(DS && o && o instanceof DS.Model);
return !!(Model && o && o instanceof Model);
}

export function isDSManyArray(o) {
Expand Down
2 changes: 2 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@
"scripts": {
"build": "ember build --environment=production",
"lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"",
"lint:css": "stylelint \"**/*.css\" --allow-empty-input",
"lint:css:fix": "concurrently \"npm:lint:css -- --fix\"",
"lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"",
"lint:hbs": "ember-template-lint .",
"lint:hbs:fix": "ember-template-lint . --fix",
Expand Down
3 changes: 0 additions & 3 deletions tests/dummy/config/ember-try.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ module.exports = async function () {
name: 'ember-release',
npm: {
devDependencies: {
'@ember/string': '3.0.1',
'ember-source': await getChannelURL('release'),
'ember-data': 'latest',
},
Expand All @@ -57,7 +56,6 @@ module.exports = async function () {
name: 'ember-beta',
npm: {
devDependencies: {
'@ember/string': '3.0.1',
'ember-source': await getChannelURL('beta'),
'ember-data': 'beta',
},
Expand All @@ -67,7 +65,6 @@ module.exports = async function () {
name: 'ember-canary',
npm: {
devDependencies: {
'@ember/string': '3.0.1',
'ember-source': await getChannelURL('canary'),
'ember-data': 'canary',
},
Expand Down
Loading