Skip to content

Commit

Permalink
Merge f8dcf0c into 4fa18d6
Browse files Browse the repository at this point in the history
  • Loading branch information
jeremythuff committed Aug 13, 2020
2 parents 4fa18d6 + f8dcf0c commit 250163e
Show file tree
Hide file tree
Showing 110 changed files with 2,071 additions and 24,427 deletions.
2 changes: 1 addition & 1 deletion browserslist → .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'.
IE 9-11 # For IE 9-11 support, remove 'not'.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,6 @@ docs/
static/
development/
.lighthouseci/
package-lock.json
src/config.json
src/config-template.json
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ script:
- npm run test:ci

after_success:
- cat ./static/weaver-components/reports/coverage/wvr-elements/lcov.info | ./node_modules/coveralls/bin/coveralls.js,
- npm run test:report
- npm run build:static-production

notifications:
Expand Down
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# Changelog

## [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)

## [0.0.5] - 05-14-2020
### Resolves

Expand Down
9 changes: 9 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,13 @@ RUN npm run build
RUN ls -la

FROM httpd:2.4-alpine

COPY --from=npm /app/dist/bundle/ /usr/local/apache2/htdocs/wvr-components/

COPY src/config-template.json tmp/config-template.json
COPY docker-entrypoint /usr/local/bin/
RUN chmod +x /usr/local/bin/docker-entrypoint

ENTRYPOINT ["docker-entrypoint"]

CMD ["httpd", "-D", "FOREGROUND"]
28 changes: 17 additions & 11 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,16 @@
"options": {
"preserveSymlinks": true,
"outputPath": "dist/weaver-components",
"index": "src/index.html",
"index": "./src/index.html",
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "tsconfig.app.json",
"aot": false,
"aot": true,
"assets": [
"src/favicon.ico",
"src/assets"
"src/assets",
"src/config.json",
"src/weaver-components.js"
],
"styles": [
"src/styles.scss"
Expand All @@ -35,6 +37,9 @@
{
"input": "node_modules/document-register-element/build/document-register-element.js"
}
],
"allowedCommonJsDependencies": [
"css-element-queries"
]
},
"configurations": {
Expand All @@ -46,23 +51,24 @@
}
],
"optimization": true,
"outputHashing": "all",
"outputHashing": "none",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"extractCss": false,
"extractLicenses": true,
"namedChunks": false,
"commonChunk": false,
"vendorChunk": false,
"buildOptimizer": false,
"buildOptimizer": true,
"budgets": [
{
"type": "initial",
"maximumWarning": "5mb",
"maximumError": "8mb"
"maximumWarning": "1mb",
"maximumError": "4mb"
},
{
"type": "anyComponentStyle",
"maximumWarning": "6kb",
"maximumError": "10kb"
"maximumWarning": "50kb",
"maximumError": "500kb"
}
]
}
Expand Down
3 changes: 0 additions & 3 deletions config-docs.json

This file was deleted.

3 changes: 0 additions & 3 deletions config.json

This file was deleted.

7 changes: 7 additions & 0 deletions defaults-dev-overrides.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#
# This overrides file should contain only those value which need to be overriden
# in ./defaults.env when running `npm start`
#

BASE_URL=http://localhost:4200
ASSETS_URL=http://localhost:4200/assets
7 changes: 7 additions & 0 deletions defaults-dist-overrides.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#
# This overrides file should contain only those value which need to be overriden
# in ./defaults.env when running `npm start:dist`
#

BASE_URL=http://localhost:8080
ASSETS_URL=http://localhost:8080/assets
7 changes: 7 additions & 0 deletions defaults-static-overrides.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#
# This overrides file should contain only those value which need to be overriden
# in ./defaults.env when running `npm start:static`
#

BASE_URL=http://localhost:8081
ASSETS_URL=http://localhost:8081/weaver-components/docs/usage/assets
7 changes: 7 additions & 0 deletions defaults.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#
# This defaults file should contain default values for every configuration entry
# 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
14 changes: 14 additions & 0 deletions docker-entrypoint
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#!/bin/bash

set -e

versionLocation=/usr/local/apache2/htdocs/wvr-components/1x/config.json
latestLocation=/usr/local/apache2/htdocs/wvr-components/latest/config.json

eval "cat << EOF | tee $versionLocation $latestLocation
$(<tmp/config-template.json)
EOF"

echo "Done docker-entrypoint..."

exec "$@"
4 changes: 2 additions & 2 deletions e2e/protractor.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Protractor configuration file, see link for more information
// https://github.com/angular/protractor/blob/master/lib/config.ts

const { SpecReporter } = require('jasmine-spec-reporter');
const { SpecReporter, StacktraceOption } = require('jasmine-spec-reporter');

/**
* @type { import("protractor").Config }
Expand All @@ -27,6 +27,6 @@ exports.config = {
require('ts-node').register({
project: require('path').join(__dirname, './tsconfig.json')
});
jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: StacktraceOption.PRETTY } }));
}
};
4 changes: 2 additions & 2 deletions e2e/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"extends": "../tsconfig.json",
"extends": "../tsconfig.base.json",
"compilerOptions": {
"outDir": "../out-tsc/e2e",
"module": "commonjs",
"target": "es5",
"target": "es2018",
"types": [
"jasmine",
"jasminewd2",
Expand Down

0 comments on commit 250163e

Please sign in to comment.