diff --git a/_config.yml b/_config.yml index c35283c1f..7784bd63e 100644 --- a/_config.yml +++ b/_config.yml @@ -8,7 +8,6 @@ keep_files: - dist - static -version: 1.0.0-alpha.7 title: Tabler description: Premium and Open Source dashboard template with responsive and high quality UI. homepage: https://tabler.io diff --git a/gulpfile.js b/gulpfile.js index 30d7e1927..451c613a6 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -323,22 +323,7 @@ gulp.task('add-banner', () => { .pipe(gulp.dest(`${distDir}`)) }); -/** - * Update version of Tabler in jekyll _config.yml and package.json - */ -gulp.task('update-version', () => { - const oldVersion = argv['latest-version'] || `${pkg.version}`, - newVersion = argv['new-version'] || `${pkg.version}`; +gulp.task('start', gulp.series('clean', 'sass', 'js', 'build-jekyll', gulp.parallel('watch-jekyll', 'watch', 'browser-sync'))); - return gulp.src(['./_config.yml', './package.json']) - .pipe(replace(/version: .*/, `version: ${newVersion}`)) - .pipe(replace('"version": "' + oldVersion + '"', `"version": "${newVersion}"`)) - .pipe(replace('"version_short": "' + oldVersion + '"', `"version_short": "${newVersion}"`)) - .pipe(gulp.dest('.')); -}); - -gulp.task('start', gulp.series('clean', 'sass', 'build-jekyll', /*'js',*/ gulp.parallel('watch-jekyll', 'watch', 'browser-sync'))); - -gulp.task('prepare-demo', gulp.series('build-jekyll', 'copy-static', 'copy-dist')); - -gulp.task('build', gulp.series('build-on', 'update-version', 'clean', 'sass'/*, 'js'*/, 'copy-images', 'copy-libs', 'add-banner', 'prepare-demo')); +gulp.task('build', gulp.series('build-on', 'clean', 'sass', 'js', 'copy-images', 'copy-libs', 'add-banner')); +gulp.task('build-demo', gulp.series('build-on', 'build-jekyll', 'copy-static', 'copy-dist')); diff --git a/package-lock.json b/package-lock.json index c100872ba..0b4183219 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "tabler", - "version": "1.0.0-alpha.7", + "version": "1.0.0-alpha.8", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 8887e4144..c6d3b9923 100644 --- a/package.json +++ b/package.json @@ -1,13 +1,13 @@ { "name": "tabler", - "version": "1.0.0-alpha.7", + "version": "1.0.0-alpha.11", "description": "Premium and Open Source dashboard template with responsive and high quality UI.", "scripts": { "start": "gulp start", "build": "gulp build", "svg-optimize": "svgo -f svg/brand --pretty", "unused-files": "node build/unused-files.js", - "release": "release-it --no-npm.publish" + "release": "release-it" }, "repository": { "type": "git", @@ -95,7 +95,7 @@ }, "release-it": { "hooks": { - "after:bump": "gulp build --latest-version ${latestVersion} --new-version ${version}", + "after:bump": "gulp build --latest-version ${latestVersion} --new-version ${version} && gulp build-demo", "after:release": "echo Successfully released ${name} v${latestVersion} to ${repo.repository}." }, "git": { diff --git a/src/js/demo.js b/src/js/demo.js index 7a4d3e0c6..30246ba56 100644 --- a/src/js/demo.js +++ b/src/js/demo.js @@ -1 +1 @@ -alert('ok'); \ No newline at end of file +alert('ok2'); \ No newline at end of file diff --git a/src/pages/_data/package.json b/src/pages/_data/package.json new file mode 120000 index 000000000..8627c75e7 --- /dev/null +++ b/src/pages/_data/package.json @@ -0,0 +1 @@ +../../../package.json \ No newline at end of file diff --git a/src/pages/_includes/layout/banner.html b/src/pages/_includes/layout/banner.html index 71d90bbc9..d8a48b826 100644 --- a/src/pages/_includes/layout/banner.html +++ b/src/pages/_includes/layout/banner.html @@ -1,6 +1,6 @@