diff --git a/lib/bootstrap.js b/lib/bootstrap.js index 4c0f0831..6d14a12b 100644 --- a/lib/bootstrap.js +++ b/lib/bootstrap.js @@ -9,7 +9,7 @@ require('protoblast')(true); /** * Define global constants and require methods */ -require('./init_scripts/constants'); +require('./scripts/create_constants'); /** * Alchemy's Base class (from which all other classes inherit) @@ -24,7 +24,7 @@ requireCorePath('core', 'client_base'); /** * Load the stages classes */ -requireCorePath('core', 'stages.js'); +requireCorePath('core', 'stage.js'); /** * Define the Stages instance @@ -40,6 +40,6 @@ DEFINE('STAGES', new Classes.Alchemy.Stages.Stage('root')); /** * Start the stages script */ -requireCorePath('init_scripts', 'stages.js'); +requireCorePath('scripts', 'create_stages.js'); module.exports = STAGES; \ No newline at end of file diff --git a/lib/core/routing.js b/lib/core/prefix.js similarity index 100% rename from lib/core/routing.js rename to lib/core/prefix.js diff --git a/lib/core/stages.js b/lib/core/stage.js similarity index 100% rename from lib/core/stages.js rename to lib/core/stage.js diff --git a/lib/init_scripts/constants.js b/lib/scripts/create_constants.js similarity index 100% rename from lib/init_scripts/constants.js rename to lib/scripts/create_constants.js diff --git a/lib/init_scripts/languages.js b/lib/scripts/create_languages.js similarity index 100% rename from lib/init_scripts/languages.js rename to lib/scripts/create_languages.js diff --git a/lib/init_scripts/settings.js b/lib/scripts/create_settings.js similarity index 100% rename from lib/init_scripts/settings.js rename to lib/scripts/create_settings.js diff --git a/lib/init_scripts/stages.js b/lib/scripts/create_stages.js similarity index 100% rename from lib/init_scripts/stages.js rename to lib/scripts/create_stages.js diff --git a/lib/init_scripts/alchemy.js b/lib/scripts/init_alchemy.js similarity index 100% rename from lib/init_scripts/alchemy.js rename to lib/scripts/init_alchemy.js diff --git a/lib/init_scripts/preload_modules.js b/lib/scripts/preload_modules.js similarity index 100% rename from lib/init_scripts/preload_modules.js rename to lib/scripts/preload_modules.js diff --git a/lib/init_scripts/devwatch.js b/lib/scripts/setup_devwatch.js similarity index 100% rename from lib/init_scripts/devwatch.js rename to lib/scripts/setup_devwatch.js diff --git a/lib/stages/00-load_core.js b/lib/stages/00-load_core.js index 293a5ddf..7801f270 100644 --- a/lib/stages/00-load_core.js +++ b/lib/stages/00-load_core.js @@ -29,7 +29,7 @@ const init_settings = load_core.createStage('init_settings', () => { /** * Load the actual settings */ - requireCorePath('init_scripts', 'settings'); + requireCorePath('scripts', 'create_settings'); }); /** @@ -50,7 +50,7 @@ const init_alchemy = load_core.createStage('init_alchemy', () => { /** * Load the actual settings */ - requireCorePath('init_scripts', 'alchemy'); + requireCorePath('scripts', 'init_alchemy'); /** * Require basic functions @@ -76,7 +76,7 @@ const init_languages = load_core.createStage('init_languages', () => { /** * Get all the languages by their locale */ - requireCorePath('init_scripts', 'languages'); + requireCorePath('scripts', 'create_languages'); }); /** @@ -92,7 +92,7 @@ const preload_modules = load_core.createStage('preload_modules', () => { /** * Pre-load basic requirements */ - requireCorePath('init_scripts', 'preload_modules'); + requireCorePath('scripts', 'preload_modules'); }); /** @@ -108,7 +108,7 @@ const devwatch = load_core.createStage('devwatch', () => { /** * Set up file change watchers for development */ - requireCorePath('init_scripts', 'devwatch'); + requireCorePath('scripts', 'setup_devwatch'); }); /** @@ -272,9 +272,9 @@ const core_classes = load_core.createStage('core_classes', () => { alchemy.hawkejs.load(resolveCorePath('class', 'schema_client'), CLIENT_HAWKEJS_OPTIONS); /** - * Set up routing functions + * Set up prefixes */ - alchemy.useOnce(resolveCorePath('core', 'routing')); + alchemy.useOnce(resolveCorePath('core', 'prefix')); /** * Set up middleware functions