Skip to content

Commit 78eca52

Browse files
AndreasArvidssonAndreasArvidsson
committed
Fixed merge conflict
2 parents b20a436 + 2b21593 commit 78eca52

File tree

2,349 files changed

+13272
-9268
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,349 files changed

+13272
-9268
lines changed

‎.github/FUNDING.yml

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

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
## Checklist
22

33
- [ ] I have added [tests](https://www.cursorless.org/docs/contributing/test-case-recorder/)
4+
- [ ] I have updated the [docs](https://github.com/cursorless-dev/cursorless/tree/main/docs) and [cheatsheet](https://github.com/cursorless-dev/cursorless/tree/main/cursorless-talon/src/cheatsheet_html)

‎.gitignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,5 @@ node_modules
99
# TypeDoc output
1010
docs/contributing/api/
1111

12-
# Generated docs hub
13-
website-root/docs/
14-
1512
# Local extension / data sandbox for debug launch task
1613
/.vscode-sandbox

‎.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ repos:
3232
hooks:
3333
- id: flynt
3434
- repo: https://github.com/Zac-HD/shed
35-
rev: 0.10.1
35+
rev: 0.10.3
3636
hooks:
3737
- id: shed
3838
# TODO: bump to --py310-plus when Talon moves to Python 3.10.

‎.prettierignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,7 @@
22

33
# We use our own format for our recorded yaml tests to keep them compact
44
/src/test/suite/fixtures/recorded/**/*.yml
5+
6+
7+
# This was swizzled from a Docusaurus core class
8+
docs-site/src/theme/SearchBar/index.js

‎.vscode/launch.json

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,14 +109,26 @@
109109
"name": "Docusaurus Start (Debug)",
110110
"type": "node",
111111
"request": "launch",
112-
"cwd": "${workspaceFolder}/website",
112+
"cwd": "${workspaceFolder}/docs-site",
113113
"runtimeExecutable": "npm",
114114
"runtimeArgs": ["run", "start"],
115115
"resolveSourceMapLocations": [
116116
"${workspaceFolder}/**",
117117
"!${workspaceFolder}/.vscode-sandbox/**",
118118
"!**/node_modules/**"
119119
]
120+
},
121+
{
122+
"name": "cursorless.org client-side",
123+
"type": "chrome",
124+
"request": "launch",
125+
"url": "http://localhost:4200",
126+
"webRoot": "${workspaceFolder}/cursorless-nx",
127+
"sourceMapPathOverrides": {
128+
"webpack://_N_E/*": "${webRoot}/apps/cursorless-org/*",
129+
"webpack://_N_E/libs/*": "${webRoot}/libs/*",
130+
"webpack://_N_E/node_modules/*": "${webRoot}/node_modules/*"
131+
}
120132
}
121133
]
122134
}

‎.vscode/tasks.json

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,30 @@
4141
"reveal": "never"
4242
},
4343
"group": "build"
44+
},
45+
{
46+
"label": "Serve cursorless.org",
47+
"type": "shell",
48+
"command": "nx serve cursorless-org",
49+
"options": {
50+
"cwd": "cursorless-nx"
51+
},
52+
"problemMatcher": []
53+
},
54+
{
55+
"label": "Install local",
56+
"type": "shell",
57+
"command": "vsce package -o bundle.vsix && code --install-extension bundle.vsix",
58+
"presentation": {
59+
"focus": true
60+
},
61+
"problemMatcher": []
62+
},
63+
{
64+
"label": "Run pre commit",
65+
"type": "shell",
66+
"command": "pre-commit run",
67+
"presentation": {}
4468
}
4569
]
4670
}

‎cursorless-nx/apps/cheatsheet-local/src/favicon.ico

320 Bytes
Binary file not shown.

‎cursorless-nx/apps/cursorless-org-e2e/.eslintrc.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"extends": ["plugin:cypress/recommended", "../../.eslintrc.json"],
3+
"ignorePatterns": ["!**/*"],
4+
"overrides": [
5+
{
6+
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
7+
"rules": {}
8+
}
9+
]
10+
}

‎cursorless-nx/apps/cursorless-org-e2e/cypress.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"fileServerFolder": ".",
3+
"fixturesFolder": "./src/fixtures",
4+
"integrationFolder": "./src/integration",
5+
"modifyObstructiveCode": false,
6+
"supportFile": "./src/support/index.ts",
7+
"pluginsFile": false,
8+
"video": true,
9+
"videosFolder": "../../dist/cypress/apps/cursorless-org-e2e/videos",
10+
"screenshotsFolder": "../../dist/cypress/apps/cursorless-org-e2e/screenshots",
11+
"chromeWebSecurity": false
12+
}

‎cursorless-nx/apps/cursorless-org-e2e/project.json

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"$schema": "../../node_modules/nx/schemas/project-schema.json",
3+
"sourceRoot": "apps/cursorless-org-e2e/src",
4+
"projectType": "application",
5+
"targets": {
6+
"e2e": {
7+
"executor": "@nrwl/cypress:cypress",
8+
"options": {
9+
"cypressConfig": "apps/cursorless-org-e2e/cypress.json",
10+
"devServerTarget": "cursorless-org:serve:development"
11+
},
12+
"configurations": {
13+
"production": {
14+
"devServerTarget": "cursorless-org:serve:production"
15+
}
16+
}
17+
},
18+
"lint": {
19+
"executor": "@nrwl/linter:eslint",
20+
"outputs": ["{options.outputFile}"],
21+
"options": {
22+
"lintFilePatterns": ["apps/cursorless-org-e2e/**/*.{js,ts}"]
23+
}
24+
}
25+
},
26+
"tags": [],
27+
"implicitDependencies": ["cursorless-org"]
28+
}

‎cursorless-nx/apps/cursorless-org-e2e/src/fixtures/example.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"name": "Using fixtures to represent data",
3+
"email": "hello@cypress.io"
4+
}

‎cursorless-nx/apps/cursorless-org-e2e/src/integration/app.spec.ts

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import { getGreeting } from '../support/app.po';
2+
3+
describe('cursorless-org', () => {
4+
beforeEach(() => cy.visit('/'));
5+
6+
it('should display welcome message', () => {
7+
// Custom command example, see `../support/commands.ts` file
8+
cy.login('my-email@something.com', 'myPassword');
9+
10+
// Function helper example, see `../support/app.po.ts` file
11+
getGreeting().contains('Welcome cursorless-org');
12+
});
13+
});

‎cursorless-nx/apps/cursorless-org-e2e/src/support/app.po.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export const getGreeting = () => cy.get('h1');

‎cursorless-nx/apps/cursorless-org-e2e/src/support/commands.ts

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
// ***********************************************
2+
// This example commands.js shows you how to
3+
// create various custom commands and overwrite
4+
// existing commands.
5+
//
6+
// For more comprehensive examples of custom
7+
// commands please read more here:
8+
// https://on.cypress.io/custom-commands
9+
// ***********************************************
10+
11+
// eslint-disable-next-line @typescript-eslint/no-namespace
12+
declare namespace Cypress {
13+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
14+
interface Chainable<Subject> {
15+
login(email: string, password: string): void;
16+
}
17+
}
18+
//
19+
// -- This is a parent command --
20+
Cypress.Commands.add('login', (email, password) => {
21+
console.log('Custom command example: Login', email, password);
22+
});
23+
//
24+
// -- This is a child command --
25+
// Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... })
26+
//
27+
//
28+
// -- This is a dual command --
29+
// Cypress.Commands.add("dismiss", { prevSubject: 'optional'}, (subject, options) => { ... })
30+
//
31+
//
32+
// -- This will overwrite an existing command --
33+
// Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... })

‎cursorless-nx/apps/cursorless-org-e2e/src/support/index.ts

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
// ***********************************************************
2+
// This example support/index.js is processed and
3+
// loaded automatically before your test files.
4+
//
5+
// This is a great place to put global configuration and
6+
// behavior that modifies Cypress.
7+
//
8+
// You can change the location of this file or turn off
9+
// automatically serving support files with the
10+
// 'supportFile' configuration option.
11+
//
12+
// You can read more here:
13+
// https://on.cypress.io/configuration
14+
// ***********************************************************
15+
16+
// Import commands.js using ES2015 syntax:
17+
import './commands';

‎cursorless-nx/apps/cursorless-org-e2e/tsconfig.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"extends": "../../tsconfig.base.json",
3+
"compilerOptions": {
4+
"sourceMap": false,
5+
"outDir": "../../dist/out-tsc",
6+
"allowJs": true,
7+
"types": ["cypress", "node"]
8+
},
9+
"include": ["src/**/*.ts", "src/**/*.js"]
10+
}

‎cursorless-nx/apps/cursorless-org/.eslintrc.json

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
{
2+
"extends": [
3+
"plugin:@nrwl/nx/react-typescript",
4+
"next",
5+
"next/core-web-vitals",
6+
"../../.eslintrc.json"
7+
],
8+
"ignorePatterns": ["!**/*"],
9+
"overrides": [
10+
{
11+
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
12+
"rules": {
13+
"@next/next/no-html-link-for-pages": [
14+
"error",
15+
"apps/cursorless-org/pages"
16+
]
17+
}
18+
},
19+
{
20+
"files": ["*.ts", "*.tsx"],
21+
"rules": {}
22+
},
23+
{
24+
"files": ["*.js", "*.jsx"],
25+
"rules": {}
26+
}
27+
],
28+
"rules": {
29+
"@next/next/no-html-link-for-pages": "off"
30+
},
31+
"env": {
32+
"jest": true
33+
}
34+
}

‎cursorless-nx/apps/cursorless-org/components/Button.tsx

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
interface Props {
2+
text: string;
3+
href: string;
4+
isExternal: boolean;
5+
}
6+
7+
export default function Button({ text, href, isExternal }: Props) {
8+
const className =
9+
'text-center uppercase text-2xl sm:text-[2.4em] tracking-[0.18em] hover:text-salmon-400';
10+
11+
const extraProps = isExternal
12+
? {
13+
target: '_blank',
14+
rel: 'noreferrer',
15+
}
16+
: {};
17+
18+
return (
19+
<a href={href} className={className} {...extraProps}>
20+
{text}
21+
</a>
22+
);
23+
}

0 commit comments

Comments
 (0)