Merge remote-tracking branch 'upstream/master' into circleci-project-setup

Author: Richard Nicolaas Meijerink

.circleci/config.yml

@@ -53,6 +53,16 @@ case $1 in
         exit $EXIT_STATE
         ;;
 
+    virtual-webgl-jasmine)
+        SHARDS=($(node $ROOT/tasks/shard_jasmine_tests.js --limit=5 --tag=gl | circleci tests split))
+        for s in ${SHARDS[@]}; do
+            MAX_AUTO_RETRY=2
+            retry ./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --virtualWebgl --tags=gl --skip-tags=noCI,noVirtualWebgl --doNotFailOnEmptyTestSuite -- "$s"
+        done
+
+        exit $EXIT_STATE
+        ;;
+
     flaky-no-gl-jasmine)
         SHARDS=($(node $ROOT/tasks/shard_jasmine_tests.js --limit=1 --tag=flaky | circleci tests split))
 
@@ -82,6 +92,15 @@ case $1 in
         exit $EXIT_STATE
         ;;
 
+    make-baselines-virtual-webgl)
+        SUITE=$({\
+                  find $ROOT/test/image/mocks/gl*     -type f -printf "%f\n"; \
+                  find $ROOT/test/image/mocks/mapbox* -type f -printf "%f\n"; \
+                } | sed 's/\.json$//1' | circleci tests split)
+        python3 test/image/make_baseline.py virtual-webgl $SUITE || EXIT_STATE=$?
+        exit $EXIT_STATE
+        ;;
+
     make-baselines-mathjax3)
         python3 test/image/make_baseline.py mathjax3    legend_mathjax_title_and_items mathjax parcats_grid_subplots table_latex_multitrace_scatter table_plain_birds table_wrapped_birds ternary-mathjax || EXIT_STATE=$?
         exit $EXIT_STATE
@@ -103,6 +122,11 @@ case $1 in
         exit $EXIT_STATE
         ;;
 
+    test-image-virtual-webgl)
+        node test/image/compare_pixels_test.js virtual-webgl || { tar -cvf build/baselines.tar build/test_images/*.png ; exit 1 ; } || EXIT_STATE=$?
+        exit $EXIT_STATE
+        ;;
+
     source-syntax)
         npm run lint        || EXIT_STATE=$?
         npm run test-syntax || EXIT_STATE=$?

.circleci/test.sh

@@ -3,5 +3,6 @@ node_modules
 dist
 build
 
+tasks/test_amdefine.js
 tasks/test_requirejs.js
 test/jasmine/assets/jquery-1.8.3.min.js

.eslintignore

@@ -55,6 +55,7 @@
     "no-floating-decimal": [2],
     "space-infix-ops": [2, {"int32Hint": true}],
     "quotes": [2, "single"],
+    "quote-props": ["error", "as-needed"],
     "dot-notation": [2],
     "dot-location": [2, "property"],
     "operator-linebreak": [2, "after"],

.eslintrc

@@ -4,6 +4,8 @@ build/*
 !build/plotcss.js
 !build/README.md
 
+dist/*.LICENSE.txt
+
 npm-debug.log*
 *.sublime*
 *~

.gitignore

@@ -3,41 +3,6 @@ Depending on your needs you may require/import one of [the distributed plotly.js
 
 The sections below provide additional info in respect to alternative building frameworks.
 
-## Browserify example
-
-Given source file:
-```js
-// file: index.js
-var Plotly = require('plotly.js-dist-min');
-// ....
-```
-
-then simply run
-
-```sh
-browserify index.js > bundle.js
-```
-
----
-## Webpack
-
-For plotly.js to build with Webpack you will need to install [[email protected]+](https://github.com/hughsk/ify-loader) and add it to your `webpack.config.json`. This adds Browserify transform compatibility to Webpack which is necessary for some plotly.js dependencies.
-
-A repo that demonstrates how to build plotly.js with Webpack can be found [here](https://github.com/plotly/plotly-webpack). In short add `ify-loader` to the `module` section in your `webpack.config.js`:
-
-```js
-...
-    module: {
-        rules: [
-            {
-                test: /\.js$/,
-                loader: 'ify-loader'
-            }
-        ]
-    },
-...
-```
-
 ---
 ## Angular CLI