diff --git a/assets/javascripts/app/app.coffee b/assets/javascripts/app/app.coffee index 2b429bd5..3993970e 100644 --- a/assets/javascripts/app/app.coffee +++ b/assets/javascripts/app/app.coffee @@ -118,7 +118,8 @@ migrateDocs: -> for slug in @settings.getDocs() when not @docs.findBy('slug', slug) needsSaving = true - doc = @disabledDocs.findBy('slug_without_version', slug) + doc = @disabledDocs.findBy('slug', 'webpack') if slug == 'webpack~2' + doc ||= @disabledDocs.findBy('slug_without_version', slug) if doc @disabledDocs.remove(doc) @docs.add(doc) diff --git a/lib/app.rb b/lib/app.rb index 51d48be6..4979c64c 100644 --- a/lib/app.rb +++ b/lib/app.rb @@ -357,7 +357,8 @@ class App < Sinatra::Application 'angular~1.4' => 'angularjs~1.4', 'angular~1.3' => 'angularjs~1.3', 'angular~1.2' => 'angularjs~1.2', - 'codeigniter~3.0' => 'codeigniter~3' + 'codeigniter~3.0' => 'codeigniter~3', + 'webpack~2' => 'webpack' } get %r{/([\w~\.%]+)(\-[\w\-]+)?(/.*)?} do |doc, type, rest| diff --git a/lib/docs/filters/webpack/entries.rb b/lib/docs/filters/webpack/entries.rb index f0531f3a..c86beadc 100644 --- a/lib/docs/filters/webpack/entries.rb +++ b/lib/docs/filters/webpack/entries.rb @@ -29,7 +29,7 @@ module Docs elsif slug.start_with?('api') css('.header[id] code').each_with_object [] do |node, entries| next if node.previous.try(:content).present? - entries << ["#{self.name}: #{node.content.sub(/\(.*\)/, '()')}", node.parent['id']] + entries << ["#{self.name.split(':').first}: #{node.content.sub(/\(.*\)/, '()')}", node.parent['id']] end else [] diff --git a/lib/docs/scrapers/webpack.rb b/lib/docs/scrapers/webpack.rb index 8b8d1e78..ed3cfaf8 100644 --- a/lib/docs/scrapers/webpack.rb +++ b/lib/docs/scrapers/webpack.rb @@ -3,10 +3,10 @@ module Docs self.name = 'webpack' self.type = 'webpack' - version '2' do - self.release = '2.6.1' + version do + self.release = '3.0.0' self.base_url = 'https://webpack.js.org/' - self.root_path = 'guides/get-started/' + self.root_path = 'guides/' self.initial_paths = %w( concepts/ guides/ @@ -23,7 +23,7 @@ module Docs html_filters.push 'webpack/clean_html', 'webpack/entries' options[:container] = '.page' - options[:trailing_slash] = true + options[:trailing_slash] = false options[:only_patterns] = [ /\Aconcepts\//, /\Aguides\//,