Skip to content

Commit

Permalink
Merge pull request #285 from TAMULib/1.7.2-patch
Browse files Browse the repository at this point in the history
1.7.2 patch
  • Loading branch information
jeremythuff authored Dec 14, 2020
2 parents bb0b6d1 + c2d8132 commit 6f17c77
Show file tree
Hide file tree
Showing 73 changed files with 616 additions and 864 deletions.
2 changes: 1 addition & 1 deletion .browserslistrc
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@
last 2 versions
Firefox ESR
not dead
IE 9-11 # For IE 9-11 support, remove 'not'.
not IE 9-11 # For IE 9-11 support, remove 'not'.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ static/
development/
.lighthouseci/
package-lock.json
yarn.lock
src/config.json
src/config-template.json

Expand Down
18 changes: 7 additions & 11 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"prefix": "wvr",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"builder": "ngx-build-plus:browser",
"options": {
"preserveSymlinks": true,
"outputPath": "dist/weaver-components",
Expand All @@ -33,11 +33,7 @@
"styles": [
"src/styles.scss"
],
"scripts": [
{
"input": "node_modules/document-register-element/build/document-register-element.js"
}
],
"scripts": [],
"allowedCommonJsDependencies": [
"css-element-queries",
"handlebars"
Expand All @@ -63,8 +59,8 @@
"budgets": [
{
"type": "initial",
"maximumWarning": "1mb",
"maximumError": "4mb"
"maximumWarning": "1.5mb",
"maximumError": "2mb"
},
{
"type": "anyComponentStyle",
Expand All @@ -76,7 +72,7 @@
}
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"builder": "ngx-build-plus:dev-server",
"options": {
"browserTarget": "weaver-components:build"
},
Expand All @@ -93,7 +89,7 @@
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"builder": "ngx-build-plus:karma",
"options": {
"main": "src/test.ts",
"polyfills": "src/polyfills.ts",
Expand Down Expand Up @@ -155,7 +151,7 @@
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"builder": "ngx-build-plus:karma",
"options": {
"main": "projects/wvr-elements/src/test.ts",
"tsConfig": "projects/wvr-elements/tsconfig.spec.json",
Expand Down
70 changes: 35 additions & 35 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@
"type": "git",
"url": "git+https://github.com/TAMULib/weaver-components.git"
},
"version": "1.7.1",
"version": "1.7.2",
"private": false,
"license": "MIT",
"config": {
"DOCKER_SERVER": ""
},
"scripts": {
"build": "ng build --prod --output-hashing none",
"build": "ng build --prod --single-bundle --output-hashing none",
"build:clean": "npm run clean && npm run build",
"build:wvr-elements": "ng build wvr-elements",
"build:wvr-elements": "ng build --prod wvr-elements",
"build:wvr-components-style": "node scripts/build-wvr-components-style.js",
"build:wvr-components": "node scripts/build-wvr-components.js",
"build:wvr-components-static": "node scripts/build-wvr-components-static.js",
Expand Down Expand Up @@ -52,61 +52,60 @@
"test:ci": "npm run test:coverage && npm run test:audit"
},
"dependencies": {
"@angular/animations": "^11.0.0",
"@angular/common": "^11.0.0",
"@angular/compiler": "^11.0.0",
"@angular/core": "^11.0.0",
"@angular/elements": "^11.0.0",
"@angular/forms": "^11.0.0",
"@angular/localize": "^11.0.0",
"@angular/platform-browser": "^11.0.0",
"@angular/platform-browser-dynamic": "^11.0.0",
"@angular/router": "^11.0.0",
"@angular/animations": "^11.0.3",
"@angular/common": "^11.0.3",
"@angular/compiler": "^11.0.3",
"@angular/core": "^11.0.3",
"@angular/elements": "^11.0.3",
"@angular/forms": "^11.0.3",
"@angular/platform-browser": "^11.0.3",
"@angular/platform-browser-dynamic": "^11.0.3",
"@angular/router": "^11.0.3",
"@ng-bootstrap/ng-bootstrap": "^8.0.0",
"@ngrx/core": "^1.2.0",
"@ngrx/effects": "^10.0.1",
"@ngrx/entity": "^10.0.1",
"@ngrx/router-store": "^10.0.1",
"@ngrx/store": "^10.0.1",
"@ngrx/store-devtools": "^10.0.1",
"@ngrx/effects": "^10.1.0",
"@ngrx/entity": "^10.1.0",
"@ngrx/router-store": "^10.1.0",
"@ngrx/store": "^10.1.0",
"@ngrx/store-devtools": "^10.1.0",
"@types/json5": "^0.0.30",
"bootstrap": "^4.5.3",
"classlist.js": "^1.1.20150312",
"css-element-queries": "^1.2.3",
"document-register-element": "^1.14.5",
"dotenv-override": "^5.0.1",
"dotenv-override-true": "^6.2.2",
"handlebars": "^4.7.6",
"handlebars-loader": "^1.7.1",
"ie11-custom-properties": "^4.1.0",
"json5": "^2.1.3",
"ng-lazyload-image": "^9.1.0",
"rxjs": "~6.6.3",
"tslib": "^2.0.3",
"web-animations-js": "^2.3.2",
"zone.js": "~0.11.3"
},
"devDependencies": {
"@angular-devkit/build-angular": "^0.1100.0",
"@angular-devkit/build-angular": "^0.1100.3",
"@angular-devkit/build-ng-packagr": "~0.1002.0",
"@angular-devkit/schematics": "^11.0.0",
"@angular/cli": "^11.0.0",
"@angular/compiler-cli": "^11.0.0",
"@angular/language-service": "^11.0.0",
"@angular-devkit/schematics": "^11.0.3",
"@angular/cli": "^11.0.3",
"@angular/compiler-cli": "^11.0.3",
"@angular/language-service": "^11.0.3",
"@angular/localize": "11.0.3",
"@compodoc/compodoc": "^1.1.11",
"@lhci/cli": "^0.6.1",
"@ngrx/schematics": "^10.0.1",
"@ngrx/schematics": "^10.1.0",
"@pickra/copy-code-block": "^1.2.0",
"@types/jasmine": "~3.6.1",
"@types/jasmine": "~3.6.2",
"@types/jasminewd2": "~2.0.8",
"@types/node": "^14.14.7",
"@types/node": "^14.14.10",
"angular-tslint-rules": "^1.20.4",
"chalk": "^4.1.0",
"chrome-launcher": "^0.13.4",
"codelyzer": "^6.0.1",
"concat": "^1.0.3",
"console-stamp": "^3.0.0-rc4.2",
"coveralls": "^3.1.0",
"dotenv-override": "^5.0.1",
"dotenv-override-true": "^6.2.2",
"glob": "^7.1.6",
"handlebars-loader": "^1.7.1",
"jasmine-core": "~3.6.0",
"jasmine-spec-reporter": "~6.0.0",
"jsdom": "^16.4.0",
Expand All @@ -115,15 +114,16 @@
"karma-coverage-istanbul-reporter": "~3.0.3",
"karma-jasmine": "~4.0.1",
"karma-jasmine-html-reporter": "^1.5.4",
"lighthouse": "^6.4.1",
"lighthouse-badges": "^1.0.36",
"ng-packagr": "^11.0.2",
"lighthouse": "^6.5.0",
"lighthouse-badges": "^1.0.37",
"ng-packagr": "^11.0.3",
"ngx-build-plus": "^10.1.1",
"protractor": "~7.0.0",
"rimraf": "^3.0.2",
"shelljs": "^0.8.4",
"static-server": "^2.2.1",
"ts-loader": "^8.0.11",
"ts-node": "~9.0.0",
"ts-node": "~9.1.0",
"tslint": "~6.1.3",
"typescript": "~4.0.5"
}
Expand Down
8 changes: 4 additions & 4 deletions projects/wvr-elements/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@wvr/elements",
"version": "1.7.1",
"version": "1.7.2",
"description": "Collection of angular components for Weaver's Custom Web Component UI",
"author": "Texas A&M University Libraries",
"private": false,
Expand All @@ -22,14 +22,14 @@
"license": "MIT",
"dependencies": {
"css-element-queries": "^1.2.3",
"tslib": "^2.0.0",
"tslib": "^2.0.3",
"handlebars": "^4.7.6"
},
"bin": {
"wvr-ud": "./scripts/build-wvr-ud.js"
},
"peerDependencies": {
"@angular/common": "^9.0.0",
"@angular/core": "^9.0.0"
"@angular/common": "^11.0.3",
"@angular/core": "^11.0.3"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ describe('ComponentRegistryService', () => {

it('should retrieve components by component', () => {
// tslint:disable-next-line:no-string-literal
expect(service.getComponentByElement(component['_eRef'].nativeElement as HTMLElement) === component)
expect(service.getComponentByElement(component['eRef'].nativeElement as HTMLElement) === component)
.toBeTruthy();
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@ export class ComponentRegistryService<T> {

/** Adds a WvrBaseComponent to the registry. */
register(component: T): number {

// tslint:disable-next-line:no-string-literal
const element = (component['_eRef'].nativeElement as HTMLElement);
// tslint:disable-next-line:increment-decrement
this.registry.set(++this.index, component);

Expand Down
28 changes: 0 additions & 28 deletions projects/wvr-elements/src/lib/core/icon.service.spec.ts

This file was deleted.

76 changes: 0 additions & 76 deletions projects/wvr-elements/src/lib/core/icon.service.ts

This file was deleted.

Loading

0 comments on commit 6f17c77

Please sign in to comment.