Skip to content

Commit a93ba6e

Browse files
committed
Merge branch 'main' of github.com:cypress-io/cypress-documentation
2 parents 486f341 + 98a0f33 commit a93ba6e

File tree

2,091 files changed

+112723
-100482
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,091 files changed

+112723
-100482
lines changed

.circleci/config.yml

Lines changed: 25 additions & 124 deletions
Original file line numberDiff line numberDiff line change
@@ -6,35 +6,30 @@ orbs:
66
executors:
77
node-executor:
88
docker:
9-
- image: cimg/node:14.16.0
9+
- image: cimg/node:16.15.1
1010
with-chrome-and-firefox:
1111
resource_class: medium+
1212
docker:
1313
- image: 'cypress/browsers:node16.13.2-chrome97-ff96'
1414

1515
commands:
16-
nuxt-build:
16+
docs-build:
1717
steps:
1818
- checkout
1919
- restore_cache:
2020
keys:
21-
- yarn-cache-{{ checksum "yarn.lock" }}-{{ checksum "patches/github-slugger+1.3.0.patch" }}-{{ checksum "patches/vue-scrollactive+0.9.3.patch" }}-{{ checksum "patches/@docsearch+js+1.0.0-alpha.28.patch" }}-{{ checksum "patches/@nuxt+vue-app+2.14.12.patch" }}
21+
- npm-cache-{{ checksum "package-lock.json" }}
2222
- run:
2323
name: Install Dependencies
24-
command: yarn --frozen-lockfile
24+
command: npm ci
2525
- save_cache:
26-
key: yarn-cache-{{ checksum "yarn.lock" }}-{{ checksum "patches/github-slugger+1.3.0.patch" }}-{{ checksum "patches/vue-scrollactive+0.9.3.patch" }}-{{ checksum "patches/@docsearch+js+1.0.0-alpha.28.patch" }}-{{ checksum "patches/@nuxt+vue-app+2.14.12.patch" }}
26+
key: npm-cache-{{ checksum "package-lock.json" }}
2727
paths:
2828
- node_modules
2929
- run:
30-
name: Nuxt Build
31-
command: yarn build
30+
name: Docs Build
31+
command: npm run build
3232

33-
link-check-changed-files:
34-
steps:
35-
- run:
36-
name: Broken link checker for changed files
37-
command: yarn changed-files-broken-link-checker:ci
3833

3934
job-defaults: &job-defaults
4035
executor: node-executor
@@ -44,145 +39,51 @@ jobs:
4439
build:
4540
<<: *job-defaults
4641
steps:
47-
- nuxt-build
42+
- docs-build
4843
- persist_to_workspace:
4944
root: ~/repo
5045
paths:
51-
- build/*
46+
- dist/*
5247
- node_modules/*
5348

54-
link-check-changed-files:
55-
<<: *job-defaults
56-
steps:
57-
- checkout
58-
- attach_workspace:
59-
at: ~/repo
60-
- link-check-changed-files
61-
6249
lint:
6350
<<: *job-defaults
6451
steps:
6552
- checkout
6653
- attach_workspace:
6754
at: ~/repo
68-
- run: yarn lint
69-
70-
broken-link-check-prod:
71-
<<: *job-defaults
72-
steps:
73-
- checkout
74-
- restore_cache:
75-
keys:
76-
- yarn-cache-{{ checksum "yarn.lock" }}-{{ checksum "patches/github-slugger+1.3.0.patch" }}-{{ checksum "patches/vue-scrollactive+0.9.3.patch" }}-{{ checksum "patches/@docsearch+js+1.0.0-alpha.28.patch" }}-{{ checksum "patches/@nuxt+vue-app+2.14.12.patch" }}
77-
- run:
78-
name: Install Dependencies
79-
command: yarn --frozen-lockfile
80-
- run:
81-
name: Broken link checker
82-
command: yarn broken-link-checker:prod
83-
55+
- run: npm run lint
56+
8457
release:
85-
<<: *job-defaults
86-
steps:
87-
- nuxt-build
88-
- run:
89-
name: Docsearch Scraper
90-
command: node ./cy_scripts/scrape.js
91-
92-
publish-scheduled-sanity-content:
9358
<<: *job-defaults
9459
steps:
9560
- checkout
96-
- restore_cache:
97-
keys:
98-
- yarn-cache-{{ checksum "yarn.lock" }}-{{ checksum "patches/github-slugger+1.3.0.patch" }}-{{ checksum "patches/vue-scrollactive+0.9.3.patch" }}-{{ checksum "patches/@docsearch+js+1.0.0-alpha.28.patch" }}-{{ checksum "patches/@nuxt+vue-app+2.14.12.patch" }}
99-
- run:
100-
name: Install Dependencies
101-
command: yarn --frozen-lockfile
61+
- attach_workspace:
62+
at: ~/repo
63+
- setup_remote_docker
10264
- run:
103-
name: Check for scheduled sanity.io content to publish and invoke Netlify build hook if necessary
104-
command: node ./scripts/sanity/publishContent.js
65+
name: Algolia Scraper
66+
command: |
67+
echo "Scraping..."
68+
ls
69+
node ./scripts/search/scrape-and-compare-algolia-index.mjs
10570
10671
workflows:
10772
version: 2
10873
build-and-test:
10974
jobs:
110-
- cypress/install:
111-
name: 'Setup Linux'
112-
yarn: true
113-
install-command: yarn --frozen-lockfile
114-
executor: with-chrome-and-firefox
115-
post-steps:
116-
- run:
117-
name: 'Unit tests'
118-
command: yarn test:unit --ci --runInBand
119-
120-
- link-check-changed-files:
121-
name: 'Broken link checker'
122-
requires:
123-
- build
124-
75+
- build
12576
- lint:
12677
name: "Lint JS/CSS/Markdown"
12778
requires:
128-
- build
79+
- build
12980

130-
# Run E2E tests in Chrome
131-
- cypress/run:
132-
name: 'UI Tests - Chrome'
133-
browser: chrome
134-
spec: cypress/integration/*
135-
executor: with-chrome-and-firefox
136-
wait-on: 'http://localhost:3000'
137-
command-prefix: npx percy exec --
138-
yarn: true
139-
start: yarn start:ci
140-
parallel: true
141-
parallelism: 4
142-
ci-build-id: ${CIRCLE_SHA1:0:8}
143-
group: 'UI - Chrome'
81+
# Run Algolia scraper only on main.
82+
- release:
83+
name: 'Run Algolia scraper'
14484
requires:
14585
- build
146-
- Setup Linux
147-
command: |
148-
if [ -n "$DOCS_RECORD_KEY" ]; then
149-
yarn cypress run --record --key $DOCS_RECORD_KEY --parallel
150-
else
151-
yarn cypress run
152-
fi
153-
154-
- build:
155-
filters:
156-
branches:
157-
ignore:
158-
- master
159-
160-
# Run docsearch-scraper only on master.
161-
- release:
162-
name: 'Run docsearch scraper'
163-
filters:
164-
branches:
165-
only:
166-
- master
167-
168-
nightly:
169-
triggers:
170-
- schedule:
171-
cron: "0 0 * * *"
17286
filters:
17387
branches:
17488
only:
175-
- master
176-
jobs:
177-
- broken-link-check-prod
178-
179-
sanity-scheduled-content-check:
180-
triggers:
181-
- schedule:
182-
cron: "0 0,12 * * *"
183-
filters:
184-
branches:
185-
only:
186-
- master
187-
jobs:
188-
- publish-scheduled-sanity-content
89+
- main

.eslintignore

Lines changed: 0 additions & 2 deletions
This file was deleted.

.eslintrc-textlint

Lines changed: 0 additions & 22 deletions
This file was deleted.

.eslintrc.js

Lines changed: 0 additions & 21 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
2+
blank_issues_enabled: false
3+
contact_links:
4+
- name: 💬 Chat
5+
url: https://on.cypress.io/discord
6+
about: Want to discuss Cypress with others? Check out our chat.
7+
- name: Cypress App or Cloud Issue
8+
url: https://github.com/cypress-io/cypress/issues/new
9+
about: This issue tracker is not for App or Cloud issues. Please open issues related to the App or Cloud here.

.github/PULL_REQUEST_TEMPLATE/plugin_template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ Before submitting your plugin, please check to see if it fulfills these requirem
88
- [ ] 🛠 Plugin purpose is clearly documented (in a README or docs website)
99
- [ ] 📝 Well-written documentation - A great example ([link](https://github.com/Fredx87/cypress-keycloak-commands#cypress-keycloak-commands))
1010
- [ ] 🔬 Tested using Cypress - tests using Cypress can act as both example usage _and_ test coverage
11-
- [ ] 👷‍♀️ CI pipeline that's passing (CircleCI and [Github Actions](https://github.com/cypress-io/cypress-tutorial-build-todo/blob/master/.github/workflows) are both free for Open Source)
11+
- [ ] 👷‍♀️ CI pipeline that's passing (CircleCI and [Github Actions](https://github.com/cypress-io/cypress-tutorial-build-todo/blob/main/.github/workflows) are both free for Open Source)
1212

1313
If you have reason to believe your plugin does not need to meet certain requirements, please feel free to provide justification below:

.github/workflows/create-pr-develop-to-master.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Create PR - develop -> master
1+
name: Create PR - develop -> main
22

33
# run this workflow only
44
# when a pull request to "develop" branch is closed
@@ -19,15 +19,15 @@ jobs:
1919

2020
# https://github.com/repo-sync/pull-request
2121
# if the pull request has been successfully merged, then create
22-
# a PR to "master" branch
22+
# a PR to "main" branch
2323
- name: pull-request
2424
uses: repo-sync/pull-request@v2
2525
if: github.event.pull_request.merged == true
2626
with:
2727
github_token: ${{ secrets.GITHUB_TOKEN }}
2828
# be explicit about branches
2929
source_branch: "develop"
30-
destination_branch: "master"
31-
pr_title: "develop to master auto PR"
32-
pr_body: ":robot: Automated PR from **develop** to **master**"
30+
destination_branch: "main"
31+
pr_title: "develop to main auto PR"
32+
pr_body: ":robot: Automated PR from **develop** to **main**"
3333
pr_label: "auto-pr"

.gitignore

Lines changed: 31 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,36 @@
1-
node_modules/
2-
db.json
3-
public/
4-
*.log
5-
.history
6-
.vscode
1+
# Dependencies
2+
node_modules
3+
4+
# Production
5+
build
6+
dist
7+
8+
# Generated files
9+
.docusaurus
10+
.cache-loader
11+
12+
# Misc
713
.DS_Store
8-
.deploy*/
9-
support
10-
!cypress/support
11-
.idea/
12-
.nuxt/
13-
dist/
14-
static/sw.js
15-
.eslintcache
16-
.circle-credentials.json
14+
.env
15+
.env.local
16+
.env.development.local
17+
.env.test.local
18+
.env.production.local
1719

18-
themes/cypress/source/css/vendor/
19-
themes/cypress/source/js/vendor/
20-
themes/cypress/source/fonts/vendor/
20+
npm-debug.log*
21+
yarn-debug.log*
22+
yarn-error.log*
2123

24+
.vscode
2225
cypress/screenshots
2326
cypress/videos
27+
28+
# Generated files
29+
.docusaurus
30+
.cache-loader
31+
32+
.nuxt
33+
.husky
34+
themes
35+
.eslintcache
36+
db.json

.husky/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

.husky/pre-commit

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)