From 20cd949c3773f3cd5bcc81a294663dc9c519e180 Mon Sep 17 00:00:00 2001 From: Evan Lovely Date: Tue, 30 Oct 2018 11:36:00 -0700 Subject: [PATCH 01/34] feat(*): add Express server for hosting static file builds BDS-693 --- package.json | 2 ++ server.js | 11 +++++++++++ 2 files changed, 13 insertions(+) create mode 100644 server.js diff --git a/package.json b/package.json index 3eb4909e8f..ee40f9534a 100644 --- a/package.json +++ b/package.json @@ -55,6 +55,7 @@ "test:js:watch": "jest --watch", "test:php": "cd packages/core-php && composer run test", "test": "npm-run-all --parallel test:*", + "serve": "node server.js", "watch:icons": "lerna exec --scope @bolt/components-icons -- yarn run watch" }, "dependencies": { @@ -62,6 +63,7 @@ }, "devDependencies": { "editorconfig-checker": "^1.3.3", + "express": "^4.16.3", "husky": "^0.14.3", "jest": "^23.5.0", "lerna": "^3.2.1", diff --git a/server.js b/server.js new file mode 100644 index 0000000000..614ba40045 --- /dev/null +++ b/server.js @@ -0,0 +1,11 @@ +const express = require('express'); +const { join } = require('path'); +const app = express(); + +const port = process.env.PORT || 3123; + +app.use(express.static(join(__dirname, './www'))); + +app.listen(port, () => { + console.log(`Express listening on http://localhost:${port}`); +}); From 2d569729e27e284eb738dfa995780ee159417daf Mon Sep 17 00:00:00 2001 From: Evan Lovely Date: Tue, 30 Oct 2018 11:52:29 -0700 Subject: [PATCH 02/34] ci(deploys): add Dockerfile for building, testing, and hosting Bolt BDS-693 --- .dockerignore | 9 +++++++++ .travis.yml | 28 +++++++++++++++++++--------- Dockerfile | 10 ++++++++++ 3 files changed, 38 insertions(+), 9 deletions(-) create mode 100644 .dockerignore create mode 100644 Dockerfile diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000000..810c5a733d --- /dev/null +++ b/.dockerignore @@ -0,0 +1,9 @@ +node_modules +dist +vendor +/.idea +/.vscode +/example-integrations +/www +/apps/bolt-site/cache +/apps/pattern-lab/cache diff --git a/.travis.yml b/.travis.yml index 57f883b058..0604a373fa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,9 @@ -sudo: false +sudo: required dist: trusty +services: + - docker + language: php php: - 7.1 @@ -9,23 +12,30 @@ addons: sauce_connect: true before_install: -- nvm install # version lifted from `.nvmrc` -- curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.9.4 -- export PATH="$HOME/.yarn/bin:$PATH" +# - nvm install # version lifted from `.nvmrc` +# - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.9.4 +# - export PATH="$HOME/.yarn/bin:$PATH" before_script: - phpenv config-rm xdebug.ini install: -- yarn run setup +# - yarn run setup before_script: -- yarn run lint +# - yarn run lint # Can't do deploy on `after_success` b/c if deploy fails, the build still reports success. Can't use `deploy` step b/c Travis skips that on PRs. script: -- bash ./travis.sh # time command already run inside the travis.sh script -- npx nightwatch@0.9.20 --config nightwatch.js --env chrome,ie11 +- docker pull boltdesignsystem/bolt || true +- docker build --pull --cache-from boltdesignsystem/bolt --tag boltdesignsystem/bolt . +- docker images +- echo $DOCKER_HUB_PASS | docker login --username $DOCKER_HUB_USER --password-stdin +- docker tag boltdesignsystem/bolt boltdesignsystem/bolt:latest +- docker tag boltdesignsystem/bolt boltdesignsystem/bolt:${TRAVIS_COMMIT} +- docker push boltdesignsystem/bolt:latest && docker push boltdesignsystem/bolt:${TRAVIS_COMMIT} +# - bash ./travis.sh # time command already run inside the travis.sh script +# - npx nightwatch@0.9.20 --config nightwatch.js --env chrome,ie11 cache: apt: true @@ -35,7 +45,7 @@ cache: notifications: email: on_success: never - on_failure: always + on_failure: never # @todo re-enable slack: secure: cNto+gWAoK1JM9jBNG4i4rMSybv3twMbqlFSCohQFBDMwKFMdlyWqFDX6iYKtHxWEDzrZyRz3qiJ8/S44mgjeKJ/xHbHDtPchp/KL2P1htipvwD2EZXobcBEGl83v2rmtFO1WNJUPB3RIJE2yt1wJsX7NIXpDw82hePmaIvNJmtbLpK/J5uaFqGNHIsctmULgVmGSNSTyK4nYxxjNNLd0EvO37Y6VN8FhsKNu2NHMKeeQxinEvETDUh8XuqXZYNWE3PBvVa4OiDhgnr5K27jsnWX+wEmqg0xY+CMf7mUSTqVN61fA7LnHyM0qcGGmB6YTv4QYLMwPydp+nsjDcm3St9D+KOTsQ4ExOaEAL/6EnAEpl8GtxST+ytdqswhCC4yMCO61Hy+M5AoXgDSGrrXHgZakDMAcEVcJdH38791hRxcuM3ldVmHAlAWFdgRLG5rRMVh3qoXz7jbraoTdjyKMegQIQdKR2SX7O9Dv0EEtLz4lTFN2RENvAjLggUPPU+ESoUHmSbwmPGnt7jy3ra2AI3nnYpfn/0e6Op/A3z7HLbdm3XyuNWoTPhy1mc4Adca+HosJ37UPv7nDRIGds1sKYAeWq94+rEk+/6IQ/oRIDRhSYsQbLLWnU6DH4o7iOj7D+X/ngjqmF75nW2s5+7rtdBHFvNzOJalCKHiDTMfdlQ= diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000000..ea6d7f42f7 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,10 @@ +FROM basaltinc/docker-node-php-base:latest +WORKDIR /app +COPY . . +EXPOSE 3123 +RUN yarn setup +RUN yarn lint +RUN yarn build +RUN yarn test + +CMD yarn serve From f4cc8422887c95615ce93afe469dc6c0d38261f0 Mon Sep 17 00:00:00 2001 From: Evan Lovely Date: Tue, 30 Oct 2018 13:09:48 -0700 Subject: [PATCH 03/34] ci(now): setup now.sh Docker deploy from latest Docker build BDS-693 --- .travis.yml | 9 +++++++-- deploys/Dockerfile | 3 +++ 2 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 deploys/Dockerfile diff --git a/.travis.yml b/.travis.yml index 0604a373fa..ed59fb3946 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,12 +31,17 @@ script: - docker build --pull --cache-from boltdesignsystem/bolt --tag boltdesignsystem/bolt . - docker images - echo $DOCKER_HUB_PASS | docker login --username $DOCKER_HUB_USER --password-stdin +- GIT_SHA="$(git rev-parse --short HEAD)" - docker tag boltdesignsystem/bolt boltdesignsystem/bolt:latest -- docker tag boltdesignsystem/bolt boltdesignsystem/bolt:${TRAVIS_COMMIT} -- docker push boltdesignsystem/bolt:latest && docker push boltdesignsystem/bolt:${TRAVIS_COMMIT} +- docker tag boltdesignsystem/bolt boltdesignsystem/bolt:${GIT_SHA} +- docker push boltdesignsystem/bolt:latest && docker push boltdesignsystem/bolt:${GIT_SHA} # - bash ./travis.sh # time command already run inside the travis.sh script # - npx nightwatch@0.9.20 --config nightwatch.js --env chrome,ie11 +after_script: + - echo '' && echo 'About to deploy...' && echo '' + - cd deploys && DOCKER_TAG=$GIT_SHA npx now@canary --team boltdesignsystem + cache: apt: true directories: diff --git a/deploys/Dockerfile b/deploys/Dockerfile new file mode 100644 index 0000000000..e51ee61484 --- /dev/null +++ b/deploys/Dockerfile @@ -0,0 +1,3 @@ +FROM boltdesignsystem/bolt:${DOCKER_TAG:-latest} +# tag being built from will be env var `$DOCKER_TAG` if set, else it will be `latest` +EXPOSE 3123 From 1fc8f0d8724bb300db54a547f34df09603a8a32c Mon Sep 17 00:00:00 2001 From: Evan Lovely Date: Tue, 30 Oct 2018 17:30:28 -0700 Subject: [PATCH 04/34] Add now token --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ed59fb3946..b0f7f377c4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,7 +40,7 @@ script: after_script: - echo '' && echo 'About to deploy...' && echo '' - - cd deploys && DOCKER_TAG=$GIT_SHA npx now@canary --team boltdesignsystem + - cd deploys && DOCKER_TAG=$GIT_SHA npx now@canary --team boltdesignsystem --token $NOW_TOKEN cache: apt: true From 910c7a6e40c01b195c026b15a12a81ce868e961f Mon Sep 17 00:00:00 2001 From: Evan Lovely Date: Thu, 8 Nov 2018 12:21:00 -0800 Subject: [PATCH 05/34] ci(now): now.sh docker config tweak --- deploys/now.json | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 deploys/now.json diff --git a/deploys/now.json b/deploys/now.json new file mode 100644 index 0000000000..d594d1ec40 --- /dev/null +++ b/deploys/now.json @@ -0,0 +1,8 @@ +{ + "version": 1, + "name": "bolt-docker", + "type": "docker", + "features": { + "cloud": "v1" + } +} \ No newline at end of file From b6584232f040a245d7b790391f89ce4716759c1c Mon Sep 17 00:00:00 2001 From: Evan Lovely Date: Fri, 14 Dec 2018 11:36:44 -0800 Subject: [PATCH 06/34] ci(travis) adjust now settings --- .travis.yml | 2 +- deploys/now.json | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b0f7f377c4..09ac6b9217 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,7 +40,7 @@ script: after_script: - echo '' && echo 'About to deploy...' && echo '' - - cd deploys && DOCKER_TAG=$GIT_SHA npx now@canary --team boltdesignsystem --token $NOW_TOKEN + - cd deploys && DOCKER_TAG=$GIT_SHA npx now deploy --force --team boltdesignsystem --token $NOW_TOKEN cache: apt: true diff --git a/deploys/now.json b/deploys/now.json index d594d1ec40..8a0e372adf 100644 --- a/deploys/now.json +++ b/deploys/now.json @@ -2,7 +2,13 @@ "version": 1, "name": "bolt-docker", "type": "docker", + "scale": { + "sfo1": { + "min": 1, + "max": 1 + } + }, "features": { "cloud": "v1" } -} \ No newline at end of file +} From 7890e5773921f787910ae9da33c58b1d36bc42b6 Mon Sep 17 00:00:00 2001 From: Evan Lovely Date: Fri, 14 Dec 2018 14:42:15 -0800 Subject: [PATCH 07/34] ci(travis) hook up new deploy --- .travis.yml | 14 +- Dockerfile | 2 +- now.json => Xnow.old.json | 1 + deploys/now.json | 2 +- package.json | 1 - scripts/deploy.js | 21 +- yarn.lock | 646 ++++++++++++++++++-------------------- 7 files changed, 331 insertions(+), 356 deletions(-) rename now.json => Xnow.old.json (93%) diff --git a/.travis.yml b/.travis.yml index 09ac6b9217..fde6aed103 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,14 +16,12 @@ before_install: # - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.9.4 # - export PATH="$HOME/.yarn/bin:$PATH" -before_script: -- phpenv config-rm xdebug.ini - install: # - yarn run setup -before_script: +#before_script: # - yarn run lint +#- phpenv config-rm xdebug.ini # Can't do deploy on `after_success` b/c if deploy fails, the build still reports success. Can't use `deploy` step b/c Travis skips that on PRs. script: @@ -35,12 +33,12 @@ script: - docker tag boltdesignsystem/bolt boltdesignsystem/bolt:latest - docker tag boltdesignsystem/bolt boltdesignsystem/bolt:${GIT_SHA} - docker push boltdesignsystem/bolt:latest && docker push boltdesignsystem/bolt:${GIT_SHA} -# - bash ./travis.sh # time command already run inside the travis.sh script -# - npx nightwatch@0.9.20 --config nightwatch.js --env chrome,ie11 after_script: - - echo '' && echo 'About to deploy...' && echo '' - - cd deploys && DOCKER_TAG=$GIT_SHA npx now deploy --force --team boltdesignsystem --token $NOW_TOKEN + - npm i -g now@latest + - yarn deploy + - npx nightwatch@0.9.20 --config nightwatch.js --env chrome,ie11 + - time ./scripts/update-read-only-git-repos.sh cache: apt: true diff --git a/Dockerfile b/Dockerfile index ea6d7f42f7..21efbc76da 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM basaltinc/docker-node-php-base:latest +FROM boltdesignsystem/bolt-docker:latest WORKDIR /app COPY . . EXPOSE 3123 diff --git a/now.json b/Xnow.old.json similarity index 93% rename from now.json rename to Xnow.old.json index 1e481ee515..5a0cab357b 100644 --- a/now.json +++ b/Xnow.old.json @@ -1,4 +1,5 @@ { + "COMMENT": "@todo ensure these rewrites work in new setup", "version": 1, "static": { "trailingSlash": true, diff --git a/deploys/now.json b/deploys/now.json index 8a0e372adf..c1c767e874 100644 --- a/deploys/now.json +++ b/deploys/now.json @@ -1,6 +1,6 @@ { "version": 1, - "name": "bolt-docker", + "name": "boltdesignsystem", "type": "docker", "scale": { "sfo1": { diff --git a/package.json b/package.json index 6bbcbd02ce..0e254e9c2c 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,6 @@ "jest": "^23.5.0", "lerna": "^3.4.3", "node-fetch": "^2.2.0", - "now": "^12.1.0", "npm-run-all": "^4.1.5", "yaml-lint": "^1.2.4", "git-semver-tags": "^2.0.0", diff --git a/scripts/deploy.js b/scripts/deploy.js index a641cf68ae..eaeda409db 100755 --- a/scripts/deploy.js +++ b/scripts/deploy.js @@ -1,5 +1,6 @@ #!/usr/bin/env node const url = require('url'); +const { resolve } = require('path'); const querystring = require('querystring'); const fetch = require('node-fetch'); const {spawnSync} = require('child_process'); @@ -30,8 +31,13 @@ async function init() { TRAVIS_REPO_SLUG, // If the current build is for a git tag, this variable is set to the tag’s name TRAVIS_TAG, + TRAVIS_BUILD_WEB_URL, } = process.env; + // also made in `.travis.yml` during docker tag + const gitSha = spawnSync('git', ['rev-parse', '--short' 'HEAD'], { + encoding: 'utf8', + }).trim(); console.log({ TRAVIS, @@ -40,6 +46,8 @@ async function init() { TRAVIS_PULL_REQUEST, TRAVIS_REPO_SLUG, TRAVIS_TAG, + TRAVIS_BUILD_WEB_URL, + gitSha, }); let branchName = 'detached-HEAD'; @@ -64,7 +72,6 @@ async function init() { const baseNowArgs = [ '--platform-version=1', '--team=boltdesignsystem', - '--local-config=../now.json', ]; if (NOW_TOKEN) baseNowArgs.push(`--token=${NOW_TOKEN}`); @@ -72,11 +79,15 @@ async function init() { console.log('Starting deploy...'); const deployOutput = spawnSync('now', [ 'deploy', - './www', - '--name=boltdesignsystem', - '--static', + '--force', + `--meta TRAVIS_BUILD_WEB_URL=${TRAVIS_BUILD_WEB_URL}`, + `--env DOCKER_TAG=${gitSha}`, + `--build-env DOCKER_TAG=${gitSha}`, ...baseNowArgs, - ], {encoding: 'utf8'}); + ], { + encoding: 'utf8', + cwd: resolve(__dirname, '../deploys'), + }); if (deployOutput.status !== 0) { console.error('Error deploying:'); } diff --git a/yarn.lock b/yarn.lock index 6ea2303d28..9e4e47d89e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -26,32 +26,32 @@ dependencies: "@babel/highlight" "^7.0.0" -"@babel/core@^7.0.0", "@babel/core@^7.1.2": - version "7.1.6" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.1.6.tgz#3733cbee4317429bc87c62b29cf8587dba7baeb3" - integrity sha512-Hz6PJT6e44iUNpAn8AoyAs6B3bl60g7MJQaI0rZEar6ECzh6+srYO1xlIdssio34mPaUtAb1y+XlkkSJzok3yw== +"@babel/core@^7.0.0": + version "7.1.2" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.1.2.tgz#f8d2a9ceb6832887329a7b60f9d035791400ba4e" + integrity sha512-IFeSSnjXdhDaoysIlev//UzHZbdEmm7D0EIH2qtse9xK7mXEZQpYjs2P00XlP1qYsYvid79p+Zgg6tz1mp6iVw== dependencies: "@babel/code-frame" "^7.0.0" - "@babel/generator" "^7.1.6" - "@babel/helpers" "^7.1.5" - "@babel/parser" "^7.1.6" + "@babel/generator" "^7.1.2" + "@babel/helpers" "^7.1.2" + "@babel/parser" "^7.1.2" "@babel/template" "^7.1.2" - "@babel/traverse" "^7.1.6" - "@babel/types" "^7.1.6" + "@babel/traverse" "^7.1.0" + "@babel/types" "^7.1.2" convert-source-map "^1.1.0" - debug "^4.1.0" - json5 "^2.1.0" + debug "^3.1.0" + json5 "^0.5.0" lodash "^4.17.10" resolve "^1.3.2" semver "^5.4.1" source-map "^0.5.0" -"@babel/generator@^7.1.6": - version "7.1.6" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.1.6.tgz#001303cf87a5b9d093494a4bf251d7b5d03d3999" - integrity sha512-brwPBtVvdYdGxtenbQgfCdDPmtkmUBZPjUoK5SXJEBuHaA5BCubh9ly65fzXz7R6o5rA76Rs22ES8Z+HCc0YIQ== +"@babel/generator@^7.1.2", "@babel/generator@^7.1.3": + version "7.1.3" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.1.3.tgz#2103ec9c42d9bdad9190a6ad5ff2d456fd7b8673" + integrity sha512-ZoCZGcfIJFJuZBqxcY9OjC1KW2lWK64qrX1o4UYL3yshVhwKFYgzpWZ0vvtGMNJdTlvkw0W+HR1VnYN8q3QPFQ== dependencies: - "@babel/types" "^7.1.6" + "@babel/types" "^7.1.3" jsesc "^2.5.1" lodash "^4.17.10" source-map "^0.5.0" @@ -220,14 +220,14 @@ "@babel/traverse" "^7.1.0" "@babel/types" "^7.0.0" -"@babel/helpers@^7.1.5": - version "7.1.5" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.1.5.tgz#68bfc1895d685f2b8f1995e788dbfe1f6ccb1996" - integrity sha512-2jkcdL02ywNBry1YNFAH/fViq4fXG0vdckHqeJk+75fpQ2OH+Az6076tX/M0835zA45E0Cqa6pV5Kiv9YOqjEg== +"@babel/helpers@^7.1.2": + version "7.1.2" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.1.2.tgz#ab752e8c35ef7d39987df4e8586c63b8846234b5" + integrity sha512-Myc3pUE8eswD73aWcartxB16K6CGmHDv9KxOmD2CeOs/FaEAQodr3VYGmlvOmog60vNQ2w8QbatuahepZwrHiA== dependencies: "@babel/template" "^7.1.2" - "@babel/traverse" "^7.1.5" - "@babel/types" "^7.1.5" + "@babel/traverse" "^7.1.0" + "@babel/types" "^7.1.2" "@babel/highlight@^7.0.0": version "7.0.0" @@ -238,10 +238,10 @@ esutils "^2.0.2" js-tokens "^4.0.0" -"@babel/parser@^7.0.0", "@babel/parser@^7.1.2", "@babel/parser@^7.1.6": - version "7.1.6" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.1.6.tgz#16e97aca1ec1062324a01c5a6a7d0df8dd189854" - integrity sha512-dWP6LJm9nKT6ALaa+bnL247GHHMWir3vSlZ2+IHgHgktZQx0L3Uvq2uAWcuzIe+fujRsYWBW2q622C5UvGK9iQ== +"@babel/parser@^7.0.0", "@babel/parser@^7.1.2", "@babel/parser@^7.1.3": + version "7.1.3" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.1.3.tgz#2c92469bac2b7fbff810b67fca07bd138b48af77" + integrity sha512-gqmspPZOMW3MIRb9HlrnbZHXI1/KHTOroBwN1NcLL6pWxzqzEKGvRTq0W/PxS45OtQGbaFikSQpkS5zbnsQm2w== "@babel/plugin-proposal-async-generator-functions@^7.1.0": version "7.1.0" @@ -265,9 +265,9 @@ "@babel/plugin-syntax-class-properties" "^7.0.0" "@babel/plugin-proposal-decorators@^7.0.0": - version "7.1.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.1.6.tgz#460c31edbd01953efe45d491583b3ec31661d689" - integrity sha512-U42f8KhUbtlhUDyV/wK4Rq/wWh8vWyttYABckG/v0vVnMPvayOewZC/83CbVdmyP+UhEqI368FEQ7hHMfhBpQA== + version "7.1.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.1.2.tgz#79829bd75fced6581ec6c7ab1930e8d738e892e7" + integrity sha512-YooynBO6PmBgHvAd0fl5e5Tq/a0pEC6RqF62ouafme8FzdIVH41Mz/u1dn8fFVm4jzEJ+g/MsOxouwybJPuP8Q== dependencies: "@babel/helper-plugin-utils" "^7.0.0" "@babel/helper-replace-supers" "^7.1.0" @@ -386,10 +386,10 @@ dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-block-scoping@^7.1.5": - version "7.1.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.1.5.tgz#3e8e0bc9a5104519923302a24f748f72f2f61f37" - integrity sha512-jlYcDrz+5ayWC7mxgpn1Wj8zj0mmjCT2w0mPIMSwO926eXBRxpEgoN/uQVRBfjtr8ayjcmS+xk2G1jaP8JjMJQ== +"@babel/plugin-transform-block-scoping@^7.0.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.2.0.tgz#f17c49d91eedbcdf5dd50597d16f5f2f770132d4" + integrity sha512-vDTgf19ZEV6mx35yiPJe4fS02mPQUUcBNwWQSZFXSzTSbsJFQvHt7DqyS3LK8oOWALFOsJ+8bbqBgkirZteD5Q== dependencies: "@babel/helper-plugin-utils" "^7.0.0" lodash "^4.17.10" @@ -606,9 +606,9 @@ regenerator-runtime "^0.11.1" "@babel/preset-env@^7.0.0": - version "7.1.6" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.1.6.tgz#a0bf4b96b6bfcf6e000afc5b72b4abe7cc13ae97" - integrity sha512-YIBfpJNQMBkb6MCkjz/A9J76SNCSuGVamOVBgoUkLzpJD/z8ghHi9I42LQ4pulVX68N/MmImz6ZTixt7Azgexw== + version "7.1.0" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.1.0.tgz#e67ea5b0441cfeab1d6f41e9b5c79798800e8d11" + integrity sha512-ZLVSynfAoDHB/34A17/JCZbyrzbQj59QC1Anyueb4Bwjh373nVPq5/HMph0z+tCmcDjXDe+DlKQq9ywQuvWrQg== dependencies: "@babel/helper-module-imports" "^7.0.0" "@babel/helper-plugin-utils" "^7.0.0" @@ -623,7 +623,7 @@ "@babel/plugin-transform-arrow-functions" "^7.0.0" "@babel/plugin-transform-async-to-generator" "^7.1.0" "@babel/plugin-transform-block-scoped-functions" "^7.0.0" - "@babel/plugin-transform-block-scoping" "^7.1.5" + "@babel/plugin-transform-block-scoping" "^7.0.0" "@babel/plugin-transform-classes" "^7.1.0" "@babel/plugin-transform-computed-properties" "^7.0.0" "@babel/plugin-transform-destructuring" "^7.0.0" @@ -653,9 +653,9 @@ semver "^5.3.0" "@babel/runtime@^7.0.0": - version "7.1.5" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.1.5.tgz#4170907641cf1f61508f563ece3725150cc6fe39" - integrity sha512-xKnPpXG/pvK1B90JkwwxSGii90rQGKtzcMt2gI5G6+M0REXaq6rOHsGC2ay6/d0Uje7zzvSzjEzfR3ENhFlrfA== + version "7.1.2" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.1.2.tgz#81c89935f4647706fc54541145e6b4ecfef4b8e3" + integrity sha512-Y3SCjmhSupzFB6wcv1KmmFucH6gDVnI30WjOcicV10ju0cZjak3Jcs67YLIXBrmZYw1xCrVeJPbycFwrqNyxpg== dependencies: regenerator-runtime "^0.12.0" @@ -668,25 +668,25 @@ "@babel/parser" "^7.1.2" "@babel/types" "^7.1.2" -"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.1.5", "@babel/traverse@^7.1.6": - version "7.1.6" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.1.6.tgz#c8db9963ab4ce5b894222435482bd8ea854b7b5c" - integrity sha512-CXedit6GpISz3sC2k2FsGCUpOhUqKdyL0lqNrImQojagnUMXf8hex4AxYFRuMkNGcvJX5QAFGzB5WJQmSv8SiQ== +"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0": + version "7.1.4" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.1.4.tgz#f4f83b93d649b4b2c91121a9087fa2fa949ec2b4" + integrity sha512-my9mdrAIGdDiSVBuMjpn/oXYpva0/EZwWL3sm3Wcy/AVWO2eXnsoZruOT9jOGNRXU8KbCIu5zsKnXcAJ6PcV6Q== dependencies: "@babel/code-frame" "^7.0.0" - "@babel/generator" "^7.1.6" + "@babel/generator" "^7.1.3" "@babel/helper-function-name" "^7.1.0" "@babel/helper-split-export-declaration" "^7.0.0" - "@babel/parser" "^7.1.6" - "@babel/types" "^7.1.6" - debug "^4.1.0" + "@babel/parser" "^7.1.3" + "@babel/types" "^7.1.3" + debug "^3.1.0" globals "^11.1.0" lodash "^4.17.10" -"@babel/types@^7.0.0", "@babel/types@^7.1.2", "@babel/types@^7.1.5", "@babel/types@^7.1.6": - version "7.1.6" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.1.6.tgz#0adb330c3a281348a190263aceb540e10f04bcce" - integrity sha512-DMiUzlY9DSjVsOylJssxLHSgj6tWM9PRFJOGW/RaOglVOK9nzTxoOMfTfRQXGUCUQ/HmlG2efwC+XqUEJ5ay4w== +"@babel/types@^7.0.0", "@babel/types@^7.1.2", "@babel/types@^7.1.3": + version "7.1.3" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.1.3.tgz#3a767004567060c2f40fca49a304712c525ee37d" + integrity sha512-RpPOVfK+yatXyn8n4PB1NW6k9qjinrXrRR8ugBN8fD6hCy5RXI6PSbVqpOJBO9oSaY7Nom4ohj35feb0UR9hSA== dependencies: esutils "^2.0.2" lodash "^4.17.10" @@ -1298,7 +1298,7 @@ call-me-maybe "^1.0.1" glob-to-regexp "^0.3.0" -"@nodelib/fs.stat@^1.1.2": +"@nodelib/fs.stat@^1.0.1": version "1.1.3" resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b" integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw== @@ -1356,14 +1356,9 @@ node-notifier "^5.1.2" "@types/node@*": - version "10.12.10" - resolved "https://registry.yarnpkg.com/@types/node/-/node-10.12.10.tgz#4fa76e6598b7de3f0cb6ec3abacc4f59e5b3a2ce" - integrity sha512-8xZEYckCbUVgK8Eg7lf5Iy4COKJ5uXlnIOnePN0WUwSQggy9tolM+tDJf7wMOnT/JT/W9xDYIaYggt3mRV2O5w== - -"@types/tapable@1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.2.tgz#e13182e1b69871a422d7863e11a4a6f5b814a4bd" - integrity sha512-42zEJkBpNfMEAvWR5WlwtTH22oDzcMjFsL9gDGExwF8X8WvAiw7Vwop7hPw03QT8TKfec83LwbHj6SvpqM4ELQ== + version "10.12.0" + resolved "https://registry.yarnpkg.com/@types/node/-/node-10.12.0.tgz#ea6dcbddbc5b584c83f06c60e82736d8fbb0c235" + integrity sha512-3TUHC3jsBAB7qVRGxT6lWyYo2v96BMmD2PTcl47H25Lu7UXtFH/2qqmKiVrnel6Ne//0TFYf6uvNX+HW2FRkLQ== "@vue/babel-preset-app@^3.1.0": version "3.1.1" @@ -1773,9 +1768,9 @@ integrity sha512-flmTp4rVbBkcUIF3eBO3LNoAaYvleTdhPZKzdzr6iztWLLrxCctcK+7MAQeC3/SPjc3JDdC3jYLMRF4R6C3f9g== "@webcomponents/shadycss@^1.5.2": - version "1.6.0" - resolved "https://registry.yarnpkg.com/@webcomponents/shadycss/-/shadycss-1.6.0.tgz#2aeb0703983137a733bdb5c06fff125aa1f8c5c1" - integrity sha512-iURGZZU6BaiRJtGgjMn208QxPkY11QwT/VmuHNa4Yb+kJxU/WODe4C8b0LDOtnk4KJzJg50hCfwvPRAjePEzbA== + version "1.5.2" + resolved "https://registry.yarnpkg.com/@webcomponents/shadycss/-/shadycss-1.5.2.tgz#ad72f43000c39ba4ac61e625131f34f4b7cfe55f" + integrity sha512-0OyrmVc7S+INtzoqP2ofAo+OdVn2Nj0Qvq4wD9FEGN7nMmLRxaD2mzy6hD6EslzxUSuGH302CDU4KXiY66SEqg== "@webcomponents/shadydom@^1.2.0": version "1.3.1" @@ -1864,14 +1859,14 @@ acorn-jsx@^3.0.0: acorn "^3.0.4" acorn-jsx@^5.0.0: - version "5.0.1" - resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.0.1.tgz#32a064fd925429216a09b141102bfdd185fae40e" - integrity sha512-HJ7CfNHrfJLlNTzIEUTj43LNWGkqpRLxm3YjAlcD0ACydk9XynzYsCBHxut+iqt+1aBXkx9UP/w/ZqMr13XIzg== + version "5.0.0" + resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.0.0.tgz#958584ddb60990c02c97c1bd9d521fce433bb101" + integrity sha512-XkB50fn0MURDyww9+UYL3c1yLbOBz0ZFvrdYlGB8l+Ije1oSC75qAqrzSPjYQbdnQUzhlUGNKuesryAv0gxZOg== acorn-walk@^6.0.1: - version "6.1.1" - resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.1.1.tgz#d363b66f5fac5f018ff9c3a1e7b6f8e310cc3913" - integrity sha512-OtUw6JUTgxA2QoqqmrmQ7F2NYqiBPi/L2jqHyFtllhOUvXYQXf0Z1CYUinIfyT4bTCGmrA7gX9FvHA81uzCoVw== + version "6.1.0" + resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.1.0.tgz#c957f4a1460da46af4a0388ce28b4c99355b0cbc" + integrity sha512-ugTb7Lq7u4GfWSqqpwE0bGyoBZNMTok/zDBXxfEG0QM50jNlGhIWjRC1pPN7bvV1anhF+bs+/gNcRw+o55Evbg== acorn@^3.0.4: version "3.3.0" @@ -1884,9 +1879,9 @@ acorn@^5.0.0, acorn@^5.5.0, acorn@^5.5.3, acorn@^5.6.2: integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw== acorn@^6.0.1, acorn@^6.0.2: - version "6.0.4" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.0.4.tgz#77377e7353b72ec5104550aa2d2097a2fd40b754" - integrity sha512-VY4i5EKSKkofY2I+6QLTbTTN/UvEQPCo6eiwzzSaSWfpaDhOmStMCMod6wmuPciNq+XS0faCglFu2lHZpdHUtg== + version "6.0.2" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.0.2.tgz#6a459041c320ab17592c6317abbfdf4bbaa98ca4" + integrity sha512-GXmKIvbrN3TV7aVqAzVFaMW8F8wzVX7voEBRO3bDA64+EX37YSayggRJP5Xig6HYHBkWKpFg9W5gg6orklubhg== address@^1.0.3: version "1.0.3" @@ -1950,7 +1945,17 @@ ajv@^5.1.0, ajv@^5.2.3, ajv@^5.3.0: fast-json-stable-stringify "^2.0.0" json-schema-traverse "^0.3.0" -ajv@^6.0.1, ajv@^6.1.0, ajv@^6.5.2, ajv@^6.5.3, ajv@^6.5.4, ajv@^6.5.5: +ajv@^6.0.1, ajv@^6.1.0, ajv@^6.5.2, ajv@^6.5.3: + version "6.5.4" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.4.tgz#247d5274110db653706b550fcc2b797ca28cfc59" + integrity sha512-4Wyjt8+t6YszqaXnLDfMmG/8AlO5Zbcsy3ATHncCzjW/NoPzAId8AK6749Ybjmdt+kUY1gP60fCu46oDxPv/mg== + dependencies: + fast-deep-equal "^2.0.1" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.4.1" + uri-js "^4.2.2" + +ajv@^6.5.4, ajv@^6.5.5: version "6.5.5" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.5.tgz#cf97cdade71c6399a92c6d6c4177381291b781a1" integrity sha512-7q7gtRQDJSyuEHjuVgHoUa2VuemFiCMrfQc9Tc08XTAc4Zj/5U1buQJ0HU6i7fKjXU09SVgSmxa4sLvuvS8Iyg== @@ -2284,9 +2289,9 @@ ast-types@0.9.6: integrity sha1-ECyenpAF0+fjgpvwxPok7oYu6bk= ast-types@0.x.x: - version "0.11.7" - resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.11.7.tgz#f318bf44e339db6a320be0009ded64ec1471f46c" - integrity sha512-2mP3TwtkY/aTv5X3ZsMpNAbOnyoC/aMJwJSoaELPkHId0nSQgFcnU4dRW3isxiz7+zBexk0ym3WNVjMiQBnJSw== + version "0.11.6" + resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.11.6.tgz#4e2266c2658829aef3b40cc33ad599c4e9eb89ef" + integrity sha512-nHiuV14upVGl7MWwFUYbzJ6YlfwWS084CU9EA8HajfYQjMSli5TQi3UTRygGF58LFWVkXxS1rbgRhROEqlQkXg== astral-regex@^1.0.0: version "1.0.0" @@ -2768,9 +2773,9 @@ bluebird@^2.3.5, bluebird@^2.6.2, bluebird@^2.8.1, bluebird@^2.8.2, bluebird@^2. integrity sha1-U0uQM8AiyVecVro7Plpcqvu2UOE= bluebird@^3.1.1, bluebird@^3.5.1, bluebird@^3.5.2: - version "3.5.3" - resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.3.tgz#7d01c6f9616c9a51ab0f8c549a79dfe6ec33efa7" - integrity sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw== + version "3.5.2" + resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.2.tgz#1be0908e054a751754549c270489c1505d4ab15a" + integrity sha512-dhHTWMI7kMx5whMQntl7Vr9C6BvV10lFXDAasnqnrMYhXVCzzk6IO9Fo2L75jXHT07WrOngL1WDXOp+yYS91Yg== bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0: version "4.11.8" @@ -3051,13 +3056,13 @@ browserslist@^1.1.1, browserslist@^1.1.3, browserslist@^1.7.6: electron-to-chromium "^1.2.7" browserslist@^4.0.0, browserslist@^4.1.0, browserslist@^4.1.1, browserslist@^4.3.3: - version "4.3.4" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.3.4.tgz#4477b737db6a1b07077275b24791e680d4300425" - integrity sha512-u5iz+ijIMUlmV8blX82VGFrB9ecnUg5qEt55CMZ/YJEhha+d8qpBfOFuutJ6F/VKRXjZoD33b6uvarpPxcl3RA== + version "4.3.3" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.3.3.tgz#88a7d9ce2e5db561e160ab660bc59cb406a0c41d" + integrity sha512-6h84UD1mmHeuQ9IucX6yzBc+KBYcBBTLYt2CXtY7GYCra6iE5kOm7oM+zuGw/0tjGtbJxjm58OvxSBmogEMCRQ== dependencies: - caniuse-lite "^1.0.30000899" - electron-to-chromium "^1.3.82" - node-releases "^1.0.1" + caniuse-lite "^1.0.30000898" + electron-to-chromium "^1.3.81" + node-releases "^1.0.0-alpha.15" bs-recipes@1.3.4: version "1.3.4" @@ -3168,9 +3173,9 @@ cacache@^10.0.4: y18n "^4.0.0" cacache@^11.0.1, cacache@^11.2.0: - version "11.3.1" - resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.3.1.tgz#d09d25f6c4aca7a6d305d141ae332613aa1d515f" - integrity sha512-2PEw4cRRDu+iQvBTTuttQifacYjLPhET+SYO/gEFMy8uhi+jlJREDAjSF5FWSdV/Aw5h18caHA7vMTw2c+wDzA== + version "11.2.0" + resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.2.0.tgz#617bdc0b02844af56310e411c0878941d5739965" + integrity sha512-IFWl6lfK6wSeYCHUXh+N1lY72UDrpyrYQJNIVQf48paDuWbv5RbAtJYf/4gUQFObTCHZwdZ5sI8Iw7nqwP6nlQ== dependencies: bluebird "^3.5.1" chownr "^1.0.1" @@ -3350,14 +3355,14 @@ caniuse-api@^3.0.0: lodash.uniq "^4.5.0" caniuse-db@^1.0.30000187, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639: - version "1.0.30000911" - resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000911.tgz#76262de497a6d914594201eccc10a4d6c5020f98" - integrity sha512-TrcnJ/w8DA7ZCXbZ2/EPgBmZtkYQAPegRovKpB0BJmDsf86ZoQM/CizblSeNt0TZBxqgeHmj+eElPe33fAGwdw== + version "1.0.30000899" + resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000899.tgz#f66d667d507c2aa19603a4a3763d71aa89cc360f" + integrity sha512-MSCUohyoLU4/PGapapw/PLQkmQ+sFgzX6e3tM6ue8HX9HW9rBD5gRiAYKhC8r0QkvUE0pWTA8Ze6f3jrzBizVg== -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000898, caniuse-lite@^1.0.30000899: - version "1.0.30000911" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000911.tgz#5dfb8139ee479722da27000ca92dec47913b9605" - integrity sha512-x/E/SNwD80I0bT+fF9Y3Kbwo7Xd1xSafCAmFlpJmaVg3SQoJJOH4Ivb9fi9S0WjfqewQ6Ydt1zEVZpmMVYNeDA== +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000898: + version "1.0.30000899" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000899.tgz#6febdbbc388a7982f620ee0e3d09aab0c061389e" + integrity sha512-enC3zKfUCJxxwvUIsBkbHd54CtJw1KtIWvrK0JZxWD/fEN2knHaai45lndJ4xXAkyRAPyk60J3yagkKDWhfeMA== capture-exit@^1.2.0: version "1.2.0" @@ -3635,7 +3640,7 @@ chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.3, chokidar@^2.0.4: optionalDependencies: fsevents "^1.2.2" -chownr@^1.0.1, chownr@^1.1.1: +chownr@^1.0.1: version "1.1.1" resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494" integrity sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g== @@ -4181,44 +4186,44 @@ content-type@~1.0.4: integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== conventional-changelog-angular@^5.0.1: - version "5.0.2" - resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-5.0.2.tgz#39d945635e03b6d0c9d4078b1df74e06163dc66a" - integrity sha512-yx7m7lVrXmt4nKWQgWZqxSALEiAKZhOAcbxdUaU9575mB0CzXVbgrgpfSnSP7OqWDUTYGD0YVJ0MSRdyOPgAwA== + version "5.0.1" + resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-5.0.1.tgz#f96431b76de453333a909decd02b15cb5bd2d364" + integrity sha512-q4ylJ68fWZDdrFC9z4zKcf97HW6hp7Mo2YlqD4owfXhecFKy/PJCU/1oVFF4TqochchChqmZ0Vb0e0g8/MKNlA== dependencies: compare-func "^1.3.1" q "^1.5.1" conventional-changelog-core@^3.1.0: - version "3.1.5" - resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-3.1.5.tgz#c2edf928539308b54fe1b90a2fc731abc021852c" - integrity sha512-iwqAotS4zk0wA4S84YY1JCUG7X3LxaRjJxuUo6GI4dZuIy243j5nOg/Ora35ExT4DOiw5dQbMMQvw2SUjh6moQ== + version "3.1.0" + resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-3.1.0.tgz#96a81bb3301b4b2a3dc2851cc54c5fb674ac1942" + integrity sha512-bcZkcFXkqVgG2W8m/1wjlp2wn/BKDcrPgw3/mvSEQtzs8Pax8JbAPFpEQReHY92+EKNNXC67wLA8y2xcNx0rDA== dependencies: - conventional-changelog-writer "^4.0.2" - conventional-commits-parser "^3.0.1" + conventional-changelog-writer "^4.0.0" + conventional-commits-parser "^3.0.0" dateformat "^3.0.0" get-pkg-repo "^1.0.0" - git-raw-commits "2.0.0" + git-raw-commits "^2.0.0" git-remote-origin-url "^2.0.0" - git-semver-tags "^2.0.2" + git-semver-tags "^2.0.0" lodash "^4.2.1" normalize-package-data "^2.3.5" q "^1.5.1" - read-pkg "^3.0.0" - read-pkg-up "^3.0.0" + read-pkg "^1.1.0" + read-pkg-up "^1.0.1" through2 "^2.0.0" -conventional-changelog-preset-loader@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.0.2.tgz#81d1a07523913f3d17da3a49f0091f967ad345b0" - integrity sha512-pBY+qnUoJPXAXXqVGwQaVmcye05xi6z231QM98wHWamGAmu/ghkBprQAwmF5bdmyobdVxiLhPY3PrCfSeUNzRQ== +conventional-changelog-preset-loader@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.0.1.tgz#d134734e0cc1b91b88b30586c5991f31442029f1" + integrity sha512-HiSfhXNzAzG9klIqJaA97MMiNBR4js+53g4Px0k7tgKeCNVXmrDrm+CY+nIqcmG5NVngEPf8rAr7iji1TWW7zg== -conventional-changelog-writer@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-4.0.2.tgz#eb493ed84269e7a663da36e49af51c54639c9a67" - integrity sha512-d8/FQY/fix2xXEBUhOo8u3DCbyEw3UOQgYHxLsPDw+wHUDma/GQGAGsGtoH876WyNs32fViHmTOUrgRKVLvBug== +conventional-changelog-writer@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-4.0.0.tgz#3ed983c8ef6a3aa51fe44e82c9c75e86f1b5aa42" + integrity sha512-hMZPe0AQ6Bi05epeK/7hz80xxk59nPA5z/b63TOHq2wigM0/akreOc8N4Jam5b9nFgKWX1e9PdPv2ewgW6bcfg== dependencies: compare-func "^1.3.1" - conventional-commits-filter "^2.0.1" + conventional-commits-filter "^2.0.0" dateformat "^3.0.0" handlebars "^4.0.2" json-stringify-safe "^5.0.1" @@ -4228,18 +4233,18 @@ conventional-changelog-writer@^4.0.2: split "^1.0.0" through2 "^2.0.0" -conventional-commits-filter@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-2.0.1.tgz#55a135de1802f6510b6758e0a6aa9e0b28618db3" - integrity sha512-92OU8pz/977udhBjgPEbg3sbYzIxMDFTlQT97w7KdhR9igNqdJvy8smmedAAgn4tPiqseFloKkrVfbXCVd+E7A== +conventional-commits-filter@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-2.0.0.tgz#a0ce1d1ff7a1dd7fab36bee8e8256d348d135651" + integrity sha512-Cfl0j1/NquB/TMVx7Wrmyq7uRM+/rPQbtVVGwzfkhZ6/yH6fcMmP0Q/9044TBZPTNdGzm46vXFXL14wbET0/Mg== dependencies: is-subset "^0.1.1" modify-values "^1.0.0" -conventional-commits-parser@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.0.1.tgz#fe1c49753df3f98edb2285a5e485e11ffa7f2e4c" - integrity sha512-P6U5UOvDeidUJ8ebHVDIoXzI7gMlQ1OF/id6oUvp8cnZvOXMt1n8nYl74Ey9YMn0uVQtxmCtjPQawpsssBWtGg== +conventional-commits-parser@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.0.0.tgz#7f604549a50bd8f60443fbe515484b1c2f06a5c4" + integrity sha512-GWh71U26BLWgMykCp+VghZ4s64wVbtseECcKQ/PvcPZR2cUnz+FUc2J9KjxNl7/ZbCxST8R03c9fc+Vi0umS9Q== dependencies: JSONStream "^1.0.4" is-text-path "^1.0.0" @@ -4250,16 +4255,16 @@ conventional-commits-parser@^3.0.1: trim-off-newlines "^1.0.0" conventional-recommended-bump@^4.0.1: - version "4.0.4" - resolved "https://registry.yarnpkg.com/conventional-recommended-bump/-/conventional-recommended-bump-4.0.4.tgz#05540584641d3da758c8863c09788fcaeb586872" - integrity sha512-9mY5Yoblq+ZMqJpBzgS+RpSq+SUfP2miOR3H/NR9drGf08WCrY9B6HAGJZEm6+ThsVP917VHAahSOjM6k1vhPg== + version "4.0.1" + resolved "https://registry.yarnpkg.com/conventional-recommended-bump/-/conventional-recommended-bump-4.0.1.tgz#304a45a412cfec050a10ea2e7e4a89320eaf3991" + integrity sha512-9waJvW01TUs4HQJ3khwGSSlTlKsY+5u7OrxHL+oWEoGNvaNO/0qL6qqnhS3J0Fq9fNKA9bmlf5cOXjCQoW+I4Q== dependencies: concat-stream "^1.6.0" - conventional-changelog-preset-loader "^2.0.2" - conventional-commits-filter "^2.0.1" - conventional-commits-parser "^3.0.1" - git-raw-commits "2.0.0" - git-semver-tags "^2.0.2" + conventional-changelog-preset-loader "^2.0.1" + conventional-commits-filter "^2.0.0" + conventional-commits-parser "^3.0.0" + git-raw-commits "^2.0.0" + git-semver-tags "^2.0.0" meow "^4.0.0" q "^1.5.1" @@ -4308,9 +4313,9 @@ copy-descriptor@^0.1.0: integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= copy-webpack-plugin@^4.5.2: - version "4.6.0" - resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.6.0.tgz#e7f40dd8a68477d405dd1b7a854aae324b158bae" - integrity sha512-Y+SQCF+0NoWQryez2zXn5J5knmr9z/9qSQt7fbL78u83rxmigOy8X5+BFn8CFSuX+nKT8gpYwJX68ekqtQt6ZA== + version "4.5.4" + resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.5.4.tgz#f2b2782b3cd5225535c3dc166a80067e7d940f27" + integrity sha512-0lstlEyj74OAtYMrDxlNZsU7cwFijAI3Ofz2fD6Mpo9r4xCv4yegfa3uHIKvZY1NSuOtE9nvG6TAhJ+uz9gDaQ== dependencies: cacache "^10.0.4" find-cache-dir "^1.0.0" @@ -4891,7 +4896,7 @@ decamelize-keys@^1.0.0: decamelize "^1.1.0" map-obj "^1.0.0" -decamelize@^1.0.0, decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.1.2, decamelize@^1.2.0: +decamelize@^1.0.0, decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.1.2: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= @@ -5203,7 +5208,14 @@ doctrine@^2.1.0: dependencies: esutils "^2.0.2" -document-register-element@^1.11.1, document-register-element@^1.12.0: +document-register-element@^1.11.1: + version "1.12.0" + resolved "https://registry.yarnpkg.com/document-register-element/-/document-register-element-1.12.0.tgz#ee9d4808fda9af5091927df1589292eec45acb01" + integrity sha512-LFe6EoJUOdg0xSDio8zYq0C7iX83fr+R3Wiqv88OzYAL5FQV5NrDMO36jTfLwwoP1/4OoEDj49vAGkwmnd/n8Q== + dependencies: + lightercollective "^0.1.0" + +document-register-element@^1.12.0: version "1.13.1" resolved "https://registry.yarnpkg.com/document-register-element/-/document-register-element-1.13.1.tgz#dad8cb7be38e04ee3f56842e6cf81af46c1249ba" integrity sha512-92ZyLDKg9j4rOll//NNXj25f+8rAzOkYsGJonhugKwXfeqH7bzs8Ucpvey0WzZ2ZzKdrvW9RnUw3UyOZ/uhBFw== @@ -5353,9 +5365,9 @@ dotdir-regex@^0.1.0: integrity sha1-1F30yIY75vVZPXFpFDgXZ+k4wLY= drift-zoom@^1.2.0: - version "1.3.3" - resolved "https://registry.yarnpkg.com/drift-zoom/-/drift-zoom-1.3.3.tgz#bd9b281a70aaf05a2c1f1cd002d3e700072d0089" - integrity sha512-UnU0zBMfBV9v0QE/MqCRuLeKNrV13S7Ga+CVHlRClHI/wB0vc6ZU/I1sePGRk+SBXlov492JatXI/cT0BSMIHg== + version "1.3.2" + resolved "https://registry.yarnpkg.com/drift-zoom/-/drift-zoom-1.3.2.tgz#76e6641569936b57853551cc842373472ab5eac4" + integrity sha512-yrHxOngftItuHzwe7/UYDOeltxN4OCa7s/VSnYgECu8sO0T4zvH16pgNz0B+TKdL2IJs69vo1QrvtpXBrcnZRg== duplexer2@0.0.2: version "0.0.2" @@ -5441,10 +5453,10 @@ ejs@^2.5.9: resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.6.1.tgz#498ec0d495655abc6f23cd61868d926464071aa0" integrity sha512-0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ== -electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.82: - version "1.3.85" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.85.tgz#5c46f790aa96445cabc57eb9d17346b1e46476fe" - integrity sha512-kWSDVVF9t3mft2OHVZy4K85X2beP6c6mFm3teFS/mLSDJpQwuFIWHrULCX+w6H1E55ZYmFRlT+ATAFRwhrYzsw== +electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.81: + version "1.3.82" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.82.tgz#7d13ae4437d2a783de3f4efba96b186c540b67b1" + integrity sha512-NI4nB2IWGcU4JVT1AE8kBb/dFor4zjLHMLsOROPahppeHrR0FG5uslxMmkp/thO1MvPjM2xhlKoY29/I60s0ew== element-closest@^2.0.2: version "2.0.2" @@ -5713,9 +5725,9 @@ eslint-config-prettier@^2.9.0: get-stdin "^5.0.1" eslint-config-prettier@^3.0.1: - version "3.3.0" - resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-3.3.0.tgz#41afc8d3b852e757f06274ed6c44ca16f939a57d" - integrity sha512-Bc3bh5bAcKNvs3HOpSi6EfGA2IIp7EzWcg2tS4vP7stnXu/J1opihHDM7jI9JCIckyIDTgZLSWn7J3HY0j2JfA== + version "3.1.0" + resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-3.1.0.tgz#2c26d2cdcfa3a05f0642cd7e6e4ef3316cdabfa2" + integrity sha512-QYGfmzuc4q4J6XIhlp8vRKdI/fI0tQfQPy1dME3UOLprE+v4ssH/3W9LM2Q7h5qBcy5m0ehCrBDU2YF8q6OY8w== dependencies: get-stdin "^6.0.0" @@ -5866,9 +5878,9 @@ eslint@^4.19.1: text-table "~0.2.0" eslint@^5.5.0: - version "5.9.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.9.0.tgz#b234b6d15ef84b5849c6de2af43195a2d59d408e" - integrity sha512-g4KWpPdqN0nth+goDNICNXGfJF7nNnepthp46CAlJoJtC5K/cLu3NgCM3AHu1CkJ5Hzt9V0Y0PBAO6Ay/gGb+w== + version "5.8.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.8.0.tgz#91fbf24f6e0471e8fdf681a4d9dd1b2c9f28309b" + integrity sha512-Zok6Bru3y2JprqTNm14mgQ15YQu/SMDkWdnmHfFg770DIUlmMFd/gqqzCHekxzjHZJxXv3tmTpH0C1icaYJsRQ== dependencies: "@babel/code-frame" "^7.0.0" ajv "^6.5.3" @@ -6269,15 +6281,15 @@ fast-diff@^1.1.1: integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w== fast-glob@^2.0.2: - version "2.2.4" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.4.tgz#e54f4b66d378040e0e4d6a68ec36bbc5b04363c0" - integrity sha512-FjK2nCGI/McyzgNtTESqaWP3trPvHyRyoyY70hxjc3oKPNmDe8taohLZpoVKoUjW85tbU5txaYUZCNtVzygl1g== + version "2.2.3" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.3.tgz#d09d378e9ef6b0076a0fa1ba7519d9d4d9699c28" + integrity sha512-NiX+JXjnx43RzvVFwRWfPKo4U+1BrK5pJPsHQdKMlLoFHrrGktXglQhHliSihWAq+m1z6fHk3uwGHrtRbS9vLA== dependencies: "@mrmlnc/readdir-enhanced" "^2.2.1" - "@nodelib/fs.stat" "^1.1.2" + "@nodelib/fs.stat" "^1.0.1" glob-parent "^3.1.0" is-glob "^4.0.0" - merge2 "^1.2.3" + merge2 "^1.2.1" micromatch "^3.1.10" fast-json-stable-stringify@^2.0.0: @@ -6595,9 +6607,9 @@ flush-write-stream@^1.0.0: readable-stream "^2.0.4" follow-redirects@^1.0.0, follow-redirects@^1.2.5: - version "1.5.10" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a" - integrity sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ== + version "1.5.9" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.9.tgz#c9ed9d748b814a39535716e531b9196a845d89c6" + integrity sha512-Bh65EZI/RU8nx0wbYF9shkFZlqLP+6WT/5FnA3cE/djNSuKNHJEinGGZgu/cQEkeeb2GdFOgenAmn8qaqYke2w== dependencies: debug "=3.1.0" @@ -6985,7 +6997,7 @@ getpass@^0.1.1: dependencies: assert-plus "^1.0.0" -git-raw-commits@2.0.0: +git-raw-commits@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-2.0.0.tgz#d92addf74440c14bcc5c83ecce3fb7f8a79118b5" integrity sha512-w4jFEJFgKXMQJ0H0ikBk2S+4KP2VEjhCvLCNqbNRQC8BgGWgLKNCO7a9K9LI+TVT7Gfoloje502sEnctibffgg== @@ -7004,10 +7016,10 @@ git-remote-origin-url@^2.0.0: gitconfiglocal "^1.0.0" pify "^2.3.0" -git-semver-tags@^2.0.0, git-semver-tags@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-2.0.2.tgz#f506ec07caade191ac0c8d5a21bdb8131b4934e3" - integrity sha512-34lMF7Yo1xEmsK2EkbArdoU79umpvm0MfzaDkSNYSJqtM5QLAVTPWgpiXSVI5o/O9EvZPSrP4Zvnec/CqhSd5w== +git-semver-tags@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-2.0.0.tgz#c218fd895bdf8e8e02f6bde555b2c3893ac73cd7" + integrity sha512-lSgFc3zQTul31nFje2Q8XdNcTOI6B4I3mJRPCgFzHQQLfxfqdWTYzdtCaynkK5Xmb2wQlSJoKolhXJ1VhKROnQ== dependencies: meow "^4.0.0" semver "^5.5.0" @@ -7223,9 +7235,9 @@ global-prefix@^1.0.1: which "^1.2.14" globals@^11.0.1, globals@^11.1.0, globals@^11.7.0: - version "11.9.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-11.9.0.tgz#bde236808e987f290768a93d065060d78e6ab249" - integrity sha512-5cJVtyXWH8PiJPVLZzzoIizXx944O4OmRro5MWKx5fT4MgcN7OfaMutPeaTdJCCURwbWdhhcCWcKIffPnmTzBg== + version "11.8.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-11.8.0.tgz#c1ef45ee9bed6badf0663c5cb90e8d1adec1321d" + integrity sha512-io6LkyPVuzCHBSQV9fmOwxZkUk6nIaGmxheLDgmuFv89j0fm2aqDbIXKAGfzCMHqz3HLF2Zf8WSG6VqMh2qFmA== globals@^9.18.0: version "9.18.0" @@ -7766,7 +7778,7 @@ html-loader@^0.5.5: loader-utils "^1.1.0" object-assign "^4.1.1" -html-minifier@^3.2.3, html-minifier@^3.3.1, html-minifier@^3.5.8: +html-minifier@^3.2.3, html-minifier@^3.3.1, html-minifier@^3.5.20, html-minifier@^3.5.8: version "3.5.21" resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.21.tgz#d0040e054730e354db008463593194015212d20c" integrity sha512-LKUKwuJDhxNa3uf/LPR/KVjm/l3rBqtYeCOAekvG8F1vItxMUpueGd94i/asDDr8/1u7InxzFA5EeGjhhG5mMA== @@ -7810,12 +7822,11 @@ html-webpack-plugin@^3.2.0: version "4.0.0-beta" resolved "https://codeload.github.com/jantimon/html-webpack-plugin/tar.gz/7fb656a2dfdf129162f993a260f3291336b17ff1" dependencies: - "@types/tapable" "1.0.2" - html-minifier "^3.2.3" + html-minifier "^3.5.20" loader-utils "^1.1.0" - lodash "^4.17.10" - pretty-error "^2.0.2" - tapable "^1.0.0" + lodash "^4.17.11" + pretty-error "^2.1.1" + tapable "^1.1.0" util.promisify "1.0.0" htmlparser2@3.8.x, htmlparser2@~3.8.1: @@ -8034,16 +8045,11 @@ ignore@^3.2.0, ignore@^3.3.3, ignore@^3.3.5: resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043" integrity sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug== -ignore@^4.0.6: +ignore@^4.0.0, ignore@^4.0.6: version "4.0.6" resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== -ignore@^5.0.4: - version "5.0.4" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.0.4.tgz#33168af4a21e99b00c5d41cbadb6a6cb49903a45" - integrity sha512-WLsTMEhsQuXpCiG173+f3aymI43SXa+fB1rSfbzyP4GkPP+ZFVuO0/3sFUGNBtifisPeDcl/uD/Y2NxZ7xFq4g== - immutability-helper@^2.7.1: version "2.8.1" resolved "https://registry.yarnpkg.com/immutability-helper/-/immutability-helper-2.8.1.tgz#3c5ec05fcd83676bfae7146f319595243ad904f4" @@ -8820,9 +8826,9 @@ isarray@2.0.1: integrity sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4= isbot@^2.0.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/isbot/-/isbot-2.2.1.tgz#6c187c52122e5a2cd4d023b0215ffe6ade31c1b7" - integrity sha512-z0idtpC0uKKKTBhd1g73GREBWhCQdnJq8U5o+8XhgPvuPiRb/vkpNreLvtoneaZX9FNxDFOU0ohEj9hTWm/tPw== + version "2.2.0" + resolved "https://registry.yarnpkg.com/isbot/-/isbot-2.2.0.tgz#89b4d84a8d709496371b4ea0a55f242bee7612fd" + integrity sha512-tUgpHpQBuFvWnvJHUQUsuaZwyJnpbKTLoAffCPCdHFF9BYynSy27s6O0PHjFFqatQ82IDW2IAvJ7oF3wqroipA== iselement@^1.1.3: version "1.1.4" @@ -9381,7 +9387,7 @@ jsesc@^1.3.0: resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b" integrity sha1-RsP+yMGJKxKwgz25vHYiF226s0s= -jsesc@^2.5.1, jsesc@^2.5.2: +jsesc@^2.5.1: version "2.5.2" resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA== @@ -9466,13 +9472,6 @@ json5@^0.5.0, json5@^0.5.1: resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE= -json5@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.0.tgz#e7a0c62c48285c628d20a10b85c89bb807c32850" - integrity sha512-8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ== - dependencies: - minimist "^1.2.0" - jsondiffpatch@^0.2.5: version "0.2.5" resolved "https://registry.yarnpkg.com/jsondiffpatch/-/jsondiffpatch-0.2.5.tgz#50361d995cf8c86137e8d5589f20fa5220db3511" @@ -9626,10 +9625,10 @@ known-css-properties@^0.2.0: resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.2.0.tgz#899c94be368e55b42d7db8d5be7d73a4a4a41454" integrity sha512-UTCzU28rRI9wkb8qSGoZa9pgWvxr4LjP2MEhi9XHb/1XMOJy0uTnIxaxzj8My/PORG+kQG6VzAcGvRw66eIOfA== -known-css-properties@^0.9.0: - version "0.9.0" - resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.9.0.tgz#28f8a7134cfa3b0aa08b1e5edf64a57f64fc23af" - integrity sha512-2G/A/8XPhH6MmuVgl079wYsgdqfXE3cfm62txk/ajS4wvRWo6tEHcgQCJCHOOy12Fse1Sxlbf7/IJBpR9hnVew== +known-css-properties@^0.8.0: + version "0.8.0" + resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.8.0.tgz#2f62aaab90ece0c788d0c49e08c1e5d9b689238d" + integrity sha512-pku5zscbIr9YsA6lFU1nhFGSAXsdJtEQ2WilCL40d0YCoDofBlNohMUq32wyt7tpiiaZ09GKyLZFrB1ijx6+WA== last-call-webpack-plugin@^3.0.0: version "3.0.0" @@ -9761,9 +9760,9 @@ levn@^0.3.0, levn@~0.3.0: type-check "~0.3.2" libnpmaccess@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/libnpmaccess/-/libnpmaccess-3.0.1.tgz#5b3a9de621f293d425191aa2e779102f84167fa8" - integrity sha512-RlZ7PNarCBt+XbnP7R6PoVgOq9t+kou5rvhaInoNibhPO7eMlRfS0B8yjatgn2yaHIwWNyoJDolC/6Lc5L/IQA== + version "3.0.0" + resolved "https://registry.yarnpkg.com/libnpmaccess/-/libnpmaccess-3.0.0.tgz#33cc9c8a5cb53e87d06bf2e547c2eba974f619af" + integrity sha512-SiE4AZAzMpD7pmmXHfgD7rof8QIQGoKaeyAS8exgx2CKA6tzRTbRljq1xM4Tgj8/tIg+KBJPJWkR0ifqKT3irQ== dependencies: aproba "^2.0.0" get-stream "^4.0.0" @@ -10502,9 +10501,9 @@ marked@^0.3.19: integrity sha512-ea2eGWOqNxPcXv8dyERdSr/6FmzvWwzjMxpfGB/sbMccXoct+xY+YukPD+QTUZwyvK7BZwcr4m21WBOW41pAkg== marked@^0.5.0: - version "0.5.2" - resolved "https://registry.yarnpkg.com/marked/-/marked-0.5.2.tgz#3efdb27b1fd0ecec4f5aba362bddcd18120e5ba9" - integrity sha512-fdZvBa7/vSQIZCi4uuwo2N3q+7jJURpMVCcbaX0S1Mg65WZ5ilXvC67MviJAsdjqqgD+CEq4RKo5AYGgINkVAA== + version "0.5.1" + resolved "https://registry.yarnpkg.com/marked/-/marked-0.5.1.tgz#062f43b88b02ee80901e8e8d8e6a620ddb3aa752" + integrity sha512-iUkBZegCZou4AdwbKTwSW/lNDcz5OuRSl3qdcl31Ia0B2QPG0Jn+tKblh/9/eP9/6+4h27vpoh8wel/vQOV0vw== math-random@^1.0.1: version "1.0.1" @@ -10651,7 +10650,7 @@ merge-stream@^1.0.0, merge-stream@^1.0.1: dependencies: readable-stream "^2.0.1" -merge2@^1.2.3: +merge2@^1.2.1: version "1.2.3" resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.3.tgz#7ee99dbd69bb6481689253f018488a1b902b0ed5" integrity sha512-gdUU1Fwj5ep4kplwcmftruWofEFt6lfpkkr3h860CXbAB9c3hGb55EOL2ali0Td5oebvW0E1+3Sr+Ur7XfKpRA== @@ -10776,9 +10775,9 @@ mimic-response@^1.0.0, mimic-response@^1.0.1: integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ== mini-css-extract-plugin@^0.4.1, mini-css-extract-plugin@^0.4.2: - version "0.4.5" - resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.4.5.tgz#c99e9e78d54f3fa775633aee5933aeaa4e80719a" - integrity sha512-dqBanNfktnp2hwL2YguV9Jh91PFX7gu7nRLs4TGsbAfAG6WOtlynFRYzwDwmmeSb5uIwHo9nx1ta0f7vAZVp2w== + version "0.4.4" + resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.4.4.tgz#c10410a004951bd3cedac1da69053940fccb625d" + integrity sha512-o+Jm+ocb0asEngdM6FsZWtZsRzA8koFUudIDwYUfl94M3PejPHG7Vopw5hN9V8WsMkSFpm3tZP3Fesz89EyrfQ== dependencies: loader-utils "^1.1.0" schema-utils "^1.0.0" @@ -10836,7 +10835,7 @@ minimist@~0.0.1: resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf" integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8= -minipass@^2.2.1, minipass@^2.3.4, minipass@^2.3.5: +minipass@^2.2.1, minipass@^2.3.3, minipass@^2.3.5: version "2.3.5" resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848" integrity sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA== @@ -10844,10 +10843,10 @@ minipass@^2.2.1, minipass@^2.3.4, minipass@^2.3.5: safe-buffer "^5.1.2" yallist "^3.0.0" -minizlib@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.1.1.tgz#6734acc045a46e61d596a43bb9d9cd326e19cc42" - integrity sha512-TrfjCjk4jLhcJyGMYymBH6oTXcWjYbUAXTHDbtnWHjZC25h0cdajHuPE1zxb4DVmu8crfh+HwH/WMuyLG0nHBg== +minizlib@^1.1.0: + version "1.2.1" + resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.2.1.tgz#dd27ea6136243c7c880684e8672bb3a45fd9b614" + integrity sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA== dependencies: minipass "^2.2.1" @@ -11094,9 +11093,9 @@ nice-try@^1.0.4: integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== nightwatch@^1.0.8: - version "1.0.14" - resolved "https://registry.yarnpkg.com/nightwatch/-/nightwatch-1.0.14.tgz#96d9df2118ab5a795c395e6c2dabc0adc347ae5b" - integrity sha512-SXJk0BtXAWslcdByueESJ8a265rshGfllCPy9yPdAEGhIjSKsaMw1ASPn+q+msFhpOYRKEjoQ+Qu9e4SlSz2xQ== + version "1.0.11" + resolved "https://registry.yarnpkg.com/nightwatch/-/nightwatch-1.0.11.tgz#6829c1aa87f6e939ce77c64b35e1aef5d0ed5e62" + integrity sha512-vEAit4rVgufCAyaqQ6Cxs29A9cBNEKeXxWcPFXrG/AOp+19Vz2K6shoNTwpbdNpDDbp7Pjy1YnvjlG9aQrCsmQ== dependencies: assertion-error "^1.1.0" chai-nightwatch "0.2.1" @@ -11126,9 +11125,9 @@ no-emit-webpack-plugin@^1.0.0: schema-utils "^0.4.3" node-abi@^2.2.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.5.0.tgz#942e1a78bce764bc0c1672d5821e492b9d032052" - integrity sha512-9g2twBGSP6wIR5PW7tXvAWnEWKJDH/VskdXp168xsw9VVxpEGov8K4jsP4/VeoC7b2ZAyzckvMCuQuQlw44lXg== + version "2.4.5" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.4.5.tgz#1fd1fb66641bf3c4dcf55a5490ba10c467ead80c" + integrity sha512-aa/UC6Nr3+tqhHGRsAuw/edz7/q9nnetBrKWxj6rpTtm+0X9T1qU7lIEHMS3yN9JwAbRiKUbRRFy1PLz/y3aaA== dependencies: semver "^5.4.1" @@ -11266,10 +11265,10 @@ node-pre-gyp@^0.10.0: semver "^5.3.0" tar "^4" -node-releases@^1.0.1: - version "1.0.4" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.0.4.tgz#2d585de8c6c81d00017e063e7810a63889aa6756" - integrity sha512-GqRV9GcHw8JCRDaP/JoeNMNzEGzHAknMvIHqMb2VeTOmg1Cf9+ej8bkV12tHfzWHQMCkQ5zUFgwFUkfraynNCw== +node-releases@^1.0.0-alpha.15: + version "1.0.0-alpha.15" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.0.0-alpha.15.tgz#bdb08730287cc50ddbfa3c1a358366a4a2f5d397" + integrity sha512-hKG6hd/g6a9OV/ARt2qrxbRhe/4WEMFohTLOB9PNyTYvvI59gICZFzt9/mMgpYUTts06qXlN8H6UjfbIRdnW8A== dependencies: semver "^5.3.0" @@ -11310,9 +11309,9 @@ node-sass-selector-importer@^5.2.0: postcss-scss "^1.0.2" node-sass@^4.5.3, node-sass@^4.9.0, node-sass@^4.9.3: - version "4.10.0" - resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.10.0.tgz#dcc2b364c0913630945ccbf7a2bbf1f926effca4" - integrity sha512-fDQJfXszw6vek63Fe/ldkYXmRYK/QS6NbvM3i5oEo9ntPDy4XX7BcKZyTKv+/kSSxRtXXc7l+MSwEmYc0CSy6Q== + version "4.9.4" + resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.9.4.tgz#349bd7f1c89422ffe7e1e4b60f2055a69fbc5512" + integrity sha512-MXyurANsUoE4/6KmfMkwGcBzAnJQ5xJBGW7Ei6ea8KnUKuzHr/SguVBIi3uaUAHtZCPUYkvlJ3Ef5T5VAwVpaA== dependencies: async-foreach "^0.1.3" chalk "^1.1.1" @@ -11340,15 +11339,15 @@ node-status-codes@^1.0.0: integrity sha1-WuVUHQJGRdMqWPzdyc7s6nrjrC8= nodemon@^1.15.1: - version "1.18.7" - resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.18.7.tgz#716b66bf3e89ac4fcfb38a9e61887a03fc82efbb" - integrity sha512-xuC1V0F5EcEyKQ1VhHYD13owznQbUw29JKvZ8bVH7TmuvVNHvvbp9pLgE4PjTMRJVe0pJ8fGRvwR2nMiosIsPQ== + version "1.18.5" + resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.18.5.tgz#3d3924df23d06806952e8b6d3de052f2a3351807" + integrity sha512-8806dC8dfBlbxQmqNOSEeay/qlbddKvFzxIGNxnPtxUlTtH77xsrC66RnA3M47HCSgMgE5bj+U586o50RowXBg== dependencies: chokidar "^2.0.4" debug "^3.1.0" ignore-by-default "^1.0.1" minimatch "^3.0.4" - pstree.remy "^1.1.2" + pstree.remy "^1.1.0" semver "^5.5.0" supports-color "^5.2.0" touch "^3.1.0" @@ -11482,11 +11481,6 @@ normalize-url@^3.0.0, normalize-url@^3.1.0: resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559" integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg== -now@^12.1.0: - version "12.1.6" - resolved "https://registry.yarnpkg.com/now/-/now-12.1.6.tgz#70a2a46d22feac85eb4c763223f9498d02f9e2f6" - integrity sha512-sTdRnRez47Qf+zhoj6yrVHw/JWjadjilj+gD54gyxspz48c/RpHvuKmgQ5OeX1NuK/JaOzJgtGBHgDNlewCbUw== - npm-bundled@^1.0.1: version "1.0.5" resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.5.tgz#3c1732b7ba936b3a10325aef616467c0ccbcc979" @@ -11524,7 +11518,7 @@ npm-packlist@^1.1.12, npm-packlist@^1.1.6: ignore-walk "^3.0.1" npm-bundled "^1.0.1" -npm-pick-manifest@^2.2.3: +npm-pick-manifest@^2.1.0: version "2.2.3" resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-2.2.3.tgz#32111d2a9562638bb2c8f2bf27f7f3092c8fae40" integrity sha512-+IluBC5K201+gRU85vFlUwX3PFShZAbAgDNp2ewJdWMVSppdo/Zih0ul2Ecky/X7b51J7LrrUAP+XOmOCvYZqA== @@ -12100,9 +12094,9 @@ package-json@^4.0.0: semver "^5.1.0" pacote@^9.1.0: - version "9.2.3" - resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.2.3.tgz#48cfe87beb9177acd6594355a584a538835424b3" - integrity sha512-Y3+yY3nBRAxMlZWvr62XLJxOwCmG9UmkGZkFurWHoCjqF0cZL72cTOCRJTvWw8T4OhJS2RTg13x4oYYriauvEw== + version "9.1.1" + resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.1.1.tgz#25091f75a25021de8be8d34cc6408728fca3579b" + integrity sha512-f28Rq5ozzKAA9YwIKw61/ipwAatUZseYmVssDbHHaexF0wRIVotapVEZPAjOT7Eu3LYVqEp0NVpNizoAnYBUaA== dependencies: bluebird "^3.5.2" cacache "^11.2.0" @@ -12118,7 +12112,7 @@ pacote@^9.1.0: normalize-package-data "^2.4.0" npm-package-arg "^6.1.0" npm-packlist "^1.1.12" - npm-pick-manifest "^2.2.3" + npm-pick-manifest "^2.1.0" npm-registry-fetch "^3.8.0" osenv "^0.1.5" promise-inflight "^1.0.1" @@ -12381,15 +12375,15 @@ pend@~1.2.0: integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA= penthouse@^1.6.2, penthouse@^1.8.0: - version "1.10.2" - resolved "https://registry.yarnpkg.com/penthouse/-/penthouse-1.10.2.tgz#a3dabe981d4034032a94b4e7eae5bea56ae7b892" - integrity sha512-RgUVXpO/AAIA8GBesA/P/8S4XbxT0bLaA74+Oy4/iigIgWL3SlU5vdHNYH/VyneAYU56rbc9FkesjIVQGJwpng== + version "1.9.2" + resolved "https://registry.yarnpkg.com/penthouse/-/penthouse-1.9.2.tgz#6595c6750aa0b0c2cfb65caa1940a99b9e283a21" + integrity sha512-afQ1DV5wjX5ZhA1cEuKKx9CMkoZTgdo2adACZAYXxxBBKtjroawzDr3kGx83hvESp7heH9dRR8HmL7VE+LL+dg== dependencies: css-mediaquery "^0.1.2" css-tree "1.0.0-alpha.28" debug "^4.1.0" - jsesc "^2.5.2" - puppeteer "1.10.0" + jsesc "^2.5.1" + puppeteer "1.9.0" performance-now@^2.1.0: version "2.1.0" @@ -12628,12 +12622,12 @@ postcss-image-inliner@^2.0.0: svgo "^1.0.3" then-fs "2.0.0" -postcss-jsx@^0.35.0: - version "0.35.0" - resolved "https://registry.yarnpkg.com/postcss-jsx/-/postcss-jsx-0.35.0.tgz#1d6cb82393994cdc7e9aa421648e3f0f3f98209b" - integrity sha512-AU2/9QDmHYJRxTiniMt2bJ9fwCzVF6n00VnR4gdnFGHeXRW2mGwoptpuPgYjfivkdI8LlNIuo+w8TyS6a4JhJw== +postcss-jsx@^0.34.0: + version "0.34.0" + resolved "https://registry.yarnpkg.com/postcss-jsx/-/postcss-jsx-0.34.0.tgz#5a122af914f911fab4a9b8fcf3adc73c2dfe1bdd" + integrity sha512-UJISlEGWH/LeMYudAwq9GeqfyPW9AeRq87GHOlbquxOIakKr0Aqu6l9Cx0Fg20f3A9bKJcX1NGX4/xzIs7PlZQ== dependencies: - "@babel/core" "^7.1.2" + "@babel/core" "^7.0.0" optionalDependencies: postcss-styled ">=0.34.0" @@ -12644,12 +12638,12 @@ postcss-less@^0.14.0: dependencies: postcss "^5.0.21" -postcss-less@^3.0.1: - version "3.1.0" - resolved "https://registry.yarnpkg.com/postcss-less/-/postcss-less-3.1.0.tgz#0e14a80206b452f44d3a09d082fa72645e8168cc" - integrity sha512-+fDH2A9zV8B4gFu3Idhq8ma09/mMBXXc03T2lL9CHjBQqKrfUit+TrQrnojc6Y4k7N4E+tyE1Uj5U1tcoKtXLQ== +postcss-less@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/postcss-less/-/postcss-less-2.0.0.tgz#5d190b8e057ca446d60fe2e2587ad791c9029fb8" + integrity sha512-pPNsVnpCB13nBMOcl5GVh8JGmB0JGFjqkLUDzKdVpptFFKEe9wFdEzvh2j4lD2AD+7qcrUfw9Ta+oi5+Fw7jjQ== dependencies: - postcss "^7.0.3" + postcss "^5.2.16" postcss-load-config@^2.0.0: version "2.0.0" @@ -12927,7 +12921,7 @@ postcss-safe-parser@^4.0.0: dependencies: postcss "^7.0.0" -postcss-sass@^0.3.5: +postcss-sass@^0.3.0: version "0.3.5" resolved "https://registry.yarnpkg.com/postcss-sass/-/postcss-sass-0.3.5.tgz#6d3e39f101a53d2efa091f953493116d32beb68c" integrity sha512-B5z2Kob4xBxFjcufFnhQ2HqJQ2y/Zs/ic5EZbCywCkxKd756Q40cIQ/veRDwSrw1BF6+4wUgmpm0sBASqVi65A== @@ -13034,10 +13028,10 @@ postcss-value-parser@^3.0.0, postcss-value-parser@^3.1.1, postcss-value-parser@^ resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281" integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ== -postcss@>=5.0.19, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.2, postcss@^7.0.3, postcss@^7.0.5: - version "7.0.6" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.6.tgz#6dcaa1e999cdd4a255dcd7d4d9547f4ca010cdc2" - integrity sha512-Nq/rNjnHFcKgCDDZYO0lNsl6YWe6U7tTy+ESN+PnLxebL8uBtYX59HZqvrj7YLK5UCyll2hqDsJOo3ndzEW8Ug== +postcss@>=5.0.19, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.2, postcss@^7.0.5: + version "7.0.5" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.5.tgz#70e6443e36a6d520b0fd4e7593fcca3635ee9f55" + integrity sha512-HBNpviAUFCKvEh7NZhw1e8MBPivRszIiUnhrJ+sBFVSYSqubrzwX3KG51mYgcRHX8j/cAgZJedONZcm5jTBdgQ== dependencies: chalk "^2.4.1" source-map "^0.6.1" @@ -13145,16 +13139,16 @@ prettier@1.13.7: integrity sha512-KIU72UmYPGk4MujZGYMFwinB7lOf2LsDNGSOC8ufevsrPLISrZbNJlWstRi3m0AMuszbH+EFSQ/r6w56RSPK6w== prettier@^1.12.1, prettier@^1.14.2, prettier@^1.7.4: - version "1.15.2" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.15.2.tgz#d31abe22afa4351efa14c7f8b94b58bb7452205e" - integrity sha512-YgPLFFA0CdKL4Eg2IHtUSjzj/BWgszDHiNQAe0VAIBse34148whfdzLagRL+QiKS+YfK5ftB6X4v/MBw8yCoug== + version "1.14.3" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.14.3.tgz#90238dd4c0684b7edce5f83b0fb7328e48bd0895" + integrity sha512-qZDVnCrnpsRJJq5nSsiHCE3BYMED2OtsI+cmzIzF1QIfqm5ALf8tEJcO27zV1gKNKRPdhjO0dNWnrzssDQ1tFg== pretty-bytes@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-4.0.2.tgz#b2bf82e7350d65c6c33aa95aaa5a4f6327f61cd9" integrity sha1-sr+C5zUNZcbDOqlaqlpPYyf2HNk= -pretty-error@^2.0.2: +pretty-error@^2.0.2, pretty-error@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.1.tgz#5f4f87c8f91e5ae3f3ba87ab4cf5e03b1a17f1a3" integrity sha1-X0+HyPkeWuPzuoerTPXgOxoX8aM= @@ -13336,10 +13330,10 @@ psl@^1.1.24, psl@^1.1.28: resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.29.tgz#60f580d360170bb722a797cc704411e6da850c67" integrity sha512-AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ== -pstree.remy@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/pstree.remy/-/pstree.remy-1.1.2.tgz#4448bbeb4b2af1fed242afc8dc7416a6f504951a" - integrity sha512-vL6NLxNHzkNTjGJUpMm5PLC+94/0tTlC1vkP9bdU0pOHih+EujMjgMTwfZopZvHWRFbqJ5Y73OMoau50PewDDA== +pstree.remy@^1.1.0: + version "1.1.6" + resolved "https://registry.yarnpkg.com/pstree.remy/-/pstree.remy-1.1.6.tgz#73a55aad9e2d95814927131fbf4dc1b62d259f47" + integrity sha512-NdF35+QsqD7EgNEI5mkI/X+UwaxVEbQaz9f4IooEmMUv6ZPmlTQYGjBPJGgrlzNdjSvIy4MWMg6Q6vCgBO2K+w== public-encrypt@^4.0.0: version "4.0.3" @@ -13406,10 +13400,10 @@ punycode@^1.2.4, punycode@^1.4.1: resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" integrity sha1-wNWmOycYgArY4esPpSachN1BhF4= -puppeteer@1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-1.10.0.tgz#e3005f1251c2feae0e10c0f7a35afbcd56589ceb" - integrity sha512-3i28X/ucX8t3eL4TZA60FLMOQNKqudFSOGDHr0cT7T4dE027CrcS885aAqjdxNybhMPliM5yImNsKJ6SQrPzhw== +puppeteer@1.9.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-1.9.0.tgz#56dba79e7ea4faac807877bee3b23d63291fc59e" + integrity sha512-GH4PmhJf9wBRAPvtJkEJLAvdNNOofZortmBZSj8cGWYni98GUFqsf66blOEfJbo5B8l0KG5HR2d/W2MejnUrzg== dependencies: debug "^3.1.0" extract-zip "^1.6.6" @@ -13539,9 +13533,9 @@ rc@^1.0.1, rc@^1.1.6, rc@^1.2.7: strip-json-comments "~2.0.1" react-animate-height@^2.0.4: - version "2.0.7" - resolved "https://registry.yarnpkg.com/react-animate-height/-/react-animate-height-2.0.7.tgz#e73608a3b31224ef2c3f75b5b3f1351211d30140" - integrity sha512-NbdKlopeFDUY7oDlLV5T3XvpV/yi8sqO7b78mzObpgWr+prPJ/tipKYNGTDHetjElnmrC5dyC5vHUu86ua3G1A== + version "2.0.6" + resolved "https://registry.yarnpkg.com/react-animate-height/-/react-animate-height-2.0.6.tgz#6a335c05eb184704cc28b50df16501221f3868b5" + integrity sha512-8fVi96UvnhR72V9j2a64DW5XMZfPaBH5nQJZvY704xgqAw51uC9vhUeEaKUPEQSjpLlUcuy6ppYvOlsLSQTerw== dependencies: classnames "^2.2.5" prop-types "^15.6.1" @@ -13601,9 +13595,9 @@ react-html-parser@^2.0.2: htmlparser2 "^3.9.0" react-jsonschema-form@^1.0.4: - version "1.0.6" - resolved "https://registry.yarnpkg.com/react-jsonschema-form/-/react-jsonschema-form-1.0.6.tgz#ceef7c2c386e46a149ec94203547dd9111913e36" - integrity sha512-F6441MjApWHiFU/98T+fM19kBP9Ib0b3GMOB5DNyXnfMYC35CLwaANeZsTHug0HAmXGxgG+caPZSxgJSAyPz1Q== + version "1.0.5" + resolved "https://registry.yarnpkg.com/react-jsonschema-form/-/react-jsonschema-form-1.0.5.tgz#692e6bc2d747be11e61602b1ba76105d1b7605ac" + integrity sha512-idnHVkOtRDspajpc4+IfLx9gLCnqJc5zZqEqUoc7SzjSVdCRAMaxT5Qr5lPdgzb8mRcJSXaXI+qwlVfKScrLBg== dependencies: ajv "^5.2.3" babel-runtime "^6.26.0" @@ -13706,7 +13700,7 @@ read-pkg-up@^3.0.0: find-up "^2.0.0" read-pkg "^3.0.0" -read-pkg@^1.0.0: +read-pkg@^1.0.0, read-pkg@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28" integrity sha1-9f+qXs0pyzHAR0vKfXVra7KePyg= @@ -15151,9 +15145,9 @@ spdx-expression-parse@^3.0.0: spdx-license-ids "^3.0.0" spdx-license-ids@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.2.tgz#a59efc09784c2a5bada13cfeaf5c75dd214044d2" - integrity sha512-qky9CVt0lVIECkEsYbNILVnPvycuEBkXoMFLRWsREkomQLevYhtRKC+R91a5TOAQ3bCMjikRwhyaRqj1VYatYg== + version "3.0.1" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.1.tgz#e2a303236cac54b04031fa7a5a79c7e701df852f" + integrity sha512-TfOfPcYGBB5sDuPn3deByxPhmfegAhpDYKSOXZQN81Oyrrif8ZCodOLzK3AesELnCx03kikhyDwh0pfvvQvF8w== spdy-transport@^2.0.18: version "2.1.1" @@ -15236,9 +15230,9 @@ sprintf-js@~1.0.2: integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= sshpk@^1.7.0: - version "1.15.2" - resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.15.2.tgz#c946d6bd9b1a39d0e8635763f5242d6ed6dcb629" - integrity sha512-Ra/OXQtuh0/enyl4ETZAfTaeksa6BXks5ZcjpSUNrjBr0DvrJKX+1fsKDPpT9TBXgHAFsa4510aNVgI8g/+SzA== + version "1.15.1" + resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.15.1.tgz#b79a089a732e346c6e0714830f36285cd38191a2" + integrity sha512-mSdgNUaidk+dRU5MhYtN9zebdzF2iG0cNPWy8HG+W8y+fT1JnSkh0fzzpjOa0L7P8i1Rscz38t0h4gPcKz43xA== dependencies: asn1 "~0.2.3" assert-plus "^1.0.0" @@ -15658,15 +15652,15 @@ stylelint-order@^1.0.0: postcss-sorting "^4.0.0" stylelint-scss@^3.3.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-3.4.0.tgz#263da8450e371bcf646063c6ac62f69225369697" - integrity sha512-sM1bsOrbmR35N1ZAg+7uLVI+n2QHqOVMZPRiAIyiOa1ITBrg0hajBH/i1F/ZxbsBUWLAeSq/NREwPw1+xF9exQ== + version "3.3.2" + resolved "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-3.3.2.tgz#0ee3ec3758c54e9cf4805da82dcce4d514d9e095" + integrity sha512-0x+nD1heoMJYOfi3FfGcz3Hrwhcm+Qyq+BuvoBv5v9xrZZ1aziRXQauuhjwb87gWAa9MBzxhfUqBnvTUrHlLjA== dependencies: - lodash "^4.17.11" + lodash "^4.17.10" postcss-media-query-parser "^0.2.3" postcss-resolve-nested-selector "^0.1.1" postcss-selector-parser "^4.0.0" - postcss-value-parser "^3.3.1" + postcss-value-parser "^3.3.0" stylelint-selector-bem-pattern@^2.0.0: version "2.0.0" @@ -15688,9 +15682,9 @@ stylelint-selector-pattern@0.0.2: stylelint "^7.8.0" stylelint@>=3.0.2, stylelint@^9.1.1, stylelint@^9.5.0: - version "9.8.0" - resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-9.8.0.tgz#bfdade6360d82afe820d6b15251b01acf8ffd04d" - integrity sha512-qYYgP9UnZ6S4uaXrfEGPIMeNv21gP4t3E7BtnYfJIiHKvz7AbrCP0vj1wPgD6OFyxLT5txQxtoznfSkm2vsUkQ== + version "9.6.0" + resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-9.6.0.tgz#f0b366f33b6ccf3e5096d60722ed27b6470b41d8" + integrity sha512-Q0UcbFPRiC+3FejNyIBAWbMuKwZNAC0kvZtGQbjwA9LMKDod6xMlBsiIigQxmE3ywpmTeFj3mkG5Jj36EfC7XA== dependencies: autoprefixer "^9.0.0" balanced-match "^1.0.0" @@ -15700,32 +15694,31 @@ stylelint@>=3.0.2, stylelint@^9.1.1, stylelint@^9.5.0: execall "^1.0.0" file-entry-cache "^2.0.0" get-stdin "^6.0.0" - global-modules "^1.0.0" globby "^8.0.0" globjoin "^0.1.4" html-tags "^2.0.0" - ignore "^5.0.4" + ignore "^4.0.0" import-lazy "^3.1.0" imurmurhash "^0.1.4" - known-css-properties "^0.9.0" + known-css-properties "^0.8.0" leven "^2.1.0" lodash "^4.17.4" log-symbols "^2.0.0" mathml-tag-names "^2.0.1" meow "^5.0.0" - micromatch "^3.1.10" + micromatch "^2.3.11" normalize-selector "^0.2.0" pify "^4.0.0" postcss "^7.0.0" postcss-html "^0.34.0" - postcss-jsx "^0.35.0" - postcss-less "^3.0.1" + postcss-jsx "^0.34.0" + postcss-less "^2.0.0" postcss-markdown "^0.34.0" postcss-media-query-parser "^0.2.3" postcss-reporter "^6.0.0" postcss-resolve-nested-selector "^0.1.1" postcss-safe-parser "^4.0.0" - postcss-sass "^0.3.5" + postcss-sass "^0.3.0" postcss-scss "^2.0.0" postcss-selector-parser "^3.1.0" postcss-styled "^0.34.0" @@ -15733,7 +15726,6 @@ stylelint@>=3.0.2, stylelint@^9.1.1, stylelint@^9.5.0: postcss-value-parser "^3.3.0" resolve-from "^4.0.0" signal-exit "^3.0.2" - slash "^2.0.0" specificity "^0.4.1" string-width "^2.1.0" style-search "^0.1.0" @@ -15943,9 +15935,9 @@ table@^5.0.0, table@^5.0.2: string-width "^2.1.1" tapable@^1.0.0, tapable@^1.0.0-beta.5, tapable@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.1.tgz#4d297923c5a72a42360de2ab52dadfaaec00018e" - integrity sha512-9I2ydhj8Z9veORCw5PRm4u9uebCn0mcCa6scWoNcbZ6dAtoo2618u9UUzxgmsCOreJpqDDuv61LvwofW7hLcBA== + version "1.1.0" + resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.0.tgz#0d076a172e3d9ba088fd2272b2668fb8d194b78c" + integrity sha512-IlqtmLVaZA2qab8epUXbVWRn3aB1imbDMJtjB3nu4X0NqPkcY/JH9ZtCBWKHWPxs8Svi9tyo8w2dBoi07qZbBA== tar-fs@^1.13.0: version "1.16.3" @@ -15980,14 +15972,14 @@ tar@^2.0.0: inherits "2" tar@^4, tar@^4.4.6: - version "4.4.8" - resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.8.tgz#b19eec3fde2a96e64666df9fdb40c5ca1bc3747d" - integrity sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ== + version "4.4.6" + resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.6.tgz#63110f09c00b4e60ac8bcfe1bf3c8660235fbc9b" + integrity sha512-tMkTnh9EdzxyfW+6GK6fCahagXsnYk6kE6S9Gr9pjVdys769+laCTbodXDhPAjzVtEBazRgP0gYqOjnk9dQzLg== dependencies: - chownr "^1.1.1" + chownr "^1.0.1" fs-minipass "^1.2.5" - minipass "^2.3.4" - minizlib "^1.1.1" + minipass "^2.3.3" + minizlib "^1.1.0" mkdirp "^0.5.0" safe-buffer "^5.1.2" yallist "^3.0.2" @@ -16768,9 +16760,9 @@ url-parse-lax@^3.0.0: prepend-http "^2.0.0" url-parse@^1.4.3: - version "1.4.4" - resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.4.tgz#cac1556e95faa0303691fec5cf9d5a1bc34648f8" - integrity sha512-/92DTTorg4JjktLNLe6GPS2/RvAd/RGr6LuktmWSMLEOa6rjnlrFXNgSbSmkNvCoL2T028A0a1JaJLzRMlFoHg== + version "1.4.3" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.3.tgz#bfaee455c889023219d757e045fa6a684ec36c15" + integrity sha512-rh+KuAW36YKo0vClhQzLLveoj8FwPJNu65xLb7Mrt+eZht0IPT0IXgSv8gcMegZ6NvjJUALf6Mf25POlMwD1Fw== dependencies: querystringify "^2.0.0" requires-port "^1.0.0" @@ -17315,9 +17307,9 @@ whatwg-fetch@>=0.10.0: integrity sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q== whatwg-mimetype@^2.1.0, whatwg-mimetype@^2.2.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf" - integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g== + version "2.2.0" + resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.2.0.tgz#a3d58ef10b76009b042d03e25591ece89b88d171" + integrity sha512-5YSO1nMd5D1hY3WzAQV3PzZL83W3YeyR1yW9PcH26Weh1t+Vzh9B6XkDh7aXm83HBZ4nSMvkjvN2H2ySWIvBgw== whatwg-url@^6.4.1: version "6.5.0" @@ -17756,14 +17748,6 @@ yargs-parser@^10.0.0, yargs-parser@^10.1.0: dependencies: camelcase "^4.1.0" -yargs-parser@^11.1.1: - version "11.1.1" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4" - integrity sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ== - dependencies: - camelcase "^5.0.0" - decamelize "^1.2.0" - yargs-parser@^4.1.0, yargs-parser@^4.2.0: version "4.2.1" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-4.2.1.tgz#29cceac0dc4f03c6c87b4a9f217dd18c9f74871c" @@ -17785,7 +17769,7 @@ yargs-parser@^9.0.2: dependencies: camelcase "^4.1.0" -yargs@12.0.2: +yargs@12.0.2, yargs@^12.0.1, yargs@^12.0.2: version "12.0.2" resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.2.tgz#fe58234369392af33ecbef53819171eff0f5aadc" integrity sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ== @@ -17865,24 +17849,6 @@ yargs@^11.0.0: y18n "^3.2.1" yargs-parser "^9.0.2" -yargs@^12.0.1, yargs@^12.0.2: - version "12.0.5" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13" - integrity sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw== - dependencies: - cliui "^4.0.0" - decamelize "^1.2.0" - find-up "^3.0.0" - get-caller-file "^1.0.1" - os-locale "^3.0.0" - require-directory "^2.1.1" - require-main-filename "^1.0.1" - set-blocking "^2.0.0" - string-width "^2.0.0" - which-module "^2.0.0" - y18n "^3.2.1 || ^4.0.0" - yargs-parser "^11.1.1" - yargs@^3.19.0, yargs@^3.5.4: version "3.32.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.32.0.tgz#03088e9ebf9e756b69751611d2a5ef591482c995" From aebfb651e250e0fab1610662622b3b56b773ad33 Mon Sep 17 00:00:00 2001 From: Evan Lovely Date: Fri, 14 Dec 2018 14:54:56 -0800 Subject: [PATCH 08/34] chore(docker): add docker scripts --- scripts/docker-build.sh | 29 +++++++++++++++++++++++++++++ scripts/docker-run.sh | 12 ++++++++++++ 2 files changed, 41 insertions(+) create mode 100755 scripts/docker-build.sh create mode 100755 scripts/docker-run.sh diff --git a/scripts/docker-build.sh b/scripts/docker-build.sh new file mode 100755 index 0000000000..b3936136a4 --- /dev/null +++ b/scripts/docker-build.sh @@ -0,0 +1,29 @@ +#!/bin/bash +# Start in this directory even if ran elsewhere +cd "$(dirname "$0")" +# Up to root of repo +cd .. +# Show all commands ran +set -x +# Exit this script if anything else exits +set -e + +# Error messages are redirected to stderr +function handle_error { + echo "$(basename $0): ERROR! An error was encountered executing line $1." 1>&2; + # cleanup + echo 'Exiting with error.' 1>&2; + exit 1 +} + +function handle_exit { + # cleanup + echo 'Exiting without error.' 1>&2; + exit +} + +# Exit the script with a helpful error message when any error is encountered +trap 'set +x; handle_error $LINENO $BASH_COMMAND' ERR + +# --oom-kill-disable -memory=2000m +time docker build --tag boltdesignsystem/bolt:latest . diff --git a/scripts/docker-run.sh b/scripts/docker-run.sh new file mode 100755 index 0000000000..dc645b6890 --- /dev/null +++ b/scripts/docker-run.sh @@ -0,0 +1,12 @@ +#!/bin/bash +# Start in this directory even if ran elsewhere +cd "$(dirname "$0")" +# Up to root of repo +cd .. + +# Show all commands ran +set -x +# Exit this script if anything else exits +set -e + +time docker run -p 3123:3123 --tty --rm boltdesignsystem/bolt:latest From aaa6d567f9b6cf47323cf5abc5287025e5b7a592 Mon Sep 17 00:00:00 2001 From: Evan Lovely Date: Fri, 14 Dec 2018 15:34:40 -0800 Subject: [PATCH 09/34] ci(travis): install npm deps needed for deploy scripts --- .travis.yml | 2 +- scripts/deploy.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index fde6aed103..8b39bf273b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,7 +35,7 @@ script: - docker push boltdesignsystem/bolt:latest && docker push boltdesignsystem/bolt:${GIT_SHA} after_script: - - npm i -g now@latest + - npm i -g now@latest node-fetch git-semver-tags # @todo remove these; need them for following script since we don't `yarn install` (it all happens inside Docker build) - yarn deploy - npx nightwatch@0.9.20 --config nightwatch.js --env chrome,ie11 - time ./scripts/update-read-only-git-repos.sh diff --git a/scripts/deploy.js b/scripts/deploy.js index eaeda409db..602c309aa0 100755 --- a/scripts/deploy.js +++ b/scripts/deploy.js @@ -35,7 +35,7 @@ async function init() { } = process.env; // also made in `.travis.yml` during docker tag - const gitSha = spawnSync('git', ['rev-parse', '--short' 'HEAD'], { + const gitSha = spawnSync('git', ['rev-parse', '--short', 'HEAD'], { encoding: 'utf8', }).trim(); From 36ab8f82f9765006916a5464e644e7e04d586bad Mon Sep 17 00:00:00 2001 From: Evan Lovely Date: Fri, 14 Dec 2018 15:49:38 -0800 Subject: [PATCH 10/34] ci(travis): temp disabling sauce labs as I think it's down --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8b39bf273b..987d3883d0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,8 @@ language: php php: - 7.1 -addons: - sauce_connect: true +#addons: +# sauce_connect: true before_install: # - nvm install # version lifted from `.nvmrc` @@ -37,7 +37,7 @@ script: after_script: - npm i -g now@latest node-fetch git-semver-tags # @todo remove these; need them for following script since we don't `yarn install` (it all happens inside Docker build) - yarn deploy - - npx nightwatch@0.9.20 --config nightwatch.js --env chrome,ie11 +# - npx nightwatch@0.9.20 --config nightwatch.js --env chrome,ie11 - time ./scripts/update-read-only-git-repos.sh cache: From ae5bc5c9cd22e77c7f635254caa7109daf1489c9 Mon Sep 17 00:00:00 2001 From: Evan Lovely Date: Fri, 14 Dec 2018 15:55:25 -0800 Subject: [PATCH 11/34] feat(build-tools): setting up API endpoint on server --- packages/build-tools/api/index.js | 8 +++++++- server.js | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/build-tools/api/index.js b/packages/build-tools/api/index.js index d1daedc3b9..92180c2063 100644 --- a/packages/build-tools/api/index.js +++ b/packages/build-tools/api/index.js @@ -38,6 +38,12 @@ async function handleRequest(req, res, next) { // @todo test with `GET` requests // @todo test with empty body switch (pathname) { + case '/': + res.json({ + ok: true, + message: `Welcome to the Bolt Design System API! Have a nice day!`, + }); + break; case '/render-twig': try { /** @var renderResponse {Response} */ @@ -72,7 +78,7 @@ async function handleRequest(req, res, next) { res.end( JSON.stringify({ ok: false, - message: `Not api route found at: ${url}`, + message: `No api route found at: ${pathname}`, }), 'utf8', () => diff --git a/server.js b/server.js index 614ba40045..349727ef02 100644 --- a/server.js +++ b/server.js @@ -1,9 +1,11 @@ const express = require('express'); const { join } = require('path'); +const { handleRequest } = require('@bolt/build-tools/api'); const app = express(); const port = process.env.PORT || 3123; +app.use('/api', handleRequest); app.use(express.static(join(__dirname, './www'))); app.listen(port, () => { From e8ba266c3d06ae6efeb6173a697b2d2815a288a2 Mon Sep 17 00:00:00 2001 From: Evan Lovely Date: Fri, 14 Dec 2018 16:04:24 -0800 Subject: [PATCH 12/34] chore(ci): setting up CI script package.json for deps --- .travis.yml | 8 +++++--- scripts/package.json | 18 ++++++++++++++++++ 2 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 scripts/package.json diff --git a/.travis.yml b/.travis.yml index 987d3883d0..b8898d814a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,10 +34,12 @@ script: - docker tag boltdesignsystem/bolt boltdesignsystem/bolt:${GIT_SHA} - docker push boltdesignsystem/bolt:latest && docker push boltdesignsystem/bolt:${GIT_SHA} +# @todo reconsider script deps install process; need them for following script since we don't `yarn install` (it all happens inside Docker build) after_script: - - npm i -g now@latest node-fetch git-semver-tags # @todo remove these; need them for following script since we don't `yarn install` (it all happens inside Docker build) - - yarn deploy -# - npx nightwatch@0.9.20 --config nightwatch.js --env chrome,ie11 + - cd scripts && npm install + - npm run deploy +# - npm run nightwatch + - cd .. - time ./scripts/update-read-only-git-repos.sh cache: diff --git a/scripts/package.json b/scripts/package.json new file mode 100644 index 0000000000..a344e4c92e --- /dev/null +++ b/scripts/package.json @@ -0,0 +1,18 @@ +{ + "name": "@bolt/scripts", + "version": "2.2.0", + "description": "Deps for CI scripts", + "main": "deploy.js", + "scripts": { + "deploy": "./deploy.js", + "nightwatch": "nightwatch --config ../nightwatch.js --env chrome,ie11" + }, + "dependencies": { + "nightwatch": "0.9.20", + "node-fetch": "^2.3.0", + "git-semver-tags": "^2.0.2", + "now": "latest" + }, + "author": "", + "license": "ISC" +} From 60aaab24d990b32f0dab165e24f5cc11c593cb55 Mon Sep 17 00:00:00 2001 From: Evan Lovely Date: Fri, 14 Dec 2018 16:10:36 -0800 Subject: [PATCH 13/34] chore(ci): deploy tweak --- scripts/deploy.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/deploy.js b/scripts/deploy.js index 602c309aa0..fffb11099b 100755 --- a/scripts/deploy.js +++ b/scripts/deploy.js @@ -37,7 +37,7 @@ async function init() { // also made in `.travis.yml` during docker tag const gitSha = spawnSync('git', ['rev-parse', '--short', 'HEAD'], { encoding: 'utf8', - }).trim(); + }).stdout.trim(); console.log({ TRAVIS, From 66b4acc13d1f327dfeba091ac48f134c524032b5 Mon Sep 17 00:00:00 2001 From: Evan Lovely Date: Fri, 14 Dec 2018 16:27:38 -0800 Subject: [PATCH 14/34] chore(ci): deploy tweak --- scripts/deploy.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/scripts/deploy.js b/scripts/deploy.js index fffb11099b..34241ba68f 100755 --- a/scripts/deploy.js +++ b/scripts/deploy.js @@ -80,9 +80,12 @@ async function init() { const deployOutput = spawnSync('now', [ 'deploy', '--force', - `--meta TRAVIS_BUILD_WEB_URL=${TRAVIS_BUILD_WEB_URL}`, - `--env DOCKER_TAG=${gitSha}`, - `--build-env DOCKER_TAG=${gitSha}`, + '--meta', + `TRAVIS_BUILD_WEB_URL="${TRAVIS_BUILD_WEB_URL}"`, + '--env', + `DOCKER_TAG=${gitSha}`, + '--build-env', + `DOCKER_TAG=${gitSha}`, ...baseNowArgs, ], { encoding: 'utf8', @@ -90,6 +93,8 @@ async function init() { }); if (deployOutput.status !== 0) { console.error('Error deploying:'); + console.log(deployOutput.stdout, deployOutput.stderr); + process.exit(1); } console.log(deployOutput.stdout, deployOutput.stderr); const deployedUrl = deployOutput.stdout.trim(); From 181d19df940bd75e56041c0f349cc149d4ed4195 Mon Sep 17 00:00:00 2001 From: Evan Lovely Date: Fri, 14 Dec 2018 16:45:18 -0800 Subject: [PATCH 15/34] chore(ci): log api requests to test --- packages/build-tools/api/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/build-tools/api/index.js b/packages/build-tools/api/index.js index 92180c2063..87bd9d6f58 100644 --- a/packages/build-tools/api/index.js +++ b/packages/build-tools/api/index.js @@ -37,6 +37,7 @@ async function handleRequest(req, res, next) { // } // @todo test with `GET` requests // @todo test with empty body + console.log(`api request received at ${pathname}`); // remove once we're sure this works on server switch (pathname) { case '/': res.json({ From c22f3b2b7032bf39d7162297eec1aa254226c96c Mon Sep 17 00:00:00 2001 From: Evan Lovely Date: Fri, 14 Dec 2018 16:47:59 -0800 Subject: [PATCH 16/34] chore(ci): logging DOCKER_TAG --- deploys/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/deploys/Dockerfile b/deploys/Dockerfile index e51ee61484..a89aacaf74 100644 --- a/deploys/Dockerfile +++ b/deploys/Dockerfile @@ -1,3 +1,4 @@ FROM boltdesignsystem/bolt:${DOCKER_TAG:-latest} +RUN echo "Using DOCKER_TAG: ${DOCKER_TAG:-latest}" # tag being built from will be env var `$DOCKER_TAG` if set, else it will be `latest` EXPOSE 3123 From 0b22f12e157ca3f4451e2dd84cea8865d6d43bfa Mon Sep 17 00:00:00 2001 From: Evan Lovely Date: Fri, 14 Dec 2018 17:29:35 -0800 Subject: [PATCH 17/34] chore(ci): quiet docker output --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index b8898d814a..554ffc42b7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,14 +25,14 @@ install: # Can't do deploy on `after_success` b/c if deploy fails, the build still reports success. Can't use `deploy` step b/c Travis skips that on PRs. script: -- docker pull boltdesignsystem/bolt || true -- docker build --pull --cache-from boltdesignsystem/bolt --tag boltdesignsystem/bolt . +- docker --log-level error pull boltdesignsystem/bolt || true +- docker --log-level error build --quiet --pull --cache-from boltdesignsystem/bolt --tag boltdesignsystem/bolt . - docker images - echo $DOCKER_HUB_PASS | docker login --username $DOCKER_HUB_USER --password-stdin - GIT_SHA="$(git rev-parse --short HEAD)" - docker tag boltdesignsystem/bolt boltdesignsystem/bolt:latest - docker tag boltdesignsystem/bolt boltdesignsystem/bolt:${GIT_SHA} -- docker push boltdesignsystem/bolt:latest && docker push boltdesignsystem/bolt:${GIT_SHA} +- docker --log-level error push boltdesignsystem/bolt:latest && docker --log-level error push boltdesignsystem/bolt:${GIT_SHA} # @todo reconsider script deps install process; need them for following script since we don't `yarn install` (it all happens inside Docker build) after_script: From 8690b892761951760750d6ee04561eeb36473f7a Mon Sep 17 00:00:00 2001 From: Evan Lovely Date: Fri, 14 Dec 2018 17:31:28 -0800 Subject: [PATCH 18/34] chore(ci): change base Docker image so it has correct deps --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 21efbc76da..e665a42cef 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,5 @@ -FROM boltdesignsystem/bolt-docker:latest +FROM basaltinc/docker-node-php-base:latest +# @todo replace with `boltdesignsystem/bolt-docker:latest` once that is configured correctly WORKDIR /app COPY . . EXPOSE 3123 From edc3f08b22432461b4a74dd19471f609d1284675 Mon Sep 17 00:00:00 2001 From: Evan Lovely Date: Fri, 14 Dec 2018 17:38:53 -0800 Subject: [PATCH 19/34] chore(ci): change deploy url from PR comment to Commit Status --- scripts/deploy.js | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/scripts/deploy.js b/scripts/deploy.js index 34241ba68f..3bf445dc3e 100755 --- a/scripts/deploy.js +++ b/scripts/deploy.js @@ -103,7 +103,6 @@ async function init() { .replace('boltdesignsystem-', '') .replace('.now.sh', ''); - console.log('Aliasing to branch/tag name...'); // Making sure branch name is ok to be in URL const branchUrlPart = branchName @@ -173,22 +172,26 @@ async function init() { - Branch link: ${aliasedUrl} - Permalink: ${deployedUrl} - -
- -- Commit built: ${process.env.TRAVIS_COMMIT} -- [Travis build](https://travis-ci.org/${process.env.TRAVIS_REPO_SLUG}/builds/${process.env.TRAVIS_BUILD_ID}) - -
`.trim(); + +// const extra = `
+// +// - Commit built: ${process.env.TRAVIS_COMMIT} +// - [Travis build](https://travis-ci.org/${process.env.TRAVIS_REPO_SLUG}/builds/${process.env.TRAVIS_BUILD_ID}) +// +//
+// `.trim(); // end GitHub comment template - const githubCommentEndpoint = `https://api.github.com/repos/${TRAVIS_REPO_SLUG}/issues/${TRAVIS_PULL_REQUEST}/comments`; + const githubStatusEndpoint = `https://api.github.com/repos/${TRAVIS_REPO_SLUG}/statuses/${gitSha}`; - const response = await fetch(githubCommentEndpoint, { + const response = await fetch(githubStatusEndpoint, { method: 'POST', body: JSON.stringify({ - body: githubCommentText, + state: 'success', + target_url: aliasedUrl, + context: 'deploy/now.sh', + description: githubCommentText, }), headers: { Authorization: `Bearer ${GITHUB_TOKEN}`, @@ -196,7 +199,8 @@ async function init() { }).then(res => res.json()); console.log(response); console.log('GitHub comment posted'); - } else { + } + else { console.log('This is not a Pull Request build, so will not try to comment on PR.'); } // @todo Errors should be passed to `catch` From 198c0de739616e385234461ae2151c83b87965fa Mon Sep 17 00:00:00 2001 From: Evan Lovely Date: Fri, 14 Dec 2018 17:41:15 -0800 Subject: [PATCH 20/34] style: lint fix --- packages/build-tools/cli.js | 4 ++-- packages/build-tools/create-webpack-config.js | 4 ++-- packages/components/bolt-dropdown/dropdown.js | 8 ++++---- packages/components/bolt-icon/src/icon.standalone.js | 5 ++--- packages/components/bolt-text/src/text.standalone.js | 4 ++-- 5 files changed, 12 insertions(+), 13 deletions(-) diff --git a/packages/build-tools/cli.js b/packages/build-tools/cli.js index 1227c60d6c..85a8dd5522 100755 --- a/packages/build-tools/cli.js +++ b/packages/build-tools/cli.js @@ -82,8 +82,8 @@ if (program.configFile) { config.env = process.env.NODE_ENV ? process.env.NODE_ENV : typeof options.env === 'undefined' - ? config.env - : options.env; + ? config.env + : options.env; config.webpackStats = typeof options.webpackStats === 'undefined' diff --git a/packages/build-tools/create-webpack-config.js b/packages/build-tools/create-webpack-config.js index f3d70531ac..8f068392ec 100644 --- a/packages/build-tools/create-webpack-config.js +++ b/packages/build-tools/create-webpack-config.js @@ -38,8 +38,8 @@ async function createWebpackConfig(buildConfig) { const publicPath = config.publicPath ? config.publicPath : config.wwwDir - ? `/${path.relative(config.wwwDir, config.buildDir)}/` - : config.buildDir; // @todo Ensure ends with `/` or we can get `distfonts/` instead of `dist/fonts/` + ? `/${path.relative(config.wwwDir, config.buildDir)}/` + : config.buildDir; // @todo Ensure ends with `/` or we can get `distfonts/` instead of `dist/fonts/` // @TODO: move this setting to .boltrc config const sassExportData = require('@bolt/sass-export-data')({ diff --git a/packages/components/bolt-dropdown/dropdown.js b/packages/components/bolt-dropdown/dropdown.js index 36c0ace1cd..b2e03c1d72 100644 --- a/packages/components/bolt-dropdown/dropdown.js +++ b/packages/components/bolt-dropdown/dropdown.js @@ -115,8 +115,8 @@ class BoltDropdown extends withLitHtml() { const dropdownTitle = this.slots.title ? this.slot('title') : this.props.title - ? this.props.title - : ''; + ? this.props.title + : ''; return html`

@@ -152,8 +152,8 @@ class BoltDropdown extends withLitHtml() { const dropdownChildren = this.slots.default ? this.slot('default') : this.props.children - ? this.props.children - : ''; + ? this.props.children + : ''; return html`
diff --git a/packages/components/bolt-icon/src/icon.standalone.js b/packages/components/bolt-icon/src/icon.standalone.js index eb1b35b097..ae4214ed8f 100644 --- a/packages/components/bolt-icon/src/icon.standalone.js +++ b/packages/components/bolt-icon/src/icon.standalone.js @@ -124,9 +124,8 @@ class BoltIcon extends withPreact() { bgColor={primaryColor} fgColor={secondaryColor} /> - {background && size === 'xlarge' && ( - - )} + {background && + size === 'xlarge' && }
); } diff --git a/packages/components/bolt-text/src/text.standalone.js b/packages/components/bolt-text/src/text.standalone.js index 221aa3b893..bc061798bb 100644 --- a/packages/components/bolt-text/src/text.standalone.js +++ b/packages/components/bolt-text/src/text.standalone.js @@ -55,8 +55,8 @@ class BoltText extends withLitHtml() { return schemaData.enum.indexOf(propVal) > -1 ? propVal : typeof schemaData.default !== 'undefined' - ? schemaData.default - : false; + ? schemaData.default + : false; } subComponentValues(propVal, defaultVal) { From 2d50634b4717743e86907d7004030726c033e6ea Mon Sep 17 00:00:00 2001 From: Evan Lovely Date: Fri, 14 Dec 2018 18:05:06 -0800 Subject: [PATCH 21/34] chore(ci): docker build tweak --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 554ffc42b7..dce865f191 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,7 +26,7 @@ install: # Can't do deploy on `after_success` b/c if deploy fails, the build still reports success. Can't use `deploy` step b/c Travis skips that on PRs. script: - docker --log-level error pull boltdesignsystem/bolt || true -- docker --log-level error build --quiet --pull --cache-from boltdesignsystem/bolt --tag boltdesignsystem/bolt . +- docker build --pull --cache-from boltdesignsystem/bolt --tag boltdesignsystem/bolt . - docker images - echo $DOCKER_HUB_PASS | docker login --username $DOCKER_HUB_USER --password-stdin - GIT_SHA="$(git rev-parse --short HEAD)" From 6b7280bc0768cacc1f44b1df48c9a2b4bdd9b018 Mon Sep 17 00:00:00 2001 From: Evan Lovely Date: Fri, 14 Dec 2018 18:07:09 -0800 Subject: [PATCH 22/34] chore(ci): docker build w/o fresh pull --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index dce865f191..e2ab17509b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,7 +26,7 @@ install: # Can't do deploy on `after_success` b/c if deploy fails, the build still reports success. Can't use `deploy` step b/c Travis skips that on PRs. script: - docker --log-level error pull boltdesignsystem/bolt || true -- docker build --pull --cache-from boltdesignsystem/bolt --tag boltdesignsystem/bolt . +- docker build --cache-from boltdesignsystem/bolt --tag boltdesignsystem/bolt . - docker images - echo $DOCKER_HUB_PASS | docker login --username $DOCKER_HUB_USER --password-stdin - GIT_SHA="$(git rev-parse --short HEAD)" From 57e9d43e1bb58b0a1a994ebd257a3d7e8bce26cf Mon Sep 17 00:00:00 2001 From: Evan Lovely Date: Fri, 14 Dec 2018 18:36:45 -0800 Subject: [PATCH 23/34] chore(ci): re-enabling deploy PR comments, adding deploy commit checks --- scripts/deploy.js | 62 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 48 insertions(+), 14 deletions(-) diff --git a/scripts/deploy.js b/scripts/deploy.js index 3bf445dc3e..74382867d2 100755 --- a/scripts/deploy.js +++ b/scripts/deploy.js @@ -76,6 +76,18 @@ async function init() { if (NOW_TOKEN) baseNowArgs.push(`--token=${NOW_TOKEN}`); + await fetch(`https://api.github.com/repos/${TRAVIS_REPO_SLUG}/statuses/${gitSha}`, { + method: 'POST', + body: JSON.stringify({ + state: 'pending', + context: 'deploy/now.sh', + description: '', + }), + headers: { + Authorization: `Bearer ${GITHUB_TOKEN}`, + }, + }).then(res => res.json()).then(results => console.log(results)); + console.log('Starting deploy...'); const deployOutput = spawnSync('now', [ 'deploy', @@ -120,10 +132,36 @@ async function init() { if (aliasOutput.status !== 0) { console.error('Error aliasing:'); console.log(aliasOutput.stdout, aliasOutput.stderr); + const response = await fetch(`https://api.github.com/repos/${TRAVIS_REPO_SLUG}/statuses/${gitSha}`, { + method: 'POST', + body: JSON.stringify({ + state: 'error', + context: 'deploy/now.sh', + description: `${aliasOutput.stdout} - ${aliasOutput.stderr}`, + }), + headers: { + Authorization: `Bearer ${GITHUB_TOKEN}`, + }, + }).then(res => res.json()); + console.log(response); process.exit(1); } console.log(aliasOutput.stdout, aliasOutput.stderr); + const response = await fetch(`https://api.github.com/repos/${TRAVIS_REPO_SLUG}/statuses/${gitSha}`, { + method: 'POST', + body: JSON.stringify({ + state: 'success', + target_url: deployedUrl, + context: 'deploy/now.sh', + description: `Alias set to ${aliasedUrl}`, + }), + headers: { + Authorization: `Bearer ${GITHUB_TOKEN}`, + }, + }).then(res => res.json()); + console.log(response); + // if this is a tagged release, then it should become the main site. we aliased above so we have a tagged version out as well i.e. `v1-2-3-boltdesignsystem.com` if (TRAVIS_TAG && TRAVIS_TAG === latestTag) { console.log('Is tag build, aliasing to main site.'); @@ -172,26 +210,22 @@ async function init() { - Branch link: ${aliasedUrl} - Permalink: ${deployedUrl} -`.trim(); -// const extra = `
-// -// - Commit built: ${process.env.TRAVIS_COMMIT} -// - [Travis build](https://travis-ci.org/${process.env.TRAVIS_REPO_SLUG}/builds/${process.env.TRAVIS_BUILD_ID}) -// -//
-// `.trim(); +
+ +- Commit built: ${process.env.TRAVIS_COMMIT} +- [Travis build](https://travis-ci.org/${process.env.TRAVIS_REPO_SLUG}/builds/${process.env.TRAVIS_BUILD_ID}) + +
+`.trim(); // end GitHub comment template - const githubStatusEndpoint = `https://api.github.com/repos/${TRAVIS_REPO_SLUG}/statuses/${gitSha}`; + const githubCommentEndpoint = `https://api.github.com/repos/${TRAVIS_REPO_SLUG}/issues/${TRAVIS_PULL_REQUEST}/comments`; - const response = await fetch(githubStatusEndpoint, { + const response = await fetch(githubCommentEndpoint, { method: 'POST', body: JSON.stringify({ - state: 'success', - target_url: aliasedUrl, - context: 'deploy/now.sh', - description: githubCommentText, + body: githubCommentText, }), headers: { Authorization: `Bearer ${GITHUB_TOKEN}`, From 7d983c69d98caf2d3fc0623ce22bc8f18a598ebf Mon Sep 17 00:00:00 2001 From: Evan Lovely Date: Fri, 14 Dec 2018 19:13:54 -0800 Subject: [PATCH 24/34] chore(ci): adjust GitHub status calls --- scripts/deploy.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/scripts/deploy.js b/scripts/deploy.js index 74382867d2..e6fdc2be7b 100755 --- a/scripts/deploy.js +++ b/scripts/deploy.js @@ -39,6 +39,11 @@ async function init() { encoding: 'utf8', }).stdout.trim(); + const gitShaLong = spawnSync('git', ['rev-parse', 'HEAD'], { + encoding: 'utf8', + }).stdout.trim(); + + console.log({ TRAVIS, TRAVIS_BRANCH, @@ -76,7 +81,7 @@ async function init() { if (NOW_TOKEN) baseNowArgs.push(`--token=${NOW_TOKEN}`); - await fetch(`https://api.github.com/repos/${TRAVIS_REPO_SLUG}/statuses/${gitSha}`, { + await fetch(`https://api.github.com/repos/${TRAVIS_REPO_SLUG}/statuses/${gitShaLong}`, { method: 'POST', body: JSON.stringify({ state: 'pending', @@ -132,7 +137,7 @@ async function init() { if (aliasOutput.status !== 0) { console.error('Error aliasing:'); console.log(aliasOutput.stdout, aliasOutput.stderr); - const response = await fetch(`https://api.github.com/repos/${TRAVIS_REPO_SLUG}/statuses/${gitSha}`, { + const response = await fetch(`https://api.github.com/repos/${TRAVIS_REPO_SLUG}/statuses/${gitShaLong}`, { method: 'POST', body: JSON.stringify({ state: 'error', @@ -148,7 +153,7 @@ async function init() { } console.log(aliasOutput.stdout, aliasOutput.stderr); - const response = await fetch(`https://api.github.com/repos/${TRAVIS_REPO_SLUG}/statuses/${gitSha}`, { + const response = await fetch(`https://api.github.com/repos/${TRAVIS_REPO_SLUG}/statuses/${gitShaLong}`, { method: 'POST', body: JSON.stringify({ state: 'success', From 78e58c1d7a619a5ef6a5a4f4f5dc2d2347b962f1 Mon Sep 17 00:00:00 2001 From: Evan Lovely Date: Wed, 19 Dec 2018 12:58:52 -0800 Subject: [PATCH 25/34] chore(ci): skip pulling previous docker container --- .travis.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index e2ab17509b..794c8c18d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,14 +25,16 @@ install: # Can't do deploy on `after_success` b/c if deploy fails, the build still reports success. Can't use `deploy` step b/c Travis skips that on PRs. script: -- docker --log-level error pull boltdesignsystem/bolt || true -- docker build --cache-from boltdesignsystem/bolt --tag boltdesignsystem/bolt . +#- docker --log-level error pull boltdesignsystem/bolt || true +#- docker build --cache-from boltdesignsystem/bolt --tag boltdesignsystem/bolt . +- docker build --tag boltdesignsystem/bolt . - docker images - echo $DOCKER_HUB_PASS | docker login --username $DOCKER_HUB_USER --password-stdin - GIT_SHA="$(git rev-parse --short HEAD)" - docker tag boltdesignsystem/bolt boltdesignsystem/bolt:latest - docker tag boltdesignsystem/bolt boltdesignsystem/bolt:${GIT_SHA} -- docker --log-level error push boltdesignsystem/bolt:latest && docker --log-level error push boltdesignsystem/bolt:${GIT_SHA} +- docker --log-level error push boltdesignsystem/bolt:latest +- docker --log-level error push boltdesignsystem/bolt:${GIT_SHA} # @todo reconsider script deps install process; need them for following script since we don't `yarn install` (it all happens inside Docker build) after_script: From 69afc7fcee7dcdd71891d60466e6bbc493007465 Mon Sep 17 00:00:00 2001 From: Evan Lovely Date: Wed, 19 Dec 2018 13:00:28 -0800 Subject: [PATCH 26/34] chore(ci): skip pushing docker twice --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 794c8c18d8..7a97ab65e5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,7 +33,7 @@ script: - GIT_SHA="$(git rev-parse --short HEAD)" - docker tag boltdesignsystem/bolt boltdesignsystem/bolt:latest - docker tag boltdesignsystem/bolt boltdesignsystem/bolt:${GIT_SHA} -- docker --log-level error push boltdesignsystem/bolt:latest +#- docker --log-level error push boltdesignsystem/bolt:latest - docker --log-level error push boltdesignsystem/bolt:${GIT_SHA} # @todo reconsider script deps install process; need them for following script since we don't `yarn install` (it all happens inside Docker build) From d67afd8963b893aafb054373cb74b122f15650ff Mon Sep 17 00:00:00 2001 From: Joseph Karasek Date: Wed, 19 Dec 2018 15:44:26 -0800 Subject: [PATCH 27/34] feat(server): add needed custom routes/redirects for express server --- server.js | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/server.js b/server.js index 349727ef02..eff96a7eea 100644 --- a/server.js +++ b/server.js @@ -5,9 +5,24 @@ const app = express(); const port = process.env.PORT || 3123; +app.get(['/docs', '/docs/', '/docs/index.html'], (req, res) => { + res.redirect('/docs/getting-started/index.html'); +}); + +app.get('/pattern-lab/splash-screen', (req, res) => { + res.redirect('/pattern-lab'); +}); + +app.get('/favicon.ico', (req, res) => { + res.redirect('/pattern-lab/favicons/favicon.ico'); +}); + app.use('/api', handleRequest); + app.use(express.static(join(__dirname, './www'))); app.listen(port, () => { console.log(`Express listening on http://localhost:${port}`); }); + +app.redirect; From 975aab6e0712ceffa2eb56061e2dc5675b1afe48 Mon Sep 17 00:00:00 2001 From: Evan Lovely Date: Wed, 19 Dec 2018 18:37:58 -0800 Subject: [PATCH 28/34] chore(ci): re-enable Docker operations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Didn’t really save that much time on builds --- .travis.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7a97ab65e5..e3cbcef924 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,15 +25,14 @@ install: # Can't do deploy on `after_success` b/c if deploy fails, the build still reports success. Can't use `deploy` step b/c Travis skips that on PRs. script: -#- docker --log-level error pull boltdesignsystem/bolt || true -#- docker build --cache-from boltdesignsystem/bolt --tag boltdesignsystem/bolt . -- docker build --tag boltdesignsystem/bolt . +- docker --log-level error pull boltdesignsystem/bolt || true +- docker build --cache-from boltdesignsystem/bolt --tag boltdesignsystem/bolt . - docker images - echo $DOCKER_HUB_PASS | docker login --username $DOCKER_HUB_USER --password-stdin - GIT_SHA="$(git rev-parse --short HEAD)" - docker tag boltdesignsystem/bolt boltdesignsystem/bolt:latest - docker tag boltdesignsystem/bolt boltdesignsystem/bolt:${GIT_SHA} -#- docker --log-level error push boltdesignsystem/bolt:latest +- docker --log-level error push boltdesignsystem/bolt:latest - docker --log-level error push boltdesignsystem/bolt:${GIT_SHA} # @todo reconsider script deps install process; need them for following script since we don't `yarn install` (it all happens inside Docker build) From 59adc309bc05fee40cfcd35936643c7b61d4979e Mon Sep 17 00:00:00 2001 From: Evan Lovely Date: Fri, 21 Dec 2018 14:16:15 -0800 Subject: [PATCH 29/34] refactor: implementing ci-utils instead of manual calls --- scripts/deploy.js | 90 +++++++++++++++----------------------------- scripts/package.json | 3 +- 2 files changed, 33 insertions(+), 60 deletions(-) diff --git a/scripts/deploy.js b/scripts/deploy.js index e6fdc2be7b..3ff819f564 100755 --- a/scripts/deploy.js +++ b/scripts/deploy.js @@ -2,6 +2,14 @@ const url = require('url'); const { resolve } = require('path'); const querystring = require('querystring'); +const { + setGitHubStatus, + createGitHubComment, + outputBanner, + runAndShow, + runAndReturn, + getGitSha, +} = require('ci-utils'); const fetch = require('node-fetch'); const {spawnSync} = require('child_process'); const { promisify } = require('util'); @@ -35,14 +43,8 @@ async function init() { } = process.env; // also made in `.travis.yml` during docker tag - const gitSha = spawnSync('git', ['rev-parse', '--short', 'HEAD'], { - encoding: 'utf8', - }).stdout.trim(); - - const gitShaLong = spawnSync('git', ['rev-parse', 'HEAD'], { - encoding: 'utf8', - }).stdout.trim(); - + const gitSha = getGitSha(true); + const gitShaLong = getGitSha(); console.log({ TRAVIS, @@ -81,19 +83,12 @@ async function init() { if (NOW_TOKEN) baseNowArgs.push(`--token=${NOW_TOKEN}`); - await fetch(`https://api.github.com/repos/${TRAVIS_REPO_SLUG}/statuses/${gitShaLong}`, { - method: 'POST', - body: JSON.stringify({ - state: 'pending', - context: 'deploy/now.sh', - description: '', - }), - headers: { - Authorization: `Bearer ${GITHUB_TOKEN}`, - }, - }).then(res => res.json()).then(results => console.log(results)); - - console.log('Starting deploy...'); + await setGitHubStatus({ + state: 'pending', + context: 'deploy/now.sh', + }); + + outputBanner('Starting deploy...'); const deployOutput = spawnSync('now', [ 'deploy', '--force', @@ -137,35 +132,22 @@ async function init() { if (aliasOutput.status !== 0) { console.error('Error aliasing:'); console.log(aliasOutput.stdout, aliasOutput.stderr); - const response = await fetch(`https://api.github.com/repos/${TRAVIS_REPO_SLUG}/statuses/${gitShaLong}`, { - method: 'POST', - body: JSON.stringify({ - state: 'error', - context: 'deploy/now.sh', - description: `${aliasOutput.stdout} - ${aliasOutput.stderr}`, - }), - headers: { - Authorization: `Bearer ${GITHUB_TOKEN}`, - }, - }).then(res => res.json()); - console.log(response); + + await setGitHubStatus({ + state: 'error', + context: 'deploy/now.sh', + description: `${aliasOutput.stdout} - ${aliasOutput.stderr}`, + }); process.exit(1); } console.log(aliasOutput.stdout, aliasOutput.stderr); - const response = await fetch(`https://api.github.com/repos/${TRAVIS_REPO_SLUG}/statuses/${gitShaLong}`, { - method: 'POST', - body: JSON.stringify({ - state: 'success', - target_url: deployedUrl, - context: 'deploy/now.sh', - description: `Alias set to ${aliasedUrl}`, - }), - headers: { - Authorization: `Bearer ${GITHUB_TOKEN}`, - }, - }).then(res => res.json()); - console.log(response); + await setGitHubStatus({ + state: 'success', + context: 'deploy/now.sh', + url: deployedUrl, + description: `Alias set to ${aliasedUrl}`, + }); // if this is a tagged release, then it should become the main site. we aliased above so we have a tagged version out as well i.e. `v1-2-3-boltdesignsystem.com` if (TRAVIS_TAG && TRAVIS_TAG === latestTag) { @@ -225,19 +207,9 @@ async function init() { `.trim(); // end GitHub comment template - const githubCommentEndpoint = `https://api.github.com/repos/${TRAVIS_REPO_SLUG}/issues/${TRAVIS_PULL_REQUEST}/comments`; - - const response = await fetch(githubCommentEndpoint, { - method: 'POST', - body: JSON.stringify({ - body: githubCommentText, - }), - headers: { - Authorization: `Bearer ${GITHUB_TOKEN}`, - }, - }).then(res => res.json()); - console.log(response); - console.log('GitHub comment posted'); + const results = await createGitHubComment(githubCommentText, TRAVIS_PULL_REQUEST); + console.log(`GitHub comment made: ${results.html_url}`); + } else { console.log('This is not a Pull Request build, so will not try to comment on PR.'); diff --git a/scripts/package.json b/scripts/package.json index a344e4c92e..0291e3acf2 100644 --- a/scripts/package.json +++ b/scripts/package.json @@ -8,9 +8,10 @@ "nightwatch": "nightwatch --config ../nightwatch.js --env chrome,ie11" }, "dependencies": { + "ci-utils": "^0.5.0", + "git-semver-tags": "^2.0.2", "nightwatch": "0.9.20", "node-fetch": "^2.3.0", - "git-semver-tags": "^2.0.2", "now": "latest" }, "author": "", From f72be3466c86f57c79c15f2308102076863bd095 Mon Sep 17 00:00:00 2001 From: Evan Lovely Date: Fri, 21 Dec 2018 14:33:15 -0800 Subject: [PATCH 30/34] chore: cleanup old file --- Xnow.old.json | 39 --------------------------------------- 1 file changed, 39 deletions(-) delete mode 100644 Xnow.old.json diff --git a/Xnow.old.json b/Xnow.old.json deleted file mode 100644 index 5a0cab357b..0000000000 --- a/Xnow.old.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "COMMENT": "@todo ensure these rewrites work in new setup", - "version": 1, - "static": { - "trailingSlash": true, - "cleanUrls": false, - "directoryListing": false, - "rewrites": [ - { - "source": "/", - "destination": "/index.html" - }, - { - "source": "/pattern-lab", - "destination": "/pattern-lab/index.html" - }, - { - "source": "/pattern-lab/splash-screen/", - "destination": "/pattern-lab/splash-screen.html" - }, - { - "source": "/docs", - "destination": "/docs/getting-started/index.html" - }, - { - "source": "/docs/", - "destination": "/docs/getting-started/index.html" - }, - { - "source": "/docs/index.html", - "destination": "/docs/getting-started/index.html" - }, - { - "source": "/favicon.ico", - "destination": "/pattern-lab/favicons/favicon.ico" - } - ] - } -} From fc30d38d94f346e3111e204ef648829455e032ae Mon Sep 17 00:00:00 2001 From: Evan Lovely Date: Fri, 21 Dec 2018 15:20:15 -0800 Subject: [PATCH 31/34] perf: removing unused jshint dep as it brought in phantomjs-prebuilt for no reason --- packages/uikit-workshop/package.json | 5 - yarn.lock | 183 +++------------------------ 2 files changed, 20 insertions(+), 168 deletions(-) diff --git a/packages/uikit-workshop/package.json b/packages/uikit-workshop/package.json index 01e00914f3..66bb8a0c07 100644 --- a/packages/uikit-workshop/package.json +++ b/packages/uikit-workshop/package.json @@ -29,9 +29,6 @@ "license": "MIT", "repository": "https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop", "bugs": "https://github.com/pattern-lab/patternlab-node/issues", - "peerDependencies": { - "jshint": "^2.9.5" - }, "devDependencies": { "@babel/core": "^7.0.0", "@babel/plugin-proposal-class-properties": "^7.0.0", @@ -51,7 +48,6 @@ "css-loader": "^1.0.0", "html-loader": "^0.5.5", "html-webpack-plugin": "github:jantimon/html-webpack-plugin#webpack-4", - "jshint": "^2.9.6", "mini-css-extract-plugin": "^0.4.1", "no-emit-webpack-plugin": "^1.0.0", "node-sass": "^4.9.3", @@ -87,7 +83,6 @@ "iframe-resizer": "^3.6.2", "jquery": "^3.3.1", "js-cookie": "^2.2.0", - "jshint": "^2.9.5", "mousetrap": "^1.6.2", "preact": "^8.3.1", "preact-compat": "^3.18.4", diff --git a/yarn.lock b/yarn.lock index 9e4e47d89e..9de12ffa30 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2345,11 +2345,6 @@ async@~0.2.6: resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1" integrity sha1-trvgsGdLnXGXCMo43owjfLUmw9E= -async@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/async/-/async-1.0.0.tgz#f8fc04ca3a13784ade9e1641af98578cfbd647a9" - integrity sha1-+PwEyjoTeErenhZBr5hXjPvWR6k= - asynckit@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" @@ -3755,14 +3750,6 @@ cli-width@^2.0.0: resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639" integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk= -cli@~1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/cli/-/cli-1.0.1.tgz#22817534f24bfa4950c34d532d48ecbc621b8c14" - integrity sha1-IoF1NPJL+klQw01TLUjsvGIbjBQ= - dependencies: - exit "0.1.2" - glob "^7.1.1" - clipboard@^2.0.0, clipboard@^2.0.1: version "2.0.4" resolved "https://registry.yarnpkg.com/clipboard/-/clipboard-2.0.4.tgz#836dafd66cf0fea5d71ce5d5b0bf6e958009112d" @@ -3946,7 +3933,7 @@ colorguard@^1.2.0: text-table "^0.2.0" yargs "^1.2.6" -colors@1.0.3, colors@1.0.x: +colors@1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b" integrity sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs= @@ -4138,7 +4125,7 @@ connect@3.6.6: parseurl "~1.3.2" utils-merge "1.0.1" -console-browserify@1.1.x, console-browserify@^1.1.0: +console-browserify@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10" integrity sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA= @@ -4790,11 +4777,6 @@ currently-unhandled@^0.4.1: dependencies: array-find-index "^1.0.1" -cycle@1.0.x: - version "1.0.3" - resolved "https://registry.yarnpkg.com/cycle/-/cycle-1.0.3.tgz#21e80b2be8580f98b468f379430662b046c34ad2" - integrity sha1-IegLK+hYD5i0aPN5QwZisEbDStI= - cyclist@~0.2.2: version "0.2.2" resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640" @@ -6070,7 +6052,7 @@ execall@^1.0.0: dependencies: clone-regexp "^1.0.0" -exit@0.1.2, exit@0.1.x, exit@^0.1.2: +exit@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c" integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw= @@ -6240,7 +6222,7 @@ extglob@^2.0.4: snapdragon "^0.8.1" to-regex "^3.0.1" -extract-zip@^1.6.5, extract-zip@^1.6.6: +extract-zip@^1.6.6: version "1.6.7" resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.6.7.tgz#a840b4b8af6403264c8db57f4f1a74333ef81fe9" integrity sha1-qEC0uK9kAyZMjbV/Txp0Mz74H+k= @@ -6260,11 +6242,6 @@ extsprintf@^1.2.0: resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8= -eyes@0.1.x: - version "0.1.8" - resolved "https://registry.yarnpkg.com/eyes/-/eyes-0.1.8.tgz#62cf120234c683785d902348a800ef3e0cc20bc0" - integrity sha1-Ys8SAjTGg3hdkCNIqADvPgzCC8A= - fast-deep-equal@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614" @@ -6738,15 +6715,6 @@ fs-extra@3.0.1, fs-extra@3.x: jsonfile "^3.0.0" universalify "^0.1.0" -fs-extra@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-1.0.0.tgz#cd3ce5f7e7cb6145883fcae3191e9877f8587950" - integrity sha1-zTzl9+fLYUWIP8rjGR6Yd/hYeVA= - dependencies: - graceful-fs "^4.1.2" - jsonfile "^2.1.0" - klaw "^1.0.0" - fs-extra@^2.0.0: version "2.1.2" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-2.1.2.tgz#046c70163cef9aad46b0e4a7fa467fb22d71de35" @@ -7386,7 +7354,7 @@ got@^9.0.0: to-readable-stream "^1.0.0" url-parse-lax "^3.0.0" -graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9: +graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6: version "4.1.15" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00" integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA== @@ -7622,14 +7590,6 @@ hash@0.2.0: resolved "https://registry.yarnpkg.com/hash/-/hash-0.2.0.tgz#978654fa723b1252eea844e560c3931dad27289b" integrity sha1-l4ZU+nI7ElLuqETlYMOTHa0nKJs= -hasha@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/hasha/-/hasha-2.2.0.tgz#78d7cbfc1e6d66303fe79837365984517b2f6ee1" - integrity sha1-eNfL/B5tZjA/55g3NlmEUXsvbuE= - dependencies: - is-stream "^1.0.1" - pinkie-promise "^2.0.0" - he@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd" @@ -7829,17 +7789,6 @@ html-webpack-plugin@^3.2.0: tapable "^1.1.0" util.promisify "1.0.0" -htmlparser2@3.8.x, htmlparser2@~3.8.1: - version "3.8.3" - resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.8.3.tgz#996c28b191516a8be86501a7d79757e5c70c1068" - integrity sha1-mWwosZFRaovoZQGn15dX5ccMEGg= - dependencies: - domelementtype "1" - domhandler "2.3" - domutils "1.5" - entities "1.0" - readable-stream "1.1" - htmlparser2@3.9.1: version "3.9.1" resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.9.1.tgz#621b7a58bc9acd003f7af0a2c9a00aa67c8505d2" @@ -7874,6 +7823,17 @@ htmlparser2@~3.3.0: domutils "1.1" readable-stream "1.0" +htmlparser2@~3.8.1: + version "3.8.3" + resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.8.3.tgz#996c28b191516a8be86501a7d79757e5c70c1068" + integrity sha1-mWwosZFRaovoZQGn15dX5ccMEGg= + dependencies: + domelementtype "1" + domhandler "2.3" + domutils "1.5" + entities "1.0" + readable-stream "1.1" + http-cache-semantics@3.8.1, http-cache-semantics@^3.8.1: version "3.8.1" resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2" @@ -8872,7 +8832,7 @@ isomorphic-fetch@^2.1.1: node-fetch "^1.0.1" whatwg-fetch ">=0.10.0" -isstream@0.1.x, isstream@~0.1.2: +isstream@~0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= @@ -9397,24 +9357,6 @@ jsesc@~0.5.0: resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0= -jshint@^2.9.5: - version "2.9.6" - resolved "https://registry.yarnpkg.com/jshint/-/jshint-2.9.6.tgz#19b34e578095a34928fe006135a6cb70137b9c08" - integrity sha512-KO9SIAKTlJQOM4lE64GQUtGBRpTOuvbrRrSZw3AhUxMNG266nX9hK2cKA4SBhXOj0irJGyNyGSLT62HGOVDEOA== - dependencies: - cli "~1.0.0" - console-browserify "1.1.x" - exit "0.1.x" - htmlparser2 "3.8.x" - lodash "~4.17.10" - minimatch "~3.0.2" - shelljs "0.3.x" - strip-json-comments "1.0.x" - unicode-5.2.0 "^0.7.5" - optionalDependencies: - phantom "~4.0.1" - phantomjs-prebuilt "~2.1.7" - json-buffer@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898" @@ -9548,11 +9490,6 @@ jsprim@^1.2.2: json-schema "0.2.3" verror "1.10.0" -kew@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/kew/-/kew-0.7.0.tgz#79d93d2d33363d6fdd2970b335d9141ad591d79b" - integrity sha1-edk9LTM2PW/dKXCzNdkUGtWR15s= - keyv@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.0.0.tgz#44923ba39e68b12a7cec7df6c3268c031f2ef373" @@ -9608,13 +9545,6 @@ kind-of@^6.0.0, kind-of@^6.0.2: resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051" integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA== -klaw@^1.0.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439" - integrity sha1-QIhDO0azsbolnXh4XY6W9zugJDk= - optionalDependencies: - graceful-fs "^4.1.9" - kleur@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/kleur/-/kleur-2.0.2.tgz#b704f4944d95e255d038f0cb05fb8a602c55a300" @@ -12390,30 +12320,6 @@ performance-now@^2.1.0: resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= -phantom@~4.0.1: - version "4.0.12" - resolved "https://registry.yarnpkg.com/phantom/-/phantom-4.0.12.tgz#78d18cf3f2a76fea4909f6160fcabf2742d7dbf0" - integrity sha512-Tz82XhtPmwCk1FFPmecy7yRGZG2btpzY2KI9fcoPT7zT9det0CcMyfBFPp1S8DqzsnQnm8ZYEfdy528mwVtksA== - dependencies: - phantomjs-prebuilt "^2.1.16" - split "^1.0.1" - winston "^2.4.0" - -phantomjs-prebuilt@^2.1.16, phantomjs-prebuilt@~2.1.7: - version "2.1.16" - resolved "https://registry.yarnpkg.com/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.16.tgz#efd212a4a3966d3647684ea8ba788549be2aefef" - integrity sha1-79ISpKOWbTZHaE6ouniFSb4q7+8= - dependencies: - es6-promise "^4.0.3" - extract-zip "^1.6.5" - fs-extra "^1.0.0" - hasha "^2.2.0" - kew "^0.7.0" - progress "^1.1.8" - request "^2.81.0" - request-progress "^2.0.1" - which "^1.2.10" - pidtree@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.3.0.tgz#f6fada10fccc9f99bf50e90d0b23d72c9ebc2e6b" @@ -13223,11 +13129,6 @@ process@^0.11.10: resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI= -progress@^1.1.8: - version "1.1.8" - resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be" - integrity sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74= - progress@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.1.tgz#c9242169342b1c29d275889c95734621b1952e31" @@ -14116,13 +14017,6 @@ replace-ext@1.0.0, replace-ext@^1.0.0: resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb" integrity sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs= -request-progress@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/request-progress/-/request-progress-2.0.1.tgz#5d36bb57961c673aa5b788dbc8141fdf23b44e08" - integrity sha1-XTa7V5YcZzqlt4jbyBQf3yO0Tgg= - dependencies: - throttleit "^1.0.0" - request-promise-core@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.1.tgz#3eee00b2c5aa83239cfb04c5700da36f81cd08b6" @@ -14165,7 +14059,7 @@ request@2.87.0: tunnel-agent "^0.6.0" uuid "^3.1.0" -request@^2.69.0, request@^2.81.0, request@^2.83.0, request@^2.87.0, request@^2.88.0: +request@^2.69.0, request@^2.83.0, request@^2.87.0, request@^2.88.0: version "2.88.0" resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef" integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg== @@ -14848,11 +14742,6 @@ shell-quote@^1.6.1: array-reduce "~0.0.0" jsonify "~0.0.0" -shelljs@0.3.x: - version "0.3.0" - resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.3.0.tgz#3596e6307a781544f591f37da618360f31db57b1" - integrity sha1-NZbmMHp4FUT1kfN9phg2DzHbV7E= - shellwords@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b" @@ -15212,7 +15101,7 @@ split@^0.3.0: dependencies: through "2" -split@^1.0.0, split@^1.0.1: +split@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/split/-/split-1.0.1.tgz#605bd9be303aa59fb35f9229fbea0ddec9ea07d9" integrity sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg== @@ -15263,11 +15152,6 @@ stable@~0.1.6: resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf" integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w== -stack-trace@0.0.x: - version "0.0.10" - resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0" - integrity sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA= - stack-utils@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.2.tgz#33eba3897788558bebfc2db059dc158ec36cebb8" @@ -15551,11 +15435,6 @@ strip-indent@^2.0.0: resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68" integrity sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g= -strip-json-comments@1.0.x: - version "1.0.4" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-1.0.4.tgz#1e15fbcac97d3ee99bf2d73b4c656b082bbafb91" - integrity sha1-HhX7ysl9Pumb8tc7TGVrCCu6+5E= - strip-json-comments@^2.0.1, strip-json-comments@~2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" @@ -16057,11 +15936,6 @@ throat@^4.0.0: resolved "https://registry.yarnpkg.com/throat/-/throat-4.1.0.tgz#89037cbc92c56ab18926e6ba4cbb200e15672a6a" integrity sha1-iQN8vJLFarGJJua6TLsgDhVnKmo= -throttleit@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.0.tgz#9e785836daf46743145a5984b6268d828528ac6c" - integrity sha1-nnhYNtr0Z0MUWlmEtiaNgoUorGw= - through2-filter@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/through2-filter/-/through2-filter-2.0.0.tgz#60bc55a0dacb76085db1f9dae99ab43f83d622ec" @@ -16503,11 +16377,6 @@ unherit@^1.0.4: inherits "^2.0.1" xtend "^4.0.1" -unicode-5.2.0@^0.7.5: - version "0.7.5" - resolved "https://registry.yarnpkg.com/unicode-5.2.0/-/unicode-5.2.0-0.7.5.tgz#e0df129431a28a95263d8c480fb5e9ab2b0973f0" - integrity sha512-KVGLW1Bri30x00yv4HNM8kBxoqFXr0Sbo55735nvrlsx4PYBZol3UtoWgO492fSwmsetzPEZzy73rbU8OGXJcA== - unicode-canonical-property-names-ecmascript@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818" @@ -17349,7 +17218,7 @@ which-pm-runs@^1.0.0: resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.0.0.tgz#670b3afbc552e0b55df6b7780ca74615f23ad1cb" integrity sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs= -which@1, which@^1.0.5, which@^1.2.10, which@^1.2.12, which@^1.2.14, which@^1.2.9, which@^1.3.0, which@^1.3.1: +which@1, which@^1.0.5, which@^1.2.12, which@^1.2.14, which@^1.2.9, which@^1.3.0, which@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== @@ -17399,18 +17268,6 @@ window-size@^0.2.0: resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.2.0.tgz#b4315bb4214a3d7058ebeee892e13fa24d98b075" integrity sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU= -winston@^2.4.0: - version "2.4.4" - resolved "https://registry.yarnpkg.com/winston/-/winston-2.4.4.tgz#a01e4d1d0a103cf4eada6fc1f886b3110d71c34b" - integrity sha512-NBo2Pepn4hK4V01UfcWcDlmiVTs7VTB1h7bgnB0rgP146bYhMxX0ypCz3lBOfNxCO4Zuek7yeT+y/zM1OfMw4Q== - dependencies: - async "~1.0.0" - colors "1.0.x" - cycle "1.0.x" - eyes "0.1.x" - isstream "0.1.x" - stack-trace "0.0.x" - wolfy87-eventemitter@^5.2.4: version "5.2.5" resolved "https://registry.yarnpkg.com/wolfy87-eventemitter/-/wolfy87-eventemitter-5.2.5.tgz#e7af2adbb84e481c65edeb2a2e01032c8ff1b88f" From 060448f874a6d6e437e0799686f226395c43a0a4 Mon Sep 17 00:00:00 2001 From: Salem Ghoweri Date: Mon, 31 Dec 2018 16:08:08 -0500 Subject: [PATCH 32/34] chore: update Twig rendering service API snapshots --- .../api/__snapshots__/index.test.js.snap | 118 +++++++++--------- 1 file changed, 61 insertions(+), 57 deletions(-) diff --git a/packages/build-tools/api/__snapshots__/index.test.js.snap b/packages/build-tools/api/__snapshots__/index.test.js.snap index 927cf373f2..552045bf3e 100644 --- a/packages/build-tools/api/__snapshots__/index.test.js.snap +++ b/packages/build-tools/api/__snapshots__/index.test.js.snap @@ -1,67 +1,71 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Test the Bolt TwigRender API renders attributes on the button component correctly 1`] = ` -" - - -" -`; - -exports[`Test the Bolt TwigRender API renders the button component correctly 1`] = ` -" - - -" `; -exports[`Test the Bolt TwigRender API renders the secondary button correctly 1`] = ` -" - - + - +`; +exports[`Test the Bolt Twig Renderer API renders the secondary button correctly 1`] = ` + + + -" + + `; From 5b7060f8c4e11d89775c66cdfac9515257aff44e Mon Sep 17 00:00:00 2001 From: Salem Ghoweri Date: Mon, 31 Dec 2018 16:10:00 -0500 Subject: [PATCH 33/34] chore: fix lint issues --- packages/build-tools/cli.js | 4 ++-- packages/build-tools/create-webpack-config.js | 4 ++-- packages/components/bolt-dropdown/dropdown.js | 8 ++++---- packages/components/bolt-icon/src/icon.standalone.js | 5 +++-- packages/components/bolt-text/src/text.standalone.js | 4 ++-- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/packages/build-tools/cli.js b/packages/build-tools/cli.js index 3dd9f7171b..76c1c33127 100755 --- a/packages/build-tools/cli.js +++ b/packages/build-tools/cli.js @@ -82,8 +82,8 @@ if (program.configFile) { config.env = process.env.NODE_ENV ? process.env.NODE_ENV : typeof options.env === 'undefined' - ? config.env - : options.env; + ? config.env + : options.env; config.webpackStats = typeof options.webpackStats === 'undefined' diff --git a/packages/build-tools/create-webpack-config.js b/packages/build-tools/create-webpack-config.js index bd67ea01e8..3f11438a52 100644 --- a/packages/build-tools/create-webpack-config.js +++ b/packages/build-tools/create-webpack-config.js @@ -36,8 +36,8 @@ async function createWebpackConfig(buildConfig) { const publicPath = config.publicPath ? config.publicPath : config.wwwDir - ? `/${path.relative(config.wwwDir, config.buildDir)}/` - : config.buildDir; // @todo Ensure ends with `/` or we can get `distfonts/` instead of `dist/fonts/` + ? `/${path.relative(config.wwwDir, config.buildDir)}/` + : config.buildDir; // @todo Ensure ends with `/` or we can get `distfonts/` instead of `dist/fonts/` // @TODO: move this setting to .boltrc config const sassExportData = require('@bolt/sass-export-data')({ diff --git a/packages/components/bolt-dropdown/dropdown.js b/packages/components/bolt-dropdown/dropdown.js index b2e03c1d72..36c0ace1cd 100644 --- a/packages/components/bolt-dropdown/dropdown.js +++ b/packages/components/bolt-dropdown/dropdown.js @@ -115,8 +115,8 @@ class BoltDropdown extends withLitHtml() { const dropdownTitle = this.slots.title ? this.slot('title') : this.props.title - ? this.props.title - : ''; + ? this.props.title + : ''; return html`

@@ -152,8 +152,8 @@ class BoltDropdown extends withLitHtml() { const dropdownChildren = this.slots.default ? this.slot('default') : this.props.children - ? this.props.children - : ''; + ? this.props.children + : ''; return html`
diff --git a/packages/components/bolt-icon/src/icon.standalone.js b/packages/components/bolt-icon/src/icon.standalone.js index ae4214ed8f..eb1b35b097 100644 --- a/packages/components/bolt-icon/src/icon.standalone.js +++ b/packages/components/bolt-icon/src/icon.standalone.js @@ -124,8 +124,9 @@ class BoltIcon extends withPreact() { bgColor={primaryColor} fgColor={secondaryColor} /> - {background && - size === 'xlarge' && } + {background && size === 'xlarge' && ( + + )}
); } diff --git a/packages/components/bolt-text/src/text.standalone.js b/packages/components/bolt-text/src/text.standalone.js index bc061798bb..221aa3b893 100644 --- a/packages/components/bolt-text/src/text.standalone.js +++ b/packages/components/bolt-text/src/text.standalone.js @@ -55,8 +55,8 @@ class BoltText extends withLitHtml() { return schemaData.enum.indexOf(propVal) > -1 ? propVal : typeof schemaData.default !== 'undefined' - ? schemaData.default - : false; + ? schemaData.default + : false; } subComponentValues(propVal, defaultVal) { From 18d88d9ac563646a9650e0e9786569a313a7c236 Mon Sep 17 00:00:00 2001 From: Salem Ghoweri Date: Mon, 31 Dec 2018 16:38:30 -0500 Subject: [PATCH 34/34] test: test now deploy --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 36a732d341..78d31e36c8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -56,7 +56,9 @@ jobs: - docker tag boltdesignsystem/bolt boltdesignsystem/bolt:${GIT_SHA} - docker --log-level error push boltdesignsystem/bolt:latest - docker --log-level error push boltdesignsystem/bolt:${GIT_SHA} - + after_script: + - cd scripts && npm install + - npm run deploy cache: yarn: true directories: