Skip to content
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.

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

chore: dependency updates, eslint v8, node 18 #412

Merged
merged 16 commits into from
Jul 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 6 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on: workflow_dispatch

env:
GH_TOKEN: ${{ secrets.GH_TOKEN }}
NODE_VERSION: 18

jobs:
release:
Expand All @@ -16,11 +17,13 @@ jobs:
latest-tag-ref: ${{ steps.latest-tag.outputs.tag }}
new-tag-ref: ${{ steps.semantic-release-tag.outputs.tag }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: 0
persist-credentials: false
- uses: actions/setup-node@v2
- uses: actions/setup-node@v3
with:
node-version: ${{ env.NODE_VERSION }}

- name: Install dependencies
run: yarn install
Expand All @@ -47,7 +50,7 @@ jobs:
release-container-image:
needs: release
if: needs.release.outputs.new-tag-ref != needs.release.outputs.latest-tag-ref
uses: adfinis-sygroup/customer-center/.github/workflows/release-container-image.yaml@main
uses: adfinis/customer-center/.github/workflows/release-container-image.yaml@main
with:
ref: ${{ needs.release.outputs.new-tag-ref }}
secrets:
Expand Down
13 changes: 7 additions & 6 deletions .github/workflows/test-frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ on:

env:
CI: true
NODE_VERSION: 18

jobs:
lint:
Expand All @@ -21,10 +22,10 @@ jobs:
target: [js, hbs]

steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 14
node-version: ${{ env.NODE_VERSION }}

- name: Install dependencies
run: yarn --cwd=frontend install
Expand All @@ -38,10 +39,10 @@ jobs:
runs-on: [ubuntu-latest]

steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 14
node-version: ${{ env.NODE_VERSION }}

- name: Install dependencies
run: yarn --cwd=frontend install
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Adfinis customer support portal with LDAP and Timed integration.

## Setup

* `git clone [email protected]:adfinis-sygroup/customer-center.git`
* `git clone [email protected]:adfinis/customer-center.git`
* `cd customer-center`
* `make init`

Expand Down
7 changes: 5 additions & 2 deletions frontend/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
"use strict";

module.exports = {
extends: "@adfinis-sygroup/eslint-config/ember-app",

settings: {
"import/internal-regex": "^customer-center/",
},
extends: ["@adfinis/eslint-config/ember-app"],
rules: {
"ember/no-settled-after-test-helper": "warn",
"no-unused-vars": "off",
"prefer-rest-params": "off",
"ember/use-brace-expansion": "off",
Expand Down
8 changes: 4 additions & 4 deletions frontend/.template-lintrc.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
"use strict";

module.exports = {
extends: "octane",
extends: "recommended",

rules: {
"no-bare-strings": true,
"block-indentation": true,
"require-input-label": false,
"no-invalid-link-text": "warn",
"require-input-label": "warn",
"no-autofocus-attribute": "warn",
},
};
3 changes: 2 additions & 1 deletion frontend/app/adapters/application.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import JSONAPIAdapter from "@ember-data/adapter/json-api";
import ENV from "customer-center/config/environment";
import OIDCAdapterMixin from "ember-simple-auth-oidc/mixins/oidc-adapter-mixin";

Check warning on line 2 in frontend/app/adapters/application.js

View workflow job for this annotation

GitHub Actions / Lint (Frontend) (js)

Don't use a mixin

import ENV from "customer-center/config/environment";

const BaseAdapter = JSONAPIAdapter.extend(OIDCAdapterMixin);

export default class ApplicationAdapter extends BaseAdapter {
Expand Down
3 changes: 2 additions & 1 deletion frontend/app/app.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import Application from "@ember/application";
import { InitSentryForEmber } from "@sentry/ember";
import config from "customer-center/config/environment";
import loadInitializers from "ember-load-initializers";
import Resolver from "ember-resolver";

import config from "customer-center/config/environment";

InitSentryForEmber();

export default class App extends Application {
Expand Down
1 change: 1 addition & 0 deletions frontend/app/application/controller.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import Controller from "@ember/controller";
import { action } from "@ember/object";
import { inject as service } from "@ember/service";

import ENV from "customer-center/config/environment";

export default class ApplicationController extends Controller {
Expand Down
1 change: 1 addition & 0 deletions frontend/app/error/controller.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import Controller from "@ember/controller";
import { inject as service } from "@ember/service";

import config from "customer-center/config/environment";

export default class ErrorController extends Controller {
Expand Down
3 changes: 2 additions & 1 deletion frontend/app/helpers/format-duration-short.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { helper } from "@ember/component/helper";
import startPaddingTag from "customer-center/utils/start-padding-tag";
import moment from "moment";

import startPaddingTag from "customer-center/utils/start-padding-tag";

export function formatDurationShort(params) {
let duration = Array.isArray(params) ? params[0] : params;

Expand Down
3 changes: 2 additions & 1 deletion frontend/app/models/subscription-project.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import Model, { attr, hasMany, belongsTo } from "@ember-data/model";
import ENV from "customer-center/config/environment";
import moment from "moment";

import ENV from "customer-center/config/environment";

export default class TimedSubscriptionProjectModel extends Model {
@attr name;
@attr("django-duration") purchasedTime;
Expand Down
1 change: 1 addition & 0 deletions frontend/app/router.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import EmberRouter from "@ember/routing/router";

import config from "customer-center/config/environment";

export default class Router extends EmberRouter {
Expand Down
3 changes: 2 additions & 1 deletion frontend/app/services/notify.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import parseError from "customer-center/utils/parse-error";
import NotifyService from "ember-notify";

import parseError from "customer-center/utils/parse-error";

export default class ExtrendedNotifyService extends NotifyService {
fromError(error) {
this.error(parseError(error));
Expand Down
1 change: 1 addition & 0 deletions frontend/app/subscriptions/confirm/route.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import Route from "@ember/routing/route";
import { inject as service } from "@ember/service";

import ENV from "customer-center/config/environment";

export default class SubscriptionsConfirmRoute extends Route {
Expand Down
1 change: 1 addition & 0 deletions frontend/app/subscriptions/detail/controller.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import Controller from "@ember/controller";
import { inject as service } from "@ember/service";
import { tracked } from "@glimmer/tracking";

import ENV from "customer-center/config/environment";

export default class SubscriptionsDetailController extends Controller {
Expand Down
1 change: 1 addition & 0 deletions frontend/app/subscriptions/index/route.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import Route from "@ember/routing/route";
import { inject as service } from "@ember/service";

import ENV from "customer-center/config/environment";

export default class SubscriptionsIndexRoute extends Route {
Expand Down
3 changes: 2 additions & 1 deletion frontend/app/subscriptions/list/controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@ import { action } from "@ember/object";
import { inject as service } from "@ember/service";
import { isEmpty } from "@ember/utils";
import { tracked } from "@glimmer/tracking";
import { formatDurationShort } from "customer-center/helpers/format-duration-short";
import { saveAs } from "file-saver";
import moment from "moment";

import { formatDurationShort } from "customer-center/helpers/format-duration-short";

export default class SubscriptionsListController extends Controller {
@service intl;

Expand Down
1 change: 1 addition & 0 deletions frontend/app/subscriptions/list/route.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import Route from "@ember/routing/route";
import { inject as service } from "@ember/service";

import ENV from "customer-center/config/environment";

export default class SubscriptionsListRoute extends Route {
Expand Down
1 change: 1 addition & 0 deletions frontend/app/subscriptions/own/controller.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import Controller from "@ember/controller";
import { inject as service } from "@ember/service";

import ENV from "customer-center/config/environment";

export default class SubscriptionsOwnController extends Controller {
Expand Down
3 changes: 2 additions & 1 deletion frontend/app/subscriptions/reload/controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ import { action } from "@ember/object";
import { inject as service } from "@ember/service";
import { isEmpty } from "@ember/utils";
import { tracked } from "@glimmer/tracking";
import ENV from "customer-center/config/environment";
import { Changeset } from "ember-changeset";
import moment from "moment";
import UIkit from "uikit";

import ENV from "customer-center/config/environment";

/**
* Format duration to HH:mm. Since duration.hours() is always less or equal to 24,
* remaining hours need to be added if the duration exceeds 24 hours.
Expand Down
1 change: 1 addition & 0 deletions frontend/app/subscriptions/reload/route.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import Route from "@ember/routing/route";
import { inject as service } from "@ember/service";

import ENV from "customer-center/config/environment";

export default class SubscriptionsReloadRoute extends Route {
Expand Down
3 changes: 2 additions & 1 deletion frontend/app/transforms/django-duration.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import Transform from "@ember-data/serializer/transform";
import startPaddingTag from "customer-center/utils/start-padding-tag";
import moment from "moment";

import startPaddingTag from "customer-center/utils/start-padding-tag";

/**
* The django duration transform
*
Expand Down
43 changes: 24 additions & 19 deletions frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "customer-center",
"description": "Adfinis customer support portal with Timed integration.",
"repository": "https://github.com/adfinis-sygroup/customer-center",
"repository": "https://github.com/adfinis/customer-center",
"version": "3.2.5",
"license": "MIT",
"private": true,
Expand All @@ -17,20 +17,14 @@
"doc": "doc",
"test": "tests"
},
"engines": {
"node": "12.* || 14.* || 16.*"
},
"release": {
"extends": "@adfinis-sygroup/semantic-release-config"
"extends": "@adfinis/semantic-release-config"
},
"commitlint": {
"extends": [
"@commitlint/config-conventional"
]
},
"ember": {
"edition": "octane"
},
"scripts": {
"start": "ember serve",
"start-proxy": "ember server --proxy http://localhost:8000",
Expand All @@ -42,8 +36,11 @@
"prepare": "cd .. && husky install"
},
"devDependencies": {
"@adfinis-sygroup/eslint-config": "^1.5.0",
"@adfinis-sygroup/semantic-release-config": "^3.2.0",
"@adfinis/eslint-config": "^2.0.0",
"@adfinis/semantic-release-config": "^4.0.0",
"@babel/core": "7.21.4",
"@babel/eslint-parser": "7.21.3",
"@babel/plugin-proposal-decorators": "7.21.0",
"@ember/optional-features": "^2.0.0",
"@ember/render-modifiers": "^2.0.4",
"@ember/test-helpers": "^2.8.1",
Expand All @@ -53,7 +50,7 @@
"babel-eslint": "^10.1.0",
"broccoli-asset-rev": "^3.0.0",
"ember-api-actions": "^0.2.9",
"ember-auto-import": "^1.11.3",
"ember-auto-import": "^2.0",
"ember-changeset": "3.15.0",
"ember-changeset-validations": "3.16.0",
"ember-cli": "3.28.6",
Expand Down Expand Up @@ -83,23 +80,31 @@
"ember-simple-auth": "4.2.2",
"ember-simple-auth-oidc": "^3.0.1",
"ember-source": "3.28.11",
"ember-template-lint": "^4.6.0",
"ember-template-lint": "^5.11.0",
"ember-truth-helpers": "^3.0.0",
"ember-uikit": "4.0.0",
"eslint": "7.32.0",
"eslint-config-prettier": "8.3.0",
"eslint-plugin-ember": "10.5.8",
"eslint-plugin-import": "2.25.3",
"eslint": "8.39.0",
"eslint-config-prettier": "8.8.0",
"eslint-plugin-ember": "11.5.2",
"eslint-plugin-import": "2.27.5",
"eslint-plugin-n": "15.7.0",
"eslint-plugin-node": "11.1.0",
"eslint-plugin-prettier": "4.2.1",
"eslint-plugin-qunit": "^7.2.0",
"eslint-plugin-qunit": "7.3.4",
"file-saver": "^2.0.5",
"husky": "^7.0.4",
"loader.js": "^4.7.0",
"moment": "^2.29.1",
"prettier": "2.7.1",
"prettier": "2.8.8",
"qunit": "2.17.2",
"qunit-dom": "2.0.0",
"sass": "1.51.0"
"sass": "1.51.0",
"webpack": "5"
},
"engines": {
"node": ">= 18"
},
"ember": {
"edition": "octane"
}
}
5 changes: 3 additions & 2 deletions frontend/tests/test-helper.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import { setApplication } from "@ember/test-helpers";
import Application from "customer-center/app";
import config from "customer-center/config/environment";
import { start } from "ember-qunit";
import * as QUnit from "qunit";
import { setup } from "qunit-dom";

import Application from "customer-center/app";
import config from "customer-center/config/environment";

setApplication(Application.create(config.APP));

setup(QUnit.assert);
Expand Down
3 changes: 2 additions & 1 deletion frontend/tests/unit/models/subscription-project-test.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import ENV from "customer-center/config/environment";
import { setupTest } from "ember-qunit";
import moment from "moment";
import { module, test } from "qunit";

import ENV from "customer-center/config/environment";

module("Unit | Model | timed subscription project", function (hooks) {
setupTest(hooks);

Expand Down
3 changes: 2 additions & 1 deletion frontend/tests/unit/utils/parse-error-test.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import parseError from "customer-center/utils/parse-error";
import { module, test } from "qunit";

import parseError from "customer-center/utils/parse-error";

module("Unit | Utility | parse-error", function () {
test("it works", function (assert) {
const error = new Error("Test");
Expand Down
3 changes: 2 additions & 1 deletion frontend/tests/unit/utils/start-padding-tag-test.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import startPaddingTag from "customer-center/utils/start-padding-tag";
import { module, test } from "qunit";

import startPaddingTag from "customer-center/utils/start-padding-tag";

module("Unit | Utility | start padding tag", function () {
test("it works", function (assert) {
const tag = startPaddingTag(2);
Expand Down
Loading
Loading