From b3814fc7c001cb735bac10de2d898fc161d4ae79 Mon Sep 17 00:00:00 2001 From: Justin Hall Date: Thu, 18 Jun 2020 20:33:57 -0600 Subject: [PATCH] Standardize prettier options across all Blitz code bases (#703) Co-authored-by: Brandon Bayer (meta) --- .eslintrc.js | 38 ++--- .github/FUNDING.yml | 2 +- .github/ISSUE_TEMPLATE/feature_request.md | 6 +- .github/checkInstallTime.js | 4 +- .github/workflows/main.yml | 4 +- __mocks__/fs.js | 2 +- examples/plain-js/app/pages/_app.js | 2 +- examples/plain-js/app/pages/index.js | 6 +- .../app/projects/pages/projects/[id].js | 4 +- .../app/projects/pages/projects/[id]/edit.js | 4 +- .../app/projects/pages/projects/index.js | 4 +- .../app/projects/pages/projects/new.js | 2 +- examples/plain-js/blitz.config.js | 2 +- examples/plain-js/db/index.js | 2 +- examples/plain-js/package.json | 4 +- examples/store/.babelrc.js | 2 +- .../store/app/admin/pages/admin/index.tsx | 2 +- .../app/admin/pages/admin/products/[id].tsx | 6 +- .../app/admin/pages/admin/products/index.tsx | 10 +- .../app/admin/pages/admin/products/new.tsx | 2 +- .../store/app/components/ErrorBoundary.tsx | 2 +- examples/store/app/pages/_app.tsx | 2 +- examples/store/app/pages/_document.tsx | 4 +- examples/store/app/pages/index.tsx | 4 +- .../app/products/components/ProductForm.tsx | 32 ++-- .../app/products/mutations/createProduct.ts | 6 +- .../app/products/mutations/deleteProduct.ts | 6 +- .../app/products/mutations/updateProduct.ts | 6 +- .../app/products/pages/products/[handle].tsx | 14 +- .../app/products/pages/products/index.tsx | 10 +- .../app/products/pages/products/infinite.tsx | 17 +- .../app/products/pages/products/paginated.tsx | 4 +- .../store/app/products/pages/products/ssr.tsx | 10 +- .../store/app/products/queries/getProduct.ts | 6 +- .../store/app/products/queries/getProducts.ts | 8 +- .../products/queries/getProductsInfinite.ts | 6 +- .../integration/admin/products/edit.test.ts | 4 +- .../integration/admin/products/helper.ts | 10 +- .../integration/admin/products/index.test.ts | 2 +- .../integration/admin/products/new.test.ts | 2 +- examples/store/db/index.ts | 2 +- examples/store/package.json | 4 +- .../tailwind/app/components/ErrorBoundary.tsx | 2 +- examples/tailwind/app/components/nav.js | 8 +- examples/tailwind/app/pages/_app.tsx | 2 +- examples/tailwind/app/pages/_document.tsx | 2 +- examples/tailwind/blitz.config.js | 2 +- examples/tailwind/db/index.ts | 2 +- examples/tailwind/package.json | 4 +- packages/blitz/jest.setup.js | 2 +- packages/blitz/rollup.config.js | 42 ++--- packages/blitz/src/index.ts | 2 +- packages/blitz/src/utils/index.ts | 2 +- packages/blitz/test/todo.test.ts | 2 +- packages/cli/jest.config.js | 18 +- packages/cli/src/check-before-running.ts | 18 +- packages/cli/src/command.ts | 4 +- packages/cli/src/commands/build.ts | 20 +-- packages/cli/src/commands/console.ts | 36 ++-- packages/cli/src/commands/db.ts | 158 +++++++++--------- packages/cli/src/commands/generate.ts | 106 ++++++------ packages/cli/src/commands/help.ts | 12 +- packages/cli/src/commands/install.ts | 77 +++++---- packages/cli/src/commands/new.ts | 54 +++--- packages/cli/src/commands/start.ts | 22 +-- packages/cli/src/commands/test.ts | 24 +-- packages/cli/src/errors/prompt-aborted.ts | 2 +- packages/cli/src/index.ts | 8 +- packages/cli/src/utils/dedent.ts | 8 +- packages/cli/src/utils/get-project-root.ts | 2 +- packages/cli/src/utils/is-blitz-root.ts | 26 +-- packages/cli/src/utils/setup-ts-node.ts | 6 +- packages/cli/test/__fixtures__/installer.ts | 10 +- packages/cli/test/commands/build.test.ts | 16 +- packages/cli/test/commands/console.test.ts | 26 +-- packages/cli/test/commands/db.test.ts | 56 +++---- packages/cli/test/commands/generate.test.ts | 50 +++--- packages/cli/test/commands/install.test.ts | 32 ++-- packages/cli/test/commands/new.test.ts | 63 +++---- packages/cli/test/commands/start.test.ts | 20 +-- packages/cli/test/commands/test.test.ts | 52 +++--- packages/cli/test/utils/dedent.test.ts | 8 +- packages/cli/types/index.d.ts | 2 +- packages/config/jest.config.js | 14 +- packages/config/jest.setup.js | 2 +- packages/config/src/index.ts | 10 +- packages/core/jest.config.js | 14 +- packages/core/jest.setup.js | 2 +- packages/core/src/index.ts | 38 ++--- packages/core/src/middleware.test.ts | 50 +++--- packages/core/src/middleware.ts | 22 +-- packages/core/src/rpc.ts | 29 ++-- packages/core/src/ssr-query.test.ts | 46 ++--- packages/core/src/ssr-query.ts | 14 +- packages/core/src/use-infinite-query.ts | 23 +-- packages/core/src/use-paginated-query.ts | 30 ++-- packages/core/src/use-params.ts | 29 ++-- packages/core/src/use-query.ts | 23 +-- packages/core/src/use-router-query.ts | 4 +- packages/core/src/use-router.ts | 6 +- packages/core/src/utils/index.ts | 6 +- packages/core/src/utils/query-cache.ts | 2 +- packages/core/src/with-router.tsx | 10 +- packages/core/test/rpc.test.ts | 82 ++++----- packages/core/test/use-params.test.ts | 34 ++-- packages/core/test/use-query.test.tsx | 45 ++--- packages/core/types/index.d.ts | 2 +- packages/display/src/index.test.ts | 2 +- packages/display/src/index.ts | 20 +-- packages/file-pipeline/README.md | 10 +- packages/file-pipeline/src/display.ts | 18 +- packages/file-pipeline/src/events.ts | 12 +- .../agnostic-source/agnostic-source.test.ts | 38 ++--- .../src/helpers/agnostic-source/index.ts | 34 ++-- .../file-pipeline/src/helpers/enrich-files.ts | 10 +- .../file-pipeline/src/helpers/file-cache.ts | 8 +- .../helpers/idle-handler/idle-handler.test.ts | 14 +- .../src/helpers/idle-handler/index.ts | 12 +- packages/file-pipeline/src/helpers/unlink.ts | 10 +- .../src/helpers/work-optimizer/README.md | 18 +- .../src/helpers/work-optimizer/index.ts | 8 +- .../work-optimizer/work-optimizer.test.ts | 58 +++---- .../file-pipeline/src/helpers/writer/index.ts | 20 +-- .../src/helpers/writer/write.test.ts | 31 ++-- packages/file-pipeline/src/index.ts | 10 +- packages/file-pipeline/src/pipeline.ts | 22 +-- packages/file-pipeline/src/streams.ts | 18 +- packages/file-pipeline/src/test-utils.ts | 4 +- .../src/transform-files/highwatermark.test.ts | 22 +-- .../src/transform-files/index.ts | 20 +-- .../transform-files/transform-files.test.ts | 34 ++-- packages/file-pipeline/src/transform.test.ts | 124 +++++++------- packages/file-pipeline/src/transform.ts | 19 ++- packages/file-pipeline/src/types.ts | 8 +- packages/file-pipeline/src/utils.ts | 6 +- packages/file-pipeline/src/vinyl-file.d.ts | 4 +- packages/generator/README.md | 14 +- packages/generator/jest.config.js | 18 +- packages/generator/src/conflict-checker.ts | 70 ++++---- .../generator/src/errors/prompt-aborted.ts | 2 +- packages/generator/src/generator.ts | 91 +++++----- .../generator/src/generators/app-generator.ts | 87 +++++----- .../src/generators/form-generator.ts | 14 +- .../src/generators/model-generator.ts | 36 ++-- .../src/generators/mutation-generator.ts | 14 +- .../src/generators/page-generator.ts | 18 +- .../src/generators/query-generator.ts | 14 +- packages/generator/src/index.ts | 16 +- packages/generator/src/prisma/field.ts | 80 +++++---- packages/generator/src/prisma/model.ts | 20 +-- .../src/utils/fetch-latest-version-for.ts | 4 +- .../src/utils/get-blitz-dependency-version.ts | 18 +- .../generator/src/utils/get-latest-version.ts | 12 +- .../generator/src/utils/load-dependencies.ts | 15 +- packages/generator/src/utils/npm-fetch.ts | 6 +- packages/generator/src/utils/plurals.ts | 4 +- packages/generator/test/generator.test.ts | 16 +- .../test/generators/app-generator.test.ts | 52 +++--- .../test/generators/page-generator.test.ts | 106 ++++++------ packages/generator/test/prisma/field.test.ts | 100 +++++------ packages/generator/test/prisma/model.test.ts | 20 +-- .../app/components/CreateFileBrowserModal.tsx | 12 +- .../gui/app/components/CreateProjectForm.tsx | 97 +++++++++++ .../app/components/CreateProjectInputs.tsx | 93 +++++++++++ .../gui/app/components/CreateProjectModal.tsx | 25 +++ packages/gui/app/components/Fade.tsx | 39 +++++ packages/gui/app/components/FileBrowser.tsx | 63 ++++--- packages/gui/app/components/Greeting.tsx | 10 ++ packages/gui/app/components/Nav.tsx | 76 +++++++++ packages/gui/app/components/NewView/Color.tsx | 8 +- .../app/components/NewView/ColorChooser.tsx | 43 ++--- .../components/NewView/DirectoryChooser.tsx | 18 +- .../app/components/NewView/DirectoryList.tsx | 39 +++-- .../gui/app/components/NewView/Footer.tsx | 29 ++-- packages/gui/app/components/NewView/Form.tsx | 75 +++++---- .../gui/app/components/NewView/Header.tsx | 2 +- packages/gui/app/components/NewView/Icon.tsx | 6 +- .../app/components/NewView/IconChooser.tsx | 43 ++--- .../gui/app/components/NewView/Inputs.tsx | 30 ++-- .../gui/app/components/NewView/Status.tsx | 40 ++--- packages/gui/app/components/NewView/Tabs.tsx | 26 +-- packages/gui/app/components/NewView/index.tsx | 7 +- packages/gui/app/components/NewView/types.ts | 4 +- packages/gui/app/components/NewView/utils.ts | 22 ++- packages/gui/app/components/OfflineAlert.tsx | 23 +++ packages/gui/app/components/PagesModule.tsx | 47 ++++++ packages/gui/app/components/ProjectCard.tsx | 51 ++++++ packages/gui/app/components/ProjectHeader.tsx | 25 +++ packages/gui/app/components/ProjectList.tsx | 18 ++ .../gui/app/components/ProjectModules.tsx | 19 +++ .../gui/app/components/ProjectView/Pages.tsx | 15 +- .../gui/app/components/ProjectView/Schema.tsx | 23 +-- .../gui/app/components/ProjectView/index.tsx | 6 +- .../gui/app/components/Sidebar/NewSwitch.tsx | 15 +- .../app/components/Sidebar/ProjectSwitch.tsx | 20 ++- .../components/Sidebar/ProjectSwitches.tsx | 8 +- packages/gui/app/components/Sidebar/index.tsx | 8 +- packages/gui/app/components/Sidebar/types.ts | 2 +- packages/gui/app/mutations/createProject.ts | 14 +- packages/gui/app/mutations/importProject.ts | 4 +- packages/gui/app/pages/_app.tsx | 6 +- packages/gui/app/pages/import.tsx | 6 +- packages/gui/app/pages/index.tsx | 12 +- packages/gui/app/pages/new.tsx | 6 +- packages/gui/app/pages/p/[id]/index.tsx | 6 +- packages/gui/app/pages/p/[id]/schema.tsx | 15 +- packages/gui/app/pages/projects/[id].tsx | 62 +++++++ .../gui/app/queries/getCreateProjectStatus.ts | 10 +- packages/gui/app/queries/getDirectories.ts | 8 +- packages/gui/app/queries/getDirectory.ts | 14 +- packages/gui/app/queries/getHomedir.ts | 2 +- packages/gui/app/queries/getPages.ts | 14 +- packages/gui/app/queries/getProject.ts | 8 +- packages/gui/app/queries/getProjects.ts | 16 +- packages/gui/app/queries/getSchema.ts | 60 +++---- packages/gui/db/index.ts | 10 +- packages/gui/postcss.config.js | 2 +- packages/gui/tailwind.config.js | 10 +- packages/gui/types/index.d.ts | 2 +- packages/gui/utils/canUseDom.ts | 1 + packages/gui/utils/dethunkify.ts | 2 + packages/gui/utils/getDirMtime.ts | 8 +- packages/gui/utils/hooks/state/useToggle.ts | 7 +- packages/gui/utils/hooks/state/useUndoable.ts | 6 +- .../gui/utils/hooks/web/useDelayUnmount.ts | 17 ++ packages/gui/utils/hooks/web/useInterval.ts | 4 +- .../gui/utils/hooks/web/useLocalStorage.ts | 13 ++ .../utils/hooks/web/useNetworkAvailability.ts | 25 +++ packages/gui/utils/hooks/web/useStorage.ts | 6 +- packages/gui/utils/hooks/web/utils.ts | 8 +- packages/gui/utils/managedEventListener.ts | 14 ++ packages/gui/utils/status.ts | 10 +- .../utils/string/findClosestStringMatch.ts | 2 +- .../gui/utils/string/orderBySimilarity.ts | 8 +- packages/gui/utils/string/toKebabCase.ts | 4 +- packages/gui/utils/timeDifference.ts | 56 +++++++ packages/gui/utils/types/JSONArray.ts | 3 + packages/gui/utils/types/JSONObject.ts | 5 + packages/gui/utils/types/JSONValue.ts | 4 + packages/gui/utils/useColor.ts | 6 +- packages/gui/utils/useEventCallback.ts | 11 ++ packages/gui/utils/useIcon.ts | 6 +- packages/gui/utils/useName.ts | 6 +- packages/gui/utils/usePath.ts | 6 +- packages/installer/jest.config.js | 16 +- packages/installer/src/components/branded.tsx | 4 +- packages/installer/src/components/newline.tsx | 4 +- .../src/executors/add-dependency-executor.tsx | 46 ++--- packages/installer/src/executors/executor.tsx | 16 +- .../installer/src/executors/file-prompt.ts | 12 +- .../src/executors/file-transform-executor.tsx | 40 ++--- .../src/executors/new-file-executor.tsx | 41 ++--- packages/installer/src/index.ts | 16 +- packages/installer/src/installer.tsx | 25 +-- packages/installer/src/recipe-renderer.tsx | 33 ++-- .../installer/src/transforms/add-import.ts | 8 +- packages/installer/src/transforms/index.ts | 2 +- packages/installer/src/utils/paths.ts | 8 +- packages/installer/src/utils/transform.ts | 33 ++-- .../src/utils/use-enter-to-continue.ts | 2 +- .../test/transforms/add-import.test.ts | 23 +-- packages/installer/test/utils/paths.test.ts | 32 ++-- packages/repl/jest.config.js | 16 +- packages/repl/src/index.ts | 2 +- packages/repl/src/repl.ts | 34 ++-- packages/repl/src/utils/load-blitz.ts | 20 +-- packages/repl/test/repl.test.ts | 50 +++--- packages/server/README.md | 4 +- packages/server/register/index.js | 6 +- packages/server/register/launch-editor.js | 12 +- packages/server/src/build-hash.ts | 22 +-- packages/server/src/build.ts | 21 ++- packages/server/src/config.ts | 50 +++--- packages/server/src/dev.ts | 8 +- packages/server/src/folder-hash.d.ts | 2 +- packages/server/src/index.ts | 16 +- packages/server/src/manifest-loader.ts | 6 +- packages/server/src/next-utils.ts | 34 ++-- .../parse-chokidar-rules-from-gitignore.ts | 28 ++-- packages/server/src/parse-gitignore.d.ts | 2 +- packages/server/src/prod.ts | 13 +- packages/server/src/reporter.ts | 2 +- packages/server/src/resolve-bin-async.ts | 10 +- packages/server/src/rpc.ts | 18 +- packages/server/src/stages/config/index.ts | 26 +-- packages/server/src/stages/index.ts | 10 +- packages/server/src/stages/manifest/index.ts | 12 +- .../src/stages/manifest/manifest.test.ts | 45 ++--- packages/server/src/stages/pages/api.test.ts | 36 ++-- packages/server/src/stages/pages/errors.ts | 12 +- .../src/stages/pages/find-duplicates.test.ts | 74 ++++---- packages/server/src/stages/pages/index.ts | 28 ++-- .../pages/pages-path-transformer.test.ts | 36 ++-- .../server/src/stages/pages/pages.test.ts | 60 +++---- packages/server/src/stages/relative/index.ts | 14 +- .../stages/relative/relative-paths.test.ts | 42 ++--- .../src/stages/relative/relative.test.ts | 34 ++-- packages/server/src/stages/rpc/index.ts | 31 ++-- .../server/src/stages/stage-test-utils.ts | 17 +- packages/server/src/stages/utils.ts | 8 +- packages/server/src/streams.ts | 16 +- packages/server/src/with-blitz.ts | 33 ++-- packages/server/test/api-routes.test.ts | 42 ++--- packages/server/test/build.test.ts | 62 +++---- packages/server/test/dev.test.ts | 113 +++++++------ ...arse-chokidar-rules-from-gitignore.test.ts | 31 ++-- packages/server/test/prod.test.ts | 42 ++--- packages/server/test/rpc.test.ts | 118 ++++++------- packages/server/test/rules.test.ts | 42 ++--- packages/server/test/utils/multi-mock.ts | 6 +- packages/server/test/utils/tree-utils.ts | 2 +- packages/server/test/vercel-now.test.ts | 50 +++--- packages/server/test/with-blitz.test.ts | 26 +-- prettier.config.js | 9 +- rfc-docs/01-architecture.md | 51 +++--- rfc-docs/02-file-structure-routing.md | 8 +- 316 files changed, 3864 insertions(+), 2896 deletions(-) create mode 100644 packages/gui/app/components/CreateProjectForm.tsx create mode 100644 packages/gui/app/components/CreateProjectInputs.tsx create mode 100644 packages/gui/app/components/CreateProjectModal.tsx create mode 100644 packages/gui/app/components/Fade.tsx create mode 100644 packages/gui/app/components/Greeting.tsx create mode 100644 packages/gui/app/components/Nav.tsx create mode 100644 packages/gui/app/components/OfflineAlert.tsx create mode 100644 packages/gui/app/components/PagesModule.tsx create mode 100644 packages/gui/app/components/ProjectCard.tsx create mode 100644 packages/gui/app/components/ProjectHeader.tsx create mode 100644 packages/gui/app/components/ProjectList.tsx create mode 100644 packages/gui/app/components/ProjectModules.tsx create mode 100644 packages/gui/app/pages/projects/[id].tsx create mode 100644 packages/gui/utils/canUseDom.ts create mode 100644 packages/gui/utils/dethunkify.ts create mode 100644 packages/gui/utils/hooks/web/useDelayUnmount.ts create mode 100644 packages/gui/utils/hooks/web/useLocalStorage.ts create mode 100644 packages/gui/utils/hooks/web/useNetworkAvailability.ts create mode 100644 packages/gui/utils/managedEventListener.ts create mode 100644 packages/gui/utils/timeDifference.ts create mode 100644 packages/gui/utils/types/JSONArray.ts create mode 100644 packages/gui/utils/types/JSONObject.ts create mode 100644 packages/gui/utils/types/JSONValue.ts create mode 100644 packages/gui/utils/useEventCallback.ts diff --git a/.eslintrc.js b/.eslintrc.js index 476addfc4..28f342bbd 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,38 +1,38 @@ module.exports = { - parser: '@typescript-eslint/parser', + parser: "@typescript-eslint/parser", parserOptions: { ecmaVersion: 6, - sourceType: 'module', + sourceType: "module", ecmaFeatures: { jsx: true, }, project: `./tsconfig.json`, }, - plugins: ['@typescript-eslint', 'import', 'unicorn'], - extends: ['react-app'], + plugins: ["@typescript-eslint", "import", "unicorn"], + extends: ["react-app"], rules: { - 'react/react-in-jsx-scope': 'off', // React is always in scope with Blitz - 'jsx-a11y/anchor-is-valid': 'off', //Doesn't play well with Blitz/Next usage - 'import/first': 'off', - 'import/no-default-export': 'error', - 'require-await': 'error', - 'no-async-promise-executor': 'error', - 'unicorn/filename-case': [ - 'error', + "react/react-in-jsx-scope": "off", // React is always in scope with Blitz + "jsx-a11y/anchor-is-valid": "off", //Doesn't play well with Blitz/Next usage + "import/first": "off", + "import/no-default-export": "error", + "require-await": "error", + "no-async-promise-executor": "error", + "unicorn/filename-case": [ + "error", { - case: 'kebabCase', + case: "kebabCase", }, ], - '@typescript-eslint/no-floating-promises': 'error', + "@typescript-eslint/no-floating-promises": "error", }, - ignorePatterns: ['packages/cli/', 'packages/generator/templates'], + ignorePatterns: ["packages/cli/", "packages/generator/templates"], overrides: [ { - files: ['examples/**', 'packages/gui/**'], + files: ["examples/**", "packages/gui/**"], rules: { - 'import/no-default-export': 'off', - 'unicorn/filename-case': 'off', - '@typescript-eslint/no-floating-promises': 'off', + "import/no-default-export": "off", + "unicorn/filename-case": "off", + "@typescript-eslint/no-floating-promises": "off", }, }, ], diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index fe561a1d9..7ae6d91fc 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,4 +1,4 @@ github: blitz-js -custom: ['https://paypal.me/thebayers'] +custom: ["https://paypal.me/thebayers"] open_collective: blitzjs patreon: flybayer diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index e8e9bfbed..ec5524172 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -1,9 +1,9 @@ --- name: Feature/change request about: Something new or better! -title: '' -labels: '' -assignees: '' +title: "" +labels: "" +assignees: "" --- ### What do you want and why? diff --git a/.github/checkInstallTime.js b/.github/checkInstallTime.js index 5db709092..9a811ed53 100755 --- a/.github/checkInstallTime.js +++ b/.github/checkInstallTime.js @@ -1,7 +1,7 @@ #!/usr/bin/env node -const fs = require('fs') -const yarnOut = fs.readFileSync(0, {encoding: 'utf8'}) +const fs = require("fs") +const yarnOut = fs.readFileSync(0, {encoding: "utf8"}) const [installTimeString] = /(?<=^Done in )\d+\.\d+(?=s\.$)/m.exec(yarnOut) const installTime = Number(installTimeString) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 10010acc5..fa84dfc17 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,7 +19,7 @@ jobs: - name: Use Node.js uses: actions/setup-node@v1 with: - node-version: '12.16.1' + node-version: "12.16.1" - name: Test Install time run: | cd ../ && mkdir test && cd test @@ -37,7 +37,7 @@ jobs: - name: Use Node.js uses: actions/setup-node@v1 with: - node-version: '12.16.1' + node-version: "12.16.1" - name: Get yarn cache directory path id: yarn-cache-dir-path run: echo "::set-output name=dir::$(yarn cache dir)" diff --git a/__mocks__/fs.js b/__mocks__/fs.js index ec43c8669..fd7ed6831 100644 --- a/__mocks__/fs.js +++ b/__mocks__/fs.js @@ -1,3 +1,3 @@ -const {fs} = require('memfs') +const {fs} = require("memfs") module.exports = fs diff --git a/examples/plain-js/app/pages/_app.js b/examples/plain-js/app/pages/_app.js index 88dd5c271..63ae4ea8f 100644 --- a/examples/plain-js/app/pages/_app.js +++ b/examples/plain-js/app/pages/_app.js @@ -1,3 +1,3 @@ -export default function MyApp({ Component, pageProps }) { +export default function MyApp({Component, pageProps}) { return } diff --git a/examples/plain-js/app/pages/index.js b/examples/plain-js/app/pages/index.js index 37392c62f..71303c472 100644 --- a/examples/plain-js/app/pages/index.js +++ b/examples/plain-js/app/pages/index.js @@ -1,4 +1,4 @@ -import { Head, Link } from "blitz" +import {Head, Link} from "blitz" const modelSnippet = `model Project { id Int @default(autoincrement()) @id name String @@ -189,8 +189,8 @@ const Home = () => ( body { padding: 0; margin: 0; - font-family: "Libre Franklin", -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, Ubuntu, - Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif; + font-family: "Libre Franklin", -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, + Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif; } * { diff --git a/examples/plain-js/app/projects/pages/projects/[id].js b/examples/plain-js/app/projects/pages/projects/[id].js index 2c49f7efc..3c00e72d3 100644 --- a/examples/plain-js/app/projects/pages/projects/[id].js +++ b/examples/plain-js/app/projects/pages/projects/[id].js @@ -1,5 +1,5 @@ -import { Suspense } from "react" -import { Head, Link, useRouter, useQuery } from "blitz" +import {Suspense} from "react" +import {Head, Link, useRouter, useQuery} from "blitz" import getProject from "app/projects/queries/getProject" import deleteProject from "app/projects/mutations/deleteProject" export const Project = () => { diff --git a/examples/plain-js/app/projects/pages/projects/[id]/edit.js b/examples/plain-js/app/projects/pages/projects/[id]/edit.js index f827f51ce..01bc0b916 100644 --- a/examples/plain-js/app/projects/pages/projects/[id]/edit.js +++ b/examples/plain-js/app/projects/pages/projects/[id]/edit.js @@ -1,5 +1,5 @@ -import { Suspense } from "react" -import { Head, Link, useRouter, useQuery } from "blitz" +import {Suspense} from "react" +import {Head, Link, useRouter, useQuery} from "blitz" import getProject from "app/projects/queries/getProject" import updateProject from "app/projects/mutations/updateProject" export const EditProject = () => { diff --git a/examples/plain-js/app/projects/pages/projects/index.js b/examples/plain-js/app/projects/pages/projects/index.js index ae39357b4..fe6016bda 100644 --- a/examples/plain-js/app/projects/pages/projects/index.js +++ b/examples/plain-js/app/projects/pages/projects/index.js @@ -1,5 +1,5 @@ -import { Suspense } from "react" -import { Head, Link, useQuery } from "blitz" +import {Suspense} from "react" +import {Head, Link, useQuery} from "blitz" import getProjects from "app/projects/queries/getProjects" export const ProjectsList = () => { diff --git a/examples/plain-js/app/projects/pages/projects/new.js b/examples/plain-js/app/projects/pages/projects/new.js index 2535d859d..80a5d6337 100644 --- a/examples/plain-js/app/projects/pages/projects/new.js +++ b/examples/plain-js/app/projects/pages/projects/new.js @@ -1,4 +1,4 @@ -import { Head, Link, useRouter } from "blitz" +import {Head, Link, useRouter} from "blitz" import createProject from "app/projects/mutations/createProject" const NewProjectPage = () => { diff --git a/examples/plain-js/blitz.config.js b/examples/plain-js/blitz.config.js index 3b17b02ef..80bd1073c 100644 --- a/examples/plain-js/blitz.config.js +++ b/examples/plain-js/blitz.config.js @@ -1,5 +1,5 @@ module.exports = { - webpack: (config, { buildId, dev, isServer, defaultLoaders, webpack }) => { + webpack: (config, {buildId, dev, isServer, defaultLoaders, webpack}) => { // Note: we provide webpack above so you should not `require` it // Perform customizations to webpack config // Important: return the modified config diff --git a/examples/plain-js/db/index.js b/examples/plain-js/db/index.js index 56c97b0db..20d5d0aa2 100644 --- a/examples/plain-js/db/index.js +++ b/examples/plain-js/db/index.js @@ -1,4 +1,4 @@ -import { PrismaClient } from "@prisma/client" +import {PrismaClient} from "@prisma/client" export * from "@prisma/client" let prisma diff --git a/examples/plain-js/package.json b/examples/plain-js/package.json index 92a5be39a..bae6e0ae8 100644 --- a/examples/plain-js/package.json +++ b/examples/plain-js/package.json @@ -12,7 +12,9 @@ ], "prettier": { "semi": false, - "printWidth": 110 + "printWidth": 100, + "bracketSpacing": false, + "trailingComma": "all" }, "husky": { "hooks": { diff --git a/examples/store/.babelrc.js b/examples/store/.babelrc.js index 906fa8567..a14498291 100644 --- a/examples/store/.babelrc.js +++ b/examples/store/.babelrc.js @@ -1,4 +1,4 @@ module.exports = { - presets: ['next/babel'], + presets: ["next/babel"], plugins: [], } diff --git a/examples/store/app/admin/pages/admin/index.tsx b/examples/store/app/admin/pages/admin/index.tsx index 00394069e..05acc1ea8 100644 --- a/examples/store/app/admin/pages/admin/index.tsx +++ b/examples/store/app/admin/pages/admin/index.tsx @@ -1,4 +1,4 @@ -import { Link } from "blitz" +import {Link} from "blitz" function StoreAdminPage() { return ( diff --git a/examples/store/app/admin/pages/admin/products/[id].tsx b/examples/store/app/admin/pages/admin/products/[id].tsx index c59c3f8be..b1a0ea282 100644 --- a/examples/store/app/admin/pages/admin/products/[id].tsx +++ b/examples/store/app/admin/pages/admin/products/[id].tsx @@ -1,12 +1,12 @@ -import { Suspense } from "react" -import { Link, useRouter, useQuery, useParam } from "blitz" +import {Suspense} from "react" +import {Link, useRouter, useQuery, useParam} from "blitz" import getProduct from "app/products/queries/getProduct" import ProductForm from "app/products/components/ProductForm" function Product() { const router = useRouter() const id = useParam("id", "number") - const [product, { mutate }] = useQuery(getProduct, { where: { id } }) + const [product, {mutate}] = useQuery(getProduct, {where: {id}}) return ( (
  • - getProduct({ where: { id: product.id } })}>{product.name} + getProduct({where: {id: product.id}})}>{product.name}
    • ))} @@ -35,7 +35,7 @@ function AdminProducts() { Create Product - Admin + Admin

    diff --git a/examples/store/app/admin/pages/admin/products/new.tsx b/examples/store/app/admin/pages/admin/products/new.tsx index 0531712cf..bf655b755 100644 --- a/examples/store/app/admin/pages/admin/products/new.tsx +++ b/examples/store/app/admin/pages/admin/products/new.tsx @@ -1,4 +1,4 @@ -import { Link, useRouter } from "blitz" +import {Link, useRouter} from "blitz" import ProductForm from "app/products/components/ProductForm" function AdminNewProductPage() { diff --git a/examples/store/app/components/ErrorBoundary.tsx b/examples/store/app/components/ErrorBoundary.tsx index 22aee07c6..11895f6e6 100644 --- a/examples/store/app/components/ErrorBoundary.tsx +++ b/examples/store/app/components/ErrorBoundary.tsx @@ -3,7 +3,7 @@ import React from "react" export default class ErrorBoundary extends React.Component<{ fallback: (error: any) => React.ReactNode }> { - state = { hasError: false, error: null } + state = {hasError: false, error: null} static getDerivedStateFromError(error: any) { return { diff --git a/examples/store/app/pages/_app.tsx b/examples/store/app/pages/_app.tsx index 88dd5c271..63ae4ea8f 100644 --- a/examples/store/app/pages/_app.tsx +++ b/examples/store/app/pages/_app.tsx @@ -1,3 +1,3 @@ -export default function MyApp({ Component, pageProps }) { +export default function MyApp({Component, pageProps}) { return } diff --git a/examples/store/app/pages/_document.tsx b/examples/store/app/pages/_document.tsx index ed68f9911..614d20235 100644 --- a/examples/store/app/pages/_document.tsx +++ b/examples/store/app/pages/_document.tsx @@ -1,9 +1,9 @@ -import { Document, Html, DocumentHead, Main, BlitzScript, DocumentContext } from "@blitzjs/core" +import {Document, Html, DocumentHead, Main, BlitzScript, DocumentContext} from "@blitzjs/core" class MyDocument extends Document { static async getInitialProps(ctx: DocumentContext) { const initialProps = await Document.getInitialProps(ctx) - return { ...initialProps } + return {...initialProps} } render() { diff --git a/examples/store/app/pages/index.tsx b/examples/store/app/pages/index.tsx index f1ca49ca7..7224398b0 100644 --- a/examples/store/app/pages/index.tsx +++ b/examples/store/app/pages/index.tsx @@ -1,4 +1,4 @@ -import { Head, Link } from "blitz" +import {Head, Link} from "blitz" const Home = () => (
    @@ -8,7 +8,7 @@ const Home = () => (
    -

    +

    Blitz Store Example