Skip to content

Commit

Permalink
woo
Browse files Browse the repository at this point in the history
  • Loading branch information
lifeart committed Dec 9, 2023
1 parent c95ad4d commit 6f0eb10
Show file tree
Hide file tree
Showing 34 changed files with 201 additions and 139 deletions.
Empty file added compat/ember-array/index.ts
Empty file.
6 changes: 6 additions & 0 deletions compat/ember-owner/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
export function getOwner(context) {
console.log('getOwner', context);
}
export function setOwner(context, owner) {
console.log('setOwner', context, owner);
}
Empty file added compat/ember-routing/route.ts
Empty file.
Empty file added compat/ember-routing/router.ts
Empty file.
Empty file.
Empty file.
Empty file.
3 changes: 3 additions & 0 deletions compat/ember-template/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export function isHTMLSafe() {
return true;
}
3 changes: 3 additions & 0 deletions compat/ember-test/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export function registerWaiter() {
console.log('registerWaiter');
}
Empty file added compat/ember-utils/index.ts
Empty file.
18 changes: 9 additions & 9 deletions compat/embroider-macros/index.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import * as renderer from '@ember/renderer';
// import * as renderer from '@ember/renderer';
import * as validator from '@glimmer/validator';
import * as manager from '@glimmer/manager';
import { DEBUG } from '@glimmer/env';
import * as recordData from '@ember-data/json-api';
import * as model from '@ember-data/model/-private';
import * as graph from '@ember-data/graph/-private';
import { getDataConfig } from './../ember-data-private-build-infra';
// import * as recordData from '@ember-data/json-api';
// import * as model from '@ember-data/model/-private';
// import * as graph from '@ember-data/graph/-private';
// import { getDataConfig } from './../ember-data-private-build-infra';
import * as owner from '@ember/owner';

export function isDevelopingApp() {
Expand Down Expand Up @@ -62,7 +62,7 @@ export function macroCondition(value: boolean) {

export function importSync(name: string) {
if (name === '@ember/renderer') {
return renderer;
return {};
}
if (name === '@glimmer/validator') {
return validator;
Expand All @@ -71,13 +71,13 @@ export function importSync(name: string) {
return manager;
}
if (name === '@ember-data/json-api') {
return recordData;
// return recordData;
}
if (name === '@ember-data/model/-private') {
return model;
// return model;
}
if (name === '@ember-data/graph/-private') {
return graph;
// return graph;
}
if (name === '@ember/owner') {
return owner;
Expand Down
5 changes: 5 additions & 0 deletions compat/emner-template-compilation/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
export function precompileTemplate() {
return null;
}

export type PrecompiledTemplate = unknown;
Empty file added compat/glimmer-manager/index.ts
Empty file.
5 changes: 5 additions & 0 deletions compat/glimmer-tracking/primitives/cache.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
export function createCache() {

}
export function getValue() {
}
2 changes: 2 additions & 0 deletions compat/node-module/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export const IS_NODE = false;
export const module = globalThis;
6 changes: 3 additions & 3 deletions plugins/ember-vendor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ export function internalPackages(mode: string) {
'@ember/test-helpers/addon-test-support/@ember/test-helpers'
),

Addon('@ember/test-waiters', mode).addSelfAlias(
'@ember/test-waiters/addon/@ember/test-waiters'
),
// Addon('@ember/test-waiters', mode).addSelfAlias(
// '@ember/test-waiters/addon/@ember/test-waiters'
// ),

Addon('ember-compatibility-helpers', mode).addSelfAlias(
compatPath('ember-compatibility-helpers/index.ts')
Expand Down
26 changes: 13 additions & 13 deletions src/addons/ember-truth-helpers.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import and from 'ember-truth-helpers/addon/helpers/and.js';
import eq from 'ember-truth-helpers/addon/helpers/equal.js';
import or from 'ember-truth-helpers/addon/helpers/or.js';
import not from 'ember-truth-helpers/addon/helpers/not.js';
import notEq from 'ember-truth-helpers/addon/helpers/not-equal.js';
// import and from 'ember-truth-helpers/addon/helpers/and.js';
// import eq from 'ember-truth-helpers/addon/helpers/equal.js';
// import or from 'ember-truth-helpers/addon/helpers/or.js';
// import not from 'ember-truth-helpers/addon/helpers/not.js';
// import notEq from 'ember-truth-helpers/addon/helpers/not-equal.js';

const registry = {
'helper:and': and,
'helper:eq': eq,
'helper:or': or,
'helper:not': not,
'helper:not-eq': notEq,
};
// const registry = {
// 'helper:and': and,
// 'helper:eq': eq,
// 'helper:or': or,
// 'helper:not': not,
// 'helper:not-eq': notEq,
// };

export default registry;
// export default registry;
8 changes: 4 additions & 4 deletions src/addons/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import EmberSimpleAuthRegistry from './ember-simple-auth';
// import EmberSimpleAuthRegistry from './ember-simple-auth';
import EmberTruthHelpers from './ember-truth-helpers';
import EmberPowerSelect from './ember-power-select';
import EmberBasicDropdown from './ember-basic-dropdown';
Expand All @@ -8,7 +8,7 @@ import EmberRenderModifiers from './ember-render-modifiers';
import EmberStyleModifier from './ember-style-modifier';
import EmberIntl from './ember-intl';
import EmberPageTitle from './ember-page-title';
import EmberData from './ember-data';
// import EmberData from './ember-data';
import EmberNotify from './ember-notify';
import EmberModalDialog from './ember-modal-dialog';
import EmberResponsive from './ember-responsive';
Expand All @@ -25,11 +25,11 @@ const registry = {
...EmberPowerSelect,
...EmberIntl,
...EmberPageTitle,
...EmberData,
// ...EmberData,
...EmberNotify,
...EmberModalDialog,
...EmberResponsive,
...EmberEventHelpers,
};

export default registry;
export default {};
5 changes: 4 additions & 1 deletion src/authenticators/custom.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
import Base from 'ember-simple-auth/authenticators/base';
// import Base from 'ember-simple-auth/authenticators/base';

interface IUserData {
id: string;
name: string;
}

class Base {

}
export default class CustomAuthenticator extends Base {
restore(data: IUserData): Promise<IUserData> {
return Promise.resolve(data);
Expand Down
4 changes: 2 additions & 2 deletions src/config/initializer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import type RouteClass from './router';
import { default as initializer } from '../initializers/logger';
import { default as logger } from '../instance-initializers/logger';
import { default as modalDialog } from '../instance-initializers/ember-modal-dialog';
import { default as emberDataInitializer } from '../initializers/ember-data';
// import { default as emberDataInitializer } from '../initializers/ember-data';
import { default as emberResponsive } from '../initializers/ember-responsive';
import breakpoints from './breakpoints';

Expand All @@ -15,7 +15,7 @@ export function init(
) {
// Init initializers
Application.initializer(initializer);
Application.initializer(emberDataInitializer);
// Application.initializer(emberDataInitializer);
Application.initializer(emberResponsive);

// Init instance initializers
Expand Down
16 changes: 8 additions & 8 deletions src/config/registry.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,18 @@ import IsDev from '@/helpers/is-dev';
import ClickTracker from '@/modifiers/click-tracker';

// ember-data debug adapter
import DataDebugAdapter from '@ember-data/debug';
import StoreService from '@/services/store';
// import DataDebugAdapter from '@ember-data/debug';
// import StoreService from '@/services/store';
/* ember-data stuff */
import Pet from '@/models/pet';
import Person from '@/models/person';
// import Pet from '@/models/pet';
// import Person from '@/models/person';

const InitialRegistry = {
'service:store': StoreService,
'model:pet': Pet,
'model:person': Person,
// 'service:store': StoreService,
// 'model:pet': Pet,
// 'model:person': Person,
// debug ember-data adapter
'data-adapter:main': DataDebugAdapter,
// 'data-adapter:main': DataDebugAdapter,

'authenticator:custom': CustomAuthenticator,
'service:date': DateService,
Expand Down
2 changes: 1 addition & 1 deletion src/config/router.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import EmberRouter from '@ember/routing/router';
import config from './env';
import type Controller from '@ember/controller';
import Route from '@ember/routing/route';
import { PrecompiledTemplate } from '@ember/template-compilation';
import type { PrecompiledTemplate } from '@ember/template-compilation';
import { getOwner } from '@ember/application';

/*
Expand Down
4 changes: 2 additions & 2 deletions src/controllers/application.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Controller from '@ember/controller';
import { service } from '@ember/service';
import type SessionService from 'ember-simple-auth/addon/services/session';
// import type SessionService from 'ember-simple-auth/addon/services/session';
import type EmberNotify from 'ember-notify';
import { tracked } from '@glimmer/tracking';
import { restartableTask, timeout } from 'ember-concurrency';
Expand All @@ -9,7 +9,7 @@ import type { Task } from 'ember-concurrency';
type MyTaskType = Task<void, []>;

export class ApplicationController extends Controller {
@service session: SessionService;
// @service session: SessionService;
@service notify: EmberNotify;
@tracked showModal = true;

Expand Down
4 changes: 2 additions & 2 deletions src/controllers/login.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import Controller from '@ember/controller';
import { service } from '@ember/service';
import { action } from '@ember/object';
import SessionService from 'ember-simple-auth/addon/services/session';
// import SessionService from 'ember-simple-auth/addon/services/session';
import RouterService from '@ember/routing/router-service';

export class LoginController extends Controller {
@service session: SessionService;
// @service session: SessionService;
@service router!: RouterService;

@action
Expand Down
30 changes: 15 additions & 15 deletions src/initializers/ember-data.ts
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
import type Application from '@ember/application';
// import type Application from '@ember/application';

function initializeStore(application: Application) {
application.registerOptionsForType('serializer', { singleton: false });
application.registerOptionsForType('adapter', { singleton: false });
}
// function initializeStore(application: Application) {
// application.registerOptionsForType('serializer', { singleton: false });
// application.registerOptionsForType('adapter', { singleton: false });
// }

function setupContainer(application: Application) {
initializeStore(application);
}
// function setupContainer(application: Application) {
// initializeStore(application);
// }

/*
This code initializes EmberData in an Ember application.
*/
export default {
name: 'ember-data',
initialize: setupContainer,
};
// /*
// This code initializes EmberData in an Ember application.
// */
// export default {
// name: 'ember-data',
// initialize: setupContainer,
// };
12 changes: 6 additions & 6 deletions src/models/person.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Model, { attr, belongsTo, hasMany } from '@ember-data/model';
// import Model, { attr, belongsTo, hasMany } from '@ember-data/model';

export default class PersonModel extends Model {
@attr name;
@belongsTo('pet', { inverse: 'owner', async: false }) dog;
@hasMany('person', { inverse: 'friends', async: false }) friends;
}
// export default class PersonModel extends Model {
// @attr name;
// @belongsTo('pet', { inverse: 'owner', async: false }) dog;
// @hasMany('person', { inverse: 'friends', async: false }) friends;
// }
10 changes: 5 additions & 5 deletions src/models/pet.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Model, { attr, belongsTo } from '@ember-data/model';
// import Model, { attr, belongsTo } from '@ember-data/model';

export default class PetModel extends Model {
@attr name;
@belongsTo('person', { inverse: 'dog', async: false }) owner;
}
// export default class PetModel extends Model {
// @attr name;
// @belongsTo('person', { inverse: 'dog', async: false }) owner;
// }
8 changes: 4 additions & 4 deletions src/routes/application.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import Route from '@ember/routing/route';
import { service } from '@ember/service';
import translations from 'ember-intl/translations';
import SessionService from 'ember-simple-auth/addon/services/session';
// import SessionService from 'ember-simple-auth/addon/services/session';
import type IntlService from 'ember-intl/addon/services/intl';
import type Store from '@/services/store';
// import type Store from '@/services/store';

export class ApplicationRoute extends Route {
@service session: SessionService;
// @service session: SessionService;
@service intl!: IntlService;
@service store!: Store;
// @service store!: Store;

async beforeModel() {
await this.session.setup();
Expand Down
6 changes: 3 additions & 3 deletions src/routes/login.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import Route from '@ember/routing/route';
import { service } from '@ember/service';
import SessionService from 'ember-simple-auth/addon/services/session';
// import SessionService from 'ember-simple-auth/addon/services/session';

export default class LoginRoute extends Route {
@service session: SessionService;
// @service session: SessionService;

beforeModel() {
this.session.prohibitAuthentication('main');
// this.session.prohibitAuthentication('main');
}
}
10 changes: 5 additions & 5 deletions src/routes/logout.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ import Route from '@ember/routing/route';
import RouterService from '@ember/routing/router-service';
import Transition from '@ember/routing/transition';
import { service } from '@ember/service';
import SessionService from 'ember-simple-auth/addon/services/session';
// import SessionService from 'ember-simple-auth/addon/services/session';

export default class LogoutRoute extends Route {
@service session: SessionService;
// @service session: SessionService;
@service router!: RouterService;

async beforeModel(transition: Transition) {
this.session.requireAuthentication(transition, 'login');
// this.session.requireAuthentication(transition, 'login');

await this.session.invalidate();
// await this.session.invalidate();

this.router.transitionTo('main');
// this.router.transitionTo('main');
}
}
16 changes: 8 additions & 8 deletions src/routes/profile.ts
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
import Route from '@ember/routing/route';
import type Transition from '@ember/routing/transition';
import { service } from '@ember/service';
import SessionService from 'ember-simple-auth/addon/services/session';
import StoreService from '@/services/store';
// import SessionService from 'ember-simple-auth/addon/services/session';
// import StoreService from '@/services/store';

export default class ProfileRoute extends Route {
@service session: SessionService;
@service store: StoreService;
// @service session: SessionService;
// @service store: StoreService;

beforeModel(transition: Transition) {
this.session.requireAuthentication(transition, 'login');
// this.session.requireAuthentication(transition, 'login');
}

model() {
const model = this.session.data.authenticated;
const user = this.store.peekRecord('person', model.id);
return user ?? this.store.createRecord('person', model);
// const model = this.session.data.authenticated;
// const user = this.store.peekRecord('person', model.id);
// return user ?? this.store.createRecord('person', model);
}
}
Loading

0 comments on commit 6f0eb10

Please sign in to comment.