perf: update to the latest npm packages

Author: maniator

.nvmrc

@@ -0,0 +1 @@
+v16.6.1

.vscode/settings.json

@@ -0,0 +1,10 @@
+{
+    "files.watcherExclude": {
+        "**/.git/objects/**": true,
+        "**/.git/subtree-cache/**": true,
+        "**/node_modules/*/**": true,
+        "**/docs/*/**": true,
+        "**/lib/*/**": true,
+        "**/dist/*/**": true
+      }    
+}

example/adder.js

@@ -1,6 +1,6 @@
 // same example as https://github.com/cujojs/most#simple-example
 
-const { fromEvent, combine } = Servable;
+import { fromEvent, combine } from "../lib/index.js";
 
 const xInput = document.querySelector('input.x');
 const yInput = document.querySelector('input.y');
@@ -14,18 +14,14 @@ const renderResult = result => {
   resultNode.textContent = result
 };
 
-const main = () => {
-  // x represents the current value of xInput
-  const x = fromEvent('input', xInput).map(toNumber);
-  
-  // y represents the current value of yInput
-  const y = fromEvent('input', yInput).map(toNumber);
-  
-  // result is the live current value of adding x and y
-  const result = combine([x, y], add);
-  
-  // Observe the result value by rendering it to the resultNode
-  result.subscribe(renderResult);
-};
+// x represents the current value of xInput
+const x = fromEvent('input', xInput).map(toNumber);
+
+// y represents the current value of yInput
+const y = fromEvent('input', yInput).map(toNumber);
+
+// result is the live current value of adding x and y
+const result = combine([x, y], add);
 
-main();
+// Observe the result value by rendering it to the resultNode
+result.subscribe(renderResult);

example/dragdrop.js

@@ -1,16 +1,17 @@
-var parent = document.body;
-var widget = document.getElementById("widget");
+import { Observable } from "../lib/index.js";
 
-var mouseDowns$ = Servable.Observable.fromEvent("mousedown", widget);
-var parentMouseMoves$ = Servable.Observable.fromEvent("mousemove", parent);
-var parentMouseUps$ = Servable.Observable.fromEvent("mouseup", parent);
+const parent = document.body;
+const widget = document.getElementById("widget");
 
-var drags$ = mouseDowns$
+const mouseDowns$ = Observable.fromEvent("mousedown", widget);
+const parentMouseMoves$ = Observable.fromEvent("mousemove", parent);
+const parentMouseUps$ = Observable.fromEvent("mouseup", parent);
+
+const drags$ = mouseDowns$
   .flatMap(() => parentMouseMoves$.takeUntil(parentMouseUps$))
   .do((e) => {
     widget.style.left = e.clientX + "px";
     widget.style.top = e.clientY + "px";
   });
 
-var subscription =
-  drags$.subscribe();
+const subscription = drags$.subscribe();

example/index.html

@@ -49,11 +49,9 @@ <h3>Log</h3>
             <p id="log"></p>
         </div>
     </div>
-
-    <script type="text/javascript" src="../dist/index.js"></script>
-    <script type="text/javascript" src="logger.js"></script>
-    <script type="text/javascript" src="index.js"></script>
-    <script type="text/javascript" src="adder.js"></script>
-    <script type="text/javascript" src="dragdrop.js"></script>
+    <script type="module" type="text/javascript" src="./logger.js"></script>
+    <script type="module" type="text/javascript" src="./index.js"></script>
+    <script type="module" type="text/javascript" src="./adder.js"></script>
+    <script type="module" type="text/javascript" src="./dragdrop.js"></script>
 </body>
 </html>

example/index.js

@@ -1,4 +1,5 @@
-const {Observable} = Servable;
+import { Observable } from "../lib/index.js";
+import { logger } from "./logger.js";
 
 const countObservable$ = Observable.interval(1000, 1).take(4);
 const countObservable2$ = Observable.interval(500, 5);
@@ -10,15 +11,15 @@ Observable.zip([
   countObservable2$.take(7),
 ]).subscribe({
   next(number) {
-    console.log('Next numbers from countSubscription: ' + number);
+    logger.log('Next numbers from countSubscription: ' + number);
   },
 
   error(errors) {
-    console.warn('I HAVE ERRORS', errors)
+    logger.warn('I HAVE ERRORS', errors)
   },
 
   complete() {
-    console.log('I AM COMPLETE');
+    logger.log('I AM COMPLETE');
   }
 });
 
@@ -27,7 +28,7 @@ const inputObservable$ = Observable.fromEvent('input', document.getElementById('
 const divReverse = document.getElementById('myTextReverse');
 const div = document.getElementById('myText');
 
-console.log(inputObservable$);
+logger.log(inputObservable$);
 
 inputObservable$
   .map((text) => text.split('').reverse().join(''))
@@ -40,22 +41,22 @@ inputObservable$
 
 const ajaxCall$ = Observable
   .of('../package.json')
-  .do(fileName => console.log('Request ' + fileName))
+  .do(fileName => logger.log('Request ' + fileName))
   .flatMap(fileName => Observable.ajax(fileName))
   .map(response => response.toJSON())
-  .do(console.log.bind(console, 'Value of ./package.json: '));
+  .do(logger.log.bind(logger, 'Value of ./package.json: '));
 
 const ajaxSubscription = ajaxCall$
   .subscribe({
-    next: () => console.log('Finished request to ./package.json'),
-    error: (e) => console.warn('ERROR', e, e.response)
+    next: () => logger.log('Finished request to ./package.json'),
+    error: (e) => logger.warn('ERROR', e, e.response)
   });
 
-console.error('Cancel one request to package.json')
+logger.error('Cancel one request to package.json')
 ajaxSubscription.unsubscribe();
 
 ajaxCall$
   .subscribe({
-    next: () => console.log('Finished request to ./package.json'),
-    error: (e) => console.warn('ERROR', e, e.response)
+    next: () => logger.log('Finished request to ./package.json'),
+    error: (e) => logger.warn('ERROR', e, e.response)
   });

example/logger.js

@@ -1,42 +1,47 @@
-function Logger (element) {
-  this.element = element;
-}
-
-window.originalConsole = window.console;
-Logger.prototype = Object.keys(window.originalConsole).reduce((memo, consoleFn) => ({
-  ...memo,
-  [`_${consoleFn}`]: typeof window.originalConsole[consoleFn] === 'function' ? window.originalConsole[consoleFn].bind(window.originalConsole) : window.originalConsole[consoleFn],
-}), {});
-
-Logger.prototype.log = function () {
-  const preTag = document.createElement('pre');
-
-  this._log.apply(this, arguments);
-
-  if (!this.element) {
-    this._error('No element set', this.element)
+export class Logger {
+  constructor (elementSelector = '#log', logger = console) {
+    this.elementSelector = elementSelector;
+    this.logger = logger;
   }
 
-  this.element.appendChild(preTag);
-
-  preTag.textContent = Array.from(arguments).map((arg) => JSON.stringify(arg, null, 2)).join(', ');
-
-  preTag.classList.add('bg-info');
-  preTag.style.maxHeight = '25vh';
+  get element () {
+    if (!this._element) {
+      this._element = document.querySelector(this.elementSelector);
+    }
 
-  return preTag;
-};
-
-Logger.prototype.warn = function () {
-  const preTag = this.log.apply(this, arguments);
+    return this._element;
+  }
 
-  preTag.classList.add('bg-warning');
-};
+  log(...args) {
+    const preTag = document.createElement('pre');
+  
+    this.logger.log.apply(this.logger, args);
+  
+    if (!this.element) {
+      this.logger.error.call(this.logger, 'No element set', this.element)
+    }
+  
+    this.element.appendChild(preTag);
+  
+    preTag.textContent = Array.from(args).map((arg) => JSON.stringify(arg, null, 2)).join(', ');
+  
+    preTag.classList.add('bg-info');
+    preTag.style.maxHeight = '25vh';
+  
+    return preTag;
+  }
 
-Logger.prototype.error = function () {
-  const preTag = this.log.apply(this, arguments);
+  warn(...args) {
+    const preTag = this.log(...args);
+  
+    preTag.classList.add('bg-warning');
+  }
 
-  preTag.classList.add('bg-danger');
-};
+  error(...args) {
+    const preTag = this.log(...args);
+  
+    preTag.classList.add('bg-danger');
+  }
+}
 
-window.console = new Logger(document.getElementById('log'));
+export const logger = new Logger();

package.json

@@ -3,53 +3,46 @@
   "version": "0.4.2",
   "description": "From scratch observable",
   "main": "lib/index.js",
-  "jsnext:main": "src/index.js",
+  "type": "module",
   "scripts": {
     "test": "jest",
-    "build": "rimraf lib dist && yarn build:lib && yarn rollup && uglifyjs dist/index.js -c \"warnings=false\" --comments -m -o dist/index.min.js --verbose",
-    "build:lib": "babel src --out-dir lib",
+    "prebuild": "rimraf dist lib",
+    "build": "yarn rollup",
     "watch": "yarn rollup -w",
     "rollup": "rollup -c",
     "release": "node release.js",
     "exampleDemo": "yarn build && yarn docs",
-    "docs": "yarn documentation build src/** -f html -g -o .",
-    "server": "http-server"
+    "predocs": "rimraf docs",
+    "docs": "documentation build src/** --format html --document-exported --theme node_modules/clean-documentation-theme -g -o docs",
+    "serve": "npx serve"
   },
+  "author": "Naftali Lubin",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/maniator/servable/issues"
+  },
+  "homepage": "https://github.com/maniator/servable#readme",
   "engines": {
-    "yarn": ">=1 <2",
-    "node": ">=10"
+    "node": ">=12"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/maniator/servable.git"
   },
-  "author": "Neal Lubin",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/maniator/servable/issues"
-  },
-  "homepage": "https://github.com/maniator/servable#readme",
   "devDependencies": {
-    "@babel/cli": "7.1.5",
-    "@babel/core": "7.1.6",
-    "@babel/preset-env": "7.1.6",
-    "documentation": "9.0.0-alpha.1",
-    "http-server": "^0.10.0",
-    "inquirer": "^3.0.6",
-    "jest": "23.6.0",
-    "rimraf": "^2.6.1",
-    "rollup": "0.41.6",
-    "rollup-plugin-babel": "4.0.3",
-    "rollup-plugin-filesize": "^1.3.2",
-    "rollup-plugin-license": "^0.3.0",
-    "rollup-plugin-node-globals": "^1.1.0",
-    "rollup-plugin-node-resolve": "^3.0.0",
-    "rollup-watch": "^3.2.2",
-    "semver": "^6.1.0",
-    "shelljs": "^0.8.3",
-    "uglify-js": "^3.0.3"
-  },
-  "resolutions": {
-    "babel-core": "7.0.0-bridge.0"
+    "@babel/cli": "7.14.8",
+    "@babel/core": "7.15.0",
+    "@babel/preset-env": "7.15.0",
+    "clean-documentation-theme": "^0.5.2",
+    "documentation": "13.2.5",
+    "inquirer": "^8.1.2",
+    "jest": "27.0.6",
+    "rimraf": "^3.0.2",
+    "rollup": "2.56.0",
+    "rollup-plugin-babel": "4.4.0",
+    "rollup-plugin-filesize": "^9.1.1",
+    "rollup-plugin-terser": "^7.0.2",
+    "semver": "^7.3.5",
+    "shelljs": "^0.8.3"
   }
 }

release.js

@@ -42,9 +42,8 @@ inquirer.prompt(questions).then(function(answers) {
   }
   console.log('');
 
-  // run('npm test', dryRun) &&
-  run('yarn build', dryRun) &&
   run(`npm version ${newVerison}`, dryRun) &&
+  run('yarn build', dryRun) &&
   run('git push origin --tags', dryRun) &&
   run('npm publish', dryRun);
 });