merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2303 from jitendra-webkul/1.0 

Fixed velocity webpack mix file
This commit is contained in:
Jitendra Singh 2020-02-05 20:32:30 +05:30 committed by GitHub
parent 47b010ce6b c019891c50
commit 0e0ecda0d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Velocity/publishable/assets/js/velocity.js vendored
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Velocity/publishable/assets/mix-manifest.json
View File

@ -1,5 +1,5 @@
{
"/js/velocity.js": "/js/velocity.js?id=88f49832ffa11a05f6c5",
"/js/velocity.js": "/js/velocity.js?id=f6500424c8a08e971ec0",
"/css/velocity.css": "/css/velocity.css?id=20ca46e702d49266f2fd",
"/css/velocity-admin.css": "/css/velocity-admin.css?id=612d35e452446366eef7"
}

2
packages/Webkul/Velocity/src/Resources/assets/js/app.js vendored
View File

@ -175,6 +175,8 @@ $(document).ready(function () {
},
mounted: function () {
this.addServerErrors();
document.body.style.display = "block";
this.$validator.localize(document.documentElement.lang);

8
packages/Webkul/Velocity/webpack.mix.js vendored
View File

@ -1,14 +1,12 @@
const { mix } = require("laravel-mix");
require("laravel-mix-merge-manifest");
var publicPath = "../../../resources/themes/velocity/assets";
if (mix.inProduction()) {
publicPath = 'publishable/assets';
var publicPath = 'publishable/assets';
} else {
var publicPath = "../../../public/themes/velocity/assets";
}
publicPath = 'publishable/assets';
mix.setPublicPath(publicPath).mergeManifest();
mix.disableNotifications();