Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Hyperdash Angular

[![CircleCI](https://circleci.com/gh/hypertrace/hyperdash-angular.svg?style=svg)](https://circleci.com/gh/hypertrace/hyperdash-angular)
[![CircleCI](https://circleci.com/gh/hypertrace/hyperdash-angular.svg?style=shield)](https://circleci.com/gh/hypertrace/hyperdash-angular)
[![codecov](https://codecov.io/gh/hypertrace/hyperdash-angular/branch/master/graph/badge.svg)](https://codecov.io/gh/hypertrace/hyperdash-angular)

## Prerequisites
Expand Down
1 change: 1 addition & 0 deletions jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ module.exports = {
modulePathIgnorePatterns: ['<rootDir>/projects'],
watchPathIgnorePatterns: ['test-results'],
moduleNameMapper: {
'^lodash-es$': 'lodash',
'^@hypertrace/hyperdash-angular$': '<rootDir>/projects/hyperdash-angular/src/public_api.ts'
}
};
25 changes: 20 additions & 5 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
"@angular/platform-browser": "^10.0.4",
"@angular/platform-browser-dynamic": "^10.0.4",
"@angular/router": "^10.0.4",
"@hypertrace/hyperdash": "^1.0.0",
"@hypertrace/hyperdash": "^1.1.2",
"core-js": "^3.6.5",
"lodash": "^4.17.15",
"lodash-es": "^4.17.15",
"rxjs": "^6.6.0",
"tslib": "^2.0.0",
"zone.js": "~0.10.3"
Expand All @@ -44,7 +44,7 @@
"@compodoc/compodoc": "^1.1.11",
"@ngneat/spectator": "^5.11.0",
"@types/jest": "^25.0.0",
"@types/lodash": "4.14.155",
"@types/lodash-es": "^4.17.3",
"@types/node": "^14.0.13",
"@types/webpack-env": "^1.15.2",
"codelyzer": "^6.0.0",
Expand All @@ -55,6 +55,7 @@
"jest-config": "^25.5.0",
"jest-html-reporter": "^3.1.3",
"jest-junit": "^10.0.0",
"lodash": "^4.17.15",
"ng-packagr": "^10.0.0",
"prettier": "^2.0.5",
"pretty-quick": "^2.0.1",
Expand Down
3 changes: 3 additions & 0 deletions projects/hyperdash-angular/jest.config.debug.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
module.exports = {
rootDir: '../..',
modulePathIgnorePatterns: ['BOGUS'], // Need to reset from app project, but empty is merged
moduleNameMapper: {
'^lodash-es$': 'lodash'
},
preset: 'jest-preset-angular',
setupFilesAfterEnv: ['<rootDir>/node_modules/@angular-builders/jest/dist/jest-config/setup.js'],
testMatch: ['<rootDir>/projects/hyperdash-angular/**/+(*.)+(spec|test).+(ts|js)?(x)'],
Expand Down
3 changes: 3 additions & 0 deletions projects/hyperdash-angular/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ module.exports = {
}
]
],
moduleNameMapper: {
'^lodash-es$': 'lodash'
},
modulePathIgnorePatterns: ['BOGUS'], // Need to reset from app project, but empty is merged
watchPathIgnorePatterns: ['test-results']
};
2 changes: 1 addition & 1 deletion projects/hyperdash-angular/ng-package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"entryFile": "src/public_api.ts",
"umdModuleIds": {
"@hypertrace/hyperdash": "hyperdash",
"lodash": "_"
"lodash-es": "_"
}
}
}
4 changes: 2 additions & 2 deletions projects/hyperdash-angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
"core-js": "^3.6.5",
"rxjs": "^6.6.0",
"zone.js": "^0.10.0",
"@hypertrace/hyperdash": "^1.0.0",
"lodash": "^4.17.15"
"lodash-es": "^4.17.15",
"@hypertrace/hyperdash": "^1.1.2"
},
"dependencies": {
"tslib": "^2.0.0"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Inject, Injectable, Injector, Type } from '@angular/core';
import { ModelPropertyTypeRegistrationInformation } from '@hypertrace/hyperdash';
import { flatten, uniq } from 'lodash';
import { flatten, uniq } from 'lodash-es';
import { DefaultModelApiBuilderService } from '../injectable-wrappers/default-model-api-builder.service';
import { ArrayDeserializerService } from '../injectable-wrappers/deserialization/array-deserializer.service';
import { DeserializationManagerService } from '../injectable-wrappers/deserialization/deserialization-manager.service';
Expand Down
2 changes: 1 addition & 1 deletion src/example-dash/example-dash.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import {
RendererApi,
RENDERER_API
} from '@hypertrace/hyperdash-angular';
import { remove } from 'lodash';
import { remove } from 'lodash-es';
import { EMPTY, interval, Observable, of } from 'rxjs';
// tslint:disable-next-line:no-submodule-imports
import { catchError, map, take } from 'rxjs/operators';
Expand Down