From eec8401fe4641b3dc539c17ed8f7b044c5dc889f Mon Sep 17 00:00:00 2001 From: Menasheh Peromsik Date: Mon, 16 Apr 2018 16:57:44 -0400 Subject: [PATCH] require files in specific order in gulpfile also removes filenumbers --- gulpfile.js | 39 +++++++++++++++++-- src/{005_animations.js => animations.js} | 0 src/{006_colors.js => colors.js} | 0 src/{002_functions.js => functions.js} | 0 src/morphic.js | 37 ------------------ src/morphs/{015_blinker.js => blinker.js} | 0 src/morphs/{034_bouncer.js => bouncer.js} | 0 src/morphs/{017_box.js => box.js} | 0 src/morphs/{020_circlebox.js => circlebox.js} | 0 .../{012_colorpalette.js => colorpalette.js} | 0 .../{014_colorpicker.js => colorpicker.js} | 0 src/morphs/{016_cursor.js => cursor.js} | 0 src/morphs/{019_dial.js => dial.js} | 0 src/morphs/{030_frame.js => frame.js} | 0 .../{013_graypalette.js => graypalette.js} | 0 src/morphs/{035_hand.js => hand.js} | 0 src/morphs/{024_inspector.js => inspector.js} | 0 src/morphs/{032_list.js => list.js} | 0 src/morphs/{025_menu.js => menu.js} | 0 src/morphs/{029_menuitem.js => menuitem.js} | 0 src/morphs/{010_morph.js => morph.js} | 0 .../{023_mousesensor.js => mousesensor.js} | 0 src/morphs/{011_pen.js => pen.js} | 0 .../{031_scrollframe.js => scrollframe.js} | 0 src/morphs/{022_slider.js => slider.js} | 0 .../{021_sliderbutton.js => sliderbutton.js} | 0 .../{018_speechbubble.js => speechbubble.js} | 0 src/morphs/{026_string.js => string.js} | 0 .../{033_stringfield.js => stringfield.js} | 0 src/morphs/{027_text.js => text.js} | 0 src/morphs/{028_trigger.js => trigger.js} | 0 src/morphs/{036_world.js => world.js} | 0 src/{009_node.js => node.js} | 0 src/{007_points.js => points.js} | 0 src/{008_rectangle.js => rectangle.js} | 0 src/{003_retina.js => retina.js} | 0 src/{001_settings.js => settings.js} | 0 37 files changed, 36 insertions(+), 40 deletions(-) rename src/{005_animations.js => animations.js} (100%) rename src/{006_colors.js => colors.js} (100%) rename src/{002_functions.js => functions.js} (100%) delete mode 100644 src/morphic.js rename src/morphs/{015_blinker.js => blinker.js} (100%) rename src/morphs/{034_bouncer.js => bouncer.js} (100%) rename src/morphs/{017_box.js => box.js} (100%) rename src/morphs/{020_circlebox.js => circlebox.js} (100%) rename src/morphs/{012_colorpalette.js => colorpalette.js} (100%) rename src/morphs/{014_colorpicker.js => colorpicker.js} (100%) rename src/morphs/{016_cursor.js => cursor.js} (100%) rename src/morphs/{019_dial.js => dial.js} (100%) rename src/morphs/{030_frame.js => frame.js} (100%) rename src/morphs/{013_graypalette.js => graypalette.js} (100%) rename src/morphs/{035_hand.js => hand.js} (100%) rename src/morphs/{024_inspector.js => inspector.js} (100%) rename src/morphs/{032_list.js => list.js} (100%) rename src/morphs/{025_menu.js => menu.js} (100%) rename src/morphs/{029_menuitem.js => menuitem.js} (100%) rename src/morphs/{010_morph.js => morph.js} (100%) rename src/morphs/{023_mousesensor.js => mousesensor.js} (100%) rename src/morphs/{011_pen.js => pen.js} (100%) rename src/morphs/{031_scrollframe.js => scrollframe.js} (100%) rename src/morphs/{022_slider.js => slider.js} (100%) rename src/morphs/{021_sliderbutton.js => sliderbutton.js} (100%) rename src/morphs/{018_speechbubble.js => speechbubble.js} (100%) rename src/morphs/{026_string.js => string.js} (100%) rename src/morphs/{033_stringfield.js => stringfield.js} (100%) rename src/morphs/{027_text.js => text.js} (100%) rename src/morphs/{028_trigger.js => trigger.js} (100%) rename src/morphs/{036_world.js => world.js} (100%) rename src/{009_node.js => node.js} (100%) rename src/{007_points.js => points.js} (100%) rename src/{008_rectangle.js => rectangle.js} (100%) rename src/{003_retina.js => retina.js} (100%) rename src/{001_settings.js => settings.js} (100%) diff --git a/gulpfile.js b/gulpfile.js index 660bffb..f18f532 100644 --- 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 b/src/animations.js similarity index 100% rename from src/005_animations.js rename to src/animations.js diff --git a/src/006_colors.js b/src/colors.js similarity index 100% rename from src/006_colors.js rename to src/colors.js diff --git a/src/002_functions.js b/src/functions.js similarity index 100% rename from src/002_functions.js rename to src/functions.js diff --git a/src/morphic.js b/src/morphic.js deleted file mode 100644 index 8bf7674..0000000 --- a/src/morphic.js +++ /dev/null @@ -1,37 +0,0 @@ -/* requires: -001_settings.js -002_functions.js -003_retina.js -005_animations.js -006_colors.js -007_points.js -008_rectangle.js -009_node.js -010_morph.js -011_pen.js -012_colorpalette.js -013_graypalette.js -014_colorpicker.js -015_blinker.js -016_cursor.js -017_box.js -018_speechbubble.js -019_dial.js -020_circlebox.js -021_sliderbutton.js -022_slider.js -023_mousesensor.js -024_inspector.js -025_menu.js -026_string.js -027_text.js -028_trigger.js -029_menuitem.js -030_frame.js -031_scrollframe.js -032_list.js -033_stringfield.js -034_bouncer.js -035_hand.js -036_world.js -*/ diff --git a/src/morphs/015_blinker.js b/src/morphs/blinker.js similarity index 100% rename from src/morphs/015_blinker.js rename to src/morphs/blinker.js diff --git a/src/morphs/034_bouncer.js b/src/morphs/bouncer.js similarity index 100% rename from src/morphs/034_bouncer.js rename to src/morphs/bouncer.js diff --git a/src/morphs/017_box.js b/src/morphs/box.js similarity index 100% rename from src/morphs/017_box.js rename to src/morphs/box.js diff --git a/src/morphs/020_circlebox.js b/src/morphs/circlebox.js similarity index 100% rename from src/morphs/020_circlebox.js rename to src/morphs/circlebox.js diff --git a/src/morphs/012_colorpalette.js b/src/morphs/colorpalette.js similarity index 100% rename from src/morphs/012_colorpalette.js rename to src/morphs/colorpalette.js diff --git a/src/morphs/014_colorpicker.js b/src/morphs/colorpicker.js similarity index 100% rename from src/morphs/014_colorpicker.js rename to src/morphs/colorpicker.js diff --git a/src/morphs/016_cursor.js b/src/morphs/cursor.js similarity index 100% rename from src/morphs/016_cursor.js rename to src/morphs/cursor.js diff --git a/src/morphs/019_dial.js b/src/morphs/dial.js similarity index 100% rename from src/morphs/019_dial.js rename to src/morphs/dial.js diff --git a/src/morphs/030_frame.js b/src/morphs/frame.js similarity index 100% rename from src/morphs/030_frame.js rename to src/morphs/frame.js diff --git a/src/morphs/013_graypalette.js b/src/morphs/graypalette.js similarity index 100% rename from src/morphs/013_graypalette.js rename to src/morphs/graypalette.js diff --git a/src/morphs/035_hand.js b/src/morphs/hand.js similarity index 100% rename from src/morphs/035_hand.js rename to src/morphs/hand.js diff --git a/src/morphs/024_inspector.js b/src/morphs/inspector.js similarity index 100% rename from src/morphs/024_inspector.js rename to src/morphs/inspector.js diff --git a/src/morphs/032_list.js b/src/morphs/list.js similarity index 100% rename from src/morphs/032_list.js rename to src/morphs/list.js diff --git a/src/morphs/025_menu.js b/src/morphs/menu.js similarity index 100% rename from src/morphs/025_menu.js rename to src/morphs/menu.js diff --git a/src/morphs/029_menuitem.js b/src/morphs/menuitem.js similarity index 100% rename from src/morphs/029_menuitem.js rename to src/morphs/menuitem.js diff --git a/src/morphs/010_morph.js b/src/morphs/morph.js similarity index 100% rename from src/morphs/010_morph.js rename to src/morphs/morph.js diff --git a/src/morphs/023_mousesensor.js b/src/morphs/mousesensor.js similarity index 100% rename from src/morphs/023_mousesensor.js rename to src/morphs/mousesensor.js diff --git a/src/morphs/011_pen.js b/src/morphs/pen.js similarity index 100% rename from src/morphs/011_pen.js rename to src/morphs/pen.js diff --git a/src/morphs/031_scrollframe.js b/src/morphs/scrollframe.js similarity index 100% rename from src/morphs/031_scrollframe.js rename to src/morphs/scrollframe.js diff --git a/src/morphs/022_slider.js b/src/morphs/slider.js similarity index 100% rename from src/morphs/022_slider.js rename to src/morphs/slider.js diff --git a/src/morphs/021_sliderbutton.js b/src/morphs/sliderbutton.js similarity index 100% rename from src/morphs/021_sliderbutton.js rename to src/morphs/sliderbutton.js diff --git a/src/morphs/018_speechbubble.js b/src/morphs/speechbubble.js similarity index 100% rename from src/morphs/018_speechbubble.js rename to src/morphs/speechbubble.js diff --git a/src/morphs/026_string.js b/src/morphs/string.js similarity index 100% rename from src/morphs/026_string.js rename to src/morphs/string.js diff --git a/src/morphs/033_stringfield.js b/src/morphs/stringfield.js similarity index 100% rename from src/morphs/033_stringfield.js rename to src/morphs/stringfield.js diff --git a/src/morphs/027_text.js b/src/morphs/text.js similarity index 100% rename from src/morphs/027_text.js rename to src/morphs/text.js diff --git a/src/morphs/028_trigger.js b/src/morphs/trigger.js similarity index 100% rename from src/morphs/028_trigger.js rename to src/morphs/trigger.js diff --git a/src/morphs/036_world.js b/src/morphs/world.js similarity index 100% rename from src/morphs/036_world.js rename to src/morphs/world.js diff --git a/src/009_node.js b/src/node.js similarity index 100% rename from src/009_node.js rename to src/node.js diff --git a/src/007_points.js b/src/points.js similarity index 100% rename from src/007_points.js rename to src/points.js diff --git a/src/008_rectangle.js b/src/rectangle.js similarity index 100% rename from src/008_rectangle.js rename to src/rectangle.js diff --git a/src/003_retina.js b/src/retina.js similarity index 100% rename from src/003_retina.js rename to src/retina.js diff --git a/src/001_settings.js b/src/settings.js similarity index 100% rename from src/001_settings.js rename to src/settings.js