Merge remote-tracking branch 'upstream/master' into pr-merge

Author: richardnm-2

.circleci/config.yml

@@ -28,7 +28,7 @@ jobs:
 
   install-and-cibuild: # main cibuild using node 16 & npm 7
     docker:
-      - image: cimg/node:16.8.0
+      - image: cimg/node:16.17.1
     working_directory: ~/plotly.js
     steps:
       - checkout
@@ -52,11 +52,11 @@ jobs:
   timezone-jasmine:
     docker:
       # need '-browsers' version to test in real (xvfb-wrapped) browsers
-      - image: cimg/node:16.8.0-browsers
+      - image: cimg/node:16.17.1-browsers
     working_directory: ~/plotly.js
     steps:
       - browser-tools/install-browser-tools: &browser-versions
-          chrome-version: 93.0.4577.63
+          chrome-version: 110.0.5481.100
           install-firefox: false
           install-geckodriver: false
       - attach_workspace:
@@ -85,15 +85,15 @@ jobs:
   no-gl-jasmine:
     docker:
       # need '-browsers' version to test in real (xvfb-wrapped) browsers
-      - image: cimg/node:16.8.0-browsers
+      - image: cimg/node:16.17.1-browsers
     environment:
       # Alaska time (arbitrary timezone to test date logic)
       TZ: "America/Anchorage"
     parallelism: 12
     working_directory: ~/plotly.js
     steps:
       - browser-tools/install-browser-tools: &browser-versions
-          chrome-version: 93.0.4577.63
+          chrome-version: 110.0.5481.100
           install-firefox: false
           install-geckodriver: false
       - attach_workspace:
@@ -105,15 +105,15 @@ jobs:
   webgl-jasmine:
     docker:
       # need '-browsers' version to test in real (xvfb-wrapped) browsers
-      - image: cimg/node:16.8.0-browsers
+      - image: cimg/node:16.17.1-browsers
     environment:
       # Alaska time (arbitrary timezone to test date logic)
       TZ: "America/Anchorage"
     parallelism: 8
     working_directory: ~/plotly.js
     steps:
       - browser-tools/install-browser-tools: &browser-versions
-          chrome-version: 93.0.4577.63
+          chrome-version: 110.0.5481.100
           install-firefox: false
           install-geckodriver: false
       - attach_workspace:
@@ -125,14 +125,14 @@ jobs:
   flaky-no-gl-jasmine:
     docker:
       # need '-browsers' version to test in real (xvfb-wrapped) browsers
-      - image: cimg/node:16.8.0-browsers
+      - image: cimg/node:16.17.1-browsers
     environment:
       # Alaska time (arbitrary timezone to test date logic)
       TZ: "America/Anchorage"
     working_directory: ~/plotly.js
     steps:
       - browser-tools/install-browser-tools: &browser-versions
-          chrome-version: 93.0.4577.63
+          chrome-version: 110.0.5481.100
           install-firefox: false
           install-geckodriver: false
       - attach_workspace:
@@ -144,14 +144,14 @@ jobs:
   bundle-jasmine:
     docker:
       # need '-browsers' version to test in real (xvfb-wrapped) browsers
-      - image: cimg/node:16.8.0-browsers
+      - image: cimg/node:16.17.1-browsers
     environment:
       # Alaska time (arbitrary timezone to test date logic)
       TZ: "America/Anchorage"
     working_directory: ~/plotly.js
     steps:
       - browser-tools/install-browser-tools: &browser-versions
-          chrome-version: 93.0.4577.63
+          chrome-version: 110.0.5481.100
           install-firefox: false
           install-geckodriver: false
       - attach_workspace:
@@ -163,7 +163,7 @@ jobs:
   mathjax-firefox81:
     docker:
       # need '-browsers' version to test in real (xvfb-wrapped) browsers
-      - image: cimg/node:16.8.0-browsers
+      - image: cimg/node:16.17.1-browsers
     environment:
       # Alaska time (arbitrary timezone to test date logic)
       TZ: "America/Anchorage"
@@ -182,7 +182,7 @@ jobs:
   mathjax-firefox82:
     docker:
       # need '-browsers' version to test in real (xvfb-wrapped) browsers
-      - image: cimg/node:16.8.0-browsers
+      - image: cimg/node:16.17.1-browsers
     environment:
       # Alaska time (arbitrary timezone to test date logic)
       TZ: "America/Anchorage"
@@ -201,7 +201,7 @@ jobs:
   mathjax-firefoxLatest:
     docker:
       # need '-browsers' version to test in real (xvfb-wrapped) browsers
-      - image: cimg/node:16.8.0-browsers
+      - image: cimg/node:16.17.1-browsers
     environment:
       # Alaska time (arbitrary timezone to test date logic)
       TZ: "America/Anchorage"
@@ -255,7 +255,7 @@ jobs:
 
   test-baselines:
     docker:
-      - image: circleci/node:16.8.0
+      - image: circleci/node:16.9.0
     working_directory: ~/plotly.js
     steps:
       - attach_workspace:
@@ -269,7 +269,7 @@ jobs:
 
   test-baselines-mathjax3:
     docker:
-      - image: circleci/node:16.8.0
+      - image: circleci/node:16.9.0
     working_directory: ~/plotly.js
     steps:
       - attach_workspace:
@@ -306,7 +306,7 @@ jobs:
 
   test-exports:
     docker:
-      - image: circleci/node:16.8.0
+      - image: circleci/node:16.9.0
     working_directory: ~/plotly.js
     steps:
       - attach_workspace:
@@ -320,7 +320,7 @@ jobs:
 
   mock-validation:
     docker:
-      - image: cimg/node:16.8.0
+      - image: cimg/node:16.17.1
     working_directory: ~/plotly.js
     steps:
       - attach_workspace:
@@ -334,7 +334,7 @@ jobs:
 
   source-syntax:
     docker:
-      - image: cimg/node:16.8.0
+      - image: cimg/node:16.17.1
     working_directory: ~/plotly.js
     steps:
       - attach_workspace:
@@ -345,7 +345,7 @@ jobs:
 
   publish-dist:
     docker:
-      - image: cimg/node:16.8.0
+      - image: cimg/node:16.17.1
     working_directory: ~/plotly.js
     steps:
       - checkout
@@ -400,21 +400,18 @@ jobs:
       - run:
           name: Test plot-schema.json diff - If failed, after (npm start) you could run (npm run schema && git add test/plot-schema.json && git commit -m "update plot-schema diff")
           command: diff --unified --color dist/plot-schema.json test/plot-schema.json
+      - run:
+          name: Test plotly.min.js import using amdefine
+          command: npm run test-amdefine
       - run:
           name: Test plotly.min.js import using requirejs
           command: npm run test-requirejs
-      - run:
-          name: Test plotly bundles againt unexpected characters
-          command: npm run no-bad-char
-      - run:
-          name: Display function constructors in plotly.js bundle
-          command: npm run log-new-func
-      - run:
-          name: Test certain bundles against function constructors
-          command: npm run no-new-func
       - run:
           name: Test plotly bundles against es6
           command: npm run no-es6-dist
+      - run:
+          name: Display function constructors in all bundles
+          command: npm run no-new-func
 
 workflows:
   version: 2

.eslintignore

@@ -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

.eslintrc

@@ -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"],

.gitignore

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

BUILDING.md

@@ -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