From c07a13eefb67ac8c2ed1a887f40fd0b69f04e383 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maotora=20=E1=95=99=28=E2=87=80=E2=80=B8=E2=86=BC=E2=80=B6?= =?UTF-8?q?=29=E1=95=97?= Date: Fri, 7 Apr 2023 19:38:46 +0300 Subject: [PATCH 1/2] Fix blitz recipe paths (#3997) Co-authored-by: Tobias Co-authored-by: Siddharth Suresh --- .changeset/many-fans-fetch.md | 7 + packages/blitz/src/installer/utils/paths.ts | 27 +- pnpm-lock.yaml | 241 +++++++++++------- recipes/bumbag-ui/index.ts | 1 - recipes/chakra-ui/index.ts | 2 +- recipes/next-ui/index.ts | 2 +- .../templates/config/tailwind.config.js | 2 +- 7 files changed, 186 insertions(+), 96 deletions(-) create mode 100644 .changeset/many-fans-fetch.md diff --git a/.changeset/many-fans-fetch.md b/.changeset/many-fans-fetch.md new file mode 100644 index 0000000000..ca2c3d1b37 --- /dev/null +++ b/.changeset/many-fans-fetch.md @@ -0,0 +1,7 @@ +--- +"@blitzjs/recipe-chakra-ui": patch +"@blitzjs/recipe-next-ui": patch +"@blitzjs/recipe-tailwind": patch +--- + +This change reflects the directory change from app/pages to src/pages for the receipts chakra-ui, next-ui, tailwind. It checks for which directories exists and is compatible with either versions. diff --git a/packages/blitz/src/installer/utils/paths.ts b/packages/blitz/src/installer/utils/paths.ts index 16b9b51e8d..032fe6d656 100644 --- a/packages/blitz/src/installer/utils/paths.ts +++ b/packages/blitz/src/installer/utils/paths.ts @@ -18,14 +18,28 @@ function getBlitzPath(type: string) { } } +function getAppSourceDir() { + const srcPath = "src/pages" + const srcDir = fs.existsSync(path.resolve(srcPath)) + + if (srcDir) { + return "src" + } else { + return "app" + } +} + function findPageDir() { const srcPagePath = `src/pages` - const srcPage = fs.existsSync(path.resolve(srcPagePath)) + const srcPage = getAppSourceDir() - if (srcPage) { - return srcPagePath - } else { - return `pages` + switch (srcPage) { + case "src": { + return srcPagePath + } + default: { + return `pages` + } } } @@ -36,6 +50,9 @@ export const paths = { app() { return `${findPageDir()}/_app${ext(true)}` }, + appSrcDirectory() { + return getAppSourceDir() + }, blitzServer() { return getBlitzPath("server") }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e16d6b49ff..bdd92e058b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -665,7 +665,7 @@ importers: "@vitejs/plugin-react": 1.3.0 delay: 5.0.0 eslint: 8.27.0 - eslint-config-next: 13.2.4_rmayb2veg2btbq6mbmnyivgasy + eslint-config-next: 13.3.0_rmayb2veg2btbq6mbmnyivgasy eslint-plugin-testing-library: 5.0.1_rmayb2veg2btbq6mbmnyivgasy jsdom: 19.0.0 typescript: 4.8.4 @@ -1809,6 +1809,7 @@ packages: semver: 6.3.0 transitivePeerDependencies: - supports-color + dev: false /@babel/core/7.20.2: resolution: @@ -1835,6 +1836,32 @@ packages: transitivePeerDependencies: - supports-color + /@babel/core/7.20.2_supports-color@8.1.1: + resolution: + { + integrity: sha512-w7DbG8DtMrJcFOi4VrLm+8QM4az8Mo+PuLBKLp2zrYRCow8W/f9xiXm5sN53C8HksCyDQwCKha9JiDoIyPjT2g==, + } + engines: {node: ">=6.9.0"} + dependencies: + "@ampproject/remapping": 2.2.0 + "@babel/code-frame": 7.18.6 + "@babel/generator": 7.20.4 + "@babel/helper-compilation-targets": 7.20.0_@babel+core@7.20.2 + "@babel/helper-module-transforms": 7.20.2_supports-color@8.1.1 + "@babel/helpers": 7.20.1_supports-color@8.1.1 + "@babel/parser": 7.20.3 + "@babel/template": 7.18.10 + "@babel/traverse": 7.20.1_supports-color@8.1.1 + "@babel/types": 7.20.2 + convert-source-map: 1.8.0 + debug: 4.3.3_supports-color@8.1.1 + gensync: 1.0.0-beta.2 + json5: 2.2.1 + semver: 6.3.0 + transitivePeerDependencies: + - supports-color + dev: true + /@babel/generator/7.18.2: resolution: { @@ -1884,7 +1911,7 @@ packages: engines: {node: ">=6.9.0"} dependencies: "@babel/helper-explode-assignable-expression": 7.16.7 - "@babel/types": 7.18.4 + "@babel/types": 7.20.2 /@babel/helper-compilation-targets/7.18.2_@babel+core@7.12.10: resolution: @@ -2091,7 +2118,7 @@ packages: } engines: {node: ">=6.9.0"} dependencies: - "@babel/types": 7.18.4 + "@babel/types": 7.20.2 /@babel/helper-function-name/7.17.9: resolution: @@ -2193,6 +2220,7 @@ packages: "@babel/types": 7.18.4 transitivePeerDependencies: - supports-color + dev: false /@babel/helper-module-transforms/7.20.2: resolution: @@ -2212,6 +2240,25 @@ packages: transitivePeerDependencies: - supports-color + /@babel/helper-module-transforms/7.20.2_supports-color@8.1.1: + resolution: + { + integrity: sha512-zvBKyJXRbmK07XhMuujYoJ48B5yvvmM6+wcpv6Ivj4Yg6qO7NOZOSnvZN9CRl1zz1Z4cKf8YejmCMh8clOoOeA==, + } + engines: {node: ">=6.9.0"} + dependencies: + "@babel/helper-environment-visitor": 7.18.9 + "@babel/helper-module-imports": 7.18.6 + "@babel/helper-simple-access": 7.20.2 + "@babel/helper-split-export-declaration": 7.18.6 + "@babel/helper-validator-identifier": 7.19.1 + "@babel/template": 7.18.10 + "@babel/traverse": 7.20.1_supports-color@8.1.1 + "@babel/types": 7.20.2 + transitivePeerDependencies: + - supports-color + dev: true + /@babel/helper-optimise-call-expression/7.16.7: resolution: { @@ -2234,6 +2281,7 @@ packages: integrity: sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==, } engines: {node: ">=6.9.0"} + dev: true /@babel/helper-remap-async-to-generator/7.16.8: resolution: @@ -2427,6 +2475,7 @@ packages: "@babel/types": 7.18.4 transitivePeerDependencies: - supports-color + dev: false /@babel/helpers/7.20.1: resolution: @@ -2441,6 +2490,20 @@ packages: transitivePeerDependencies: - supports-color + /@babel/helpers/7.20.1_supports-color@8.1.1: + resolution: + { + integrity: sha512-J77mUVaDTUJFZ5BpP6mMn6OIl3rEWymk2ZxDBQJUG3P+PbmyMcF3bYWvz0ma69Af1oobDqT/iAsvzhB58xhQUg==, + } + engines: {node: ">=6.9.0"} + dependencies: + "@babel/template": 7.18.10 + "@babel/traverse": 7.20.1_supports-color@8.1.1 + "@babel/types": 7.20.2 + transitivePeerDependencies: + - supports-color + dev: true + /@babel/highlight/7.17.9: resolution: { @@ -2804,7 +2867,7 @@ packages: "@babel/core": ^7.0.0-0 dependencies: "@babel/core": 7.20.2 - "@babel/helper-plugin-utils": 7.20.2 + "@babel/helper-plugin-utils": 7.17.12 /@babel/plugin-syntax-class-properties/7.12.13_@babel+core@7.12.10: resolution: @@ -2872,7 +2935,7 @@ packages: "@babel/core": ^7.0.0-0 dependencies: "@babel/core": 7.20.2 - "@babel/helper-plugin-utils": 7.20.2 + "@babel/helper-plugin-utils": 7.17.12 /@babel/plugin-syntax-json-strings/7.8.3_@babel+core@7.12.10: resolution: @@ -4254,6 +4317,7 @@ packages: globals: 11.12.0 transitivePeerDependencies: - supports-color + dev: false /@babel/traverse/7.20.1: resolution: @@ -4275,6 +4339,27 @@ packages: transitivePeerDependencies: - supports-color + /@babel/traverse/7.20.1_supports-color@8.1.1: + resolution: + { + integrity: sha512-d3tN8fkVJwFLkHkBN479SOsw4DMZnz8cdbL/gvuDuzy3TS6Nfw80HuQqhw1pITbIruHyh7d1fMA47kWzmcUEGA==, + } + engines: {node: ">=6.9.0"} + dependencies: + "@babel/code-frame": 7.18.6 + "@babel/generator": 7.20.4 + "@babel/helper-environment-visitor": 7.18.9 + "@babel/helper-function-name": 7.19.0 + "@babel/helper-hoist-variables": 7.18.6 + "@babel/helper-split-export-declaration": 7.18.6 + "@babel/parser": 7.20.3 + "@babel/types": 7.20.2 + debug: 4.3.3_supports-color@8.1.1 + globals: 11.12.0 + transitivePeerDependencies: + - supports-color + dev: true + /@babel/types/7.12.10: resolution: { @@ -5045,7 +5130,7 @@ packages: engines: {node: ">=6.0.0"} dependencies: "@jridgewell/set-array": 1.1.1 - "@jridgewell/sourcemap-codec": 1.4.14 + "@jridgewell/sourcemap-codec": 1.4.13 /@jridgewell/gen-mapping/0.3.1: resolution: @@ -5056,7 +5141,7 @@ packages: dependencies: "@jridgewell/set-array": 1.1.1 "@jridgewell/sourcemap-codec": 1.4.13 - "@jridgewell/trace-mapping": 0.3.17 + "@jridgewell/trace-mapping": 0.3.11 /@jridgewell/gen-mapping/0.3.2: resolution: @@ -5069,6 +5154,13 @@ packages: "@jridgewell/sourcemap-codec": 1.4.14 "@jridgewell/trace-mapping": 0.3.17 + /@jridgewell/resolve-uri/3.0.7: + resolution: + { + integrity: sha512-8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA==, + } + engines: {node: ">=6.0.0"} + /@jridgewell/resolve-uri/3.1.0: resolution: { @@ -5101,8 +5193,8 @@ packages: integrity: sha512-RllI476aSMsxzeI9TtlSMoNTgHDxEmnl6GkkHwhr0vdL8W+0WuesyI8Vd3rBOfrwtPXbPxdT9ADJdiOKgzxPQA==, } dependencies: - "@jridgewell/resolve-uri": 3.1.0 - "@jridgewell/sourcemap-codec": 1.4.14 + "@jridgewell/resolve-uri": 3.0.7 + "@jridgewell/sourcemap-codec": 1.4.13 /@jridgewell/trace-mapping/0.3.17: resolution: @@ -5119,8 +5211,8 @@ packages: integrity: sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==, } dependencies: - "@jridgewell/resolve-uri": 3.1.0 - "@jridgewell/sourcemap-codec": 1.4.14 + "@jridgewell/resolve-uri": 3.0.7 + "@jridgewell/sourcemap-codec": 1.4.13 /@juanm04/cpx/2.0.1_supports-color@8.1.1: resolution: @@ -5238,10 +5330,10 @@ packages: glob: 7.1.7 dev: true - /@next/eslint-plugin-next/13.2.4: + /@next/eslint-plugin-next/13.3.0: resolution: { - integrity: sha512-ck1lI+7r1mMJpqLNa3LJ5pxCfOB1lfJncKmRJeJxcJqcngaFwylreLP7da6Rrjr6u2gVRTfmnkSkjc80IiQCwQ==, + integrity: sha512-wuGN5qSEjSgcq9fVkH0Y/qIPFjnZtW3ZPwfjJOn7l/rrf6y8J24h/lo61kwqunTyzZJm/ETGfGVU9PUs8cnzEA==, } dependencies: glob: 7.1.7 @@ -5519,7 +5611,7 @@ packages: glob: 7.2.0 is-reference: 1.2.1 magic-string: 0.25.9 - resolve: 1.22.1 + resolve: 1.22.0 rollup: 2.77.2 dev: true @@ -7951,10 +8043,7 @@ packages: engines: {node: ">=8"} /array-flatten/1.1.1: - resolution: - { - integrity: sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==, - } + resolution: {integrity: sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=} dev: true /array-includes/3.1.5: @@ -8225,7 +8314,7 @@ packages: } engines: {node: ">=8"} dependencies: - "@babel/helper-plugin-utils": 7.20.2 + "@babel/helper-plugin-utils": 7.17.12 "@istanbuljs/load-nyc-config": 1.1.0 "@istanbuljs/schema": 0.1.3 istanbul-lib-instrument: 5.2.0 @@ -8240,8 +8329,8 @@ packages: } engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - "@babel/template": 7.16.7 - "@babel/types": 7.18.4 + "@babel/template": 7.18.10 + "@babel/types": 7.20.2 "@types/babel__core": 7.1.19 "@types/babel__traverse": 7.17.1 @@ -8287,7 +8376,7 @@ packages: } engines: {node: ">= 10.0.0"} dependencies: - "@babel/types": 7.20.2 + "@babel/types": 7.18.4 dev: true /babylon/6.18.0: @@ -8544,7 +8633,7 @@ packages: engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true dependencies: - caniuse-lite: 1.0.30001434 + caniuse-lite: 1.0.30001339 electron-to-chromium: 1.4.146 escalade: 3.1.1 node-releases: 2.0.5 @@ -8749,6 +8838,12 @@ packages: engines: {node: ">=14.16"} dev: false + /caniuse-lite/1.0.30001339: + resolution: + { + integrity: sha512-Es8PiVqCe+uXdms0Gu5xP5PF2bxLR7OBp3wUzUnuO7OHzhOfCyg3hdiGWVPVxhiuniOzng+hTc1u3fEQ0TlkSQ==, + } + /caniuse-lite/1.0.30001434: resolution: { @@ -9250,8 +9345,8 @@ packages: integrity: sha512-vCrqcSIq4//Gx74TXXCGnHpulY1dskqLTFGDmhrGxzeXL8lF8kvXv6mpNWlJj1uD4DW23D4ljAqbY4RRaaUZIw==, } dependencies: - "@babel/parser": 7.20.3 - "@babel/types": 7.20.2 + "@babel/parser": 7.18.4 + "@babel/types": 7.18.4 dev: true /content-disposition/0.5.4: @@ -9310,10 +9405,7 @@ packages: dev: false /cookie-signature/1.0.6: - resolution: - { - integrity: sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==, - } + resolution: {integrity: sha1-4wOogrNCzD7oylE6eZmXNNqzriw=} dev: true /cookie/0.4.1: @@ -9374,7 +9466,7 @@ packages: integrity: sha512-rEF75n3QtInrYICvJjrAgV03HwKiYvtKHdPtaba1KucG+cNZ4NJnH9isqt979e67KZlhpbCOTwnsvnIr+CVeOg==, } dependencies: - browserslist: 4.20.3 + browserslist: 4.21.4 semver: 7.0.0 /core-js-pure/3.23.0: @@ -10001,10 +10093,7 @@ packages: path-type: 4.0.0 /discontinuous-range/1.0.0: - resolution: - { - integrity: sha512-c68LpLbO+7kP/b1Hr1qs8/BJ09F5khZGTxqxZuhzxpmwJKOgRFHJWIb9/KmqnqHhLdO55aOxFH/EGBvUQbL/RQ==, - } + resolution: {integrity: sha1-44Mx8IRLukm5qctxx3FYWqsbxlo=} dev: true /display-notification/2.0.0: @@ -10144,10 +10233,7 @@ packages: dev: false /ee-first/1.1.1: - resolution: - { - integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==, - } + resolution: {integrity: sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=} dev: true /ejs/3.1.8: @@ -10216,10 +10302,10 @@ packages: dependencies: once: 1.4.0 - /enhanced-resolve/5.10.0: + /enhanced-resolve/5.11.0: resolution: { - integrity: sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ==, + integrity: sha512-0Gcraf7gAJSQoPg+bTSXNhuzAYtXqLc4C011vb8S3B8XUSEkGYNBk20c68X9291VF4vvsCD8SPkr6Mza+DwU+g==, } engines: {node: ">=10.13.0"} dependencies: @@ -11285,10 +11371,10 @@ packages: - supports-color dev: true - /eslint-config-next/13.2.4_rmayb2veg2btbq6mbmnyivgasy: + /eslint-config-next/13.3.0_rmayb2veg2btbq6mbmnyivgasy: resolution: { - integrity: sha512-lunIBhsoeqw6/Lfkd6zPt25w1bn0znLA/JCL+au1HoEpSb4/PpsOYsYtgV/q+YPsoKIOzFyU5xnb04iZnXjUvg==, + integrity: sha512-6YEwmFBX0VjBd3ODGW9df0Is0FLaRFdMN8eAahQG9CN6LjQ28J8AFr19ngxqMSg7Qv6Uca/3VeeBosJh1bzu0w==, } peerDependencies: eslint: ^7.23.0 || ^8.0.0 @@ -11297,7 +11383,7 @@ packages: typescript: optional: true dependencies: - "@next/eslint-plugin-next": 13.2.4 + "@next/eslint-plugin-next": 13.3.0 "@rushstack/eslint-patch": 1.1.3 "@typescript-eslint/parser": 5.43.0_rmayb2veg2btbq6mbmnyivgasy eslint: 8.27.0 @@ -11418,7 +11504,7 @@ packages: eslint-plugin-import: "*" dependencies: debug: 4.3.4 - enhanced-resolve: 5.10.0 + enhanced-resolve: 5.11.0 eslint: 8.27.0 eslint-plugin-import: 2.26.0_bbzxof3vtngyannf3l4jlcflvy get-tsconfig: 4.2.0 @@ -12815,10 +12901,7 @@ packages: dev: false /fresh/0.5.2: - resolution: - { - integrity: sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==, - } + resolution: {integrity: sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=} engines: {node: ">= 0.6"} dev: true @@ -13588,7 +13671,7 @@ packages: engines: {node: ">= 6"} dependencies: agent-base: 6.0.2 - debug: 4.3.3 + debug: 4.3.4 transitivePeerDependencies: - supports-color @@ -14357,7 +14440,7 @@ packages: engines: {node: ">=8"} dependencies: "@babel/core": 7.20.2 - "@babel/parser": 7.18.4 + "@babel/parser": 7.20.3 "@istanbuljs/schema": 0.1.3 istanbul-lib-coverage: 3.2.0 semver: 6.3.0 @@ -14794,7 +14877,7 @@ packages: jest-pnp-resolver: 1.2.2_jest-resolve@29.3.0 jest-util: 29.2.1 jest-validate: 29.2.2 - resolve: 1.22.1 + resolve: 1.22.0 resolve.exports: 1.1.0 slash: 3.0.0 @@ -15413,10 +15496,7 @@ packages: dev: false /jstransformer/1.0.0: - resolution: - { - integrity: sha512-C9YK3Rf8q6VAPDCCU9fnqo3mAfOH6vUGnMcP4AQAYIEpWtfGLpwOTmZ+igtdK5y+VvI2n3CyYSzy4Qh34eq24A==, - } + resolution: {integrity: sha1-7Yvwkh4vPx7U1cGkT2hwntJHIsM=} dependencies: is-promise: 2.2.2 promise: 7.3.1 @@ -15598,10 +15678,7 @@ packages: dev: true /libqp/1.1.0: - resolution: - { - integrity: sha512-4Rgfa0hZpG++t1Vi2IiqXG9Ad1ig4QTmtuZF946QJP4bPqOYC78ixUXgz5TW/wE7lNaNKlplSYTxQ+fR2KZ0EA==, - } + resolution: {integrity: sha1-9ebgatdLeU+1tbZpiL9yjvHe2+g=} dev: true /lie/3.3.0: @@ -16013,10 +16090,7 @@ packages: dev: false /media-typer/0.3.0: - resolution: - { - integrity: sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==, - } + resolution: {integrity: sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=} engines: {node: ">= 0.6"} dev: true @@ -16082,10 +16156,7 @@ packages: dev: false /merge-descriptors/1.0.1: - resolution: - { - integrity: sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==, - } + resolution: {integrity: sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=} dev: true /merge-stream/2.0.0: @@ -16613,7 +16684,10 @@ packages: "@swc/helpers": 0.4.14 caniuse-lite: 1.0.30001434 postcss: 8.4.14 + react: 18.2.0 + react-dom: 18.2.0_react@18.2.0 styled-jsx: 5.1.1 + use-sync-external-store: 1.2.0_react@18.2.0 optionalDependencies: "@next/swc-android-arm-eabi": 13.2.4 "@next/swc-android-arm64": 13.2.4 @@ -16764,7 +16838,7 @@ packages: } dependencies: hosted-git-info: 2.8.9 - resolve: 1.22.1 + resolve: 1.22.0 semver: 5.7.1 validate-npm-package-license: 3.0.4 dev: false @@ -17554,10 +17628,7 @@ packages: } /path-to-regexp/0.1.7: - resolution: - { - integrity: sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==, - } + resolution: {integrity: sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=} dev: true /path-type/3.0.0: @@ -18082,7 +18153,7 @@ packages: jstransformer: 1.0.0 pug-error: 2.0.0 pug-walk: 2.0.0 - resolve: 1.22.1 + resolve: 1.22.0 dev: true /pug-lexer/5.0.1: @@ -18733,7 +18804,6 @@ packages: is-core-module: 2.11.0 path-parse: 1.0.7 supports-preserve-symlinks-flag: 1.0.0 - dev: true /resolve/1.22.1: resolution: @@ -18847,7 +18917,7 @@ packages: rollup: ^2.55 typescript: ^4.1 dependencies: - magic-string: 0.26.2 + magic-string: 0.26.7 rollup: 2.77.2 typescript: 4.8.4 optionalDependencies: @@ -20229,10 +20299,7 @@ packages: dev: true /token-stream/1.0.0: - resolution: - { - integrity: sha512-VSsyNPPW74RpHwR8Fc21uubwHY7wMDeJLys2IX5zJNih+OnAnaifKHo+1LHT7DAdloQ7apeaaWg8l7qnf/TnEg==, - } + resolution: {integrity: sha1-zCAOqyYT9BZtJ/+a/HylbUnfbrQ=} dev: true /totalist/1.1.0: @@ -20356,7 +20423,7 @@ packages: "@tsconfig/node14": 1.0.2 "@tsconfig/node16": 1.0.3 "@types/node": 18.11.9 - acorn: 8.8.1 + acorn: 8.7.1 acorn-walk: 8.2.0 arg: 4.1.3 create-require: 1.1.1 @@ -20390,7 +20457,7 @@ packages: "@tsconfig/node14": 1.0.2 "@tsconfig/node16": 1.0.3 "@types/node": 18.7.13 - acorn: 8.8.1 + acorn: 8.7.1 acorn-walk: 8.2.0 arg: 4.1.3 create-require: 1.1.1 @@ -20423,7 +20490,7 @@ packages: "@tsconfig/node12": 1.0.10 "@tsconfig/node14": 1.0.2 "@tsconfig/node16": 1.0.3 - acorn: 8.8.1 + acorn: 8.7.1 acorn-walk: 8.2.0 arg: 4.1.3 create-require: 1.1.1 @@ -21016,7 +21083,7 @@ packages: integrity: sha512-sY6u8RedwfLfBis0copfU/fzROieyAndqPs8Kn2PfyzTjtA88vCk81J1b5z+8/VJc+cwfGy23/AqOCpvAbkNVw==, } dependencies: - "@babel/core": 7.18.2 + "@babel/core": 7.20.2 "@babel/standalone": 7.18.9 "@babel/types": 7.18.4 scule: 0.2.1 @@ -21030,7 +21097,7 @@ packages: integrity: sha512-sY6u8RedwfLfBis0copfU/fzROieyAndqPs8Kn2PfyzTjtA88vCk81J1b5z+8/VJc+cwfGy23/AqOCpvAbkNVw==, } dependencies: - "@babel/core": 7.18.2_supports-color@8.1.1 + "@babel/core": 7.20.2_supports-color@8.1.1 "@babel/standalone": 7.18.9 "@babel/types": 7.18.4 scule: 0.2.1 @@ -21499,7 +21566,7 @@ packages: engines: {node: ">= 10.13.0"} hasBin: true dependencies: - acorn: 8.8.1 + acorn: 8.7.1 acorn-walk: 8.2.0 chalk: 4.1.2 commander: 6.2.1 @@ -21643,8 +21710,8 @@ packages: } engines: {node: ">= 10.0.0"} dependencies: - "@babel/parser": 7.20.3 - "@babel/types": 7.20.2 + "@babel/parser": 7.18.4 + "@babel/types": 7.18.4 assert-never: 1.2.1 babel-walk: 3.0.0-canary-5 dev: true diff --git a/recipes/bumbag-ui/index.ts b/recipes/bumbag-ui/index.ts index 2e3cb632f1..0de8e11b2a 100644 --- a/recipes/bumbag-ui/index.ts +++ b/recipes/bumbag-ui/index.ts @@ -1,5 +1,4 @@ import {addImport, paths, Program, RecipeBuilder} from "blitz/installer" -import type {NodePath} from "ast-types/lib/node-path" import j from "jscodeshift" function wrapComponentWithBumbagProvider(program: Program) { diff --git a/recipes/chakra-ui/index.ts b/recipes/chakra-ui/index.ts index a1dbf84334..154bc11288 100644 --- a/recipes/chakra-ui/index.ts +++ b/recipes/chakra-ui/index.ts @@ -139,7 +139,7 @@ export default RecipeBuilder() stepId: "updateLabeledTextField", stepName: "Update the `LabeledTextField` with Chakra UI's `Input` component", explanation: `The LabeledTextField component uses Chakra UI's input component`, - singleFileSearch: "src/core/components/LabeledTextField.tsx", + singleFileSearch: `${paths.appSrcDirectory()}/core/components/LabeledTextField.tsx`, transform(program) { // Add ComponentPropsWithoutRef import program.find(j.ImportDeclaration, {source: {value: "react"}}).forEach((path) => { diff --git a/recipes/next-ui/index.ts b/recipes/next-ui/index.ts index bfd28bd2f7..b574ff49b4 100644 --- a/recipes/next-ui/index.ts +++ b/recipes/next-ui/index.ts @@ -111,7 +111,7 @@ export default RecipeBuilder() stepId: "updateLabeledTextField", stepName: "Update the `LabeledTextField` with Next UI's `Input` component", explanation: `The LabeledTextField component uses Next UI's input component`, - singleFileSearch: "src/core/components/LabeledTextField.tsx", + singleFileSearch: `${paths.appSrcDirectory()}/core/components/LabeledTextField.tsx`, transform(program) { // Add ComponentPropsWithoutRef import program.find(j.ImportDeclaration, {source: {value: "react"}}).forEach((path) => { diff --git a/recipes/tailwind/templates/config/tailwind.config.js b/recipes/tailwind/templates/config/tailwind.config.js index 2184934871..8ddcff2b20 100644 --- a/recipes/tailwind/templates/config/tailwind.config.js +++ b/recipes/tailwind/templates/config/tailwind.config.js @@ -1,6 +1,6 @@ // tailwind.config.js module.exports = { - content: ["{pages,app}/**/*.{js,ts,jsx,tsx}"], + content: ["./{src,app,pages}/**/*.{js,ts,jsx,tsx}"], theme: { extend: {}, }, From ac587b6ac309864a504e9783f471b5cf81380b53 Mon Sep 17 00:00:00 2001 From: "Blitz.js Bot" <79382586+blitzjs-bot@users.noreply.github.com> Date: Fri, 7 Apr 2023 12:38:51 -0400 Subject: [PATCH 2/2] (meta) added @maotora as contributor --- .all-contributorsrc | 10 ++++++++++ README.md | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 890c053912..78c99da9a8 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -3866,6 +3866,16 @@ "doc", "code" ] + }, + { + "login": "maotora", + "name": "Maotora ᕙ(⇀‸↼‶)ᕗ", + "avatar_url": "https://avatars.githubusercontent.com/u/5174884?v=4", + "profile": "https://maotoramm.com", + "contributions": [ + "doc", + "code" + ] } ], "contributorsPerLine": 7, diff --git a/README.md b/README.md index d257bdbf71..05d2e9a286 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ - + @@ -721,6 +721,7 @@ Thanks to these wonderful people ([emoji key](https://allcontributors.org/docs/e
Johan Eliasson
📖
Hikmat Jafarli
📖 💻 +
Maotora ᕙ(⇀‸↼‶)ᕗ
📖 💻