Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(test-project): Fix test-project generation script, and regenerate fixture #9779

Merged
merged 2 commits into from
Dec 30, 2023
Merged

chore(test-project): Fix test-project generation script, and regenerate fixture #9779

merged 2 commits into from
Dec 30, 2023

Conversation

Tobbe
Copy link
Member

@Tobbe Tobbe commented Dec 30, 2023 •
edited
Loading

The test-project fixture had drifted from what you actually get when you rebuild it. Both because all PRs haven’t included the needed updates. But also because the script that generates it needed some updates. This PR addresses both those things

@Tobbe Tobbe added the release:chore This PR is a chore (means nothing for users) label Dec 30, 2023
@Tobbe Tobbe added this to the chore milestone Dec 30, 2023
@Tobbe Tobbe enabled auto-merge (squash) December 30, 2023 12:52
@Tobbe Tobbe force-pushed the tobbe-fix-test-project-genereation-and-template branch from b0415ae to f8318a8 Compare December 30, 2023 14:20
@Tobbe Tobbe merged commit d33c24b into redwoodjs:main Dec 30, 2023
32 checks passed
@Tobbe Tobbe deleted the tobbe-fix-test-project-genereation-and-template branch December 30, 2023 14:40
Tobbe added a commit that referenced this pull request Jan 1, 2024
@Tobbe
chore(test-project): Fix test-project generation script, and regenera…
ac21224 
…te fixture (#9779)
dac09 added a commit to dac09/redwood that referenced this pull request Jan 2, 2024
@dac09
Merge branch 'main' of github.com:redwoodjs/redwood into feat/dbauth-…
9b1affd 
…cookie+generic-handler

* 'main' of github.com:redwoodjs/redwood: (125 commits)
  chore(release-tooling): Reminder to update Algolia
  chore(release-tooling): Add note about generating release notes
  chore(release-tooling): Add more detailed instructions for after releasing
  chore(release-tooling): Fix PR count message
  fix(crwa): use `fs.renameSync` instead of `fs.rename` (redwoodjs#9787)
  chore(release-tooling): Update to node 20 in version check
  chore(deps): bump @adobe/css-tools from 4.3.1 to 4.3.2 in /__fixtures__/example-todo-main (redwoodjs#9785)
  chore(crwa): add e2e tests for create-redwood-app (redwoodjs#9783)
  chore(release-tooling): fetch -> pull (redwoodjs#9784)
  feat(scaffold/cell): Adds TypedDocument Support to Cell and Scaffold Generators (redwoodjs#9693)
  fix: Support Custom Id Field Names in when generating Cells (redwoodjs#9778)
  chore(framework-tools): .gitignore (redwoodjs#9782)
  Use build:pack for dbauth when rebuilding the test project (redwoodjs#9781)
  chore(test-project): Fix test-project generation script, and regenerate fixture (redwoodjs#9779)
  Fix dbAuth allowUserFields initialization syntax (redwoodjs#9780)
  chore(framework-tools): add `project:tarsync` script (redwoodjs#9766)
  fix(otel): Fix OTel sdk loading (redwoodjs#9777)
  fix: Fixes way OpenTelemetry setup template uses project-config for port setting (redwoodjs#9775)
  chore(router): Miniscule fixes
  chore(router): Move useMatch to its own file (redwoodjs#9770)
  ...
dac09 added a commit to dac09/redwood that referenced this pull request Jan 24, 2024
@dac09
Squashed commit of the following:
f19ab8e 
commit d35207f
Author: Daniel Choudhury <[email protected]>
Date:   Tue Jan 23 22:59:56 2024 +0700

    Remove this.init from inside class, call them in the tests instead

commit d4ce855
Merge: ed74729 fca8d7a
Author: Daniel Choudhury <[email protected]>
Date:   Mon Jan 22 22:23:24 2024 +0700

    Merge branch 'main' into feat/dbauth-fetch-handler

commit ed74729
Merge: 8fdbec0 b8a5e53
Author: Daniel Choudhury <[email protected]>
Date:   Mon Jan 22 16:04:02 2024 +0700

    Merge branch 'main' into feat/dbauth-fetch-handler

commit 8fdbec0
Merge: 61d4664 74a9b0a
Author: Daniel Choudhury <[email protected]>
Date:   Mon Jan 22 10:56:29 2024 +0700

    Merge branch 'main' into feat/dbauth-fetch-handler

commit 61d4664
Merge: b32eca7 7491bdf
Author: Daniel Choudhury <[email protected]>
Date:   Sun Jan 21 17:53:18 2024 +0700

    Merge branch 'feat/dbauth-fetch-handler' of github.com:dac09/redwood into feat/dbauth-fetch-handler

    * 'feat/dbauth-fetch-handler' of github.com:dac09/redwood:

commit b32eca7
Author: Daniel Choudhury <[email protected]>
Date:   Sun Jan 21 17:52:57 2024 +0700

    Fix merge after vitest

commit 5900629
Merge: bf2b589 41ac728
Author: Daniel Choudhury <[email protected]>
Date:   Sun Jan 21 17:48:07 2024 +0700

    Merge branch 'main' of github.com:redwoodjs/redwood into feat/dbauth-fetch-handler

    * 'main' of github.com:redwoodjs/redwood:
      feat(server file): add `createServer` (redwoodjs#9845)
      chore(crwa): set `REDWOOD_CI` and `REDWOOD_DISABLE_TELEMETRY` (redwoodjs#9857)
      Fix(crwa): Exit 0 after Quit install (redwoodjs#9856)
      chore(crwa): switch to vitest (redwoodjs#9855)
      chore(api): Switch to use vitest over jest (redwoodjs#9853)
      fix(server): ensure consistency between CLI serve entrypoints regarding help and strict (redwoodjs#9809)
      Improve how the api-server watch command works (redwoodjs#9841)
      docs(typo): correct grammar in realtime docs (redwoodjs#9850)
      Add support for Prisma Bytes and GraphQL scalar Byte (redwoodjs#9847)
      packages/cli: Switch from substr (deprecated) to slice (redwoodjs#9849)

commit 7491bdf
Merge: abf3a95 41ac728
Author: Daniel Choudhury <[email protected]>
Date:   Sun Jan 21 16:36:13 2024 +0700

    Merge branch 'main' into feat/dbauth-fetch-handler

commit abf3a95
Merge: bf2b589 b759ad1
Author: Daniel Choudhury <[email protected]>
Date:   Fri Jan 19 16:20:01 2024 +0700

    Merge branch 'main' into feat/dbauth-fetch-handler

commit bf2b589
Author: Daniel Choudhury <[email protected]>
Date:   Fri Jan 19 16:18:43 2024 +0700

    Remove unused function

commit 06c07dc
Author: Daniel Choudhury <[email protected]>
Date:   Fri Jan 19 16:16:55 2024 +0700

    Undo bearer token change

commit 38b3584
Author: Daniel Choudhury <[email protected]>
Date:   Fri Jan 19 16:14:17 2024 +0700

    Remove old comment

commit 2bdb5e0
Author: Daniel Choudhury <[email protected]>
Date:   Fri Jan 19 16:03:11 2024 +0700

    Cleanup, update shared.test

commit 3cdb37d
Author: Daniel Choudhury <[email protected]>
Date:   Fri Jan 19 01:48:47 2024 +0700

    Update packages/auth-providers/dbAuth/api/src/decoder.ts

commit 8750800
Author: Daniel Choudhury <[email protected]>
Date:   Fri Jan 19 01:13:54 2024 +0700

    FIX ALL THE TESTS!

commit d773116
Merge: 6a31c00 6d74a22
Author: Daniel Choudhury <[email protected]>
Date:   Fri Jan 19 00:57:31 2024 +0700

    Merge main

commit 6a31c00
Author: Daniel Choudhury <[email protected]>
Date:   Tue Jan 16 14:33:21 2024 +0700

    Just keep the dbAuth fetch-api related changes, revert everything else

commit c3a2ebb
Merge: be84ace d9892f4
Author: Daniel Choudhury <[email protected]>
Date:   Tue Jan 16 13:51:39 2024 +0700

    Merge branch 'main' of github.com:redwoodjs/redwood into feat/dbauth-fetch-handler

    * 'main' of github.com:redwoodjs/redwood:
      Add missing cli-helpers test file (redwoodjs#9833)
      Add cli-helpers util to update redwood.toml (redwoodjs#9832)
      Tweak graphiql setup messages (redwoodjs#9831)
      exp setup sentry: Fix file extension (redwoodjs#9829)
      Fastify config: Use exact file extension in log message (redwoodjs#9828)
      Remove unused Fastify plugin (redwoodjs#9827)
      Add trusted-documents to fragments CI smoke-test (redwoodjs#9826)
      prerender: Enable Trusted Documents support (redwoodjs#9825)
      trustedDocuments.test.ts: Format source
      cli: add missing dep jscodeshift (redwoodjs#9823)
      graphql setup fragments: Move telemetry to main handler (redwoodjs#9819)
      feat: Adds Setup CLI Command to Configure GraphQL Trusted Documents (redwoodjs#9800)
      Update cli tsconfig to reference used packages (redwoodjs#9822)
      fragments setup: newline fix + refactor->rename (redwoodjs#9821)
      yarn rw setup graphql fragments (redwoodjs#9811)

commit be84ace
Author: Daniel Choudhury <[email protected]>
Date:   Tue Jan 16 13:51:10 2024 +0700

    Restore unneeded changes

commit 5ce1870
Merge: 0d62479 80e4a4f
Author: Daniel Choudhury <[email protected]>
Date:   Tue Jan 9 11:51:41 2024 +0600

    Merge branch 'main' of github.com:redwoodjs/redwood into feat/dbauth-cookie+generic-handler

    * 'main' of github.com:redwoodjs/redwood:
      chore: Improved Possible Types DX and Framework integration for GraphQL Fragments with Union and Interface support (redwoodjs#9594)
      fix(server): error early on incompatible config (apiHost and apiUrl) (redwoodjs#9808)
      chore(esm): convert crwa to esm and bundle (redwoodjs#9786)
      chore(cli): More robust isAwaitable (redwoodjs#9806)
      chore(ci): Update task names to say "node 20" (redwoodjs#9805)
      Use TS for rebuild-test-project-fixture script (redwoodjs#9804)
      chore: bump TSTyche (redwoodjs#9803)
      docs(fragments): Typo, grammar and formatting fixes (redwoodjs#9802)
      Revert accidental changes to test-project
      chore(deps): update dependency @apollo/experimental-nextjs-app-support to v0.5.2 (redwoodjs#9716)
      fix(deps): update dependency react-helmet-async to v2 (redwoodjs#9697)
      fix(deps): update dependency sqlite to v5 (redwoodjs#9698)
      data migrate: Clean up upHandler test (redwoodjs#9796)
      chore(data-migration): Fix test exit code (redwoodjs#9795)
      Add routeParams to useMatch (redwoodjs#9793)
      fix(fastify): Prevent duplicate `@fastify/url-data` registration (redwoodjs#9794)
      useRoutePath(): Get the path for the current route by default (redwoodjs#9790)
      Router: Use a single RouterContext (redwoodjs#9792)

commit 0d62479
Author: Daniel Choudhury <[email protected]>
Date:   Thu Jan 4 14:39:48 2024 +0700

    ServerAuthState types and stuff
    Inject initial server auth state on ssr

commit d25ed51
Merge: 9b1affd 3e08e20
Author: Daniel Choudhury <[email protected]>
Date:   Wed Jan 3 13:18:27 2024 +0700

    Merge branch 'main' of github.com:redwoodjs/redwood into feat/dbauth-cookie+generic-handler

    * 'main' of github.com:redwoodjs/redwood:
      chore: yarn install to update `yarn.lock` (follow up to redwoodjs#9669)
      chore(deps): update dependency @envelop/core to v5 (redwoodjs#9669)
      Use regex to make test pass in VSCode (redwoodjs#9791)
      fix(dbAuth): Correct hardcoded DB column (redwoodjs#9788)
      fix(deps): update dependency graphql-yoga to v5 (redwoodjs#9688)

commit 9b1affd
Merge: e05a906 1075258
Author: Daniel Choudhury <[email protected]>
Date:   Tue Jan 2 13:41:53 2024 +0700

    Merge branch 'main' of github.com:redwoodjs/redwood into feat/dbauth-cookie+generic-handler
    * 'main' of github.com:redwoodjs/redwood: (125 commits)
      chore(release-tooling): Reminder to update Algolia
      chore(release-tooling): Add note about generating release notes
      chore(release-tooling): Add more detailed instructions for after releasing
      chore(release-tooling): Fix PR count message
      fix(crwa): use `fs.renameSync` instead of `fs.rename` (redwoodjs#9787)
      chore(release-tooling): Update to node 20 in version check
      chore(deps): bump @adobe/css-tools from 4.3.1 to 4.3.2 in /__fixtures__/example-todo-main (redwoodjs#9785)
      chore(crwa): add e2e tests for create-redwood-app (redwoodjs#9783)
      chore(release-tooling): fetch -> pull (redwoodjs#9784)
      feat(scaffold/cell): Adds TypedDocument Support to Cell and Scaffold Generators (redwoodjs#9693)
      fix: Support Custom Id Field Names in when generating Cells (redwoodjs#9778)
      chore(framework-tools): .gitignore (redwoodjs#9782)
      Use build:pack for dbauth when rebuilding the test project (redwoodjs#9781)
      chore(test-project): Fix test-project generation script, and regenerate fixture (redwoodjs#9779)
      Fix dbAuth allowUserFields initialization syntax (redwoodjs#9780)
      chore(framework-tools): add `project:tarsync` script (redwoodjs#9766)
      fix(otel): Fix OTel sdk loading (redwoodjs#9777)
      fix: Fixes way OpenTelemetry setup template uses project-config for port setting (redwoodjs#9775)
      chore(router): Miniscule fixes
      chore(router): Move useMatch to its own file (redwoodjs#9770)
      ...

commit e05a906
Author: Daniel Choudhury <[email protected]>
Date:   Thu Dec 28 14:33:11 2023 +0700

    Add nx to gitignore

commit 4e268aa
Author: Daniel Choudhury <[email protected]>
Date:   Mon Dec 25 14:38:11 2023 +0700

    Refactor and reuse getEventHeader
    Improve Fetch Request detection

commit 5e0c1c2
Author: Daniel Choudhury <[email protected]>
Date:   Mon Dec 25 13:26:11 2023 +0700

    Change detection of fetch event

commit fe40f61
Author: Daniel Choudhury <[email protected]>
Date:   Fri Dec 22 18:09:11 2023 +0700

    Cleanup isFetchRequest

commit 1a3cbd4
Author: Daniel Choudhury <[email protected]>
Date:   Fri Dec 22 14:41:48 2023 +0700

    Undo decoder type changes

commit 0979725
Author: Daniel Choudhury <[email protected]>
Date:   Fri Dec 22 14:36:20 2023 +0700

    Get it working with middleware!

commit 3f0a32b
Author: Daniel Choudhury <[email protected]>
Date:   Fri Dec 22 13:28:51 2023 +0700

    Fix more tests
    Normalize request differently to be more compatible

commit 82badfd
Author: Daniel Choudhury <[email protected]>
Date:   Wed Dec 20 14:44:10 2023 +0700

    Fix authContext tests and dbauth handler

commit 67c4ace
Author: Daniel Choudhury <[email protected]>
Date:   Mon Dec 11 14:46:57 2023 +0700

    I think I have it working with failing tests

commit b275d9f
Author: Daniel Choudhury <[email protected]>
Date:   Fri Dec 8 11:05:23 2023 +0700

    Fix building!

commit 0542ca7
Merge: 37adfa5 fb3f1fb
Author: Daniel Choudhury <[email protected]>
Date:   Fri Dec 8 10:50:56 2023 +0700

    Merge branch 'main' of github.com:redwoodjs/redwood into try/dbauth-ssr-updated-forward-cookies

    * 'main' of github.com:redwoodjs/redwood: (163 commits)
      chore(deps): update dependency @clerk/clerk-react to v4.28.3 (redwoodjs#9643)
      fix(deps): update prisma monorepo to v5.7.0 (redwoodjs#9642)
      fix(CLI): merge NODE_OPTIONS in `yarn rw dev` (redwoodjs#9585)
      chore(release): configure aloglia to index docs
      chore(release): handle OTP for lerna publish
      RSC: No need to patch Vite anymore (redwoodjs#9636)
      RSC: Remove unused code. Improve code organization (redwoodjs#9631)
      chore(release): improve tooling
      chore: Linting and disable some console logs (redwoodjs#9635)
      chore: Update Testing documentation to link to How to Test Email/Mailer (redwoodjs#9634)
      chore(release): fix open answer
      Add vscode web debugger and compound (redwoodjs#9567)
      RSC: Use Routes.tsx for (client-side) routing (redwoodjs#9630)
      RSC: Add RW env var definitions to Vite config and include FatalErrorBoundary (redwoodjs#9622)
      chore(release): add notes on redwoodjs#9624
      chore(release): add release:notes scripts, fix docs
      chore(deps): update dependency @clerk/clerk-react to v4.28.2 (redwoodjs#9625)
      fix(deps): update dependency @vitejs/plugin-react to v4.2.1 (redwoodjs#9626)
      fix(deps): update dependency vite to v4.5.1 (redwoodjs#9627)
      fix(deps): update storybook monorepo to v7.6.3 (redwoodjs#9628)
      ...

commit 37adfa5
Author: Daniel Choudhury <[email protected]>
Date:   Mon Nov 20 16:05:31 2023 +0700

    Make it forward cookies from authState

commit a8f0e33
Author: Daniel Choudhury <[email protected]>
Date:   Wed Nov 15 22:52:00 2023 +0700

    Fix some merged changes

commit 4bb543a
Merge: 2b66173 bbe2226
Author: Daniel Choudhury <[email protected]>
Date:   Wed Nov 15 22:51:44 2023 +0700

    Merge branch 'main' of github.com:redwoodjs/redwood into try/dbauth-ssr-updated
    * 'main' of github.com:redwoodjs/redwood: (80 commits)
      fix(deps): update dependency @fastify/http-proxy to v9.3.0 (redwoodjs#9451)
      fix(deps): update dependency @fastify/static to v6.12.0 (redwoodjs#9452)
      chore: migrate type tests to TSTyche (redwoodjs#9394)
      fix(deps): update dependency @testing-library/user-event to v14.5.1 (redwoodjs#9455)
      fix(deps): update dependency @vitejs/plugin-react to v4.1.1 (redwoodjs#9456)
      fix(deps): update dependency pino to v8.16.1 (redwoodjs#9459)
      fix(deps): update dependency firebase-admin to v11.11.0 (redwoodjs#9458)
      chore(deps): update dependency firebase to v10.6.0 (redwoodjs#9449)
      fix(deps): update dependency @fastify/url-data to v5.4.0 (redwoodjs#9453)
      fix(deps): update dependency @simplewebauthn/browser to v7.4.0 (redwoodjs#9454)
      chore(deps): update actions/setup-node action to v4 (redwoodjs#9461)
      chore(deps): update actions/checkout action to v4 (redwoodjs#9460)
      fix(deps): update dependency @graphql-yoga/plugin-graphql-sse to v2.0.5 (redwoodjs#9440)
      fix(deps): update prisma monorepo to v5.6.0 (redwoodjs#9447)
      fix(deps): update dependency nodemailer to v6.9.7 (redwoodjs#9444)
      chore(deps): update dependency esbuild to v0.19.5 (redwoodjs#9359)
      fix(deps): update dependency @envelop/on-resolve to v3.0.3 (redwoodjs#9436)
      fix(deps): update dependency semver to v7.5.4 (redwoodjs#9445)
      fix(deps): update dependency jsonwebtoken to v9.0.2 (redwoodjs#9443)
      fix(deps): update dependency systeminformation to v5.21.17 (redwoodjs#9446)
      ...

commit 2b66173
Author: Daniel Choudhury <[email protected]>
Date:   Wed Nov 15 21:48:27 2023 +0700

    Get it building again

commit 9fafcf8
Author: Daniel Choudhury <[email protected]>
Date:   Thu Nov 2 23:50:43 2023 +0700

    SHIP IT

commit bb0b36e
Merge: 5f1deed 7ab07a2
Author: Daniel Choudhury <[email protected]>
Date:   Thu Nov 2 22:23:40 2023 +0700

    Merge branch 'main' of github.com:redwoodjs/redwood into try/dbauth-ssr

    * 'main' of github.com:redwoodjs/redwood: (26 commits)
      fix(api-server): copy fallback fix from redwoodjs#9272 (redwoodjs#9369)
      fix(deps): update dependency concurrently to v8.2.2 (redwoodjs#9361)
      chore(k6): Fix function context test (redwoodjs#9368)
      feat(cli): Setup command for mailer (redwoodjs#9335)
      feature: Support defer and stream GraphQL Directives in RedwoodRealtime (redwoodjs#9235)
      chore(deps): update dependency rimraf to v5.0.5 (redwoodjs#9360)
      chore(k6): Fix function context test (redwoodjs#9358)
      chore(deps): bump undici from 5.22.1 to 5.26.3 (redwoodjs#9307)
      fix(babel): Fix opentelemetry api wrapping and allow it to be disabled (redwoodjs#9298)
      chore(api-server): remove server survey tests in CI (redwoodjs#9348)
      chore(deps): update babel monorepo to v7.23.2 (redwoodjs#9344)
      chore(deps): bump @babel/traverse from 7.18.9 to 7.23.2 in /docs (redwoodjs#9311)
      chore(deps): update dependency @tsconfig/docusaurus to v2 (redwoodjs#9347)
      fix(deps): update dependency react-player to v2.13.0 (redwoodjs#9346)
      fix(deps): update docusaurus monorepo to v2.4.3 (redwoodjs#9345)
      fix(deps): update dependency @babel/traverse to v7.23.2 [security] (redwoodjs#9322)
      chore: increase server test timeout, fix `yarn build:clean` (redwoodjs#9336)
      feature: Adds utility functions to add envars and update Redwood toml for plugin packages to cli helpers for use in simplifying CLI setup commands (redwoodjs#9324)
      fix(cli): Tailwind setup updates `scaffold.css` when needed (redwoodjs#9290)
      fix(cli): Exit with non-zero exit code when `yarn rw g types` has errors (redwoodjs#9280)
      ...

commit 5f1deed
Author: Daniel Choudhury <[email protected]>
Date:   Thu Oct 26 12:57:44 2023 +0700

    NOT WORKING: try extracting session passed into a cookie

commit 9e86135
Author: Daniel Choudhury <[email protected]>
Date:   Wed Oct 25 12:48:33 2023 +0700

    Simple auth state parsing with middleware in entry server

Squashed commit of the following:

commit 616bd22
Author: Daniel Choudhury <[email protected]>
Date:   Tue Jan 23 23:33:24 2024 +0700

    Also convert fetch handler test to vitest

commit 81b787f
Merge: d35207f 352af62
Author: Daniel Choudhury <[email protected]>
Date:   Tue Jan 23 23:33:09 2024 +0700

    Merge branch 'main' of github.com:redwoodjs/redwood into feat/dbauth-fetch-handler
    * 'main' of github.com:redwoodjs/redwood:
      chore(auth-providers): switch to vitest (mostly) (redwoodjs#9869)
      chore(esm): convert `@redwoodjs/project-config` to ESM (redwoodjs#9870)
      fix(createServer): use addHook instead of ready (redwoodjs#9871)

commit d35207f
Author: Daniel Choudhury <[email protected]>
Date:   Tue Jan 23 22:59:56 2024 +0700

    Remove this.init from inside class, call them in the tests instead

commit 352af62
Author: Josh GM Walker <[email protected]>
Date:   Mon Jan 22 22:03:28 2024 +0000

    chore(auth-providers): switch to vitest (mostly) (redwoodjs#9869)

    This PR updates the auth providers with the exception of two:
    1. `@redwoodjs/auth-firebase-web`
    It contains jest specific code for specifically resolving uuid to CJS.
    I'm sure it's possible to switch it over but I have not yet tried.
    3. `@redwoodjs/auth-dbauth-web`
    I encountered errors that WebAuthn was not supported within the test
    environment. Even with the `jsdom` environment set.

commit 68ed27a
Author: Dominic Saadi <[email protected]>
Date:   Mon Jan 22 13:22:38 2024 -0800

    chore(esm): convert `@redwoodjs/project-config` to ESM (redwoodjs#9870)

    I'm still working through a few things.

    The motivation for tackling `@redwoodjs/project-config` first was 1)
    most of our other package's depend on it 2) it's small 3) it would make
    merging the PR that converts the CLI's Jest tests to Vitest easier
    because Vitest can't mock require (see
    redwoodjs#9863).

    I used
    [`arethetypeswrong/cli`](https://github.com/arethetypeswrong/arethetypeswrong.github.io)
    extensively. Right now I'm deeming the "Masquerading as ESM" error it
    emits acceptable. The code between the ESM and CJS files doesn't differ
    in functionality, only syntax; shipping two declaration copies of all
    the declaration files is shipping extra code. Mark Erikson did something
    similar at first at least here:

    > Unfortunately, no build tool that I knew of at that time did this by
    default, and the idea of shipping 99%-duplicate typedefs bothered me.
    So, I opted to not try to fix this "FalseCJS" issue for our packages (at
    least for the time being).

    (Source:
    https://blog.isquaredsoftware.com/2023/08/esm-modernization-lessons/#typescript-declarations.)

    Note that FalseCJS's fancier name is "Masquerading as CJS". We have
    "Masquerading as ESM", not CJS. I'm not sure if it's an issue that it's
    flipped yet.

    ```
    $ attw ./redwoodjs-project-config.tgz

    @redwoodjs/project-config v6.0.7

    Build tools:
    - [email protected]
    - [email protected]

    👺 Import resolved to an ESM type declaration file, but a CommonJS JavaScript file. https://github.com/arethetypeswrong/arethetypeswrong.github.io/blob/main/docs/problems/FalseESM.md

    ┌───────────────────┬─────────────────────────────┐
    │                   │ "@redwoodjs/project-config" │
    ├───────────────────┼─────────────────────────────┤
    │ node10            │ 🟢                          │
    ├───────────────────┼─────────────────────────────┤
    │ node16 (from CJS) │ 👺 Masquerading as ESM      │
    ├───────────────────┼─────────────────────────────┤
    │ node16 (from ESM) │ 🟢 (ESM)                    │
    ├───────────────────┼─────────────────────────────┤
    │ bundler           │ 🟢                          │
    └───────────────────┴─────────────────────────────┘
    ```

    Regarding the `.js` extensions (which are necessary for relative imports
    in ESM) in TS code, see redwoodjs#8456.

commit 49347fd
Author: Dominic Saadi <[email protected]>
Date:   Mon Jan 22 12:08:01 2024 -0800

    fix(createServer): use addHook instead of ready (redwoodjs#9871)

    Fixes the issue @Tobbe and I were seeing in studio:

    ```
    ~/redwood-project/node_modules/avvio/boot.js:244
        throw new AVV_ERR_ROOT_PLG_BOOTED()
              ^
    AvvioError [Error]: Root plugin has already booted
      ...
    ```

    `fastify.ready` actually starts the server. All this is doing is
    logging. We want to use `addHook` instead. Follow up to
    redwoodjs#9845.

commit d4ce855
Merge: ed74729 fca8d7a
Author: Daniel Choudhury <[email protected]>
Date:   Mon Jan 22 22:23:24 2024 +0700

    Merge branch 'main' into feat/dbauth-fetch-handler

commit ed74729
Merge: 8fdbec0 b8a5e53
Author: Daniel Choudhury <[email protected]>
Date:   Mon Jan 22 16:04:02 2024 +0700

    Merge branch 'main' into feat/dbauth-fetch-handler

commit 8fdbec0
Merge: 61d4664 74a9b0a
Author: Daniel Choudhury <[email protected]>
Date:   Mon Jan 22 10:56:29 2024 +0700

    Merge branch 'main' into feat/dbauth-fetch-handler

commit 61d4664
Merge: b32eca7 7491bdf
Author: Daniel Choudhury <[email protected]>
Date:   Sun Jan 21 17:53:18 2024 +0700

    Merge branch 'feat/dbauth-fetch-handler' of github.com:dac09/redwood into feat/dbauth-fetch-handler

    * 'feat/dbauth-fetch-handler' of github.com:dac09/redwood:

commit b32eca7
Author: Daniel Choudhury <[email protected]>
Date:   Sun Jan 21 17:52:57 2024 +0700

    Fix merge after vitest

commit 5900629
Merge: bf2b589 41ac728
Author: Daniel Choudhury <[email protected]>
Date:   Sun Jan 21 17:48:07 2024 +0700

    Merge branch 'main' of github.com:redwoodjs/redwood into feat/dbauth-fetch-handler

    * 'main' of github.com:redwoodjs/redwood:
      feat(server file): add `createServer` (redwoodjs#9845)
      chore(crwa): set `REDWOOD_CI` and `REDWOOD_DISABLE_TELEMETRY` (redwoodjs#9857)
      Fix(crwa): Exit 0 after Quit install (redwoodjs#9856)
      chore(crwa): switch to vitest (redwoodjs#9855)
      chore(api): Switch to use vitest over jest (redwoodjs#9853)
      fix(server): ensure consistency between CLI serve entrypoints regarding help and strict (redwoodjs#9809)
      Improve how the api-server watch command works (redwoodjs#9841)
      docs(typo): correct grammar in realtime docs (redwoodjs#9850)
      Add support for Prisma Bytes and GraphQL scalar Byte (redwoodjs#9847)
      packages/cli: Switch from substr (deprecated) to slice (redwoodjs#9849)

commit 7491bdf
Merge: abf3a95 41ac728
Author: Daniel Choudhury <[email protected]>
Date:   Sun Jan 21 16:36:13 2024 +0700

    Merge branch 'main' into feat/dbauth-fetch-handler

commit abf3a95
Merge: bf2b589 b759ad1
Author: Daniel Choudhury <[email protected]>
Date:   Fri Jan 19 16:20:01 2024 +0700

    Merge branch 'main' into feat/dbauth-fetch-handler

commit bf2b589
Author: Daniel Choudhury <[email protected]>
Date:   Fri Jan 19 16:18:43 2024 +0700

    Remove unused function

commit 06c07dc
Author: Daniel Choudhury <[email protected]>
Date:   Fri Jan 19 16:16:55 2024 +0700

    Undo bearer token change

commit 38b3584
Author: Daniel Choudhury <[email protected]>
Date:   Fri Jan 19 16:14:17 2024 +0700

    Remove old comment

commit 2bdb5e0
Author: Daniel Choudhury <[email protected]>
Date:   Fri Jan 19 16:03:11 2024 +0700

    Cleanup, update shared.test

commit 3cdb37d
Author: Daniel Choudhury <[email protected]>
Date:   Fri Jan 19 01:48:47 2024 +0700

    Update packages/auth-providers/dbAuth/api/src/decoder.ts

commit 8750800
Author: Daniel Choudhury <[email protected]>
Date:   Fri Jan 19 01:13:54 2024 +0700

    FIX ALL THE TESTS!

commit d773116
Merge: 6a31c00 6d74a22
Author: Daniel Choudhury <[email protected]>
Date:   Fri Jan 19 00:57:31 2024 +0700

    Merge main

commit 6a31c00
Author: Daniel Choudhury <[email protected]>
Date:   Tue Jan 16 14:33:21 2024 +0700

    Just keep the dbAuth fetch-api related changes, revert everything else

commit c3a2ebb
Merge: be84ace d9892f4
Author: Daniel Choudhury <[email protected]>
Date:   Tue Jan 16 13:51:39 2024 +0700

    Merge branch 'main' of github.com:redwoodjs/redwood into feat/dbauth-fetch-handler

    * 'main' of github.com:redwoodjs/redwood:
      Add missing cli-helpers test file (redwoodjs#9833)
      Add cli-helpers util to update redwood.toml (redwoodjs#9832)
      Tweak graphiql setup messages (redwoodjs#9831)
      exp setup sentry: Fix file extension (redwoodjs#9829)
      Fastify config: Use exact file extension in log message (redwoodjs#9828)
      Remove unused Fastify plugin (redwoodjs#9827)
      Add trusted-documents to fragments CI smoke-test (redwoodjs#9826)
      prerender: Enable Trusted Documents support (redwoodjs#9825)
      trustedDocuments.test.ts: Format source
      cli: add missing dep jscodeshift (redwoodjs#9823)
      graphql setup fragments: Move telemetry to main handler (redwoodjs#9819)
      feat: Adds Setup CLI Command to Configure GraphQL Trusted Documents (redwoodjs#9800)
      Update cli tsconfig to reference used packages (redwoodjs#9822)
      fragments setup: newline fix + refactor->rename (redwoodjs#9821)
      yarn rw setup graphql fragments (redwoodjs#9811)

commit be84ace
Author: Daniel Choudhury <[email protected]>
Date:   Tue Jan 16 13:51:10 2024 +0700

    Restore unneeded changes

commit 5ce1870
Merge: 0d62479 80e4a4f
Author: Daniel Choudhury <[email protected]>
Date:   Tue Jan 9 11:51:41 2024 +0600

    Merge branch 'main' of github.com:redwoodjs/redwood into feat/dbauth-cookie+generic-handler

    * 'main' of github.com:redwoodjs/redwood:
      chore: Improved Possible Types DX and Framework integration for GraphQL Fragments with Union and Interface support (redwoodjs#9594)
      fix(server): error early on incompatible config (apiHost and apiUrl) (redwoodjs#9808)
      chore(esm): convert crwa to esm and bundle (redwoodjs#9786)
      chore(cli): More robust isAwaitable (redwoodjs#9806)
      chore(ci): Update task names to say "node 20" (redwoodjs#9805)
      Use TS for rebuild-test-project-fixture script (redwoodjs#9804)
      chore: bump TSTyche (redwoodjs#9803)
      docs(fragments): Typo, grammar and formatting fixes (redwoodjs#9802)
      Revert accidental changes to test-project
      chore(deps): update dependency @apollo/experimental-nextjs-app-support to v0.5.2 (redwoodjs#9716)
      fix(deps): update dependency react-helmet-async to v2 (redwoodjs#9697)
      fix(deps): update dependency sqlite to v5 (redwoodjs#9698)
      data migrate: Clean up upHandler test (redwoodjs#9796)
      chore(data-migration): Fix test exit code (redwoodjs#9795)
      Add routeParams to useMatch (redwoodjs#9793)
      fix(fastify): Prevent duplicate `@fastify/url-data` registration (redwoodjs#9794)
      useRoutePath(): Get the path for the current route by default (redwoodjs#9790)
      Router: Use a single RouterContext (redwoodjs#9792)

commit 0d62479
Author: Daniel Choudhury <[email protected]>
Date:   Thu Jan 4 14:39:48 2024 +0700

    ServerAuthState types and stuff
    Inject initial server auth state on ssr

commit d25ed51
Merge: 9b1affd 3e08e20
Author: Daniel Choudhury <[email protected]>
Date:   Wed Jan 3 13:18:27 2024 +0700

    Merge branch 'main' of github.com:redwoodjs/redwood into feat/dbauth-cookie+generic-handler

    * 'main' of github.com:redwoodjs/redwood:
      chore: yarn install to update `yarn.lock` (follow up to redwoodjs#9669)
      chore(deps): update dependency @envelop/core to v5 (redwoodjs#9669)
      Use regex to make test pass in VSCode (redwoodjs#9791)
      fix(dbAuth): Correct hardcoded DB column (redwoodjs#9788)
      fix(deps): update dependency graphql-yoga to v5 (redwoodjs#9688)

commit 9b1affd
Merge: e05a906 1075258
Author: Daniel Choudhury <[email protected]>
Date:   Tue Jan 2 13:41:53 2024 +0700

    Merge branch 'main' of github.com:redwoodjs/redwood into feat/dbauth-cookie+generic-handler
    * 'main' of github.com:redwoodjs/redwood: (125 commits)
      chore(release-tooling): Reminder to update Algolia
      chore(release-tooling): Add note about generating release notes
      chore(release-tooling): Add more detailed instructions for after releasing
      chore(release-tooling): Fix PR count message
      fix(crwa): use `fs.renameSync` instead of `fs.rename` (redwoodjs#9787)
      chore(release-tooling): Update to node 20 in version check
      chore(deps): bump @adobe/css-tools from 4.3.1 to 4.3.2 in /__fixtures__/example-todo-main (redwoodjs#9785)
      chore(crwa): add e2e tests for create-redwood-app (redwoodjs#9783)
      chore(release-tooling): fetch -> pull (redwoodjs#9784)
      feat(scaffold/cell): Adds TypedDocument Support to Cell and Scaffold Generators (redwoodjs#9693)
      fix: Support Custom Id Field Names in when generating Cells (redwoodjs#9778)
      chore(framework-tools): .gitignore (redwoodjs#9782)
      Use build:pack for dbauth when rebuilding the test project (redwoodjs#9781)
      chore(test-project): Fix test-project generation script, and regenerate fixture (redwoodjs#9779)
      Fix dbAuth allowUserFields initialization syntax (redwoodjs#9780)
      chore(framework-tools): add `project:tarsync` script (redwoodjs#9766)
      fix(otel): Fix OTel sdk loading (redwoodjs#9777)
      fix: Fixes way OpenTelemetry setup template uses project-config for port setting (redwoodjs#9775)
      chore(router): Miniscule fixes
      chore(router): Move useMatch to its own file (redwoodjs#9770)
      ...

commit e05a906
Author: Daniel Choudhury <[email protected]>
Date:   Thu Dec 28 14:33:11 2023 +0700

    Add nx to gitignore

commit 4e268aa
Author: Daniel Choudhury <[email protected]>
Date:   Mon Dec 25 14:38:11 2023 +0700

    Refactor and reuse getEventHeader
    Improve Fetch Request detection

commit 5e0c1c2
Author: Daniel Choudhury <[email protected]>
Date:   Mon Dec 25 13:26:11 2023 +0700

    Change detection of fetch event

commit fe40f61
Author: Daniel Choudhury <[email protected]>
Date:   Fri Dec 22 18:09:11 2023 +0700

    Cleanup isFetchRequest

commit 1a3cbd4
Author: Daniel Choudhury <[email protected]>
Date:   Fri Dec 22 14:41:48 2023 +0700

    Undo decoder type changes

commit 0979725
Author: Daniel Choudhury <[email protected]>
Date:   Fri Dec 22 14:36:20 2023 +0700

    Get it working with middleware!

commit 3f0a32b
Author: Daniel Choudhury <[email protected]>
Date:   Fri Dec 22 13:28:51 2023 +0700

    Fix more tests
    Normalize request differently to be more compatible

commit 82badfd
Author: Daniel Choudhury <[email protected]>
Date:   Wed Dec 20 14:44:10 2023 +0700

    Fix authContext tests and dbauth handler

commit 67c4ace
Author: Daniel Choudhury <[email protected]>
Date:   Mon Dec 11 14:46:57 2023 +0700

    I think I have it working with failing tests

commit b275d9f
Author: Daniel Choudhury <[email protected]>
Date:   Fri Dec 8 11:05:23 2023 +0700

    Fix building!

commit 0542ca7
Merge: 37adfa5 fb3f1fb
Author: Daniel Choudhury <[email protected]>
Date:   Fri Dec 8 10:50:56 2023 +0700

    Merge branch 'main' of github.com:redwoodjs/redwood into try/dbauth-ssr-updated-forward-cookies

    * 'main' of github.com:redwoodjs/redwood: (163 commits)
      chore(deps): update dependency @clerk/clerk-react to v4.28.3 (redwoodjs#9643)
      fix(deps): update prisma monorepo to v5.7.0 (redwoodjs#9642)
      fix(CLI): merge NODE_OPTIONS in `yarn rw dev` (redwoodjs#9585)
      chore(release): configure aloglia to index docs
      chore(release): handle OTP for lerna publish
      RSC: No need to patch Vite anymore (redwoodjs#9636)
      RSC: Remove unused code. Improve code organization (redwoodjs#9631)
      chore(release): improve tooling
      chore: Linting and disable some console logs (redwoodjs#9635)
      chore: Update Testing documentation to link to How to Test Email/Mailer (redwoodjs#9634)
      chore(release): fix open answer
      Add vscode web debugger and compound (redwoodjs#9567)
      RSC: Use Routes.tsx for (client-side) routing (redwoodjs#9630)
      RSC: Add RW env var definitions to Vite config and include FatalErrorBoundary (redwoodjs#9622)
      chore(release): add notes on redwoodjs#9624
      chore(release): add release:notes scripts, fix docs
      chore(deps): update dependency @clerk/clerk-react to v4.28.2 (redwoodjs#9625)
      fix(deps): update dependency @vitejs/plugin-react to v4.2.1 (redwoodjs#9626)
      fix(deps): update dependency vite to v4.5.1 (redwoodjs#9627)
      fix(deps): update storybook monorepo to v7.6.3 (redwoodjs#9628)
      ...

commit 37adfa5
Author: Daniel Choudhury <[email protected]>
Date:   Mon Nov 20 16:05:31 2023 +0700

    Make it forward cookies from authState

commit a8f0e33
Author: Daniel Choudhury <[email protected]>
Date:   Wed Nov 15 22:52:00 2023 +0700

    Fix some merged changes

commit 4bb543a
Merge: 2b66173 bbe2226
Author: Daniel Choudhury <[email protected]>
Date:   Wed Nov 15 22:51:44 2023 +0700

    Merge branch 'main' of github.com:redwoodjs/redwood into try/dbauth-ssr-updated
    * 'main' of github.com:redwoodjs/redwood: (80 commits)
      fix(deps): update dependency @fastify/http-proxy to v9.3.0 (redwoodjs#9451)
      fix(deps): update dependency @fastify/static to v6.12.0 (redwoodjs#9452)
      chore: migrate type tests to TSTyche (redwoodjs#9394)
      fix(deps): update dependency @testing-library/user-event to v14.5.1 (redwoodjs#9455)
      fix(deps): update dependency @vitejs/plugin-react to v4.1.1 (redwoodjs#9456)
      fix(deps): update dependency pino to v8.16.1 (redwoodjs#9459)
      fix(deps): update dependency firebase-admin to v11.11.0 (redwoodjs#9458)
      chore(deps): update dependency firebase to v10.6.0 (redwoodjs#9449)
      fix(deps): update dependency @fastify/url-data to v5.4.0 (redwoodjs#9453)
      fix(deps): update dependency @simplewebauthn/browser to v7.4.0 (redwoodjs#9454)
      chore(deps): update actions/setup-node action to v4 (redwoodjs#9461)
      chore(deps): update actions/checkout action to v4 (redwoodjs#9460)
      fix(deps): update dependency @graphql-yoga/plugin-graphql-sse to v2.0.5 (redwoodjs#9440)
      fix(deps): update prisma monorepo to v5.6.0 (redwoodjs#9447)
      fix(deps): update dependency nodemailer to v6.9.7 (redwoodjs#9444)
      chore(deps): update dependency esbuild to v0.19.5 (redwoodjs#9359)
      fix(deps): update dependency @envelop/on-resolve to v3.0.3 (redwoodjs#9436)
      fix(deps): update dependency semver to v7.5.4 (redwoodjs#9445)
      fix(deps): update dependency jsonwebtoken to v9.0.2 (redwoodjs#9443)
      fix(deps): update dependency systeminformation to v5.21.17 (redwoodjs#9446)
      ...

commit 2b66173
Author: Daniel Choudhury <[email protected]>
Date:   Wed Nov 15 21:48:27 2023 +0700

    Get it building again

commit 9fafcf8
Author: Daniel Choudhury <[email protected]>
Date:   Thu Nov 2 23:50:43 2023 +0700

    SHIP IT

commit bb0b36e
Merge: 5f1deed 7ab07a2
Author: Daniel Choudhury <[email protected]>
Date:   Thu Nov 2 22:23:40 2023 +0700

    Merge branch 'main' of github.com:redwoodjs/redwood into try/dbauth-ssr

    * 'main' of github.com:redwoodjs/redwood: (26 commits)
      fix(api-server): copy fallback fix from redwoodjs#9272 (redwoodjs#9369)
      fix(deps): update dependency concurrently to v8.2.2 (redwoodjs#9361)
      chore(k6): Fix function context test (redwoodjs#9368)
      feat(cli): Setup command for mailer (redwoodjs#9335)
      feature: Support defer and stream GraphQL Directives in RedwoodRealtime (redwoodjs#9235)
      chore(deps): update dependency rimraf to v5.0.5 (redwoodjs#9360)
      chore(k6): Fix function context test (redwoodjs#9358)
      chore(deps): bump undici from 5.22.1 to 5.26.3 (redwoodjs#9307)
      fix(babel): Fix opentelemetry api wrapping and allow it to be disabled (redwoodjs#9298)
      chore(api-server): remove server survey tests in CI (redwoodjs#9348)
      chore(deps): update babel monorepo to v7.23.2 (redwoodjs#9344)
      chore(deps): bump @babel/traverse from 7.18.9 to 7.23.2 in /docs (redwoodjs#9311)
      chore(deps): update dependency @tsconfig/docusaurus to v2 (redwoodjs#9347)
      fix(deps): update dependency react-player to v2.13.0 (redwoodjs#9346)
      fix(deps): update docusaurus monorepo to v2.4.3 (redwoodjs#9345)
      fix(deps): update dependency @babel/traverse to v7.23.2 [security] (redwoodjs#9322)
      chore: increase server test timeout, fix `yarn build:clean` (redwoodjs#9336)
      feature: Adds utility functions to add envars and update Redwood toml for plugin packages to cli helpers for use in simplifying CLI setup commands (redwoodjs#9324)
      fix(cli): Tailwind setup updates `scaffold.css` when needed (redwoodjs#9290)
      fix(cli): Exit with non-zero exit code when `yarn rw g types` has errors (redwoodjs#9280)
      ...

commit 5f1deed
Author: Daniel Choudhury <[email protected]>
Date:   Thu Oct 26 12:57:44 2023 +0700

    NOT WORKING: try extracting session passed into a cookie

commit 9e86135
Author: Daniel Choudhury <[email protected]>
Date:   Wed Oct 25 12:48:33 2023 +0700

    Simple auth state parsing with middleware in entry server
@Josh-Walker-GM Josh-Walker-GM modified the milestones: chore, v8.0.0 Sep 4, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
release:chore This PR is a chore (means nothing for users)
Projects
None yet
Milestone
v8.0.0
Development

Successfully merging this pull request may close these issues.
2 participants
@Tobbe @Josh-Walker-GM