+
Skip to content

Conversation

kinoute
Copy link
Contributor

@kinoute kinoute commented Sep 25, 2021

The new Cascadia version includes:

Goquery has recently upgraded Cascadia too.

@WGH-
Copy link
Collaborator

WGH- commented Jan 16, 2023

If you don't mind, I'll take this PR from here, fix conflicts, and use the latest Cascadia version instead.

@WGH-
Copy link
Collaborator

WGH- commented Jan 16, 2023

Okay, I've fucked up with force-push, sorry

@WGH-
Copy link
Collaborator

WGH- commented Jan 16, 2023

@kinoute do you mind recreating PR with this diff, so it will be properly attributed and all?

commit 44ad8c940162b0c87fad7dcb27731336bfe524a0
Author: Yann Defretin <yann@defret.in>
Date:   Mon Jan 16 04:42:13 2023 +0300

    use new Cascadia version

    Cascadia 1.3.1 now supports ignore case feature as well as many pseudo-classes.

diff --git a/go.mod b/go.mod
index e0930fc..3a53bd6 100644
--- a/go.mod
+++ b/go.mod
@@ -4,7 +4,7 @@ go 1.12

 require (
 	github.com/PuerkitoBio/goquery v1.5.1
-	github.com/andybalholm/cascadia v1.2.0 // indirect
+	github.com/andybalholm/cascadia v1.3.1 // indirect
 	github.com/antchfx/htmlquery v1.2.3
 	github.com/antchfx/xmlquery v1.3.4
 	github.com/gobwas/glob v0.2.3
diff --git a/go.sum b/go.sum
index 91ab75a..f5fece9 100644
--- a/go.sum
+++ b/go.sum
@@ -3,8 +3,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03
 github.com/PuerkitoBio/goquery v1.5.1 h1:PSPBGne8NIUWw+/7vFBV+kG2J/5MOjbzc7154OaKCSE=
 github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
 github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y=
-github.com/andybalholm/cascadia v1.2.0 h1:vuRCkM5Ozh/BfmsaTm26kbjm0mIOM3yS5Ek/F5h18aE=
-github.com/andybalholm/cascadia v1.2.0/go.mod h1:YCyR8vOZT9aZ1CHEd8ap0gMVm2aFgxBp0T0eFw1RUQY=
+github.com/andybalholm/cascadia v1.3.1 h1:nhxRkql1kdYCc8Snf7D5/D3spOX+dBgjA6u8x004T2c=
+github.com/andybalholm/cascadia v1.3.1/go.mod h1:R4bJ1UQfqADjvDa4P6HZHLh/3OxWWEqc0Sk8XGwHqvA=
 github.com/antchfx/htmlquery v1.2.3 h1:sP3NFDneHx2stfNXCKbhHFo8XgNjCACnU/4AO5gWz6M=
 github.com/antchfx/htmlquery v1.2.3/go.mod h1:B0ABL+F5irhhMWg54ymEZinzMSi0Kt3I2if0BLYa3V0=
 github.com/antchfx/xmlquery v1.3.4 h1:RuhsI4AA5Ma4XoXhaAr2VjJxU0Xp0W2zy/f9ZIpsF4s=
@@ -76,6 +76,7 @@ golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR
 golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20210916014120-12bc252f5db8/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220114011407-0dd24b26b47d h1:1n1fc535VhN8SYtD4cDUyNlfpAF2ROMM9+11equK3hs=
 golang.org/x/net v0.0.0-20220114011407-0dd24b26b47d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=

@kinoute
Copy link
Contributor Author

kinoute commented Jan 16, 2023

@WGH- Sure, I will do that ASAP.

@kinoute
Copy link
Contributor Author

kinoute commented Jan 16, 2023

@WGH- I fixed it on my fork/PR

@WGH- WGH- reopened this Jan 16, 2023
@WGH-
Copy link
Collaborator

WGH- commented Jan 16, 2023

Hmm, I wonder why GitHub claims that this PR has 7 commits, even though it's clearly one commit ahead of master branch.

Cascadia 1.3.1 now supports ignore case feature as well as many pseudo-classes.
@WGH-
Copy link
Collaborator

WGH- commented Jan 16, 2023

Okay, I force-pushed and restored the original commit message, and now the Commits tab looks fine. I'm finally happy.

@WGH- WGH- merged commit 487ef11 into gocolly:master Jan 16, 2023
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

点击 这是indexloc提供的php浏览器服务,不要输入任何密码和下载