Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
maoosi committed Oct 26, 2022
2 parents 4c797f5 + 7c6ae43 commit 4ab5c3b
Show file tree
Hide file tree
Showing 172 changed files with 14,379 additions and 17,112 deletions.
9 changes: 0 additions & 9 deletions .editorconfig

This file was deleted.

23 changes: 23 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"root": true,
"extends": "@antfu",
"rules": {
"jsonc/indent": ["error", 4, {}],
"@typescript-eslint/indent": [
"error",
4,
{
"offsetTernaryExpressions": true,
"ignoredNodes": ["TemplateLiteral *", "TSTypeParameterInstantiation"]
}
]
},
"globals": {
"$": true,
"chalk": true,
"cd": true,
"argv": true,
"fs": true,
"nothrow": true
}
}
13 changes: 7 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,20 @@
node_modules/
*/**/node_modules/

# Test files
test/generated/
# Testing
tests/e2e/prisma/generated/
playground/

# Dist folder
dist/

# Docs
docs/.vuepress/dist/
docs/.vitepress/dist/
tmp.md

# Boilerplate files
Boilerplate/cdk/*.lock
Boilerplate/cdk/cdk.out
packages/boilerplate/cdk/*.lock
packages/boilerplate/cdk/cdk.out

# Log files
npm-debug.log*
Expand All @@ -22,7 +24,6 @@ yarn-error.log*

# Editor directories and files
.idea
.vscode
*.suo
*.ntvs*
*.njsproj
Expand Down
5 changes: 5 additions & 0 deletions .markdownlint.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"default": true,
"no-inline-html": false,
"line-length": false
}
28 changes: 23 additions & 5 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,40 @@
node_modules/
*/**/node_modules/

# Excl. project files
# Source files
packages/
scripts/
tests/
playground/
docs/
test/
src/
.editorconfig
*.config.js
tsconfig.*.json
.eslintrc
.markdownlint.json
.prettierignore
.prettierrc.cjs
tsconfig.json

# Package cache files
package-*.json
pnpm-*.yaml

# Log files
npm-debug.log*
yarn-debug.log*
yarn-error.log*
.pnpm-debug.log*

# Workspace
pnpm-workspace.yaml
vite.config.ts

# Installer
dist/installer

# Editor directories and files
.idea
.vscode
.github
*.suo
*.ntvs*
*.njsproj
Expand Down
6 changes: 6 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"recommendations": [
"dbaeumer.vscode-eslint",
"johnpapa.vscode-peacock"
]
}
109 changes: 109 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
{
// Visuals
"peacock.color": "#1f08f6",
"workbench.colorCustomizations": {
"activityBar.activeBackground": "#4b38f9",
"activityBar.activeBorder": "#f95745",
"activityBar.background": "#4b38f9",
"activityBar.foreground": "#e7e7e7",
"activityBar.inactiveForeground": "#e7e7e799",
"activityBarBadge.background": "#f95745",
"activityBarBadge.foreground": "#15202b",
"sash.hoverBorder": "#4b38f9",
"statusBar.background": "#1f08f6",
"statusBar.foreground": "#e7e7e7",
"statusBarItem.hoverBackground": "#4b38f9",
"statusBarItem.remoteBackground": "#1f08f6",
"statusBarItem.remoteForeground": "#e7e7e7",
"titleBar.activeBackground": "#1f08f6",
"titleBar.activeForeground": "#e7e7e7",
"titleBar.inactiveBackground": "#1f08f699",
"titleBar.inactiveForeground": "#e7e7e799",
"commandCenter.border": "#e7e7e799"
},

// ESLint config
"eslint.codeAction.showDocumentation": {
"enable": true
},
"eslint.probe": [
"javascript",
"typescript",
"javascriptreact",
"typescriptreact",
"vue",
"html",
"markdown",
"json",
"jsonc",
"json5"
],
"prettier.enable": false,

// Editor
"editor.formatOnSave": true,
"editor.accessibilitySupport": "off",
"editor.cursorSmoothCaretAnimation": true,
"editor.find.addExtraSpaceOnTop": false,
"editor.guides.bracketPairs": "active",
"editor.inlineSuggest.enabled": true,
"editor.lineNumbers": "interval",
"editor.multiCursorModifier": "ctrlCmd",
"editor.renderWhitespace": "boundary",
"editor.suggestSelection": "first",
"editor.tabSize": 4,
"editor.unicodeHighlight.invisibleCharacters": false,
"editor.codeActionsOnSave": {
"source.fixAll": false,
"source.fixAll.eslint": true, // this allows ESLint to auto fix on save
"source.organizeImports": false
},
"[markdown]": {
"editor.formatOnSave": false
},
"[prisma]": {
"editor.defaultFormatter": "Prisma.prisma",
"editor.formatOnSave": true
},
"files.eol": "\n",
"typescript.tsdk": "node_modules/typescript/lib",

// Grammarly
"grammarly.selectors": [
{
"language": "markdown",
"scheme": "file",
"pattern": "docs/changelog/1.0.0-rc.1.md"
},
{
"language": "markdown",
"scheme": "file",
"pattern": "docs/contributing.md"
},
{
"language": "markdown",
"scheme": "file",
"pattern": "docs/essentials/concept.md"
},
{
"language": "markdown",
"scheme": "file",
"pattern": "docs/essentials/getting-started.md"
},
{
"language": "markdown",
"scheme": "file",
"pattern": "docs/advanced/securing-api.md"
},
{
"language": "markdown",
"scheme": "file",
"pattern": "docs/advanced/extending-api.md"
},
{
"language": "markdown",
"scheme": "file",
"pattern": "README.md"
}
]
}
Loading

1 comment on commit 4ab5c3b

@vercel
Copy link

@vercel vercel bot commented on 4ab5c3b Oct 26, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

prisma-appsync – ./

prisma-appsync-git-main-maoosi.vercel.app
prisma-appsync.vercel.app
prisma-appsync-maoosi.vercel.app

Please sign in to comment.