Merge branch 'develop' of https://github.com/tidusjar/ombi into develop

src/Ombi.Core/Authentication/OmbiUserManager.cs

@@ -158,7 +158,7 @@ namespace Ombi.Core.Authentication
                     if (!email.Equals(result.User?.Email))
                     {
                         user.Email = result.User?.Email;
-                        await UpdateAsync(user);
+                        await GlobalMutex.Lock(async () => await UpdateAsync(user));
                     }
 
                     return true;

src/Ombi.Core/Engine/TvRequestEngine.cs

@@ -31,14 +31,13 @@ namespace Ombi.Core.Engine
     {
         public TvRequestEngine(ITvMazeApi tvApi, IMovieDbApi movApi, IRequestServiceMain requestService, IPrincipal user,
             INotificationHelper helper, IRuleEvaluator rule, OmbiUserManager manager,
-            ITvSender sender, IAuditRepository audit, IRepository<RequestLog> rl, ISettingsService<OmbiSettings> settings, ICacheService cache,
+            ITvSender sender, IRepository<RequestLog> rl, ISettingsService<OmbiSettings> settings, ICacheService cache,
             IRepository<RequestSubscription> sub) : base(user, requestService, rule, manager, cache, settings, sub)
         {
             TvApi = tvApi;
             MovieDbApi = movApi;
             NotificationHelper = helper;
             TvSender = sender;
-            Audit = audit;
             _requestLog = rl;
         }
 
@@ -46,7 +45,6 @@ namespace Ombi.Core.Engine
         private ITvMazeApi TvApi { get; }
         private IMovieDbApi MovieDbApi { get; }
         private ITvSender TvSender { get; }
-        private IAuditRepository Audit { get; }
         private readonly IRepository<RequestLog> _requestLog;
 
         public async Task<RequestEngineResult> RequestTvShow(TvRequestViewModel tv)
@@ -84,8 +82,6 @@ namespace Ombi.Core.Engine
                 }
             }
 
-            await Audit.Record(AuditType.Added, AuditArea.TvRequest, $"Added Request {tvBuilder.ChildRequest.Title}", Username);
-
             var existingRequest = await TvRepository.Get().FirstOrDefaultAsync(x => x.TvDbId == tv.TvDbId);
             if (existingRequest != null)
             {
@@ -351,7 +347,6 @@ namespace Ombi.Core.Engine
 
         public async Task<TvRequests> UpdateTvRequest(TvRequests request)
         {
-            await Audit.Record(AuditType.Updated, AuditArea.TvRequest, $"Updated Request {request.Title}", Username);
             var allRequests = TvRepository.Get();
             var results = await allRequests.FirstOrDefaultAsync(x => x.Id == request.Id);
 
@@ -394,7 +389,6 @@ namespace Ombi.Core.Engine
             if (request.Approved)
             {
                 NotificationHelper.Notify(request, NotificationType.RequestApproved);
-                await Audit.Record(AuditType.Approved, AuditArea.TvRequest, $"Approved Request {request.Title}", Username);
                 // Autosend
                 await TvSender.Send(request);
             }
@@ -426,9 +420,7 @@ namespace Ombi.Core.Engine
 
         public async Task<ChildRequests> UpdateChildRequest(ChildRequests request)
         {
-            await Audit.Record(AuditType.Updated, AuditArea.TvRequest, $"Updated Request {request.Title}", Username);
+             await TvRepository.UpdateChild(request);
-
-            await TvRepository.UpdateChild(request);
             return request;
         }
 
@@ -446,16 +438,14 @@ namespace Ombi.Core.Engine
                 // Delete the parent
                 TvRepository.Db.TvRequests.Remove(parent);
             }
-            await Audit.Record(AuditType.Deleted, AuditArea.TvRequest, $"Deleting Request {request.Title}", Username);
+            
-
             await TvRepository.Db.SaveChangesAsync();
         }
 
         public async Task RemoveTvRequest(int requestId)
         {
             var request = await TvRepository.Get().FirstOrDefaultAsync(x => x.Id == requestId);
-            await Audit.Record(AuditType.Deleted, AuditArea.TvRequest, $"Deleting Request {request.Title}", Username);
+             await TvRepository.Delete(request);
-            await TvRepository.Delete(request);
         }
 
         public async Task<bool> UserHasRequest(string userId)

src/Ombi.DependencyInjection/IocExtensions.cs

@@ -134,28 +134,28 @@ namespace Ombi.DependencyInjection
         }
 
         public static void RegisterStore(this IServiceCollection services) { 
-            services.AddEntityFrameworkSqlite().AddDbContext<OmbiContext>();
+            services.AddDbContext<OmbiContext>();
-            services.AddEntityFrameworkSqlite().AddDbContext<SettingsContext>();
+            services.AddDbContext<SettingsContext>();
-            services.AddEntityFrameworkSqlite().AddDbContext<ExternalContext>();
+            services.AddDbContext<ExternalContext>();
             
             services.AddScoped<IOmbiContext, OmbiContext>(); // https://docs.microsoft.com/en-us/aspnet/core/data/entity-framework-6
             services.AddScoped<ISettingsContext, SettingsContext>(); // https://docs.microsoft.com/en-us/aspnet/core/data/entity-framework-6
             services.AddScoped<IExternalContext, ExternalContext>(); // https://docs.microsoft.com/en-us/aspnet/core/data/entity-framework-6
-            services.AddTransient<ISettingsRepository, SettingsJsonRepository>();
+            services.AddScoped<ISettingsRepository, SettingsJsonRepository>();
-            services.AddTransient<ISettingsResolver, SettingsResolver>();
+            services.AddScoped<ISettingsResolver, SettingsResolver>();
-            services.AddTransient<IPlexContentRepository, PlexServerContentRepository>();
+            services.AddScoped<IPlexContentRepository, PlexServerContentRepository>();
-            services.AddTransient<IEmbyContentRepository, EmbyContentRepository>();
+            services.AddScoped<IEmbyContentRepository, EmbyContentRepository>();
-            services.AddTransient<INotificationTemplatesRepository, NotificationTemplatesRepository>();
+            services.AddScoped<INotificationTemplatesRepository, NotificationTemplatesRepository>();
             
-            services.AddTransient<ITvRequestRepository, TvRequestRepository>();
+            services.AddScoped<ITvRequestRepository, TvRequestRepository>();
-            services.AddTransient<IMovieRequestRepository, MovieRequestRepository>();
+            services.AddScoped<IMovieRequestRepository, MovieRequestRepository>();
-            services.AddTransient<IMusicRequestRepository, MusicRequestRepository>();
+            services.AddScoped<IMusicRequestRepository, MusicRequestRepository>();
-            services.AddTransient<IAuditRepository, AuditRepository>();
+            services.AddScoped<IAuditRepository, AuditRepository>();
-            services.AddTransient<IApplicationConfigRepository, ApplicationConfigRepository>();
+            services.AddScoped<IApplicationConfigRepository, ApplicationConfigRepository>();
-            services.AddTransient<ITokenRepository, TokenRepository>();
+            services.AddScoped<ITokenRepository, TokenRepository>();
-            services.AddTransient(typeof(ISettingsService<>), typeof(SettingsService<>));
+            services.AddScoped(typeof(ISettingsService<>), typeof(SettingsService<>));
-            services.AddTransient(typeof(IRepository<>), typeof(Repository<>));
+            services.AddScoped(typeof(IRepository<>), typeof(Repository<>));
-            services.AddTransient(typeof(IExternalRepository<>), typeof(ExternalRepository<>));
+            services.AddScoped(typeof(IExternalRepository<>), typeof(ExternalRepository<>));
         }
         public static void RegisterServices(this IServiceCollection services)
         {
@@ -163,7 +163,7 @@ namespace Ombi.DependencyInjection
             services.AddTransient<INotificationService, NotificationService>();
             services.AddTransient<IEmailProvider, GenericEmailProvider>();
             services.AddTransient<INotificationHelper, NotificationHelper>();
-            services.AddTransient<ICacheService, CacheService>();
+            services.AddSingleton<ICacheService, CacheService>();
 
             services.AddTransient<IDiscordNotification, DiscordNotification>();
             services.AddTransient<IEmailNotification, EmailNotification>();

src/Ombi.Schedule/JobSetup.cs

@@ -81,7 +81,7 @@ namespace Ombi.Schedule
             RecurringJob.AddOrUpdate(() => _embyUserImporter.Start(), JobSettingsHelper.UserImporter(s));
             RecurringJob.AddOrUpdate(() => _plexUserImporter.Start(), JobSettingsHelper.UserImporter(s));
             RecurringJob.AddOrUpdate(() => _newsletter.Start(), JobSettingsHelper.Newsletter(s));
-            RecurringJob.AddOrUpdate(() => _resender.Start(), JobSettingsHelper.ResendFailedRequests(s));
+           // RecurringJob.AddOrUpdate(() => _resender.Start(), JobSettingsHelper.ResendFailedRequests(s));
             RecurringJob.AddOrUpdate(() => _mediaDatabaseRefresh.Start(), JobSettingsHelper.MediaDatabaseRefresh(s));
         }
 

src/Ombi.Store/Context/OmbiContext.cs

@@ -17,6 +17,7 @@ namespace Ombi.Store.Context
         {
             if (_created) return;
 
+
             _created = true;
             Database.SetCommandTimeout(60);
             Database.Migrate();

src/Ombi.Store/Repository/BaseRepository.cs

@@ -81,7 +81,7 @@ namespace Ombi.Store.Repository
             await _ctx.Database.ExecuteSqlCommandAsync(sql);
         }
 
-        private async Task<int> InternalSaveChanges()
+        protected async Task<int> InternalSaveChanges()
         {
             return await GlobalMutex.Lock(async () => await _ctx.SaveChangesAsync());
         }

src/Ombi.Store/Repository/EmbyContentRepository.cs

@@ -72,7 +72,7 @@ namespace Ombi.Store.Repository
         public async Task Update(EmbyContent existingContent)
         {
             Db.EmbyContent.Update(existingContent);
-            await Db.SaveChangesAsync();
+            await InternalSaveChanges();
         }
 
         public IQueryable<EmbyEpisode> GetAllEpisodes()
@@ -83,7 +83,7 @@ namespace Ombi.Store.Repository
         public async Task<EmbyEpisode> Add(EmbyEpisode content)
         {
             await Db.EmbyEpisode.AddAsync(content);
-            await Db.SaveChangesAsync();
+            await InternalSaveChanges();
             return content;
         }
         public async Task<EmbyEpisode> GetEpisodeByEmbyId(string key)
@@ -94,12 +94,13 @@ namespace Ombi.Store.Repository
         public async Task AddRange(IEnumerable<EmbyEpisode> content)
         {
             Db.EmbyEpisode.AddRange(content);
-            await Db.SaveChangesAsync();
+            await InternalSaveChanges();
         }
 
         public void UpdateWithoutSave(EmbyContent existingContent)
         {
             Db.EmbyContent.Update(existingContent);
         }
+        
     }
 }

src/Ombi.Store/Repository/NotificationTemplatesRepository.cs

@@ -45,7 +45,7 @@ namespace Ombi.Store.Repository
                 Db.Attach(template);
                 Db.Entry(template).State = EntityState.Modified;
             }
-            await Db.SaveChangesAsync();
+            await InternalSaveChanges();
         }
 
         public async Task UpdateRange(IEnumerable<NotificationTemplates> templates)
@@ -56,16 +56,21 @@ namespace Ombi.Store.Repository
                 Db.Attach(t);
                 Db.Entry(t).State = EntityState.Modified;
             }
-            await Db.SaveChangesAsync();
+            await InternalSaveChanges();
         }
 
         public async Task<NotificationTemplates> Insert(NotificationTemplates entity)
         {
             var settings = await Db.NotificationTemplates.AddAsync(entity).ConfigureAwait(false);
-            await Db.SaveChangesAsync().ConfigureAwait(false);
+            await InternalSaveChanges().ConfigureAwait(false);
             return settings.Entity;
         }
 
+        private async Task<int> InternalSaveChanges()
+        {
+            return await GlobalMutex.Lock(async () => await Db.SaveChangesAsync());
+        }
+
         private bool _disposed;
         // Protected implementation of Dispose pattern.
         protected virtual void Dispose(bool disposing)

src/Ombi.Store/Repository/PlexContentRepository.cs

@@ -96,7 +96,7 @@ namespace Ombi.Store.Repository
         public async Task Update(PlexServerContent existingContent)
         {
             Db.PlexServerContent.Update(existingContent);
-            await Db.SaveChangesAsync();
+            await InternalSaveChanges();
         }
         public void UpdateWithoutSave(PlexServerContent existingContent)
         {
@@ -106,7 +106,7 @@ namespace Ombi.Store.Repository
         public async Task UpdateRange(IEnumerable<PlexServerContent> existingContent)
         {
             Db.PlexServerContent.UpdateRange(existingContent);
-            await Db.SaveChangesAsync();
+            await InternalSaveChanges();
         }
 
         public IQueryable<PlexEpisode> GetAllEpisodes()
@@ -127,14 +127,14 @@ namespace Ombi.Store.Repository
         public async Task<PlexEpisode> Add(PlexEpisode content)
         {
             await Db.PlexEpisode.AddAsync(content);
-            await Db.SaveChangesAsync();
+            await InternalSaveChanges();
             return content;
         }
 
         public async Task DeleteEpisode(PlexEpisode content)
         {
             Db.PlexEpisode.Remove(content);
-            await Db.SaveChangesAsync();
+            await InternalSaveChanges();
         }
 
         public async Task<PlexEpisode> GetEpisodeByKey(int key)
@@ -144,7 +144,7 @@ namespace Ombi.Store.Repository
         public async Task AddRange(IEnumerable<PlexEpisode> content)
         {
             Db.PlexEpisode.AddRange(content);
-            await Db.SaveChangesAsync();
+            await InternalSaveChanges();
         }
     }
 }

src/Ombi.Store/Repository/Requests/MovieRequestRepository.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
+using Ombi.Helpers;
 using Ombi.Store.Context;
 using Ombi.Store.Entities.Requests;
 
@@ -70,12 +71,17 @@ namespace Ombi.Store.Repository.Requests
                 Db.MovieRequests.Attach(request);
                 Db.Update(request);
             }
-            await Db.SaveChangesAsync();
+            await InternalSaveChanges();
         }
 
         public async Task Save()
         {
-            await Db.SaveChangesAsync();
+            await InternalSaveChanges();
+        }
+
+        private async Task<int> InternalSaveChanges()
+        {
+            return await GlobalMutex.Lock(async () => await Db.SaveChangesAsync());
         }
     }
 }

src/Ombi.Store/Repository/Requests/MusicRequestRepository.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
+using Ombi.Helpers;
 using Ombi.Store.Context;
 using Ombi.Store.Entities.Requests;
 
@@ -61,12 +62,16 @@ namespace Ombi.Store.Repository.Requests
                 Db.AlbumRequests.Attach(request);
                 Db.Update(request);
             }
-            await Db.SaveChangesAsync();
+            await InternalSaveChanges();
         }
 
         public async Task Save()
         {
-            await Db.SaveChangesAsync();
+            await InternalSaveChanges();
+        }
+        private async Task<int> InternalSaveChanges()
+        {
+            return await GlobalMutex.Lock(async () => await Db.SaveChangesAsync());
         }
     }
 }

src/Ombi.Store/Repository/Requests/TvRequestRepository.cs

@@ -2,6 +2,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
+using Ombi.Helpers;
 using Ombi.Store.Context;
 using Ombi.Store.Entities.Requests;
 
@@ -101,20 +102,20 @@ namespace Ombi.Store.Repository.Requests
 
         public async Task Save()
         {
-            await Db.SaveChangesAsync();
+            await InternalSaveChanges();
         }
 
         public async Task<TvRequests> Add(TvRequests request)
         {
             await Db.TvRequests.AddAsync(request);
-            await Db.SaveChangesAsync();
+            await InternalSaveChanges();
             return request;
         }
 
         public async Task<ChildRequests> AddChild(ChildRequests request)
         {
             await Db.ChildRequests.AddAsync(request);
-            await Db.SaveChangesAsync();
+            await InternalSaveChanges();
 
             return request;
         }
@@ -122,33 +123,38 @@ namespace Ombi.Store.Repository.Requests
         public async Task Delete(TvRequests request)
         {
             Db.TvRequests.Remove(request);
-            await Db.SaveChangesAsync();
+            await InternalSaveChanges();
         }
 
         public async Task DeleteChild(ChildRequests request)
         {
             Db.ChildRequests.Remove(request);
-            await Db.SaveChangesAsync();
+            await InternalSaveChanges();
         }
 
         public async Task DeleteChildRange(IEnumerable<ChildRequests> request)
         {
             Db.ChildRequests.RemoveRange(request);
-            await Db.SaveChangesAsync();
+            await InternalSaveChanges();
         }
 
         public async Task Update(TvRequests request)
         {
             Db.Update(request);
             
-            await Db.SaveChangesAsync();
+            await InternalSaveChanges();
         }
         
         public async Task UpdateChild(ChildRequests request)
         {
             Db.Update(request);
 
-            await Db.SaveChangesAsync();
+            await InternalSaveChanges();
+        }
+
+        private async Task<int> InternalSaveChanges()
+        {
+            return await GlobalMutex.Lock(async () => await Db.SaveChangesAsync());
         }
     }
 }

src/Ombi.Store/Repository/SettingsJsonRepository.cs

@@ -62,14 +62,14 @@ namespace Ombi.Store.Repository
         {
             //_cache.Remove(GetName(entity.SettingsName));
             Db.Settings.Remove(entity);
-            await Db.SaveChangesAsync();
+            await InternalSaveChanges();
         }
 
         public async Task UpdateAsync(GlobalSettings entity)
         {
             //_cache.Remove(GetName(entity.SettingsName));
             Db.Update(entity);
-            await Db.SaveChangesAsync();
+            await InternalSaveChanges();
         }
 
         public void Delete(GlobalSettings entity)
@@ -91,6 +91,11 @@ namespace Ombi.Store.Repository
             return $"{entity}Json";
         }
 
+        private async Task<int> InternalSaveChanges()
+        {
+            return await GlobalMutex.Lock(async () => await Db.SaveChangesAsync());
+        }
+
         private bool _disposed;
         protected virtual void Dispose(bool disposing)
         {

src/Ombi.Store/Repository/TokenRepository.cs

@@ -4,6 +4,7 @@ using Ombi.Store.Entities;
 using System;
 using System.Linq;
 using System.Threading.Tasks;
+using Ombi.Helpers;
 
 namespace Ombi.Store.Repository
 {
@@ -19,12 +20,16 @@ namespace Ombi.Store.Repository
         public async Task CreateToken(Tokens token)
         {
             await Db.Tokens.AddAsync(token);
-            await Db.SaveChangesAsync();
+            await InternalSaveChanges();
         }
 
         public IQueryable<Tokens> GetToken(string tokenId)
         {
             return Db.Tokens.Where(x => x.Token == tokenId);
         }
+        private async Task<int> InternalSaveChanges()
+        {
+            return await GlobalMutex.Lock(async () => await Db.SaveChangesAsync());
+        }
     }
 }

src/Ombi/ClientApp/app/search/music/albumsearch.component.html

@@ -80,7 +80,7 @@
                 <i class="fa fa-check"></i> {{ 'Common.Available' | translate }}</button>
         </div>
         <div *ngIf="!result.fullyAvailable">
-            <div *ngIf="result.requested || result.approved; then requestedBtn else notRequestedBtn"></div>
+            <div *ngIf="result.requested || result.approved || result.monitored; then requestedBtn else notRequestedBtn"></div>
             <ng-template #requestedBtn>
                 <button style="text-align: right" class="btn btn-primary-outline disabled" [disabled]>
                     <i class="fa fa-check"></i> {{ 'Common.Requested' | translate }}</button>

src/Ombi/Startup.cs

@@ -56,9 +56,6 @@ namespace Ombi
         // This method gets called by the runtime. Use this method to add services to the container.
         public IServiceProvider ConfigureServices(IServiceCollection services)
         {
-            // Add framework services.
-            services.AddDbContext<OmbiContext>();
-
             services.AddIdentity<OmbiUser, IdentityRole>()
                 .AddEntityFrameworkStores<OmbiContext>()
                 .AddDefaultTokenProviders()

src/Ombi/package-lock.json

@@ -1766,9 +1766,9 @@
       }
     },
     "bootstrap": {
-      "version": "3.4.0",
+      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.4.0.tgz",
+      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.4.1.tgz",
-      "integrity": "sha512-F1yTDO9OHKH0xjl03DsOe8Nu1OWBIeAugGMhy3UTIYDdbbIPesQIhCEbj+HEr6wqlwweGAlP8F3OBC6kEuhFuw=="
+      "integrity": "sha512-yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA=="
     },
     "bootswatch": {
       "version": "3.4.0",
@@ -4190,8 +4190,7 @@
         },
         "ansi-regex": {
           "version": "2.1.1",
-          "bundled": true,
+          "bundled": true
-          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -4209,13 +4208,11 @@
         },
         "balanced-match": {
           "version": "1.0.0",
-          "bundled": true,
+          "bundled": true
-          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -4228,18 +4225,15 @@
         },
         "code-point-at": {
           "version": "1.1.0",
-          "bundled": true,
+          "bundled": true
-          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
-          "bundled": true,
+          "bundled": true
-          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
-          "bundled": true,
+          "bundled": true
-          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -4342,8 +4336,7 @@
         },
         "inherits": {
           "version": "2.0.3",
-          "bundled": true,
+          "bundled": true
-          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -4353,7 +4346,6 @@
         "is-fullwidth-code-point": {
           "version": "1.0.0",
           "bundled": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -4366,20 +4358,17 @@
         "minimatch": {
           "version": "3.0.4",
           "bundled": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
         },
         "minimist": {
           "version": "0.0.8",
-          "bundled": true,
+          "bundled": true
-          "optional": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -4396,7 +4385,6 @@
         "mkdirp": {
           "version": "0.5.1",
           "bundled": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -4469,8 +4457,7 @@
         },
         "number-is-nan": {
           "version": "1.0.1",
-          "bundled": true,
+          "bundled": true
-          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -4480,7 +4467,6 @@
         "once": {
           "version": "1.4.0",
           "bundled": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -4556,8 +4542,7 @@
         },
         "safe-buffer": {
           "version": "5.1.2",
-          "bundled": true,
+          "bundled": true
-          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -4587,7 +4572,6 @@
         "string-width": {
           "version": "1.0.2",
           "bundled": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -4605,7 +4589,6 @@
         "strip-ansi": {
           "version": "3.0.1",
           "bundled": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -4644,13 +4627,11 @@
         },
         "wrappy": {
           "version": "1.0.2",
-          "bundled": true,
+          "bundled": true
-          "optional": true
         },
         "yallist": {
           "version": "3.0.3",
-          "bundled": true,
+          "bundled": true
-          "optional": true
         }
       }
     },