Skip to content

Commit b5222e4

Browse files
committed
Merge branch 'release/23.11.0'
2 parents 1df6023 + c1f9a29 commit b5222e4

File tree

427 files changed

+5937
-3639
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

427 files changed

+5937
-3639
lines changed

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
# misc
1919
/coverage/
2020
!.*
21+
.*/
2122
.eslintcache
2223

2324
# ember-try

.eslintrc.js

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -282,52 +282,60 @@ module.exports = {
282282
},
283283
},
284284
{
285-
files: ['app/locales/*/translations.ts'],
285+
files: ['./app/locales/*/translations.ts'],
286286
rules: {
287287
'max-len': 'off',
288288
},
289289
},
290290
{
291-
files: ['tests/**/*'],
291+
files: ['./tests/**/*'],
292292
rules: {
293293
'no-await-in-loop': 'off',
294294
'ember/avoid-leaking-state-in-components': 'off',
295295
'ember/avoid-leaking-state-in-ember-objects': 'off',
296296
},
297297
},
298298
{
299-
files: ['mirage/**/*'],
299+
// Test files:
300+
files: ['tests/**/*-test.{js,ts}'],
301+
extends: ['plugin:qunit/recommended'],
302+
rules: {
303+
'qunit/require-expect': 'off',
304+
},
305+
},
306+
{
307+
files: ['./mirage/**/*'],
300308
rules: {
301309
'ember/avoid-leaking-state-in-ember-objects': 'off',
302310
},
303311
},
304312
{
305-
files: ['lib/*/index.js'],
313+
files: ['./lib/*/index.js'],
306314
rules: {
307315
'ember/avoid-leaking-state-in-ember-objects': 'off',
308316
'@typescript-eslint/no-var-requires': 'off',
309317
},
310318
},
311319
{
312-
files: ['lib/*/addon/engine.js'],
320+
files: ['./lib/*/addon/engine.js'],
313321
rules: {
314322
'ember/avoid-leaking-state-in-ember-objects': 'off',
315323
},
316324
},
317325
{
318326
files: [
319-
'.eslintrc.js',
320-
'.prettierrc.js',
321-
'.template-lintrc.js',
322-
'ember-cli-build.js',
323-
'testem.js',
324-
'run-node-test.js',
325-
'lib/**/environment.js',
326-
'lib/**/index.js',
327-
'blueprints/*/index.js',
328-
'blueprints/**/*.js',
329-
'node-tests/**/*.js',
330-
'config/**/*.js',
327+
'./.eslintrc.js',
328+
'./.prettierrc.js',
329+
'./.template-lintrc.js',
330+
'./ember-cli-build.js',
331+
'./testem.js',
332+
'./run-node-test.js',
333+
'./lib/**/environment.js',
334+
'./lib/**/index.js',
335+
'./blueprints/*/index.js',
336+
'./blueprints/**/*.js',
337+
'./node-tests/**/*.js',
338+
'./config/**/*.js',
331339
],
332340
parserOptions: {
333341
sourceType: 'script',

.template-lintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
'use strict';
44

55
module.exports = {
6-
extends: 'octane',
6+
extends: 'recommended',
77

88
rules: {
99
'block-indentation': 4,

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
55
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
66

7+
## [23.11.0] - 2023-09-27
8+
### Changed
9+
- Upgrade to Ember 3.28
10+
11+
712
## [23.10.0] - 2023-08-28
813
### Added
914
- Added search improvement routes and related components
@@ -1940,6 +1945,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
19401945
### Added
19411946
- Quick Files
19421947

1948+
[23.11.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/23.11.0
19431949
[23.10.2]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/23.10.2
19441950
[23.10.1]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/23.10.1
19451951
[23.10.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/23.10.0

app/adapters/crossref-adapter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import JSONAPIAdapter from '@ember-data/adapter/json-api';
22
import DS from 'ember-data';
33
import ModelRegistry from 'ember-data/types/registries/model';
4-
import config from 'ember-get-config';
4+
import config from 'ember-osf-web/config/environment';
55

66
const { support: { supportEmail } } = config;
77

app/adapters/node.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import OsfAdapter from './osf-adapter';
44
export default class NodeAdapter extends OsfAdapter {
55
buildURL(modelName?: string | number, id?: string, snapshot?: DS.Snapshot | null, requestType?: string): string {
66
if (snapshot && requestType === 'createRecord') {
7-
const parent: any = snapshot.record.belongsTo('parent').belongsToRelationship.members.list[0];
7+
const parent: any = snapshot.record.belongsTo('parent').belongsToRelationship.members?.list[0];
88

99
if (parent) {
1010
return this.buildRelationshipURL(parent.createSnapshot(), 'children');

app/adapters/osf-adapter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { inject as service } from '@ember/service';
44
import { underscore } from '@ember/string';
55
import DS from 'ember-data';
66
import ModelRegistry from 'ember-data/types/registries/model';
7-
import config from 'ember-get-config';
7+
import config from 'ember-osf-web/config/environment';
88
import { pluralize } from 'ember-inflector';
99
import Session from 'ember-simple-auth/services/session';
1010

app/adapters/user-password.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import config from 'ember-get-config';
1+
import config from 'ember-osf-web/config/environment';
22

33
import OsfAdapter from './osf-adapter';
44

app/adapters/user-registration.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import RESTAdapter from '@ember-data/adapter/rest';
22
import ModelRegistry from 'ember-data/types/registries/model';
3-
import config from 'ember-get-config';
3+
import config from 'ember-osf-web/config/environment';
44

55
export default class UserRegistrationAdapter extends RESTAdapter {
66
host = config.OSF.url.replace(/\/$/, '');

app/app.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Application from '@ember/application';
2-
import config from 'ember-get-config';
2+
import config from 'ember-osf-web/config/environment';
33
import loadInitializers from 'ember-load-initializers';
44
import Resolver from './resolver';
55

0 commit comments

Comments
 (0)