Skip to content

Commit

Permalink
Merge pull request #236 from Naoray/asset-cache-fix
Browse files Browse the repository at this point in the history
added version function to gulpfile via elixir
  • Loading branch information
austintoddj authored Oct 25, 2016
2 parents 65ca951 + 41e50e4 commit 337170c
Show file tree
Hide file tree
Showing 61 changed files with 4,546 additions and 3,141 deletions.
42 changes: 32 additions & 10 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,21 @@ require('laravel-elixir-vue-2');
|
*/

var assetsPath = 'public/assets/';

elixir(function (mix) {

// Sass Files
mix.sass('frontend/frontend.scss');
mix.sass('backend/backend.scss');
mix.sass('../talvbansal/media-manager/css/media-manager.css');
mix.sass('frontend/frontend.scss', assetsPath + 'css/');
mix.sass('backend/backend.scss', assetsPath + 'css/');
mix.sass('../talvbansal/media-manager/css/media-manager.css', assetsPath + 'css/');

// Frontend JS Files
mix.scripts([
'jquery.min.js',
'bootstrap.min.js',
'frontend/**/*.js'
], 'public/js/frontend.js');
], assetsPath + 'js/frontend.js');

// Vendor JS Files
mix.scripts([
Expand All @@ -46,17 +48,37 @@ elixir(function (mix) {
'fileinput.min.js',
'bootstrap-datetimepicker.min.js',
'../talvbansal/media-manager/js/media-manager.js'
], 'public/js/vendor.js');
], assetsPath + 'js/vendor.js');

// Application JS Files
mix.scripts([
'functions.js',
'bootstrap-growl.min.js'
], 'public/js/app.js');
], assetsPath + 'js/app.js');

// copy Favicon
mix.copy('resources/assets/favicon.ico', assetsPath);

// copy Images
mix.copy('resources/assets/images', assetsPath + 'images');

// copy Fonts
mix.copy(['resources/assets/fonts', 'resources/assets/talvbansal/media-manager/fonts'], assetsPath + '/fonts');

// versioning css files
mix.version([
// css files
assetsPath + 'css/frontend.css',
assetsPath + 'css/backend.css',

// Copy Media Manager SVG images into the public directory
mix.copy( 'resources/assets/talvbansal/media-manager/fonts', 'public/fonts' );
// js
assetsPath + 'js/frontend.js',
assetsPath + 'js/vendor.js',
assetsPath + 'js/app.js'
]);

// Run unit tests on code base
mix.phpUnit();
// Run unit tests on code base if in production mode
if (elixir.config.production) {
mix.phpUnit();
}
});
4 changes: 2 additions & 2 deletions public/css/backend.css → public/assets/css/backend.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/css/frontend.css → public/assets/css/frontend.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

File renamed without changes.
Empty file added public/assets/favicon.ico
Empty file.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
33 changes: 33 additions & 0 deletions public/build/assets/css/backend-dc76ad3797.css

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions public/build/assets/css/frontend-3e7eceb137.css

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions public/build/assets/js/app-7565142b23.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions public/build/assets/js/frontend-f5814b797f.js

Large diffs are not rendered by default.

53 changes: 53 additions & 0 deletions public/build/assets/js/vendor-6ae20ee748.js

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions public/build/rev-manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"assets/css/backend.css": "assets/css/backend-dc76ad3797.css",
"assets/css/frontend.css": "assets/css/frontend-3e7eceb137.css",
"assets/js/app.js": "assets/js/app-7565142b23.js",
"assets/js/frontend.js": "assets/js/frontend-f5814b797f.js",
"assets/js/vendor.js": "assets/js/vendor-6ae20ee748.js"
}
Binary file removed public/fonts/summernote.ttf
Binary file not shown.
Binary file removed public/fonts/summernote.woff
Binary file not shown.
Loading

0 comments on commit 337170c

Please sign in to comment.