hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 10:04:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

run ng update @angular/core@17 @angular/cli@17 --force

Browse Source
This commit is contained in:
Andrea Barbasso
2024-03-15 15:55:21 +01:00
parent 6dced44443
commit 035a62c723
20 changed files with 1435 additions and 894 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
angular.json
View File

@@ -124,7 +124,7 @@
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "dspace-angular:build"
"buildTarget": "dspace-angular:build"
}
},
"test": {
@@ -217,7 +217,7 @@
}
},
"serve-ssr": {
"builder": "@nguniversal/builders:ssr-dev-server",
"builder": "@angular-devkit/build-angular:ssr-dev-server",
"options": {
"browserTarget": "dspace-angular:build",
"serverTarget": "dspace-angular:server",
@@ -231,7 +231,7 @@
}
},
"prerender": {
"builder": "@nguniversal/builders:prerender",
"builder": "@angular-devkit/build-angular:prerender",
"options": {
"browserTarget": "dspace-angular:build:production",
"serverTarget": "dspace-angular:server:production",

32
package.json
View File

@@ -55,17 +55,18 @@
"ts-node": "10.2.1"
},
"dependencies": {
"@angular/animations": "^16.2.12",
"@angular/animations": "^17.3.0",
"@angular/cdk": "^16.2.12",
"@angular/common": "^16.2.12",
"@angular/compiler": "^16.2.12",
"@angular/core": "^16.2.12",
"@angular/forms": "^16.2.12",
"@angular/localize": "16.2.12",
"@angular/platform-browser": "^16.2.12",
"@angular/platform-browser-dynamic": "^16.2.12",
"@angular/platform-server": "^16.2.12",
"@angular/router": "^16.2.12",
"@angular/common": "^17.3.0",
"@angular/compiler": "^17.3.0",
"@angular/core": "^17.3.0",
"@angular/forms": "^17.3.0",
"@angular/localize": "17.3.0",
"@angular/platform-browser": "^17.3.0",
"@angular/platform-browser-dynamic": "^17.3.0",
"@angular/platform-server": "^17.3.0",
"@angular/router": "^17.3.0",
"@angular/ssr": "^17.3.0",
"@babel/runtime": "7.21.0",
"@kolkov/ngx-gallery": "^2.0.1",
"@material-ui/core": "^4.11.0",
@@ -76,7 +77,6 @@
"@ngrx/effects": "^16.3.0",
"@ngrx/router-store": "^16.3.0",
"@ngrx/store": "^16.3.0",
"@nguniversal/express-engine": "^16.2.0",
"@ngx-translate/core": "^14.0.0",
"@nicky-lenaers/ngx-scroll-to": "^14.0.0",
"@types/grecaptcha": "^3.0.4",
@@ -134,20 +134,19 @@
},
"devDependencies": {
"@angular-builders/custom-webpack": "~16.0.0",
"@angular-devkit/build-angular": "^16.2.12",
"@angular-devkit/build-angular": "^17.3.0",
"@angular-eslint/builder": "16.3.1",
"@angular-eslint/eslint-plugin": "16.3.1",
"@angular-eslint/eslint-plugin-template": "16.3.1",
"@angular-eslint/schematics": "16.3.1",
"@angular-eslint/template-parser": "16.3.1",
"@angular/cli": "^16.2.12",
"@angular/compiler-cli": "^16.2.12",
"@angular/language-service": "^16.2.12",
"@angular/cli": "^17.3.0",
"@angular/compiler-cli": "^17.3.0",
"@angular/language-service": "^17.3.0",
"@cypress/schematic": "^1.5.0",
"@fortawesome/fontawesome-free": "^6.4.0",
"@ngrx/store-devtools": "^16.3.0",
"@ngtools/webpack": "^16.2.12",
"@nguniversal/builders": "^16.2.0",
"@types/deep-freeze": "0.1.2",
"@types/ejs": "^3.1.2",
"@types/express": "^4.17.17",
@@ -159,6 +158,7 @@
"@typescript-eslint/eslint-plugin": "^5.59.1",
"@typescript-eslint/parser": "^5.59.1",
"axe-core": "^4.7.2",
"browser-sync": "^3.0.0",
"compression-webpack-plugin": "^9.2.0",
"copy-webpack-plugin": "^6.4.1",
"cross-env": "^7.0.3",

2
src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html
View File

@@ -35,7 +35,7 @@
[checked]="isSelected(bitstreamFormat) | async"
(change)="selectBitStreamFormat(bitstreamFormat, $event)"
>
<span class="sr-only">{{'admin.registries.bitstream-formats.select' | translate}}}</span>
<span class="sr-only">{{'admin.registries.bitstream-formats.select' | translate}}&#125;</span>
</label>
</td>
<td><a [routerLink]="['/admin/registries/bitstream-formats', bitstreamFormat.id, 'edit']">{{bitstreamFormat.id}}</a></td>

2
src/app/core/auth/auth.service.spec.ts
View File

@@ -12,7 +12,7 @@ import {
Store,
StoreModule,
} from '@ngrx/store';
import { REQUEST } from '@nguniversal/express-engine/tokens';
import { REQUEST } from '../../../express.tokens';
import { TranslateService } from '@ngx-translate/core';
import { cold } from 'jasmine-marbles';
import {

2
src/app/core/auth/auth.service.ts
View File

@@ -12,7 +12,7 @@ import {
import {
REQUEST,
RESPONSE,
} from '@nguniversal/express-engine/tokens';
} from '../../../express.tokens';
import { TranslateService } from '@ngx-translate/core';
import { CookieAttributes } from 'js-cookie';
import {

2
src/app/core/forward-client-ip/forward-client-ip.interceptor.spec.ts
View File

@@ -4,7 +4,7 @@ import {
HttpTestingController,
} from '@angular/common/http/testing';
import { TestBed } from '@angular/core/testing';
import { REQUEST } from '@nguniversal/express-engine/tokens';
import { REQUEST } from '../../../express.tokens';
import { DspaceRestService } from '../dspace-rest/dspace-rest.service';
import { ForwardClientIpInterceptor } from './forward-client-ip.interceptor';

2
src/app/core/forward-client-ip/forward-client-ip.interceptor.ts
View File

@@ -8,7 +8,7 @@ import {
Inject,
Injectable,
} from '@angular/core';
import { REQUEST } from '@nguniversal/express-engine/tokens';
import { REQUEST } from '../../../express.tokens';
import { Observable } from 'rxjs';
@Injectable({ providedIn: 'root' })

2
src/app/core/locale/server-locale.service.ts
View File

@@ -3,7 +3,7 @@ import {
Inject,
Injectable,
} from '@angular/core';
import { REQUEST } from '@nguniversal/express-engine/tokens';
import { REQUEST } from '../../../express.tokens';
import { TranslateService } from '@ngx-translate/core';
import {
combineLatest,

2
src/app/core/services/cookie.service.spec.ts
View File

@@ -2,7 +2,7 @@ import {
TestBed,
waitForAsync,
} from '@angular/core/testing';
import { REQUEST } from '@nguniversal/express-engine/tokens';
import { REQUEST } from '../../../express.tokens';
import {
CookieService,

2
src/app/core/services/cookie.service.ts
View File

@@ -2,7 +2,7 @@ import {
Inject,
Injectable,
} from '@angular/core';
import { REQUEST } from '@nguniversal/express-engine/tokens';
import { REQUEST } from '../../../express.tokens';
import { CookieAttributes } from 'js-cookie';
import {
Observable,

2
src/app/core/services/server-hard-redirect.service.ts
View File

@@ -5,7 +5,7 @@ import {
import {
REQUEST,
RESPONSE,
} from '@nguniversal/express-engine/tokens';
} from '../../../express.tokens';
import {
Request,
Response,

2
src/app/core/services/server-response.service.ts
View File

@@ -3,7 +3,7 @@ import {
Injectable,
Optional,
} from '@angular/core';
import { RESPONSE } from '@nguniversal/express-engine/tokens';
import { RESPONSE } from '../../../express.tokens';
import { Response } from 'express';
/**

2
src/app/core/services/server.referrer.service.ts
View File

@@ -2,7 +2,7 @@ import {
Inject,
Injectable,
} from '@angular/core';
import { REQUEST } from '@nguniversal/express-engine/tokens';
import { REQUEST } from '../../../express.tokens';
import {
Observable,
of as observableOf,

2
src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.spec.ts
View File

@@ -13,7 +13,7 @@ import {
import { By } from '@angular/platform-browser';
import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
import { Store } from '@ngrx/store';
import { REQUEST } from '@nguniversal/express-engine/tokens';
import { REQUEST } from '../../../../../../express.tokens';
import { TranslateService } from '@ngx-translate/core';
import {
Observable,

2
src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts
View File

@@ -13,7 +13,7 @@ import {
Router,
} from '@angular/router';
import { provideMockStore } from '@ngrx/store/testing';
import { REQUEST } from '@nguniversal/express-engine/tokens';
import { REQUEST } from '../../../../../express.tokens';
import { TranslateModule } from '@ngx-translate/core';
import { of as observableOf } from 'rxjs';
import { AuthRequestService } from 'src/app/core/auth/auth-request.service';

2
src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.spec.ts
View File

@@ -12,7 +12,7 @@ import {
import { By } from '@angular/platform-browser';
import { ActivatedRoute } from '@angular/router';
import { provideMockStore } from '@ngrx/store/testing';
import { REQUEST } from '@nguniversal/express-engine/tokens';
import { REQUEST } from '../../../../../express.tokens';
import { TranslateModule } from '@ngx-translate/core';
import { of } from 'rxjs';
import { AuthRequestService } from 'src/app/core/auth/auth-request.service';

2
src/main.server.ts
View File

@@ -17,4 +17,4 @@ if (environment.production) {
export { ServerAppModule } from './modules/app/server-app.module';
export { renderModule } from '@angular/platform-server';
export { ngExpressEngine } from '@nguniversal/express-engine';
export { ngExpressEngine } from '@angular/ssr';

2
src/modules/app/browser-app.module.ts
View File

@@ -15,7 +15,7 @@ import {
StoreConfig,
StoreModule,
} from '@ngrx/store';
import { REQUEST } from '@nguniversal/express-engine/tokens';
import { REQUEST } from '../../express.tokens';
import {
MissingTranslationHandler,
TranslateLoader,

10
src/themes/dspace/app/home-page/home-news/home-news.component.html
View File

@@ -23,10 +23,10 @@
<p>The test user accounts below have their password set to the name of this
software in lowercase.</p>
<ul>
<li>Demo Site Administrator = dspacedemo+admin@gmail.com</li>
<li>Demo Community Administrator = dspacedemo+commadmin@gmail.com</li>
<li>Demo Collection Administrator = dspacedemo+colladmin@gmail.com</li>
<li>Demo Submitter = dspacedemo+submit@gmail.com</li>
<li>Demo Site Administrator = dspacedemo+admin&#64;gmail.com</li>
<li>Demo Community Administrator = dspacedemo+commadmin&#64;gmail.com</li>
<li>Demo Collection Administrator = dspacedemo+colladmin&#64;gmail.com</li>
<li>Demo Submitter = dspacedemo+submit&#64;gmail.com</li>
</ul>
</div>
</div>
@@ -35,5 +35,5 @@
<source type="image/jpg" srcset="assets/dspace/images/banner.jpg 2000w, assets/dspace/images/banner-half.jpg 1200w, assets/dspace/images/banner-tall.jpg 768w">
<img alt="" [src]="'assets/dspace/images/banner.jpg'"/><!-- without the []="''" Firefox downloads both the fallback and the resolved image -->
</picture>
<small class="credits">Photo by <a href="https://www.pexels.com/@inspiredimages">@inspiredimages</a></small>
<small class="credits">Photo by <a href="https://www.pexels.com/@inspiredimages">&#64;inspiredimages</a></small>
</div>

2247
yarn.lock
View File

File diff suppressed because it is too large Load Diff