Gitlab is now using https://gitlab.lcsb.uni.lu as it's primary address. Please update your bookmarks. FAQ.

Commit e489f7a4 authored by Sascha Herzinger's avatar Sascha Herzinger
Browse files

fixed es6 import issue

parent 86e5a8de
...@@ -4,5 +4,5 @@ commit = True ...@@ -4,5 +4,5 @@ commit = True
tag = True tag = True
[bumpversion:file:package.json] [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+)'
...@@ -14,7 +14,7 @@ Please have a look at this playlist to see a demo of the visual aspects of Fract ...@@ -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. - 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? ### 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 ### 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. 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.
......
This source diff could not be displayed because it is too large. You can view the blob instead.
{ {
"name": "fractalis", "name": "fractalis",
"description": "The front-end component of the Fractalis visual analytics project.", "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>", "author": "Sascha Herzinger <sascha.herzinger@uni.lu>",
"license": "Apache-2.0", "license": "Apache-2.0",
"bugs": { "bugs": {
...@@ -14,12 +14,12 @@ ...@@ -14,12 +14,12 @@
}, },
"scripts": { "scripts": {
"build": "webpack --config webpack.config.js --mode production", "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", "devserver": "webpack-dev-server --config webpack.config.js --mode development",
"test": "karma start karma.conf.js" "test": "karma start karma.conf.js"
}, },
"main": "./lib/fractal-1.2.8.min.js", "main": "lib/fractal-es6-export.js",
"module": "./lib/fractal-1.2.8.min.js",
"dependencies": { "dependencies": {
"axios": "0.16.1", "axios": "0.16.1",
"d3": "4.13.0", "d3": "4.13.0",
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<head> <head>
<link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet"> <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> </head>
<body> <body>
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
<script> <script>
/* eslint-disable */ /* eslint-disable */
const fjs = fractal.init({ const fjs = fractalis.init({
handler: 'demo_tcga_coad', handler: 'demo_tcga_coad',
dataSource: location.protocol + '//' + window.location.host, dataSource: location.protocol + '//' + window.location.host,
fractalisNode: 'http://localhost:5000', fractalisNode: 'http://localhost:5000',
......
const webpack = require('webpack') const webpack = require('webpack')
const path = require('path') const path = require('path')
const mode = require('yargs').argv.mode
const VERSION = require('./package.json').version
module.exports = { module.exports = {
entry: './src/main.js', entry: './src/main.js',
output: { output: {
path: path.resolve(__dirname, 'lib'), path: path.resolve(__dirname, 'lib'),
library: 'fractal', library: 'fractalis',
libraryTarget: 'var', libraryTarget: 'var',
filename: mode === 'production' ? `fractal-${VERSION}.min.js` : `fractal.js`, filename: 'fractal.js',
hotUpdateChunkFilename: 'hot/hot-update.js', hotUpdateChunkFilename: 'hot/hot-update.js',
hotUpdateMainFilename: 'hot/hot-update.json' hotUpdateMainFilename: 'hot/hot-update.json'
}, },
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment