Merge pull request #251 from TAMULib/sprint12-staging

Sprint12 staging
TAMULib · Nov 2, 2020 · 5eabb9f · 5eabb9f
2 parents c26d09a + c7ec08b
commit 5eabb9f
Show file tree

Hide file tree

Showing 136 changed files with 3,609 additions and 1,361 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,4 @@
+node_modules/
+dist/
+static/
+tmp/
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+* text=auto eol=lf
diff --git a/.gitignore b/.gitignore
@@ -53,3 +53,5 @@ development/
 package-lock.json
 src/config.json
 src/config-template.json
+
+.wvr-ud/static-assets/styles.css
diff --git a/.wvr-ud/config.json b/.wvr-ud/config.json
@@ -8,7 +8,7 @@
     "projects/wvr-elements/src/lib/wvr-it-works"
   ],
   "additionalScript": [
-    "dist/bundle/latest/weaver-components.js"
+    "dist/bundle/weaver-components.js"
   ],
   "additionalAssets": [
     "src/assets/**/*"

diff --git a/.wvr-ud/static-assets/styles.css → .wvr-ud/static-assets/_styles.css b/.wvr-ud/static-assets/styles.css → .wvr-ud/static-assets/_styles.css
@@ -148,4 +148,6 @@ main.loading #preview {
 .feather-plus-circle,
 .open .feather-minus-circle {
   display: inline-block;
-}
+}
+
+/*** OVERRIDES ***/
diff --git a/.wvr-ud/static-assets/index-base.html b/.wvr-ud/static-assets/index-base.html
@@ -4,7 +4,7 @@
 <head>
   <title>{{PROJECT_NAME}}</title>
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <link rel="icon" type="image/x-icon" href="https://labs.library.tamu.edu/wvr-components/latest/assets/favicon.ico">
+  <link rel="icon" type="image/x-icon" href="https://labs.library.tamu.edu/wvr-components/assets/favicon.ico">
   <link href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" rel="stylesheet"
     integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
   <link rel="stylesheet" type="text/css" href="{{BASE_PATH}}styles.css">

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,15 +1,71 @@
 # Changelog
 
+## [1.6.0] - 11-2-20
+### Resolves
+
+- Weaver component's build process should build multiple versions of the product. (#86)
+- Weaver Usage Docs should be converted into an angular project. (#102)
+- The wvr manifest action to submit request should afford providing response map. (#223)
+- Handlebars should be extracted into a service and all helpers declared outside of the component constructor. (#232)
+- On safari (check firefox) mobile display does not run the position footer function at load time. (#233)
+- Weaver components should provide a wvr-cards component. (#234)
+- Weaver Component selectors need to be refactored to avoid name collision with Weaver (angularjs) directives. (#237)
+- The wvr-header should use the configured asset path for the header logo. (#255)
+
+## [1.5.0] - 10-8-20
+### Resolves
+
+- Weaver Components should communicate with Weaver web services. (#195)
+- Weaver Lists should automatically assign aria owns attribute for each of its list items. (#206)
+- Weaver Components should provide an Alert Component. (#207)
+- Weaver Components should dynamically assign unique identifiers to each component. (#208)
+- Explore ngRX as a state store solution for components. (#209)
+- Weaver Components should offer a tabs component. (#210)
+
+## [1.4.0] - 9-23-20
+### Resolves
+
+- Encapsulates bootstrap within global styling
+- Performance improvements 
+- Introduces Mobile Service
+- The list item context attr should override the visual context of the list item. (#199)
+
 ## [1.3.0] - 08-13-20
 ### Resolves
 
-Weaver Components should have an element query strategy. (#27)
-Icons should be integrated into weaver buttons. (#128)
-Weaver Components should support lists with expanding and collapsing sections. (#163)
-The Wvr Icon component should support animation. (#164)
-Weaver Components should have a list component. (#165)
-Coveralls not providing the coverage notification. (#167)
-Observable subscriptions should be unsubscribed from or converted to promises. (#168)
+- Weaver Components should have an element query strategy. (#27)
+- Icons should be integrated into weaver buttons. (#128)
+- Weaver Components should support lists with expanding and collapsing sections. (#163)
+- The Wvr Icon component should support animation. (#164)
+- Weaver Components should have a list component. (#165)
+- Coveralls not providing the coverage notification. (#167)
+- Observable subscriptions should be unsubscribed from or converted to promises. (#168)
+
+## [1.2.0] - 07-16-20
+### Resolves
+
+- Weaver Component should support a global configuration paradigm. (#64)
+- Weaver Components should share vendor styling across components. (#82)
+- Weaver Components should support multiple font icon libraries. (#85)
+- Buttons must be integrated into weaver drop-down. (#129)
+- Weaver footer "stick-to-bottom" property affected by wvr-button line-height and padding property. (#150)
+
+## [1.1.0] - 06-25-20
+### Resolves
+
+- Wvr Components should provide a wvr-button component (#103)
+- CDN needs to be exposed through the firewall (#135)
+- Fix Z-Index on dropdown overlaps (#133)
+- Restore dynamic change detection for display of bottom nav (#136)
+- Dropdown inside of List inside of Header flickers instead of staying open (#119)
+
+## [1.0.0] - 06-11-20
+### Resolves
+
+- The wvr-header should support mobile and tablet layouts (#7)
+- Weaver Components should have CI hooks for lighthouse (#105)
+- wvr-component should have attribute: page-title-url (#116)
+- Weaver Drop down component selector should be renamed (#125)
 
 ## [0.0.5] - 05-14-2020
 ### Resolves

diff --git a/Dockerfile b/Dockerfile
@@ -8,13 +8,18 @@ COPY . .
 RUN npm install
 RUN npm run build
 
-RUN ls -la
-
 FROM httpd:2.4-alpine
 
-COPY --from=npm /app/dist/bundle/ /usr/local/apache2/htdocs/wvr-components/
+ARG MAJOR_VERSION=0x
+ARG MAJOR_MINOR_VERSION=0.0
+
+COPY --from=npm /app/dist/bundle/ /usr/local/apache2/htdocs/wvr-components/bundle
+
+RUN ln -s /usr/local/apache2/htdocs/wvr-components/bundle /usr/local/apache2/htdocs/wvr-components/latest
+RUN ln -s /usr/local/apache2/htdocs/wvr-components/bundle /usr/local/apache2/htdocs/wvr-components/${MAJOR_VERSION}x
+RUN ln -s /usr/local/apache2/htdocs/wvr-components/bundle /usr/local/apache2/htdocs/wvr-components/${MAJOR_MINOR_VERSION}
 
-COPY src/config-template.json tmp/config-template.json
+COPY --from=npm /app/src/config-template.json tmp/config-template.json
 COPY docker-entrypoint /usr/local/bin/
 RUN chmod +x /usr/local/bin/docker-entrypoint
 

diff --git a/angular.json b/angular.json
@@ -39,7 +39,8 @@
               }
             ],
             "allowedCommonJsDependencies": [
-              "css-element-queries"
+              "css-element-queries",
+              "handlebars"
             ]
           },
           "configurations": {

diff --git a/defaults.env b/defaults.env
@@ -3,5 +3,5 @@
 # found at src/config-template.json.
 #
 
-BASE_URL=https://labs.library.tamu.edu/wvr-components/latest
-ASSETS_URL=https://labs.library.tamu.edu/wvr-components/latest/assets
+BASE_URL=https://labs.library.tamu.edu/wvr-components
+ASSETS_URL=https://labs.library.tamu.edu/wvr-components/assets
diff --git a/docker-entrypoint b/docker-entrypoint
@@ -1,13 +1,11 @@
-#!/bin/bash
+#!/bin/sh
 
 set -e
 
-versionLocation=/usr/local/apache2/htdocs/wvr-components/1x/config.json
-latestLocation=/usr/local/apache2/htdocs/wvr-components/latest/config.json
+config=/usr/local/apache2/htdocs/wvr-components/bundle/config.json
+template=tmp/config-template.json
 
-eval "cat << EOF | tee $versionLocation $latestLocation
-$(<tmp/config-template.json)
-EOF"
+echo $(eval echo $(echo $(cat $template) | sed -r "s/\\\"/\\\\\"/g")) > $config
 
 echo "Done docker-entrypoint..."
 

diff --git a/e2e/src/app.po.ts b/e2e/src/app.po.ts
@@ -6,7 +6,7 @@ export class AppPage {
   }
 
   async getItWorksText(): Promise<string> {
-    return element(by.css('wvr-it-works'))
+    return element(by.css('wvre-it-works'))
       .getText() as Promise<string>;
   }
 }
diff --git a/package.json b/package.json
@@ -4,16 +4,11 @@
     "type": "git",
     "url": "git+https://github.com/TAMULib/weaver-components.git"
   },
-  "version": "1.5.0",
+  "version": "1.6.0",
   "private": false,
   "license": "MIT",
-  "bin": {
-    "wvr-ud": "./scripts/build-wvr-ud.js",
-    "wvr-build-components": ".scripts/build-wvr-components.js",
-    "wvr-build-configuration": ".scripts/build-wvr-components-configuration.js",
-    "wvr-build-lighthouse": ".scripts/build-wvr-components-lighthouse-badges.js",
-    "wvr-build-static": ".scripts/build-wvr-components-static.js",
-    "wvr-serve-dist": ".scripts/serve-dist.js"
+  "config": {
+    "DOCKER_SERVER": ""
   },
   "scripts": {
     "build": "ng build --prod --output-hashing none",
@@ -27,19 +22,25 @@
     "build:docs": "npm run build:docs-usage && npm run build:docs-development",
     "build:docs-development": "compodoc --output ./static/weaver-components/docs/development -p ./projects/wvr-elements/tsconfig.docs.json",
     "build:docs-usage": "node scripts/build-wvr-ud.js",
+    "build:docker": "node scripts/build-docker.js",
     "build:static": "npm run build:static-docs && npm run build:static-reports",
     "build:static-setup": "node scripts/build-wvr-components-static.js",
     "build:static-docs": "npm run test:audit && npm run build:static-setup && npm run build:docs-usage && npm run build:docs-development",
     "build:static-reports": "npm run build:static-setup && npm run test:coverage",
     "build:static-production": "npm run build:static && node scripts/build-wvr-components-configuration.js defaults-ci-overrides.env && ls -A | grep -v static | xargs rimraf && mv static/weaver-components/* . && rimraf static",
-    "clean": "rimraf dist",
+    "clean": "npm run clean:dist && npm run clean:static",
+    "clean:dist": "rimraf dist",
     "clean:static": "rimraf static",
+    "publish:docker": "node scripts/docker-push.js",
+    "publish:npm": "npm run build && node scripts/build-publish.js $1",
+    "publish:npm-next": "npm run publish:npm next",
     "lint": "ng lint",
     "link": "npm link ./dist/wvr-elements",
     "ng": "ng",
     "start": "node scripts/build-wvr-components-configuration.js defaults-dev-overrides.env && ng serve --port 4200",
     "start:dist": "node scripts/build-wvr-components-configuration.js defaults-dist-overrides.env && node scripts/serve-dist.js",
     "start:static": "node scripts/build-wvr-components-configuration.js defaults-static-overrides.env && static-server static -p 8081",
+    "start:docker": "node scripts/start-docker.js",
     "test": "npm run test:unit && npm run test:e2e",
     "test:audit": "rimraf .lighthouseci && lhci autorun --upload.target=temporary-public-storage --config=./lighthouserc.json && node scripts/build-wvr-components-lighthouse-badges.js",
     "test:e2e": "ng e2e",
@@ -50,69 +51,78 @@
     "test:ci": "npm run test:coverage && npm run test:audit"
   },
   "dependencies": {
-    "@angular/animations": "^10.0.12",
-    "@angular/common": "^10.0.12",
-    "@angular/compiler": "^10.0.12",
-    "@angular/core": "^10.0.12",
-    "@angular/elements": "^10.0.12",
-    "@angular/forms": "^10.0.12",
-    "@angular/localize": "^10.0.12",
-    "@angular/platform-browser": "^10.0.12",
-    "@angular/platform-browser-dynamic": "^10.0.12",
-    "@angular/router": "^10.0.12",
+    "@angular/animations": "^10.2.0",
+    "@angular/common": "^10.2.0",
+    "@angular/compiler": "^10.2.0",
+    "@angular/core": "^10.2.0",
+    "@angular/elements": "^10.2.0",
+    "@angular/forms": "^10.2.0",
+    "@angular/localize": "^10.2.0",
+    "@angular/platform-browser": "^10.2.0",
+    "@angular/platform-browser-dynamic": "^10.2.0",
+    "@angular/router": "^10.2.0",
     "@ng-bootstrap/ng-bootstrap": "^7.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",
     "@types/json5": "0.0.30",
-    "dotenv-override": "^5.0.1",
-    "dotenv-override-true": "^6.2.1",
-    "bootstrap": "^4.5.2",
+    "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",
     "ie11-custom-properties": "^4.1.0",
     "json5": "^2.1.3",
-    "rxjs": "~6.6.2",
-    "tslib": "^2.0.1",
+    "rxjs": "~6.6.3",
+    "tslib": "^2.0.3",
     "web-animations-js": "^2.3.2",
-    "zone.js": "~0.10.3"
+    "zone.js": "~0.11.2"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.1000.7",
-    "@angular-devkit/build-ng-packagr": "~0.1000.7",
-    "@angular-devkit/schematics": "^10.0.7",
-    "@angular/cli": "^10.0.7",
-    "@angular/compiler-cli": "^10.0.12",
-    "@angular/language-service": "^10.0.12",
+    "@angular-devkit/build-angular": "^0.1002.0",
+    "@angular-devkit/build-ng-packagr": "~0.1001.7",
+    "@angular-devkit/schematics": "^10.1.7",
+    "@angular/cli": "^10.1.7",
+    "@angular/compiler-cli": "^10.2.0",
+    "@angular/language-service": "^10.2.0",
     "@compodoc/compodoc": "^1.1.11",
-    "@lhci/cli": "^0.5.0",
+    "@lhci/cli": "^0.5.1",
+    "@ngrx/schematics": "^10.0.1",
     "@pickra/copy-code-block": "^1.2.0",
-    "@types/jasmine": "~3.5.13",
+    "@types/jasmine": "~3.5.14",
     "@types/jasminewd2": "~2.0.8",
-    "@types/node": "^14.6.0",
+    "@types/node": "^14.14.2",
     "angular-tslint-rules": "^1.20.4",
     "chalk": "^4.1.0",
     "chrome-launcher": "^0.13.4",
-    "codelyzer": "^6.0.0",
+    "codelyzer": "^6.0.1",
     "concat": "^1.0.3",
     "console-stamp": "^3.0.0-rc4.2",
     "coveralls": "^3.1.0",
     "glob": "^7.1.6",
     "jasmine-core": "~3.6.0",
-    "jasmine-spec-reporter": "~5.0.2",
+    "jasmine-spec-reporter": "~6.0.0",
     "jsdom": "^16.4.0",
-    "karma": "~5.1.1",
+    "karma": "~5.2.3",
     "karma-chrome-launcher": "~3.1.0",
     "karma-coverage-istanbul-reporter": "~3.0.3",
     "karma-jasmine": "~4.0.1",
     "karma-jasmine-html-reporter": "^1.5.4",
-    "lighthouse": "^6.2.0",
-    "lighthouse-badges": "^1.0.33",
-    "ng-packagr": "^10.0.4",
+    "lighthouse": "^6.4.1",
+    "lighthouse-badges": "^1.0.36",
+    "ng-packagr": "^10.1.2",
     "protractor": "~7.0.0",
     "rimraf": "^3.0.2",
+    "shelljs": "^0.8.4",
     "static-server": "^2.2.1",
-    "ts-loader": "^8.0.3",
+    "ts-loader": "^8.0.6",
     "ts-node": "~9.0.0",
     "tslint": "~6.1.3",
-    "typescript": "~3.9.4"
+    "typescript": "~4.0.3"
   }
 }
diff --git a/projects/wvr-elements/package.json b/projects/wvr-elements/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@wvr/elements",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "description": "Collection of angular components for Weaver's Custom Web Component UI",
   "author": "Texas A&M University Libraries",
   "private": false,
@@ -21,9 +21,12 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "css-element-queries": "^1.2.3"
-  ,    "tslib": "^2.0.0"
-},
+    "css-element-queries": "^1.2.3",
+    "tslib": "^2.0.0"
+  },
+  "bin": {
+    "wvr-ud": "./scripts/build-wvr-ud.js"
+  },
   "peerDependencies": {
     "@angular/common": "^9.0.0",
     "@angular/core": "^9.0.0"