chore(dev): provide ES5 version for npm pkg

antvis · Jan 23, 2018 · a855266 · a855266
1 parent acc930e
commit a855266
Show file tree

Hide file tree

Showing 33 changed files with 56 additions and 49 deletions.
diff --git a/.babelrc b/.babelrc
@@ -0,0 +1,14 @@
+{
+  "plugins": [
+    "transform-remove-strict-mode"
+  ],
+  "presets": [
+    [
+      "env",
+      {
+        "loose": true,
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/.eslintignore b/.eslintignore
@@ -1,5 +1,6 @@
 build/
 coverage/
+lib/
 dist/
 mocks/
 node_modules/

diff --git a/.gitignore b/.gitignore
@@ -66,6 +66,7 @@ temp
 .DS_Store
 .idea
 demos/assets/screenshots
+lib
 
 *.sw*
 *.un~
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
   "description": "the Grammar of Graphics in Javascript",
   "main": "build/g2.js",
   "browser": "build/g2.js",
-  "module": "index.js",
+  "module": "lib/index.js",
   "homepage": "https://github.com/antvis/g2",
   "repository": {
     "type": "git",
@@ -21,6 +21,7 @@
   "license": "MIT",
   "devDependencies": {
     "@antv/data-set": "~0.8.0",
+    "babel-cli": "~6.26.0",
     "babel-core": "~6.26.0",
     "babel-eslint": "~8.0.3",
     "babel-loader": "~7.1.2",
@@ -52,6 +53,7 @@
   },
   "scripts": {
     "build": "webpack",
+    "build-lib": "babel src --out-dir lib",
     "ci": "npm run lint && npm run test",
     "compress": "uglifyjs -c -m -o dist/g2.min.js -- build/g2.js",
     "coverage": "npm run coverage-generator && npm run coverage-viewer",
@@ -82,7 +84,7 @@
     "silent": false
   },
   "dependencies": {
-    "@antv/g": "~2.0.5-beta.3",
+    "@antv/g": "^2.0.5-beta.3",
     "fecha": "~2.3.2",
     "gl-matrix": "~2.4.0",
     "lodash": "~4.17.4",

diff --git a/index.js → src/index.js b/index.js → src/index.js
@@ -1,10 +1,10 @@
 const G = require('@antv/g');
-const Animate = require('./src/animate/animate');
-const Chart = require('./src/chart/chart');
-const Global = require('./src/global');
-const Scale = require('./src/scale/index');
-const Shape = require('./src/geom/shape/');
-const Util = require('./src/util');
+const Animate = require('./animate/animate');
+const Chart = require('./chart/chart');
+const Global = require('./global');
+const Scale = require('./scale/index');
+const Shape = require('./geom/shape/index');
+const Util = require('./util');
 
 const G2 = {
   // version
@@ -26,7 +26,7 @@ const G2 = {
 G2.track = function(enable) {
   Global.trackable = enable;
 };
-require('./src/track');
+require('./track');
 
 // 保证两个版本共存
 if (typeof window !== 'undefined') {

diff --git a/test/bugs/issue-124-spec.js b/test/bugs/issue-124-spec.js
@@ -1,4 +1,4 @@
-const G2 = require('../../index');
+const G2 = require('../../src/index');
 
 describe('#124', () => {
   it('null data draw point', () => {

diff --git a/test/bugs/issue-125-spec.js b/test/bugs/issue-125-spec.js
@@ -1,4 +1,4 @@
-const G2 = require('../../index');
+const G2 = require('../../src/index');
 
 describe('#125', () => {
   it('null data draw point', () => {

diff --git a/test/bugs/issue-238-spec.js b/test/bugs/issue-238-spec.js
@@ -1,4 +1,4 @@
-const G2 = require('../../index');
+const G2 = require('../../src/index');
 
 describe('#238', () => {
   it('Endless loop when calling chart.forceFit()', () => {

diff --git a/test/bugs/issue-240-spec.js b/test/bugs/issue-240-spec.js
@@ -1,5 +1,5 @@
 const DataSet = require('@antv/data-set');
-const G2 = require('../../index');
+const G2 = require('../../src/index');
 
 describe('#242', () => {
   it('Tooltip throws error when shape\'s area is 0', () => {

diff --git a/test/bugs/issue-242-spec.js b/test/bugs/issue-242-spec.js
@@ -1,5 +1,5 @@
 const DataSet = require('@antv/data-set');
-const G2 = require('../../index');
+const G2 = require('../../src/index');
 
 describe('#242', () => {
   it('Tooltip throws error when shape\'s area is 0', () => {

diff --git a/test/bugs/issue-243-spec.js b/test/bugs/issue-243-spec.js
@@ -1,6 +1,6 @@
 const DataSet = require('@antv/data-set');
 // const expect = require('chai').expect;
-const G2 = require('../../index');
+const G2 = require('../../src/index');
 
 describe('#243', () => {
   it('Axis grid `alternateColor` has gaps when field is `category`', () => {

diff --git a/test/bugs/issue-252-spec.js b/test/bugs/issue-252-spec.js
@@ -1,4 +1,4 @@
-const G2 = require('../../index');
+const G2 = require('../../src/index');
 
 describe('#252', () => {
   it('null data draw point', () => {

diff --git a/test/bugs/issue-285-spec.js b/test/bugs/issue-285-spec.js
@@ -1,6 +1,6 @@
 const DataSet = require('@antv/data-set');
 const expect = require('chai').expect;
-const G2 = require('../../index');
+const G2 = require('../../src/index');
 
 describe('#285', () => {
   it('Throws to break endless loop in scale calculating when field values are not regular', () => {

diff --git a/test/bugs/issue-291-spec.js b/test/bugs/issue-291-spec.js
@@ -1,5 +1,5 @@
 const expect = require('chai').expect;
-const G2 = require('../../index');
+const G2 = require('../../src/index');
 describe('#291', () => {
   const div = document.createElement('div');
   document.body.appendChild(div);

diff --git a/test/bugs/issue-311-spec.js b/test/bugs/issue-311-spec.js
@@ -1,5 +1,5 @@
 const expect = require('chai').expect;
-const G2 = require('../../index');
+const G2 = require('../../src/index');
 
 describe('#311', () => {
   it('no data legend error', () => {

diff --git a/test/bugs/issue-318-spec.js b/test/bugs/issue-318-spec.js
@@ -1,6 +1,6 @@
 const DataSet = require('@antv/data-set');
 const expect = require('chai').expect;
-const G2 = require('../../index');
+const G2 = require('../../src/index');
 
 describe('#318', () => {
   it('when show tooltip, throw error', () => {

diff --git a/test/bugs/issue-325-spec.js b/test/bugs/issue-325-spec.js
@@ -1,5 +1,5 @@
 const expect = require('chai').expect;
-const G2 = require('../../index');
+const G2 = require('../../src/index');
 
 describe('#360', () => {
   const div = document.createElement('div');

diff --git a/test/bugs/issue-326-spec.js b/test/bugs/issue-326-spec.js
@@ -1,5 +1,5 @@
 const expect = require('chai').expect;
-const G2 = require('../../index');
+const G2 = require('../../src/index');
 
 describe('#326', () => {
   it('view event emit', () => {

diff --git a/test/bugs/issue-345-spec.js b/test/bugs/issue-345-spec.js
@@ -1,5 +1,5 @@
 // const expect = require('chai').expect;
-const G2 = require('../../index');
+const G2 = require('../../src/index');
 
 describe('#345', () => {
   it('Extra legend added in each render', () => {

diff --git a/test/bugs/issue-346-spec.js b/test/bugs/issue-346-spec.js
@@ -1,5 +1,5 @@
 const expect = require('chai').expect;
-const G2 = require('../../index');
+const G2 = require('../../src/index');
 
 describe('#346', () => {
   it('when show tooltip, throw error', () => {

diff --git a/test/bugs/issue-360-spec.js b/test/bugs/issue-360-spec.js
@@ -1,5 +1,5 @@
 const expect = require('chai').expect;
-const G2 = require('../../index');
+const G2 = require('../../src/index');
 
 describe('#360', () => {
   it('point selected error', () => {

diff --git a/test/bugs/issue-361-spec.js b/test/bugs/issue-361-spec.js
@@ -1,5 +1,5 @@
 // const expect = require('chai').expect;
-const G2 = require('../../index');
+const G2 = require('../../src/index');
 const diamonds = require('../../demos/data/diamond.json');
 const DataSet = require('@antv/data-set');
 const DataView = DataSet.View;

diff --git a/test/bugs/issue-368-spec.js b/test/bugs/issue-368-spec.js
@@ -1,5 +1,5 @@
 const expect = require('chai').expect;
-const G2 = require('../../index');
+const G2 = require('../../src/index');
 
 describe('#368', () => {
   it('tooltip change', () => {

diff --git a/test/bugs/issue-369-spec.js b/test/bugs/issue-369-spec.js
@@ -1,5 +1,5 @@
 const expect = require('chai').expect;
-const G2 = require('../../index');
+const G2 = require('../../src/index');
 
 describe('#369', () => {
   it('when container hide', () => {

diff --git a/test/bugs/issue-371-spec.js b/test/bugs/issue-371-spec.js
@@ -1,5 +1,5 @@
 const expect = require('chai').expect;
-const G2 = require('../../index');
+const G2 = require('../../src/index');
 
 describe('#371', () => {
   it('point click with line error', () => {

diff --git a/test/bugs/issue-398-spec.js b/test/bugs/issue-398-spec.js
@@ -1,5 +1,5 @@
 const expect = require('chai').expect;
-const G2 = require('../../index');
+const G2 = require('../../src/index');
 
 describe('#398', () => {
   it('color mapping: data is null', () => {

diff --git a/test/bugs/issue-400-spec.js b/test/bugs/issue-400-spec.js
@@ -1,5 +1,5 @@
 const expect = require('chai').expect;
-const G2 = require('../../index');
+const G2 = require('../../src/index');
 
 describe('#400', () => {
   it('interval stack reverse order', () => {

diff --git a/test/bugs/issue-sync-spec.js b/test/bugs/issue-sync-spec.js
@@ -1,5 +1,5 @@
 const expect = require('chai').expect;
-const G2 = require('../../index');
+const G2 = require('../../src/index');
 
 describe('sync bug', function() {
   const div = document.createElement('div');

diff --git a/test/bugs/ticks-spec.js b/test/bugs/ticks-spec.js
@@ -1,4 +1,4 @@
-const G2 = require('../../index');
+const G2 = require('../../src/index');
 
 describe('ticks', () => {
   it('all data equals null', () => {

diff --git a/test/unit/geom/label/pie-labels-spec.js b/test/unit/geom/label/pie-labels-spec.js
@@ -3,7 +3,7 @@ const { Canvas } = require('@antv/g');
 const DataSet = require('@antv/data-set');
 const PieLabels = require('../../../../src/geom/label/pie-labels');
 const Coord = require('../../../../src/coord/');
-const G2 = require('../../../../index');
+const G2 = require('../../../../src/index');
 const Scale = require('../../../../src/scale/index');
 
 describe('pie labels', function() {

diff --git a/test/unit/global-spec.js b/test/unit/global-spec.js
@@ -1,5 +1,5 @@
 const expect = require('chai').expect;
-const { Global } = require('../../index');
+const { Global } = require('../../src/index');
 
 
 describe('Global', () => {

diff --git a/test/unit/index-spec.js b/test/unit/index-spec.js
@@ -1,5 +1,5 @@
 const expect = require('chai').expect;
-const G2 = require('../../index');
+const G2 = require('../../src/index');
 
 describe('sample', () => {
   it('G2 3.0', () => {

diff --git a/webpack.config.js b/webpack.config.js
@@ -5,7 +5,7 @@ const pkg = require('./package.json');
 module.exports = {
   devtool: 'cheap-source-map',
   entry: {
-    g2: './index.js'
+    g2: './src/index.js'
   },
   output: {
     filename: '[name].js',
@@ -21,18 +21,7 @@ module.exports = {
         use: {
           loader: 'babel-loader',
           options: {
-            babelrc: false,
-            plugins: [
-              'transform-remove-strict-mode'
-            ],
-            presets: [
-              [
-                'env', {
-                  loose: true,
-                  modules: false
-                }
-              ]
-            ]
+            babelrc: true
           }
         }
       },