Skip to content

Commit

Permalink
Fix compatibility issues with Nova 4.28.0 (#122)
Browse files Browse the repository at this point in the history
  • Loading branch information
milewski authored Oct 25, 2023
1 parent 99ff810 commit b16b710
Show file tree
Hide file tree
Showing 7 changed files with 249 additions and 229 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"license": "MIT",
"require": {
"php": ">=8.1",
"laravel/nova": "^4.0"
"laravel/nova": "^4.28.0"
},
"autoload": {
"psr-4": {
Expand Down
2 changes: 1 addition & 1 deletion dist/js/tool.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions nova.mix.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ class NovaExtension {
webpackConfig.resolve.alias = {
...(webpackConfig.resolve.alias || {}),
'laravel-nova': path.join(__dirname, '../../vendor/laravel/nova/resources/js/mixins/packages.js'),
'laravel-nova-ui': path.join(__dirname, '../../vendor/laravel/nova/node_modules/laravel-nova-ui'),
'@': path.resolve(__dirname, '../../vendor/laravel/nova/resources/js/'),
}

Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
"nova:install": "npm --prefix='../../vendor/laravel/nova' ci"
},
"devDependencies": {
"@vue/compiler-sfc": "^3.2.22",
"@vue/compiler-sfc": "^3.3.7",
"laravel-mix": "^6.0.41",
"mix-tailwindcss": "^1.3.0",
"sass": "^1.69.3",
"sass": "^1.69.4",
"sass-loader": "^13.3.2",
"tailwindcss": "^3.3.3",
"vue-collapsed": "^1.2.8",
"tailwindcss": "^3.3.4",
"vue-collapsed": "^1.2.9",
"vue-loader": "^17.3.0"
}
}
6 changes: 3 additions & 3 deletions resources/js/components/Menu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -252,15 +252,15 @@
@screen lg {
div[data-testid="content"] {
div[dusk="content"] {
display: flex;
}
div[data-testid="content"] > div:first-child {
div[dusk="content"] > div:first-child {
position: relative;
}
div[data-testid="content"] > div:last-child {
div[dusk="content"] > div:last-child {
margin-left: 0;
flex: 1;
width: 0;
Expand Down
2 changes: 1 addition & 1 deletion resources/js/tool.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ Nova.booting(app => {
let element = null

if (screen === 'desktop') {
element = document.querySelector('#nova div[data-testid="content"] > div:first-child')
element = document.querySelector('#nova div[dusk="content"] > div:first-child')
}

if (screen === 'responsive') {
Expand Down
457 changes: 238 additions & 219 deletions yarn.lock

Large diffs are not rendered by default.

0 comments on commit b16b710

Please sign in to comment.