From 4c790cb525e0742befaafc8617f2092a6ffd64c0 Mon Sep 17 00:00:00 2001 From: Alex Bigelow Date: Tue, 17 Apr 2018 13:08:17 -0600 Subject: [PATCH] Fix example, clean up build --- dist/uki.umd.js | 178 -------------------------------------- dist/uki.umd.min.js | 1 - examples/basic/index.html | 4 - examples/basic/script.js | 5 +- package.json | 10 +-- rollup.config.js | 52 +---------- 6 files changed, 8 insertions(+), 242 deletions(-) delete mode 100644 dist/uki.umd.js delete mode 100644 dist/uki.umd.min.js diff --git a/dist/uki.umd.js b/dist/uki.umd.js deleted file mode 100644 index d6ba882..0000000 --- a/dist/uki.umd.js +++ /dev/null @@ -1,178 +0,0 @@ -(function (global, factory) { - typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) : - typeof define === 'function' && define.amd ? define(['exports'], factory) : - (factory((global.uki = {}))); -}(this, (function (exports) { 'use strict'; - - class AbstractClass { - requireProperties(properties) { - properties.forEach(m => { - if (this[m] === undefined) { - throw new TypeError(m + ' is undefined for class ' + this.constructor.name); - } - }); - } - } - - class Model extends AbstractClass { - constructor() { - super(); - this.eventHandlers = {}; - this.stickyTriggers = {}; - } - on(eventName, callback, allowDuplicateListeners) { - if (!this.eventHandlers[eventName]) { - this.eventHandlers[eventName] = []; - } - if (!allowDuplicateListeners) { - if (this.eventHandlers[eventName].indexOf(callback) !== -1) { - return; - } - } - this.eventHandlers[eventName].push(callback); - } - off(eventName, callback) { - if (this.eventHandlers[eventName]) { - if (!callback) { - delete this.eventHandlers[eventName]; - } else { - let index = this.eventHandlers[eventName].indexOf(callback); - if (index >= 0) { - this.eventHandlers[eventName].splice(index, 1); - } - } - } - } - trigger(eventName, ...args) { - if (this.eventHandlers[eventName]) { - this.eventHandlers[eventName].forEach(callback => { - window.setTimeout(() => { - // Add timeout to prevent blocking - callback.apply(this, args); - }, 0); - }); - } - } - stickyTrigger(eventName, argObj, delay = 10) { - this.stickyTriggers[eventName] = this.stickyTriggers[eventName] || { argObj: {} }; - this.stickyTriggers[eventName].argObj = Object.assign(this.stickyTriggers.argObj, argObj); - window.clearTimeout(this.stickyTriggers.timeout); - this.stickyTriggers.timeout = window.setTimeout(() => { - let argObj = this.stickyTriggers[eventName].argObj; - delete this.stickyTriggers[eventName]; - this.trigger(eventName, argObj); - }, delay); - } - } - - /* globals d3 */ - - class View extends Model { - constructor(d3el, resources = {}) { - super(); - this.requireProperties(['setup', 'draw']); - this.d3el = d3el; - this.dirty = true; - this.drawTimeout = null; - this.debounceWait = 100; - this.readyToRender = false; - this.loadResources(resources); - } - loadStylesheet(path) { - let style = document.createElement('link'); - style.rel = 'stylesheet'; - style.type = 'text/css'; - style.media = 'screen'; - style.href = path; - document.getElementsByTagName('head')[0].appendChild(style); - return style; - } - async loadResources(paths) { - this.resources = {}; - if (paths.style) { - // Load stylesheets immediately - this.resources.style = this.loadStylesheet(paths.style); - delete paths.style; - } - // load all d3-fetchable resources in parallel - try { - await Promise.all(Object.keys(paths).reduce((agg, key) => { - if (d3[key]) { - agg.push((async () => { - this.resources[key] = await d3[key](paths[key]); - })()); - } else { - throw new Error('d3 has no function for fetching resource of type ' + key); - } - return agg; - }, [])); - this.readyToRender = true; - this.render(); - } catch (err) { - throw err; - } - } - render(d3el = this.d3el) { - let needsFreshRender = this.dirty || d3el.node() !== this.d3el.node(); - this.d3el = d3el; - if (!this.readyToRender) { - // Don't execute any render calls until the promise in the constructor - // has been resolved - return; - } - if (needsFreshRender) { - // Call setup immediately - this.updateContainerCharacteristics(d3el); - this.setup(d3el); - this.dirty = false; - } - // Debounce the actual draw call - clearTimeout(this.drawTimeout); - this.drawTimeout = setTimeout(() => { - this.drawTimeout = null; - this.draw(d3el); - }, this.debounceWait); - } - updateContainerCharacteristics(d3el) { - if (d3el !== null) { - this.bounds = d3el.node().getBoundingClientRect(); - this.emSize = parseFloat(d3el.style('font-size')); - this.scrollBarSize = this.computeScrollBarSize(d3el); - } - } - computeScrollBarSize(d3el) { - // blatantly adapted from SO thread: - // http://stackoverflow.com/questions/13382516/getting-scroll-bar-width-using-javascript - var outer = document.createElement('div'); - outer.style.visibility = 'hidden'; - outer.style.width = '100px'; - outer.style.msOverflowStyle = 'scrollbar'; // needed for WinJS apps - - d3el.node().appendChild(outer); - - var widthNoScroll = outer.offsetWidth; - // force scrollbars - outer.style.overflow = 'scroll'; - - // add innerdiv - var inner = document.createElement('div'); - inner.style.width = '100%'; - outer.appendChild(inner); - - var widthWithScroll = inner.offsetWidth; - - // remove divs - outer.parentNode.removeChild(outer); - - return widthNoScroll - widthWithScroll; - } - } - - exports.AbstractClass = AbstractClass; - exports.Model = Model; - exports.View = View; - - Object.defineProperty(exports, '__esModule', { value: true }); - -}))); -//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"file":"uki.umd.js","sources":["../src/AbstractClass/index.js","../src/Model/index.js","../src/View/index.js"],"sourcesContent":["class AbstractClass {\n  requireProperties (properties) {\n    properties.forEach(m => {\n      if (this[m] === undefined) {\n        throw new TypeError(m + ' is undefined for class ' + this.constructor.name);\n      }\n    });\n  }\n}\nexport default AbstractClass;\n","import AbstractClass from '../AbstractClass/index.js';\n\nclass Model extends AbstractClass {\n  constructor () {\n    super();\n    this.eventHandlers = {};\n    this.stickyTriggers = {};\n  }\n  on (eventName, callback, allowDuplicateListeners) {\n    if (!this.eventHandlers[eventName]) {\n      this.eventHandlers[eventName] = [];\n    }\n    if (!allowDuplicateListeners) {\n      if (this.eventHandlers[eventName].indexOf(callback) !== -1) {\n        return;\n      }\n    }\n    this.eventHandlers[eventName].push(callback);\n  }\n  off (eventName, callback) {\n    if (this.eventHandlers[eventName]) {\n      if (!callback) {\n        delete this.eventHandlers[eventName];\n      } else {\n        let index = this.eventHandlers[eventName].indexOf(callback);\n        if (index >= 0) {\n          this.eventHandlers[eventName].splice(index, 1);\n        }\n      }\n    }\n  }\n  trigger (eventName, ...args) {\n    if (this.eventHandlers[eventName]) {\n      this.eventHandlers[eventName].forEach(callback => {\n        window.setTimeout(() => { // Add timeout to prevent blocking\n          callback.apply(this, args);\n        }, 0);\n      });\n    }\n  }\n  stickyTrigger (eventName, argObj, delay = 10) {\n    this.stickyTriggers[eventName] = this.stickyTriggers[eventName] || { argObj: {} };\n    this.stickyTriggers[eventName].argObj = Object.assign(this.stickyTriggers.argObj, argObj);\n    window.clearTimeout(this.stickyTriggers.timeout);\n    this.stickyTriggers.timeout = window.setTimeout(() => {\n      let argObj = this.stickyTriggers[eventName].argObj;\n      delete this.stickyTriggers[eventName];\n      this.trigger(eventName, argObj);\n    }, delay);\n  }\n}\n\nexport default Model;\n","/* globals d3 */\nimport Model from '../Model/index.js';\n\nclass View extends Model {\n  constructor (d3el, resources = {}) {\n    super();\n    this.requireProperties(['setup', 'draw']);\n    this.d3el = d3el;\n    this.dirty = true;\n    this.drawTimeout = null;\n    this.debounceWait = 100;\n    this.readyToRender = false;\n    this.loadResources(resources);\n  }\n  loadStylesheet (path) {\n    let style = document.createElement('link');\n    style.rel = 'stylesheet';\n    style.type = 'text/css';\n    style.media = 'screen';\n    style.href = path;\n    document.getElementsByTagName('head')[0].appendChild(style);\n    return style;\n  }\n  async loadResources (paths) {\n    this.resources = {};\n    if (paths.style) {\n      // Load stylesheets immediately\n      this.resources.style = this.loadStylesheet(paths.style);\n      delete paths.style;\n    }\n    // load all d3-fetchable resources in parallel\n    try {\n      await Promise.all(Object.keys(paths).reduce((agg, key) => {\n        if (d3[key]) {\n          agg.push((async () => {\n            this.resources[key] = await d3[key](paths[key]);\n          })());\n        } else {\n          throw new Error('d3 has no function for fetching resource of type ' + key);\n        }\n        return agg;\n      }, []));\n      this.readyToRender = true;\n      this.render();\n    } catch (err) { throw err; }\n  }\n  render (d3el = this.d3el) {\n    let needsFreshRender = this.dirty || d3el.node() !== this.d3el.node();\n    this.d3el = d3el;\n    if (!this.readyToRender) {\n      // Don't execute any render calls until the promise in the constructor\n      // has been resolved\n      return;\n    }\n    if (needsFreshRender) {\n      // Call setup immediately\n      this.updateContainerCharacteristics(d3el);\n      this.setup(d3el);\n      this.dirty = false;\n    }\n    // Debounce the actual draw call\n    clearTimeout(this.drawTimeout);\n    this.drawTimeout = setTimeout(() => {\n      this.drawTimeout = null;\n      this.draw(d3el);\n    }, this.debounceWait);\n  }\n  updateContainerCharacteristics (d3el) {\n    if (d3el !== null) {\n      this.bounds = d3el.node().getBoundingClientRect();\n      this.emSize = parseFloat(d3el.style('font-size'));\n      this.scrollBarSize = this.computeScrollBarSize(d3el);\n    }\n  }\n  computeScrollBarSize (d3el) {\n    // blatantly adapted from SO thread:\n    // http://stackoverflow.com/questions/13382516/getting-scroll-bar-width-using-javascript\n    var outer = document.createElement('div');\n    outer.style.visibility = 'hidden';\n    outer.style.width = '100px';\n    outer.style.msOverflowStyle = 'scrollbar'; // needed for WinJS apps\n\n    d3el.node().appendChild(outer);\n\n    var widthNoScroll = outer.offsetWidth;\n    // force scrollbars\n    outer.style.overflow = 'scroll';\n\n    // add innerdiv\n    var inner = document.createElement('div');\n    inner.style.width = '100%';\n    outer.appendChild(inner);\n\n    var widthWithScroll = inner.offsetWidth;\n\n    // remove divs\n    outer.parentNode.removeChild(outer);\n\n    return widthNoScroll - widthWithScroll;\n  }\n}\n\nexport default View;\n"],"names":["AbstractClass","requireProperties","properties","forEach","m","undefined","TypeError","constructor","name","Model","eventHandlers","stickyTriggers","on","eventName","callback","allowDuplicateListeners","indexOf","push","off","index","splice","trigger","args","window","setTimeout","apply","stickyTrigger","argObj","delay","Object","assign","clearTimeout","timeout","View","d3el","resources","dirty","drawTimeout","debounceWait","readyToRender","loadResources","loadStylesheet","path","style","document","createElement","rel","type","media","href","getElementsByTagName","appendChild","paths","Promise","all","keys","reduce","agg","key","d3","Error","render","err","needsFreshRender","node","updateContainerCharacteristics","setup","draw","bounds","getBoundingClientRect","emSize","parseFloat","scrollBarSize","computeScrollBarSize","outer","visibility","width","msOverflowStyle","widthNoScroll","offsetWidth","overflow","inner","widthWithScroll","parentNode","removeChild"],"mappings":"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"} diff --git a/dist/uki.umd.min.js b/dist/uki.umd.min.js deleted file mode 100644 index 91a81fa..0000000 --- a/dist/uki.umd.min.js +++ /dev/null @@ -1 +0,0 @@ -!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports):"function"==typeof define&&define.amd?define(["exports"],t):t(e.uki={})}(this,function(e){"use strict";class t{requireProperties(e){e.forEach(e=>{if(void 0===this[e])throw new TypeError(e+" is undefined for class "+this.constructor.name)})}}class s extends t{constructor(){super(),this.eventHandlers={},this.stickyTriggers={}}on(e,t,s){this.eventHandlers[e]||(this.eventHandlers[e]=[]),(s||-1===this.eventHandlers[e].indexOf(t))&&this.eventHandlers[e].push(t)}off(e,t){if(this.eventHandlers[e])if(t){let s=this.eventHandlers[e].indexOf(t);s>=0&&this.eventHandlers[e].splice(s,1)}else delete this.eventHandlers[e]}trigger(e,...t){this.eventHandlers[e]&&this.eventHandlers[e].forEach(e=>{window.setTimeout(()=>{e.apply(this,t)},0)})}stickyTrigger(e,t,s=10){this.stickyTriggers[e]=this.stickyTriggers[e]||{argObj:{}},this.stickyTriggers[e].argObj=Object.assign(this.stickyTriggers.argObj,t),window.clearTimeout(this.stickyTriggers.timeout),this.stickyTriggers.timeout=window.setTimeout(()=>{let t=this.stickyTriggers[e].argObj;delete this.stickyTriggers[e],this.trigger(e,t)},s)}}e.AbstractClass=t,e.Model=s,e.View=class extends s{constructor(e,t={}){super(),this.requireProperties(["setup","draw"]),this.d3el=e,this.dirty=!0,this.drawTimeout=null,this.debounceWait=100,this.readyToRender=!1,this.loadResources(t)}loadStylesheet(e){let t=document.createElement("link");return t.rel="stylesheet",t.type="text/css",t.media="screen",t.href=e,document.getElementsByTagName("head")[0].appendChild(t),t}async loadResources(e){this.resources={},e.style&&(this.resources.style=this.loadStylesheet(e.style),delete e.style);try{await Promise.all(Object.keys(e).reduce((t,s)=>{if(!d3[s])throw new Error("d3 has no function for fetching resource of type "+s);return t.push((async()=>{this.resources[s]=await d3[s](e[s])})()),t},[])),this.readyToRender=!0,this.render()}catch(e){throw e}}render(e=this.d3el){let t=this.dirty||e.node()!==this.d3el.node();this.d3el=e,this.readyToRender&&(t&&(this.updateContainerCharacteristics(e),this.setup(e),this.dirty=!1),clearTimeout(this.drawTimeout),this.drawTimeout=setTimeout(()=>{this.drawTimeout=null,this.draw(e)},this.debounceWait))}updateContainerCharacteristics(e){null!==e&&(this.bounds=e.node().getBoundingClientRect(),this.emSize=parseFloat(e.style("font-size")),this.scrollBarSize=this.computeScrollBarSize(e))}computeScrollBarSize(e){var t=document.createElement("div");t.style.visibility="hidden",t.style.width="100px",t.style.msOverflowStyle="scrollbar",e.node().appendChild(t);var s=t.offsetWidth;t.style.overflow="scroll";var i=document.createElement("div");i.style.width="100%",t.appendChild(i);var r=i.offsetWidth;return t.parentNode.removeChild(t),s-r}},Object.defineProperty(e,"__esModule",{value:!0})}); diff --git a/examples/basic/index.html b/examples/basic/index.html index 1b7ed94..24d9db0 100644 --- a/examples/basic/index.html +++ b/examples/basic/index.html @@ -6,9 +6,5 @@
- diff --git a/examples/basic/script.js b/examples/basic/script.js index 6016319..3e85c49 100644 --- a/examples/basic/script.js +++ b/examples/basic/script.js @@ -1,3 +1,4 @@ +/* globals d3 */ import { View } from './uki.esm.js'; class CustomView extends View { @@ -8,4 +9,6 @@ class CustomView extends View { this.d3el.text('Hello, world!'); } } -export default new CustomView(); + +const myView = new CustomView(d3.select('#myView')); +myView.render(); diff --git a/package.json b/package.json index 2e2a507..8c4b7dc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "uki", - "version": "0.2.0", + "version": "0.2.1", "description": "Minimal, d3-based Model-View library", "module": "dist/uki.esm.js", "jsnext:main": "dist/uki.esm.js", @@ -25,13 +25,7 @@ "babel-preset-env": "^1.6.1", "rollup": "^0.58.0", "rollup-plugin-babel": "^3.0.3", - "rollup-plugin-commonjs": "^9.1.0", - "rollup-plugin-node-builtins": "^2.1.2", - "rollup-plugin-node-globals": "^1.1.0", - "rollup-plugin-node-resolve": "^3.0.2", - "rollup-plugin-uglify": "^3.0.0", - "serve": "^6.5.5", - "uglify-es": "^3.3.9" + "serve": "^6.5.5" }, "dependencies": {}, "peerDependencies": { diff --git a/rollup.config.js b/rollup.config.js index d7010af..7a98019 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -1,10 +1,4 @@ -import builtins from 'rollup-plugin-node-builtins'; -import globals from 'rollup-plugin-node-globals'; -import resolve from 'rollup-plugin-node-resolve'; -import commonjs from 'rollup-plugin-commonjs'; import babel from 'rollup-plugin-babel'; -import uglify from 'rollup-plugin-uglify'; -import uglifyEs from 'uglify-es'; import pkg from './package.json'; // Derive some of the configuration from package.json @@ -17,28 +11,8 @@ const commonPlugins = [ ]; // Basic build formats, without minification -let builds = [ - // browser-friendly UMD build - { - input: 'src/module.js', - output: { - name: 'uki', - file: pkg.browser, - format: 'umd', - globals: { 'd3': 'd3' } - }, - plugins: [ - resolve({ - browser: true, - preferBuiltins: true - }), // so Rollup can find dependencies - commonjs(), // so Rollup can convert dependencies to ES modules - builtins(), - globals() - ].concat(commonPlugins), - external: peerDependencies - }, - // ES Module build for bundlers +export default [ + // ES Module { input: 'src/module.js', output: { @@ -49,25 +23,3 @@ let builds = [ plugins: commonPlugins } ]; - -// Create both minified and un-minified versions for -// builds with 'min.js' in their filenames -let minifiedBuilds = []; -builds.forEach(build => { - if (build.output.file.endsWith('min.js')) { - // Deep copy the build spec, add uglification - let minBuild = Object.assign({}, build); - minBuild.output = Object.assign({}, build.output); - minBuild.plugins = minBuild.plugins.concat([ - uglify({}, uglifyEs.minfier) - ]); - minifiedBuilds.push(minBuild); - - // Keep the un-minified version for development, - // include a sourcemap - build.output.file = build.output.file.replace(/min\.js/, 'js'); - build.output.sourcemap = 'inline'; - } -}); - -export default builds.concat(minifiedBuilds);