Skip to content

Commit

Permalink
Fix import/extensions errors & disable runloop lint rule for now
Browse files Browse the repository at this point in the history
  • Loading branch information
mkszepp committed Jun 27, 2024
1 parent d8f217b commit 58f384c
Show file tree
Hide file tree
Showing 26 changed files with 70 additions and 65 deletions.
4 changes: 3 additions & 1 deletion ember-moment/.eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ module.exports = {
env: {
browser: true,
},
rules: {},
rules: {
'ember/no-runloop': 'off',
},
overrides: [
// require relative imports use full extensions
{
Expand Down
11 changes: 7 additions & 4 deletions ember-moment/src/helpers/-base.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export default Helper.extend({
'moment.timeZone',
function () {
this.recompute();
}
},
),

compute(value, { interval }) {
Expand All @@ -33,9 +33,12 @@ export default Helper.extend({
* as the run loop queue is never clear so tests will stay locked waiting
* for queue to clear.
*/
this.intervalTimer = setTimeout(() => {
run(() => this.recompute());
}, parseInt(interval, 10));
this.intervalTimer = setTimeout(
() => {
run(() => this.recompute());
},
parseInt(interval, 10),
);
}
},

Expand Down
4 changes: 2 additions & 2 deletions ember-moment/src/helpers/is-after.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import BaseHelper from './-base';
import computeFn from '../utils/helper-compute';
import BaseHelper from './-base.js';
import computeFn from '../utils/helper-compute.js';

export default BaseHelper.extend({
compute: computeFn(function (params, { precision, locale, timeZone }) {
Expand Down
4 changes: 2 additions & 2 deletions ember-moment/src/helpers/is-before.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import computeFn from '../utils/helper-compute';
import BaseHelper from './-base';
import computeFn from '../utils/helper-compute.js';
import BaseHelper from './-base.js';

export default BaseHelper.extend({
compute: computeFn(function (params, { precision, locale, timeZone }) {
Expand Down
8 changes: 4 additions & 4 deletions ember-moment/src/helpers/is-between.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import computeFn from '../utils/helper-compute';
import BaseHelper from './-base';
import computeFn from '../utils/helper-compute.js';
import BaseHelper from './-base.js';

export default BaseHelper.extend({
compute: computeFn(function (
params,
{ precision, inclusivity, locale, timeZone }
{ precision, inclusivity, locale, timeZone },
) {
this._super(...arguments);

Expand All @@ -14,7 +14,7 @@ export default BaseHelper.extend({

if (length < 2 || length > 3) {
throw new TypeError(
'ember-moment: Invalid Number of arguments, expected 2 or 3'
'ember-moment: Invalid Number of arguments, expected 2 or 3',
);
}

Expand Down
4 changes: 2 additions & 2 deletions ember-moment/src/helpers/is-same-or-after.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import computeFn from '../utils/helper-compute';
import BaseHelper from './-base';
import computeFn from '../utils/helper-compute.js';
import BaseHelper from './-base.js';

export default BaseHelper.extend({
compute: computeFn(function (params, { precision, locale, timeZone }) {
Expand Down
4 changes: 2 additions & 2 deletions ember-moment/src/helpers/is-same-or-before.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import computeFn from '../utils/helper-compute';
import BaseHelper from './-base';
import computeFn from '../utils/helper-compute.js';
import BaseHelper from './-base.js';

export default BaseHelper.extend({
compute: computeFn(function (params, { precision, locale, timeZone }) {
Expand Down
4 changes: 2 additions & 2 deletions ember-moment/src/helpers/is-same.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import computeFn from '../utils/helper-compute';
import BaseHelper from './-base';
import computeFn from '../utils/helper-compute.js';
import BaseHelper from './-base.js';

export default BaseHelper.extend({
compute: computeFn(function (params, { precision, locale, timeZone }) {
Expand Down
6 changes: 3 additions & 3 deletions ember-moment/src/helpers/moment-add.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { typeOf } from '@ember/utils';

import computeFn from '../utils/helper-compute';
import BaseHelper from './-base';
import computeFn from '../utils/helper-compute.js';
import BaseHelper from './-base.js';

export default BaseHelper.extend({
compute: computeFn(function (params, { precision, locale, timeZone }) {
Expand All @@ -27,7 +27,7 @@ export default BaseHelper.extend({

return this.morphMoment(moment.moment(...args), { locale, timeZone }).add(
...additionArgs,
precision
precision,
);
}),
});
8 changes: 4 additions & 4 deletions ember-moment/src/helpers/moment-calendar.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import computeFn from '../utils/helper-compute';
import BaseHelper from './-base';
import computeFn from '../utils/helper-compute.js';
import BaseHelper from './-base.js';

export default BaseHelper.extend({
compute: computeFn(function (params, formatHash = {}) {
this._super(...arguments);

if (!params || (params && params.length > 3)) {
throw new TypeError(
'ember-moment: Invalid Number of arguments, at most 3'
'ember-moment: Invalid Number of arguments, at most 3',
);
}

Expand All @@ -23,7 +23,7 @@ export default BaseHelper.extend({

return this.morphMoment(moment.moment(date), { locale, timeZone }).calendar(
referenceTime,
mergedFormats
mergedFormats,
);
}),
});
8 changes: 4 additions & 4 deletions ember-moment/src/helpers/moment-diff.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import computeFn from '../utils/helper-compute';
import BaseHelper from './-base';
import computeFn from '../utils/helper-compute.js';
import BaseHelper from './-base.js';

export default BaseHelper.extend({
compute: computeFn(function (params, { precision, float, locale, timeZone }) {
this._super(...arguments);

if (!params || (params && params.length !== 2)) {
throw new TypeError(
'ember-moment: Invalid Number of arguments, must be 2'
'ember-moment: Invalid Number of arguments, must be 2',
);
}

Expand All @@ -17,7 +17,7 @@ export default BaseHelper.extend({
return this.morphMoment(moment.moment(dateB), { locale, timeZone }).diff(
dateA,
precision,
float
float,
);
}),
});
6 changes: 3 additions & 3 deletions ember-moment/src/helpers/moment-duration.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import BaseHelper from './-base';
import { momentOrMomentTimezone as moment } from '../index';
import BaseHelper from './-base.js';
import { momentOrMomentTimezone as moment } from '../index.js';

export default BaseHelper.extend({
compute(params, { locale, timeZone }) {
Expand All @@ -8,7 +8,7 @@ export default BaseHelper.extend({

if (!params || (params && params.length > 2)) {
throw new TypeError(
'ember-moment: Invalid Number of arguments, at most 2'
'ember-moment: Invalid Number of arguments, at most 2',
);
}

Expand Down
6 changes: 3 additions & 3 deletions ember-moment/src/helpers/moment-format.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { isEmpty } from '@ember/utils';
import { get, observer } from '@ember/object';

import computeFn from '../utils/helper-compute';
import BaseHelper from './-base';
import computeFn from '../utils/helper-compute.js';
import BaseHelper from './-base.js';

export default BaseHelper.extend({
// eslint-disable-next-line ember/no-observers
Expand All @@ -17,7 +17,7 @@ export default BaseHelper.extend({

if (length > 3) {
throw new TypeError(
'ember-moment: Invalid number of arguments, expected at most 3'
'ember-moment: Invalid number of arguments, expected at most 3',
);
}

Expand Down
4 changes: 2 additions & 2 deletions ember-moment/src/helpers/moment-from-now.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import computeFn from '../utils/helper-compute';
import BaseHelper from './-base';
import computeFn from '../utils/helper-compute.js';
import BaseHelper from './-base.js';

export default BaseHelper.extend({
compute: computeFn(function (params, { hideAffix, locale, timeZone }) {
Expand Down
8 changes: 4 additions & 4 deletions ember-moment/src/helpers/moment-from.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
import computeFn from '../utils/helper-compute';
import BaseHelper from './-base';
import computeFn from '../utils/helper-compute.js';
import BaseHelper from './-base.js';

export default BaseHelper.extend({
compute: computeFn(function (
[datetime, ...params],
{ hideAffix, locale, timeZone }
{ hideAffix, locale, timeZone },
) {
this._super(...arguments);

const moment = this.moment;

return this.morphMoment(moment.moment(datetime), { locale, timeZone }).from(
...params,
hideAffix
hideAffix,
);
}),
});
4 changes: 2 additions & 2 deletions ember-moment/src/helpers/moment-subtract.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { typeOf } from '@ember/utils';

import computeFn from '../utils/helper-compute';
import BaseHelper from './-base';
import computeFn from '../utils/helper-compute.js';
import BaseHelper from './-base.js';

export default BaseHelper.extend({
compute: computeFn(function (params, { precision, locale, timeZone }) {
Expand Down
6 changes: 3 additions & 3 deletions ember-moment/src/helpers/moment-to-date.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import computeFn from '../utils/helper-compute';
import BaseHelper from './-base';
import computeFn from '../utils/helper-compute.js';
import BaseHelper from './-base.js';

export default BaseHelper.extend({
compute: computeFn(function (params, { hidePrefix, locale, timeZone }) {
Expand All @@ -9,7 +9,7 @@ export default BaseHelper.extend({

return this.morphMoment(moment.moment(), { locale, timeZone }).to(
...params,
hidePrefix
hidePrefix,
);
}),
});
4 changes: 2 additions & 2 deletions ember-moment/src/helpers/moment-to-now.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import computeFn from '../utils/helper-compute';
import BaseHelper from './-base';
import computeFn from '../utils/helper-compute.js';
import BaseHelper from './-base.js';

export default BaseHelper.extend({
compute: computeFn(function (params, { hideAffix, locale, timeZone }) {
Expand Down
8 changes: 4 additions & 4 deletions ember-moment/src/helpers/moment-to.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
import computeFn from '../utils/helper-compute';
import BaseHelper from './-base';
import computeFn from '../utils/helper-compute.js';
import BaseHelper from './-base.js';

export default BaseHelper.extend({
compute: computeFn(function (
[datetime, ...params],
{ hideAffix, locale, timeZone }
{ hideAffix, locale, timeZone },
) {
this._super(...arguments);

const moment = this.moment;

return this.morphMoment(moment.moment(datetime), { locale, timeZone }).to(
...params,
hideAffix
hideAffix,
);
}),
});
2 changes: 1 addition & 1 deletion ember-moment/src/helpers/moment.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import BaseHelper from './-base';
import BaseHelper from './-base.js';

export default BaseHelper.extend({
compute(params, { locale, timeZone }) {
Expand Down
4 changes: 2 additions & 2 deletions ember-moment/src/helpers/now.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { momentOrMomentTimezone as moment } from '../index';
import BaseHelper from './-base';
import { momentOrMomentTimezone as moment } from '../index.js';
import BaseHelper from './-base.js';

export default BaseHelper.extend({
compute() {
Expand Down
4 changes: 2 additions & 2 deletions ember-moment/src/helpers/unix.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { momentOrMomentTimezone as moment } from '../index';
import BaseHelper from './-base';
import { momentOrMomentTimezone as moment } from '../index.js';
import BaseHelper from './-base.js';

export default BaseHelper.extend({
compute([unixTimeStamp]) {
Expand Down
4 changes: 2 additions & 2 deletions ember-moment/src/helpers/utc.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { momentOrMomentTimezone as moment } from '../index';
import BaseHelper from './-base';
import { momentOrMomentTimezone as moment } from '../index.js';
import BaseHelper from './-base.js';

export default BaseHelper.extend({
compute([utcTime, format]) {
Expand Down
2 changes: 1 addition & 1 deletion ember-moment/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export const momentOrMomentTimezone = (() => {
return importSync('moment').default;
} else {
throw new Error(
`ember-moment was unable to detect either moment-timezone or moment. Please add one of those to your app.`
`ember-moment was unable to detect either moment-timezone or moment. Please add one of those to your app.`,
);
}
})();
4 changes: 2 additions & 2 deletions ember-moment/src/services/moment.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Service from '@ember/service';
import Evented from '@ember/object/evented';
import { getOwner } from '@ember/application';
import { momentOrMomentTimezone as moment } from '../index';
import { momentOrMomentTimezone as moment } from '../index.js';
import { computed, set, setProperties } from '@ember/object';

// eslint-disable-next-line ember/no-classic-classes
Expand Down Expand Up @@ -32,7 +32,7 @@ export default Service.extend(Evented, {
if (!moment.tz) {
/* eslint-disable no-console */
console.warn(
'[ember-moment] attempted to set timezone, but moment-timezone is not setup.'
'[ember-moment] attempted to set timezone, but moment-timezone is not setup.',
);
return;
}
Expand Down
4 changes: 2 additions & 2 deletions ember-moment/src/utils/helper-compute.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export default function (cb) {
return function (params, hash) {
if (!params || (params && params.length === 0)) {
throw new TypeError(
'ember-moment: Invalid Number of arguments, expected at least 1'
'ember-moment: Invalid Number of arguments, expected at least 1',
);
}

Expand All @@ -23,7 +23,7 @@ export default function (cb) {

/* eslint-disable no-console */
console.warn(
`ember-moment: an empty value (null, undefined, or "") was passed to ember-moment helper`
`ember-moment: an empty value (null, undefined, or "") was passed to ember-moment helper`,
);
}

Expand Down

0 comments on commit 58f384c

Please sign in to comment.