From e4e7e4cf6beaf5b352e2f6f92adf7cde840dc503 Mon Sep 17 00:00:00 2001 From: codecalm Date: Wed, 28 Oct 2020 10:40:12 +0100 Subject: [PATCH] build fix --- demo/sitemap.xml | 66 ++++++++--------- gulpfile.js | 6 +- package-lock.json | 175 ++++++++++++++++++++++++++++++++++++++++++++-- package.json | 5 ++ src/js/tabler.js | 3 +- 5 files changed, 215 insertions(+), 40 deletions(-) diff --git a/demo/sitemap.xml b/demo/sitemap.xml index 25b665212..dad66f0a3 100644 --- a/demo/sitemap.xml +++ b/demo/sitemap.xml @@ -2,135 +2,135 @@ /docs/alerts.html - 2020-10-27T00:31:22+01:00 + 2020-10-28T10:27:33+01:00 /docs/autosize.html - 2020-10-27T00:31:22+01:00 + 2020-10-28T10:27:33+01:00 /docs/avatars.html - 2020-10-27T00:31:22+01:00 + 2020-10-28T10:27:33+01:00 /docs/badges.html - 2020-10-27T00:31:22+01:00 + 2020-10-28T10:27:33+01:00 /docs/breadcrumb.html - 2020-10-27T00:31:22+01:00 + 2020-10-28T10:27:33+01:00 /docs/buttons.html - 2020-10-27T00:31:22+01:00 + 2020-10-28T10:27:33+01:00 /docs/cards.html - 2020-10-27T00:31:22+01:00 + 2020-10-28T10:27:33+01:00 /docs/carousel.html - 2020-10-27T00:31:22+01:00 + 2020-10-28T10:27:33+01:00 /docs/charts.html - 2020-10-27T00:31:22+01:00 + 2020-10-28T10:27:33+01:00 /docs/colors.html - 2020-10-27T00:31:22+01:00 + 2020-10-28T10:27:33+01:00 /docs/countup.html - 2020-10-27T00:31:22+01:00 + 2020-10-28T10:27:33+01:00 /docs/cursors.html - 2020-10-27T00:31:22+01:00 + 2020-10-28T10:27:33+01:00 /docs/divider.html - 2020-10-27T00:31:22+01:00 + 2020-10-28T10:27:33+01:00 /docs/dropdowns.html - 2020-10-27T00:31:22+01:00 + 2020-10-28T10:27:33+01:00 /docs/empty.html - 2020-10-27T00:31:22+01:00 + 2020-10-28T10:27:33+01:00 /docs/flags.html - 2020-10-27T00:31:22+01:00 + 2020-10-28T10:27:33+01:00 /docs/form-elements.html - 2020-10-27T00:31:22+01:00 + 2020-10-28T10:27:33+01:00 /docs/form-helpers.html - 2020-10-27T00:31:22+01:00 + 2020-10-28T10:27:33+01:00 /docs/ - 2020-10-27T00:31:22+01:00 + 2020-10-28T10:27:33+01:00 /docs/input-mask.html - 2020-10-27T00:31:22+01:00 + 2020-10-28T10:27:33+01:00 /docs/modals.html - 2020-10-27T00:31:22+01:00 + 2020-10-28T10:27:33+01:00 /docs/payments.html - 2020-10-27T00:31:22+01:00 + 2020-10-28T10:27:33+01:00 /docs/progress.html - 2020-10-27T00:31:22+01:00 + 2020-10-28T10:27:33+01:00 /docs/range-slider.html - 2020-10-27T00:31:22+01:00 + 2020-10-28T10:27:33+01:00 /docs/ribbons.html - 2020-10-27T00:31:22+01:00 + 2020-10-28T10:27:33+01:00 /docs/spinners.html - 2020-10-27T00:31:22+01:00 + 2020-10-28T10:27:33+01:00 /docs/steps.html - 2020-10-27T00:31:22+01:00 + 2020-10-28T10:27:33+01:00 /docs/tables.html - 2020-10-27T00:31:22+01:00 + 2020-10-28T10:27:33+01:00 /docs/tabs.html - 2020-10-27T00:31:22+01:00 + 2020-10-28T10:27:33+01:00 /docs/timelines.html - 2020-10-27T00:31:22+01:00 + 2020-10-28T10:27:33+01:00 /docs/toasts.html - 2020-10-27T00:31:22+01:00 + 2020-10-28T10:27:33+01:00 /docs/tooltips.html - 2020-10-27T00:31:22+01:00 + 2020-10-28T10:27:33+01:00 /docs/typography.html - 2020-10-27T00:31:22+01:00 + 2020-10-28T10:27:33+01:00 /all.html diff --git a/gulpfile.js b/gulpfile.js index 341f00923..b9b54c8f2 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,5 +1,4 @@ const gulp = require('gulp'), - debug = require('gulp-debug'), clean = require('gulp-clean'), sass = require('gulp-sass'), postcss = require('gulp-postcss'), @@ -10,6 +9,8 @@ const gulp = require('gulp'), rollup = require('gulp-rollup'), rollupBabel = require('rollup-plugin-babel'), rollupCleanup = require('rollup-plugin-cleanup'), + rollupCommonJS = require('@rollup/plugin-commonjs'), + rollupNodeResolve = require('@rollup/plugin-node-resolve').nodeResolve, browserSync = require('browser-sync'), glob = require('glob'), fs = require('fs'), @@ -168,12 +169,15 @@ gulp.task('sass', () => { gulp.task('js', () => { const g = gulp.src(`${srcDir}/**/*.js`) .pipe(rollup({ + cache: true, input: [`${srcDir}/js/tabler.js`, `${srcDir}/js/demo.js`], output: { format: 'umd', name: '[name].js' }, plugins: [ + rollupNodeResolve(), + rollupCommonJS(), rollupBabel({ exclude: 'node_modules/**' }), diff --git a/package-lock.json b/package-lock.json index 7b63ca683..9d0e5a439 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1337,6 +1337,72 @@ "@types/node": ">= 8" } }, + "@rollup/plugin-babel": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.2.1.tgz", + "integrity": "sha512-Jd7oqFR2dzZJ3NWANDyBjwTtX/lYbZpVcmkHrfQcpvawHs9E4c0nYk5U2mfZ6I/DZcIvy506KZJi54XK/jxH7A==", + "dev": true, + "requires": { + "@babel/helper-module-imports": "^7.10.4", + "@rollup/pluginutils": "^3.1.0" + } + }, + "@rollup/plugin-commonjs": { + "version": "16.0.0", + "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-16.0.0.tgz", + "integrity": "sha512-LuNyypCP3msCGVQJ7ki8PqYdpjfEkE/xtFa5DqlF+7IBD0JsfMZ87C58heSwIMint58sAUZbt3ITqOmdQv/dXw==", + "dev": true, + "requires": { + "@rollup/pluginutils": "^3.1.0", + "commondir": "^1.0.1", + "estree-walker": "^2.0.1", + "glob": "^7.1.6", + "is-reference": "^1.2.1", + "magic-string": "^0.25.7", + "resolve": "^1.17.0" + }, + "dependencies": { + "estree-walker": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.1.tgz", + "integrity": "sha512-tF0hv+Yi2Ot1cwj9eYHtxC0jB9bmjacjQs6ZBTj82H8JwUywFuc+7E83NWfNMwHXZc11mjfFcVXPe9gEP4B8dg==", + "dev": true + } + } + }, + "@rollup/plugin-node-resolve": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-10.0.0.tgz", + "integrity": "sha512-sNijGta8fqzwA1VwUEtTvWCx2E7qC70NMsDh4ZG13byAXYigBNZMxALhKUSycBks5gupJdq0lFrKumFrRZ8H3A==", + "dev": true, + "requires": { + "@rollup/pluginutils": "^3.1.0", + "@types/resolve": "1.17.1", + "builtin-modules": "^3.1.0", + "deepmerge": "^4.2.2", + "is-module": "^1.0.0", + "resolve": "^1.17.0" + } + }, + "@rollup/pluginutils": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz", + "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==", + "dev": true, + "requires": { + "@types/estree": "0.0.39", + "estree-walker": "^1.0.1", + "picomatch": "^2.2.2" + }, + "dependencies": { + "estree-walker": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz", + "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==", + "dev": true + } + } + }, "@sindresorhus/is": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-3.1.2.tgz", @@ -1397,6 +1463,15 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "@types/resolve": { + "version": "1.17.1", + "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz", + "integrity": "sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==", + "dev": true, + "requires": { + "@types/node": "*" + } + }, "@types/responselike": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz", @@ -2260,6 +2335,12 @@ "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==", "dev": true }, + "builtin-modules": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.1.0.tgz", + "integrity": "sha512-k0KL0aWZuBt2lrxrcASWDfwOLMnodeQjodT/1SxEQAXsHANgo6ZC/VEaSEHCXt7aSTZ4/4H5LKa+tBXmW7Vtvw==", + "dev": true + }, "bytes": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", @@ -2630,6 +2711,12 @@ "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", "dev": true }, + "commondir": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", + "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=", + "dev": true + }, "component-bind": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz", @@ -2918,6 +3005,12 @@ "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", "dev": true }, + "deepmerge": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz", + "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==", + "dev": true + }, "default-compare": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/default-compare/-/default-compare-1.0.0.tgz", @@ -4848,6 +4941,52 @@ "arr-union": "^3.1.0", "extend-shallow": "^3.0.2" } + }, + "rollup": { + "version": "0.68.2", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-0.68.2.tgz", + "integrity": "sha512-WgjNCXYv7ZbtStIap1+tz4pd2zwz0XYN//OILwEY6dINIFLVizK1iWdu+ZtUURL/OKnp8Lv2w8FBds8YihzX7Q==", + "dev": true, + "requires": { + "@types/estree": "0.0.39", + "@types/node": "*" + } + } + } + }, + "gulp-rollup-2": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/gulp-rollup-2/-/gulp-rollup-2-1.2.1.tgz", + "integrity": "sha512-C4MPKSRPRpxGFjeP9NyD7ArElom6DXJ3rPk4l19Yx7W3Z8VJb7h2WOQ6qOeO1U2/PbI0yRyGguuj7wp2ilIkdg==", + "dev": true, + "requires": { + "njfs": "^1.2.3", + "object-hash": "^2.0.3", + "rollup": "^2.29.0", + "through2": "^4.0.2", + "vinyl": "^2.2.1", + "vinyl-sourcemaps-apply": "^0.2.1" + }, + "dependencies": { + "readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "dev": true, + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + }, + "through2": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz", + "integrity": "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==", + "dev": true, + "requires": { + "readable-stream": "3" + } } } }, @@ -5583,6 +5722,12 @@ "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==", "dev": true }, + "is-module": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz", + "integrity": "sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=", + "dev": true + }, "is-negated-glob": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz", @@ -5637,6 +5782,15 @@ "isobject": "^3.0.1" } }, + "is-reference": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz", + "integrity": "sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==", + "dev": true, + "requires": { + "@types/estree": "*" + } + }, "is-regex": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz", @@ -6641,6 +6795,12 @@ "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=", "dev": true }, + "njfs": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/njfs/-/njfs-1.2.4.tgz", + "integrity": "sha512-ewq2vZRIHGgTWIDjhA+ckOxr6KFJEsbPtBeG7tfoxE7ziu8X+YkqjanYc5+LnRCTDrE4mc5AAv3aGcrJTPpoTw==", + "dev": true + }, "node-fetch": { "version": "2.6.1", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz", @@ -6847,6 +7007,12 @@ } } }, + "object-hash": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-2.0.3.tgz", + "integrity": "sha512-JPKn0GMu+Fa3zt3Bmr66JhokJU5BaNBIh4ZeTlaCBzrBsOeXzwcKKAK1tbLiPKgvwmPXsDvvLHoWh5Bm7ofIYg==", + "dev": true + }, "object-inspect": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz", @@ -8428,13 +8594,12 @@ } }, "rollup": { - "version": "0.68.2", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-0.68.2.tgz", - "integrity": "sha512-WgjNCXYv7ZbtStIap1+tz4pd2zwz0XYN//OILwEY6dINIFLVizK1iWdu+ZtUURL/OKnp8Lv2w8FBds8YihzX7Q==", + "version": "2.32.1", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.32.1.tgz", + "integrity": "sha512-Op2vWTpvK7t6/Qnm1TTh7VjEZZkN8RWgf0DHbkKzQBwNf748YhXbozHVefqpPp/Fuyk/PQPAnYsBxAEtlMvpUw==", "dev": true, "requires": { - "@types/estree": "0.0.39", - "@types/node": "*" + "fsevents": "~2.1.2" } }, "rollup-plugin-babel": { diff --git a/package.json b/package.json index 94da606fa..b84900c28 100644 --- a/package.json +++ b/package.json @@ -47,6 +47,9 @@ "devDependencies": { "@babel/core": "^7.12.3", "@babel/preset-env": "^7.12.1", + "@rollup/plugin-babel": "^5.2.1", + "@rollup/plugin-commonjs": "^16.0.0", + "@rollup/plugin-node-resolve": "^10.0.0", "autoprefixer": "^10.0.1", "browser-sync": "^2.26.13", "gulp": "^4.0.2", @@ -58,9 +61,11 @@ "gulp-postcss": "^9.0.0", "gulp-rename": "^2.0.0", "gulp-rollup": "^2.17.0", + "gulp-rollup-2": "^1.2.1", "gulp-sass": "^4.1.0", "postcss": "^8.1.4", "release-it": "^14.2.0", + "rollup": "^2.32.1", "rollup-plugin-babel": "^4.4.0", "yaml": "^1.10.0" }, diff --git a/src/js/tabler.js b/src/js/tabler.js index ae919f606..185111c5a 100644 --- a/src/js/tabler.js +++ b/src/js/tabler.js @@ -1,4 +1,5 @@ -'use strict'; +//Vendor +import 'bootstrap'; // (function () { // /**