Upgrading lamb to 0.57.0 (modules) and using it as a dependency rathe…

…r than as a peer dependency: Will have to keep an eye on the bundles size as for now rollup doesn't tree-shake code indirectly executed upon loading if it is assumed to have side effects. Later on using sideEffects: false in package.json will inform rollup that we are sure that loading modules won't cause sfx and will drop more code. See: rollup/rollup#2672
nestauk · Feb 19, 2019 · 41ed066 · 41ed066
1 parent f3a8bb2
commit 41ed066
Show file tree

Hide file tree

Showing 59 changed files with 150 additions and 244 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/components/dependent/package.json b/packages/components/dependent/package.json
@@ -2,7 +2,18 @@
     "browser": "dist/index.js",
     "dependencies": {
         "@svizzle/hello": "0.1.0",
-        "@svizzle/hi": "0.1.0"
+        "@svizzle/hi": "0.1.0",
+        "lamb": "^0.57.0"
+    },
+    "devDependencies": {
+        "@svizzle/dev": "^0.1.0",
+        "esm": "^3.0.84",
+        "mocha": "^5.2.0",
+        "rollup": "^0.67.3",
+        "rollup-plugin-buble": "^0.19.4",
+        "rollup-plugin-svelte": "^4.4.0",
+        "rollup-plugin-terser": "^3.0.0",
+        "svelte": "3.0.0-alpha16"
     },
     "description": "Svizzle Dependent",
     "files": [
@@ -16,18 +27,5 @@
         "build": "rollup -c"
     },
     "svelte": "src/index.html",
-    "version": "0.1.0",
-    "devDependencies": {
-        "@svizzle/dev": "^0.1.0",
-        "esm": "^3.0.84",
-        "mocha": "^5.2.0",
-        "rollup": "^0.67.3",
-        "rollup-plugin-buble": "^0.19.4",
-        "rollup-plugin-svelte": "^4.4.0",
-        "rollup-plugin-terser": "^3.0.0",
-        "svelte": "3.0.0-alpha16"
-    },
-    "peerDependencies": {
-        "lamb": "^0.56.0"
-    }
+    "version": "0.1.0"
 }
diff --git a/packages/components/dependent/rollup.config.js b/packages/components/dependent/rollup.config.js
@@ -16,12 +16,8 @@ const umdConfig = {
         banner: makeBanner(pkg),
         file: pkg.main,
         format: "umd",
-        name: pkg.name,
-        globals: {
-            "lamb": "_"
-        }
+        name: pkg.name
     },
-    external: ["lamb"],
     plugins: [
         // resolve(),
         // commonjs(),

diff --git a/packages/components/hello/package.json b/packages/components/hello/package.json
@@ -1,18 +1,8 @@
 {
     "browser": "dist/index.js",
-    "description": "Svizzle Hello",
-    "files": [
-        "dist/*"
-    ],
-    "license": "MIT",
-    "main": "dist/index.js",
-    "module": "dist/index.mjs",
-    "name": "@svizzle/hello",
-    "scripts": {
-        "build": "rollup -c"
+    "dependencies": {
+        "lamb": "^0.57.0"
     },
-    "svelte": "src/index.html",
-    "version": "0.1.0",
     "devDependencies": {
         "@svizzle/dev": "^0.1.0",
         "esm": "^3.0.84",
@@ -25,7 +15,17 @@
         "rollup-plugin-terser": "^3.0.0",
         "svelte": "3.0.0-alpha16"
     },
-    "peerDependencies": {
-        "lamb": "^0.56.0"
-    }
+    "description": "Svizzle Hello",
+    "files": [
+        "dist/*"
+    ],
+    "license": "MIT",
+    "main": "dist/index.js",
+    "module": "dist/index.mjs",
+    "name": "@svizzle/hello",
+    "scripts": {
+        "build": "rollup -c"
+    },
+    "svelte": "src/index.html",
+    "version": "0.1.0"
 }
diff --git a/packages/components/hello/rollup.config.js b/packages/components/hello/rollup.config.js
@@ -18,12 +18,8 @@ const umdConfig = {
         banner: makeBanner(pkg),
         file: pkg.main,
         format: "umd",
-        name: pkg.name,
-        globals: {
-            "lamb": "_"
-        }
+        name: pkg.name
     },
-    external: ["lamb"],
     plugins: [
         resolve(),
         commonjs(),

diff --git a/packages/components/hello/src/index.html b/packages/components/hello/src/index.html
@@ -1,7 +1,7 @@
 <p>Hello {name}</p>
 
 <script>
-    import _ from "lamb";
+    import * as _ from "lamb";
     import {join} from "@svizzle/utils";
 
     export let name = join([1, 2, 3], "@");

diff --git a/packages/components/hi/package.json b/packages/components/hi/package.json
@@ -1,20 +1,8 @@
 {
     "browser": "dist/index.js",
-    "description": "Svizzle Hi",
-    "files": [
-        "dist/*"
-    ],
-    "license": "MIT",
-    "main": "dist/index.js",
-    "module": "dist/index.mjs",
-    "name": "@svizzle/hi",
-    "scripts": {
-        "build": "rollup -c"
-    },
-    "svelte": "src/index.html",
-    "version": "0.1.0",
     "dependencies": {
-        "@svizzle/utils": "^0.1.0"
+        "@svizzle/utils": "^0.1.0",
+        "lamb": "^0.57.0"
     },
     "devDependencies": {
         "@svizzle/dev": "^0.1.0",
@@ -28,7 +16,17 @@
         "rollup-plugin-terser": "^3.0.0",
         "svelte": "3.0.0-alpha16"
     },
-    "peerDependencies": {
-        "lamb": "^0.56.0"
-    }
+    "description": "Svizzle Hi",
+    "files": [
+        "dist/*"
+    ],
+    "license": "MIT",
+    "main": "dist/index.js",
+    "module": "dist/index.mjs",
+    "name": "@svizzle/hi",
+    "scripts": {
+        "build": "rollup -c"
+    },
+    "svelte": "src/index.html",
+    "version": "0.1.0"
 }
diff --git a/packages/components/hi/rollup.config.js b/packages/components/hi/rollup.config.js
@@ -18,12 +18,8 @@ const umdConfig = {
         banner: makeBanner(pkg),
         file: pkg.main,
         format: "umd",
-        name: pkg.name,
-        globals: {
-            "lamb": "_"
-        }
+        name: pkg.name
     },
-    external: ["lamb"],
     plugins: [
         resolve(),
         commonjs(),

diff --git a/packages/tools/dev/package.json b/packages/tools/dev/package.json
@@ -1,33 +1,28 @@
 {
     "author": "nestauk",
-    "description": "Svizzle dev utils",
-    "module": "index.js",
-    "license": "MIT",
-    "main": "dist/dev.js",
-    "name": "@svizzle/dev",
-    "scripts": {
-        "build": "rollup -c",
-        "test": "mocha -r esm"
+    "dependencies": {
+        "lamb": "^0.57.0"
     },
-    "version": "0.1.0",
     "devDependencies": {
         "esm": "^3.0.84",
-        "lamb": "^0.56.0",
         "mocha": "^5.2.0",
         "rollup": "^0.67.3",
         "rollup-plugin-buble": "^0.19.4",
         "rollup-plugin-commonjs": "^9.2.0",
         "rollup-plugin-json": "^3.1.0",
         "rollup-plugin-node-resolve": "^3.4.0",
-        "rollup-plugin-terser": "^3.0.0"
-    },
-    "peerDependencies": {
-        "lamb": "^0.56.0",
-        "rollup-plugin-buble": "^0.19.4",
-        "rollup-plugin-commonjs": "^9.2.0",
-        "rollup-plugin-node-resolve": "^3.4.0",
-        "rollup-plugin-svelte": "^4.4.0",
         "rollup-plugin-terser": "^3.0.0",
-        "svelte": "^2.15.3"
-    }
+        "rollup-plugin-svelte": "^4.4.0",
+        "svelte": "3.0.0-alpha16"
+    },
+    "description": "Svizzle dev utils",
+    "module": "index.js",
+    "license": "MIT",
+    "main": "dist/dev.js",
+    "name": "@svizzle/dev",
+    "scripts": {
+        "build": "rollup -c",
+        "test": "mocha -r esm"
+    },
+    "version": "0.1.0"
 }
diff --git a/packages/tools/dev/rollup.config.js b/packages/tools/dev/rollup.config.js
@@ -19,7 +19,6 @@ const config = {
         name: pkg.name,
         indent: false,
         globals: {
-            // lamb: "_",
             resolve: "rollup-plugin-node-resolve"
         }
         // extend: true,
@@ -38,7 +37,6 @@ const config = {
         // })
     ],
     external: [
-        // "lamb",
         // "rollup-plugin-buble",
         // "rollup-plugin-commonjs",
         // "rollup-plugin-json",

diff --git a/packages/tools/dom/package.json b/packages/tools/dom/package.json
@@ -3,9 +3,9 @@
     "browser": "dist/browser.js",
     "dependencies": {
         "@svizzle/utils": "^0.1.0",
-        "d3-selection": "^1.3.2"
+        "d3-selection": "^1.3.2",
+        "lamb": "^0.57.0"
     },
-    "description": "Svizzle dom utils",
     "devDependencies": {
         "@svizzle/dev": "^0.1.0",
         "esm": "^3.0.84",
@@ -16,16 +16,14 @@
         "rollup-plugin-node-resolve": "^3.4.0",
         "rollup-plugin-terser": "^3.0.0"
     },
+    "description": "Svizzle dom utils",
     "files": [
         "dist/*"
     ],
     "license": "MIT",
     "main": "dist/index.js",
     "module": "dist/index.mjs",
     "name": "@svizzle/dom",
-    "peerDependencies": {
-        "lamb": "^0.56.0"
-    },
     "private": true,
     "scripts": {
         "build": "rollup -c",

diff --git a/packages/tools/dom/rollup.config.js b/packages/tools/dom/rollup.config.js
@@ -18,10 +18,7 @@ const cjsConfig = {
         banner: makeBanner(pkg),
         file: pkg.main,
         format: "cjs",
-        indent: false,
-        globals: {
-            "lamb": "_"
-        }
+        indent: false
     },
     plugins: []
 };
@@ -48,12 +45,8 @@ const esmConfig = {
         banner: makeBanner(pkg),
         file: renameToMjs(pkg.main),
         format: "esm",
-        indent: false,
-        globals: {
-            "lamb": "_"
-        }
+        indent: false
     },
-    external: ["lamb"],
     plugins: []
 };
 
@@ -64,12 +57,8 @@ const browserConfig = {
         file: pkg.browser,
         format: "umd",
         name: pkg.name,
-        indent: false,
-        globals: {
-            "lamb": "_"
-        }
+        indent: false
     },
-    external: ["lamb"],
     plugins: [
         resolve(),
         commonjs(),

diff --git a/packages/tools/dom/src/attrs.js b/packages/tools/dom/src/attrs.js
@@ -1,4 +1,4 @@
-import _ from "lamb";
+import * as _ from "lamb";
 
 import {
     isNumber,

diff --git a/packages/tools/dom/src/nodes.js b/packages/tools/dom/src/nodes.js
@@ -1,4 +1,4 @@
-import _ from "lamb";
+import * as _ from "lamb";
 
 import * as d3 from "../vendor/d3";
 

diff --git a/packages/tools/file/package.json b/packages/tools/file/package.json
@@ -2,7 +2,8 @@
     "author": "nestauk",
     "dependencies": {
         "@svizzle/utils": "^0.1.0",
-        "d3-dsv": "^1.0.10"
+        "d3-dsv": "^1.0.10",
+        "lamb": "^0.57.0"
     },
     "description": "Svizzle file utils",
     "devDependencies": {

diff --git a/packages/tools/file/rollup.config.js b/packages/tools/file/rollup.config.js
@@ -17,12 +17,8 @@ const cjsConfig = {
         banner: makeBanner(pkg),
         file: pkg.main,
         format: "cjs",
-        indent: false,
-        globals: {
-            "lamb": "_"
-        }
+        indent: false
     },
-    external: ["lamb"],
     plugins: []
 };
 
@@ -48,12 +44,8 @@ const esmConfig = {
         banner: makeBanner(pkg),
         file: renameToMjs(pkg.main),
         format: "esm",
-        indent: false,
-        globals: {
-            "lamb": "_"
-        }
+        indent: false
     },
-    external: ["lamb"],
     plugins: []
 };
 

diff --git a/packages/tools/file/src/path.js b/packages/tools/file/src/path.js
@@ -1,6 +1,6 @@
 import path from "path";
 
-import _ from "lamb";
+import * as _ from "lamb";
 
 import {mergeObj} from "@svizzle/utils";
 

diff --git a/packages/tools/file/test/read.spec.js b/packages/tools/file/test/read.spec.js
@@ -1,6 +1,6 @@
 import {strict as assert} from "assert";
 import path from "path";
-import _ from "lamb";
+import * as _ from "lamb";
 
 import {readCsv, readJson, readJsonDir} from "../src/read";