decidim 0.4.3 → 0.4.4

data/decidim-results/spec/features/explore_results_spec.rb

@@ -85,7 +85,7 @@ describe "Explore results", type: :feature do
   end
 
   context "show" do
-    let(:path) { decidim_results.result_path(id: result.id, participatory_process_id: participatory_process.id, feature_id: feature.id) }
+    let(:path) { resource_locator(result).path }
     let(:results_count) { 1 }
     let(:result) { results.first }
 

data/decidim-results/spec/forms/result_form_spec.rb

@@ -61,6 +61,12 @@ describe Decidim::Results::Admin::ResultForm do
     it { is_expected.not_to be_valid }
   end
 
+  it "properly maps category id from model" do
+    result = create(:result, feature: current_feature, category: category)
+
+    expect(described_class.from_model(result).decidim_category_id).to eq(category_id)
+  end
+
   context "with proposals" do
     let(:proposals_feature) { create :feature, manifest_name: :proposals, participatory_process: participatory_process }
     let!(:proposal) { create :proposal, feature: proposals_feature }

data/decidim-results/spec/shared/manage_results_examples.rb

@@ -35,7 +35,7 @@ RSpec.shared_examples "manage results" do
       end
 
       within_window @new_window do
-        expect(current_path).to eq decidim_results.result_path(id: result.id, participatory_process_id: participatory_process.id, feature_id: current_feature.id)
+        expect(current_path).to eq resource_locator(result).path
         expect(page).to have_content(translated(result.title))
       end
     end

data/decidim-surveys/decidim-surveys.gemspec

@@ -19,4 +19,5 @@ Gem::Specification.new do |s|
   s.add_dependency "jquery-tmpl-rails", "~> 1.1.0"
 
   s.add_development_dependency "decidim-dev", Decidim.version
+  s.add_development_dependency "decidim-admin", Decidim.version
 end

data/decidim-surveys/lib/decidim/surveys/feature.rb

@@ -67,35 +67,31 @@ Decidim.register_feature(:surveys) do |feature|
     exports.serializer Decidim::Surveys::SurveyUserAnswersSerializer
   end
 
-  feature.seeds do
-    Decidim::ParticipatoryProcess.find_each do |process|
-      next unless process.steps.any?
-
-      feature = Decidim::Feature.create!(
-        name: Decidim::Features::Namer.new(process.organization.available_locales, :surveys).i18n_name,
-        manifest_name: :surveys,
-        published_at: Time.current,
-        participatory_process: process
-      )
+  feature.seeds do |process|
+    feature = Decidim::Feature.create!(
+      name: Decidim::Features::Namer.new(process.organization.available_locales, :surveys).i18n_name,
+      manifest_name: :surveys,
+      published_at: Time.current,
+      participatory_process: process
+    )
+
+    survey = Decidim::Surveys::Survey.create!(
+      feature: feature,
+      title: Decidim::Faker::Localized.paragraph,
+      description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+        Decidim::Faker::Localized.paragraph(3)
+      end,
+      tos: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+        Decidim::Faker::Localized.paragraph(2)
+      end
+    )
 
-      survey = Decidim::Surveys::Survey.create!(
-        feature: feature,
-        title: Decidim::Faker::Localized.paragraph,
-        description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-          Decidim::Faker::Localized.paragraph(3)
-        end,
-        tos: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-          Decidim::Faker::Localized.paragraph(2)
-        end
+    3.times do
+      Decidim::Surveys::SurveyQuestion.create!(
+        survey: survey,
+        body: Decidim::Faker::Localized.paragraph,
+        question_type: "short_answer"
       )
-
-      3.times do
-        Decidim::Surveys::SurveyQuestion.create!(
-          survey: survey,
-          body: Decidim::Faker::Localized.paragraph,
-          question_type: "short_answer"
-        )
-      end
     end
   end
 end

data/decidim-system/db/seeds.rb

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 
 if !Rails.env.production? || ENV["SEED"]
-  Decidim::System::Admin.create!(
-    email: "system@example.org",
+  Decidim::System::Admin.find_or_initialize_by(email: "system@example.org").update!(
     password: "decidim123456",
     password_confirmation: "decidim123456"
   )

data/decidim-system/spec/commands/decidim/system/create_default_pages_spec.rb

@@ -15,7 +15,7 @@ module Decidim
       end
 
       it "sets the content with each locale" do
-        I18n.available_locales = [:en, :ca]
+        allow(Decidim).to receive(:available_locales).and_return [:en, :ca]
 
         subject
 

data/docs/features_and_components.md

@@ -18,17 +18,17 @@ There's a DSL available to describe all this:
 # :my_feature is the unique name of the feature that will be globally registered.
 Decidim.register_feature(:my_feature) do |feature|
   # The user will be redirected to the feature's engine when accessing it through
-  # the public page of a participatory process. A feature's engine is isolated 
-  # from the outside so it can deal with its own dependencies without having to 
+  # the public page of a participatory process. A feature's engine is isolated
+  # from the outside so it can deal with its own dependencies without having to
   # know its render path or its parent resources.
   feature.engine = MyFeature::Engine
 
   # A component's admin engine will get rendered on the admin panel and follows
-  # the same principles as the engine. It's isolated from the outside and 
+  # the same principles as the engine. It's isolated from the outside and
   # doesn't care about external dependencies. It only needs to care about its
   # underlying `feature`.
   feature.admin_engine = MyFeature::AdminEngine
-    
+
   # Feature hooks get called whenever relevant lifecycle events happen, like
   # adding a new feature o destroying it. You always get passed the instance
   # so you can act on it. Creating or destroying a comoponent is transactional
@@ -41,7 +41,7 @@ Decidim.register_feature(:my_feature) do |feature|
   end
 
   # Export definitions allow features to declare any number of exportable files.
-  # 
+  #
   # An export definition needs a unique name, a collection, and a Serializer. If
   # no serializer is provided, a default, naive one will be used.
   #
@@ -57,4 +57,4 @@ Decidim.register_feature(:my_feature) do |feature|
 end
 ```
 
-Every model in a feature doesn't have to (and should not) know about its parent participatory process, but instead should be scoped to the features. 
+Every model in a feature doesn't have to (and should not) know about its parent participatory process, but instead should be scoped to the features.

data/docs/getting_started.md

@@ -142,4 +142,4 @@ $ bin/rails decidim:check_locales
 ```
 
 Be aware that this task might not be able to detect everything, so make sure you
-also manually check your application before uprading.
+also manually check your application before upgrading.

data/docs/how_to_create_a_plugin.md

@@ -125,8 +125,8 @@
         # Register some stat number to the application
       end
 
-      feature.seeds do
-        # Add some seeds for this feature
+      feature.seeds do |process|
+        # Define seeds for a specific participatory process
       end
     end
     ```

data/docs/social_providers.md

@@ -19,7 +19,7 @@ If you want to enable sign up through social providers like Facebook you will ne
 1. Navigate to [Twitter Developers Page](https://dev.twitter.com/)
 2. Follow the "My apps" link.
 3. Click the "Create New App" button.
-4. Fill in the `Name`, `Description` fields. 
+4. Fill in the `Name`, `Description` fields.
 5. Fill in the `Website` and `Callback URL` fields with the same value. If you are working on a development app you need to use `http://127.0.0.1:3000/` instead of `http://localhost:3000/`.
 5. Check the 'Developer Agreement' checkbox and click the 'Create your Twitter application' button.
 6. Navigate to the "Keys and Access Tokens" tab and copy the API_KEY and API_SECRET.
@@ -38,4 +38,4 @@ If you want to enable sign up through social providers like Facebook you will ne
 8. Click on `Credentials` tab and click on "Create credentials" button. Select `OAuth client ID`.
 9. Select `Web applications`. Fill in the `Authorized Javascript origins` with your url. Then fill in the `Authorized redirect URIs` with your url and append the path `/users/auth/google_oauth2/callback`.
 10. Copy the CLIENT_ID AND CLIENT_SECRET
-11. Paste credentials in `config/secrets.yml`. Ensure the `enabled` attribute is `true`.
+11. Paste credentials in `config/secrets.yml`. Ensure the `enabled` attribute is `true`.

data/lib/generators/decidim/app_generator.rb

@@ -90,12 +90,6 @@ module Decidim
         end
       end
 
-      def set_locales
-        inject_into_file "config/application.rb", after: "class Application < Rails::Application" do
-          "\n    config.i18n.available_locales = Decidim.available_locales\n    config.i18n.default_locale = Decidim.default_locale"
-        end
-      end
-
       def remove_default_error_pages
         remove_file "public/404.html"
         remove_file "public/500.html"

data/lib/generators/decidim/docker_generator.rb

@@ -38,7 +38,7 @@ module Decidim
 
           run "rails generate decidim:demo"
           run "docker-compose build"
-          run "docker-compose run --rm app rake db:drop db:create db:migrate db:setup"
+          run "docker-compose run --rm app rails db:drop db:create db:migrate db:setup"
         end
       end
 

data/lib/generators/decidim/install_generator.rb

@@ -24,7 +24,7 @@ module Decidim
       end
 
       def copy_migrations
-        rake "railties:install:migrations"
+        rails_command "railties:install:migrations"
         recreate_db if options[:recreate_db]
       end
 
@@ -111,10 +111,10 @@ module Decidim
       private
 
       def recreate_db
-        rake "db:environment:set db:drop" unless ENV["CI"]
-        rake "db:create"
-        rake "db:migrate"
-        rake "db:test:prepare"
+        rails_command "db:environment:set db:drop" unless ENV["CI"]
+        rails_command "db:create"
+        rails_command "db:migrate"
+        rails_command "db:test:prepare"
       end
 
       def scss_variables

data/lib/generators/decidim/templates/README.md.erb

@@ -13,7 +13,7 @@ An opinionated guide to deploy this app to Heroku can be found at [https://githu
 You will need to do some steps before having the app working properly once you've deployed it:
 
 1. Open a Rails console in the server: `bundle exec rails console`
-2. Create a System Admin user: 
+2. Create a System Admin user:
 ```ruby
 user = Decidim::System::Admin.new(email: <email>, password: <password>, password_confirmation: <password>)
 user.save!

data/lib/generators/decidim/templates/database.yml.erb

@@ -23,7 +23,7 @@ default: &default
   host: <%%= ENV.fetch("DATABASE_HOST") { "localhost" } %>
   username: <%%= ENV.fetch("DATABASE_USERNAME") { "" } %>
   password: <%%= ENV.fetch("DATABASE_PASSWORD") { "" } %>
-  
+
 development:
   <<: *default
   database: <%%= ENV.fetch("DATABASE_NAME") { "<%= app_name %>_development" } %>

data/lib/generators/decidim/templates/initializer.rb

@@ -7,7 +7,7 @@ Decidim.configure do |config|
   config.authorization_handlers = [ExampleAuthorizationHandler]
 
   # Uncomment this lines to set your preferred locales
-  # config.available_locales = %i{en ca es}
+  # config.available_locales = [:en, :ca, :es]
 
   # Geocoder configuration
   # config.geocoder = {
@@ -28,3 +28,6 @@ Decidim.configure do |config|
   # The number of reports which an object can receive before hiding it
   # config.max_reports_before_hiding = 3
 end
+
+Rails.application.config.i18n.available_locales = Decidim.available_locales
+Rails.application.config.i18n.default_locale = Decidim.default_locale

data/package-lock.json

@@ -1,5 +1,6 @@
 {
   "name": "decidim",
+  "version": "0.4.4",
   "lockfileVersion": 1,
   "dependencies": {
     "@types/async": {
@@ -81,15 +82,15 @@
       "optional": true
     },
     "@types/jest": {
-      "version": "20.0.4",
-      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-20.0.4.tgz",
-      "integrity": "sha512-peWdNw8LgPMFTvTOX+VZN0R45HXnVObxdd/CkhHjXZwrjfIn/B6utU6jLwYTYf+AwWIprxzrKLEDKzSEgl09Rw==",
+      "version": "20.0.5",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-20.0.5.tgz",
+      "integrity": "sha512-/cqO0q7Eq+lzmnE/7dHParw2kYQj0uCvcKAdk/aF5Z2VZpxNSKS+FhKcCkgr/3IhEpl9BN32Hmd6gEI7VwdEsg==",
       "dev": true
     },
     "@types/jquery": {
-      "version": "3.2.9",
-      "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.2.9.tgz",
-      "integrity": "sha512-AmYGadmTv+Xh6re2CH5ruyvV3znvtJbhxyT00JQAGFP2U+xgqhf+C2xfjdP/GgK5d9YmSif/UYs2ssMl4gW6fw==",
+      "version": "3.2.10",
+      "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.2.10.tgz",
+      "integrity": "sha512-VtD/+VgsQMY+rmibce1HhXeF47eFkbv/D+7BmQdl8yu0Wo2LW1yV69cAPKhFHdW2kmTi9W8nl2GNBz2WQoGFag==",
       "dev": true
     },
     "@types/node": {
@@ -99,9 +100,9 @@
       "dev": true
     },
     "@types/react": {
-      "version": "15.0.38",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-15.0.38.tgz",
-      "integrity": "sha512-CkRB27L/kMDu7K20U0V7BwYK9/kPd9Im6Jlxv2vAEolYBvQy6JrSpPJsbZXtOk4MoDUomkct8Q7PNBUSLd0fmg==",
+      "version": "16.0.0",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-16.0.0.tgz",
+      "integrity": "sha512-lmu8zYXNhkZrIAgFgJK2/tGNXfdL//tKbtDEeph+doEAsBm+C2vnD+mAkR17bumu9K8ivYufySkkX4vrq9L8Sw==",
       "dev": true
     },
     "@types/react-dom": {
@@ -116,12 +117,6 @@
       "integrity": "sha512-Vd+WmnrQKrrfVJ+9LWyOWqlBQJFsfi8rhKRm3ag3ZrOjY5SmzZkGmxbkgRIk9jpZt4dpvE21cmbBSp1dCV7/fw==",
       "dev": true
     },
-    "@types/zen-observable": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/@types/zen-observable/-/zen-observable-0.5.1.tgz",
-      "integrity": "sha1-wOq5QrTVKTTzlt4M2OLmP8kqMwc=",
-      "optional": true
-    },
     "abab": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/abab/-/abab-1.0.3.tgz",
@@ -288,24 +283,14 @@
       }
     },
     "apollo-client": {
-      "version": "1.9.0-1",
-      "resolved": "https://registry.npmjs.org/apollo-client/-/apollo-client-1.9.0-1.tgz",
-      "integrity": "sha512-8uf5wO+cTdMnKAvIkPev2+3h7Hn41d9uW8Heyza1jVy4HCzLxgNhd+ZMLc+Q9OUc7R+NyZhwcINJSQgpco3Auw=="
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/apollo-client/-/apollo-client-1.8.1.tgz",
+      "integrity": "sha512-rOvN+5Ei4CnPCH3XBlvY7ZkJOgXcWLglovIGWcDiyyVFWhaHTKTboluKcGrjqVznfnBXdaaApRUccJbePwJHEw=="
     },
     "apollo-codegen": {
-      "version": "0.15.2",
-      "resolved": "https://registry.npmjs.org/apollo-codegen/-/apollo-codegen-0.15.2.tgz",
-      "integrity": "sha1-4kRKdyxm2Lu1tyqQ1vQ3GcfauFM="
-    },
-    "apollo-fetch": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/apollo-fetch/-/apollo-fetch-0.3.0.tgz",
-      "integrity": "sha512-ttmz1aT0zYlyGPnEl8v1GQmUV2sAvfK/wQU7XOpqHhNcW/rYWOn5CLqVLqMHJJqZfCGsCA9pB4ypgaPbm727Ig=="
-    },
-    "apollo-link": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/apollo-link/-/apollo-link-0.0.3.tgz",
-      "integrity": "sha1-mwLbje95JojhT4vosw9xb3eJrLk="
+      "version": "0.16.2",
+      "resolved": "https://registry.npmjs.org/apollo-codegen/-/apollo-codegen-0.16.2.tgz",
+      "integrity": "sha512-2xQ/D4MYfgFd93csYfu8FfxavYTCxCvwp16kgRrk7hYg+SyTnbvR8dt6XtQ4HrgparOiWrUDxYHUvx2Wu1Hrsg=="
     },
     "app-root-path": {
       "version": "2.0.1",
@@ -451,9 +436,9 @@
       "dev": true
     },
     "awesome-typescript-loader": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/awesome-typescript-loader/-/awesome-typescript-loader-3.2.1.tgz",
-      "integrity": "sha512-/4abhqe5+wX/hQrquLT95o3QkaUCkzOfC6XQZcbk5sxI5V4rxcA3az7DQRHoHL2EWn7mnP3orzNfkjZAA/TVzA==",
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/awesome-typescript-loader/-/awesome-typescript-loader-3.2.2.tgz",
+      "integrity": "sha512-8F8rFsOIT4HQDKXt+5Dz66qhiC2pOAbfhsbOj3DeW0LATxxBPQPx0vxCxmecfEroTyKDYBiBMod2cXrChcQa4w==",
       "dev": true
     },
     "aws-sign2": {
@@ -3440,9 +3425,9 @@
       "dev": true
     },
     "hoist-non-react-statics": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.2.0.tgz",
-      "integrity": "sha1-sJnKgvNkCxJEMJyKUmor1grZ19k="
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.2.1.tgz",
+      "integrity": "sha1-p+QcdgEh0Kv8eiM5szHSmiY4nlI="
     },
     "home-or-tmp": {
       "version": "2.0.0",
@@ -5502,9 +5487,9 @@
       "integrity": "sha1-Z/jVo9PYrHzPpFJWWoMQBlF450g="
     },
     "react-apollo": {
-      "version": "1.4.8",
-      "resolved": "https://registry.npmjs.org/react-apollo/-/react-apollo-1.4.8.tgz",
-      "integrity": "sha512-WolzbKOK11BBckiLcPkAP8bMVyDIV1r+KlAKwW2ivU+3C49uBl/up0jqns6munqCy6EdqpHxOEj/g6ssW3zP3Q=="
+      "version": "1.4.10",
+      "resolved": "https://registry.npmjs.org/react-apollo/-/react-apollo-1.4.10.tgz",
+      "integrity": "sha512-vkAvPrA92lVB/q9a0jA4gJAPQ8xy6WrjtAFBNjn7NlWiIl/Wtk7djE0r2o5C+eLRu8Es+ECMcreI9sy+iWjpeQ=="
     },
     "react-dom": {
       "version": "15.6.1",
@@ -6407,10 +6392,18 @@
       "dev": true
     },
     "tslint-react": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/tslint-react/-/tslint-react-3.0.0.tgz",
-      "integrity": "sha1-AMSKt/IukVM7Yr3vLBYrSUR68Ao=",
-      "dev": true
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/tslint-react/-/tslint-react-3.2.0.tgz",
+      "integrity": "sha1-hR+1BSAcY9A0PFFybmNk9+mtLpk=",
+      "dev": true,
+      "dependencies": {
+        "tsutils": {
+          "version": "2.8.0",
+          "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.8.0.tgz",
+          "integrity": "sha1-AWAXNymzvxOGKN0UoVN+AIUdgUo=",
+          "dev": true
+        }
+      }
     },
     "tsutils": {
       "version": "2.7.1",
@@ -6682,9 +6675,9 @@
       "dev": true
     },
     "webpack": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.3.0.tgz",
-      "integrity": "sha1-zi+eB2Vmq6kfdIhxM6iD/X2hh7w=",
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.4.1.tgz",
+      "integrity": "sha1-TD9PP7MYFVpNsMtqNv8FxWl0GPQ=",
       "dev": true,
       "dependencies": {
         "ajv-keywords": {
@@ -6693,94 +6686,16 @@
           "integrity": "sha1-opbhf3v658HOT34N5T0pyzIWLfA=",
           "dev": true
         },
-        "camelcase": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
-          "dev": true
-        },
-        "find-up": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-          "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "load-json-file": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-          "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
-          "dev": true
-        },
-        "os-locale": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
-          "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
-          "dev": true
-        },
-        "path-exists": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-          "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-          "dev": true
-        },
-        "path-type": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-          "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-          "dev": true
-        },
-        "read-pkg": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-          "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
-          "dev": true
-        },
-        "read-pkg-up": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-          "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
-          "dev": true
-        },
-        "string-width": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-          "dev": true
-        },
-        "strip-bom": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-          "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
+        "enhanced-resolve": {
+          "version": "3.4.1",
+          "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz",
+          "integrity": "sha1-BCHjOf1xQZs9oT0Smzl5BAIwR24=",
           "dev": true
         },
         "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true
-        },
-        "which-module": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
-          "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
-          "dev": true
-        },
-        "yargs": {
-          "version": "6.6.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz",
-          "integrity": "sha1-eC7CHvQDNF+DCoCMo9UTr1YGUgg=",
-          "dev": true
-        },
-        "yargs-parser": {
           "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz",
-          "integrity": "sha1-KczqwNxPA8bIe0qfIX3RjJ90hxw=",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.2.1.tgz",
+          "integrity": "sha512-qxzYsob3yv6U+xMzPrv170y8AwGP7i74g+pbixCfD6rgso8BscLT2qXIuz6TpOaiJZ3mFgT5O9lyT9nMU4LfaA==",
           "dev": true
         }
       }
@@ -6957,9 +6872,6 @@
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz",
       "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k="
-    },
-    "zen-observable": {
-      "version": "git+https://github.com/evanshauser/zen-observable.git#a11ee4bd848f381898b6cd93c769eb1dcc0febf6"
     }
   }
 }