update diff method

marthacryan · marthacryan · commit a56c55a0a253 · 2025-04-14T16:07:03.000-05:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -193,27 +193,23 @@ jobs:
       - run:
           name: Check JupyterLab build artifacts
           command: |
-            # Compare all files except 'Only in' cases
+            # 1. Compare all files except 'Only in' cases
             diff -qr plotly/labextension-tmp/ plotly/labextension/ | grep -v '^Only in' > build_diff.txt || true
-
             cat build_diff.txt
 
-            # Filter out package.json from the global diff (we’ll check it separately)
+            # 2. Filter out package.json from overall diff
             grep -v 'package.json' build_diff.txt > filtered_diff.txt
-
             cat filtered_diff.txt
 
-            # Check if package.json differs
-            diff plotly/labextension/package.json plotly/labextension-tmp/package.json > package_json_diff.txt || true
-
+            # 3. Diff package.json in unified mode
+            diff -u plotly/labextension/package.json plotly/labextension-tmp/package.json > package_json_diff.txt || true
             cat package_json_diff.txt
 
-            # Allow only the "load": "static/..." line to differ
+            # 4. Filter out the line that changes ("load": "static/...js")
             grep -vE '"load": "static/.*\.js"' package_json_diff.txt > package_json_diff_filtered.txt
-
             cat package_json_diff_filtered.txt
 
-            # Check both filtered diffs
+            # 5. Final check
             if [ -s filtered_diff.txt ] || [ -s package_json_diff_filtered.txt ]; then
               echo "❌ Build artifacts differ:"
               echo "--- Unexpected diffs ---"
@@ -222,10 +218,11 @@ jobs:
               cat package_json_diff_filtered.txt
               exit 1
             else
-              echo "✅ Build artifacts match expected output (ignoring allowed hash in package.json)."
+              echo "✅ Build artifacts match expected output (ignoring known 'load' hash in package.json)."
             fi
 
 
+
   # Percy
   python_311_percy:
     docker:
