Ugh systemJS

Author: Ændrew Rininsland

index.js

@@ -16,9 +16,20 @@ var config = {
   paths: {
     'npm:': 'https://unpkg.com/',
   },
+  packages: {
+    babel: {
+      main: 'browser.min.js',
+    },
+    react: {
+      main: 'react.js',
+    },
+    'react-dom': {
+      main: 'index.js',
+    },
+  },
   map: Object.assign({}, modules, window.D3_BOOTLOADER_MODULES),
   meta: { '*.json': { loader: 'plugin-json' } },
-  transpiler: 'plugin-babel',
+  transpiler: 'babel',
 };
 
 SystemJS.config(config);

modules.js

@@ -41,15 +41,16 @@ export default {
   'g-legend': 'npm:g-legend@^1/build/g-legend.js',
   'g-xaxisdate': 'npm:g-axis@^1/build/g-axis.js',
   'g-yaxislinear': 'npm:g-axis@^1/build/g-axis.js',
-  'plugin-babel': 'npm:systemjs-plugin-babel/plugin-babel.js',
   'plugin-json': 'npm:[email protected]/json.js',
   'save-svg-as-png': 'npm:[email protected]/lib/saveSvgAsPng.js',
   'simple-statistics': 'npm:[email protected]/dist/simple-statistics.js',
-  'systemjs-babel-build': 'npm:[email protected]/systemjs-babel-browser.js',
   'topojson-client': 'npm:[email protected]/dist/topojson-client.js',
   '@financial-times/g-components': 'npm:object-assign@^2',
   react: 'npm:react@^16.8',
   'react-dom': 'npm:react-dom@^16.8',
   'prop-types': 'npm:prop-types@^15',
   chai: 'https://www.chaijs.com/chai.js',
+  babel: 'npm:[email protected]',
+  fbjs: 'npm:[email protected]',
+  'object-assign': 'npm:[email protected]',
 };

package-lock.json

@@ -40,16 +40,16 @@
     "eslint-plugin-import": "^2.18.0",
     "esm": "^3.2.25",
     "npm-prepublish": "^1.2.3",
-    "rollup": "^0.67.4",
-    "rollup-plugin-commonjs": "^9.3.4",
-    "rollup-plugin-node-resolve": "^3.4.0",
+    "rollup": "^1.16.3",
+    "rollup-plugin-commonjs": "^10.0.1",
+    "rollup-plugin-node-resolve": "^5.2.0",
     "uglify-js": "^3.6.0"
   },
   "dependencies": {
     "cheerio": "^1.0.0-rc.3",
     "execa": "^1.0.0",
     "pacote": "^9.5.1",
-    "systemjs": "^0.20.19",
+    "systemjs": "^0.21.6",
     "tmp": "0.0.33"
   },
   "eslintConfig": {

package.json

@@ -3,11 +3,16 @@ import resolve from 'rollup-plugin-node-resolve';
 
 export default [
   {
-    entry: 'index.js',
-    dest: 'dist/d3-bootloader.js',
-    format: 'umd',
+    input: 'index.js',
+    output: {
+      file: 'dist/d3-bootloader.js',
+      format: 'umd',
+      name: 'bootD3',
+      sourcemap: true,
+    },
+
     external: ['fs'],
-    moduleName: 'bootD3',
+
     plugins: [
       resolve(),
       commonjs({
@@ -19,11 +24,14 @@ export default [
     ],
   },
   {
-    entry: 'offline/index.js',
-    dest: 'offline/d3-bootloader.js',
-    format: 'umd',
+    input: 'offline/index.js',
+    output: {
+      file: 'offline/d3-bootloader.js',
+      format: 'umd',
+      name: 'bootD3',
+      sourcemap: true,
+    },
     external: ['fs'],
-    moduleName: 'bootD3',
     plugins: [
       resolve(),
       commonjs({