Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

first commit #2

Open
wants to merge 2 commits into
base: nova-4
Choose a base branch
from
Open
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
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@
},
"minimum-stability": "dev",
"prefer-stable": true
}
}
33 changes: 33 additions & 0 deletions nova.mix.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
const mix = require('laravel-mix')
const webpack = require('webpack')
const path = require('path')

class NovaExtension {
name() {
return 'nova-extension'
}

register(name) {
this.name = name
}

webpackConfig(webpackConfig) {
webpackConfig.externals = {
vue: 'Vue',
}

webpackConfig.resolve.alias = {
...(webpackConfig.resolve.alias || {}),
'laravel-nova': path.join(
__dirname,
'../../vendor/laravel/nova/resources/js/mixins/packages.js'
),
}

webpackConfig.output = {
uniqueName: this.name,
}
}
}

mix.extend('nova', new NovaExtension())
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@
"vue-router": "^4.0.15",
"vuex": "^4.0.2"
}
}
}
2 changes: 1 addition & 1 deletion resources/js/components/FilterBehavior.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,4 @@ export default {
return payload;
}
}
}
}
2 changes: 1 addition & 1 deletion resources/js/components/GlobalFilter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -157,4 +157,4 @@ export default {
},
},
};
</script>
</script>
2 changes: 1 addition & 1 deletion src/GlobalFilterable.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ public function globalFiltered($request, $model, $filters = [])
}
return $model;
}
}
}
4 changes: 4 additions & 0 deletions src/NovaGlobalFilter.php
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,8 @@ public function title($title)
$this->title = $title;
return $this;
}
<<<<<<< HEAD
}
=======
}
>>>>>>> f7d11cd65d4c1c4d5785f65ab5e5756acc5c4017
19 changes: 19 additions & 0 deletions vue.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
module.exports = {
chainWebpack: config => {
config.resolve.alias.set('vue', '@vue/compat')

config.module
.rule('vue')
.use('vue-loader')
.tap(options => {
return {
...options,
compilerOptions: {
compatConfig: {
MODE: 2
}
}
}
})
}
}