diff options
| author | Mike Greiling <mike@pixelcog.com> | 2016-11-03 16:38:54 -0500 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-01-10 12:30:38 -0600 |
| commit | fe964cc235ed22a5d013d5874284763b698aba7c (patch) | |
| tree | 5529dd7d9deb13d511d37f7a8fed33de15aa6d7c /config | |
| parent | 55f291e8ceae6d3d432039f72f6935c62fb2a872 (diff) | |
| download | gitlab-ce-fe964cc235ed22a5d013d5874284763b698aba7c.tar.gz | |
migrate all javascript asset bundles and require syntax
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 20 | ||||
| -rw-r--r-- | config/webpack.config.js | 21 |
2 files changed, 22 insertions, 19 deletions
diff --git a/config/application.rb b/config/application.rb index 02839dba1ed..7607c7a61b2 100644 --- a/config/application.rb +++ b/config/application.rb @@ -96,23 +96,9 @@ module Gitlab config.assets.precompile << "katex.css" config.assets.precompile << "katex.js" config.assets.precompile << "xterm/xterm.css" - config.assets.precompile << "graphs/graphs_bundle.js" - config.assets.precompile << "users/users_bundle.js" - config.assets.precompile << "network/network_bundle.js" - config.assets.precompile << "profile/profile_bundle.js" - config.assets.precompile << "protected_branches/protected_branches_bundle.js" - config.assets.precompile << "diff_notes/diff_notes_bundle.js" - config.assets.precompile << "merge_request_widget/ci_bundle.js" - config.assets.precompile << "boards/boards_bundle.js" - config.assets.precompile << "cycle_analytics/cycle_analytics_bundle.js" - config.assets.precompile << "merge_conflicts/merge_conflicts_bundle.js" - config.assets.precompile << "boards/test_utils/simulate_drag.js" - config.assets.precompile << "environments/environments_bundle.js" - config.assets.precompile << "blob_edit/blob_edit_bundle.js" - config.assets.precompile << "snippet/snippet_bundle.js" - config.assets.precompile << "terminal/terminal_bundle.js" - config.assets.precompile << "lib/utils/*.js" - config.assets.precompile << "lib/*.js" + config.assets.precompile << "lib/ace.js" + config.assets.precompile << "lib/cropper.js" + config.assets.precompile << "lib/raphael.js" config.assets.precompile << "u2f.js" config.assets.precompile << "vendor/assets/fonts/*" diff --git a/config/webpack.config.js b/config/webpack.config.js index d45638fbcbd..2fcf2e11450 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -12,9 +12,26 @@ var ROOT_PATH = path.resolve(__dirname, '..'); var DEV_SERVER_PORT = 3808; var config = { - context: ROOT_PATH, + context: path.join(ROOT_PATH, 'app/assets/javascripts'), entry: { - application: './app/assets/javascripts/webpack/application.js' + application: './application.js', + blob_edit: './blob_edit/blob_edit_bundle.js', + boards: './boards/boards_bundle.js', + boards_test: './boards/test_utils/simulate_drag.js', + cycle_analytics: './cycle_analytics/cycle_analytics_bundle.js', + diff_notes: './diff_notes/diff_notes_bundle.js', + environments: './environments/environments_bundle.js', + graphs: './graphs/graphs_bundle.js', + merge_conflicts: './merge_conflicts/merge_conflicts_bundle.js', + merge_request_widget: './merge_request_widget/ci_bundle.js', + network: './network/network_bundle.js', + profile: './profile/profile_bundle.js', + protected_branches: './protected_branches/protected_branches_bundle.js', + snippet: './snippet/snippet_bundle.js', + terminal: './terminal/terminal_bundle.js', + users: './users/users_bundle.js', + lib_chart: './lib/chart.js', + lib_d3: './lib/d3.js' }, output: { |