From 0d4af5293449722fe873bc1a4b462a857dbbe58e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20Go=C5=82e=CC=A8biowski-Owczarek?= Date: Wed, 17 Apr 2019 19:56:25 +0200 Subject: [PATCH] Build: Fix unresolved jQuery reference in finalPropName Also, prevent further similar breakages by changing our ESLint configuration to disallow relying on a global jQuery object in AMD modules. (cherry-picked from 874030583c9b94603de467124420e6c7a1c3c8ac) Fixes gh-4358 Closes gh-4361 --- src/.eslintrc.json | 11 ++++++++--- src/css/finalPropName.js | 5 ++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/.eslintrc.json b/src/.eslintrc.json index 2083914bd..3d0ca185a 100644 --- a/src/.eslintrc.json +++ b/src/.eslintrc.json @@ -3,7 +3,12 @@ "extends": "../.eslintrc-browser.json", - "globals": { - "jQuery": true - } + "overrides": [ + { + "files": "wrapper.js", + "globals": { + "jQuery": false + } + } + ] } diff --git a/src/css/finalPropName.js b/src/css/finalPropName.js index e5c77b0b2..352d18a27 100644 --- a/src/css/finalPropName.js +++ b/src/css/finalPropName.js @@ -1,4 +1,7 @@ -define( [ "../var/document" ], function( document ) { +define( [ + "../var/document", + "../core" +], function( document, jQuery ) { "use strict"; -- 2.39.5