Skip to content

fix: remove duplicate import and no relative import #4015

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

Merged
merged 8 commits into from
Feb 15, 2020
Merged

fix: remove duplicate import and no relative import #4015

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cccb573
remove duplicate import
maze-runnar Feb 6, 2020
8c1991a
remove dulicate import
maze-runnar Feb 6, 2020
98ec6d6
remove relative import
maze-runnar Feb 6, 2020
c636e85
remove relative parent import
maze-runnar Feb 6, 2020
25856e7
Merge branch 'development' into patch-10
maze-runnar Feb 15, 2020
832796b
Update test-helper.js
maze-runnar Feb 15, 2020
9dae189
adding app.js to same folder to avoid relative parent import
maze-runnar Feb 15, 2020
327a6ea
remove relative parent import
maze-runnar Feb 15, 2020
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
2 changes: 1 addition & 1 deletion app/initializers/extensions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import '../extensions/ember-table/component';
import 'open-event-frontend/extensions/ember-table/component';

export function initialize() {}

Expand Down
3 changes: 1 addition & 2 deletions app/services/current-user.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import Service from '@ember/service';
import { inject as service } from '@ember/service';
import Service, { inject as service } from '@ember/service';
import { isEmpty } from '@ember/utils';
import { resolve } from 'rsvp';

Expand Down
3 changes: 1 addition & 2 deletions app/services/device.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import $ from 'jquery';
import Service from '@ember/service';
import Service, { inject as service } from '@ember/service';
import { computed } from '@ember/object';
import { equal, or } from '@ember/object/computed';
import { debounce } from '@ember/runloop';
import { forOwn } from 'lodash-es';
import { inject as service } from '@ember/service';

/**
* Keeping this outside the service object to keep it lean and faster to loop over
Expand Down
4 changes: 2 additions & 2 deletions tests/test-helper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Application from '../app';
import Application from '@ember/application';
import QUnit from 'qunit';
import config from '../config/environment';
import config from 'open-event-frontend/config/environment';
Copy link
Member

@snitin315 snitin315 Feb 15, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you sure this is correct way?

Copy link
Contributor Author

@maze-runnar maze-runnar Feb 15, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@snitin315 , can you please pull these changes to test. it's working as far i tested for everyone's concern if you once please check it.

Copy link
Contributor Author

@maze-runnar maze-runnar Feb 15, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you sure this is correct way?

I think it is, other files of project used this type of import.

Copy link
Member

@snitin315 snitin315 Feb 15, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure , but I think somewhere I read that. In ember.js the project-name/ refers to the app folder by default. Please check if the statement is correct .

Copy link
Contributor Author

@maze-runnar maze-runnar Feb 15, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@snitin315 app.js uses same kind of import -

import Application from '@ember/application';
import Resolver from './resolver';
import loadInitializers from 'ember-load-initializers';
import config from 'open-event-frontend/config/environment';

const App = Application.extend({
  modulePrefix    : config.modulePrefix,
  podModulePrefix : config.podModulePrefix,
  Resolver
});

loadInitializers(App, config.modulePrefix);

export default App;

Copy link
Contributor Author

@maze-runnar maze-runnar Feb 15, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Check This

Screenshot from 2020-02-15 17-03-24

import Application from '@ember/application';
import Resolver from './resolver';
import loadInitializers from 'ember-load-initializers';
import config from 'open-event-frontend/config/environment';
const App = Application.extend({
modulePrefix : config.modulePrefix,
podModulePrefix : config.podModulePrefix,
Resolver
});
loadInitializers(App, config.modulePrefix);
export default App;

when life is unfair 😕 :

import { setApplication } from '@ember/test-helpers';
import { start } from 'ember-qunit';
import loadEmberExam from 'ember-exam/test-support/load';
Expand Down