Merge pull request #7229 from plotly/drop-amd-header

Drop AMD support from bundle header

Author: archmoj

.circleci/config.yml

@@ -464,12 +464,6 @@ 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
 
   test-stackgl-bundle:
     docker:

draftlogs/7229_remove.md

@@ -0,0 +1 @@
+ - Drop AMD support from bundle header [[#7229](https://github.com/plotly/plotly.js/pull/7229)]

package.json

@@ -47,8 +47,6 @@
     "test-export": "node test/image/export_test.js",
     "test-syntax": "node tasks/test_syntax.js && npm run find-strings -- --no-output",
     "test-bundle": "node tasks/test_bundle.js",
-    "test-amdefine": "node tasks/test_amdefine.js",
-    "test-requirejs": "node tasks/test_requirejs.js",
     "test-plain-obj": "node tasks/test_plain_obj.mjs",
     "test": "npm run test-jasmine -- --nowatch && npm run test-bundle && npm run test-image && npm run test-export && npm run test-syntax && npm run lint",
     "b64": "python3 test/image/generate_b64_mocks.py && node devtools/test_dashboard/server.mjs",

tasks/test_amdefine.js

@@ -56,9 +56,7 @@ function addWrapper(path){
         [
             '(',
             ' function(root, factory) {',
-            '  if (typeof define === "function" && define.amd) {',
-            '   define(factory);',
-            '  } else if (typeof module === "object" && module.exports) {',
+            '  if (typeof module === "object" && module.exports) {',
             '   module.exports = factory();',
             '  } else {',
             '   root.moduleName = factory();',
@@ -73,9 +71,7 @@ function addWrapper(path){
         path,
         [
             '',
-            'if (!(typeof define === "function" && define.amd)) {',
-            ' window.Plotly = Plotly;',
-            '}',
+            'window.Plotly = Plotly;',
             'return Plotly;',
             '}));',
         ].join('\n'),