plotly
diff --git a/‎.circleci/config.yml
Lines changed: 7 additions & 7 deletions b/‎.circleci/config.yml
Lines changed: 7 additions & 7 deletions
diff --git a/‎.circleci/test.sh
Lines changed: 2 additions & 1 deletion b/‎.circleci/test.sh
Lines changed: 2 additions & 1 deletion
diff --git a/‎BUILDING.md
Lines changed: 50 additions & 22 deletions b/‎BUILDING.md
Lines changed: 50 additions & 22 deletions
@@ -10,7 +10,7 @@ version: 2.0
 jobs:
   build:
     docker:
-      - image: circleci/node:10.9.0
+      - image: circleci/node:12.13.0
     working_directory: ~/plotly.js
     steps:
       - checkout
@@ -39,7 +39,7 @@ jobs:
   test-jasmine:
     docker:
       # need '-browsers' version to test in real (xvfb-wrapped) browsers
-      - image: circleci/node:10.9.0-browsers
+      - image: circleci/node:12.13.0-browsers
     parallelism: 2
     working_directory: ~/plotly.js
     steps:
@@ -52,7 +52,7 @@ jobs:
   test-jasmine2:
     docker:
       # need '-browsers' version to test in real (xvfb-wrapped) browsers
-      - image: circleci/node:10.9.0-browsers
+      - image: circleci/node:12.13.0-browsers
     parallelism: 3
     working_directory: ~/plotly.js
     steps:
@@ -65,7 +65,7 @@ jobs:
   test-jasmine3:
     docker:
       # need '-browsers' version to test in real (xvfb-wrapped) browsers
-      - image: circleci/node:10.9.0-browsers
+      - image: circleci/node:12.13.0-browsers
     working_directory: ~/plotly.js
     steps:
       - attach_workspace:
@@ -115,7 +115,7 @@ jobs:
 
   test-syntax:
     docker:
-      - image: circleci/node:10.9.0
+      - image: circleci/node:12.13.0
     working_directory: ~/plotly.js
     steps:
       - attach_workspace:
@@ -127,7 +127,7 @@ jobs:
   test-bundle:
     docker:
       # need '-browsers' version to test in real (xvfb-wrapped) browsers
-      - image: circleci/node:10.9.0-browsers
+      - image: circleci/node:12.13.0-browsers
     working_directory: ~/plotly.js
     steps:
       - attach_workspace:
@@ -138,7 +138,7 @@ jobs:
 
   publish:
     docker:
-      - image: circleci/node:10.9.0
+      - image: circleci/node:12.13.0
     working_directory: ~/plotly.js
     steps:
       - attach_workspace:
 
@@ -75,11 +75,12 @@ case $1 in
 
     image)
         SUITE=$(find $ROOT/test/image/mocks/ -type f -printf "%f\n" | circleci tests split)
-        npm run test-image -- $SUITE --filter || EXIT_STATE=$?
+        npm run test-image -- $SUITE --filter --skip-flaky || EXIT_STATE=$?
         exit $EXIT_STATE
         ;;
 
     image2)
+        retry npm run test-image -- --just-flaky
         npm run test-export     || EXIT_STATE=$?
         exit $EXIT_STATE
         ;;
 
@@ -35,39 +35,67 @@ var Plotly = require('plotly.js');
 
 then simply run,
 
-
 ```
 browserify index.js > bundle.js
 ```
 
 ## Angular CLI
 
-Currently Angular CLI uses Webpack under the hood to bundle and build your Angular application.
-Sadly it doesn't allow you to override its Webpack config in order to add the plugin mentioned in the [Webpack](#webpack) section.
-Without this plugin your build will fail when it tries to build glslify for WebGL plots.
-
-Currently 2 solutions exists to circumvent this issue:
+Since Angular uses webpack under the hood and doesn't allow easily to change it's webpack configuration, there is some work needed using a `custom-webpack` builder to get things going.
 
-1) If you need to use WebGL plots, you can create a Webpack config from your Angular CLI project with [ng eject](https://github.com/angular/angular-cli/wiki/eject). This will allow you to follow the instructions regarding Webpack.
-2) If you don't need to use WebGL plots, you can make a custom build containing only the required modules for your plots. The clean way to do it with Angular CLI is not the method described in the [Modules](https://github.com/plotly/plotly.js/blob/master/README.md#modules) section of the README but the following:
+1. Install [`@angular-builders/custom-webpack`](https://www.npmjs.com/package/@angular-builders/custom-webpack) and [[email protected]+](https://github.com/hughsk/ify-loader)
+2. Create a new `extra-webpack.config.js` beside `angular.json`.
 
-```typescript
-// in the Component you want to create a graph
-import * as Plotly from 'plotly.js';
+> extra-webpack.config.json
+```javascript
+module.exports = {
+    module: {
+        rules: [
+            {
+                test: /\.js$/,
+                include: [
+                    path.resolve(__dirname, "node_modules/plotly.js")
+                ],
+                loader: 'ify-loader'
+            }
+        ]
+    },
+};
 ```
 
+3. Change the builder in `angular.json` to `"@angular-builders/custom-webpack:browser` and configure it correctly to use our new webpack config.
+
+> angular.json
 ```json
-// in src/tsconfig.app.json
-// List here the modules you want to import
-// this example is for scatter plots
 {
-    "compilerOptions": {
-        "paths": {
-            "plotly.js": [
-                "../node_modules/plotly.js/lib/core.js",
-                "../node_modules/plotly.js/lib/scatter.js"
-            ]
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "version": 1,
+  "newProjectRoot": "projects",
+  "projects": {
+    "MY_PROJECT_NAME": {
+      "root": "",
+      "sourceRoot": "src",
+      "projectType": "application",
+      "prefix": "app",
+      "schematics": {
+        "@schematics/angular:component": {
+          "styleext": "scss"
         }
-    }
-}
+      },
+      "architect": {
+        "build": {
+          "builder": "@angular-builders/custom-webpack:browser",
+          "options": {
+            ....
+            "customWebpackConfig": {
+              "path": "./extra-webpack.config.js",
+              "replaceDuplicatePlugins": true,
+              "mergeStrategies": {"module.rules":  "merge"}
+            }
+          }
+        }
+...
 ```
+
+It's important to set `projects.x.architect.build.builder` and `projects.x.architect.build.options.customWebpackConfig`.
+If you have more projects in your `angular.json` make sure to adjust their settings accordingly.