kevin/hypothetical
1
0
Fork 0
mirror of https://github.com/prurigro/hypothetical.git synced 2024-11-21 23:52:31 -05:00
Code Issues Projects Releases Packages Wiki Activity

Sync the traditional-bootstrap with the date picker update, and upgrade sortablejs by switching to npm

Browse source
This commit is contained in:
Kevin MacMartin 2019-10-14 21:32:11 -04:00
parent 35cc8ac7cf
commit af9b3ea026
6 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
bower.json
View file

@ -7,7 +7,6 @@
"description": "The Hypothetical website template", "description": "The Hypothetical website template",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"Sortable": "~1.9.0",
"simplemde": "~1.11.2", "simplemde": "~1.11.2",
"SpinKit": "~1.2.5", "SpinKit": "~1.2.5",
"list.js": "^1.5.0" "list.js": "^1.5.0"

2
gulpfile.js vendored
View file

@ -63,7 +63,7 @@ const jsDashboardLibs = [
"node_modules/popper.js/dist/umd/popper.js", "node_modules/popper.js/dist/umd/popper.js",
"node_modules/bootstrap/dist/js/bootstrap.js", "node_modules/bootstrap/dist/js/bootstrap.js",
"node_modules/flatpickr/dist/flatpickr.js", "node_modules/flatpickr/dist/flatpickr.js",
"bower_components/Sortable/Sortable.js", "node_modules/sortablejs/Sortable.js",
"bower_components/list.js/dist/list.js", "bower_components/list.js/dist/list.js",
"bower_components/simplemde/dist/simplemde.min.js" "bower_components/simplemde/dist/simplemde.min.js"
]; ];

5
package-lock.json generated
View file

@ -7876,6 +7876,11 @@
"is-plain-obj": "^1.0.0" "is-plain-obj": "^1.0.0"
} }
}, },
"sortablejs": {
"version": "1.10.1",
"resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.10.1.tgz",
"integrity": "sha512-N6r7GrVmO8RW1rn0cTdvK3JR0BcqecAJ0PmYMCL3ZuqTH3pY+9QyqkmJSkkLyyDvd+AJnwaxTP22Ybr/83V9hQ=="
},
"source-map": { "source-map": {
"version": "0.5.7", "version": "0.5.7",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",

1
package.json
View file

@ -31,6 +31,7 @@
"jquery": "^3.4.1", "jquery": "^3.4.1",
"minimist": "^1.2.0", "minimist": "^1.2.0",
"popper.js": "^1.15.0", "popper.js": "^1.15.0",
"sortablejs": "^1.10.1",
"vinyl-buffer": "^1.0.1", "vinyl-buffer": "^1.0.1",
"vinyl-source-stream": "^2.0.0", "vinyl-source-stream": "^2.0.0",
"vue": "^2.6.10", "vue": "^2.6.10",

16
traditional-bootstrap/gulpfile.js vendored
View file

@ -60,17 +60,15 @@ const jsDashboardLibs = [
"node_modules/jquery/dist/jquery.js", "node_modules/jquery/dist/jquery.js",
"node_modules/popper.js/dist/umd/popper.js", "node_modules/popper.js/dist/umd/popper.js",
"node_modules/bootstrap/dist/js/bootstrap.js", "node_modules/bootstrap/dist/js/bootstrap.js",
"node_modules/pickadate/lib/picker.js", "node_modules/flatpickr/dist/flatpickr.js",
"node_modules/pickadate/lib/picker.date.js", "node_modules/sortablejs/Sortable.js",
"bower_components/Sortable/Sortable.js",
"bower_components/list.js/dist/list.js", "bower_components/list.js/dist/list.js",
"bower_components/simplemde/dist/simplemde.min.js" "bower_components/simplemde/dist/simplemde.min.js"
]; ];
// CSS libraries for the dashboard // CSS libraries for the dashboard
const cssDashboardLibs = [ const cssDashboardLibs = [
"node_modules/pickadate/lib/themes/default.css", "node_modules/flatpickr/dist/flatpickr.css",
"node_modules/pickadate/lib/themes/default.date.css",
"bower_components/simplemde/dist/simplemde.min.css", "bower_components/simplemde/dist/simplemde.min.css",
"bower_components/SpinKit/css/spinners/11-folding-cube.css" "bower_components/SpinKit/css/spinners/11-folding-cube.css"
]; ];
@ -104,11 +102,11 @@ function processSass(filename) {
} }
// Process css // Process css
function processCSS(ouputFilename, inputFiles) { function processCSS(outputFilename, inputFiles) {
const css = gulp.src(inputFiles) const css = gulp.src(inputFiles)
.pipe(plumber(handleError)) .pipe(plumber(handleError))
.pipe(postCSS([ autoprefixer(autoprefixerSettings) ])) .pipe(postCSS([ autoprefixer(autoprefixerSettings) ]))
.pipe(concat(`${ouputFilename}.css`)); .pipe(concat(`${outputFilename}.css`));
if (isProduction) { if (isProduction) {
css.pipe(cleanCSS()); css.pipe(cleanCSS());
@ -118,10 +116,10 @@ function processCSS(ouputFilename, inputFiles) {
} }
// Process javascript // Process javascript
function processJavaScript(ouputFilename, inputFiles, es6) { function processJavaScript(outputFilename, inputFiles, es6) {
const javascript = gulp.src(inputFiles) const javascript = gulp.src(inputFiles)
.pipe(plumber(handleError)) .pipe(plumber(handleError))
.pipe(concat(`${ouputFilename}.js`)); .pipe(concat(`${outputFilename}.js`));
if (es6) { if (es6) {
if (isProduction) { if (isProduction) {

3
traditional-bootstrap/package.json
View file

@ -14,6 +14,7 @@
"babelify": "^10.0.0", "babelify": "^10.0.0",
"bootstrap": "4.3.1", "bootstrap": "4.3.1",
"fancy-log": "^1.3.3", "fancy-log": "^1.3.3",
"flatpickr": "^4.6.2",
"gsap": "^2.1.3", "gsap": "^2.1.3",
"gulp": "^4.0.2", "gulp": "^4.0.2",
"gulp-babel": "^8.0.0", "gulp-babel": "^8.0.0",
@ -27,8 +28,8 @@
"gulp-uglify": "^3.0.2", "gulp-uglify": "^3.0.2",
"jquery": "^3.4.1", "jquery": "^3.4.1",
"minimist": "^1.2.0", "minimist": "^1.2.0",
"pickadate": "^3.6.4",
"popper.js": "^1.15.0", "popper.js": "^1.15.0",
"sortablejs": "^1.10.1",
"what-input": "^5.2.3" "what-input": "^5.2.3"
} }
} }