From aee18dc3b213b677eb6fc8089d995f828a67db62 Mon Sep 17 00:00:00 2001 From: Kevin MacMartin Date: Mon, 13 Nov 2017 21:00:00 -0500 Subject: [PATCH] Improve module support --- contain-element-module.js | 6 ++---- gulpfile.js | 10 ++++++++-- module-template.js | 1 - package-lock.json | 21 ++++++++++++++++++++- package.json | 3 ++- 5 files changed, 32 insertions(+), 9 deletions(-) delete mode 100644 module-template.js diff --git a/contain-element-module.js b/contain-element-module.js index de62501..39963fa 100644 --- a/contain-element-module.js +++ b/contain-element-module.js @@ -1,4 +1,4 @@ -function ContainElement(options) { +module.exports = function(options) { var scaleFactor = 1, element = options.element || document.getElementById(options.id), elementWidth = options.width || element.offsetWidth, @@ -144,6 +144,4 @@ function ContainElement(options) { // External function to return the current scale factor this.getScale = function() { return scaleFactor; }; -} - -export default ContainElement; +}; diff --git a/gulpfile.js b/gulpfile.js index 034411e..67ef4a0 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,9 +1,15 @@ const gulp = require("gulp"), ugly = require("gulp-uglify"), - concat = require("gulp-concat"); + concat = require("gulp-concat"), + insert = require("gulp-insert"); gulp.task("module", function() { - return gulp.src([ "contain-element.js", "module-template.js" ]) + return gulp.src([ "contain-element.js" ]) + .pipe(insert.transform(function(contents) { + return contents + .replace(/^function ContainElement/, "module.exports = function") + .replace(/\n\}/, "\n};"); + })) .pipe(concat("contain-element-module.js")) .pipe(gulp.dest("./")); }); diff --git a/module-template.js b/module-template.js deleted file mode 100644 index 7e40466..0000000 --- a/module-template.js +++ /dev/null @@ -1 +0,0 @@ -export default ContainElement; diff --git a/package-lock.json b/package-lock.json index 6ba6bb3..008d7a3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "contain-element", - "version": "1.6.2", + "version": "1.6.3", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -617,6 +617,16 @@ } } }, + "gulp-insert": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/gulp-insert/-/gulp-insert-0.5.0.tgz", + "integrity": "sha1-MjE/E+SiPPWsylzl8MCAkjx3hgI=", + "dev": true, + "requires": { + "readable-stream": "1.1.14", + "streamqueue": "0.0.6" + } + }, "gulp-uglify": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/gulp-uglify/-/gulp-uglify-3.0.0.tgz", @@ -1463,6 +1473,15 @@ "integrity": "sha1-pB6tGm1ggc63n2WwYZAbbY89HQ8=", "dev": true }, + "streamqueue": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/streamqueue/-/streamqueue-0.0.6.tgz", + "integrity": "sha1-ZvX17JTpuK8knkrsLdH3Qb/pTeM=", + "dev": true, + "requires": { + "readable-stream": "1.1.14" + } + }, "string_decoder": { "version": "0.10.31", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", diff --git a/package.json b/package.json index c8a1140..4eff88a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "contain-element", "description": "A JavaScript plugin to contain an element within its parent element.", - "version": "1.6.3", + "version": "1.6.4", "license": "MIT", "main": "contain-element.min.js", "homepage": "https://github.com/WilliamsNY/contain-element", @@ -40,6 +40,7 @@ "devDependencies": { "gulp": "^3.9.1", "gulp-concat": "^2.6.1", + "gulp-insert": "^0.5.0", "gulp-uglify": "^3.0.0" }, "scripts": {