Skip to content

Commit 3d1555f

Browse files
committed
add ember-notify
1 parent 2571845 commit 3d1555f

File tree

8 files changed

+92
-10
lines changed

8 files changed

+92
-10
lines changed

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@
9191
"ember-data": "5.1.1",
9292
"ember-intl": "^5.7.2",
9393
"ember-modifier": "^4.0.0",
94+
"ember-notify": "^6.0.4",
9495
"ember-page-title": "^7.0.0",
9596
"ember-power-select": "^6.0.1",
9697
"ember-qunit": "^6.1.1",

patches/ember-notify+6.0.4.patch

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
diff --git a/node_modules/ember-notify/addon/components/ember-notify.js b/node_modules/ember-notify/addon/components/ember-notify.js
2+
index 3079547..8135c1a 100644
3+
--- a/node_modules/ember-notify/addon/components/ember-notify.js
4+
+++ b/node_modules/ember-notify/addon/components/ember-notify.js
5+
@@ -3,11 +3,11 @@ import { computed } from '@ember/object';
6+
import { oneWay } from '@ember/object/computed';
7+
import { inject as service } from '@ember/service';
8+
import Component from '@ember/component';
9+
-import layout from '../templates/components/ember-notify';
10+
+// import layout from '../templates/components/ember-notify';
11+
import Message from 'ember-notify/message';
12+
13+
export default Component.extend({
14+
- layout,
15+
+ // layout,
16+
17+
notify: service(),
18+
19+
diff --git a/node_modules/ember-notify/addon/components/ember-notify/message.js b/node_modules/ember-notify/addon/components/ember-notify/message.js
20+
index 4a60397..1a1c46f 100644
21+
--- a/node_modules/ember-notify/addon/components/ember-notify/message.js
22+
+++ b/node_modules/ember-notify/addon/components/ember-notify/message.js
23+
@@ -2,12 +2,12 @@ import { isArray } from '@ember/array';
24+
import { later } from '@ember/runloop';
25+
import { computed } from '@ember/object';
26+
import Component from '@ember/component';
27+
-import layout from '../../templates/components/ember-notify/message';
28+
+// import layout from '../../templates/components/ember-notify/message';
29+
30+
const DEFAULT_MESSAGE = {};
31+
32+
export default Component.extend({
33+
- layout,
34+
+ // layout,
35+
message: DEFAULT_MESSAGE,
36+
closeAfter: null,
37+
run: null,

src/addons/ember-notify.ts

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
import 'ember-notify/vendor/ember-notify.css';
2+
3+
import NotifyService from 'ember-notify/index.js';
4+
import EmberNotifyComponent from 'ember-notify/components/ember-notify.js';
5+
import EmberNotifyComponentTemplate from 'ember-notify/templates/components/ember-notify.hbs';
6+
import EmberNotifyMessageComponent from 'ember-notify/components/ember-notify/message.js';
7+
import EmberNotifyMessageComponentTemplate from 'ember-notify/templates/components/ember-notify/message.hbs';
8+
import { setComponentTemplate } from '@glimmer/manager';
9+
10+
const registry = {
11+
'service:notify': NotifyService,
12+
'component:ember-notify': setComponentTemplate(
13+
EmberNotifyComponentTemplate,
14+
EmberNotifyComponent
15+
),
16+
'component:ember-notify/message': setComponentTemplate(
17+
EmberNotifyMessageComponentTemplate,
18+
EmberNotifyMessageComponent
19+
),
20+
};
21+
22+
export default registry;

src/addons/index.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import EmberStyleModifier from './ember-style-modifier';
99
import EmberIntl from './ember-intl';
1010
import EmberPageTitle from './ember-page-title';
1111
import EmberData from './ember-data';
12+
import EmberNotify from './ember-notify';
1213

1314
const registry = {
1415
...EmberSimpleAuthRegistry,
@@ -22,6 +23,7 @@ const registry = {
2223
...EmberIntl,
2324
...EmberPageTitle,
2425
...EmberData,
26+
...EmberNotify,
2527
};
2628

2729
export default registry;

src/controllers/application.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
import Controller from '@ember/controller';
22
import { service } from '@ember/service';
3-
import SessionService from 'ember-simple-auth/addon/services/session';
4-
3+
import type SessionService from 'ember-simple-auth/addon/services/session';
4+
import type EmberNotify from 'ember-notify'
55
export class ApplicationController extends Controller {
66
@service session: SessionService;
7+
@service notify: EmberNotify;
78

89
constructor(...args: ConstructorParameters<typeof Controller>) {
910
super(...args);
10-
console.log('ApplicationController init');
11+
this.notify.info('Welcome to Ember.js');
1112
}
1213
}

src/templates/application.hbs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<Header @session={{this.session}} />
2+
<EmberNotify />
23

34
<div class='mx-auto max-w-7xl px-4 sm:px-6 lg:px-8 mt-8'>
45
<div class='mx-auto max-w-3xl'>

vite.config.ts

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ export default defineConfig(({ mode }) => {
8585
addonExport('ember-bootstrap'),
8686
addonExport('ember-inflector'),
8787
addonExport('@ember/string'),
88+
addonExport('ember-notify'),
8889
{
8990
find: 'ember-simple-auth/use-session-setup-method',
9091
replacement: './compat/ember-simple-auth/use-session-setup-method.ts',
@@ -231,7 +232,10 @@ export default defineConfig(({ mode }) => {
231232
find: /^@ember-data\/private-build-infra$/,
232233
replacement: compatPath('ember-data-private-build-infra'),
233234
},
234-
],
235+
].reduce((acc, el) => {
236+
const items = Array.isArray(el) ? el : [el];
237+
return [...acc, ...items];
238+
}, []),
235239
},
236240
plugins: [
237241
hbsResolver(isProd),
@@ -288,7 +292,7 @@ export default defineConfig(({ mode }) => {
288292
babel({
289293
// regexp to match files in src folder
290294
filter:
291-
/^.*(@ember-data|ember-bootstrap|ember-ref-bucket|tracked-toolbox|ember-power-select|ember-basic-dropdown|page-title)\/.*\.(ts|js|hbs)$/,
295+
/^.*(@ember-data|ember-notify|ember-bootstrap|ember-ref-bucket|tracked-toolbox|ember-power-select|ember-basic-dropdown|page-title)\/.*\.(ts|js|hbs)$/,
292296
babelConfig: addonBabelConfig([], isProd),
293297
}),
294298
// ...
@@ -334,10 +338,16 @@ function localScopes() {
334338
}
335339

336340
function addonExport(name: string) {
337-
return {
338-
find: name,
339-
replacement: nodePath(`${name}/addon`),
340-
};
341+
return [
342+
{
343+
find: `${name}/vendor`,
344+
replacement: nodePath(`${name}/vendor`),
345+
},
346+
{
347+
find: name,
348+
replacement: nodePath(`${name}/addon`),
349+
},
350+
];
341351
}
342352

343353
function nodePath(name: string) {

yarn.lock

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5369,7 +5369,7 @@ ember-cli-htmlbars@^4.3.1:
53695369
strip-bom "^4.0.0"
53705370
walk-sync "^2.0.2"
53715371

5372-
ember-cli-htmlbars@^5.2.0, ember-cli-htmlbars@^5.3.1, ember-cli-htmlbars@^5.7.1:
5372+
ember-cli-htmlbars@^5.2.0, ember-cli-htmlbars@^5.3.1, ember-cli-htmlbars@^5.3.2, ember-cli-htmlbars@^5.7.1:
53735373
version "5.7.2"
53745374
resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-5.7.2.tgz#e0cd2fb3c20d85fe4c3e228e6f0590ee1c645ba8"
53755375
integrity sha512-Uj6R+3TtBV5RZoJY14oZn/sNPnc+UgmC8nb5rI4P3fR/gYoyTFIZSXiIM7zl++IpMoIrocxOrgt+mhonKphgGg==
@@ -5762,6 +5762,14 @@ ember-named-blocks-polyfill@^0.2.4:
57625762
ember-cli-babel "^7.19.0"
57635763
ember-cli-version-checker "^5.1.1"
57645764

5765+
ember-notify@^6.0.4:
5766+
version "6.0.4"
5767+
resolved "https://registry.yarnpkg.com/ember-notify/-/ember-notify-6.0.4.tgz#3b30fccb911a97a4d1ed65a95447f4d3dbdb6b89"
5768+
integrity sha512-JwqgpPdF50GjaJxL1uU6jkYEVR56qn3A3x7frAB+8jJgIwpeIytZO8geSYQVeRLUUeadDS1yd6sj26BbLZAZww==
5769+
dependencies:
5770+
ember-cli-babel "^7.23.1"
5771+
ember-cli-htmlbars "^5.3.2"
5772+
57655773
ember-on-helper@^0.1.0:
57665774
version "0.1.0"
57675775
resolved "https://registry.yarnpkg.com/ember-on-helper/-/ember-on-helper-0.1.0.tgz#c8b1fef9173fc8546c4933b57ecd7ffbcebad99e"

0 commit comments

Comments
 (0)