Skip to content

Commit b99cbac

Browse files
committed
chore(showcase): ember v6.4
1 parent 39fcb55 commit b99cbac

File tree

12 files changed

+1390
-422
lines changed

12 files changed

+1390
-422
lines changed

packages/components/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
"babel-plugin-ember-template-compilation": "^2.4.1",
9797
"concurrently": "^9.1.2",
9898
"ember-basic-dropdown": "^8.4.0",
99-
"ember-source": "^5.12.0",
99+
"ember-source": "^6.4.0",
100100
"ember-template-lint": "^7.0.2",
101101
"ember-template-lint-plugin-prettier": "^5.0.0",
102102
"eslint": "^9.23.0",

pnpm-lock.yaml

Lines changed: 1331 additions & 372 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

showcase/.ember-cli

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,4 @@
11
{
2-
/**
3-
Ember CLI sends analytics information by default. The data is completely
4-
anonymous, but there are times when you might want to disable this behavior.
5-
6-
Setting `disableAnalytics` to true will prevent any data from being sent.
7-
*/
8-
"disableAnalytics": true,
9-
102
/**
113
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
124
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.

showcase/.stylelintignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,3 @@
33

44
# compiled output
55
/dist/
6-
7-
# addons
8-
/.node_modules.ember-try/

showcase/app/app.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ import Application from '@ember/application';
77
import Resolver from 'ember-resolver';
88
import loadInitializers from 'ember-load-initializers';
99
import config from 'showcase/config/environment';
10+
import { importSync, isDevelopingApp, macroCondition } from '@embroider/macros';
11+
12+
if (macroCondition(isDevelopingApp())) {
13+
importSync('./deprecation-workflow');
14+
}
1015

1116
export default class App extends Application {
1217
modulePrefix = config.modulePrefix;
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
import setupDeprecationWorkflow from 'ember-cli-deprecation-workflow';
2+
3+
/**
4+
* Docs: https://github.com/ember-cli/ember-cli-deprecation-workflow
5+
*/
6+
setupDeprecationWorkflow({
7+
/**
8+
false by default, but if a developer / team wants to be more aggressive about being proactive with
9+
handling their deprecations, this should be set to "true"
10+
*/
11+
throwOnUnhandled: false,
12+
workflow: [
13+
/* ... handlers ... */
14+
/* to generate this list, run your app for a while (or run the test suite),
15+
* and then run in the browser console:
16+
*
17+
* deprecationWorkflow.flushDeprecations()
18+
*
19+
* And copy the handlers here
20+
*/
21+
/* example: */
22+
/* { handler: 'silence', matchId: 'template-action' }, */
23+
{ handler: 'throw', matchId: 'ember-modifier.use-destroyables' },
24+
{ handler: 'throw', matchId: 'ember-modifier.use-modify' },
25+
{ handler: 'throw', matchId: 'ember-modifier.no-args-property' },
26+
{ handler: 'throw', matchId: 'ember-modifier.no-element-property' },
27+
{ handler: 'silence', matchId: 'importing-inject-from-ember-service' },
28+
],
29+
});

showcase/config/deprecation-workflow.js

Lines changed: 0 additions & 14 deletions
This file was deleted.

showcase/config/ember-cli-update.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,17 @@
33
"packages": [
44
{
55
"name": "ember-cli",
6-
"version": "5.12.0",
6+
"version": "6.4.0",
77
"blueprints": [
88
{
99
"name": "app",
1010
"outputRepo": "https://github.com/ember-cli/ember-new-output",
1111
"codemodsSource": "ember-app-codemods-manifest@1",
1212
"isBaseBlueprint": true,
1313
"options": [
14-
"--no-welcome",
1514
"--pnpm",
16-
"--ci-provider=github",
1715
"--typescript",
16+
"--no-welcome",
1817
"--no-ember-data"
1918
]
2019
}

showcase/config/ember-try.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const { embroiderSafe, embroiderOptimized } = require('@embroider/test-setup');
1111
module.exports = async function () {
1212
return {
1313
command: 'ember test --filter="integration" --reporter xunit',
14-
usePnpm: true,
14+
packageManager: 'pnpm',
1515
scenarios: [
1616
{
1717
name: 'ember-lts-3.28',

showcase/config/targets.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
'use strict';
77

88
const browsers = [
9-
'last 2 Chrome versions',
10-
'last 2 Firefox versions',
11-
'last 2 Safari versions',
9+
'last 1 Chrome versions',
10+
'last 1 Firefox versions',
11+
'last 1 Safari versions',
1212
];
1313

1414
module.exports = {

0 commit comments

Comments
 (0)