Skip to content

Commit 7e4e8bc

Browse files
committed
Relative paths for require
Now we can use relative paths in the calls to `require`, so those using relative builds don't have to worry about modules not being imported properly. This also makes it considerably easier in the future when we look to cut down the build sizes and have a custom builder, as we don't have to worry as much about the paths being incorrect. This fixes select2#3014 finally.
1 parent d1e8a6f commit 7e4e8bc

5 files changed

Lines changed: 21 additions & 11 deletions

File tree

dist/js/select2.full.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4200,6 +4200,7 @@ S2.define('select2/i18n/en',[],function () {
42004200

42014201
S2.define('select2/defaults',[
42024202
'jquery',
4203+
'require',
42034204
'./results',
42044205

42054206
'./selection/single',
@@ -4232,7 +4233,9 @@ S2.define('select2/defaults',[
42324233
'./dropdown/closeOnSelect',
42334234

42344235
'./i18n/en'
4235-
], function ($, ResultsList,
4236+
], function ($, require,
4237+
4238+
ResultsList,
42364239

42374240
SingleSelection, MultipleSelection, Placeholder, AllowClear,
42384241
SelectionSearch, EventRelay,
@@ -4515,8 +4518,8 @@ S2.define('select2/defaults',[
45154518
}
45164519

45174520
this.defaults = {
4518-
amdBase: 'select2/',
4519-
amdLanguageBase: 'select2/i18n/',
4521+
amdBase: './',
4522+
amdLanguageBase: './i18n/',
45204523
closeOnSelect: true,
45214524
debug: false,
45224525
escapeMarkup: Utils.escapeMarkup,

dist/js/select2.full.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/js/select2.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4200,6 +4200,7 @@ S2.define('select2/i18n/en',[],function () {
42004200

42014201
S2.define('select2/defaults',[
42024202
'jquery',
4203+
'require',
42034204
'./results',
42044205

42054206
'./selection/single',
@@ -4232,7 +4233,9 @@ S2.define('select2/defaults',[
42324233
'./dropdown/closeOnSelect',
42334234

42344235
'./i18n/en'
4235-
], function ($, ResultsList,
4236+
], function ($, require,
4237+
4238+
ResultsList,
42364239

42374240
SingleSelection, MultipleSelection, Placeholder, AllowClear,
42384241
SelectionSearch, EventRelay,
@@ -4515,8 +4518,8 @@ S2.define('select2/defaults',[
45154518
}
45164519

45174520
this.defaults = {
4518-
amdBase: 'select2/',
4519-
amdLanguageBase: 'select2/i18n/',
4521+
amdBase: './',
4522+
amdLanguageBase: './i18n/',
45204523
closeOnSelect: true,
45214524
debug: false,
45224525
escapeMarkup: Utils.escapeMarkup,

dist/js/select2.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/js/select2/defaults.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
define([
22
'jquery',
3+
'require',
4+
35
'./results',
46

57
'./selection/single',
@@ -32,7 +34,9 @@ define([
3234
'./dropdown/closeOnSelect',
3335

3436
'./i18n/en'
35-
], function ($, ResultsList,
37+
], function ($, require,
38+
39+
ResultsList,
3640

3741
SingleSelection, MultipleSelection, Placeholder, AllowClear,
3842
SelectionSearch, EventRelay,
@@ -315,8 +319,8 @@ define([
315319
}
316320

317321
this.defaults = {
318-
amdBase: 'select2/',
319-
amdLanguageBase: 'select2/i18n/',
322+
amdBase: './',
323+
amdLanguageBase: './i18n/',
320324
closeOnSelect: true,
321325
debug: false,
322326
escapeMarkup: Utils.escapeMarkup,

0 commit comments

Comments
 (0)