diff --git a/.github/workflows/ci-weekly.yml b/.github/workflows/ci-weekly.yml index 51421ca88b8..7ba2a3ef21e 100644 --- a/.github/workflows/ci-weekly.yml +++ b/.github/workflows/ci-weekly.yml @@ -1,75 +1,170 @@ name: CI - FAST Validation on: + push: + braches: + - master + - releases/* + - features/* schedule: - cron: 0 7 * * 3 - - + jobs: - build_windows: - name: Validate on Windows - runs-on: windows-latest - env: - GITHUB_SERVICE_PAT: ${{sercrets.GH_PAT}} + build_linux: + runs-on: [ubuntu-latest] + steps: - uses: actions/checkout@v2 - - name: Setup Node.js environment - uses: actions/setup-node@v2.1.0 + - name: Get yarn cache directory path + id: yarn-cache-dir-path + run: echo '::set-output name=dir::$(yarn cache dir)' + + - name: Set up node_modules cache + uses: actions/cache@v1.1.2 + id: yarn-cache with: - node-version: '10' + path: ${{ steps.yarn-cache-dir-path.outputs.dir }} + key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} + restore-keys: | + ${{ runner.os }}-yarn- - - name: Install Lerna - run: npm i -g lerna + - name: Install package dependencies + run: yarn install --frozen-lockfile --ignore-scripts - - name: Install package dependencies / prepare workspaces - run: | - yarn install --frozen-lockfile + - name: Prepare workspaces + run: yarn prepare - - name: Ensure Prettier formatting - run: lerna run prettier:diff + - name: Testing Prettier format + run: yarn format:check - - name: Execute unit tests - run: lerna run test --stream + - name: Testing unit tests + run: yarn lerna run test --stream - - build_macos: - name: Validate on MacOS - - runs-on: macos-latest + - name: Collect and upload code coverage to Code Climate + uses: paambaati/codeclimate-action@v2.6.0 + + env: + CC_TEST_REPORTER_ID: 08a773cb4ea5811add5a45e12873e5cd2634c005568705cc37abfd5217617a32 + with: + coverageCommand: yarn lerna run coverage + coverageLocations: | + ${{github.workspace}}/packages/tooling/fast-tooling/coverage/lcov.info:lcov + ${{github.workspace}}/packages/tooling/fast-tooling-react/coverage/lcov.info:lcov + ${{github.workspace}}/packages/tooling/fast-tooling-wasm/coverage/lcov.info:lcov + ${{github.workspace}}/packages/tooling/fast-figma-plugin-msft/coverage/lcov.info:lcov + ${{github.workspace}}/packages/utilities/fast-animation/coverage/lcov.info:lcov + ${{github.workspace}}/packages/utilities/fast-colors/coverage/lcov.info:lcov + ${{github.workspace}}/packages/utilities/fast-web-utilities/coverage/lcov.info:lcov + ${{github.workspace}}/packages/utilities/fast-eslint-rules/coverage/lcov.info:lcov + ${{github.workspace}}/sites/fast-component-explorer/coverage/lcov.info:lcov + debug: false + + build-windows: + runs-on: [windows-latest] steps: + - name: Set git to use LF + run: | + git config --global core.autocrlf false + git config --global core.eol lf + - uses: actions/checkout@v2 - - name: Setup Node.js environment - uses: actions/setup-node@v2.1.0 + - name: Display the path + run: echo $PATH + shell: bash + + - name: Get yarn cache directory path + id: yarn-cache-dir-path + run: echo '::set-output name=dir::$(yarn cache dir)' + + - name: Set up node_modules cache + uses: actions/cache@v1.1.2 + id: yarn-cache with: - node-version: '10' + path: ${{ steps.yarn-cache-dir-path.outputs.dir }} + key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} + restore-keys: | + ${{ runner.os }}-yarn- - - name: Install Lerna - run: sudo yarn global add lerna + - name: Install package dependencies + run: yarn install --frozen-lockfile --ignore-scripts - - name: Install package dependencies / prepare workspaces - run: yarn install --frozen-lockfile + - name: Prepare workspaces + run: yarn prepare - - name: Ensure Prettier formatting - run: lerna run prettier:diff + - name: Testing Prettier format + run: yarn format:check - - name: Execute unit tests - run: lerna run test --stream + - name: Testing unit tests + run: yarn lerna run test --stream - code_scan: - name: Validate Security + - name: Collect and upload code coverage to Code Climate + uses: paambaati/codeclimate-action@v2.6.0 - runs-on: ubuntu-latest + env: + CC_TEST_REPORTER_ID: 08a773cb4ea5811add5a45e12873e5cd2634c005568705cc37abfd5217617a32 + with: + coverageCommand: yarn lerna run coverage + coverageLocations: | + ${{github.workspace}}/packages/tooling/fast-tooling/coverage/lcov.info:lcov + ${{github.workspace}}/packages/tooling/fast-tooling-react/coverage/lcov.info:lcov + ${{github.workspace}}/packages/tooling/fast-tooling-wasm/coverage/lcov.info:lcov + ${{github.workspace}}/packages/tooling/fast-figma-plugin-msft/coverage/lcov.info:lcov + ${{github.workspace}}/packages/utilities/fast-animation/coverage/lcov.info:lcov + ${{github.workspace}}/packages/utilities/fast-colors/coverage/lcov.info:lcov + ${{github.workspace}}/packages/utilities/fast-web-utilities/coverage/lcov.info:lcov + ${{github.workspace}}/packages/utilities/fast-eslint-rules/coverage/lcov.info:lcov + ${{github.workspace}}/sites/fast-component-explorer/coverage/lcov.info:lcov + debug: false + + build-macos: + runs-on: [macos-latest] steps: - uses: actions/checkout@v2 - - name: Initialize CodeQL - uses: github/codeql-action/init@v1 + - name: Get yarn cache directory path + id: yarn-cache-dir-path + run: echo '::set-output name=dir::$(yarn cache dir)' + + - name: Set up node_modules cache + uses: actions/cache@v1.1.2 + id: yarn-cache with: - languages: javascript + path: ${{ steps.yarn-cache-dir-path.outputs.dir }} + key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} + restore-keys: | + ${{ runner.os }}-yarn- + + - name: Install package dependencies + run: yarn install --frozen-lockfile --ignore-scripts - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1 \ No newline at end of file + - name: Prepare workspaces + run: yarn prepare + + - name: Testing Prettier format + run: yarn format:check + + - name: Testing unit tests + run: yarn lerna run test --stream + + - name: Collect and upload code coverage to Code Climate + uses: paambaati/codeclimate-action@v2.6.0 + + env: + CC_TEST_REPORTER_ID: 08a773cb4ea5811add5a45e12873e5cd2634c005568705cc37abfd5217617a32 + with: + coverageCommand: yarn lerna run coverage + coverageLocations: | + ${{github.workspace}}/packages/tooling/fast-tooling/coverage/lcov.info:lcov + ${{github.workspace}}/packages/tooling/fast-tooling-react/coverage/lcov.info:lcov + ${{github.workspace}}/packages/tooling/fast-tooling-wasm/coverage/lcov.info:lcov + ${{github.workspace}}/packages/tooling/fast-figma-plugin-msft/coverage/lcov.info:lcov + ${{github.workspace}}/packages/utilities/fast-animation/coverage/lcov.info:lcov + ${{github.workspace}}/packages/utilities/fast-colors/coverage/lcov.info:lcov + ${{github.workspace}}/packages/utilities/fast-web-utilities/coverage/lcov.info:lcov + ${{github.workspace}}/packages/utilities/fast-eslint-rules/coverage/lcov.info:lcov + ${{github.workspace}}/sites/fast-component-explorer/coverage/lcov.info:lcov + debug: false \ No newline at end of file diff --git a/.gitignore b/.gitignore index 1449236c552..d2f89d154f8 100644 --- a/.gitignore +++ b/.gitignore @@ -66,4 +66,5 @@ docs/en/packages/*/api/ # Ignore Build Artefacts bin/ -obj/ \ No newline at end of file +obj/ + diff --git a/.prettierignore b/.prettierignore index 53bdb3e7383..a10f172bda0 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,2 +1,10 @@ -packages/web-components/fast-components/src/default-palette.ts -packages/web-components/fast-element/src/**/*.spec.ts \ No newline at end of file +*.spec.ts +**/__test-images__ +**/__tests__ +**/.tmp +**/bootstrap +**/coverage +**/dist +**/temp +default-palette.ts +testData.ts \ No newline at end of file diff --git a/.prettierrc b/.prettierrc index 2bc74dd37dd..2bb675a0421 100644 --- a/.prettierrc +++ b/.prettierrc @@ -8,5 +8,6 @@ "bracketSpacing": true, "jsxBracketSameLine": false, "arrowParens": "avoid", - "htmlWhitespaceSensitivity": "ignore" + "htmlWhitespaceSensitivity": "ignore", + "endOfLine": "auto" } \ No newline at end of file diff --git a/package.json b/package.json index 91d59d0a7ac..2ef38071d5e 100644 --- a/package.json +++ b/package.json @@ -45,10 +45,12 @@ "integration-tests:beta": "node build/testing/sauce-labs/test-browsers.js beta", "integration-tests:release": "node build/testing/sauce-labs/test-browsers.js release", "prepare": "lerna run prepare", - "test": "yarn eslint && yarn unit-tests", + "test": "yarn eslint \"/**/*.{ts}\"", "unit-tests": "jest --maxWorkers=4", "unit-tests:watch": "jest --watch", - "watch": "tsc -p ./tsconfig.json -w --preserveWatchOutput" + "watch": "tsc -p ./tsconfig.json -w --preserveWatchOutput", + "format:check": "lerna run prettier:diff", + "format": "lerna run prettier" }, "husky": { "hooks": { @@ -92,7 +94,7 @@ "build/helpers/__tests__/*", "build/helpers/" ], - "testRegex": "(/__tests__/.*|(\\.|/)(test|spec))\\.(js?|ts?)$", + "testRegex": "/__tests__/.*\\.(test|spec)\\.(js|ts|tsx)$", "moduleFileExtensions": [ "ts", "js" diff --git a/sites/fast-color-explorer/app/site-footer.tsx b/sites/fast-color-explorer/app/site-footer.tsx index ad3f806787a..d22c6ba9c0a 100644 --- a/sites/fast-color-explorer/app/site-footer.tsx +++ b/sites/fast-color-explorer/app/site-footer.tsx @@ -13,7 +13,7 @@ export class Footer extends React.Component<{}, {}> { ); } diff --git a/sites/fast-component-explorer/app/site-footer.tsx b/sites/fast-component-explorer/app/site-footer.tsx index 2e57301235a..52a108c2acd 100644 --- a/sites/fast-component-explorer/app/site-footer.tsx +++ b/sites/fast-component-explorer/app/site-footer.tsx @@ -14,7 +14,7 @@ export class Footer extends React.Component<{}, {}> { ); diff --git a/sites/fast-creator/app/site-footer.tsx b/sites/fast-creator/app/site-footer.tsx index 2e57301235a..52a108c2acd 100644 --- a/sites/fast-creator/app/site-footer.tsx +++ b/sites/fast-creator/app/site-footer.tsx @@ -14,7 +14,7 @@ export class Footer extends React.Component<{}, {}> { ); diff --git a/sites/fast-website/package.json b/sites/fast-website/package.json index 57509c8465f..2d9bd55fc0c 100644 --- a/sites/fast-website/package.json +++ b/sites/fast-website/package.json @@ -25,7 +25,7 @@ "prettier": "2.0.2", "rollup": "^2.7.6", "rollup-plugin-commonjs": "^10.1.0", - "rollup-plugin-ejs": "^2.2.0", + "rollup-plugin-jst": "^1.2.0", "rollup-plugin-node-resolve": "^5.2.0", "rollup-plugin-svg": "^2.0.0", "rollup-plugin-typescript2": "^0.27.1", diff --git a/sites/fast-website/rollup.config.js b/sites/fast-website/rollup.config.js index ed4e2460890..a96b4ee84e6 100644 --- a/sites/fast-website/rollup.config.js +++ b/sites/fast-website/rollup.config.js @@ -1,7 +1,7 @@ import alias from "@rollup/plugin-alias"; import path from "path"; import commonJS from "rollup-plugin-commonjs"; -import ejs from "rollup-plugin-ejs"; +import jst from "rollup-plugin-jst"; import resolve from "rollup-plugin-node-resolve"; import svg from "rollup-plugin-svg"; import typescript from "rollup-plugin-typescript2"; @@ -23,14 +23,7 @@ export default [ }), resolve(), commonJS(), - ejs({ - render: { - data: null, - }, - compilerOptions: { - client: true, - }, - }), + jst(), svg(), typescript({ tsconfigOverride: { diff --git a/yarn.lock b/yarn.lock index f8a8d20dfd8..1dd034ffcef 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7913,11 +7913,6 @@ async-each@^1.0.1: resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf" integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ== -async-foreach@^0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542" - integrity sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI= - async-limiter@~1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd" @@ -9116,13 +9111,6 @@ blob@0.0.5: resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.5.tgz#d680eeef25f8cd91ad533f5b01eed48e64caf683" integrity sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig== -block-stream@*: - version "0.0.9" - resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a" - integrity sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo= - dependencies: - inherits "~2.0.0" - bluebird@^3.0.5, bluebird@^3.3.5, bluebird@^3.5.1, bluebird@^3.5.3, bluebird@^3.5.5: version "3.7.1" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.1.tgz#df70e302b471d7473489acf26a93d63b53f874de" @@ -9968,7 +9956,7 @@ chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3. escape-string-regexp "^1.0.5" supports-color "^5.3.0" -chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3: +chalk@^1.0.0, chalk@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= @@ -11212,14 +11200,6 @@ cross-spawn@7.0.1, cross-spawn@^7.0.0: shebang-command "^2.0.0" which "^2.0.1" -cross-spawn@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982" - integrity sha1-ElYDfsufDF9549bvE14wdwGEuYI= - dependencies: - lru-cache "^4.0.1" - which "^1.2.9" - cross-spawn@^5.0.1: version "5.1.0" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" @@ -12342,7 +12322,7 @@ ejs@^2.6.1: resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.2.tgz#749037c4c09bd57626a6140afbe6b7e650661614" integrity sha512-rHGwtpl67oih3xAHbZlpw5rQAt+YV1mSCu2fUZ9XNrfaGEhom7E+AUiMci+ByP4aSfuAWx7hE0BPuJLMrpXwOw== -ejs@^2.7.1, ejs@^2.7.4: +ejs@^2.7.4: version "2.7.4" resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz#48661287573dcc53e366c7a1ae52c3a120eec9ba" integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA== @@ -13986,16 +13966,6 @@ fsevents@~2.1.1, fsevents@~2.1.2: resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e" integrity sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ== -fstream@^1.0.0, fstream@^1.0.12: - version "1.0.12" - resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045" - integrity sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg== - dependencies: - graceful-fs "^4.1.2" - inherits "~2.0.0" - mkdirp ">=0.5 0" - rimraf "2" - function-bind@^1.0.2, function-bind@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" @@ -14040,13 +14010,6 @@ gauge@~2.7.3: strip-ansi "^3.0.1" wide-align "^1.1.0" -gaze@^1.0.0: - version "1.1.3" - resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.3.tgz#c441733e13b927ac8c0ff0b4c3b033f28812924a" - integrity sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g== - dependencies: - globule "^1.0.0" - genfun@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/genfun/-/genfun-5.0.0.tgz#9dd9710a06900a5c4a5bf57aca5da4e52fe76537" @@ -14285,7 +14248,7 @@ glob@^5.0.15: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@~7.1.1: +glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: version "7.1.6" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== @@ -14477,15 +14440,6 @@ globby@^9.2.0: pify "^4.0.1" slash "^2.0.0" -globule@^1.0.0: - version "1.3.2" - resolved "https://registry.yarnpkg.com/globule/-/globule-1.3.2.tgz#d8bdd9e9e4eef8f96e245999a5dee7eb5d8529c4" - integrity sha512-7IDTQTIu2xzXkT+6mlluidnWo+BypnbSoEVVQCGfzqnl5Ik8d3e1d4wycb8Rj9tWW+Z39uPWsdlquqiqPCd/pA== - dependencies: - glob "~7.1.1" - lodash "~4.17.10" - minimatch "~3.0.2" - good-listener@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/good-listener/-/good-listener-1.2.2.tgz#d53b30cdf9313dffb7dc9a0d477096aa6d145c50" @@ -15057,7 +15011,7 @@ html-minifier@^1.0.0: relateurl "0.2.x" uglify-js "2.6.x" -html-minifier@^3.2.3, html-minifier@^3.5.8: +html-minifier@^3.2.3, html-minifier@^3.5.6, 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== @@ -15070,19 +15024,6 @@ html-minifier@^3.2.3, html-minifier@^3.5.8: relateurl "0.2.x" uglify-js "3.4.x" -html-minifier@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-4.0.0.tgz#cca9aad8bce1175e02e17a8c33e46d8988889f56" - integrity sha512-aoGxanpFPLg7MkIl/DDFYtb0iWz7jMFGqFhvEDZga6/4QTjneiD8I/NXL1x5aaoCp7FSIT6h/OhykDdPsbtMig== - dependencies: - camel-case "^3.0.0" - clean-css "^4.2.1" - commander "^2.19.0" - he "^1.2.0" - param-case "^2.1.1" - relateurl "^0.2.7" - uglify-js "^3.5.1" - html-tags@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.1.0.tgz#7b5e6f7e665e9fb41f30007ed9e0d41e97fb2140" @@ -15459,11 +15400,6 @@ imurmurhash@^0.1.4: resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= -in-publish@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.1.tgz#948b1a535c8030561cea522f73f78f4be357e00c" - integrity sha512-oDM0kUSNFC31ShNxHKUyfZKy8ZeXZBWMjMdZHKLOk13uvT27VTL/QzRGfRUcevJhpkZAvlhPYuXkF7eNWrtyxQ== - indent-string@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80" @@ -15509,7 +15445,7 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@2.0.4, inherits@^2.0.0, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3: +inherits@2, inherits@2.0.4, inherits@^2.0.0, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3: version "2.0.4" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== @@ -16989,11 +16925,6 @@ jpeg-js@^0.3.4: resolved "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.3.7.tgz#471a89d06011640592d314158608690172b1028d" integrity sha512-9IXdWudL61npZjvLuVe/ktHiA41iE8qFyLB+4VDTblEsWBzeg8WQTlktdUK4CdncUqtUgUg0bbOmTE2bKBKaBQ== -js-base64@^2.1.8: - version "2.6.4" - resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.6.4.tgz#f4e686c5de1ea1f867dbcad3d46d969428df98c4" - integrity sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ== - js-base64@^2.1.9: version "2.5.1" resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.1.tgz#1efa39ef2c5f7980bb1784ade4a8af2de3291121" @@ -18233,17 +18164,12 @@ lodash@^3.10.1: resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6" integrity sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y= -lodash@^4.0.0, lodash@~4.17.10: - version "4.17.19" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b" - integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ== - lodash@^4.0.1, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1, lodash@~4.17.15: version "4.17.15" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== -lodash@^4.17.19, lodash@^4.5.2: +lodash@^4.17.19, lodash@^4.5.2, lodash@^4.9.0: version "4.17.20" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52" integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA== @@ -18735,7 +18661,7 @@ memory-fs@^0.5.0: errno "^0.1.3" readable-stream "^2.0.1" -meow@^3.3.0, meow@^3.7.0: +meow@^3.3.0: version "3.7.0" resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb" integrity sha1-cstmi0JSKCkKu/qFaJJYcwioAfs= @@ -19006,7 +18932,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1: resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo= -"minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2: +"minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== @@ -19179,7 +19105,7 @@ mkdirp@*, mkdirp@0.5.1, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5 dependencies: minimist "0.0.8" -mkdirp@0.5.5, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.3: +mkdirp@0.5.5, mkdirp@0.5.x, mkdirp@^0.5.3: version "0.5.5" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== @@ -19358,11 +19284,6 @@ nan@^2.12.1: resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c" integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg== -nan@^2.13.2: - version "2.14.1" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.1.tgz#d7be34dfa3105b91494c3147089315eff8874b01" - integrity sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw== - nanomatch@^1.2.9: version "1.2.13" resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" @@ -19518,24 +19439,6 @@ node-forge@^0.10.0: resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3" integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA== -node-gyp@^3.8.0: - version "3.8.0" - resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c" - integrity sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA== - dependencies: - fstream "^1.0.0" - glob "^7.0.3" - graceful-fs "^4.1.2" - mkdirp "^0.5.0" - nopt "2 || 3" - npmlog "0 || 1 || 2 || 3 || 4" - osenv "0" - request "^2.87.0" - rimraf "2" - semver "~5.3.0" - tar "^2.0.0" - which "1" - node-gyp@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-4.0.0.tgz#972654af4e5dd0cd2a19081b4b46fe0442ba6f45" @@ -19684,29 +19587,6 @@ node-releases@^1.1.53: resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.55.tgz#8af23b7c561d8e2e6e36a46637bab84633b07cee" integrity sha512-H3R3YR/8TjT5WPin/wOoHOUPHgvj8leuU/Keta/rwelEQN9pA/S2Dx8/se4pZ2LBxSd0nAGzsNzhqwa77v7F1w== -node-sass@^4.12.0: - version "4.14.1" - resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.14.1.tgz#99c87ec2efb7047ed638fb4c9db7f3a42e2217b5" - integrity sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g== - dependencies: - async-foreach "^0.1.3" - chalk "^1.1.1" - cross-spawn "^3.0.0" - gaze "^1.0.0" - get-stdin "^4.0.1" - glob "^7.0.3" - in-publish "^2.0.0" - lodash "^4.17.15" - meow "^3.7.0" - mkdirp "^0.5.1" - nan "^2.13.2" - node-gyp "^3.8.0" - npmlog "^4.0.0" - request "^2.88.0" - sass-graph "2.2.5" - stdout-stream "^1.4.0" - "true-case-path" "^1.0.2" - noms@0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/noms/-/noms-0.0.0.tgz#da8ebd9f3af9d6760919b27d9cdc8092a7332859" @@ -19965,7 +19845,7 @@ npm-run-path@^4.0.0: dependencies: path-key "^3.0.0" -"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.1, npmlog@^4.0.2, npmlog@^4.1.2: +"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.1, npmlog@^4.0.2, npmlog@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== @@ -24031,16 +23911,6 @@ rollup-plugin-commonjs@^10.1.0: resolve "^1.11.0" rollup-pluginutils "^2.8.1" -rollup-plugin-ejs@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/rollup-plugin-ejs/-/rollup-plugin-ejs-2.2.0.tgz#86b8d0f255ecbe92df12e3ca41e504f039b32f43" - integrity sha512-vwIdfvhruBin+Na4jQ8Wub+IFkGdA5oKdPrSPKB8gwAOnYQZpJS5z+GO+bXA0SmFwS129OJ2bKubpiuqi4dpng== - dependencies: - ejs "^2.7.1" - html-minifier "^4.0.0" - node-sass "^4.12.0" - rollup-pluginutils "^2.8.1" - rollup-plugin-filesize@^8.0.2: version "8.0.2" resolved "https://registry.yarnpkg.com/rollup-plugin-filesize/-/rollup-plugin-filesize-8.0.2.tgz#d120f0dbe591a2e665ed2e9453bd6ab149a393d0" @@ -24054,6 +23924,15 @@ rollup-plugin-filesize@^8.0.2: pacote "^11.1.6" terser "^4.6.12" +rollup-plugin-jst@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/rollup-plugin-jst/-/rollup-plugin-jst-1.2.0.tgz#e57a76d550e020a2d4c7ef7f7be61ad0a40f2287" + integrity sha512-sTc5EHbl9FY3VAgeiPJ23gDzvl7KL+tR/YU3aH/GjclB+0HXWuaNVqLyj1dABYymbgrygwkAAeXeJ7PfdyBAXw== + dependencies: + html-minifier "^3.5.6" + lodash "^4.9.0" + rollup-pluginutils "^2.0.1" + rollup-plugin-node-resolve@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-5.2.0.tgz#730f93d10ed202473b1fb54a5997a7db8c6d8523" @@ -24122,7 +24001,7 @@ rollup-pluginutils@^1.3.1: estree-walker "^0.2.1" minimatch "^3.0.2" -rollup-pluginutils@^2.8.1, rollup-pluginutils@^2.8.2: +rollup-pluginutils@^2.0.1, rollup-pluginutils@^2.8.1, rollup-pluginutils@^2.8.2: version "2.8.2" resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz#72f2af0748b592364dbd3389e600e5a9444a351e" integrity sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ== @@ -24241,16 +24120,6 @@ sane@^4.0.3: minimist "^1.1.1" walker "~1.0.5" -sass-graph@2.2.5: - version "2.2.5" - resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.5.tgz#a981c87446b8319d96dce0671e487879bd24c2e8" - integrity sha512-VFWDAHOe6mRuT4mZRd4eKE+d8Uedrk6Xnh7Sh9b4NGufQLQjOrvf/MQoOdx+0s92L89FeyUUNfU597j/3uNpag== - dependencies: - glob "^7.0.0" - lodash "^4.0.0" - scss-tokenizer "^0.2.3" - yargs "^13.3.2" - saucelabs@^1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/saucelabs/-/saucelabs-1.5.0.tgz#9405a73c360d449b232839919a86c396d379fd9d" @@ -24366,14 +24235,6 @@ schema-utils@^2.7.0: ajv "^6.12.2" ajv-keywords "^3.4.1" -scss-tokenizer@^0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1" - integrity sha1-jrBtualyMzOCTT9VMGQRSYR85dE= - dependencies: - js-base64 "^2.1.8" - source-map "^0.4.2" - section-matter@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/section-matter/-/section-matter-1.0.0.tgz#e9041953506780ec01d59f292a19c7b850b84167" @@ -25018,7 +24879,7 @@ source-map-url@^0.4.0: resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3" integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM= -source-map@0.4.x, source-map@^0.4.2, source-map@~0.4.1: +source-map@0.4.x, source-map@~0.4.1: version "0.4.4" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b" integrity sha1-66T12pwNyZneaAMti092FzZSA2s= @@ -25204,13 +25065,6 @@ std-env@^2.2.1: dependencies: ci-info "^1.6.0" -stdout-stream@^1.4.0: - version "1.4.1" - resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.1.tgz#5ac174cdd5cd726104aa0c0b2bd83815d8d535de" - integrity sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA== - dependencies: - readable-stream "^2.0.1" - stealthy-require@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b" @@ -25783,15 +25637,6 @@ tar-stream@^2.0.0: inherits "^2.0.3" readable-stream "^3.1.1" -tar@^2.0.0: - version "2.2.2" - resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.2.tgz#0ca8848562c7299b8b446ff6a4d60cdbb23edc40" - integrity sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA== - dependencies: - block-stream "*" - fstream "^1.0.12" - inherits "2" - tar@^4, tar@^4.4.10, tar@^4.4.12, tar@^4.4.8: version "4.4.13" resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" @@ -26326,13 +26171,6 @@ trough@^1.0.0: resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.5.tgz#b8b639cefad7d0bb2abd37d433ff8293efa5f406" integrity sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA== -"true-case-path@^1.0.2": - version "1.0.3" - resolved "https://registry.yarnpkg.com/true-case-path/-/true-case-path-1.0.3.tgz#f813b5a8c86b40da59606722b144e3225799f47d" - integrity sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew== - dependencies: - glob "^7.1.2" - tryer@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/tryer/-/tryer-1.0.1.tgz#f2c85406800b9b0f74c9f7465b81eaad241252f8" @@ -26664,11 +26502,6 @@ uglify-js@^3.1.4: commander "~2.20.3" source-map "~0.6.1" -uglify-js@^3.5.1: - version "3.10.1" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.10.1.tgz#dd14767eb7150de97f2573a5ff210db14fffe4ad" - integrity sha512-RjxApKkrPJB6kjJxQS3iZlf///REXWYxYJxO/MpmlQzVkDWVI3PSnCBWezMecmTU/TRkNxrl8bmsfFQCp+LO+Q== - uglify-to-browserify@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"