fixed es6 import issue

e489f7a4 · Sascha Herzinger · 86e5a8de · e489f7a4 · e489f7a4 · e489f7a4
Commit e489f7a4 authored Aug 24, 2018 by Sascha Herzinger
6 changed files
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -4,5 +4,5 @@ commit = True
 tag = True

 [bumpversion:file:package.json]
-parse = '(("version": ")|("main": "\./lib/fractal-)|("module": "\./lib/fractal-))(?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)((?:\.min\.js)|)"'
+parse = '"version": "(?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)'

--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ Please have a look at this playlist to see a demo of the visual aspects of Fract
 - Please note that the test charts might not always be up-to-date. They are really just playground for developers and work-in-progress charts.

 ### I don't use webpack or similar tools. How can I include Fractalis in my project?
-https://unpkg.com
+https://unpkg.com/fractalis/lib/fractal.js

 ### Usage
 Please refer to the [main.js file](https://git-r3lab.uni.lu/Fractalis/fractal.js/blob/master/src/main.js). It is the only file directly exposed to your code.

--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
 {
  "name": "fractalis",
  "description": "The front-end component of the Fractalis visual analytics project.",
-  "version": "1.2.8",
+  "version": "1.2.10-test",
  "author": "Sascha Herzinger <sascha.herzinger@uni.lu>",
  "license": "Apache-2.0",
  "bugs": {
@@ -14,12 +14,12 @@
  },
  "scripts": {
    "build": "webpack --config webpack.config.js --mode production",
-    "prepublishOnly": "npm run-script build",
+    "create-es6-export-file": "printf 'export ' | cat - lib/fractal.js > lib/fractal-es6-export.js",
+    "prepublishOnly": "npm run-script build && npm run-script create-es6-export-file",
    "devserver": "webpack-dev-server --config webpack.config.js --mode development",
    "test": "karma start karma.conf.js"
  },
-  "main": "./lib/fractal-1.2.8.min.js",
-  "module": "./lib/fractal-1.2.8.min.js",
+  "main": "lib/fractal-es6-export.js",
  "dependencies": {
    "axios": "0.16.1",
    "d3": "4.13.0",

--- a/test/demo/demo.html
+++ b/test/demo/demo.html
@@ -3,7 +3,7 @@

 <head>
  <link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet">
-  <script src="https://localhost:8080/fractal.js"></script>
+  <script src="http://localhost:8080/fractal.js"></script>
 </head>

 <body>
@@ -90,7 +90,7 @@
 <script>
  /* eslint-disable */

-  const fjs = fractal.init({
+  const fjs = fractalis.init({
    handler: 'demo_tcga_coad',
    dataSource: location.protocol + '//' + window.location.host,
    fractalisNode: 'http://localhost:5000',

--- a/webpack.config.js
+++ b/webpack.config.js
 const webpack = require('webpack')
 const path = require('path')
-const mode = require('yargs').argv.mode
-const VERSION = require('./package.json').version

 module.exports = {
  entry: './src/main.js',
  output: {
    path: path.resolve(__dirname, 'lib'),
-    library: 'fractal',
+    library: 'fractalis',
    libraryTarget: 'var',
-    filename: mode === 'production' ? `fractal-${VERSION}.min.js` : `fractal.js`,
+    filename: 'fractal.js',
    hotUpdateChunkFilename: 'hot/hot-update.js',
    hotUpdateMainFilename: 'hot/hot-update.json'
  },