Skip to content

Commit ffc8f39

Browse files
committed
made plugins load in order
1 parent 8c440b0 commit ffc8f39

File tree

3 files changed

+32
-34
lines changed

3 files changed

+32
-34
lines changed

gulpfile.js

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
const concat = require('gulp-concat');
22
const dartSass = require('sass');
3+
const del = require('del');
4+
const fs = require('fs');
35
const gulpSass = require('gulp-sass');
46
const less = require('gulp-less');
57
const path = require('path');
@@ -11,20 +13,32 @@ const uglify = require('gulp-uglify');
1113
const uglifycss = require('gulp-uglifycss');
1214
const wrapper = require('@risadams/gulp-wrapper');
1315

14-
const del = require('del');
1516
const { src, dest, series, watch } = require('gulp');
1617

17-
// Tasks
18-
1918
const cleanLibs = async () => del('dist/**/*');
2019
const loadDependencies = async () => await _copyLibs();
2120
const copyDependencies = async () => src(['lib/**/*']).pipe(dest('dist/lib'));
2221
const copySrc = async () => {
22+
23+
let scripts = [
24+
'src/contrib/*.js',
25+
'src/constants.js',
26+
'src/utils.js',
27+
'src/selectize.js',
28+
'src/defaults.js',
29+
'src/selectize.jquery.js'
30+
];
31+
32+
// Add in all plugin scripts in a predictable order
33+
fs.readdirSync('src/plugins').sort().forEach((file) => {
34+
scripts.push(`src/plugins/${file}/plugin.js`);
35+
});
36+
2337
setTimeout(async () => {
2438
await _compileLess();
2539
await _compileSass();
26-
await _compileJavascript();
27-
setTimeout(async () => { await _minifyScripts(); }, 1000);
40+
await _compileJavascript(scripts);
41+
await _minifyScripts(scripts);
2842
}, 1000);
2943
};
3044
const watchFiles = async () => watch(['src/**/*.{js,css,less,scss}']).on('change', series(loadDependencies, copyDependencies, copySrc));
@@ -137,16 +151,8 @@ const _compileSass = async () => {
137151
}
138152
}
139153

140-
const _compileJavascript = async () =>
141-
src([
142-
'src/contrib/*.js',
143-
'src/constants.js',
144-
'src/utils.js',
145-
'src/selectize.js',
146-
'src/defaults.js',
147-
'src/selectize.jquery.js',
148-
'src/plugins/**/*.js',
149-
])
154+
const _compileJavascript = async (scripts) =>
155+
src(scripts)
150156
.pipe(concat('selectize.js'))
151157
.pipe(wrapper({
152158
header: amd_header,
@@ -157,16 +163,8 @@ const _compileJavascript = async () =>
157163
.pipe(replace(/@@version/g, getVersion()))
158164
.pipe(dest('dist/js'));
159165

160-
const _minifyScripts = async () =>
161-
src([
162-
'src/contrib/*.js',
163-
'src/constants.js',
164-
'src/utils.js',
165-
'src/selectize.js',
166-
'src/defaults.js',
167-
'src/selectize.jquery.js',
168-
'src/plugins/**/*.js',
169-
])
166+
const _minifyScripts = async (scripts) =>
167+
src(scripts)
170168
.pipe(concat('selectize.min.js'))
171169
.pipe(wrapper({
172170
header: amd_header,

package-lock.json

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

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
"http-server": "14.1.1",
5353
"jquery": "^3.6.1",
5454
"jshint": "^2.13.5",
55-
"less": "4.1.3",
5655
"karma": "6.4.1",
5756
"karma-chai": "^0.1.0",
5857
"karma-chrome-launcher": "^3.1.1",
@@ -64,9 +63,10 @@
6463
"karma-phantomjs-launcher": "^1.0.4",
6564
"karma-safari-launcher": "^1.0.0",
6665
"karma-sauce-launcher": "^4.3.6",
66+
"less": "4.1.3",
6767
"mocha": "9.2.2",
6868
"popper.js": "1.16.1",
69-
"sass": "1.55.0"
69+
"sass": "1.56.0"
7070
},
7171
"optionalDependencies": {
7272
"jquery-ui": "^1.13.2"

0 commit comments

Comments
 (0)