Skip to content

Commit eb62c8a

Browse files
authored
Merge pull request #1878 from selectize/integrate-deps
Integrate deps
2 parents 7567643 + 517124f commit eb62c8a

File tree

9 files changed

+1372
-204
lines changed

9 files changed

+1372
-204
lines changed

Gruntfile.js

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -51,26 +51,13 @@ module.exports = function (grunt) {
5151
);
5252

5353
grunt.registerTask("build_standalone", "", function () {
54-
var files,
55-
i,
56-
n,
54+
var
5755
source,
58-
name,
5956
path,
6057
modules = [];
6158

6259
// amd definitions must be changed to be not anonymous
6360
// @see https://github.com/brianreavis/selectize.js/issues/89
64-
files = [];
65-
for (i = 0, n = files_js_dependencies.length; i < n; i++) {
66-
path = files_js_dependencies[i];
67-
name = path.match(/([^\/]+?).js$/)[1];
68-
source = grunt.file
69-
.read(path)
70-
.replace("define(factory);", "define('" + name + "', factory);");
71-
modules.push(source);
72-
}
73-
7461
path = "dist/js/selectize.js";
7562
source = grunt.file
7663
.read(path)
@@ -97,11 +84,6 @@ module.exports = function (grunt) {
9784
"src/selectize.jquery.js",
9885
];
9986

100-
var files_js_dependencies = [
101-
"node_modules/@selectize/sifter/sifter.js",
102-
"node_modules/microplugin/src/microplugin.js",
103-
];
104-
10587
var less_imports = [];
10688
var less_plugin_files = [];
10789
var scss_plugin_files = [];

package-lock.json

Lines changed: 3 additions & 156 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@
2222
"type": "git",
2323
"url": "git://github.com/selectize/selectize.js.git"
2424
},
25-
"dependencies": {
26-
"@selectize/sifter": "^0.6.2",
27-
"microplugin": "0.0.3"
28-
},
2925
"devDependencies": {
3026
"@types/jquery": "^3.5.14",
3127
"bootstrap-sass": "^3.4.3",

src/.wrapper.js

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,18 @@
1919
/*jshint curly:false */
2020
/*jshint browser:true */
2121

22-
(function(root, factory) {
23-
if (typeof define === 'function' && define.amd) {
24-
define(['jquery','sifter','microplugin'], factory);
25-
} else if (typeof module === 'object' && typeof module.exports === 'object') {
26-
module.exports = factory(require('jquery'), require('sifter'), require('microplugin'));
27-
} else {
28-
root.Selectize = factory(root.jQuery, root.Sifter, root.MicroPlugin);
29-
}
30-
}(this, function($, Sifter, MicroPlugin) {
31-
'use strict';
22+
(function (root, factory) {
23+
if (typeof define === 'function' && define.amd) {
24+
define(['jquery'], factory);
25+
} else if (typeof module === 'object' && typeof module.exports === 'object') {
26+
module.exports = factory(require('jquery'));
27+
} else {
28+
root.Selectize = factory(root.jQuery);
29+
}
30+
}(this, function ($) {
31+
'use strict';
3232

33-
@@js
33+
@@js
3434

35-
return Selectize;
35+
return Selectize;
3636
}));

0 commit comments

Comments
 (0)