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.

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

refactor: useless NOTE comment & unused vars #30

Merged
merged 1 commit into from
Sep 2, 2021

Conversation

knokmki612
Copy link
Member

No description provided.

@knokmki612 knokmki612 requested a review from Hidetaro7 September 1, 2021 09:45
@@ -3,7 +3,6 @@ const theme = require("./theme");
const buttonStyle = require("./lib/buttonStyle");

module.exports = plugin.withOptions(
// NOTE: couldn't merge plugin-side theme when wrote the plugin without withOptions
Copy link
Member Author

@knokmki612 knokmki612 Sep 1, 2021

Choose a reason for hiding this comment

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

https://tailwindcss.com/docs/plugins#exposing-advanced-configuration-options

プラグイン内で独自に定義しているカラーコードなどを参照するには、 plugin.withOptions で記述する必要があるのは仕様なので、この書き方で問題なく、NOTEコメントに残す必要はないと理解したのでコメントを取り除きました

@Hidetaro7
Copy link
Contributor

ありがとうございます、hideki-trialで取り込んでおきました。 @knokmki612

@knokmki612
Copy link
Member Author

このプルリクエストのマージ先はもともとhideki-trialになっていました。

@knokmki612 knokmki612 closed this Sep 2, 2021
@knokmki612 knokmki612 deleted the refactor-tailwindcss-plugin branch September 2, 2021 04:21
@knokmki612 knokmki612 restored the refactor-tailwindcss-plugin branch September 2, 2021 04:22
@knokmki612 knokmki612 reopened this Sep 2, 2021
@knokmki612
Copy link
Member Author

knokmki612 commented Sep 2, 2021

まだ(リモートの)hideki-trialにマージされていないようだったので、このプルリクエストは一度closeしましたがreopenしました
コンフリクトが発生しているのでコンフリクト解消しますね

@knokmki612 knokmki612 force-pushed the refactor-tailwindcss-plugin branch from 8f21f25 to dfea177 Compare September 2, 2021 04:28
@Hidetaro7 Hidetaro7 merged commit 44ece37 into hideki-trial Sep 2, 2021
@Hidetaro7 Hidetaro7 deleted the refactor-tailwindcss-plugin branch September 2, 2021 04:28
@Hidetaro7
Copy link
Contributor

失礼、取り込んでおきました

@knokmki612
Copy link
Member Author

@Hidetaro7 コンフリクト解消時の操作を誤ったのでtypography.jsが復活してしまいました。

knokmki612 added a commit that referenced this pull request Sep 2, 2021
ブランチ間のコンフリクト解消時のミス #30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants