Skip to content

bugfix replace slash in tailwind config on windows#6203

Merged
jtoar merged 5 commits intoredwoodjs:mainfrom
pantheredeye:bbb-fix-tailwindConfig
Sep 8, 2022
Merged

bugfix replace slash in tailwind config on windows#6203
jtoar merged 5 commits intoredwoodjs:mainfrom
pantheredeye:bbb-fix-tailwindConfig

Conversation

@pantheredeye
Copy link
Copy Markdown
Contributor

@pantheredeye pantheredeye commented Aug 10, 2022

Fixes #6194

@nx-cloud
Copy link
Copy Markdown

nx-cloud Bot commented Aug 10, 2022

☁️ Nx Cloud Report

CI is running/has finished running commands for commit 997e6c5. As they complete they will appear below. Click to see the status, the terminal output, and the build insights.

📂 See all runs for this branch


✅ Successfully ran 14 targets

Sent with 💌 from NxCloud.

@netlify
Copy link
Copy Markdown

netlify Bot commented Aug 10, 2022

Deploy Preview for redwoodjs-docs ready!

Name Link
🔨 Latest commit 997e6c5
🔍 Latest deploy log https://app.netlify.com/sites/redwoodjs-docs/deploys/62fcf8fd616f1c0008089241
😎 Deploy Preview https://deploy-preview-6203--redwoodjs-docs.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

Comment thread packages/cli/src/commands/setup/ui/libraries/tailwindcss.js Outdated
Comment thread packages/cli/src/commands/setup/ui/libraries/tailwindcss.js Outdated
@Tobbe Tobbe self-assigned this Aug 22, 2022
@noire-munich noire-munich removed their assignment Sep 1, 2022
@jtoar jtoar added the release:fix This PR is a fix label Sep 4, 2022
@dac09
Copy link
Copy Markdown
Contributor

dac09 commented Sep 5, 2022

Next steps @pantheredeye:

@Tobbe
Copy link
Copy Markdown
Contributor

Tobbe commented Sep 6, 2022

  • rebuild the fixture with yarn build:test-project --rebuild-fixture --verbose, and commit the changes into this branch

Except any version changes to RW libraries. Those should stay 3.0-something (It's a little weird right now because we're in a RC phase. This is not the normal workflow)

@pantheredeye
Copy link
Copy Markdown
Contributor Author

pantheredeye commented Sep 7, 2022

oh, man. so I have a couple of notes... and it may take me some time to clean this up.

One @dac09 - I ran the rebuild fixture command inside of my redwood framework directory. It took about 20 minutes to complete. Not sure if that was correct. I figured it had to be, so that I could push back to this branch. If not - please let me know.

Then, I committed and tried to push the branch, and it said I was behind and had to pull. I had already sync'd my fork with the main when I first opened up, but I did not think about pulling the branch. So, I pulled after the notice and it went into a merge state... I tried to abandon. 😵‍💫

I really dove off without a safety net... I found this

git fetch origin
git reset --hard origin

and basically feel like I need to trash my local branch and start over somehow.

Also, @Tobbe - I don't really understand how your last comment affects me:

  • rebuild the fixture with yarn build:test-project --rebuild-fixture --verbose, and commit the changes into this branch

Except any version changes to RW libraries. Those should stay 3.0-something (It's a little weird right now because we're in a RC phase. This is not the normal workflow)

I thought I would figure it out after running the fixture rebuild. But, I didn't figure it out. I didn't see anything that looked like ~3.0ish.

None of this is pressing. I am probably off for the night. But, any tips would be appreciated. I will look into it when I get time.

@Tobbe
Copy link
Copy Markdown
Contributor

Tobbe commented Sep 7, 2022

It took about 20 minutes to complete. Not sure if that was correct.

Yeah, unfortunately this is not surprising given that you're on Windows. Windows, and the file system that it uses, doesn't handle tasks like that very well 🙁 I timed it on my 2020 Mac M1 and it took 6m41s to run.

it said I was behind and had to pull.

Danny merged the latest changes from the main branch into this PR branch. You can see it in the timeline
image

If and when you see something like that it means you'll have to pull in the latest changes from your "origin" remote.

I don't really understand how your last comment affects me ... I thought I would figure it out after running the fixture rebuild.

Sorry, I could have been more clear here.
After running yarn build:test-project --rebuild-fixture you'll see a bunch of files updated. Among those files you'll find three package.json files that have been updated. Looking at one of them on my machine I see this:

diff --git a/__fixtures__/test-project/web/package.json b/__fixtures__/test-project/web/package.json
index 159c08191..3814d0196 100644
--- a/__fixtures__/test-project/web/package.json
+++ b/__fixtures__/test-project/web/package.json
@@ -13,10 +13,10 @@
     ]
   },
   "dependencies": {
-    "@redwoodjs/auth": "3.0.0-rc.285",
-    "@redwoodjs/forms": "3.0.0-rc.285",
-    "@redwoodjs/router": "3.0.0-rc.285",
-    "@redwoodjs/web": "3.0.0-rc.285",
+    "@redwoodjs/auth": "2.2.3",
+    "@redwoodjs/forms": "2.2.3",
+    "@redwoodjs/router": "2.2.3",
+    "@redwoodjs/web": "2.2.3",
     "prop-types": "15.8.1",
     "react": "17.0.2",
     "react-dom": "17.0.2"

Those are the changes you don't want to commit. So revert back to "3.0.0-rc.285" in all package.json files before running git commit.

I'm happy to jump on a call and guide you through any/all of this if you want

@jtoar jtoar added topic/cli fixture-ok Override the test project fixture check labels Sep 8, 2022
@jtoar
Copy link
Copy Markdown
Contributor

jtoar commented Sep 8, 2022

I want to get a patch out so I'm going to push this one across the finish line. I added Tobbe's suggestion (see #6203 (comment)). I rebuilt the fixture but it ended up having no changes except for the migrations (which aren't real changes in this case), so I just added the fixture-ok label instead.

@jtoar jtoar enabled auto-merge (squash) September 8, 2022 09:28
@jtoar jtoar merged commit eba37c9 into redwoodjs:main Sep 8, 2022
@redwoodjs-bot redwoodjs-bot Bot added this to the next-release milestone Sep 8, 2022
jtoar added a commit that referenced this pull request Sep 8, 2022
* bugfix replace slash in tailwind config on windows

* Update packages/cli/src/commands/setup/ui/libraries/tailwindcss.js

* update regex to tobbe's suggestion

Co-authored-by: Daniel Choudhury <[email protected]>
Co-authored-by: Dominic Saadi <[email protected]>
@jtoar jtoar removed this from the next-release milestone Sep 8, 2022
@jtoar jtoar modified the milestones: next-release-patch, v2.2.4 Sep 8, 2022
@pantheredeye pantheredeye deleted the bbb-fix-tailwindConfig branch September 8, 2022 14:18
jtoar added a commit that referenced this pull request Sep 8, 2022
* bugfix replace slash in tailwind config on windows

* Update packages/cli/src/commands/setup/ui/libraries/tailwindcss.js

* update regex to tobbe's suggestion

Co-authored-by: Daniel Choudhury <[email protected]>
Co-authored-by: Dominic Saadi <[email protected]>
dac09 added a commit to dac09/redwood that referenced this pull request Sep 9, 2022
* 'main' of github.com:redwoodjs/redwood:
  fix(deps): update dependency @graphql-yoga/common to v2.12.12 (redwoodjs#6349)
  fix(test-project): revert @redwoodjs/core to rc
  Update yarn.lock
  v2.2.4
  bugfix replace slash in tailwind config on windows (redwoodjs#6203)
  bugfix replace slash in tailwind config on windows (redwoodjs#6203)
  chore(deps): update dependency @testing-library/dom to v8.17.1 (redwoodjs#6351)
  Update yarn.lock
  Use try/catch to access unauthenticated (redwoodjs#6358)
  issue#5852 added windows fix for nodeFileTrace (redwoodjs#6325)
  Handle special props `ref` and `key` in path and search params (redwoodjs#5537)
  Use try/catch to access unauthenticated (redwoodjs#6358)
  feat(codemod): Add codemod to make relation resolvers partial (redwoodjs#6342)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

fixture-ok Override the test project fixture check release:fix This PR is a fix topic/cli

Projects

No open projects
Status: Done

Development

Successfully merging this pull request may close these issues.

[Bug?]: Tailwind Setup Breaking Generators on Windows

7 participants