Skip to content

Commit

Permalink
fix(deps): update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
anehx committed Dec 6, 2023
1 parent a2e76ec commit 7fe9406
Show file tree
Hide file tree
Showing 60 changed files with 3,692 additions and 4,634 deletions.
8 changes: 0 additions & 8 deletions .ember-cli
Original file line number Diff line number Diff line change
@@ -1,12 +1,4 @@
{
/**
Ember CLI sends analytics information by default. The data is completely
anonymous, but there are times when you might want to disable this behavior.

Setting `disableAnalytics` to true will prevent any data from being sent.
*/
"disableAnalytics": false,

/**
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
Expand Down
12 changes: 0 additions & 12 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,25 +1,13 @@
# unconventional js
/blueprints/*/files/
/vendor/

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/
/node_modules/

# misc
/coverage/
!.*
.*/
.eslintcache

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try
6 changes: 6 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,12 @@ jobs:
try-scenario:
- ember-lts-4.4
- ember-lts-4.8
- ember-lts-4.12
- ember-release
- ember-beta
- ember-canary
- embroider-safe
- embroider-optimized

steps:
- uses: actions/checkout@v4
Expand Down
9 changes: 1 addition & 8 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,29 +1,22 @@
# See https://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist/
/tmp/
/declarations/

# dependencies
/bower_components/
/node_modules/

# misc
/.env*
/.pnp*
/.sass-cache
/.eslintcache
/connect.lock
/coverage/
/libpeerconnection.log
/npm-debug.log*
/testem.log
/yarn-error.log
*.swp

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
Expand Down
6 changes: 0 additions & 6 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@
/dist/
/tmp/

# dependencies
/bower_components/

# misc
/.bowerrc
/.editorconfig
/.ember-cli
/.env*
Expand All @@ -23,7 +19,6 @@
/.template-lintrc.js
/.travis.yml
/.watchmanconfig
/bower.json
/CONTRIBUTING.md
/ember-cli-build.js
/testem.js
Expand All @@ -34,7 +29,6 @@

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
Expand Down
14 changes: 1 addition & 13 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,25 +1,13 @@
# unconventional js
/blueprints/*/files/
/vendor/

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/
/node_modules/

# misc
/coverage/
!.*
.eslintcache
.lint-todo/
.*/

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try
2 changes: 1 addition & 1 deletion .watchmanconfig
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"ignore_dirs": ["tmp", "dist"]
"ignore_dirs": ["dist"]
}
22 changes: 11 additions & 11 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@

## Installation

- `git clone <repository-url>`
- `cd ember-ebau-gwr`
- `npm install`
* `git clone <repository-url>`
* `cd ember-ebau-gwr`
* `pnpm install`

## Linting

- `npm run lint`
- `npm run lint:fix`
* `pnpm lint`
* `pnpm lint:fix`

## Running tests

- `ember test` – Runs the test suite on the current Ember version
- `ember test --server` – Runs the test suite in "watch mode"
- `ember try:each` – Runs the test suite against multiple Ember versions
* `ember test` – Runs the test suite on the current Ember version
* `ember test --server` – Runs the test suite in "watch mode"
* `ember try:each` – Runs the test suite against multiple Ember versions

## Running the dummy application

- `ember serve`
- Visit the dummy application at [http://localhost:4200](http://localhost:4200).
* `ember serve`
* Visit the dummy application at [http://localhost:4200](http://localhost:4200).

For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
For more information on using ember-cli, visit [https://cli.emberjs.com/release/](https://cli.emberjs.com/release/).
4 changes: 2 additions & 2 deletions addon/components/login-modal.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export default class LoginModalComponent extends Component {
const token = await this.authFetch.housingStatToken.perform(
this.username,
this.password,
this.municipality
this.municipality,
);
if (token) {
this.authFetch.showAuthModal = false;
Expand All @@ -41,7 +41,7 @@ export default class LoginModalComponent extends Component {
get sortedMunicipalities() {
const municipalities = this.municipalities;
municipalities.sort((a, b) =>
a.name < b.name ? -1 : a.name > b.name ? 1 : 0
a.name < b.name ? -1 : a.name > b.name ? 1 : 0,
);
return municipalities;
}
Expand Down
6 changes: 3 additions & 3 deletions addon/components/model-form.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ export default class ModelFormComponent extends Component {

finishImport() {
this.notification.success(
this.intl.t("ember-gwr.components.modelForm.diff.resolved")
this.intl.t("ember-gwr.components.modelForm.diff.resolved"),
);
this.router.externalRouter.transitionTo({
queryParams: { import: false, index: undefined },
Expand Down Expand Up @@ -112,8 +112,8 @@ export default class ModelFormComponent extends Component {
typeof value === "object"
? deepMerge(original[key], objectToApply[key])
: isIsoDate(value) // Date casts necessary for import
? (original[key] = new Date(value))
: (original[key] = value);
? (original[key] = new Date(value))
: (original[key] = value);
}
});
};
Expand Down
2 changes: 1 addition & 1 deletion addon/components/model-form/field.js
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ export default class ModelFormFieldComponent extends Component {
const sortBy = this.args.sortBy;
if (sortBy) {
options = options.sort((a, b) =>
a[sortBy].localeCompare(b[sortBy], this.intl.primaryLocale)
a[sortBy].localeCompare(b[sortBy], this.intl.primaryLocale),
);
}

Expand Down
14 changes: 7 additions & 7 deletions addon/components/model-form/header/status-selector.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,16 @@ export default class ModelFormHeaderStatusSelectorComponent extends Component {
this.changesetChange = new Changeset(
this.args.model,
lookupValidator(statusValidationsChange),
statusValidationsChange
statusValidationsChange,
);
const statusValidationsCorrection = statusValidation(
this.args.modelName,
false
false,
);
this.changesetCorrection = new Changeset(
this.args.model,
lookupValidator(statusValidationsCorrection),
statusValidationsCorrection
statusValidationsCorrection,
);

this.modelStatus = this.args.model[this.args.modelStatusField];
Expand All @@ -54,7 +54,7 @@ export default class ModelFormHeaderStatusSelectorComponent extends Component {
return this.args.modelStatusOptions.map((option) => ({
status: option,
label: this.intl.t(
`ember-gwr.lifeCycles.${this.args.modelName}.statusOptions.${option}`
`ember-gwr.lifeCycles.${this.args.modelName}.statusOptions.${option}`,
),
}));
}
Expand Down Expand Up @@ -89,8 +89,8 @@ export default class ModelFormHeaderStatusSelectorComponent extends Component {
const errorsField = !parameters.length
? "errors"
: isChange
? "changeErrors"
: "correctionErrors";
? "changeErrors"
: "correctionErrors";

const changeset = isChange
? this.changesetChange
Expand Down Expand Up @@ -120,7 +120,7 @@ export default class ModelFormHeaderStatusSelectorComponent extends Component {
? this.args.onStatusChange.perform(
this.modelStatus,
this.newStatus,
this.isCascading
this.isCascading,
)
: this.args.onStatusCorrection.perform(this.newStatus);

Expand Down
6 changes: 3 additions & 3 deletions addon/components/project-nav.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,19 @@ export default class ProjectNavComponent extends Component {
get buildingTabInfoText() {
if (!this.args.activeProjectId) {
return this.intl.t(
"ember-gwr.linkedBuildings.buildingDisabledForNewProject"
"ember-gwr.linkedBuildings.buildingDisabledForNewProject",
);
}

const project = this.args.instanceId
? this.args.projects.find(
(project) => project.EPROID === this.args.activeProjectId
(project) => project.EPROID === this.args.activeProjectId,
)
: this.args.projects[0];

return project?.typeOfConstructionProject === 6010
? this.intl.t(
"ember-gwr.linkedBuildings.buildingDisabledForInfrastructure"
"ember-gwr.linkedBuildings.buildingDisabledForInfrastructure",
)
: null;
}
Expand Down
6 changes: 3 additions & 3 deletions addon/components/quarterly-closure/close-survey-button.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export default class QuarterlyClosureStatus extends Component {

get disabledButton() {
return ![620, 630, 650, 651, 663, 665].includes(
this.quarterlyClosure.status.id
this.quarterlyClosure.status.id,
);
}

Expand All @@ -34,12 +34,12 @@ export default class QuarterlyClosureStatus extends Component {
const notificationType =
NOTIFICATION_TYPES[this.quarterlyClosure.status.type];
this.notification[notificationType]?.(
this.quarterlyClosure.status.shortLabel
this.quarterlyClosure.status.shortLabel,
);
} catch (error) {
console.error(error);
this.notification.danger(
this.intl.t("ember-gwr.quarterlyClosure.closure.error")
this.intl.t("ember-gwr.quarterlyClosure.closure.error"),
);
}
}
Expand Down
10 changes: 7 additions & 3 deletions addon/components/quarterly-closure/error-list/project-errors.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ export default class SurveyDepartmentErrors extends Component {
} catch (error) {
console.error(error);
this.notification.danger(
this.intl.t("ember-gwr.quarterlyClosure.components.projectErrors.error")
this.intl.t(
"ember-gwr.quarterlyClosure.components.projectErrors.error",
),
);
}
});
Expand All @@ -32,12 +34,14 @@ export default class SurveyDepartmentErrors extends Component {
*performQualityCheck(project) {
try {
return yield this.quarterlyClosure.checkConstructionProject(
project.EPROID
project.EPROID,
);
} catch (error) {
console.error(error);
this.notification.danger(
this.intl.t("ember-gwr.quarterlyClosure.components.projectErrors.error")
this.intl.t(
"ember-gwr.quarterlyClosure.components.projectErrors.error",
),
);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ export default class SurveyDepartmentErrors extends Component {
console.error(error);
this.notification.danger(
this.intl.t(
"ember-gwr.quarterlyClosure.components.departmentErrors.error"
)
"ember-gwr.quarterlyClosure.components.departmentErrors.error",
),
);
}
});
Expand Down
4 changes: 2 additions & 2 deletions addon/components/search.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export default class SearchComponent extends Component {
this.changeset = new Changeset(
baseQuery,
lookupValidator(validations),
validations
validations,
);

this.rawQuery = baseQuery;
Expand Down Expand Up @@ -91,7 +91,7 @@ export default class SearchComponent extends Component {
} catch (error) {
console.error(error);
this.notification.danger(
this.intl.t("ember-gwr.generalErrors.searchError")
this.intl.t("ember-gwr.generalErrors.searchError"),
);
}
}
Expand Down
2 changes: 1 addition & 1 deletion addon/components/validated-form-error.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export default class ValidatedFormErrorComponent extends Component {
get errorString() {
return this.args.errors
?.map((error) =>
this.intl.t(`ember-gwr.validation-errors.${error.type}`, error.context)
this.intl.t(`ember-gwr.validation-errors.${error.type}`, error.context),
)
.join(", ");
}
Expand Down
Loading

0 comments on commit 7fe9406

Please sign in to comment.