Skip to content

Commit f75daab

Browse files
mgolmgol
authored
Core: Use named exports in src/
The `default` export is treated differently across tooling when transpiled to CommonJS - tools differ on whether `module.exports` represents the full module object or just its default export. Switch `src/` modules to named exports for tooling consistency. Fixes gh-5262 Closes gh-5292
1 parent 42e50f8 commit f75daab

File tree

136 files changed

+424
-478
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

136 files changed

+424
-478
lines changed

‎build/tasks/build.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ module.exports = function( grunt ) {
221221
// Remove the jQuery export from the entry file, we'll use our own
222222
// custom wrapper.
223223
setOverride( inputRollupOptions.input,
224-
read( inputFileName ).replace( /\n*export default jQuery;\n*/, "\n" ) );
224+
read( inputFileName ).replace( /\n*export \{ jQuery, jQuery as \$ };\n*/, "\n" ) );
225225

226226
// Replace exports/global with a noop noConflict
227227
if ( excluded.includes( "exports/global" ) ) {

‎src/ajax.js

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import jQuery from "./core.js";
2-
import document from "./var/document.js";
3-
import rnothtmlwhite from "./var/rnothtmlwhite.js";
4-
import location from "./ajax/var/location.js";
5-
import nonce from "./ajax/var/nonce.js";
6-
import rquery from "./ajax/var/rquery.js";
1+
import { jQuery } from "./core.js";
2+
import { document } from "./var/document.js";
3+
import { rnothtmlwhite } from "./var/rnothtmlwhite.js";
4+
import { location } from "./ajax/var/location.js";
5+
import { nonce } from "./ajax/var/nonce.js";
6+
import { rquery } from "./ajax/var/rquery.js";
77

88
import "./core/init.js";
99
import "./core/parseXML.js";
@@ -874,4 +874,4 @@ jQuery.ajaxPrefilter( function( s ) {
874874
}
875875
} );
876876

877-
export default jQuery;
877+
export { jQuery, jQuery as $ };

‎src/ajax/binary.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import jQuery from "../core.js";
1+
import { jQuery } from "../core.js";
22

33
import "../ajax.js";
44

‎src/ajax/jsonp.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import jQuery from "../core.js";
2-
import nonce from "./var/nonce.js";
3-
import rquery from "./var/rquery.js";
1+
import { jQuery } from "../core.js";
2+
import { nonce } from "./var/nonce.js";
3+
import { rquery } from "./var/rquery.js";
44

55
import "../ajax.js";
66

‎src/ajax/load.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import jQuery from "../core.js";
2-
import stripAndCollapse from "../core/stripAndCollapse.js";
1+
import { jQuery } from "../core.js";
2+
import { stripAndCollapse } from "../core/stripAndCollapse.js";
33

44
import "../core/parseHTML.js";
55
import "../ajax.js";

‎src/ajax/script.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import jQuery from "../core.js";
2-
import document from "../var/document.js";
1+
import { jQuery } from "../core.js";
2+
import { document } from "../var/document.js";
33

44
import "../ajax.js";
55

‎src/ajax/var/location.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export default window.location;
1+
export var location = window.location;

‎src/ajax/var/nonce.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export default { guid: Date.now() };
1+
export var nonce = { guid: Date.now() };

‎src/ajax/var/rquery.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export default ( /\?/ );
1+
export var rquery = /\?/;

‎src/ajax/xhr.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import jQuery from "../core.js";
1+
import { jQuery } from "../core.js";
22

33
import "../ajax.js";
44

‎src/attributes.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import jQuery from "./core.js";
1+
import { jQuery } from "./core.js";
22

33
import "./attributes/attr.js";
44
import "./attributes/prop.js";
55
import "./attributes/classes.js";
66
import "./attributes/val.js";
77

88
// Return jQuery for attributes-only inclusion
9-
export default jQuery;
9+
export { jQuery, jQuery as $ };

‎src/attributes/attr.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import jQuery from "../core.js";
2-
import access from "../core/access.js";
3-
import nodeName from "../core/nodeName.js";
4-
import rnothtmlwhite from "../var/rnothtmlwhite.js";
5-
import isIE from "../var/isIE.js";
1+
import { jQuery } from "../core.js";
2+
import { access } from "../core/access.js";
3+
import { nodeName } from "../core/nodeName.js";
4+
import { rnothtmlwhite } from "../var/rnothtmlwhite.js";
5+
import { isIE } from "../var/isIE.js";
66

77
import "../selector.js";
88

‎src/attributes/classes.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import jQuery from "../core.js";
2-
import stripAndCollapse from "../core/stripAndCollapse.js";
3-
import rnothtmlwhite from "../var/rnothtmlwhite.js";
1+
import { jQuery } from "../core.js";
2+
import { stripAndCollapse } from "../core/stripAndCollapse.js";
3+
import { rnothtmlwhite } from "../var/rnothtmlwhite.js";
44

55
import "../core/init.js";
66

‎src/attributes/prop.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import jQuery from "../core.js";
2-
import access from "../core/access.js";
3-
import isIE from "../var/isIE.js";
1+
import { jQuery } from "../core.js";
2+
import { access } from "../core/access.js";
3+
import { isIE } from "../var/isIE.js";
44

55
import "../selector.js";
66

‎src/attributes/val.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import jQuery from "../core.js";
2-
import isIE from "../var/isIE.js";
3-
import stripAndCollapse from "../core/stripAndCollapse.js";
4-
import nodeName from "../core/nodeName.js";
1+
import { jQuery } from "../core.js";
2+
import { isIE } from "../var/isIE.js";
3+
import { stripAndCollapse } from "../core/stripAndCollapse.js";
4+
import { nodeName } from "../core/nodeName.js";
55

66
import "../core/init.js";
77

‎src/callbacks.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import jQuery from "./core.js";
2-
import toType from "./core/toType.js";
3-
import rnothtmlwhite from "./var/rnothtmlwhite.js";
1+
import { jQuery } from "./core.js";
2+
import { toType } from "./core/toType.js";
3+
import { rnothtmlwhite } from "./var/rnothtmlwhite.js";
44

55
// Convert String-formatted options into Object-formatted ones
66
function createOptions( options ) {
@@ -227,4 +227,4 @@ jQuery.Callbacks = function( options ) {
227227
return self;
228228
};
229229

230-
export default jQuery;
230+
export { jQuery, jQuery as $ };

‎src/core.js

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
import arr from "./var/arr.js";
2-
import getProto from "./var/getProto.js";
3-
import slice from "./var/slice.js";
4-
import flat from "./var/flat.js";
5-
import push from "./var/push.js";
6-
import indexOf from "./var/indexOf.js";
7-
import class2type from "./var/class2type.js";
8-
import toString from "./var/toString.js";
9-
import hasOwn from "./var/hasOwn.js";
10-
import fnToString from "./var/fnToString.js";
11-
import ObjectFunctionString from "./var/ObjectFunctionString.js";
12-
import support from "./var/support.js";
13-
import isArrayLike from "./core/isArrayLike.js";
14-
import DOMEval from "./core/DOMEval.js";
1+
import { arr } from "./var/arr.js";
2+
import { getProto } from "./var/getProto.js";
3+
import { slice } from "./var/slice.js";
4+
import { flat } from "./var/flat.js";
5+
import { push } from "./var/push.js";
6+
import { indexOf } from "./var/indexOf.js";
7+
import { class2type } from "./var/class2type.js";
8+
import { toString } from "./var/toString.js";
9+
import { hasOwn } from "./var/hasOwn.js";
10+
import { fnToString } from "./var/fnToString.js";
11+
import { ObjectFunctionString } from "./var/ObjectFunctionString.js";
12+
import { support } from "./var/support.js";
13+
import { isArrayLike } from "./core/isArrayLike.js";
14+
import { DOMEval } from "./core/DOMEval.js";
1515

1616
var version = "@VERSION",
1717

@@ -416,4 +416,4 @@ jQuery.each( "Boolean Number String Function Array Date RegExp Object Error Symb
416416
class2type[ "[object " + name + "]" ] = name.toLowerCase();
417417
} );
418418

419-
export default jQuery;
419+
export { jQuery, jQuery as $ };

‎src/core/DOMEval.js

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import document from "../var/document.js";
1+
import { document } from "../var/document.js";
22

33
var preservedScriptAttributes = {
44
type: true,
@@ -7,7 +7,7 @@ var preservedScriptAttributes = {
77
noModule: true
88
};
99

10-
function DOMEval( code, node, doc ) {
10+
export function DOMEval( code, node, doc ) {
1111
doc = doc || document;
1212

1313
var i,
@@ -23,5 +23,3 @@ function DOMEval( code, node, doc ) {
2323
}
2424
doc.head.appendChild( script ).parentNode.removeChild( script );
2525
}
26-
27-
export default DOMEval;

‎src/core/access.js

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import jQuery from "../core.js";
2-
import toType from "../core/toType.js";
1+
import { jQuery } from "../core.js";
2+
import { toType } from "../core/toType.js";
33

44
// Multifunctional method to get and set values of a collection
55
// The value/s can optionally be executed if it's a function
6-
var access = function( elems, fn, key, value, chainable, emptyGet, raw ) {
6+
export function access( elems, fn, key, value, chainable, emptyGet, raw ) {
77
var i = 0,
88
len = elems.length,
99
bulk = key == null;
@@ -60,6 +60,4 @@ var access = function( elems, fn, key, value, chainable, emptyGet, raw ) {
6060
}
6161

6262
return len ? fn( elems[ 0 ], key ) : emptyGet;
63-
};
64-
65-
export default access;
63+
}

‎src/core/camelCase.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ function fcamelCase( _all, letter ) {
77
}
88

99
// Convert dashed to camelCase
10-
function camelCase( string ) {
10+
export function camelCase( string ) {
1111
return string.replace( rdashAlpha, fcamelCase );
1212
}
13-
14-
export default camelCase;

‎src/core/init.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// Initialize a jQuery object
2-
import jQuery from "../core.js";
3-
import document from "../var/document.js";
4-
import rsingleTag from "./var/rsingleTag.js";
5-
import isObviousHtml from "./isObviousHtml.js";
2+
import { jQuery } from "../core.js";
3+
import { document } from "../var/document.js";
4+
import { rsingleTag } from "./var/rsingleTag.js";
5+
import { isObviousHtml } from "./isObviousHtml.js";
66

77
import "../traversing/findFilter.js";
88

‎src/core/isArrayLike.js

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import toType from "./toType.js";
2-
import isWindow from "../var/isWindow.js";
1+
import { toType } from "./toType.js";
2+
import { isWindow } from "../var/isWindow.js";
33

4-
function isArrayLike( obj ) {
4+
export function isArrayLike( obj ) {
55

66
var length = !!obj && obj.length,
77
type = toType( obj );
@@ -13,5 +13,3 @@ function isArrayLike( obj ) {
1313
return type === "array" || length === 0 ||
1414
typeof length === "number" && length > 0 && ( length - 1 ) in obj;
1515
}
16-
17-
export default isArrayLike;

‎src/core/isAttached.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import jQuery from "../core.js";
2-
import documentElement from "../var/documentElement.js";
1+
import { jQuery } from "../core.js";
2+
import { documentElement } from "../var/documentElement.js";
33

44
var isAttached = function( elem ) {
55
return jQuery.contains( elem.ownerDocument, elem ) ||
@@ -16,4 +16,4 @@ if ( !documentElement.getRootNode ) {
1616
};
1717
}
1818

19-
export default isAttached;
19+
export { isAttached };

‎src/core/isObviousHtml.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
function isObviousHtml( input ) {
1+
export function isObviousHtml( input ) {
22
return input[ 0 ] === "<" &&
33
input[ input.length - 1 ] === ">" &&
44
input.length >= 3;
55
}
6-
7-
export default isObviousHtml;

‎src/core/nodeName.js

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
function nodeName( elem, name ) {
2-
1+
export function nodeName( elem, name ) {
32
return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
4-
53
}
6-
7-
export default nodeName;

‎src/core/parseHTML.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import jQuery from "../core.js";
2-
import document from "../var/document.js";
3-
import rsingleTag from "./var/rsingleTag.js";
4-
import buildFragment from "../manipulation/buildFragment.js";
5-
import isObviousHtml from "./isObviousHtml.js";
1+
import { jQuery } from "../core.js";
2+
import { document } from "../var/document.js";
3+
import { rsingleTag } from "./var/rsingleTag.js";
4+
import { buildFragment } from "../manipulation/buildFragment.js";
5+
import { isObviousHtml } from "./isObviousHtml.js";
66

77
// Argument "data" should be string of html or a TrustedHTML wrapper of obvious HTML
88
// context (optional): If specified, the fragment will be created in this context,

‎src/core/parseXML.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import jQuery from "../core.js";
1+
import { jQuery } from "../core.js";
22

33
// Cross-browser xml parsing
44
jQuery.parseXML = function( data ) {

‎src/core/ready-no-deferred.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import jQuery from "../core.js";
2-
import document from "../var/document.js";
1+
import { jQuery } from "../core.js";
2+
import { document } from "../var/document.js";
33

44
var readyCallbacks = [],
55
whenReady = function( fn ) {

‎src/core/ready.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import jQuery from "../core.js";
2-
import document from "../var/document.js";
1+
import { jQuery } from "../core.js";
2+
import { document } from "../var/document.js";
33

44
import "../core/readyException.js";
55
import "../deferred.js";

‎src/core/readyException.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import jQuery from "../core.js";
1+
import { jQuery } from "../core.js";
22

33
jQuery.readyException = function( error ) {
44
window.setTimeout( function() {

‎src/core/stripAndCollapse.js

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
import rnothtmlwhite from "../var/rnothtmlwhite.js";
1+
import { rnothtmlwhite } from "../var/rnothtmlwhite.js";
22

33
// Strip and collapse whitespace according to HTML spec
44
// https://infra.spec.whatwg.org/#strip-and-collapse-ascii-whitespace
5-
function stripAndCollapse( value ) {
5+
export function stripAndCollapse( value ) {
66
var tokens = value.match( rnothtmlwhite ) || [];
77
return tokens.join( " " );
88
}
9-
10-
export default stripAndCollapse;

‎src/core/toType.js

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import class2type from "../var/class2type.js";
2-
import toString from "../var/toString.js";
1+
import { class2type } from "../var/class2type.js";
2+
import { toString } from "../var/toString.js";
33

4-
function toType( obj ) {
4+
export function toType( obj ) {
55
if ( obj == null ) {
66
return obj + "";
77
}
@@ -10,5 +10,3 @@ function toType( obj ) {
1010
class2type[ toString.call( obj ) ] || "object" :
1111
typeof obj;
1212
}
13-
14-
export default toType;

‎src/core/var/rsingleTag.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
// rsingleTag matches a string consisting of a single HTML element with no attributes
22
// and captures the element's name
3-
export default ( /^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i );
3+
export var rsingleTag = /^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;

0 commit comments

Comments
 (0)