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.

Sign up for GitHub

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

Update NX to latest version (15.8.9) #1586

Merged
merged 24 commits into from
Mar 31, 2023
Merged

Update NX to latest version (15.8.9) #1586

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
5d1f899
chore: add migrations and update package.json
frontend-specialisten Mar 29, 2023
eef08cf
chore: [nx migration] update-configs-jest-29
frontend-specialisten Mar 29, 2023
9281b9d
chore: [nx migration] update-angular-cli-version-15-2-0
frontend-specialisten Mar 29, 2023
45335ad
chore: update yarn.lock
frontend-specialisten Mar 29, 2023
3c6cb85
chore: Update PRODUCTION_DEPENDENCIES.md
github-actions[bot] Mar 29, 2023
ac2a495
Chore: bump version to 0.3.210 for build/infrastructure/eo/chart/Char…
github-actions[bot] Mar 29, 2023
e29f7a2
Chore: bump version to 0.3.210 for build/infrastructure/eo/chart/valu…
github-actions[bot] Mar 29, 2023
4ed4bd6
fix(eo): add timezone to fix spec
frontend-specialisten Mar 29, 2023
03f5c5f
Merge branch 'chore/update-nx-15-8' of https://github.com/Energinet-D…
frontend-specialisten Mar 29, 2023
f0661ab
fix: specs for dh-admin-feature-user-management
frontend-specialisten Mar 29, 2023
e7f8160
fix(ui-watt): specs
frontend-specialisten Mar 29, 2023
6a42819
fix(market-participant): specs
frontend-specialisten Mar 29, 2023
5c225df
chore: fix yarn.lock
frontend-specialisten Mar 29, 2023
9cb0d1b
Merge branch 'main' into chore/update-nx-15-8
frontend-specialisten Mar 29, 2023
b55ff18
Merge branch 'main' into chore/update-nx-15-8
frontend-specialisten Mar 30, 2023
29f9c30
revert: change EO spec instead
frontend-specialisten Mar 30, 2023
eaef0ec
Merge branch 'main' into chore/update-nx-15-8
frontend-specialisten Mar 30, 2023
56e4c97
Chore: bump version to 0.3.211 for build/infrastructure/eo/chart/valu…
github-actions[bot] Mar 30, 2023
e502bb2
Chore: bump version to 0.3.211 for build/infrastructure/eo/chart/Char…
github-actions[bot] Mar 30, 2023
d18a729
Merge branch 'main' into chore/update-nx-15-8
frontend-specialisten Mar 30, 2023
9608fe0
Merge branch 'main' into chore/update-nx-15-8
frontend-specialisten Mar 31, 2023
31ae1cf
chore: remove migrations.json
frontend-specialisten Mar 31, 2023
c3103a6
Merge branch 'chore/update-nx-15-8' of https://github.com/Energinet-D…
frontend-specialisten Mar 31, 2023
e694f4d
chore: update tsconfig.spec.json to ES2016
frontend-specialisten Mar 31, 2023
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
24 changes: 12 additions & 12 deletions PRODUCTION_DEPENDENCIES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,24 @@
| Name | Version | License |
| ---- | ------- | ------- |
| [angular-slider/ngx-slider](https://github.com/angular-slider/ngx-slider) | 2.0.4 | MIT |
| [angular/animations](https://github.com/angular/angular) | 15.1.2 | MIT |
| [angular/cdk](https://github.com/angular/components) | 15.1.2 | MIT |
| [angular/common](https://github.com/angular/angular) | 15.1.2 | MIT |
| [angular/compiler](https://github.com/angular/angular) | 15.1.2 | MIT |
| [angular/core](https://github.com/angular/angular) | 15.1.2 | MIT |
| [angular/forms](https://github.com/angular/angular) | 15.1.2 | MIT |
| [angular/material-date-fns-adapter](https://github.com/angular/components) | 15.1.2 | MIT |
| [angular/material](https://github.com/angular/components) | 15.1.2 | MIT |
| [angular/platform-browser-dynamic](https://github.com/angular/angular) | 15.1.2 | MIT |
| [angular/platform-browser](https://github.com/angular/angular) | 15.1.2 | MIT |
| [angular/router](https://github.com/angular/angular) | 15.1.2 | MIT |
| [angular/animations](https://github.com/angular/angular) | 15.2.4 | MIT |
| [angular/cdk](https://github.com/angular/components) | 15.2.4 | MIT |
| [angular/common](https://github.com/angular/angular) | 15.2.4 | MIT |
| [angular/compiler](https://github.com/angular/angular) | 15.2.4 | MIT |
| [angular/core](https://github.com/angular/angular) | 15.2.4 | MIT |
| [angular/forms](https://github.com/angular/angular) | 15.2.4 | MIT |
| [angular/material-date-fns-adapter](https://github.com/angular/components) | 15.2.4 | MIT |
| [angular/material](https://github.com/angular/components) | 15.2.4 | MIT |
| [angular/platform-browser-dynamic](https://github.com/angular/angular) | 15.2.4 | MIT |
| [angular/platform-browser](https://github.com/angular/angular) | 15.2.4 | MIT |
| [angular/router](https://github.com/angular/angular) | 15.2.4 | MIT |
| [apollo/client](https://github.com/apollographql/apollo-client) | 3.7.7 | MIT |
| [azure/msal-angular](https://github.com/AzureAD/microsoft-authentication-library-for-js) | 2.5.4 | MIT |
| [azure/msal-browser](https://github.com/AzureAD/microsoft-authentication-library-for-js) | 2.34.0 | MIT |
| [microsoft/applicationinsights-angularplugin-js](undefined) | 3.0.0 | MIT* |
| [microsoft/applicationinsights-web](https://github.com/microsoft/ApplicationInsights-JS) | 2.8.9 | MIT |
| [ngneat/transloco](https://github.com/ngneat/transloco) | 4.2.2 | MIT |
| [ngrx/component-store](https://github.com/ngrx/platform) | 15.0.0 | MIT |
| [ngrx/component-store](https://github.com/ngrx/platform) | 15.3.0 | MIT |
| [popperjs/core](https://github.com/popperjs/popper-core) | 2.11.6 | MIT |
| [rx-angular/cdk](https://github.com/rx-angular/rx-angular) | 1.0.0-rc.4 | MIT |
| [rx-angular/template](https://github.com/rx-angular/rx-angular) | 1.0.0-rc.5 | MIT |
Expand Down
16 changes: 8 additions & 8 deletions apps/dh/app-dh/jest.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@ export default {
displayName: 'dh-app',
preset: '../../../jest.preset.js',
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
globals: {
'ts-jest': {
tsconfig: '<rootDir>/tsconfig.spec.json',
stringifyContentPathRegex: '\\.(html|svg)$',
},
crypto: require('crypto'), // Required by MSAL
},
globals: { crypto: require('crypto') },
coverageDirectory: '../../coverage/apps/dh/app-dh',
transform: {
'^.+\\.(ts|mjs|js|html)$': 'jest-preset-angular',
'^.+\\.(ts|mjs|js|html)$': [
'jest-preset-angular',
{
tsconfig: '<rootDir>/tsconfig.spec.json',
stringifyContentPathRegex: '\\.(html|svg)$',
},
],
},
transformIgnorePatterns: ['node_modules/(?!.*\\.mjs$)'],
snapshotSerializers: [
Expand Down
15 changes: 8 additions & 7 deletions apps/eo/app-eo/jest.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,7 @@ export default {
displayName: 'app-eo',
preset: '../../../jest.preset.js',
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
globals: {
'ts-jest': {
tsconfig: '<rootDir>/tsconfig.spec.json',
stringifyContentPathRegex: '\\.(html|svg)$',
},
},
globals: {},
coverageDirectory: '../../coverage/apps/eo/app-eo',
/**
* https://stackoverflow.com/questions/42260218/jest-setup-syntaxerror-unexpected-token-export
Expand All @@ -34,7 +29,13 @@ export default {
'lodash-es': 'lodash',
},
transform: {
'^.+\\.(ts|mjs|js|html)$': 'jest-preset-angular',
'^.+\\.(ts|mjs|js|html)$': [
'jest-preset-angular',
{
tsconfig: '<rootDir>/tsconfig.spec.json',
stringifyContentPathRegex: '\\.(html|svg)$',
},
],
},
transformIgnorePatterns: ['node_modules/(?!.*\\.mjs$)'],
snapshotSerializers: [
Expand Down
2 changes: 1 addition & 1 deletion build/infrastructure/eo/chart/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ apiVersion: v2
name: eo-frontend
description: A Helm chart for Kubernetes
type: application
version: 0.3.209
version: 0.3.210
2 changes: 1 addition & 1 deletion build/infrastructure/eo/chart/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ app:
replicaCount: 2
image:
name: ghcr.io/energinet-datahub/eo-frontend-app
tag: 0.3.209
tag: 0.3.210
16 changes: 11 additions & 5 deletions jest.preset.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,16 @@ const path = require('path');

module.exports = {
...nxPreset,
testEnvironment: path.join(
__dirname,
'scripts/gf/test-util',
'jsdom-lax-ssl-environment.ts'
),
testEnvironment: path.join(__dirname, 'scripts/gf/test-util', 'jsdom-lax-ssl-environment.ts'),
testURL: 'https://localhost:5001',
frontend-specialisten marked this conversation as resolved.
Show resolved Hide resolved
/* TODO: Update to latest Jest snapshotFormat
* By default Nx has kept the older style of Jest Snapshot formats
* to prevent breaking of any existing tests with snapshots.
* It's recommend you update to the latest format.
* You can do this by removing snapshotFormat property
* and running tests with --update-snapshot flag.
* Example: "nx affected --targets=test --update-snapshot"
* More info: https://jestjs.io/docs/upgrading-to-jest29#snapshot-format
*/
snapshotFormat: { escapeString: true, printBasicPrototype: true },
frontend-specialisten marked this conversation as resolved.
Show resolved Hide resolved
};
15 changes: 8 additions & 7 deletions libs/dh/admin/data-access-api/jest.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,16 @@ export default {
displayName: 'dh-admin-data-access-api',
preset: '../../../../jest.preset.js',
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
globals: {
'ts-jest': {
tsconfig: '<rootDir>/tsconfig.spec.json',
stringifyContentPathRegex: '\\.(html|svg)$',
},
},
globals: {},
coverageDirectory: '../../../../coverage/libs/dh/admin/data-access-api',
transform: {
'^.+\\.(ts|mjs|js|html)$': 'jest-preset-angular',
'^.+\\.(ts|mjs|js|html)$': [
'jest-preset-angular',
{
tsconfig: '<rootDir>/tsconfig.spec.json',
stringifyContentPathRegex: '\\.(html|svg)$',
},
],
},
transformIgnorePatterns: ['node_modules/(?!.*\\.mjs$)'],
snapshotSerializers: [
Expand Down
3 changes: 2 additions & 1 deletion libs/dh/admin/data-access-api/tsconfig.spec.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"compilerOptions": {
"outDir": "../../../../dist/out-tsc",
"module": "commonjs",
"types": ["jest", "node"]
"types": ["jest", "node"],
"target": "ES2015"
},
"files": ["src/test-setup.ts"],
"include": ["jest.config.ts", "**/*.test.ts", "**/*.spec.ts", "**/*.d.ts"]
Expand Down
15 changes: 8 additions & 7 deletions libs/dh/admin/feature-create-user-role/jest.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,16 @@ export default {
displayName: 'dh-admin-feature-create-user-role',
preset: '../../../../jest.preset.js',
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
globals: {
'ts-jest': {
tsconfig: '<rootDir>/tsconfig.spec.json',
stringifyContentPathRegex: '\\.(html|svg)$',
},
},
globals: {},
coverageDirectory: '../../../../coverage/libs/dh/admin/feature-create-user-role',
transform: {
'^.+\\.(ts|mjs|js|html)$': 'jest-preset-angular',
'^.+\\.(ts|mjs|js|html)$': [
'jest-preset-angular',
{
tsconfig: '<rootDir>/tsconfig.spec.json',
stringifyContentPathRegex: '\\.(html|svg)$',
},
],
},
transformIgnorePatterns: ['node_modules/(?!.*\\.mjs$)'],
snapshotSerializers: [
Expand Down
15 changes: 8 additions & 7 deletions libs/dh/admin/feature-edit-permission-modal/jest.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,16 @@ export default {
displayName: 'dh-admin-feature-edit-permission-modal',
preset: '../../../../jest.preset.js',
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
globals: {
'ts-jest': {
tsconfig: '<rootDir>/tsconfig.spec.json',
stringifyContentPathRegex: '\\.(html|svg)$',
},
},
globals: {},
coverageDirectory: '../../../../coverage/libs/dh/admin/feature-edit-permission-modal',
transform: {
'^.+\\.(ts|mjs|js|html)$': 'jest-preset-angular',
'^.+\\.(ts|mjs|js|html)$': [
'jest-preset-angular',
{
tsconfig: '<rootDir>/tsconfig.spec.json',
stringifyContentPathRegex: '\\.(html|svg)$',
},
],
},
transformIgnorePatterns: ['node_modules/(?!.*\\.mjs$)'],
snapshotSerializers: [
Expand Down
15 changes: 8 additions & 7 deletions libs/dh/admin/feature-edit-user-role-modal/jest.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,16 @@ export default {
displayName: 'dh-admin-feature-edit-user-role-modal',
preset: '../../../../jest.preset.js',
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
globals: {
'ts-jest': {
tsconfig: '<rootDir>/tsconfig.spec.json',
stringifyContentPathRegex: '\\.(html|svg)$',
},
},
globals: {},
coverageDirectory: '../../../../coverage/libs/dh/admin/feature-edit-user-role-modal',
transform: {
'^.+\\.(ts|mjs|js|html)$': 'jest-preset-angular',
'^.+\\.(ts|mjs|js|html)$': [
'jest-preset-angular',
{
tsconfig: '<rootDir>/tsconfig.spec.json',
stringifyContentPathRegex: '\\.(html|svg)$',
},
],
},
transformIgnorePatterns: ['node_modules/(?!.*\\.mjs$)'],
snapshotSerializers: [
Expand Down
15 changes: 8 additions & 7 deletions libs/dh/admin/feature-invite-user-modal/jest.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,16 @@ export default {
displayName: 'dh-admin-feature-invite-user-modal',
preset: '../../../../jest.preset.js',
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
globals: {
'ts-jest': {
tsconfig: '<rootDir>/tsconfig.spec.json',
stringifyContentPathRegex: '\\.(html|svg)$',
},
},
globals: {},
coverageDirectory: '../../../../coverage/libs/dh/admin/feature-invite-user-modal',
transform: {
'^.+\\.(ts|mjs|js|html)$': 'jest-preset-angular',
'^.+\\.(ts|mjs|js|html)$': [
'jest-preset-angular',
{
tsconfig: '<rootDir>/tsconfig.spec.json',
stringifyContentPathRegex: '\\.(html|svg)$',
},
],
},
transformIgnorePatterns: ['node_modules/(?!.*\\.mjs$)'],
snapshotSerializers: [
Expand Down
15 changes: 8 additions & 7 deletions libs/dh/admin/feature-permissions/jest.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,16 @@ export default {
displayName: 'dh-admin-feature-permissions',
preset: '../../../../jest.preset.js',
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
globals: {
'ts-jest': {
tsconfig: '<rootDir>/tsconfig.spec.json',
stringifyContentPathRegex: '\\.(html|svg)$',
},
},
globals: {},
coverageDirectory: '../../../../coverage/libs/dh/admin/feature-permissions',
transform: {
'^.+\\.(ts|mjs|js|html)$': 'jest-preset-angular',
'^.+\\.(ts|mjs|js|html)$': [
'jest-preset-angular',
{
tsconfig: '<rootDir>/tsconfig.spec.json',
stringifyContentPathRegex: '\\.(html|svg)$',
},
],
},
transformIgnorePatterns: ['node_modules/(?!.*\\.mjs$)'],
snapshotSerializers: [
Expand Down
15 changes: 8 additions & 7 deletions libs/dh/admin/feature-user-management/jest.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,16 @@ export default {
displayName: 'dh-admin-feature-user-management',
preset: '../../../../jest.preset.js',
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
globals: {
'ts-jest': {
tsconfig: '<rootDir>/tsconfig.spec.json',
stringifyContentPathRegex: '\\.(html|svg)$',
},
},
globals: {},
coverageDirectory: '../../../../coverage/libs/dh/admin/feature-user-management',
transform: {
'^.+\\.(ts|mjs|js|html)$': 'jest-preset-angular',
'^.+\\.(ts|mjs|js|html)$': [
'jest-preset-angular',
{
tsconfig: '<rootDir>/tsconfig.spec.json',
stringifyContentPathRegex: '\\.(html|svg)$',
},
],
},
transformIgnorePatterns: ['node_modules/(?!.*\\.mjs$)'],
snapshotSerializers: [
Expand Down
4 changes: 2 additions & 2 deletions libs/dh/admin/feature-user-management/src/lib/tabs/users-tab/dh-users-tab.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ describe(DhUsersTabComponent.name, () => {
expect(store.updateSearchText).toHaveBeenCalledWith(inputValue);
}));

it('forwards status filter value to store', async () => {
it('forwards status filter value to store', fakeAsync(async () => {
const { store, matSelect } = await setup();

await matSelect.open();
Expand All @@ -127,5 +127,5 @@ describe(DhUsersTabComponent.name, () => {

const allOptions = Object.keys(MarketParticipantUserStatus);
expect(store.updateStatusFilter).toHaveBeenCalledWith(allOptions);
});
}));
});
3 changes: 2 additions & 1 deletion libs/dh/admin/feature-user-management/tsconfig.spec.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"compilerOptions": {
"outDir": "../../../../dist/out-tsc",
"module": "commonjs",
"types": ["jest", "node"]
"types": ["jest", "node"],
"target": "ES2015"
},
"files": ["src/test-setup.ts"],
"include": ["jest.config.ts", "**/*.test.ts", "**/*.spec.ts", "**/*.d.ts"]
Expand Down
15 changes: 8 additions & 7 deletions libs/dh/admin/feature-user-roles/jest.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,16 @@ export default {
displayName: 'dh-admin-feature-user-roles',
preset: '../../../../jest.preset.js',
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
globals: {
'ts-jest': {
tsconfig: '<rootDir>/tsconfig.spec.json',
stringifyContentPathRegex: '\\.(html|svg)$',
},
},
globals: {},
coverageDirectory: '../../../../coverage/libs/dh/admin/feature-user-roles',
transform: {
'^.+\\.(ts|mjs|js|html)$': 'jest-preset-angular',
'^.+\\.(ts|mjs|js|html)$': [
'jest-preset-angular',
{
tsconfig: '<rootDir>/tsconfig.spec.json',
stringifyContentPathRegex: '\\.(html|svg)$',
},
],
},
transformIgnorePatterns: ['node_modules/(?!.*\\.mjs$)'],
snapshotSerializers: [
Expand Down
15 changes: 8 additions & 7 deletions libs/dh/admin/routing/jest.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,16 @@ export default {
displayName: 'dh-admin-routing',
preset: '../../../../jest.preset.js',
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
globals: {
'ts-jest': {
tsconfig: '<rootDir>/tsconfig.spec.json',
stringifyContentPathRegex: '\\.(html|svg)$',
},
},
globals: {},
coverageDirectory: '../../../../coverage/libs/dh/admin/routing',
transform: {
'^.+\\.(ts|mjs|js|html)$': 'jest-preset-angular',
'^.+\\.(ts|mjs|js|html)$': [
'jest-preset-angular',
{
tsconfig: '<rootDir>/tsconfig.spec.json',
stringifyContentPathRegex: '\\.(html|svg)$',
},
],
},
transformIgnorePatterns: ['node_modules/(?!.*\\.mjs$)'],
snapshotSerializers: [
Expand Down
Loading