8000 [pull] master from tdewolff:master by pull[bot] · Pull Request #184 · RepoBackup/minify · GitHub
[go: up one dir, main page]

Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ updates:
- package-ecosystem: gomod
directory: /
schedule:
interval: daily
interval: weekly
- package-ecosystem: npm
directory: /bindings/js
versioning-strategy: increase
Expand All @@ -13,4 +13,4 @@ updates:
directory: /
schedule:
# Check for updates to GitHub Actions every weekday
interval: daily
interval: monthly
4 changes: 2 additions & 2 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
digest="${{ steps.build.outputs.digest }}"
8000 touch "${{ runner.temp }}/digests/${digest#sha256:}"

- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v7
with:
name: digests-${{ matrix.platform_pair }}
path: ${{ runner.temp }}/digests/*
Expand All @@ -69,7 +69,7 @@ jobs:
needs: build

steps:
- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v8
with:
path: ${{ runner.temp }}/digests
pattern: digests-*
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
fetch-depth: 0
- uses: actions/setup-go@v6
with:
go-version: '>=1.23'
go-version: '>=1.25'
- name: Build Windows extension
run: |
set GOOS=windows
Expand Down Expand Up @@ -94,7 +94,7 @@ jobs:
fetch-depth: 0
- uses: actions/setup-go@v6
with:
go-version: '>=1.23'
go-version: '>=1.25'
- name: Build MacOS extension
run: |
export GOOS=darwin
Expand Down Expand Up @@ -126,7 +126,7 @@ jobs:
python-version: '3.13'
- uses: actions/setup-go@v6
with:
go-version: '>=1.23'
go-version: '>=1.25'
- name: Install dependencies
run: pip install build
- name: Build package
Expand Down
936 changes: 161 additions & 775 deletions bindings/js/package-lock.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions bindings/js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@
],
"devDependencies": {
"@types/node": "^25.6.0",
"tsdown": "^0.21.8",
"tsdown": "^0.21.10",
"typescript": "^6.0.3",
"vitest": "^4.1.4"
"vitest": "^4.1.5"
},
"dependencies": {
"koffi": "^2.16.1"
Expand Down
1 change: 1 addition & 0 deletions css/css.go
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ func (c *cssMinifier) minifyGrammar() {
for {
gt, _, data := c.p.Next()
Next:
fmt.Println(gt, string(data))
switch gt {
case css.ErrorGrammar:
if c.p.HasParseError() {
Expand Down
1 change: 1 addition & 0 deletions css/css_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ func TestCSS(t *testing.T) {
{"--custom:calc(var(--a) + var(--b))", "--custom:calc(var(--a) + var(--b))"}, // #784
{"a{& :is(b) {c:d;} }", "a{& :is(b){c:d}}"}, // #908
{"a{&:is(b) :is(c) {d:e;} }", "a{&:is(b) :is(c){d:e}}"}, // #908
//{"@scope (body) { :scope { color: red; } }", "@scope(body){:scope{color:red}}"}, // #968
}

8BD0 m := minify.New()
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.25.0

require (
github.com/djherbis/atime v1.1.0
github.com/fsnotify/fsnotify v1.9.0
github.com/fsnotify/fsnotify v1.10.1
github.com/tdewolff/argp v0.0.0-20260424074207-decde4f86440
github.com/tdewolff/parse/v2 v2.8.12
github.com/tdewolff/test v1.0.12
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
github.com/djherbis/atime v1.1.0 h1:rgwVbP/5by8BvvjBNrbh64Qz33idKT3pSnMSJsxhi0g=
github.com/djherbis/atime v1.1.0/go.mod h1:28OF6Y8s3NQWwacXc5eZTsEsiMzp7LF8MbXE+XJPdBE=
github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
github.com/fsnotify/fsnotify v1.10.1 h1:b0/UzAf9yR5rhf3RPm9gf3ehBPpf0oZKIjtpKrx59Ho=
github.com/fsnotify/fsnotify v1.10.1/go.mod h1:TLheqan6HD6GBK6PrDWyDPBaEV8LspOxvPSjC+bVfgo=
github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y=
github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
github.com/jmoiron/sqlx v1.4.0 h1:1PLqN7S1UYp5t4SrVVnt4nUVNemrDAtxlulVe+Qgm3o=
Expand Down
2 changes: 2 additions & 0 deletions minify.go
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ func (m *M) AddRegexp(pattern *regexp.Regexp, minifier Minifier) {
for i := range m.pattern {
if m.pattern[i].pattern.String() == pattern.String() {
m.pattern[i] = patternMinifier{pattern, minifier}
m.mutex.Unlock()
return
}
}
Expand All @@ -169,6 +170,7 @@ func (m *M) AddFuncRegexp(pattern *regexp.Regexp, minifier MinifierFunc) {
for i := range m.pattern {
if m.pattern[i].pattern.String() == pattern.String() {
m.pattern[i] = patternMinifier{pattern, minifier}
m.mutex.Unlock()
return
}
}
Expand Down
Loading
0