diff --git a/.changeset/cool-spoons-confess.md b/.changeset/cool-spoons-confess.md deleted file mode 100644 index 8a4c8553f7..0000000000 --- a/.changeset/cool-spoons-confess.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -"@marko/compiler": patch -"marko": patch -"@marko/translator-default": patch ---- - -When duplicate taglib entries are found and merged, nullish values are now ignored. This means if you specify a property in a taglib it will not be unset by another (merged) taglib. diff --git a/.changeset/lovely-keys-whisper.md b/.changeset/lovely-keys-whisper.md deleted file mode 100644 index 7b2615f627..0000000000 --- a/.changeset/lovely-keys-whisper.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -"marko": patch -"@marko/compiler": patch -"@marko/translator-default": patch ---- - -Fix issue where `module-code` entries were not properly checking the expected module output (causing them to always output esm). This was previously fine due to the cjs conversion plugin running for these, however a recent change caused that plugin to no longer run for these files since (which should have been unnecessary, except for that they had the incorrect check). diff --git a/package-lock.json b/package-lock.json index 46e6c956ee..2c69a36dc6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10480,7 +10480,7 @@ }, "packages/compiler": { "name": "@marko/compiler", - "version": "5.30.0", + "version": "5.30.1", "license": "MIT", "dependencies": { "@babel/code-frame": "^7.16.0", @@ -10508,7 +10508,7 @@ "strip-json-comments": "^3.1.1" }, "devDependencies": { - "@marko/translator-default": "^5.28.0" + "@marko/translator-default": "^5.28.1" } }, "packages/compiler/node_modules/jsesc": { @@ -10527,11 +10527,11 @@ "integrity": "sha512-uEDMMkBCJvjTqYMBnJNxn+neiS6a0rhybQNA9RaexGor1uvKjwyHA5VcbZMZEuqXhKUWbL+WNS7PhuZVZNB7pw==" }, "packages/marko": { - "version": "5.28.0", + "version": "5.28.1", "license": "MIT", "dependencies": { - "@marko/compiler": "^5.30.0", - "@marko/translator-default": "^5.28.0", + "@marko/compiler": "^5.30.1", + "@marko/translator-default": "^5.28.1", "app-module-path": "^2.2.0", "argly": "^1.2.0", "browser-refresh-client": "1.1.4", @@ -10556,7 +10556,7 @@ }, "packages/translator-default": { "name": "@marko/translator-default", - "version": "5.28.0", + "version": "5.28.1", "license": "MIT", "dependencies": { "@babel/runtime": "^7.16.0", @@ -10566,8 +10566,8 @@ "self-closing-tags": "^1.0.1" }, "devDependencies": { - "@marko/compiler": "^5.30.0", - "marko": "^5.28.0" + "@marko/compiler": "^5.30.1", + "marko": "^5.28.1" }, "peerDependencies": { "@marko/compiler": "^5.16.1", @@ -12201,7 +12201,7 @@ "@babel/traverse": "^7.16.0", "@babel/types": "^7.16.0", "@marko/babel-utils": "^6.1.0", - "@marko/translator-default": "^5.28.0", + "@marko/translator-default": "^5.28.1", "complain": "^1.6.0", "he": "^1.2.0", "htmljs-parser": "^5.4.3", @@ -12231,10 +12231,10 @@ "requires": { "@babel/runtime": "^7.16.0", "@marko/babel-utils": "^6.1.0", - "@marko/compiler": "^5.30.0", + "@marko/compiler": "^5.30.1", "escape-string-regexp": "^4.0.0", "magic-string": "^0.27.0", - "marko": "^5.28.0", + "marko": "^5.28.1", "self-closing-tags": "^1.0.1" }, "dependencies": { @@ -15689,8 +15689,8 @@ "marko": { "version": "file:packages/marko", "requires": { - "@marko/compiler": "^5.30.0", - "@marko/translator-default": "^5.28.0", + "@marko/compiler": "^5.30.1", + "@marko/translator-default": "^5.28.1", "app-module-path": "^2.2.0", "argly": "^1.2.0", "browser-refresh-client": "1.1.4", diff --git a/packages/compiler/CHANGELOG.md b/packages/compiler/CHANGELOG.md index 7e0987a442..34de985ca7 100644 --- a/packages/compiler/CHANGELOG.md +++ b/packages/compiler/CHANGELOG.md @@ -1,5 +1,13 @@ # Change Log +## 5.30.1 + +### Patch Changes + +- [#1987](https://github.com/marko-js/marko/pull/1987) [`8bf5cb1f0`](https://github.com/marko-js/marko/commit/8bf5cb1f097769c835a452ff4bbea67a6c741810) Thanks [@DylanPiercey](https://github.com/DylanPiercey)! - When duplicate taglib entries are found and merged, nullish values are now ignored. This means if you specify a property in a taglib it will not be unset by another (merged) taglib. + +- [#1986](https://github.com/marko-js/marko/pull/1986) [`1b29b859f`](https://github.com/marko-js/marko/commit/1b29b859fb0876d9a8d0d7bba44d08f77f1706bb) Thanks [@DylanPiercey](https://github.com/DylanPiercey)! - Fix issue where `module-code` entries were not properly checking the expected module output (causing them to always output esm). This was previously fine due to the cjs conversion plugin running for these, however a recent change caused that plugin to no longer run for these files since (which should have been unnecessary, except for that they had the incorrect check). + ## 5.30.0 ### Minor Changes diff --git a/packages/compiler/package.json b/packages/compiler/package.json index 8ab2b3a67c..d48826a3fb 100644 --- a/packages/compiler/package.json +++ b/packages/compiler/package.json @@ -1,7 +1,7 @@ { "name": "@marko/compiler", "description": "Marko template to JS compiler.", - "version": "5.30.0", + "version": "5.30.1", "author": "Dylan Piercey ", "bugs": "https://github.com/marko-js/marko/issues/new?template=Bug_report.md", "dependencies": { @@ -30,7 +30,7 @@ "strip-json-comments": "^3.1.1" }, "devDependencies": { - "@marko/translator-default": "^5.28.0" + "@marko/translator-default": "^5.28.1" }, "files": [ "dist", diff --git a/packages/marko/CHANGELOG.md b/packages/marko/CHANGELOG.md index c7bb73a746..7d83df8275 100644 --- a/packages/marko/CHANGELOG.md +++ b/packages/marko/CHANGELOG.md @@ -1,5 +1,17 @@ # Change Log +## 5.28.1 + +### Patch Changes + +- [#1987](https://github.com/marko-js/marko/pull/1987) [`8bf5cb1f0`](https://github.com/marko-js/marko/commit/8bf5cb1f097769c835a452ff4bbea67a6c741810) Thanks [@DylanPiercey](https://github.com/DylanPiercey)! - When duplicate taglib entries are found and merged, nullish values are now ignored. This means if you specify a property in a taglib it will not be unset by another (merged) taglib. + +- [#1986](https://github.com/marko-js/marko/pull/1986) [`1b29b859f`](https://github.com/marko-js/marko/commit/1b29b859fb0876d9a8d0d7bba44d08f77f1706bb) Thanks [@DylanPiercey](https://github.com/DylanPiercey)! - Fix issue where `module-code` entries were not properly checking the expected module output (causing them to always output esm). This was previously fine due to the cjs conversion plugin running for these, however a recent change caused that plugin to no longer run for these files since (which should have been unnecessary, except for that they had the incorrect check). + +- Updated dependencies [[`8bf5cb1f0`](https://github.com/marko-js/marko/commit/8bf5cb1f097769c835a452ff4bbea67a6c741810), [`1b29b859f`](https://github.com/marko-js/marko/commit/1b29b859fb0876d9a8d0d7bba44d08f77f1706bb)]: + - @marko/compiler@5.30.1 + - @marko/translator-default@5.28.1 + ## 5.28.0 ### Minor Changes diff --git a/packages/marko/package.json b/packages/marko/package.json index de806e0b47..45ef6f4e60 100644 --- a/packages/marko/package.json +++ b/packages/marko/package.json @@ -1,11 +1,11 @@ { "name": "marko", - "version": "5.28.0", + "version": "5.28.1", "license": "MIT", "description": "UI Components + streaming, async, high performance, HTML templating for Node.js and the browser.", "dependencies": { - "@marko/compiler": "^5.30.0", - "@marko/translator-default": "^5.28.0", + "@marko/compiler": "^5.30.1", + "@marko/translator-default": "^5.28.1", "app-module-path": "^2.2.0", "argly": "^1.2.0", "browser-refresh-client": "1.1.4", diff --git a/packages/translator-default/CHANGELOG.md b/packages/translator-default/CHANGELOG.md index a6eeae44ad..4bde413892 100644 --- a/packages/translator-default/CHANGELOG.md +++ b/packages/translator-default/CHANGELOG.md @@ -1,5 +1,13 @@ # Change Log +## 5.28.1 + +### Patch Changes + +- [#1987](https://github.com/marko-js/marko/pull/1987) [`8bf5cb1f0`](https://github.com/marko-js/marko/commit/8bf5cb1f097769c835a452ff4bbea67a6c741810) Thanks [@DylanPiercey](https://github.com/DylanPiercey)! - When duplicate taglib entries are found and merged, nullish values are now ignored. This means if you specify a property in a taglib it will not be unset by another (merged) taglib. + +- [#1986](https://github.com/marko-js/marko/pull/1986) [`1b29b859f`](https://github.com/marko-js/marko/commit/1b29b859fb0876d9a8d0d7bba44d08f77f1706bb) Thanks [@DylanPiercey](https://github.com/DylanPiercey)! - Fix issue where `module-code` entries were not properly checking the expected module output (causing them to always output esm). This was previously fine due to the cjs conversion plugin running for these, however a recent change caused that plugin to no longer run for these files since (which should have been unnecessary, except for that they had the incorrect check). + ## 5.28.0 ### Minor Changes diff --git a/packages/translator-default/package.json b/packages/translator-default/package.json index 7cf730098a..a2772c0f88 100644 --- a/packages/translator-default/package.json +++ b/packages/translator-default/package.json @@ -1,7 +1,7 @@ { "name": "@marko/translator-default", "description": "Translates Marko templates to the default Marko runtime.", - "version": "5.28.0", + "version": "5.28.1", "author": "Dylan Piercey ", "bugs": "https://github.com/marko-js/marko/issues/new?template=Bug_report.md", "dependencies": { @@ -12,8 +12,8 @@ "self-closing-tags": "^1.0.1" }, "devDependencies": { - "@marko/compiler": "^5.30.0", - "marko": "^5.28.0" + "@marko/compiler": "^5.30.1", + "marko": "^5.28.1" }, "files": [ "dist",