Skip to content

Commit

Permalink
add ember-notify
Browse files Browse the repository at this point in the history
  • Loading branch information
lifeart committed Dec 8, 2023
1 parent 2571845 commit 3d1555f
Show file tree
Hide file tree
Showing 8 changed files with 92 additions and 10 deletions.
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@
"ember-data": "5.1.1",
"ember-intl": "^5.7.2",
"ember-modifier": "^4.0.0",
"ember-notify": "^6.0.4",
"ember-page-title": "^7.0.0",
"ember-power-select": "^6.0.1",
"ember-qunit": "^6.1.1",
Expand Down
37 changes: 37 additions & 0 deletions patches/ember-notify+6.0.4.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
diff --git a/node_modules/ember-notify/addon/components/ember-notify.js b/node_modules/ember-notify/addon/components/ember-notify.js
index 3079547..8135c1a 100644
--- a/node_modules/ember-notify/addon/components/ember-notify.js
+++ b/node_modules/ember-notify/addon/components/ember-notify.js
@@ -3,11 +3,11 @@ import { computed } from '@ember/object';
import { oneWay } from '@ember/object/computed';
import { inject as service } from '@ember/service';
import Component from '@ember/component';
-import layout from '../templates/components/ember-notify';
+// import layout from '../templates/components/ember-notify';
import Message from 'ember-notify/message';

export default Component.extend({
- layout,
+ // layout,

notify: service(),

diff --git a/node_modules/ember-notify/addon/components/ember-notify/message.js b/node_modules/ember-notify/addon/components/ember-notify/message.js
index 4a60397..1a1c46f 100644
--- a/node_modules/ember-notify/addon/components/ember-notify/message.js
+++ b/node_modules/ember-notify/addon/components/ember-notify/message.js
@@ -2,12 +2,12 @@ import { isArray } from '@ember/array';
import { later } from '@ember/runloop';
import { computed } from '@ember/object';
import Component from '@ember/component';
-import layout from '../../templates/components/ember-notify/message';
+// import layout from '../../templates/components/ember-notify/message';

const DEFAULT_MESSAGE = {};

export default Component.extend({
- layout,
+ // layout,
message: DEFAULT_MESSAGE,
closeAfter: null,
run: null,
22 changes: 22 additions & 0 deletions src/addons/ember-notify.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import 'ember-notify/vendor/ember-notify.css';

import NotifyService from 'ember-notify/index.js';
import EmberNotifyComponent from 'ember-notify/components/ember-notify.js';
import EmberNotifyComponentTemplate from 'ember-notify/templates/components/ember-notify.hbs';
import EmberNotifyMessageComponent from 'ember-notify/components/ember-notify/message.js';
import EmberNotifyMessageComponentTemplate from 'ember-notify/templates/components/ember-notify/message.hbs';
import { setComponentTemplate } from '@glimmer/manager';

const registry = {
'service:notify': NotifyService,
'component:ember-notify': setComponentTemplate(
EmberNotifyComponentTemplate,
EmberNotifyComponent
),
'component:ember-notify/message': setComponentTemplate(
EmberNotifyMessageComponentTemplate,
EmberNotifyMessageComponent
),
};

export default registry;
2 changes: 2 additions & 0 deletions src/addons/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import EmberStyleModifier from './ember-style-modifier';
import EmberIntl from './ember-intl';
import EmberPageTitle from './ember-page-title';
import EmberData from './ember-data';
import EmberNotify from './ember-notify';

const registry = {
...EmberSimpleAuthRegistry,
Expand All @@ -22,6 +23,7 @@ const registry = {
...EmberIntl,
...EmberPageTitle,
...EmberData,
...EmberNotify,
};

export default registry;
7 changes: 4 additions & 3 deletions src/controllers/application.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import Controller from '@ember/controller';
import { service } from '@ember/service';
import SessionService from 'ember-simple-auth/addon/services/session';

import type SessionService from 'ember-simple-auth/addon/services/session';
import type EmberNotify from 'ember-notify'
export class ApplicationController extends Controller {
@service session: SessionService;
@service notify: EmberNotify;

constructor(...args: ConstructorParameters<typeof Controller>) {
super(...args);
console.log('ApplicationController init');
this.notify.info('Welcome to Ember.js');
}
}
1 change: 1 addition & 0 deletions src/templates/application.hbs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<Header @session={{this.session}} />
<EmberNotify />

<div class='mx-auto max-w-7xl px-4 sm:px-6 lg:px-8 mt-8'>
<div class='mx-auto max-w-3xl'>
Expand Down
22 changes: 16 additions & 6 deletions vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ export default defineConfig(({ mode }) => {
addonExport('ember-bootstrap'),
addonExport('ember-inflector'),
addonExport('@ember/string'),
addonExport('ember-notify'),
{
find: 'ember-simple-auth/use-session-setup-method',
replacement: './compat/ember-simple-auth/use-session-setup-method.ts',
Expand Down Expand Up @@ -231,7 +232,10 @@ export default defineConfig(({ mode }) => {
find: /^@ember-data\/private-build-infra$/,
replacement: compatPath('ember-data-private-build-infra'),
},
],
].reduce((acc, el) => {
const items = Array.isArray(el) ? el : [el];
return [...acc, ...items];
}, []),
},
plugins: [
hbsResolver(isProd),
Expand Down Expand Up @@ -288,7 +292,7 @@ export default defineConfig(({ mode }) => {
babel({
// regexp to match files in src folder
filter:
/^.*(@ember-data|ember-bootstrap|ember-ref-bucket|tracked-toolbox|ember-power-select|ember-basic-dropdown|page-title)\/.*\.(ts|js|hbs)$/,
/^.*(@ember-data|ember-notify|ember-bootstrap|ember-ref-bucket|tracked-toolbox|ember-power-select|ember-basic-dropdown|page-title)\/.*\.(ts|js|hbs)$/,
babelConfig: addonBabelConfig([], isProd),
}),
// ...
Expand Down Expand Up @@ -334,10 +338,16 @@ function localScopes() {
}

function addonExport(name: string) {
return {
find: name,
replacement: nodePath(`${name}/addon`),
};
return [
{
find: `${name}/vendor`,
replacement: nodePath(`${name}/vendor`),
},
{
find: name,
replacement: nodePath(`${name}/addon`),
},
];
}

function nodePath(name: string) {
Expand Down
10 changes: 9 additions & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5369,7 +5369,7 @@ ember-cli-htmlbars@^4.3.1:
strip-bom "^4.0.0"
walk-sync "^2.0.2"

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

ember-notify@^6.0.4:
version "6.0.4"
resolved "https://registry.yarnpkg.com/ember-notify/-/ember-notify-6.0.4.tgz#3b30fccb911a97a4d1ed65a95447f4d3dbdb6b89"
integrity sha512-JwqgpPdF50GjaJxL1uU6jkYEVR56qn3A3x7frAB+8jJgIwpeIytZO8geSYQVeRLUUeadDS1yd6sj26BbLZAZww==
dependencies:
ember-cli-babel "^7.23.1"
ember-cli-htmlbars "^5.3.2"

ember-on-helper@^0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/ember-on-helper/-/ember-on-helper-0.1.0.tgz#c8b1fef9173fc8546c4933b57ecd7ffbcebad99e"
Expand Down

0 comments on commit 3d1555f

Please sign in to comment.