From 0767f0d5681de9e795c6ed24c147427572566115 Mon Sep 17 00:00:00 2001 From: Laurent Payot Date: Tue, 12 Sep 2017 19:01:21 +0200 Subject: [PATCH 1/6] run cypress via npm-included npx npm 5.2.0 and above comes with a handy `npx` command to run executables in the node_modules directory. Added how to launch cypress this way. --- source/guides/getting-started/installing-cypress.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/source/guides/getting-started/installing-cypress.md b/source/guides/getting-started/installing-cypress.md index 778259761a..a2514bf89f 100644 --- a/source/guides/getting-started/installing-cypress.md +++ b/source/guides/getting-started/installing-cypress.md @@ -65,6 +65,12 @@ If you used `npm` to install, Cypress has now been installed to your `./node_mod $(npm bin)/cypress open ``` +**Or if your npm version is at least 5.2.0 you can use `npx`** + +```shell +npx cypress open +``` + After a moment, the Cypress Desktop application will launch. ## Adding npm scripts From af06a93dc01c3878c43f39ea2fcfd71ca75516cb Mon Sep 17 00:00:00 2001 From: Gleb Bahmutov Date: Tue, 12 Sep 2017 16:28:45 -0400 Subject: [PATCH 2/6] Use Node8 compatible hexo node-sass forks closes #67 * test CSS loaded properly for #67 * use our fork of hexo node-sass plugin with Node 8 support * move from console.log to debug * replace the right log to debug Tests the CSS on staging, close #67 --- CONTRIBUTING.md | 3 + cypress/integration/main_spec.coffee | 33 ++ lib/url_generator.js | 3 +- package-lock.json | 604 ++++++++++++++++++--------- package.json | 4 +- 5 files changed, 442 insertions(+), 205 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 300f7b9673..6179b37c95 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -54,6 +54,9 @@ npm start Visit [http://localhost:2222/](http://localhost:2222/). +**note** If you need to debug documentation build step run with environment +variable set `DEBUG=docs npm run build` + ## Writing Documentation ### Adding Examples diff --git a/cypress/integration/main_spec.coffee b/cypress/integration/main_spec.coffee index 5687dde84c..bf38567b9c 100644 --- a/cypress/integration/main_spec.coffee +++ b/cypress/integration/main_spec.coffee @@ -11,6 +11,39 @@ describe "Documentation", -> beforeEach -> cy.server() + context "CSS", -> + beforeEach -> + cy.visit("/") + # wait for the page redirect and load + cy.url().should('contain', 'why-cypress') + + # only works in development environment where each CSS + # file is separate + if Cypress.config('baseUrl').includes('localhost') + it "loads fira", -> + cy.request("fonts/vendor/fira/fira.css") + + it "has limited container height", -> + cy.get('#container') + .then (el) -> + elHeight = getComputedStyle(el[0]).height + viewportHeight = Cypress.config('viewportHeight') + expect(elHeight).to.equal(viewportHeight + 'px') + + it "has app CSS style rules", -> + isAppStyle = (ruleList) -> + ruleList.href.includes('/cypress.css') || # local separate CSS files + ruleList.href.includes('/style') # single bundle in production + + cy.document() + .then (doc) -> + appRules = Cypress._.find(doc.styleSheets, isAppStyle) + expect(appRules, 'app rules are loaded').to.not.be.undefined + cy.log('found App style rules') + containerRules = Cypress._.find(appRules.rules, {selectorText: '#container'}) + expect(containerRules, 'has #container CSS').to.not.be.undefined + cy.log('found CSS rules for', containerRules.selectorText) + context "Pages", -> describe "404", -> it "displays", -> diff --git a/lib/url_generator.js b/lib/url_generator.js index b9b8346d79..9fee773c4b 100644 --- a/lib/url_generator.js +++ b/lib/url_generator.js @@ -8,6 +8,7 @@ const request = require('request-promise') const errors = require('request-promise/errors') const la = require('lazy-ass') const is = require('check-more-types') +const debug = require('debug')('docs') const startsWithHttpRe = /^http/ const everythingAfterHashRe = /(#.+)/ @@ -252,7 +253,7 @@ function validateAndGetUrl (sidebar, href, source, text, render) { return Promise.resolve(cachedValue) } - console.log('requesting href', href) + debug('requesting href', href) if (isExternalHref(href)) { // cache this now even though diff --git a/package-lock.json b/package-lock.json index 8624f065a3..0b25b120f8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -49,25 +49,6 @@ "strip-ansi": "3.0.1", "supports-color": "2.0.0" } - }, - "cli-cursor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz", - "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=", - "dev": true, - "requires": { - "restore-cursor": "1.0.1" - } - }, - "restore-cursor": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz", - "integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=", - "dev": true, - "requires": { - "exit-hook": "1.1.1", - "onetime": "1.1.0" - } } } }, @@ -209,9 +190,9 @@ "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=" }, "ansi-escapes": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-2.0.0.tgz", - "integrity": "sha1-W65SvkJIeN2Xg+iRDj/Cki6DyBs=", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz", + "integrity": "sha1-06ioOzGapneTZisT52HHkRQiMG4=", "dev": true }, "ansi-regex": { @@ -433,9 +414,9 @@ } }, "aws-sdk": { - "version": "2.112.0", - "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.112.0.tgz", - "integrity": "sha1-mgSMDdWnQHoh9uhiNx0gSanPs1A=", + "version": "2.114.0", + "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.114.0.tgz", + "integrity": "sha1-NckZ6N4c/ZbtplzYpmGZcyR7tzc=", "dev": true, "requires": { "buffer": "4.9.1", @@ -450,12 +431,28 @@ "xmlbuilder": "4.2.1" }, "dependencies": { + "punycode": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", + "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=", + "dev": true + }, "sax": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz", "integrity": "sha1-e45lYZCyKOgaZq6nSEgNgozS03o=", "dev": true }, + "url": { + "version": "0.10.3", + "resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz", + "integrity": "sha1-Ah5NnHcF8hu/N9A861h2dAJ3TGQ=", + "dev": true, + "requires": { + "punycode": "1.3.2", + "querystring": "0.2.0" + } + }, "uuid": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz", @@ -977,7 +974,6 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz", "integrity": "sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==", - "dev": true, "requires": { "ansi-styles": "3.2.0", "escape-string-regexp": "1.0.5", @@ -988,7 +984,6 @@ "version": "3.2.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", - "dev": true, "requires": { "color-convert": "1.9.0" } @@ -997,13 +992,37 @@ "version": "4.4.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz", "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==", - "dev": true, "requires": { "has-flag": "2.0.0" } } } }, + "change-case": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/change-case/-/change-case-3.0.1.tgz", + "integrity": "sha1-7l9a0EFa0a2egHLPSc1M+nZgpVQ=", + "requires": { + "camel-case": "3.0.0", + "constant-case": "2.0.0", + "dot-case": "2.1.1", + "header-case": "1.0.1", + "is-lower-case": "1.1.3", + "is-upper-case": "1.1.2", + "lower-case": "1.1.4", + "lower-case-first": "1.0.2", + "no-case": "2.3.2", + "param-case": "2.1.1", + "pascal-case": "2.0.1", + "path-case": "2.1.1", + "sentence-case": "2.1.1", + "snake-case": "2.1.0", + "swap-case": "1.1.2", + "title-case": "2.1.1", + "upper-case": "1.1.3", + "upper-case-first": "1.1.2" + } + }, "chdir-promise": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/chdir-promise/-/chdir-promise-0.4.1.tgz", @@ -1162,12 +1181,12 @@ } }, "cli-cursor": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", - "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz", + "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=", "dev": true, "requires": { - "restore-cursor": "2.0.0" + "restore-cursor": "1.0.1" } }, "cli-spinners": { @@ -1268,7 +1287,6 @@ "version": "1.9.0", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz", "integrity": "sha1-Gsz5fdc5uYO/mU1W/sj5WFNkG3o=", - "dev": true, "requires": { "color-name": "1.1.3" } @@ -1276,8 +1294,7 @@ "color-name": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" }, "colors": { "version": "1.1.2", @@ -1404,6 +1421,15 @@ "resolved": "https://registry.npmjs.org/console-stream/-/console-stream-0.1.1.tgz", "integrity": "sha1-oJX+B7IEZZVfL6/Si11yvM2UnUQ=" }, + "constant-case": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/constant-case/-/constant-case-2.0.0.tgz", + "integrity": "sha1-QXV2TTidP6nI7NKRhu1gBSQ7akY=", + "requires": { + "snake-case": "2.1.0", + "upper-case": "1.1.3" + } + }, "convert-source-map": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz", @@ -1450,6 +1476,15 @@ "integrity": "sha1-zFRJaF37hesRyYKKzHy4erW7/MA=", "dev": true }, + "css-node-extract": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/css-node-extract/-/css-node-extract-1.1.0.tgz", + "integrity": "sha512-kG4Q1sVcp70K130ToqPEbc78kF4Cf1kxCmZd6cv0NWhY/CpGurfx6KykjKbEy+siOubS8RrcaC9NE68eCYPByg==", + "requires": { + "change-case": "3.0.1", + "postcss": "6.0.11" + } + }, "css-select": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz", @@ -1461,6 +1496,14 @@ "nth-check": "1.0.1" } }, + "css-selector-extract": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/css-selector-extract/-/css-selector-extract-3.1.3.tgz", + "integrity": "sha512-2v0yibPRPPuGEbPYP5FSRpyz9GRfFHgKPWNKGUogua9unpZT9zY+UWM5dvtP0SnMRI1dL6wKlQvL5/J9Xl/4fg==", + "requires": { + "postcss": "6.0.11" + } + }, "css-what": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.0.tgz", @@ -1577,12 +1620,6 @@ "graceful-fs": "4.1.11" } }, - "punycode": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", - "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=", - "dev": true - }, "request-progress": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-0.3.1.tgz", @@ -1598,16 +1635,6 @@ "integrity": "sha1-z+34jmDADdlpe2H90qg0OptoDq8=", "dev": true }, - "url": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", - "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=", - "dev": true, - "requires": { - "punycode": "1.3.2", - "querystring": "0.2.0" - } - }, "yauzl": { "version": "2.8.0", "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.8.0.tgz", @@ -2200,6 +2227,14 @@ "domelementtype": "1.3.0" } }, + "dot-case": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-2.1.1.tgz", + "integrity": "sha1-NNzzf1Co6TwrO8qLt/uRVcfaO+4=", + "requires": { + "no-case": "2.3.2" + } + }, "download": { "version": "4.4.3", "resolved": "https://registry.npmjs.org/download/-/download-4.4.3.tgz", @@ -2722,7 +2757,7 @@ "execa": "0.7.0", "p-finally": "1.0.0", "pify": "3.0.0", - "rimraf": "2.6.1", + "rimraf": "2.6.2", "tempfile": "2.0.0" }, "dependencies": { @@ -2732,9 +2767,9 @@ "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" }, "rimraf": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz", - "integrity": "sha1-wjOOxkPfeht/5cVPqG9XQopV8z0=", + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", + "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", "requires": { "glob": "7.1.2" } @@ -2817,12 +2852,11 @@ } }, "expand-tilde": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-1.2.2.tgz", - "integrity": "sha1-C4HrqJflo9MdHD0QL48BRB5VlEk=", - "dev": true, + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz", + "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=", "requires": { - "os-homedir": "1.0.2" + "homedir-polyfill": "1.0.1" } }, "extend": { @@ -3135,6 +3169,55 @@ "is-glob": "2.0.1", "micromatch": "2.3.11", "resolve-dir": "0.1.1" + }, + "dependencies": { + "expand-tilde": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-1.2.2.tgz", + "integrity": "sha1-C4HrqJflo9MdHD0QL48BRB5VlEk=", + "dev": true, + "requires": { + "os-homedir": "1.0.2" + } + }, + "global-modules": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-0.2.3.tgz", + "integrity": "sha1-6lo77ULG1s6ZWk+KEmm12uIjgo0=", + "dev": true, + "requires": { + "global-prefix": "0.1.5", + "is-windows": "0.2.0" + } + }, + "global-prefix": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.5.tgz", + "integrity": "sha1-jTvGuNo8qBEqFg2NSW/wRiv+948=", + "dev": true, + "requires": { + "homedir-polyfill": "1.0.1", + "ini": "1.3.4", + "is-windows": "0.2.0", + "which": "1.3.0" + } + }, + "is-windows": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz", + "integrity": "sha1-3hqm1j6indJIc3tp8f+LgALSEIw=", + "dev": true + }, + "resolve-dir": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-0.1.1.tgz", + "integrity": "sha1-shklmlYC+sXFxJatiUpujMQwJh4=", + "dev": true, + "requires": { + "expand-tilde": "1.2.2", + "global-modules": "0.2.3" + } + } } }, "fined": { @@ -3148,17 +3231,6 @@ "object.defaults": "1.1.0", "object.pick": "1.3.0", "parse-filepath": "1.0.1" - }, - "dependencies": { - "expand-tilde": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz", - "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=", - "dev": true, - "requires": { - "homedir-polyfill": "1.0.1" - } - } } }, "fira": { @@ -4149,6 +4221,14 @@ "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=", "dev": true }, + "get-installed-path": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/get-installed-path/-/get-installed-path-3.0.1.tgz", + "integrity": "sha512-JQz78VC8bYzhI+/h7Khcy1JC1P1V3wkc4fVEaMXgi0XLNjdNrZRTivLrA7kLDvFB3hVDPmgRKH1e7xc9zIbL+A==", + "requires": { + "global-modules": "1.0.0" + } + }, "get-own-enumerable-property-symbols": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-1.0.1.tgz", @@ -4525,24 +4605,24 @@ } }, "global-modules": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-0.2.3.tgz", - "integrity": "sha1-6lo77ULG1s6ZWk+KEmm12uIjgo0=", - "dev": true, + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz", + "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==", "requires": { - "global-prefix": "0.1.5", - "is-windows": "0.2.0" + "global-prefix": "1.0.2", + "is-windows": "1.0.1", + "resolve-dir": "1.0.1" } }, "global-prefix": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.5.tgz", - "integrity": "sha1-jTvGuNo8qBEqFg2NSW/wRiv+948=", - "dev": true, + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz", + "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=", "requires": { + "expand-tilde": "2.0.2", "homedir-polyfill": "1.0.1", "ini": "1.3.4", - "is-windows": "0.2.0", + "is-windows": "1.0.1", "which": "1.3.0" } }, @@ -4834,7 +4914,7 @@ "integrity": "sha1-KZNdKRXbhZRQwMbID5xvttDm0Ns=", "dev": true, "requires": { - "aws-sdk": "2.112.0", + "aws-sdk": "2.114.0", "clone": "1.0.2", "gulp-util": "3.0.8", "mime": "1.4.0", @@ -5502,8 +5582,7 @@ "has-flag": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", - "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=", - "dev": true + "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=" }, "has-gulplog": { "version": "0.1.0", @@ -5558,6 +5637,15 @@ "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz", "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=" }, + "header-case": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/header-case/-/header-case-1.0.1.tgz", + "integrity": "sha1-lTWXMZfBRLCWE81l0xfvGZY70C0=", + "requires": { + "no-case": "2.3.2", + "upper-case": "1.1.3" + } + }, "hexo": { "version": "3.3.8", "resolved": "https://registry.npmjs.org/hexo/-/hexo-3.3.8.tgz", @@ -5678,7 +5766,7 @@ "bluebird": "3.5.0", "clean-css": "4.1.8", "favicons": "4.8.6", - "html-minifier": "3.5.4", + "html-minifier": "3.5.5", "imagemin": "5.3.1", "imagemin-gifsicle": "5.2.0", "imagemin-jpeg-recompress": "5.1.0", @@ -5842,11 +5930,10 @@ } }, "hexo-renderer-scss": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/hexo-renderer-scss/-/hexo-renderer-scss-1.0.2.tgz", - "integrity": "sha1-oXVhdAEBJy34aGPol0noISY8ppc=", + "version": "github:cypress-io/hexo-renderer-scss#39f042c3c05aae485f9a8758e6a51a25a7c6d728", "requires": { - "node-sass": "3.13.1" + "node-sass": "4.5.3", + "node-sass-magic-importer": "5.0.0-alpha.8" } }, "hexo-server": { @@ -5915,7 +6002,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz", "integrity": "sha1-TCu8inWJmP7r9e1oWA921GdotLw=", - "dev": true, "requires": { "parse-passwd": "1.0.0" } @@ -5936,9 +6022,9 @@ "integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=" }, "html-minifier": { - "version": "3.5.4", - "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.4.tgz", - "integrity": "sha512-kzvy0Lvs4anPdqWgeXiLisMqAKyHwgajAQaarzwZJHkTU40/Cbqup873U2WtPem8uPbGddVnPes3wtfzQz3+hg==", + "version": "3.5.5", + "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.5.tgz", + "integrity": "sha512-g+1+NBycQI0fGnggd52JM8TRUweG7+9W2wrtjGitMAqc4G7maweAHvVAAjz9veHseIH3tYKE2lk2USGSoewIrQ==", "requires": { "camel-case": "3.0.0", "clean-css": "4.1.8", @@ -6189,12 +6275,27 @@ "through": "2.3.8" }, "dependencies": { + "ansi-escapes": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-2.0.0.tgz", + "integrity": "sha1-W65SvkJIeN2Xg+iRDj/Cki6DyBs=", + "dev": true + }, "ansi-regex": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", "dev": true }, + "cli-cursor": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", + "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", + "dev": true, + "requires": { + "restore-cursor": "2.0.0" + } + }, "figures": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz", @@ -6210,6 +6311,25 @@ "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", "dev": true }, + "onetime": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz", + "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", + "dev": true, + "requires": { + "mimic-fn": "1.1.0" + } + }, + "restore-cursor": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz", + "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", + "dev": true, + "requires": { + "onetime": "2.0.1", + "signal-exit": "3.0.2" + } + }, "string-width": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", @@ -6398,6 +6518,14 @@ "resolved": "https://registry.npmjs.org/is-jpg/-/is-jpg-1.0.0.tgz", "integrity": "sha1-KVnBfnNDDbOCZNp1uQ3VTy2G2hw=" }, + "is-lower-case": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/is-lower-case/-/is-lower-case-1.1.3.tgz", + "integrity": "sha1-fhR75HaNxGbbO/shzGCzHmrWk5M=", + "requires": { + "lower-case": "1.1.4" + } + }, "is-natural-number": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-natural-number/-/is-natural-number-2.1.1.tgz", @@ -6565,6 +6693,14 @@ "unc-path-regex": "0.1.2" } }, + "is-upper-case": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/is-upper-case/-/is-upper-case-1.1.2.tgz", + "integrity": "sha1-jQsfp+eTOh5YSDYA7H2WYcuvdW8=", + "requires": { + "upper-case": "1.1.3" + } + }, "is-url": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.2.tgz", @@ -6581,10 +6717,9 @@ "integrity": "sha1-1LVcafUYhvm2XHDWwmItN+KfSP4=" }, "is-windows": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz", - "integrity": "sha1-3hqm1j6indJIc3tp8f+LgALSEIw=", - "dev": true + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.1.tgz", + "integrity": "sha1-MQ23D3QtJZoWo2kgK1GvhCMzENk=" }, "is-zip": { "version": "1.0.0", @@ -7097,25 +7232,6 @@ "strip-ansi": "3.0.1", "supports-color": "2.0.0" } - }, - "cli-cursor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz", - "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=", - "dev": true, - "requires": { - "restore-cursor": "1.0.1" - } - }, - "restore-cursor": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz", - "integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=", - "dev": true, - "requires": { - "exit-hook": "1.1.1", - "onetime": "1.1.0" - } } } }, @@ -7403,6 +7519,11 @@ "integrity": "sha1-G6+lAF3p3W9PJmaMMMo3IwzJaJw=", "dev": true }, + "lodash.mergewith": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz", + "integrity": "sha1-FQzwoWeR9ZA7iJHqsVRgknS96lU=" + }, "lodash.restparam": { "version": "3.6.1", "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz", @@ -7487,33 +7608,6 @@ "requires": { "ansi-escapes": "1.4.0", "cli-cursor": "1.0.2" - }, - "dependencies": { - "ansi-escapes": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz", - "integrity": "sha1-06ioOzGapneTZisT52HHkRQiMG4=", - "dev": true - }, - "cli-cursor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz", - "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=", - "dev": true, - "requires": { - "restore-cursor": "1.0.1" - } - }, - "restore-cursor": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz", - "integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=", - "dev": true, - "requires": { - "exit-hook": "1.1.1", - "onetime": "1.1.0" - } - } } }, "logalot": { @@ -7550,6 +7644,14 @@ "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz", "integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=" }, + "lower-case-first": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/lower-case-first/-/lower-case-first-1.0.2.tgz", + "integrity": "sha1-5dp8JvKacHO+AtUrrJmA5ZIq36E=", + "requires": { + "lower-case": "1.1.4" + } + }, "lowercase-keys": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz", @@ -7822,9 +7924,9 @@ "integrity": "sha1-G79asbqCevI1dRQ0kEJkVfSB/h4=" }, "mocha": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-3.5.2.tgz", - "integrity": "sha512-iH5zl7afRZl1GvD0pnrRlazgc9Z/o34pXWmTFi8xNIMFKXgNL1SoBTDDb9sJfbV/sJV/j8X+0gvwY1QS1He7Nw==", + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-3.5.3.tgz", + "integrity": "sha512-/6na001MJWEtYxHOV1WLfsmR4YIynkUEhBwzsb+fk2qmQ3iqsi258l/Q2MWHJMImAcNpZ8DEdYAK72NHoIQ9Eg==", "dev": true, "requires": { "browser-stdout": "1.3.0", @@ -8192,9 +8294,9 @@ } }, "node-sass": { - "version": "3.13.1", - "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-3.13.1.tgz", - "integrity": "sha1-ckD7v/I5YwS0IjUn7TAgWJwAT8I=", + "version": "4.5.3", + "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.5.3.tgz", + "integrity": "sha1-0JydEXlkEjnRuX/8YjH9zsU+FWg=", "requires": { "async-foreach": "0.1.3", "chalk": "1.1.3", @@ -8205,13 +8307,15 @@ "in-publish": "2.0.0", "lodash.assign": "4.2.0", "lodash.clonedeep": "4.5.0", + "lodash.mergewith": "4.6.0", "meow": "3.7.0", "mkdirp": "0.5.1", "nan": "2.7.0", "node-gyp": "3.6.2", "npmlog": "4.1.2", "request": "2.81.0", - "sass-graph": "2.2.4" + "sass-graph": "2.2.4", + "stdout-stream": "1.4.0" }, "dependencies": { "chalk": { @@ -8250,6 +8354,19 @@ } } }, + "node-sass-magic-importer": { + "version": "5.0.0-alpha.8", + "resolved": "https://registry.npmjs.org/node-sass-magic-importer/-/node-sass-magic-importer-5.0.0-alpha.8.tgz", + "integrity": "sha512-gR9/wKAPc7DHSJrUFI98Zigw3AkEbBqEUzMIGguBeJ6JKkpP6N81CG61PBVE+5skwlHLw4eUCkC4vX3RlCokZQ==", + "requires": { + "css-node-extract": "1.1.0", + "css-selector-extract": "3.1.3", + "get-installed-path": "3.0.1", + "object-hash": "1.1.8", + "postcss-scss": "1.0.2", + "resolve": "1.4.0" + } + }, "node-status-codes": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz", @@ -8417,6 +8534,11 @@ "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" }, + "object-hash": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-1.1.8.tgz", + "integrity": "sha1-KKZZz5h9lqTavnhgKJ87UybEoDw=" + }, "object-keys": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz", @@ -8580,25 +8702,6 @@ "strip-ansi": "3.0.1", "supports-color": "2.0.0" } - }, - "cli-cursor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz", - "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=", - "dev": true, - "requires": { - "restore-cursor": "1.0.1" - } - }, - "restore-cursor": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz", - "integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=", - "dev": true, - "requires": { - "exit-hook": "1.1.1", - "onetime": "1.1.0" - } } } }, @@ -8811,6 +8914,12 @@ "requires": { "is-unc-path": "0.1.2" } + }, + "is-windows": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz", + "integrity": "sha1-3hqm1j6indJIc3tp8f+LgALSEIw=", + "dev": true } } }, @@ -8845,8 +8954,7 @@ "parse-passwd": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz", - "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=", - "dev": true + "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=" }, "parse-png": { "version": "1.1.2", @@ -8871,12 +8979,19 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-2.0.1.tgz", "integrity": "sha1-LVeNNFX2YNpl7KGO+VtODekSdh4=", - "dev": true, "requires": { "camel-case": "3.0.0", "upper-case-first": "1.1.2" } }, + "path-case": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/path-case/-/path-case-2.1.1.tgz", + "integrity": "sha1-lLgDfDctP+KQbkZbtF4l0ibo7qU=", + "requires": { + "no-case": "2.3.2" + } + }, "path-dirname": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz", @@ -8909,8 +9024,7 @@ "path-parse": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz", - "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=", - "dev": true + "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=" }, "path-root": { "version": "0.1.1", @@ -9087,6 +9201,34 @@ "integrity": "sha1-zqz9q0q/NT16DyqqLB/Hs/lBO6M=", "dev": true }, + "postcss": { + "version": "6.0.11", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.11.tgz", + "integrity": "sha512-DsnIzznNRQprsGTALpkC0xjDygo+QcOd+qVjP9+RjyzrPiyYOXBGOwoJ4rAiiE4lu6JggQ/jW4niY24WLxuncg==", + "requires": { + "chalk": "2.1.0", + "source-map": "0.5.7", + "supports-color": "4.4.0" + }, + "dependencies": { + "supports-color": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz", + "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==", + "requires": { + "has-flag": "2.0.0" + } + } + } + }, + "postcss-scss": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-1.0.2.tgz", + "integrity": "sha1-/0XPM1S4ee6JpOtoaA9GrJuxT5Q=", + "requires": { + "postcss": "6.0.11" + } + }, "prelude-ls": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", @@ -9585,19 +9727,17 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz", "integrity": "sha512-aW7sVKPufyHqOmyyLzg/J+8606v5nevBgaliIlV7nUpVMsDnoBGV/cbSLNjZAg9q0Cfd/+easKVKQ8vOu8fn1Q==", - "dev": true, "requires": { "path-parse": "1.0.5" } }, "resolve-dir": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-0.1.1.tgz", - "integrity": "sha1-shklmlYC+sXFxJatiUpujMQwJh4=", - "dev": true, + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz", + "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=", "requires": { - "expand-tilde": "1.2.2", - "global-modules": "0.2.3" + "expand-tilde": "2.0.2", + "global-modules": "1.0.0" } }, "resolve-from": { @@ -9607,24 +9747,13 @@ "dev": true }, "restore-cursor": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz", - "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz", + "integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=", "dev": true, "requires": { - "onetime": "2.0.1", - "signal-exit": "3.0.2" - }, - "dependencies": { - "onetime": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz", - "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", - "dev": true, - "requires": { - "mimic-fn": "1.1.0" - } - } + "exit-hook": "1.1.1", + "onetime": "1.1.0" } }, "right-align": { @@ -9859,6 +9988,15 @@ } } }, + "sentence-case": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/sentence-case/-/sentence-case-2.1.1.tgz", + "integrity": "sha1-H24t2jnBaL+S0T+G1KkYkz9mftQ=", + "requires": { + "no-case": "2.3.2", + "upper-case-first": "1.1.2" + } + }, "sequencify": { "version": "0.0.7", "resolved": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz", @@ -9961,6 +10099,14 @@ "integrity": "sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=", "dev": true }, + "snake-case": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/snake-case/-/snake-case-2.1.0.tgz", + "integrity": "sha1-Qb2xtz8w7GagTU4srRt2OH1NbZ8=", + "requires": { + "no-case": "2.3.2" + } + }, "snap-shot-compare": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/snap-shot-compare/-/snap-shot-compare-2.5.0.tgz", @@ -10154,6 +10300,43 @@ "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz", "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=" }, + "stdout-stream": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.0.tgz", + "integrity": "sha1-osfIWH5U2UJ+qe2zrD8s1SLfN4s=", + "requires": { + "readable-stream": "2.3.3" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + }, + "readable-stream": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", + "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "safe-buffer": "5.1.1", + "string_decoder": "1.0.3", + "util-deprecate": "1.0.2" + } + }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "requires": { + "safe-buffer": "5.1.1" + } + } + } + }, "stealthy-require": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz", @@ -10450,6 +10633,15 @@ } } }, + "swap-case": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/swap-case/-/swap-case-1.1.2.tgz", + "integrity": "sha1-w5IDpFhzhfrTyFCgvRvK+ggZdOM=", + "requires": { + "lower-case": "1.1.4", + "upper-case": "1.1.3" + } + }, "swig": { "version": "1.4.2", "resolved": "https://registry.npmjs.org/swig/-/swig-1.4.2.tgz", @@ -10702,6 +10894,15 @@ "resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.1.tgz", "integrity": "sha1-9PrTM0R7wLB9TcjpIJ2POaisd+g=" }, + "title-case": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/title-case/-/title-case-2.1.1.tgz", + "integrity": "sha1-PhJyFtpY0rxb7PE3q5Ha46fNj6o=", + "requires": { + "no-case": "2.3.2", + "upper-case": "1.1.3" + } + }, "titlecase": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/titlecase/-/titlecase-1.1.2.tgz", @@ -10943,15 +11144,14 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/upper-case-first/-/upper-case-first-1.1.2.tgz", "integrity": "sha1-XXm+3P8UQZUY/S7bCgUHybaFkRU=", - "dev": true, "requires": { "upper-case": "1.1.3" } }, "url": { - "version": "0.10.3", - "resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz", - "integrity": "sha1-Ah5NnHcF8hu/N9A861h2dAJ3TGQ=", + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", + "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=", "dev": true, "requires": { "punycode": "1.3.2", diff --git a/package.json b/package.json index 67a93080cf..2eaf8a7610 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,6 @@ "common-tags": "^1.4.0", "concurrent-transform": "^1.0.0", "cypress": "^0.20.0", - "debug": "^2.6.8", "dependency-check": "^2.9.1", "deps-ok": "^1.2.0", "eslint": "^4.6.1", @@ -87,6 +86,7 @@ "dependencies": { "bluebird": "3.5.0", "check-more-types": "^2.24.0", + "debug": "^2.6.8", "docsearch.js": "2.3.3", "fira": "github:cypress-io/fira#fb63362742eea8cdce0d90825ab9264d77719e3d", "font-awesome": "4.7.0", @@ -98,7 +98,7 @@ "hexo-generator-seo-friendly-sitemap": "0.0.20", "hexo-prism-plugin": "2.2.0", "hexo-renderer-marked": "0.3.0", - "hexo-renderer-scss": "1.0.2", + "hexo-renderer-scss": "github:cypress-io/hexo-renderer-scss#node-8", "hexo-server": "0.2.0", "lazy-ass": "^1.6.0", "lodash": "4.17.4", From 7f46bcf88580cd2ad0becf1758205f5bea89e089 Mon Sep 17 00:00:00 2001 From: Gleb Bahmutov Date: Tue, 12 Sep 2017 16:32:53 -0400 Subject: [PATCH 3/6] Add link to npx --- source/guides/getting-started/installing-cypress.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/source/guides/getting-started/installing-cypress.md b/source/guides/getting-started/installing-cypress.md index a2514bf89f..5cdcc462ad 100644 --- a/source/guides/getting-started/installing-cypress.md +++ b/source/guides/getting-started/installing-cypress.md @@ -65,7 +65,9 @@ If you used `npm` to install, Cypress has now been installed to your `./node_mod $(npm bin)/cypress open ``` -**Or if your npm version is at least 5.2.0 you can use `npx`** +**Or by using `npx`** + +**note**: [npx](https://www.npmjs.com/package/npx) is included with `npm > v5.2` or can be installed separately. ```shell npx cypress open From 0c9e423912a0360c20acae405f5ed3cb52276b92 Mon Sep 17 00:00:00 2001 From: Gleb Bahmutov Date: Tue, 12 Sep 2017 17:07:34 -0400 Subject: [PATCH 4/6] ci: do not pass record key if not set (#72) * ci: do not pass record key if not set, close #70 * fix duplicate command --- circle.yml | 17 +++++++++++++++-- package.json | 1 - 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/circle.yml b/circle.yml index 4e6ff6dd0c..e53a9d988c 100644 --- a/circle.yml +++ b/circle.yml @@ -74,7 +74,14 @@ jobs: - run: name: Waiting for local server to start command: $(npm bin)/wait-on http://localhost:2222 --interval 1000 --timeout 90000 - - run: npm run cypress + - run: + name: Running Cypress tests + command: | + if [ -n "$DOCS_RECORD_KEY" ]; then + $(npm bin)/cypress run --record --key $DOCS_RECORD_KEY + else + $(npm bin)/cypress run + fi "deploy-docs-staging": <<: *defaults @@ -91,7 +98,13 @@ jobs: command: cat public/build.json - run: name: Test deployed docs - command: CYPRESS_baseUrl=https://docs-staging.cypress.io npm run cypress + command: | + CYPRESS_baseUrl=https://docs-staging.cypress.io + if [ -n "$DOCS_RECORD_KEY" ]; then + $(npm bin)/cypress run --record --key $DOCS_RECORD_KEY + else + $(npm bin)/cypress run + fi "deploy-docs-production": <<: *defaults diff --git a/package.json b/package.json index 2eaf8a7610..3f7daa0498 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,6 @@ "deploy-prebuilt": "node ./cy_scripts/deploy.js", "scrape": "node ./cy_scripts/scrape.js", "start": "node --stack-size=8192 ./index.js server --port 2222", - "cypress": "cypress run --record --key $DOCS_RECORD_KEY", "test-e2e": "run-p --race start cypress", "test": "mocha --compilers coffee:coffee-script/register --recursive", "test-watch": "npm run test --silent -- --watch", From 88f8894274e1fc45bd700616c4b5026b1beb51f4 Mon Sep 17 00:00:00 2001 From: Gleb Bahmutov Date: Wed, 13 Sep 2017 10:06:34 -0400 Subject: [PATCH 5/6] export baseUrl before deploying staging --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index e53a9d988c..789d0eb1a7 100644 --- a/circle.yml +++ b/circle.yml @@ -99,7 +99,7 @@ jobs: - run: name: Test deployed docs command: | - CYPRESS_baseUrl=https://docs-staging.cypress.io + export CYPRESS_baseUrl=https://docs-staging.cypress.io if [ -n "$DOCS_RECORD_KEY" ]; then $(npm bin)/cypress run --record --key $DOCS_RECORD_KEY else From bb737e198ae27144252aed3d74f5b355e941896b Mon Sep 17 00:00:00 2001 From: Gleb Bahmutov Date: Wed, 13 Sep 2017 10:21:50 -0400 Subject: [PATCH 6/6] add dashboard badge, close #71 (#73) --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index b928bb9836..e578e42d9c 100644 --- a/readme.md +++ b/readme.md @@ -1,4 +1,4 @@ -# Cypress Documentation [![CircleCI](https://circleci.com/gh/cypress-io/cypress-documentation.svg?style=svg&circle-token=8a0253363287ab85d52953467603a4099a360c0c)](https://circleci.com/gh/cypress-io/cypress-documentation) [![first-timers-only](http://img.shields.io/badge/first--timers--only-friendly-blue.svg)](https://github.com/cypress-io/cypress-documentation/labels/first-timers-only) +# Cypress Documentation [![CircleCI](https://circleci.com/gh/cypress-io/cypress-documentation.svg?style=svg&circle-token=8a0253363287ab85d52953467603a4099a360c0c)](https://circleci.com/gh/cypress-io/cypress-documentation) [![Cypress Dashboard](https://img.shields.io/badge/cypress-dashboard-brightgreen.svg)](https://dashboard.cypress.io/#/projects/ma3dkn/runs) [![first-timers-only](http://img.shields.io/badge/first--timers--only-friendly-blue.svg)](https://github.com/cypress-io/cypress-documentation/labels/first-timers-only) The code for Cypress Documentation including Guides, API, Examples, Dashboard & FAQ found at https://docs.cypress.io.