Cms/docs/git/git/recovering from common git predicaments/index (#2974)

.editorconfig

@@ -0,0 +1,28 @@
+root = true
+
+[*]
+tab_width = 2
+indent_size = 2
+charset = utf-8
+end_of_line = lf
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.txt]
+indent_size = false
+
+[test/fast/Listing versions/Running 'nvm ls' calls into nvm_alias]
+indent_size = false
+
+[test/fast/Listing versions/Running 'nvm ls --no-alias' does not call into nvm_alias]
+indent_size = false
+
+[test/fast/Unit tests/mocks/**]
+insert_final_newline = off
+
+[test/**/.urchin*]
+insert_final_newline = off
+
+[Makefile]
+indent_style = tab

.env

@@ -1,5 +1,3 @@
+GATSBY_ALGOLIA_APP_ID='BAGY237H21'
+GATSBY_ALGOLIA_SEARCH_KEY='5f5a2d1bb109c79803ca95250ca3496c'
 ALGOLIA_ADMIN_KEY='a618cbd2bff788d0f9d73b48867b99eb'
-ALGOLIA_API_KEY='56747001d363aa353aea93c8a205f40ddae5455e65f8577e3761754016d0ee21'
-ALGOLIA_BASE_URL='https://crawler.algolia.com'
-ONEGRAPH_AUTHLIFY_TOKEN='i1-IEDTFTYEYPJbb_TNymTGLvPCdjsGRP1PwtxZg14Q'
-stackbitapikey='d65cdb563ef2906544c747c36adc22d28dea087a86d8200b7784258ad9c5b0b5'

.eslintrc.json

@@ -0,0 +1,17 @@
+{
+    "env": {
+        "node": true,
+        "es6": true
+    },
+    "extends": "eslint:recommended",
+    "parserOptions": {
+        "ecmaVersion": 2018
+    },
+    "rules": {
+        "indent": ["error", 4],
+        "linebreak-style": ["error", "unix"],
+        "quotes": ["error", "single"],
+        "semi": ["error", "always"],
+        "no-unused-vars": 0
+    }
+}

.github/ISSUE_TEMPLATE/bug_report.md

@@ -4,14 +4,14 @@ about: Create a report to help us improve
 title: ''
 labels: ''
 assignees: ''
-
 ---
 
 **Describe the bug**
 A clear and concise description of what the bug is.
 
 **To Reproduce**
 Steps to reproduce the behavior:
+
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
@@ -24,15 +24,17 @@ A clear and concise description of what you expected to happen.
 If applicable, add screenshots to help explain your problem.
 
 **Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
+
+- OS: [e.g. iOS]
+- Browser [e.g. chrome, safari]
+- Version [e.g. 22]
 
 **Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
+
+- Device: [e.g. iPhone6]
+- OS: [e.g. iOS8.1]
+- Browser [e.g. stock browser, safari]
+- Version [e.g. 22]
 
 **Additional context**
 Add any other context about the problem here.

.github/ISSUE_TEMPLATE/custom.md

@@ -4,7 +4,4 @@ about: Describe this issue template's purpose here.
 title: ''
 labels: ''
 assignees: ''
-
 ---
-
-

.github/ISSUE_TEMPLATE/feature_request.md

@@ -4,7 +4,6 @@ about: Suggest an idea for this project
 title: ''
 labels: ''
 assignees: ''
-
 ---
 
 **Is your feature request related to a problem? Please describe.**

.github/workflows/label.yml

@@ -9,6 +9,18 @@ name: Labeler
 on: [pull_request]
 
 jobs:
+<<<<<<< HEAD
+    label:
+        runs-on: ubuntu-latest
+        permissions:
+            contents: read
+            pull-requests: write
+
+        steps:
+            - uses: actions/labeler@v2
+              with:
+                  repo-token: '${{ secrets.GITHUB_TOKEN }}'
+=======
   label:
 
     runs-on: ubuntu-latest
@@ -20,3 +32,4 @@ jobs:
     - uses: actions/labeler@v4
       with:
         repo-token: "${{ secrets.GITHUB_TOKEN }}"
+>>>>>>> master

.github/workflows/latest-npm.yml

@@ -0,0 +1,50 @@
+name: 'Tests: `nvm install-latest-npm`'
+
+on: [pull_request, push]
+
+jobs:
+    nodes:
+        name: 'nvm install-latest-npm'
+        runs-on: ubuntu-latest
+
+        strategy:
+            matrix:
+                node-version:
+                    - '11'
+                    - '10'
+                    - '9'
+                    - '9.2'
+                    - '9.1'
+                    - '9.0'
+                    - '8'
+                    - '7'
+                    - '6'
+                    - '6.1'
+                    - '5'
+                    - '5.9'
+                    - '4'
+                    - '4.6'
+                    - '4.5'
+                    - '4.4'
+                    - '3'
+                    - '2'
+                    - '1'
+                    - '0.12'
+                    - '0.10'
+
+        steps:
+            - uses: actions/checkout@v2
+            - uses: ljharb/actions/node/run@main
+              name: 'nvm install-latest-npm'
+              with:
+                  node-version: ${{ matrix.node-version }}
+                  skip-ls-check: true
+                  skip-install: true
+                  shell-command: 'npm --version'
+
+    node:
+        name: 'nvm install-latest-npm'
+        needs: [nodes]
+        runs-on: ubuntu-latest
+        steps:
+            - run: 'echo tests completed'

.gitignore

@@ -1,3 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 # Logs
 logs
 *.log
@@ -55,7 +77,12 @@ typings/
 
 
 # gatsby files
+<<<<<<< HEAD
+# .cache/
+# public
+=======
 
+>>>>>>> master
 
 # Mac files
 .DS_Store
@@ -71,3 +98,10 @@ node_modules/
 public/
 .cache/
 
+<<<<<<< HEAD
+.package-lock.json
+*.cache
+*public
+src/pages/docs/tools/Archive.md
+=======
+>>>>>>> master

.netlify/state.json

@@ -1,11 +1,3 @@
 {
-	"siteId": "a1b7ee1a-11a7-4bd2-a341-2260656e216f",
-	"oneGraphSessionId": "937b1344-1df2-48d0-8935-3e68ba16a9b2",
-	"oneGraphEnabledServices": [
-		"GITHUB",
-		"NPM",
-		"SALESFORCE",
-		"SPOTIFY",
-		"STRIPE"
-	]
-}
+    "siteId": "a1b7ee1a-11a7-4bd2-a341-2260656e216f"
+}

.nvmrc

@@ -1 +1 @@
-14.5.0
+14.15.0

.travis.yml

@@ -1,14 +1,8 @@
 language: node_js
 dist: xenial
 node_js:
-    - '6'
-    - '8'
-    - '10'
-    - '12'
     - '14'
-    - '16'
 script:
-    - cd test/support/express3 && npm install
-    - cd ../express4 && npm install
-    - cd ../../..
-    - npm test
+    - cd .
+    - npm i
+    - npm run start