Skip to content

Commit f03f487

Browse files
authored
Merge pull request #320 from mrholek/v1.0.8
v1.0.8
2 parents 1a68a1c + 51d9f3d commit f03f487

File tree

619 files changed

+38512
-3104
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

619 files changed

+38512
-3104
lines changed

AJAX_Full_Project_GULP/gulp-tasks/build-dist.js

+14-2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ var runSequence = require('run-sequence');
99
var replace = require('gulp-replace');
1010

1111
var paths = gulp.paths;
12+
var pkg = gulp.pkg;
1213

1314
gulp.vendors = require('./../vendors.json');
1415
var vendors = gulp.vendors;
@@ -70,6 +71,11 @@ gulp.task('copy:vendorsFonts', function() {
7071
.pipe(gulp.dest(paths.vendors + 'fonts/'));
7172
});
7273

74+
gulp.task('copy:vendorsFlags', function() {
75+
return gulp.src(vendors.flags)
76+
.pipe(gulp.dest(paths.vendors + 'flags/'));
77+
});
78+
7379
gulp.task('replace:node_modules', function(){
7480
return gulp.src([
7581
paths.dist + '**/*.html',
@@ -87,7 +93,7 @@ gulp.task('replace:node_modules', function(){
8793
});
8894

8995
gulp.task('vendors', function(callback) {
90-
runSequence('vendors:css', 'vendors:js', 'copy:vendorsFonts', 'replace:node_modules', callback);
96+
runSequence('vendors:css', 'vendors:js', 'copy:vendorsFonts', 'copy:vendorsFlags', 'replace:node_modules', callback);
9197
});
9298

9399
gulp.task('clean:dist', function () {
@@ -115,8 +121,14 @@ gulp.task('copy:views', function() {
115121
});
116122

117123
gulp.task('copy:html', function() {
118-
return gulp.src(paths.src + 'index.html')
124+
var framework = pkg.name.split('/')[1];
125+
if (framework == 'ajax') {
126+
return gulp.src(paths.src + 'index.html')
127+
.pipe(gulp.dest(paths.dist));
128+
} else {
129+
return gulp.src(paths.src + '**/*.html')
119130
.pipe(gulp.dest(paths.dist));
131+
}
120132
});
121133

122134
gulp.task('copy:vendors', function() {

AJAX_Full_Project_GULP/gulpfile.js

+3
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ gulp.paths = {
1616

1717
var paths = gulp.paths;
1818

19+
gulp.pkg = require('./package.json');
20+
var pkg = gulp.pkg;
21+
1922
require('require-dir')('./gulp-tasks');
2023

2124
// Static Server + watching scss/html files

AJAX_Full_Project_GULP/package.json

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,35 @@
11
{
22
"name": "@coreui/ajax",
3-
"version": "1.0.6",
3+
"version": "1.0.8",
44
"description": "Open Source Bootstrap Admin Template",
55
"main": "index.html",
66
"dependencies": {
7-
"bootstrap": "4.0.0-beta.2",
7+
"bootstrap": "4.0.0-beta.3",
88
"chart.js": "2.7.1",
9+
"flag-icon-css": "2.9.0",
910
"font-awesome": "4.7.0",
1011
"jquery": "3.2.1",
1112
"pace-progress": "1.0.2",
12-
"popper.js": "1.12.6",
13+
"popper.js": "1.12.9",
1314
"simple-line-icons": "2.4.1"
1415
},
1516
"devDependencies": {
16-
"browser-sync": "2.18.13",
17+
"browser-sync": "2.23.5",
1718
"del": "3.0.0",
1819
"gulp": "3.9.1",
19-
"gulp-autoprefixer": "^4.0.0",
20+
"gulp-autoprefixer": "4.1.0",
2021
"gulp-bower-src": "0.1.0",
2122
"gulp-concat": "2.6.1",
2223
"gulp-contains": "1.1.0",
2324
"gulp-cssmin": "0.2.0",
24-
"gulp-filter": "5.0.1",
25+
"gulp-filter": "5.1.0",
2526
"gulp-rename": "1.2.2",
2627
"gulp-replace": "0.6.1",
2728
"gulp-sass": "3.1.0",
2829
"gulp-search": "1.0.0",
2930
"gulp-uglify": "3.0.0",
3031
"require-dir": "0.3.2",
31-
"run-sequence": "2.2.0"
32+
"run-sequence": "2.2.1"
3233
},
3334
"scripts": {
3435
"gulp": "gulp",

0 commit comments

Comments
 (0)