Skip to content
This repository was archived by the owner on Sep 4, 2020. It is now read-only.

Commit d7f3075

Browse files
Merge pull request #18 from hypertrace/update-ng
chore: update to ng10
2 parents 0da8980 + a72059c commit d7f3075

File tree

150 files changed

+4067
-2210
lines changed

Some content is hidden

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

150 files changed

+4067
-2210
lines changed
File renamed without changes.

angular.json

+2-32
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@
4040
"stylePreprocessorOptions": {
4141
"includePaths": ["./projects/assets-library/assets/styles", "./node_modules"]
4242
},
43-
"scripts": []
43+
"scripts": [],
44+
"allowedCommonJsDependencies": ["graphql-tag", "zen-observable"]
4445
},
4546
"configurations": {
4647
"production": {
@@ -290,37 +291,6 @@
290291
}
291292
}
292293
},
293-
"observability": {
294-
"projectType": "library",
295-
"root": "projects/observability",
296-
"sourceRoot": "projects/observability/src",
297-
"prefix": "lib",
298-
"architect": {
299-
"build": {
300-
"builder": "@angular-devkit/build-ng-packagr:build",
301-
"options": {
302-
"tsConfig": "projects/observability/tsconfig.lib.json",
303-
"project": "projects/observability/ng-package.json"
304-
},
305-
"configurations": {
306-
"production": {
307-
"tsConfig": "projects/observability/tsconfig.lib.prod.json"
308-
}
309-
}
310-
},
311-
"test": {
312-
"builder": "@angular-builders/jest:run",
313-
"options": {}
314-
},
315-
"lint": {
316-
"builder": "@angular-devkit/build-angular:tslint",
317-
"options": {
318-
"tsConfig": ["projects/observability/tsconfig.lib.json", "projects/observability/tsconfig.spec.json"],
319-
"exclude": ["**/node_modules/**"]
320-
}
321-
}
322-
}
323-
},
324294
"assets-library": {
325295
"projectType": "library",
326296
"root": "projects/assets-library",

jest.config.debug.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ module.exports = {
1313
}
1414
},
1515
setupFilesAfterEnv: ['<rootDir>/node_modules/@angular-builders/jest/dist/jest-config/setup.js'],
16-
testEnvironment: 'jest-environment-jsdom-sixteen', // Update test env to newer jsdom for bug fixes
1716
testMatch: ['<rootDir>/(src|projects)/**/+(*.)+(spec|test).ts'],
1817
watchPathIgnorePatterns: ['test-results'],
1918
modulePathIgnorePatterns: ['<rootDir>/dist/'],
2019
moduleNameMapper: {
20+
'^lodash-es$': 'lodash',
2121
'@hypertrace/assets-library': '<rootDir>/projects/assets-library/src/public-api.ts',
2222
'@hypertrace/common$': '<rootDir>/projects/common/src/public-api.ts',
2323
'@hypertrace/components': '<rootDir>/projects/components/src/public-api.ts',

jest.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ module.exports = {
2727
'!**/*/test/**',
2828
'!src/app/routes/**/*.ts'
2929
],
30-
testEnvironment: 'jest-environment-jsdom-sixteen', // Update test env to newer jsdom for bug fixes
3130
coverageDirectory: 'coverage/hypertrace-core-ui',
3231
modulePathIgnorePatterns: ['<rootDir>/dist/'], // Need to reset from app project, but empty is merged
3332
testMatch: ['<rootDir>/(src|projects)/**/+(*.)+(spec|test).ts'],
3433
moduleNameMapper: {
34+
'^lodash-es$': 'lodash',
3535
'@hypertrace/assets-library': '<rootDir>/projects/assets-library/src/public-api.ts',
3636
'@hypertrace/common$': '<rootDir>/projects/common/src/public-api.ts',
3737
'@hypertrace/components': '<rootDir>/projects/components/src/public-api.ts',

0 commit comments

Comments
 (0)