Skip to content

Commit

Permalink
Merge branch 'jlb/combobox' into feature/ui/combobox
Browse files Browse the repository at this point in the history
  • Loading branch information
SimoTod committed Jun 30, 2023
2 parents 92254b3 + 214eee7 commit 78898dd
Show file tree
Hide file tree
Showing 12 changed files with 11 additions and 12 deletions.
2 changes: 1 addition & 1 deletion packages/alpinejs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "alpinejs",
"version": "3.12.1",
"version": "3.12.2",
"description": "The rugged, minimal JavaScript framework",
"homepage": "https://alpinejs.dev",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion packages/collapse/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@alpinejs/collapse",
"version": "3.12.1",
"version": "3.12.2",
"description": "Collapse and expand elements with robust animations",
"homepage": "https://alpinejs.dev/plugins/collapse",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion packages/docs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@alpinejs/docs",
"version": "3.12.1-revision.1",
"version": "3.12.2-revision.1",
"description": "The documentation for Alpine",
"author": "Caleb Porzio",
"license": "MIT"
Expand Down
2 changes: 1 addition & 1 deletion packages/docs/src/en/essentials/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ This is by far the simplest way to get started with Alpine. Include the followin
Notice the `@3.x.x` in the provided CDN link. This will pull the latest version of Alpine version 3. For stability in production, it's recommended that you hardcode the latest version in the CDN link.

```alpine
<script defer src="https://cdn.jsdelivr.net/npm/alpinejs@3.12.1/dist/cdn.min.js"></script>
<script defer src="https://cdn.jsdelivr.net/npm/alpinejs@3.12.2/dist/cdn.min.js"></script>
```

That's it! Alpine is now available for use inside your page.
Expand Down
2 changes: 1 addition & 1 deletion packages/focus/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@alpinejs/focus",
"version": "3.12.1",
"version": "3.12.2",
"description": "Manage focus within a page",
"homepage": "https://alpinejs.dev/plugins/focus",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion packages/intersect/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@alpinejs/intersect",
"version": "3.12.1",
"version": "3.12.2",
"description": "Trigger JavaScript when an element enters the viewport",
"homepage": "https://alpinejs.dev/plugins/intersect",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion packages/mask/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@alpinejs/mask",
"version": "3.12.1",
"version": "3.12.2",
"description": "An Alpine plugin for input masking",
"homepage": "https://alpinejs.dev/plugins/mask",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion packages/morph/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@alpinejs/morph",
"version": "3.12.1",
"version": "3.12.2",
"description": "Diff and patch a block of HTML on a page with an HTML template",
"homepage": "https://alpinejs.dev/plugins/morph",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion packages/persist/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@alpinejs/persist",
"version": "3.12.1",
"version": "3.12.2",
"description": "Persist Alpine data across page loads",
"homepage": "https://alpinejs.dev/plugins/persist",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@alpinejs/ui",
"version": "3.12.0-beta.0",
"version": "3.12.1-beta.0",
"description": "Headless UI components for Alpine",
"homepage": "https://alpinejs.dev/components#headless",
"repository": {
Expand Down
2 changes: 0 additions & 2 deletions scripts/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ function bundleFile(package, file) {
entryPoints: [`packages/${package}/builds/${file}`],
outfile: `packages/${package}/dist/${file.replace('.js', '.esm.js')}`,
bundle: true,
packages: 'external',
platform: 'neutral',
mainFields: ['module', 'main'],
})
Expand All @@ -70,7 +69,6 @@ function bundleFile(package, file) {
entryPoints: [`packages/${package}/builds/${file}`],
outfile: `packages/${package}/dist/${file.replace('.js', '.cjs.js')}`,
bundle: true,
packages: 'external',
target: ['node10.4'],
platform: 'node',
}).then(() => {
Expand Down
1 change: 1 addition & 0 deletions tests/cypress/integration/directives/x-bind.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -467,6 +467,7 @@ test('Can extract Alpine bound data as a data prop',
get('#2').should(haveAttribute('foo', 'bar'))
}
)

test('x-bind updates checked attribute and property after user interaction',
html`
<div x-data="{ checked: true }">
Expand Down

0 comments on commit 78898dd

Please sign in to comment.