require files in specific order in gulpfile

also removes filenumbers
jmoenig · Apr 16, 2018 · eec8401 · eec8401
1 parent bf32171
commit eec8401
Show file tree

Hide file tree

Showing 37 changed files with 36 additions and 40 deletions.
diff --git a/gulpfile.js b/gulpfile.js
@@ -4,8 +4,41 @@ let sourcemaps = require('gulp-sourcemaps');
 let uglify = require('gulp-uglify');
 
 let jsFiles = [
-        'src/*.js',
-        'src/morphs/*.js'
+        'src/settings.js',
+        'src/functions.js',
+        'src/retina.js',
+        'src/animations.js',
+        'src/colors.js',
+        'src/points.js',
+        'src/rectangle.js',
+        'src/node.js',
+        'src/morphs/morph.js',
+        'src/morphs/pen.js',
+        'src/morphs/colorpalette.js',
+        'src/morphs/graypalette.js',
+        'src/morphs/colorpicker.js',
+        'src/morphs/blinker.js',
+        'src/morphs/cursor.js',
+        'src/morphs/box.js',
+        'src/morphs/speechbubble.js',
+        'src/morphs/dial.js',
+        'src/morphs/circlebox.js',
+        'src/morphs/sliderbutton.js',
+        'src/morphs/slider.js',
+        'src/morphs/mousesensor.js',
+        'src/morphs/inspector.js',
+        'src/morphs/menu.js',
+        'src/morphs/string.js',
+        'src/morphs/text.js',
+        'src/morphs/trigger.js',
+        'src/morphs/menuitem.js',
+        'src/morphs/frame.js',
+        'src/morphs/scrollframe.js',
+        'src/morphs/list.js',
+        'src/morphs/stringfield.js',
+        'src/morphs/bouncer.js',
+        'src/morphs/hand.js',
+        'src/morphs/world.js',
     ],
     jsDest = 'dist/';
 
@@ -23,5 +56,5 @@ gulp.task('scripts', function () {
 gulp.task('default', ['scripts']);
 
 gulp.task('watch', function() {
-    gulp.watch(['src/*.js', 'src/**/*.js'], ['scripts'])
+    gulp.watch(['src/**/*.js'], ['scripts'])
 });
diff --git a/src/005_animations.js → src/animations.js b/src/005_animations.js → src/animations.js
diff --git a/src/006_colors.js → src/colors.js b/src/006_colors.js → src/colors.js
diff --git a/src/002_functions.js → src/functions.js b/src/002_functions.js → src/functions.js
diff --git a/src/morphic.js b/src/morphic.js
diff --git a/src/morphs/015_blinker.js → src/morphs/blinker.js b/src/morphs/015_blinker.js → src/morphs/blinker.js
diff --git a/src/morphs/034_bouncer.js → src/morphs/bouncer.js b/src/morphs/034_bouncer.js → src/morphs/bouncer.js
diff --git a/src/morphs/017_box.js → src/morphs/box.js b/src/morphs/017_box.js → src/morphs/box.js
diff --git a/src/morphs/020_circlebox.js → src/morphs/circlebox.js b/src/morphs/020_circlebox.js → src/morphs/circlebox.js
diff --git a/src/morphs/012_colorpalette.js → src/morphs/colorpalette.js b/src/morphs/012_colorpalette.js → src/morphs/colorpalette.js
diff --git a/src/morphs/014_colorpicker.js → src/morphs/colorpicker.js b/src/morphs/014_colorpicker.js → src/morphs/colorpicker.js
diff --git a/src/morphs/016_cursor.js → src/morphs/cursor.js b/src/morphs/016_cursor.js → src/morphs/cursor.js
diff --git a/src/morphs/019_dial.js → src/morphs/dial.js b/src/morphs/019_dial.js → src/morphs/dial.js
diff --git a/src/morphs/030_frame.js → src/morphs/frame.js b/src/morphs/030_frame.js → src/morphs/frame.js
diff --git a/src/morphs/013_graypalette.js → src/morphs/graypalette.js b/src/morphs/013_graypalette.js → src/morphs/graypalette.js
diff --git a/src/morphs/035_hand.js → src/morphs/hand.js b/src/morphs/035_hand.js → src/morphs/hand.js
diff --git a/src/morphs/024_inspector.js → src/morphs/inspector.js b/src/morphs/024_inspector.js → src/morphs/inspector.js
diff --git a/src/morphs/032_list.js → src/morphs/list.js b/src/morphs/032_list.js → src/morphs/list.js
diff --git a/src/morphs/025_menu.js → src/morphs/menu.js b/src/morphs/025_menu.js → src/morphs/menu.js
diff --git a/src/morphs/029_menuitem.js → src/morphs/menuitem.js b/src/morphs/029_menuitem.js → src/morphs/menuitem.js
diff --git a/src/morphs/010_morph.js → src/morphs/morph.js b/src/morphs/010_morph.js → src/morphs/morph.js
diff --git a/src/morphs/023_mousesensor.js → src/morphs/mousesensor.js b/src/morphs/023_mousesensor.js → src/morphs/mousesensor.js
diff --git a/src/morphs/011_pen.js → src/morphs/pen.js b/src/morphs/011_pen.js → src/morphs/pen.js
diff --git a/src/morphs/031_scrollframe.js → src/morphs/scrollframe.js b/src/morphs/031_scrollframe.js → src/morphs/scrollframe.js
diff --git a/src/morphs/022_slider.js → src/morphs/slider.js b/src/morphs/022_slider.js → src/morphs/slider.js
diff --git a/src/morphs/021_sliderbutton.js → src/morphs/sliderbutton.js b/src/morphs/021_sliderbutton.js → src/morphs/sliderbutton.js
diff --git a/src/morphs/018_speechbubble.js → src/morphs/speechbubble.js b/src/morphs/018_speechbubble.js → src/morphs/speechbubble.js
diff --git a/src/morphs/026_string.js → src/morphs/string.js b/src/morphs/026_string.js → src/morphs/string.js
diff --git a/src/morphs/033_stringfield.js → src/morphs/stringfield.js b/src/morphs/033_stringfield.js → src/morphs/stringfield.js
diff --git a/src/morphs/027_text.js → src/morphs/text.js b/src/morphs/027_text.js → src/morphs/text.js
diff --git a/src/morphs/028_trigger.js → src/morphs/trigger.js b/src/morphs/028_trigger.js → src/morphs/trigger.js
diff --git a/src/morphs/036_world.js → src/morphs/world.js b/src/morphs/036_world.js → src/morphs/world.js
diff --git a/src/009_node.js → src/node.js b/src/009_node.js → src/node.js
diff --git a/src/007_points.js → src/points.js b/src/007_points.js → src/points.js
diff --git a/src/008_rectangle.js → src/rectangle.js b/src/008_rectangle.js → src/rectangle.js
diff --git a/src/003_retina.js → src/retina.js b/src/003_retina.js → src/retina.js
diff --git a/src/001_settings.js → src/settings.js b/src/001_settings.js → src/settings.js