From 365b2c50cb3daed02bbc6a79014d19b66c98f573 Mon Sep 17 00:00:00 2001 From: Dan Harman Date: Wed, 22 Mar 2017 10:28:26 +0000 Subject: [PATCH 001/411] Added babel-loader caching to improve subsequent build times. (#777) --- templates/ReactReduxSpa/webpack.config.js | 6 +++--- templates/ReactSpa/webpack.config.js | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/ReactReduxSpa/webpack.config.js b/templates/ReactReduxSpa/webpack.config.js index 4a09f5a1..ce9ece32 100644 --- a/templates/ReactReduxSpa/webpack.config.js +++ b/templates/ReactReduxSpa/webpack.config.js @@ -10,14 +10,14 @@ module.exports = (env) => { // Configuration in common to both client-side and server-side bundles const sharedConfig = () => ({ stats: { modules: false }, - resolve: { extensions: [ '.js', '.jsx', '.ts', '.tsx' ] }, + resolve: { extensions: ['.js', '.jsx', '.ts', '.tsx'] }, output: { filename: '[name].js', publicPath: '/dist/' // Webpack dev middleware, if enabled, handles requests for this URL prefix }, module: { rules: [ - { test: /\.tsx?$/, include: /ClientApp/, use: 'babel-loader' }, + { test: /\.tsx?$/, include: /ClientApp/, use: { loader: 'babel-loader', options: { cacheDirectory: true } } }, { test: /\.tsx?$/, include: /ClientApp/, use: 'awesome-typescript-loader?silent=true' } ] }, @@ -74,4 +74,4 @@ module.exports = (env) => { }); return [clientBundleConfig, serverBundleConfig]; -}; +}; \ No newline at end of file diff --git a/templates/ReactSpa/webpack.config.js b/templates/ReactSpa/webpack.config.js index dc589094..fa76d107 100644 --- a/templates/ReactSpa/webpack.config.js +++ b/templates/ReactSpa/webpack.config.js @@ -9,7 +9,7 @@ module.exports = (env) => { return [{ stats: { modules: false }, entry: { 'main': './ClientApp/boot.tsx' }, - resolve: { extensions: [ '.js', '.jsx', '.ts', '.tsx' ] }, + resolve: { extensions: ['.js', '.jsx', '.ts', '.tsx'] }, output: { path: path.join(__dirname, bundleOutputDir), filename: '[name].js', @@ -17,7 +17,7 @@ module.exports = (env) => { }, module: { rules: [ - { test: /\.ts(x?)$/, include: /ClientApp/, use: 'babel-loader' }, + { test: /\.ts(x?)$/, include: /ClientApp/, use: { loader: 'babel-loader', options: { cacheDirectory: true } } }, { test: /\.tsx?$/, include: /ClientApp/, use: 'awesome-typescript-loader?silent=true' }, { test: /\.css$/, use: isDevBuild ? ['style-loader', 'css-loader'] : ExtractTextPlugin.extract({ use: 'css-loader' }) }, { test: /\.(png|jpg|jpeg|gif|svg)$/, use: 'url-loader?limit=25000' } @@ -41,4 +41,4 @@ module.exports = (env) => { new ExtractTextPlugin('site.css') ]) }]; -}; +}; \ No newline at end of file From dcf51f706c1d46250603be648aea4abc006a1f7b Mon Sep 17 00:00:00 2001 From: Kiran Challa Date: Tue, 28 Mar 2017 04:22:56 -0700 Subject: [PATCH 002/411] Upgraded Json.NET version to 10.0.1 --- build/dependencies.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/dependencies.props b/build/dependencies.props index cc5ad903..5084b973 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -5,7 +5,7 @@ 1.0.0-msbuild3-final 5.0.2 4.3.0 - 9.0.1 + 10.0.1 4.5.24 1.6.1 4.7.0 From 6ed6b8e3d2312b8ab3ce5fd90234fb0f00f352e5 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 29 Mar 2017 10:27:50 +0100 Subject: [PATCH 003/411] Set AutoCompleteOnClose=false on JsonTextWriter. Fixes #822 --- .../SocketNodeInstance.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Microsoft.AspNetCore.NodeServices.Sockets/SocketNodeInstance.cs b/src/Microsoft.AspNetCore.NodeServices.Sockets/SocketNodeInstance.cs index b89d5a4b..b656978f 100644 --- a/src/Microsoft.AspNetCore.NodeServices.Sockets/SocketNodeInstance.cs +++ b/src/Microsoft.AspNetCore.NodeServices.Sockets/SocketNodeInstance.cs @@ -179,6 +179,7 @@ private static void WriteJsonLine(Stream stream, object serializableObject) using (var jsonWriter = new JsonTextWriter(streamWriter)) { jsonWriter.CloseOutput = false; + jsonWriter.AutoCompleteOnClose = false; var serializer = JsonSerializer.Create(jsonSerializerSettings); serializer.Serialize(jsonWriter, serializableObject); From b9c387bf5f89a3c585182c645126583c5467c130 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 29 Mar 2017 10:33:29 +0100 Subject: [PATCH 004/411] Remove obsolete references from gitignore files. Fixes #818 and #819. --- .gitignore | 1 - samples/angular/MusicStore/.gitignore | 1 - samples/misc/Webpack/.gitignore | 4 ---- samples/react/ReactGrid/.gitignore | 1 - templates/Angular2Spa/template_gitignore | 13 ++----------- templates/AureliaSpa/template_gitignore | 12 ++---------- templates/KnockoutSpa/template_gitignore | 9 +-------- templates/ReactReduxSpa/template_gitignore | 12 ++---------- templates/ReactSpa/template_gitignore | 9 +-------- templates/VueSpa/template_gitignore | 6 +----- templates/WebApplicationBasic/template_gitignore | 4 ---- 11 files changed, 9 insertions(+), 63 deletions(-) diff --git a/.gitignore b/.gitignore index 9b53d656..100aa3b9 100644 --- a/.gitignore +++ b/.gitignore @@ -13,7 +13,6 @@ PublishProfiles/ *.docstates _ReSharper.* nuget.exe -project.lock.json *net45.csproj *net451.csproj *k10.csproj diff --git a/samples/angular/MusicStore/.gitignore b/samples/angular/MusicStore/.gitignore index 762a3e6c..a31c74a1 100644 --- a/samples/angular/MusicStore/.gitignore +++ b/samples/angular/MusicStore/.gitignore @@ -1,7 +1,6 @@ /node_modules/ /wwwroot/lib/ /wwwroot/ng-app/**/*.js -/project.lock.json /music-db.sqlite /Properties/launchSettings.json diff --git a/samples/misc/Webpack/.gitignore b/samples/misc/Webpack/.gitignore index a99ce524..13634919 100644 --- a/samples/misc/Webpack/.gitignore +++ b/samples/misc/Webpack/.gitignore @@ -43,10 +43,6 @@ TestResult.xml [Rr]eleasePS/ dlldata.c -# DNX -project.lock.json -artifacts/ - *_i.c *_p.c *_i.h diff --git a/samples/react/ReactGrid/.gitignore b/samples/react/ReactGrid/.gitignore index 22ae0ea2..f050c809 100644 --- a/samples/react/ReactGrid/.gitignore +++ b/samples/react/ReactGrid/.gitignore @@ -1,4 +1,3 @@ /node_modules/ -project.lock.json /wwwroot/dist/ /Properties/launchSettings.json diff --git a/templates/Angular2Spa/template_gitignore b/templates/Angular2Spa/template_gitignore index 900f1b74..d261e7c7 100644 --- a/templates/Angular2Spa/template_gitignore +++ b/templates/Angular2Spa/template_gitignore @@ -28,13 +28,8 @@ Obj/ # Visual Studio 2015 cache/options directory .vs/ -/wwwroot/dist/** -/ClientApp/dist/** - -# Workaround for https://github.com/aspnet/JavaScriptServices/issues/235 -!/wwwroot/dist/_placeholder.txt -!/ClientApp/dist/_placeholder.txt - +/wwwroot/dist/ +/ClientApp/dist/ # MSTest test Results [Tt]est[Rr]esult*/ @@ -49,10 +44,6 @@ TestResult.xml [Rr]eleasePS/ dlldata.c -# DNX -project.lock.json -artifacts/ - *_i.c *_p.c *_i.h diff --git a/templates/AureliaSpa/template_gitignore b/templates/AureliaSpa/template_gitignore index 0d5fcb92..c8274b5f 100644 --- a/templates/AureliaSpa/template_gitignore +++ b/templates/AureliaSpa/template_gitignore @@ -28,12 +28,8 @@ Obj/ # Visual Studio 2015 cache/options directory .vs/ -/wwwroot/dist/** -/ClientApp/dist/** - -# Workaround for https://github.com/aspnet/JavaScriptServices/issues/235 -!/wwwroot/dist/_placeholder.txt -!/ClientApp/dist/_placeholder.txt +/wwwroot/dist/ +/ClientApp/dist/ /yarn.lock @@ -50,10 +46,6 @@ TestResult.xml [Rr]eleasePS/ dlldata.c -# DNX -project.lock.json -artifacts/ - *_i.c *_p.c *_i.h diff --git a/templates/KnockoutSpa/template_gitignore b/templates/KnockoutSpa/template_gitignore index a6f88108..3e035eee 100644 --- a/templates/KnockoutSpa/template_gitignore +++ b/templates/KnockoutSpa/template_gitignore @@ -28,10 +28,7 @@ Obj/ # Visual Studio 2015 cache/options directory .vs/ -/wwwroot/dist/** - -# Workaround for https://github.com/aspnet/JavaScriptServices/issues/235 -!/wwwroot/dist/_placeholder.txt +/wwwroot/dist/ /yarn.lock @@ -48,10 +45,6 @@ TestResult.xml [Rr]eleasePS/ dlldata.c -# DNX -project.lock.json -artifacts/ - *_i.c *_p.c *_i.h diff --git a/templates/ReactReduxSpa/template_gitignore b/templates/ReactReduxSpa/template_gitignore index 0d5fcb92..c8274b5f 100644 --- a/templates/ReactReduxSpa/template_gitignore +++ b/templates/ReactReduxSpa/template_gitignore @@ -28,12 +28,8 @@ Obj/ # Visual Studio 2015 cache/options directory .vs/ -/wwwroot/dist/** -/ClientApp/dist/** - -# Workaround for https://github.com/aspnet/JavaScriptServices/issues/235 -!/wwwroot/dist/_placeholder.txt -!/ClientApp/dist/_placeholder.txt +/wwwroot/dist/ +/ClientApp/dist/ /yarn.lock @@ -50,10 +46,6 @@ TestResult.xml [Rr]eleasePS/ dlldata.c -# DNX -project.lock.json -artifacts/ - *_i.c *_p.c *_i.h diff --git a/templates/ReactSpa/template_gitignore b/templates/ReactSpa/template_gitignore index a6f88108..3e035eee 100644 --- a/templates/ReactSpa/template_gitignore +++ b/templates/ReactSpa/template_gitignore @@ -28,10 +28,7 @@ Obj/ # Visual Studio 2015 cache/options directory .vs/ -/wwwroot/dist/** - -# Workaround for https://github.com/aspnet/JavaScriptServices/issues/235 -!/wwwroot/dist/_placeholder.txt +/wwwroot/dist/ /yarn.lock @@ -48,10 +45,6 @@ TestResult.xml [Rr]eleasePS/ dlldata.c -# DNX -project.lock.json -artifacts/ - *_i.c *_p.c *_i.h diff --git a/templates/VueSpa/template_gitignore b/templates/VueSpa/template_gitignore index a6f88108..30342b19 100644 --- a/templates/VueSpa/template_gitignore +++ b/templates/VueSpa/template_gitignore @@ -28,10 +28,7 @@ Obj/ # Visual Studio 2015 cache/options directory .vs/ -/wwwroot/dist/** - -# Workaround for https://github.com/aspnet/JavaScriptServices/issues/235 -!/wwwroot/dist/_placeholder.txt +/wwwroot/dist/ /yarn.lock @@ -49,7 +46,6 @@ TestResult.xml dlldata.c # DNX -project.lock.json artifacts/ *_i.c diff --git a/templates/WebApplicationBasic/template_gitignore b/templates/WebApplicationBasic/template_gitignore index 2e3deeeb..3e035eee 100644 --- a/templates/WebApplicationBasic/template_gitignore +++ b/templates/WebApplicationBasic/template_gitignore @@ -45,10 +45,6 @@ TestResult.xml [Rr]eleasePS/ dlldata.c -# DNX -project.lock.json -artifacts/ - *_i.c *_p.c *_i.h From 347524a11679595edef7143b50801da251e3f1d5 Mon Sep 17 00:00:00 2001 From: peterlazzarino Date: Tue, 21 Feb 2017 22:04:31 -0500 Subject: [PATCH 005/411] Add status code response capabilities to PrerenderTagHelper and RenderToStringResult. Client can now send status codes back based on client routes. --- .../Prerendering/PrerenderTagHelper.cs | 5 +++++ .../Prerendering/RenderToStringResult.cs | 5 +++++ .../npm/aspnet-prerendering/src/PrerenderingInterfaces.d.ts | 1 + 3 files changed, 11 insertions(+) diff --git a/src/Microsoft.AspNetCore.SpaServices/Prerendering/PrerenderTagHelper.cs b/src/Microsoft.AspNetCore.SpaServices/Prerendering/PrerenderTagHelper.cs index 43272a27..6462e225 100644 --- a/src/Microsoft.AspNetCore.SpaServices/Prerendering/PrerenderTagHelper.cs +++ b/src/Microsoft.AspNetCore.SpaServices/Prerendering/PrerenderTagHelper.cs @@ -129,6 +129,11 @@ public override async Task ProcessAsync(TagHelperContext context, TagHelperOutpu return; } + if (result.StatusCode.HasValue) + { + ViewContext.HttpContext.Response.StatusCode = result.StatusCode.Value; + } + // It's some HTML to inject output.Content.SetHtmlContent(result.Html); diff --git a/src/Microsoft.AspNetCore.SpaServices/Prerendering/RenderToStringResult.cs b/src/Microsoft.AspNetCore.SpaServices/Prerendering/RenderToStringResult.cs index 82c68c37..a213baf0 100644 --- a/src/Microsoft.AspNetCore.SpaServices/Prerendering/RenderToStringResult.cs +++ b/src/Microsoft.AspNetCore.SpaServices/Prerendering/RenderToStringResult.cs @@ -25,5 +25,10 @@ public class RenderToStringResult /// to the SPA's routing configuration. /// public string RedirectUrl { get; set; } + + /// + /// If set, specifies the HTTP status code that should be sent back with the server response. + /// + public int? StatusCode { get; set; } } } \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/PrerenderingInterfaces.d.ts b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/PrerenderingInterfaces.d.ts index 68dda7e0..446a2420 100644 --- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/PrerenderingInterfaces.d.ts +++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/PrerenderingInterfaces.d.ts @@ -8,6 +8,7 @@ interface RenderToStringCallback { interface RenderToStringResult { html: string; + statusCode: number; globals?: { [key: string]: any }; } From ce409738590448c4821e567edfe4ba1037f8ae91 Mon Sep 17 00:00:00 2001 From: Thomas Hermann Date: Sat, 25 Feb 2017 12:07:01 -0500 Subject: [PATCH 006/411] Add option to configure Webpack Hot Middleware client Addresses #667 --- src/Microsoft.AspNetCore.SpaServices/README.md | 15 +++++++++++++++ .../Webpack/WebpackDevMiddlewareOptions.cs | 5 +++++ .../aspnet-webpack/src/WebpackDevMiddleware.ts | 10 +++++++--- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/src/Microsoft.AspNetCore.SpaServices/README.md b/src/Microsoft.AspNetCore.SpaServices/README.md index 43ffca21..c91b6bee 100644 --- a/src/Microsoft.AspNetCore.SpaServices/README.md +++ b/src/Microsoft.AspNetCore.SpaServices/README.md @@ -633,6 +633,21 @@ Webpack has built-in HMR support for various types of module, such as styles and This is [documented in detail on the Webpack site](https://webpack.github.io/docs/hot-module-replacement.html). Or to get a working HMR-enabled ASP.NET Core site with Angular 2, React, React+Redux, or Knockout, you can use the [aspnetcore-spa generator](http://blog.stevensanderson.com/2016/05/02/angular2-react-knockout-apps-on-aspnet-core/). +#### Passing options to the Webpack Hot Middleware client + +You can configure the [Webpack Hot Middleware client](https://github.com/glenjamin/webpack-hot-middleware#client) +by modifying your `UseWebpackDevMiddleware` call to include `HotModuleReplacementClientOptions`: + +```csharp +app.UseWebpackDevMiddleware(new WebpackDevMiddlewareOptions { + HotModuleReplacement = true, + HotModuleReplacementClientOptions = new Dictionary { + { "reload", "true" }, + }, +}); +``` + +**Note**: The `path` option will be ignored, because it is controlled by the `HotModuleReplacementEndpoint` setting. ## Routing helper: MapSpaFallbackRoute diff --git a/src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddlewareOptions.cs b/src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddlewareOptions.cs index f94a8d2f..fa453218 100644 --- a/src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddlewareOptions.cs +++ b/src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddlewareOptions.cs @@ -30,6 +30,11 @@ public class WebpackDevMiddlewareOptions /// public bool ReactHotModuleReplacement { get; set; } + /// + /// Specifies additional options to be passed to the Webpack Hot Middleware client + /// + public IDictionary HotModuleReplacementClientOptions { get; set; } + /// /// Specifies the Webpack configuration file to be used. If not set, defaults to 'webpack.config.js'. /// diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/WebpackDevMiddleware.ts b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/WebpackDevMiddleware.ts index b07dbd1f..26bf6b23 100644 --- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/WebpackDevMiddleware.ts +++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/WebpackDevMiddleware.ts @@ -3,6 +3,7 @@ import * as webpack from 'webpack'; import * as url from 'url'; import * as fs from 'fs'; import * as path from 'path'; +import * as querystring from 'querystring'; import { requireNewCopy } from './RequireNewCopy'; export type CreateDevServerResult = { @@ -26,6 +27,7 @@ interface CreateDevServerOptions { interface DevServerOptions { HotModuleReplacement: boolean; HotModuleReplacementServerPort: number; + HotModuleReplacementClientOptions: Object; ReactHotModuleReplacement: boolean; } @@ -37,7 +39,7 @@ interface WebpackConfigFunc { } type WebpackConfigFileExport = WebpackConfigOrArray | WebpackConfigFunc; -function attachWebpackDevMiddleware(app: any, webpackConfig: webpack.Configuration, enableHotModuleReplacement: boolean, enableReactHotModuleReplacement: boolean, hmrClientEndpoint: string, hmrServerEndpoint: string) { +function attachWebpackDevMiddleware(app: any, webpackConfig: webpack.Configuration, enableHotModuleReplacement: boolean, enableReactHotModuleReplacement: boolean, hmrClientOptions: HotModuleReplacementClientOptions, hmrClientEndpoint: string, hmrServerEndpoint: string) { // Build the final Webpack config based on supplied options if (enableHotModuleReplacement) { // For this, we only support the key/value config format, not string or string[], since @@ -53,7 +55,8 @@ function attachWebpackDevMiddleware(app: any, webpackConfig: webpack.Configurati // Augment all entry points so they support HMR (unless they already do) Object.getOwnPropertyNames(entryPoints).forEach(entryPointName => { const webpackHotMiddlewareEntryPoint = 'webpack-hot-middleware/client'; - const webpackHotMiddlewareOptions = `?path=` + encodeURIComponent(hmrClientEndpoint); + hmrClientOptions.path = hmrClientEndpoint; + const webpackHotMiddlewareOptions = '?' + querystring.stringify(hmrClientOptions); if (typeof entryPoints[entryPointName] === 'string') { entryPoints[entryPointName] = [webpackHotMiddlewareEntryPoint + webpackHotMiddlewareOptions, entryPoints[entryPointName]]; } else if (firstIndexOfStringStartingWith(entryPoints[entryPointName], webpackHotMiddlewareEntryPoint) < 0) { @@ -225,6 +228,7 @@ export function createWebpackDevServer(callback: CreateDevServerCallback, option const enableHotModuleReplacement = options.suppliedOptions.HotModuleReplacement; const enableReactHotModuleReplacement = options.suppliedOptions.ReactHotModuleReplacement; + const hmrClientOptions = options.suppliedOptions.HotModuleReplacementClientOptions || {}; if (enableReactHotModuleReplacement && !enableHotModuleReplacement) { callback('To use ReactHotModuleReplacement, you must also enable the HotModuleReplacement option.', null); return; @@ -263,7 +267,7 @@ export function createWebpackDevServer(callback: CreateDevServerCallback, option || `http://localhost:${listener.address().port}/__webpack_hmr`; // Fall back on absolute URL to bypass proxying const hmrServerEndpoint = options.hotModuleReplacementEndpointUrl || '/__webpack_hmr'; // URL is relative to webpack dev server root - attachWebpackDevMiddleware(app, webpackConfig, enableHotModuleReplacement, enableReactHotModuleReplacement, hmrClientEndpoint, hmrServerEndpoint); + attachWebpackDevMiddleware(app, webpackConfig, enableHotModuleReplacement, enableReactHotModuleReplacement, hmrClientOptions, hmrClientEndpoint, hmrServerEndpoint); } }); From ee601bed5075e6cc927b04e6581ad2dc5ed02a69 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 29 Mar 2017 11:41:38 +0100 Subject: [PATCH 007/411] Minor doc tweaks --- src/Microsoft.AspNetCore.SpaServices/README.md | 6 ++++-- .../Webpack/WebpackDevMiddlewareOptions.cs | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Microsoft.AspNetCore.SpaServices/README.md b/src/Microsoft.AspNetCore.SpaServices/README.md index c91b6bee..b07ce869 100644 --- a/src/Microsoft.AspNetCore.SpaServices/README.md +++ b/src/Microsoft.AspNetCore.SpaServices/README.md @@ -636,7 +636,7 @@ This is [documented in detail on the Webpack site](https://webpack.github.io/doc #### Passing options to the Webpack Hot Middleware client You can configure the [Webpack Hot Middleware client](https://github.com/glenjamin/webpack-hot-middleware#client) -by modifying your `UseWebpackDevMiddleware` call to include `HotModuleReplacementClientOptions`: +by using the `HotModuleReplacementClientOptions` property on `WebpackDevMiddlewareOptions`: ```csharp app.UseWebpackDevMiddleware(new WebpackDevMiddlewareOptions { @@ -647,7 +647,9 @@ app.UseWebpackDevMiddleware(new WebpackDevMiddlewareOptions { }); ``` -**Note**: The `path` option will be ignored, because it is controlled by the `HotModuleReplacementEndpoint` setting. +For the list of available options, please see [Webpack Hot Middleware docs](https://github.com/glenjamin/webpack-hot-middleware#client). + +**Note**: The `path` option cannot be overridden this way - it is controlled by the `HotModuleReplacementEndpoint` setting. ## Routing helper: MapSpaFallbackRoute diff --git a/src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddlewareOptions.cs b/src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddlewareOptions.cs index fa453218..7ef0f173 100644 --- a/src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddlewareOptions.cs +++ b/src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddlewareOptions.cs @@ -31,7 +31,7 @@ public class WebpackDevMiddlewareOptions public bool ReactHotModuleReplacement { get; set; } /// - /// Specifies additional options to be passed to the Webpack Hot Middleware client + /// Specifies additional options to be passed to the Webpack Hot Middleware client, if used. /// public IDictionary HotModuleReplacementClientOptions { get; set; } From 0c09c68b77fc324ed0d5ea7500b8614843387b4e Mon Sep 17 00:00:00 2001 From: Thomas Hermann Date: Sat, 25 Mar 2017 18:23:27 -0400 Subject: [PATCH 008/411] Support V8 Inspector Integration for Node.js Addresses #796 --- .../HostingModels/OutOfProcessNodeInstance.cs | 37 ++++++++++--------- .../README.md | 31 ++++++++-------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/Microsoft.AspNetCore.NodeServices/HostingModels/OutOfProcessNodeInstance.cs b/src/Microsoft.AspNetCore.NodeServices/HostingModels/OutOfProcessNodeInstance.cs index f58374a5..dac718be 100644 --- a/src/Microsoft.AspNetCore.NodeServices/HostingModels/OutOfProcessNodeInstance.cs +++ b/src/Microsoft.AspNetCore.NodeServices/HostingModels/OutOfProcessNodeInstance.cs @@ -27,16 +27,6 @@ public abstract class OutOfProcessNodeInstance : INodeInstance protected readonly ILogger OutputLogger; private const string ConnectionEstablishedMessage = "[Microsoft.AspNetCore.NodeServices:Listening]"; - private const string DebuggingStartedMessageFormat = @"----- -*** Node.js debugging is enabled *** -{0} - -To debug, run: - node-inspector{1} - -If you haven't yet installed node-inspector, you can do so as follows: - npm install -g node-inspector ------"; private readonly TaskCompletionSource _connectionIsReadySource = new TaskCompletionSource(); private bool _disposed; private readonly StringAsTempFile _entryPointScript; @@ -215,8 +205,8 @@ protected abstract Task InvokeExportAsync( /// The root path of the project. This is used when locating Node.js modules relative to the project root. /// Command-line arguments to be passed to the Node.js process. /// Environment variables to be set on the Node.js process. - /// If true, passes a flag to the Node.js process telling it to accept V8 debugger connections. - /// If debugging is enabled, the Node.js process should listen for V8 debugger connections on this port. + /// If true, passes a flag to the Node.js process telling it to accept V8 Inspector connections. + /// If debugging is enabled, the Node.js process should listen for V8 Inspector connections on this port. /// protected virtual ProcessStartInfo PrepareNodeProcessStartInfo( string entryPointFilename, string projectPath, string commandLineArguments, @@ -226,7 +216,7 @@ protected virtual ProcessStartInfo PrepareNodeProcessStartInfo( string debuggingArgs; if (launchWithDebugging) { - debuggingArgs = debuggingPort != default(int) ? $"--debug={debuggingPort} " : "--debug "; + debuggingArgs = debuggingPort != default(int) ? $"--inspect={debuggingPort} " : "--inspect "; _nodeDebuggingPort = debuggingPort; } else @@ -389,10 +379,13 @@ private void ConnectToInputOutputStreams() { if (evt.Data != null) { - if (IsDebuggerListeningMessage(evt.Data)) + if (IsDebuggerMessage(evt.Data)) { - var debugPortArg = _nodeDebuggingPort.HasValue ? $" --debug-port={_nodeDebuggingPort.Value}" : string.Empty; - OutputLogger.LogWarning(string.Format(DebuggingStartedMessageFormat, evt.Data, debugPortArg)); + OutputLogger.LogWarning(evt.Data); + } + else if (IsWarning(evt.Data)) + { + OutputLogger.LogWarning(evt.Data); } else if (!initializationIsCompleted) { @@ -411,9 +404,17 @@ private void ConnectToInputOutputStreams() _nodeProcess.BeginErrorReadLine(); } - private static bool IsDebuggerListeningMessage(string message) + private static bool IsDebuggerMessage(string message) + { + return message.StartsWith("Debugger attached", StringComparison.OrdinalIgnoreCase) || + message.StartsWith("Debugger listening ", StringComparison.OrdinalIgnoreCase) || + message.StartsWith("To start debugging", StringComparison.OrdinalIgnoreCase) || + message.Contains("chrome-devtools:"); + } + + private static bool IsWarning(string message) { - return message.StartsWith("Debugger listening ", StringComparison.OrdinalIgnoreCase); + return message.StartsWith("Warning:", StringComparison.OrdinalIgnoreCase); } private FileSystemWatcher BeginFileWatcher(string rootDir) diff --git a/src/Microsoft.AspNetCore.SpaServices/README.md b/src/Microsoft.AspNetCore.SpaServices/README.md index b07ce869..acecbece 100644 --- a/src/Microsoft.AspNetCore.SpaServices/README.md +++ b/src/Microsoft.AspNetCore.SpaServices/README.md @@ -788,14 +788,14 @@ Caveats: ## Debugging your JavaScript/TypeScript code when it runs on the server -When you're using NodeServices or the server-side prerendering feature included in the project templates in this repo, your JavaScript/TypeScript code will execute on the server in a background instance of Node.js. You can enable debugging on that Node.js instance. Here's how to do it. +When you're using NodeServices or the server-side prerendering feature included in the project templates in this repo, your JavaScript/TypeScript code will execute on the server in a background instance of Node.js. You can enable debugging via [V8 Inspector Integration](https://nodejs.org/api/debugger.html#debugger_v8_inspector_integration_for_node_js) on that Node.js instance. Here's how to do it. First, in your `Startup.cs` file, in the `ConfigureServices` method, add the following: ``` services.AddNodeServices(options => { options.LaunchWithDebugging = true; - options.DebuggingPort = 5858; + options.DebuggingPort = 9229; }); ``` @@ -803,21 +803,20 @@ Now, run your application from that command line (e.g., `dotnet run`). Then in a In the console, you should see all the normal trace messages appear, plus among them will be: - ----- - *** Node.js debugging is enabled *** - Debugger listening on port 5858 - - To debug, run: - node-inspector - - If you haven't yet installed node-inspector, you can do so as follows: - npm install -g node-inspector - ----- +``` +warn: Microsoft.AspNetCore.NodeServices[0] + Debugger listening on port 9229. +warn: Microsoft.AspNetCore.NodeServices[0] + Warning: This is an experimental feature and could change at any time. +warn: Microsoft.AspNetCore.NodeServices[0] + To start debugging, open the following URL in Chrome: +warn: Microsoft.AspNetCore.NodeServices[0] + chrome-devtools://devtools/bundled/inspector.html?experiments=true&v8only=true&ws=127.0.0.1:9229/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx +``` -In some other command line window, follow those instructions (i.e., install `node-inspector` as it describes, then run `node-inspector`). Then you can open a browser at `http://127.0.0.1:8080/?port=5858` and you'll see the debugger UI. +As per instructions open the URL in Chrome. Alternatively you can go to the `Sources` tab of the Dev Tools (at http://localhost:5000) and connect to the Node instance under `Threads` in the right sidebar. -By expanding the `webpack://` entry in the sidebar, you'll be able to find your original TypeScript code (it's using source maps), and then set breakpoints in it. When you re-run your app in another browser window, your breakpoints will be hit, then you can debug the server-side execution just like you'd debug client-side execution. It looks like this: +By expanding the `webpack://` entry in the sidebar, you'll be able to find your original source code (it's using source maps), and then set breakpoints in it. When you re-run your app in another browser window, your breakpoints will be hit, then you can debug the server-side execution just like you'd debug client-side execution. It looks like this: -![screen shot 2016-07-26 at 18 56 12](https://cloud.githubusercontent.com/assets/1101362/17149317/a6f7d00c-5362-11e6-969c-4c3a9bbc33f7.png) +![screenshot from 2017-03-25 13-33-26](https://cloud.githubusercontent.com/assets/1596280/24324604/ab888a7e-115f-11e7-89d1-1586acf5e35c.png) -(Note: although this looks like Chrome's native debugger for client-side code, it is actually a JavaScript-powered debugger UI that's connected to the server-side runtime) From 8544714cbb4d6f562d6c388b9c8f86bfee7cdfd9 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 29 Mar 2017 12:00:38 +0100 Subject: [PATCH 009/411] Revert IsWarning code path to avoid breaking change (e.g., if someone overrode OnErrorDataReceived to receive such lines) --- .../HostingModels/OutOfProcessNodeInstance.cs | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/Microsoft.AspNetCore.NodeServices/HostingModels/OutOfProcessNodeInstance.cs b/src/Microsoft.AspNetCore.NodeServices/HostingModels/OutOfProcessNodeInstance.cs index dac718be..8a4894c6 100644 --- a/src/Microsoft.AspNetCore.NodeServices/HostingModels/OutOfProcessNodeInstance.cs +++ b/src/Microsoft.AspNetCore.NodeServices/HostingModels/OutOfProcessNodeInstance.cs @@ -383,10 +383,6 @@ private void ConnectToInputOutputStreams() { OutputLogger.LogWarning(evt.Data); } - else if (IsWarning(evt.Data)) - { - OutputLogger.LogWarning(evt.Data); - } else if (!initializationIsCompleted) { _connectionIsReadySource.SetException( @@ -412,11 +408,6 @@ private static bool IsDebuggerMessage(string message) message.Contains("chrome-devtools:"); } - private static bool IsWarning(string message) - { - return message.StartsWith("Warning:", StringComparison.OrdinalIgnoreCase); - } - private FileSystemWatcher BeginFileWatcher(string rootDir) { if (_watchFileExtensions == null || _watchFileExtensions.Length == 0) From 1f03b1e6331bdc2ee216df38e722cbbafac281bc Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 29 Mar 2017 12:01:01 +0100 Subject: [PATCH 010/411] Tiny shortcut to reduce string checking in non-debug scenarios --- .../HostingModels/OutOfProcessNodeInstance.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.AspNetCore.NodeServices/HostingModels/OutOfProcessNodeInstance.cs b/src/Microsoft.AspNetCore.NodeServices/HostingModels/OutOfProcessNodeInstance.cs index 8a4894c6..443aacdd 100644 --- a/src/Microsoft.AspNetCore.NodeServices/HostingModels/OutOfProcessNodeInstance.cs +++ b/src/Microsoft.AspNetCore.NodeServices/HostingModels/OutOfProcessNodeInstance.cs @@ -379,7 +379,7 @@ private void ConnectToInputOutputStreams() { if (evt.Data != null) { - if (IsDebuggerMessage(evt.Data)) + if (_launchWithDebugging && IsDebuggerMessage(evt.Data)) { OutputLogger.LogWarning(evt.Data); } From 5cb1846dd2f69bd8186acaf41e4b2e53d680ff6f Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 29 Mar 2017 14:18:37 +0100 Subject: [PATCH 011/411] Fix and reorganise WebpackDevMiddleware.ts following PR --- .../aspnet-webpack/src/WebpackDevMiddleware.ts | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/WebpackDevMiddleware.ts b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/WebpackDevMiddleware.ts index 26bf6b23..154ccacd 100644 --- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/WebpackDevMiddleware.ts +++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/WebpackDevMiddleware.ts @@ -23,11 +23,13 @@ interface CreateDevServerOptions { hotModuleReplacementEndpointUrl: string; } +type StringMap = [(key: string) => T]; + // These are the options configured in C# and then JSON-serialized, hence the C#-style naming interface DevServerOptions { HotModuleReplacement: boolean; HotModuleReplacementServerPort: number; - HotModuleReplacementClientOptions: Object; + HotModuleReplacementClientOptions: StringMap; ReactHotModuleReplacement: boolean; } @@ -39,7 +41,7 @@ interface WebpackConfigFunc { } type WebpackConfigFileExport = WebpackConfigOrArray | WebpackConfigFunc; -function attachWebpackDevMiddleware(app: any, webpackConfig: webpack.Configuration, enableHotModuleReplacement: boolean, enableReactHotModuleReplacement: boolean, hmrClientOptions: HotModuleReplacementClientOptions, hmrClientEndpoint: string, hmrServerEndpoint: string) { +function attachWebpackDevMiddleware(app: any, webpackConfig: webpack.Configuration, enableHotModuleReplacement: boolean, enableReactHotModuleReplacement: boolean, hmrClientOptions: StringMap, hmrServerEndpoint: string) { // Build the final Webpack config based on supplied options if (enableHotModuleReplacement) { // For this, we only support the key/value config format, not string or string[], since @@ -55,7 +57,6 @@ function attachWebpackDevMiddleware(app: any, webpackConfig: webpack.Configurati // Augment all entry points so they support HMR (unless they already do) Object.getOwnPropertyNames(entryPoints).forEach(entryPointName => { const webpackHotMiddlewareEntryPoint = 'webpack-hot-middleware/client'; - hmrClientOptions.path = hmrClientEndpoint; const webpackHotMiddlewareOptions = '?' + querystring.stringify(hmrClientOptions); if (typeof entryPoints[entryPointName] === 'string') { entryPoints[entryPointName] = [webpackHotMiddlewareEntryPoint + webpackHotMiddlewareOptions, entryPoints[entryPointName]]; @@ -228,7 +229,6 @@ export function createWebpackDevServer(callback: CreateDevServerCallback, option const enableHotModuleReplacement = options.suppliedOptions.HotModuleReplacement; const enableReactHotModuleReplacement = options.suppliedOptions.ReactHotModuleReplacement; - const hmrClientOptions = options.suppliedOptions.HotModuleReplacementClientOptions || {}; if (enableReactHotModuleReplacement && !enableHotModuleReplacement) { callback('To use ReactHotModuleReplacement, you must also enable the HotModuleReplacement option.', null); return; @@ -267,7 +267,12 @@ export function createWebpackDevServer(callback: CreateDevServerCallback, option || `http://localhost:${listener.address().port}/__webpack_hmr`; // Fall back on absolute URL to bypass proxying const hmrServerEndpoint = options.hotModuleReplacementEndpointUrl || '/__webpack_hmr'; // URL is relative to webpack dev server root - attachWebpackDevMiddleware(app, webpackConfig, enableHotModuleReplacement, enableReactHotModuleReplacement, hmrClientOptions, hmrClientEndpoint, hmrServerEndpoint); + + // We always overwrite the 'path' option as it needs to match what the .NET side is expecting + const hmrClientOptions = options.suppliedOptions.HotModuleReplacementClientOptions || >{}; + hmrClientOptions['path'] = hmrClientEndpoint; + + attachWebpackDevMiddleware(app, webpackConfig, enableHotModuleReplacement, enableReactHotModuleReplacement, hmrClientOptions, hmrServerEndpoint); } }); From 5dc476182cd9cf0df91a53e521dd111b99bfaed5 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Fri, 7 Apr 2017 15:48:20 +0100 Subject: [PATCH 012/411] Reference bootstrap JS in KnockoutSpa/ReactSpa/VueSpa. Fixes #846 --- templates/KnockoutSpa/ClientApp/boot.ts | 1 + templates/ReactSpa/ClientApp/boot.tsx | 2 +- templates/VueSpa/ClientApp/boot.ts | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/templates/KnockoutSpa/ClientApp/boot.ts b/templates/KnockoutSpa/ClientApp/boot.ts index 897fed6b..143e8e5f 100644 --- a/templates/KnockoutSpa/ClientApp/boot.ts +++ b/templates/KnockoutSpa/ClientApp/boot.ts @@ -1,4 +1,5 @@ import './css/site.css'; +import 'bootstrap'; import * as ko from 'knockout'; import './webpack-component-loader'; import AppRootComponent from './components/app-root/app-root'; diff --git a/templates/ReactSpa/ClientApp/boot.tsx b/templates/ReactSpa/ClientApp/boot.tsx index 129f349d..5bc2ec2c 100644 --- a/templates/ReactSpa/ClientApp/boot.tsx +++ b/templates/ReactSpa/ClientApp/boot.tsx @@ -1,5 +1,5 @@ import './css/site.css'; - +import 'bootstrap'; import * as React from 'react'; import * as ReactDOM from 'react-dom'; import { browserHistory, Router } from 'react-router'; diff --git a/templates/VueSpa/ClientApp/boot.ts b/templates/VueSpa/ClientApp/boot.ts index 232c1418..6349e8d0 100644 --- a/templates/VueSpa/ClientApp/boot.ts +++ b/templates/VueSpa/ClientApp/boot.ts @@ -1,3 +1,4 @@ +import 'bootstrap'; import Vue from 'vue'; import VueRouter from 'vue-router'; Vue.use(VueRouter); From e1533c2203ee06642d15d63f480460f103627f6b Mon Sep 17 00:00:00 2001 From: Pranav K Date: Fri, 7 Apr 2017 12:03:14 -0700 Subject: [PATCH 013/411] Use 2.0.0 version of Internal.AspNetCore.Sdk --- build/common.props | 2 +- build/dependencies.props | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/build/common.props b/build/common.props index 4bc9e508..c6d78507 100644 --- a/build/common.props +++ b/build/common.props @@ -13,6 +13,6 @@ - + diff --git a/build/dependencies.props b/build/dependencies.props index 5084b973..c03920fd 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -6,6 +6,7 @@ 5.0.2 4.3.0 10.0.1 + 2.0.0-* 4.5.24 1.6.1 4.7.0 From b28f85236f025b5d849553531c5081654c52e9b4 Mon Sep 17 00:00:00 2001 From: Ben Adams Date: Fri, 31 Mar 2017 18:36:59 +0100 Subject: [PATCH 014/411] Console type needs exe --- samples/misc/LatencyTest/LatencyTest.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/samples/misc/LatencyTest/LatencyTest.csproj b/samples/misc/LatencyTest/LatencyTest.csproj index 630d6e25..3aec2336 100644 --- a/samples/misc/LatencyTest/LatencyTest.csproj +++ b/samples/misc/LatencyTest/LatencyTest.csproj @@ -5,6 +5,7 @@ netcoreapp1.1 false + exe From c0205cfc4ed3a8fe65d5bf387ef6f8004d4b18a0 Mon Sep 17 00:00:00 2001 From: Pavlo Glazkov Date: Sat, 8 Apr 2017 13:34:19 +0200 Subject: [PATCH 015/411] Fix watchOptions in webpack.config.js being ignored by WebpackDevMiddleware (#806) This enables Docker HMR workflow and the workaround mentioned in this comment: https://github.com/aspnet/JavaScriptServices/issues/806#issuecomment-290081291 --- .../npm/aspnet-webpack/src/WebpackDevMiddleware.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/WebpackDevMiddleware.ts b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/WebpackDevMiddleware.ts index 154ccacd..bf31d822 100644 --- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/WebpackDevMiddleware.ts +++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/WebpackDevMiddleware.ts @@ -108,7 +108,8 @@ function attachWebpackDevMiddleware(app: any, webpackConfig: webpack.Configurati const compiler = webpack(webpackConfig); app.use(require('webpack-dev-middleware')(compiler, { noInfo: true, - publicPath: webpackConfig.output.publicPath + publicPath: webpackConfig.output.publicPath, + watchOptions: webpackConfig.watchOptions })); // After each compilation completes, copy the in-memory filesystem to disk. @@ -207,7 +208,7 @@ function pathJoinSafe(rootPath: string, filePath: string) { function beginWebpackWatcher(webpackConfig: webpack.Configuration) { const compiler = webpack(webpackConfig); - compiler.watch({ /* watchOptions */ }, (err, stats) => { + compiler.watch(webpackConfig.watchOptions || {}, (err, stats) => { // The default error reporter is fine for now, but could be customized here in the future if desired }); } From ea429cccf40a9d1c2746b49c061009f478282f4b Mon Sep 17 00:00:00 2001 From: Erick Galassi Date: Fri, 7 Apr 2017 18:17:10 -0300 Subject: [PATCH 016/411] Minimize CSS in production builds (all templates) --- templates/Angular2Spa/webpack.config.js | 2 +- templates/Angular2Spa/webpack.config.vendor.js | 4 ++-- templates/AureliaSpa/webpack.config.js | 2 +- templates/AureliaSpa/webpack.config.vendor.js | 2 +- templates/KnockoutSpa/webpack.config.js | 2 +- templates/KnockoutSpa/webpack.config.vendor.js | 2 +- templates/ReactReduxSpa/webpack.config.js | 2 +- templates/ReactReduxSpa/webpack.config.vendor.js | 4 ++-- templates/ReactSpa/webpack.config.js | 2 +- templates/ReactSpa/webpack.config.vendor.js | 2 +- templates/VueSpa/webpack.config.js | 2 +- templates/VueSpa/webpack.config.vendor.js | 2 +- templates/WebApplicationBasic/webpack.config.js | 2 +- templates/WebApplicationBasic/webpack.config.vendor.js | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/templates/Angular2Spa/webpack.config.js b/templates/Angular2Spa/webpack.config.js index 3cfc02ca..8c1969d3 100644 --- a/templates/Angular2Spa/webpack.config.js +++ b/templates/Angular2Spa/webpack.config.js @@ -18,7 +18,7 @@ module.exports = (env) => { rules: [ { test: /\.ts$/, include: /ClientApp/, use: ['awesome-typescript-loader?silent=true', 'angular2-template-loader'] }, { test: /\.html$/, use: 'html-loader?minimize=false' }, - { test: /\.css$/, use: ['to-string-loader', 'css-loader'] }, + { test: /\.css$/, use: [ 'to-string-loader', isDevBuild ? 'css-loader' : 'css-loader?minimize' ] }, { test: /\.(png|jpg|jpeg|gif|svg)$/, use: 'url-loader?limit=25000' } ] }, diff --git a/templates/Angular2Spa/webpack.config.vendor.js b/templates/Angular2Spa/webpack.config.vendor.js index 3b507ead..df1cfa85 100644 --- a/templates/Angular2Spa/webpack.config.vendor.js +++ b/templates/Angular2Spa/webpack.config.vendor.js @@ -51,7 +51,7 @@ module.exports = (env) => { output: { path: path.join(__dirname, 'wwwroot', 'dist') }, module: { rules: [ - { test: /\.css(\?|$)/, use: extractCSS.extract({ use: 'css-loader' }) } + { test: /\.css(\?|$)/, use: extractCSS.extract({ use: isDevBuild ? 'css-loader' : 'css-loader?minimize' }) } ] }, plugins: [ @@ -73,7 +73,7 @@ module.exports = (env) => { libraryTarget: 'commonjs2', }, module: { - rules: [ { test: /\.css(\?|$)/, use: ['to-string-loader', 'css-loader'] } ] + rules: [ { test: /\.css(\?|$)/, use: ['to-string-loader', isDevBuild ? 'css-loader' : 'css-loader?minimize' ] } ] }, entry: { vendor: ['aspnet-prerendering'] }, plugins: [ diff --git a/templates/AureliaSpa/webpack.config.js b/templates/AureliaSpa/webpack.config.js index a971f0c3..e529b58d 100644 --- a/templates/AureliaSpa/webpack.config.js +++ b/templates/AureliaSpa/webpack.config.js @@ -16,7 +16,7 @@ module.exports = { loaders: [ { test: /\.ts$/, include: /ClientApp/, loader: 'ts-loader', query: { silent: true } }, { test: /\.html$/, loader: 'html-loader' }, - { test: /\.css$/, loaders: [ 'style-loader', 'css-loader' ] }, + { test: /\.css$/, loaders: [ 'style-loader', isDevBuild ? 'css-loader' : 'css-loader?minimize' ] }, { test: /\.(png|woff|woff2|eot|ttf|svg)$/, loader: 'url-loader?limit=100000' }, { test: /\.json$/, loader: 'json-loader' } ] diff --git a/templates/AureliaSpa/webpack.config.vendor.js b/templates/AureliaSpa/webpack.config.vendor.js index da293bb6..dbde7047 100644 --- a/templates/AureliaSpa/webpack.config.vendor.js +++ b/templates/AureliaSpa/webpack.config.vendor.js @@ -11,7 +11,7 @@ module.exports = { module: { loaders: [ { test: /\.(png|woff|woff2|eot|ttf|svg)(\?|$)/, loader: 'url-loader?limit=100000' }, - { test: /\.css(\?|$)/, loader: extractCSS.extract(['css-loader']) } + { test: /\.css(\?|$)/, loader: extractCSS.extract([ isDevBuild ? 'css-loader' : 'css-loader?minimize' ]) } ] }, entry: { diff --git a/templates/KnockoutSpa/webpack.config.js b/templates/KnockoutSpa/webpack.config.js index 6d98babd..9be0b9ee 100644 --- a/templates/KnockoutSpa/webpack.config.js +++ b/templates/KnockoutSpa/webpack.config.js @@ -19,7 +19,7 @@ module.exports = (env) => { rules: [ { test: /\.ts$/, include: /ClientApp/, use: 'awesome-typescript-loader?silent=true' }, { test: /\.html$/, use: 'raw-loader' }, - { test: /\.css$/, use: isDevBuild ? ['style-loader', 'css-loader'] : ExtractTextPlugin.extract({ use: 'css-loader' }) }, + { test: /\.css$/, use: isDevBuild ? [ 'style-loader', 'css-loader' ] : ExtractTextPlugin.extract({ use: 'css-loader?minimize' }) }, { test: /\.(png|jpg|jpeg|gif|svg)$/, use: 'url-loader?limit=25000' } ] }, diff --git a/templates/KnockoutSpa/webpack.config.vendor.js b/templates/KnockoutSpa/webpack.config.vendor.js index 5ada91f4..f53c6bac 100644 --- a/templates/KnockoutSpa/webpack.config.vendor.js +++ b/templates/KnockoutSpa/webpack.config.vendor.js @@ -13,7 +13,7 @@ module.exports = (env) => { module: { rules: [ { test: /\.(png|woff|woff2|eot|ttf|svg)(\?|$)/, use: 'url-loader?limit=100000' }, - { test: /\.css(\?|$)/, use: extractCSS.extract({ use: 'css-loader' }) } + { test: /\.css(\?|$)/, use: extractCSS.extract({ use: isDevBuild ? 'css-loader' : 'css-loader?minimize' }) } ] }, entry: { diff --git a/templates/ReactReduxSpa/webpack.config.js b/templates/ReactReduxSpa/webpack.config.js index ce9ece32..98ebbc23 100644 --- a/templates/ReactReduxSpa/webpack.config.js +++ b/templates/ReactReduxSpa/webpack.config.js @@ -30,7 +30,7 @@ module.exports = (env) => { entry: { 'main-client': './ClientApp/boot-client.tsx' }, module: { rules: [ - { test: /\.css$/, use: ExtractTextPlugin.extract({ use: 'css-loader' }) }, + { test: /\.css$/, use: ExtractTextPlugin.extract({ use: isDevBuild ? 'css-loader' : 'css-loader?minimize' }) }, { test: /\.(png|jpg|jpeg|gif|svg)$/, use: 'url-loader?limit=25000' } ] }, diff --git a/templates/ReactReduxSpa/webpack.config.vendor.js b/templates/ReactReduxSpa/webpack.config.vendor.js index 9041e4f2..bd180821 100644 --- a/templates/ReactReduxSpa/webpack.config.vendor.js +++ b/templates/ReactReduxSpa/webpack.config.vendor.js @@ -49,7 +49,7 @@ module.exports = (env) => { output: { path: path.join(__dirname, 'wwwroot', 'dist') }, module: { rules: [ - { test: /\.css(\?|$)/, use: extractCSS.extract({ use: 'css-loader' }) } + { test: /\.css(\?|$)/, use: extractCSS.extract({ use: isDevBuild ? 'css-loader' : 'css-loader?minimize' }) } ] }, plugins: [ @@ -71,7 +71,7 @@ module.exports = (env) => { libraryTarget: 'commonjs2', }, module: { - rules: [ { test: /\.css(\?|$)/, use: 'css-loader' } ] + rules: [ { test: /\.css(\?|$)/, use: isDevBuild ? 'css-loader' : 'css-loader?minimize' } ] }, entry: { vendor: ['aspnet-prerendering', 'react-dom/server'] }, plugins: [ diff --git a/templates/ReactSpa/webpack.config.js b/templates/ReactSpa/webpack.config.js index fa76d107..a54d5cee 100644 --- a/templates/ReactSpa/webpack.config.js +++ b/templates/ReactSpa/webpack.config.js @@ -19,7 +19,7 @@ module.exports = (env) => { rules: [ { test: /\.ts(x?)$/, include: /ClientApp/, use: { loader: 'babel-loader', options: { cacheDirectory: true } } }, { test: /\.tsx?$/, include: /ClientApp/, use: 'awesome-typescript-loader?silent=true' }, - { test: /\.css$/, use: isDevBuild ? ['style-loader', 'css-loader'] : ExtractTextPlugin.extract({ use: 'css-loader' }) }, + { test: /\.css$/, use: isDevBuild ? ['style-loader', 'css-loader'] : ExtractTextPlugin.extract({ use: 'css-loader?minimize' }) }, { test: /\.(png|jpg|jpeg|gif|svg)$/, use: 'url-loader?limit=25000' } ] }, diff --git a/templates/ReactSpa/webpack.config.vendor.js b/templates/ReactSpa/webpack.config.vendor.js index 7ac7a7fd..c8eacdb4 100644 --- a/templates/ReactSpa/webpack.config.vendor.js +++ b/templates/ReactSpa/webpack.config.vendor.js @@ -13,7 +13,7 @@ module.exports = (env) => { module: { rules: [ { test: /\.(png|woff|woff2|eot|ttf|svg)(\?|$)/, use: 'url-loader?limit=100000' }, - { test: /\.css(\?|$)/, use: extractCSS.extract(['css-loader']) } + { test: /\.css(\?|$)/, use: extractCSS.extract([ isDevBuild ? 'css-loader' : 'css-loader?minimize' ]) } ] }, entry: { diff --git a/templates/VueSpa/webpack.config.js b/templates/VueSpa/webpack.config.js index c967f0a4..6bfda964 100644 --- a/templates/VueSpa/webpack.config.js +++ b/templates/VueSpa/webpack.config.js @@ -17,7 +17,7 @@ module.exports = (env) => { rules: [ { test: /\.vue\.html$/, include: /ClientApp/, loader: 'vue-loader', options: { loaders: { js: 'awesome-typescript-loader?silent=true' } } }, { test: /\.ts$/, include: /ClientApp/, use: 'awesome-typescript-loader?silent=true' }, - { test: /\.css$/, use: isDevBuild ? ['style-loader', 'css-loader'] : ExtractTextPlugin.extract({ use: 'css-loader' }) }, + { test: /\.css$/, use: isDevBuild ? [ 'style-loader', 'css-loader' ] : ExtractTextPlugin.extract({ use: 'css-loader?minimize' }) }, { test: /\.(png|jpg|jpeg|gif|svg)$/, use: 'url-loader?limit=25000' } ] }, diff --git a/templates/VueSpa/webpack.config.vendor.js b/templates/VueSpa/webpack.config.vendor.js index da8d7277..2cd2af60 100644 --- a/templates/VueSpa/webpack.config.vendor.js +++ b/templates/VueSpa/webpack.config.vendor.js @@ -22,7 +22,7 @@ module.exports = (env) => { }, module: { rules: [ - { test: /\.css(\?|$)/, use: extractCSS.extract({ use: 'css-loader' }) }, + { test: /\.css(\?|$)/, use: extractCSS.extract({ use: isDevBuild ? 'css-loader' : 'css-loader?minimize' }) }, { test: /\.(png|woff|woff2|eot|ttf|svg)(\?|$)/, use: 'url-loader?limit=100000' } ] }, diff --git a/templates/WebApplicationBasic/webpack.config.js b/templates/WebApplicationBasic/webpack.config.js index 712ab407..80ff4616 100644 --- a/templates/WebApplicationBasic/webpack.config.js +++ b/templates/WebApplicationBasic/webpack.config.js @@ -14,7 +14,7 @@ module.exports = merge({ module: { loaders: [ { test: /\.ts(x?)$/, include: /ClientApp/, loader: 'ts-loader?silent=true' }, - { test: /\.css/, loader: extractCSS.extract(['css-loader']) } + { test: /\.css/, loader: extractCSS.extract([ isDevelopment ? 'css-loader' : 'css-loader?minimize' ]) } ] }, entry: { diff --git a/templates/WebApplicationBasic/webpack.config.vendor.js b/templates/WebApplicationBasic/webpack.config.vendor.js index 546fd233..2efe99e8 100644 --- a/templates/WebApplicationBasic/webpack.config.vendor.js +++ b/templates/WebApplicationBasic/webpack.config.vendor.js @@ -11,7 +11,7 @@ module.exports = { module: { loaders: [ { test: /\.(png|woff|woff2|eot|ttf|svg)$/, loader: 'url-loader?limit=100000' }, - { test: /\.css/, loader: extractCSS.extract(['css-loader']) } + { test: /\.css/, loader: extractCSS.extract([ isDevelopment ? 'css-loader' : 'css-loader?minimize' ]) } ] }, entry: { From 37df30929cbb6b0b1cb41cf66c12413b873694e6 Mon Sep 17 00:00:00 2001 From: Meirion Hughes Date: Sun, 9 Apr 2017 08:53:22 +0100 Subject: [PATCH 017/411] Update Aurelia SPA template --- .../ClientApp/app/components/app/app.ts | 8 +- templates/AureliaSpa/ClientApp/boot.ts | 4 +- templates/AureliaSpa/Startup.cs | 2 +- templates/AureliaSpa/package.json | 60 ++++-------- templates/AureliaSpa/tsconfig.json | 2 +- templates/AureliaSpa/webpack.config.js | 92 +++++++++--------- templates/AureliaSpa/webpack.config.vendor.js | 95 ++++++++++--------- 7 files changed, 126 insertions(+), 137 deletions(-) diff --git a/templates/AureliaSpa/ClientApp/app/components/app/app.ts b/templates/AureliaSpa/ClientApp/app/components/app/app.ts index 6a70c185..1ff0e627 100644 --- a/templates/AureliaSpa/ClientApp/app/components/app/app.ts +++ b/templates/AureliaSpa/ClientApp/app/components/app/app.ts @@ -1,4 +1,4 @@ -import { Aurelia } from 'aurelia-framework'; +import { Aurelia, PLATFORM } from 'aurelia-framework'; import { Router, RouterConfiguration } from 'aurelia-router'; export class App { @@ -10,21 +10,21 @@ export class App { route: [ '', 'home' ], name: 'home', settings: { icon: 'home' }, - moduleId: '../home/home', + moduleId: PLATFORM.moduleName('../home/home'), nav: true, title: 'Home' }, { route: 'counter', name: 'counter', settings: { icon: 'education' }, - moduleId: '../counter/counter', + moduleId: PLATFORM.moduleName('../counter/counter'), nav: true, title: 'Counter' }, { route: 'fetch-data', name: 'fetchdata', settings: { icon: 'th-list' }, - moduleId: '../fetchdata/fetchdata', + moduleId: PLATFORM.moduleName('../fetchdata/fetchdata'), nav: true, title: 'Fetch data' }]); diff --git a/templates/AureliaSpa/ClientApp/boot.ts b/templates/AureliaSpa/ClientApp/boot.ts index da3bbf7f..5c9e2fd5 100644 --- a/templates/AureliaSpa/ClientApp/boot.ts +++ b/templates/AureliaSpa/ClientApp/boot.ts @@ -1,5 +1,5 @@ import 'isomorphic-fetch'; -import { Aurelia } from 'aurelia-framework'; +import { Aurelia, PLATFORM } from 'aurelia-framework'; import 'bootstrap/dist/css/bootstrap.css'; import 'bootstrap'; declare const IS_DEV_BUILD: boolean; // The value is supplied by Webpack during the build @@ -11,5 +11,5 @@ export function configure(aurelia: Aurelia) { aurelia.use.developmentLogging(); } - aurelia.start().then(() => aurelia.setRoot('app/components/app/app')); + aurelia.start().then(() => aurelia.setRoot(PLATFORM.moduleName('app/components/app/app'))); } diff --git a/templates/AureliaSpa/Startup.cs b/templates/AureliaSpa/Startup.cs index 412b4db7..4e801454 100644 --- a/templates/AureliaSpa/Startup.cs +++ b/templates/AureliaSpa/Startup.cs @@ -43,7 +43,7 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF app.UseDeveloperExceptionPage(); app.UseWebpackDevMiddleware(new WebpackDevMiddlewareOptions { - HotModuleReplacement = false // Aurelia Webpack Plugin HMR currently has issues. Leave this set to false. + HotModuleReplacement = true }); } else diff --git a/templates/AureliaSpa/package.json b/templates/AureliaSpa/package.json index 912b7a32..35857753 100644 --- a/templates/AureliaSpa/package.json +++ b/templates/AureliaSpa/package.json @@ -1,50 +1,30 @@ { - "name": "WebApplicationBasic", "version": "0.0.0", "dependencies": { - "aurelia-bootstrapper-webpack": "^1.0.0", - "aurelia-event-aggregator": "^1.0.0", - "aurelia-fetch-client": "^1.0.0", - "aurelia-framework": "^1.0.0", - "aurelia-history-browser": "^1.0.0", - "aurelia-loader-webpack": "^1.0.0", - "aurelia-logging-console": "^1.0.0", - "aurelia-pal-browser": "^1.0.0", - "aurelia-polyfills": "^1.0.0", - "aurelia-route-recognizer": "^1.0.0", - "aurelia-router": "^1.0.2", - "aurelia-templating-binding": "^1.0.0", - "aurelia-templating-resources": "^1.0.0", - "aurelia-templating-router": "^1.0.0", + "aurelia-bootstrapper": "^2.0.1", + "aurelia-fetch-client": "^1.0.1", + "aurelia-framework": "^1.1.0", + "aurelia-loader-webpack": "^2.0.0", + "aurelia-pal": "^1.3.0", + "aurelia-router": "^1.2.1", "bootstrap": "^3.3.7", "isomorphic-fetch": "^2.2.1", - "jquery": "^2.2.1" + "jquery": "^3.2.1" }, "devDependencies": { - "@types/node": "^6.0.45", - "aspnet-webpack": "^1.0.11", - "aurelia-webpack-plugin": "^1.1.0", - "copy-webpack-plugin": "^3.0.1", - "css": "^2.2.1", - "css-loader": "^0.25.0", - "expose-loader": "^0.7.1", - "extract-text-webpack-plugin": "2.0.0-beta.4", - "file-loader": "^0.9.0", - "html-loader": "^0.4.4", - "html-webpack-plugin": "^2.22.0", + "@types/node": "^7.0.12", + "aspnet-webpack": "^1.0.28", + "aurelia-webpack-plugin": "^2.0.0-rc.2", + "css-loader": "^0.28.0", + "extract-text-webpack-plugin": "^2.1.0", + "file-loader": "^0.11.1", + "html-loader": "^0.4.5", "json-loader": "^0.5.4", - "raw-loader": "^0.5.1", - "style-loader": "^0.13.1", - "to-string-loader": "^1.1.5", - "ts-loader": "^0.8.2", - "typescript": "^2.2.1", - "url-loader": "^0.5.7", - "webpack": "2.1.0-beta.25", - "webpack-hot-middleware": "^2.10.0" - }, - "aurelia": { - "build": { - "includeDependencies": "aurelia-*" - } + "style-loader": "^0.16.1", + "ts-loader": "^2.0.3", + "typescript": "^2.2.2", + "url-loader": "^0.5.8", + "webpack": "^2.3.3", + "webpack-hot-middleware": "^2.18.0" } } diff --git a/templates/AureliaSpa/tsconfig.json b/templates/AureliaSpa/tsconfig.json index 94b22fce..9ee62866 100644 --- a/templates/AureliaSpa/tsconfig.json +++ b/templates/AureliaSpa/tsconfig.json @@ -6,7 +6,7 @@ "experimentalDecorators": true, "emitDecoratorMetadata": true, "skipDefaultLibCheck": true, - "lib": [ "es6", "dom" ], + "lib": [ "es2015", "dom" ], "types": [ "node" ] }, "exclude": [ "bin", "node_modules" ], diff --git a/templates/AureliaSpa/webpack.config.js b/templates/AureliaSpa/webpack.config.js index e529b58d..0ace3e54 100644 --- a/templates/AureliaSpa/webpack.config.js +++ b/templates/AureliaSpa/webpack.config.js @@ -1,45 +1,51 @@ -var isDevBuild = process.argv.indexOf('--env.prod') < 0; -var path = require('path'); -var webpack = require('webpack'); -var AureliaWebpackPlugin = require('aurelia-webpack-plugin'); +const path = require('path'); +const webpack = require('webpack'); +const { AureliaPlugin } = require('aurelia-webpack-plugin'); -var bundleOutputDir = './wwwroot/dist'; -module.exports = { - resolve: { extensions: [ '.js', '.ts' ] }, - entry: { 'app': 'aurelia-bootstrapper-webpack' }, // Note: The aurelia-webpack-plugin will add your app's modules to this bundle automatically - output: { - path: path.resolve(bundleOutputDir), - publicPath: '/dist', - filename: '[name].js' - }, - module: { - loaders: [ - { test: /\.ts$/, include: /ClientApp/, loader: 'ts-loader', query: { silent: true } }, - { test: /\.html$/, loader: 'html-loader' }, - { test: /\.css$/, loaders: [ 'style-loader', isDevBuild ? 'css-loader' : 'css-loader?minimize' ] }, - { test: /\.(png|woff|woff2|eot|ttf|svg)$/, loader: 'url-loader?limit=100000' }, - { test: /\.json$/, loader: 'json-loader' } +module.exports = ({ prod } = {}) => { + const isDevBuild = !prod; + const isProdBuild = prod; + const bundleOutputDir = './wwwroot/dist'; + + return { + resolve: { + extensions: [".ts", ".js"], + modules: ["ClientApp", "node_modules"], + }, + entry: { 'app': 'aurelia-bootstrapper' }, + output: { + path: path.resolve(bundleOutputDir), + publicPath: "/dist/", + filename: '[name].js' + }, + module: { + rules: [ + { test: /\.css$/i, use: [isDevBuild ? 'css-loader' : 'css-loader?minimize'] }, + { test: /\.html$/i, use: ["html-loader"] }, + { test: /\.ts$/i, loaders: ['ts-loader'], exclude: path.resolve(__dirname, 'node_modules') }, + { test: /\.json$/i, loader: 'json-loader', exclude: path.resolve(__dirname, 'node_modules') }, + { test: /\.(png|woff|woff2|eot|ttf|svg)$/, loader: 'url-loader', query: { limit: 8192 } } + ] + }, + plugins: [ + new webpack.DefinePlugin({ IS_DEV_BUILD: JSON.stringify(isDevBuild) }), + new webpack.DllReferencePlugin({ + context: __dirname, + manifest: require('./wwwroot/dist/vendor-manifest.json') + }), + new AureliaPlugin({ aureliaApp: "boot" }), + ...when(isDevBuild, [ + new webpack.SourceMapDevToolPlugin({ + filename: '[file].map', + moduleFilenameTemplate: path.relative(bundleOutputDir, '[resourcePath]') + }) + ]), + ...when(isProdBuild, [ + new webpack.optimize.UglifyJsPlugin() + ]) ] - }, - plugins: [ - new webpack.DefinePlugin({ IS_DEV_BUILD: JSON.stringify(isDevBuild) }), - new webpack.DllReferencePlugin({ - context: __dirname, - manifest: require('./wwwroot/dist/vendor-manifest.json') - }), - new AureliaWebpackPlugin({ - root: path.resolve('./'), - src: path.resolve('./ClientApp'), - baseUrl: '/' - }) - ].concat(isDevBuild ? [ - // Plugins that apply in development builds only - new webpack.SourceMapDevToolPlugin({ - filename: '[file].map', // Remove this line if you prefer inline source maps - moduleFilenameTemplate: path.relative(bundleOutputDir, '[resourcePath]') // Point sourcemap entries to the original file locations on disk - }) - ] : [ - // Plugins that apply in production builds only - new webpack.optimize.UglifyJsPlugin() - ]) -}; + }; +} + +const ensureArray = (config) => config && (Array.isArray(config) ? config : [config]) || [] +const when = (condition, config, negativeConfig) => condition ? ensureArray(config) : ensureArray(negativeConfig) \ No newline at end of file diff --git a/templates/AureliaSpa/webpack.config.vendor.js b/templates/AureliaSpa/webpack.config.vendor.js index dbde7047..a3e30c54 100644 --- a/templates/AureliaSpa/webpack.config.vendor.js +++ b/templates/AureliaSpa/webpack.config.vendor.js @@ -1,52 +1,55 @@ -var isDevBuild = process.argv.indexOf('--env.prod') < 0; var path = require('path'); var webpack = require('webpack'); var ExtractTextPlugin = require('extract-text-webpack-plugin'); var extractCSS = new ExtractTextPlugin('vendor.css'); -module.exports = { - resolve: { - extensions: [ '.js' ] - }, - module: { - loaders: [ - { test: /\.(png|woff|woff2|eot|ttf|svg)(\?|$)/, loader: 'url-loader?limit=100000' }, - { test: /\.css(\?|$)/, loader: extractCSS.extract([ isDevBuild ? 'css-loader' : 'css-loader?minimize' ]) } - ] - }, - entry: { - vendor: [ - 'aurelia-event-aggregator', - 'aurelia-fetch-client', - 'aurelia-framework', - 'aurelia-history-browser', - 'aurelia-logging-console', - 'aurelia-pal-browser', - 'aurelia-polyfills', - 'aurelia-route-recognizer', - 'aurelia-router', - 'aurelia-templating-binding', - 'aurelia-templating-resources', - 'aurelia-templating-router', - 'bootstrap', - 'bootstrap/dist/css/bootstrap.css', - 'jquery' - ], - }, - output: { - path: path.join(__dirname, 'wwwroot', 'dist'), - publicPath: '/dist/', - filename: '[name].js', - library: '[name]_[hash]', - }, - plugins: [ - extractCSS, - new webpack.ProvidePlugin({ $: 'jquery', jQuery: 'jquery' }), // Maps these identifiers to the jQuery package (because Bootstrap expects it to be a global variable) - new webpack.DllPlugin({ - path: path.join(__dirname, 'wwwroot', 'dist', '[name]-manifest.json'), - name: '[name]_[hash]' - }) - ].concat(isDevBuild ? [] : [ - new webpack.optimize.UglifyJsPlugin({ compress: { warnings: false } }) - ]) +module.exports = ({ prod } = {}) => { + const isDevBuild = !prod; + + return { + resolve: { + extensions: ['.js'] + }, + module: { + loaders: [ + { test: /\.(png|woff|woff2|eot|ttf|svg)(\?|$)/, loader: 'url-loader?limit=100000' }, + { test: /\.css(\?|$)/, loader: extractCSS.extract([isDevBuild ? 'css-loader' : 'css-loader?minimize']) } + ] + }, + entry: { + vendor: [ + 'aurelia-event-aggregator', + 'aurelia-fetch-client', + 'aurelia-framework', + 'aurelia-history-browser', + 'aurelia-logging-console', + 'aurelia-pal-browser', + 'aurelia-polyfills', + 'aurelia-route-recognizer', + 'aurelia-router', + 'aurelia-templating-binding', + 'aurelia-templating-resources', + 'aurelia-templating-router', + 'bootstrap', + 'bootstrap/dist/css/bootstrap.css', + 'jquery' + ], + }, + output: { + path: path.join(__dirname, 'wwwroot', 'dist'), + publicPath: '/dist/', + filename: '[name].js', + library: '[name]_[hash]', + }, + plugins: [ + extractCSS, + new webpack.ProvidePlugin({ $: 'jquery', jQuery: 'jquery' }), // Maps these identifiers to the jQuery package (because Bootstrap expects it to be a global variable) + new webpack.DllPlugin({ + path: path.join(__dirname, 'wwwroot', 'dist', '[name]-manifest.json'), + name: '[name]_[hash]' + }) + ].concat(isDevBuild ? [] : [ + new webpack.optimize.UglifyJsPlugin({ compress: { warnings: false } }) + ]) + } }; From e3a8c13c22d72eb75cf6fd636c4731eeba627fcc Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 4 May 2017 12:36:25 +0100 Subject: [PATCH 018/411] Make Aurelia webpack config as consistent as possible with the other templates --- templates/AureliaSpa/webpack.config.js | 53 ++++++++----------- templates/AureliaSpa/webpack.config.vendor.js | 5 +- 2 files changed, 26 insertions(+), 32 deletions(-) diff --git a/templates/AureliaSpa/webpack.config.js b/templates/AureliaSpa/webpack.config.js index 0ace3e54..4ddc35cc 100644 --- a/templates/AureliaSpa/webpack.config.js +++ b/templates/AureliaSpa/webpack.config.js @@ -1,30 +1,28 @@ const path = require('path'); const webpack = require('webpack'); const { AureliaPlugin } = require('aurelia-webpack-plugin'); +const bundleOutputDir = './wwwroot/dist'; -module.exports = ({ prod } = {}) => { - const isDevBuild = !prod; - const isProdBuild = prod; - const bundleOutputDir = './wwwroot/dist'; - - return { +module.exports = (env) => { + const isDevBuild = !(env && env.prod); + return [{ + stats: { modules: false }, + entry: { 'app': 'aurelia-bootstrapper' }, resolve: { - extensions: [".ts", ".js"], - modules: ["ClientApp", "node_modules"], + extensions: ['.ts', '.js'], + modules: ['ClientApp', 'node_modules'], }, - entry: { 'app': 'aurelia-bootstrapper' }, output: { path: path.resolve(bundleOutputDir), - publicPath: "/dist/", + publicPath: '/dist/', filename: '[name].js' }, module: { rules: [ - { test: /\.css$/i, use: [isDevBuild ? 'css-loader' : 'css-loader?minimize'] }, - { test: /\.html$/i, use: ["html-loader"] }, - { test: /\.ts$/i, loaders: ['ts-loader'], exclude: path.resolve(__dirname, 'node_modules') }, - { test: /\.json$/i, loader: 'json-loader', exclude: path.resolve(__dirname, 'node_modules') }, - { test: /\.(png|woff|woff2|eot|ttf|svg)$/, loader: 'url-loader', query: { limit: 8192 } } + { test: /\.ts$/i, include: /ClientApp/, use: 'ts-loader?silent=true' }, + { test: /\.html$/i, use: 'html-loader' }, + { test: /\.css$/i, use: isDevBuild ? 'css-loader' : 'css-loader?minimize' }, + { test: /\.(png|jpg|jpeg|gif|svg)$/, use: 'url-loader?limit=25000' } ] }, plugins: [ @@ -33,19 +31,14 @@ module.exports = ({ prod } = {}) => { context: __dirname, manifest: require('./wwwroot/dist/vendor-manifest.json') }), - new AureliaPlugin({ aureliaApp: "boot" }), - ...when(isDevBuild, [ - new webpack.SourceMapDevToolPlugin({ - filename: '[file].map', - moduleFilenameTemplate: path.relative(bundleOutputDir, '[resourcePath]') - }) - ]), - ...when(isProdBuild, [ - new webpack.optimize.UglifyJsPlugin() - ]) - ] - }; + new AureliaPlugin({ aureliaApp: 'boot' }) + ].concat(isDevBuild ? [ + new webpack.SourceMapDevToolPlugin({ + filename: '[file].map', // Remove this line if you prefer inline source maps + moduleFilenameTemplate: path.relative(bundleOutputDir, '[resourcePath]') // Point sourcemap entries to the original file locations on disk + }) + ] : [ + new webpack.optimize.UglifyJsPlugin() + ]) + }]; } - -const ensureArray = (config) => config && (Array.isArray(config) ? config : [config]) || [] -const when = (condition, config, negativeConfig) => condition ? ensureArray(config) : ensureArray(negativeConfig) \ No newline at end of file diff --git a/templates/AureliaSpa/webpack.config.vendor.js b/templates/AureliaSpa/webpack.config.vendor.js index a3e30c54..9625a315 100644 --- a/templates/AureliaSpa/webpack.config.vendor.js +++ b/templates/AureliaSpa/webpack.config.vendor.js @@ -6,7 +6,8 @@ var extractCSS = new ExtractTextPlugin('vendor.css'); module.exports = ({ prod } = {}) => { const isDevBuild = !prod; - return { + return [{ + stats: { modules: false }, resolve: { extensions: ['.js'] }, @@ -51,5 +52,5 @@ module.exports = ({ prod } = {}) => { ].concat(isDevBuild ? [] : [ new webpack.optimize.UglifyJsPlugin({ compress: { warnings: false } }) ]) - } + }] }; From 018a3e65ffe5bcafb1032467ec4bdbac523732ed Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 4 May 2017 12:41:30 +0100 Subject: [PATCH 019/411] Put back "name" in AureliaSpa package.json because this is auto-replaced during template evaluation --- templates/AureliaSpa/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/AureliaSpa/package.json b/templates/AureliaSpa/package.json index 35857753..86cd0015 100644 --- a/templates/AureliaSpa/package.json +++ b/templates/AureliaSpa/package.json @@ -1,4 +1,5 @@ { + "name": "WebApplicationBasic", "version": "0.0.0", "dependencies": { "aurelia-bootstrapper": "^2.0.1", From 54884459bd3bc54fc70b13ae0ac29fdfa0f12c09 Mon Sep 17 00:00:00 2001 From: Matt Perry Date: Wed, 3 May 2017 22:19:42 -0400 Subject: [PATCH 020/411] Allow proxy middleware to abort long running connections. --- .../Webpack/ConditionalProxyMiddleware.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Microsoft.AspNetCore.SpaServices/Webpack/ConditionalProxyMiddleware.cs b/src/Microsoft.AspNetCore.SpaServices/Webpack/ConditionalProxyMiddleware.cs index 5a56c81b..be1cc38e 100644 --- a/src/Microsoft.AspNetCore.SpaServices/Webpack/ConditionalProxyMiddleware.cs +++ b/src/Microsoft.AspNetCore.SpaServices/Webpack/ConditionalProxyMiddleware.cs @@ -16,6 +16,7 @@ namespace Microsoft.AspNetCore.SpaServices.Webpack /// internal class ConditionalProxyMiddleware { + private const int BUFFER_SIZE = 1024; private readonly HttpClient _httpClient; private readonly RequestDelegate _next; private readonly ConditionalProxyMiddlewareOptions _options; @@ -93,7 +94,12 @@ private async Task PerformProxyRequest(HttpContext context) // SendAsync removes chunking from the response. This removes the header so it doesn't expect a chunked response. context.Response.Headers.Remove("transfer-encoding"); - await responseMessage.Content.CopyToAsync(context.Response.Body); + + using (var responseStream = await responseMessage.Content.ReadAsStreamAsync()) + { + await responseStream.CopyToAsync(context.Response.Body, BUFFER_SIZE, context.RequestAborted); + } + return true; } } From 02b31d05a2ffdb48705e30070cdec8384a123e55 Mon Sep 17 00:00:00 2001 From: Matt Perry Date: Wed, 3 May 2017 22:39:48 -0400 Subject: [PATCH 021/411] Stick closer to established style guides. Up buffer size to match websocket buffer size from original proxy code. --- .../Webpack/ConditionalProxyMiddleware.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Microsoft.AspNetCore.SpaServices/Webpack/ConditionalProxyMiddleware.cs b/src/Microsoft.AspNetCore.SpaServices/Webpack/ConditionalProxyMiddleware.cs index be1cc38e..8168689d 100644 --- a/src/Microsoft.AspNetCore.SpaServices/Webpack/ConditionalProxyMiddleware.cs +++ b/src/Microsoft.AspNetCore.SpaServices/Webpack/ConditionalProxyMiddleware.cs @@ -16,7 +16,8 @@ namespace Microsoft.AspNetCore.SpaServices.Webpack /// internal class ConditionalProxyMiddleware { - private const int BUFFER_SIZE = 1024; + private const int DefaultHttpBufferSize = 4096; + private readonly HttpClient _httpClient; private readonly RequestDelegate _next; private readonly ConditionalProxyMiddlewareOptions _options; From cdbbbcc473c7da06f240253d6c60c8e3518f5be6 Mon Sep 17 00:00:00 2001 From: Matt Perry Date: Wed, 3 May 2017 22:41:48 -0400 Subject: [PATCH 022/411] Fix build break --- .../Webpack/ConditionalProxyMiddleware.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.AspNetCore.SpaServices/Webpack/ConditionalProxyMiddleware.cs b/src/Microsoft.AspNetCore.SpaServices/Webpack/ConditionalProxyMiddleware.cs index 8168689d..118e2640 100644 --- a/src/Microsoft.AspNetCore.SpaServices/Webpack/ConditionalProxyMiddleware.cs +++ b/src/Microsoft.AspNetCore.SpaServices/Webpack/ConditionalProxyMiddleware.cs @@ -98,7 +98,7 @@ private async Task PerformProxyRequest(HttpContext context) using (var responseStream = await responseMessage.Content.ReadAsStreamAsync()) { - await responseStream.CopyToAsync(context.Response.Body, BUFFER_SIZE, context.RequestAborted); + await responseStream.CopyToAsync(context.Response.Body, DefaultHttpBufferSize, context.RequestAborted); } return true; From cbaeb1c05571361f5f9a1bbb9e6c8890bdce0e21 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 4 May 2017 13:17:24 +0100 Subject: [PATCH 023/411] Fix ReactReduxSpa build issue. Fixes #859 and #878 --- templates/ReactReduxSpa/ClientApp/components/NavMenu.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/ReactReduxSpa/ClientApp/components/NavMenu.tsx b/templates/ReactReduxSpa/ClientApp/components/NavMenu.tsx index 010e5060..e3158f61 100644 --- a/templates/ReactReduxSpa/ClientApp/components/NavMenu.tsx +++ b/templates/ReactReduxSpa/ClientApp/components/NavMenu.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { Link } from 'react-router'; -export class NavMenu extends React.Component { +export class NavMenu extends React.Component { public render() { return
From 1862e388e16b40836528607fde3f2c823ef12dcb Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 4 May 2017 13:21:35 +0100 Subject: [PATCH 024/411] Bump aspnet-prerendering to 2.0.4 for publish --- .../npm/aspnet-prerendering/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/package.json b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/package.json index 5a7281b1..9c644abc 100644 --- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/package.json +++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/package.json @@ -1,6 +1,6 @@ { "name": "aspnet-prerendering", - "version": "2.0.3", + "version": "2.0.4", "description": "Helpers for server-side rendering of JavaScript applications in ASP.NET Core projects. Works in conjunction with the Microsoft.AspNetCore.SpaServices NuGet package.", "main": "index.js", "scripts": { From 3dca3c37ff69fdb18c16f686e14ca066023a614f Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 4 May 2017 13:33:25 +0100 Subject: [PATCH 025/411] Bump aspnet-webpack to 1.0.29 for publish --- .../npm/aspnet-webpack/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/package.json b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/package.json index c319c266..010d2264 100644 --- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/package.json +++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/package.json @@ -1,6 +1,6 @@ { "name": "aspnet-webpack", - "version": "1.0.28", + "version": "1.0.29", "description": "Helpers for using Webpack in ASP.NET Core projects. Works in conjunction with the Microsoft.AspNetCore.SpaServices NuGet package.", "main": "index.js", "scripts": { From 6300f6cdcd456414e8ee2f6d5aad3faa70142fa3 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 4 May 2017 13:37:56 +0100 Subject: [PATCH 026/411] Have CI build 1.1.1 RTM versions of NodeServices/SpaServices for release --- .../Microsoft.AspNetCore.NodeServices.csproj | 2 +- .../Microsoft.AspNetCore.SpaServices.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj b/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj index cf98c736..449ad6f4 100644 --- a/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj +++ b/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj @@ -6,7 +6,7 @@ Invoke Node.js modules at runtime in ASP.NET Core applications. net451;netstandard1.6 1.1.1 - alpha + rtm aspnetcore;aspnetcoremvc;nodeservices true diff --git a/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj b/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj index 9fdde2e7..9ff8d55a 100644 --- a/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj +++ b/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj @@ -6,7 +6,7 @@ Helpers for building single-page applications on ASP.NET MVC Core. net451;netstandard1.6 1.1.1 - alpha + rtm aspnetcore;aspnetcoremvc;nodeservices true From f18e0be1280f611eddbfcd010570c65384528b97 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 4 May 2017 14:03:00 +0100 Subject: [PATCH 027/411] Fix VersionSuffix in build --- build/common.props | 1 + 1 file changed, 1 insertion(+) diff --git a/build/common.props b/build/common.props index c6d78507..e4f72324 100644 --- a/build/common.props +++ b/build/common.props @@ -10,6 +10,7 @@ true true true + $(VersionSuffix)-$(BuildNumber) From decb13b33b59a72660da168b5d99661fc262eb75 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 4 May 2017 14:07:00 +0100 Subject: [PATCH 028/411] Make versions consistent across all .NET projects --- build/common.props | 1 + build/version.props | 6 ++++++ .../Microsoft.AspNetCore.AngularServices.csproj | 2 -- .../Microsoft.AspNetCore.NodeServices.Sockets.csproj | 2 -- .../Microsoft.AspNetCore.NodeServices.csproj | 2 -- .../Microsoft.AspNetCore.ReactServices.csproj | 2 -- .../Microsoft.AspNetCore.SpaServices.csproj | 2 -- 7 files changed, 7 insertions(+), 10 deletions(-) create mode 100644 build/version.props diff --git a/build/common.props b/build/common.props index e4f72324..de4792ed 100644 --- a/build/common.props +++ b/build/common.props @@ -1,6 +1,7 @@ + Microsoft ASP.NET Core diff --git a/build/version.props b/build/version.props new file mode 100644 index 00000000..2b029e5b --- /dev/null +++ b/build/version.props @@ -0,0 +1,6 @@ + + + 1.1.1 + rtm + + diff --git a/src/Microsoft.AspNetCore.AngularServices/Microsoft.AspNetCore.AngularServices.csproj b/src/Microsoft.AspNetCore.AngularServices/Microsoft.AspNetCore.AngularServices.csproj index 89171417..2c6a0151 100644 --- a/src/Microsoft.AspNetCore.AngularServices/Microsoft.AspNetCore.AngularServices.csproj +++ b/src/Microsoft.AspNetCore.AngularServices/Microsoft.AspNetCore.AngularServices.csproj @@ -5,8 +5,6 @@ Helpers for building Angular 2 applications on ASP.NET Core. net451;netstandard1.6 - 1.1.0 - beta2 aspnetcore;aspnetcoremvc;nodeservices true diff --git a/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj b/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj index 476bc293..3319bf29 100644 --- a/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj +++ b/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj @@ -5,8 +5,6 @@ Socket-based RPC for Microsoft.AspNetCore.NodeServices. net451;netstandard1.6 - 1.1.0 - beta2 aspnetcore;aspnetcoremvc;nodeservices true diff --git a/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj b/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj index 449ad6f4..5c440e4a 100644 --- a/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj +++ b/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj @@ -5,8 +5,6 @@ Invoke Node.js modules at runtime in ASP.NET Core applications. net451;netstandard1.6 - 1.1.1 - rtm aspnetcore;aspnetcoremvc;nodeservices true diff --git a/src/Microsoft.AspNetCore.ReactServices/Microsoft.AspNetCore.ReactServices.csproj b/src/Microsoft.AspNetCore.ReactServices/Microsoft.AspNetCore.ReactServices.csproj index f9c6b8ee..0f6e26a5 100644 --- a/src/Microsoft.AspNetCore.ReactServices/Microsoft.AspNetCore.ReactServices.csproj +++ b/src/Microsoft.AspNetCore.ReactServices/Microsoft.AspNetCore.ReactServices.csproj @@ -5,8 +5,6 @@ Helpers for building React applications on ASP.NET Core. net451;netstandard1.6 - 1.1.0 - beta2 aspnetcore;aspnetcoremvc;nodeservices true diff --git a/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj b/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj index 9ff8d55a..6eaa3655 100644 --- a/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj +++ b/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj @@ -5,8 +5,6 @@ Helpers for building single-page applications on ASP.NET MVC Core. net451;netstandard1.6 - 1.1.1 - rtm aspnetcore;aspnetcoremvc;nodeservices true From 15ceec0b3fc0a44ec9fe9c0aa69b31009595cb52 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 4 May 2017 14:15:16 +0100 Subject: [PATCH 029/411] Have templates declare dependency on SpaServices 1.1.1 --- templates/Angular2Spa/Angular2Spa.csproj | 2 +- templates/AureliaSpa/AureliaSpa.csproj | 2 +- templates/KnockoutSpa/KnockoutSpa.csproj | 2 +- templates/ReactReduxSpa/ReactReduxSpa.csproj | 2 +- templates/ReactSpa/ReactSpa.csproj | 2 +- templates/VueSpa/VueSpa.csproj | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/Angular2Spa/Angular2Spa.csproj b/templates/Angular2Spa/Angular2Spa.csproj index 2fb16c25..b8bd8238 100644 --- a/templates/Angular2Spa/Angular2Spa.csproj +++ b/templates/Angular2Spa/Angular2Spa.csproj @@ -7,7 +7,7 @@ - + diff --git a/templates/AureliaSpa/AureliaSpa.csproj b/templates/AureliaSpa/AureliaSpa.csproj index db423e26..287fc635 100644 --- a/templates/AureliaSpa/AureliaSpa.csproj +++ b/templates/AureliaSpa/AureliaSpa.csproj @@ -7,7 +7,7 @@ - + diff --git a/templates/KnockoutSpa/KnockoutSpa.csproj b/templates/KnockoutSpa/KnockoutSpa.csproj index db423e26..287fc635 100644 --- a/templates/KnockoutSpa/KnockoutSpa.csproj +++ b/templates/KnockoutSpa/KnockoutSpa.csproj @@ -7,7 +7,7 @@ - + diff --git a/templates/ReactReduxSpa/ReactReduxSpa.csproj b/templates/ReactReduxSpa/ReactReduxSpa.csproj index 2fb16c25..b8bd8238 100644 --- a/templates/ReactReduxSpa/ReactReduxSpa.csproj +++ b/templates/ReactReduxSpa/ReactReduxSpa.csproj @@ -7,7 +7,7 @@ - + diff --git a/templates/ReactSpa/ReactSpa.csproj b/templates/ReactSpa/ReactSpa.csproj index db423e26..287fc635 100644 --- a/templates/ReactSpa/ReactSpa.csproj +++ b/templates/ReactSpa/ReactSpa.csproj @@ -7,7 +7,7 @@ - + diff --git a/templates/VueSpa/VueSpa.csproj b/templates/VueSpa/VueSpa.csproj index db423e26..287fc635 100644 --- a/templates/VueSpa/VueSpa.csproj +++ b/templates/VueSpa/VueSpa.csproj @@ -7,7 +7,7 @@ - + From e48ee287c292261466a4cefe959b3de98e3749c8 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 4 May 2017 14:24:59 +0100 Subject: [PATCH 030/411] Change .NET package versions since subsequent builds won't be RTM releases --- build/version.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/version.props b/build/version.props index 2b029e5b..2ebde7d5 100644 --- a/build/version.props +++ b/build/version.props @@ -1,6 +1,6 @@ - 1.1.1 - rtm + 1.1.2 + preview1 From d41f47f5bc0ec7d37072eb44cb64fa4770bbec33 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 4 May 2017 18:20:25 +0100 Subject: [PATCH 031/411] Make statusCode optional on RenderToStringResult. Fixes #917 and #918 --- .../npm/aspnet-prerendering/src/PrerenderingInterfaces.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/PrerenderingInterfaces.d.ts b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/PrerenderingInterfaces.d.ts index 446a2420..248c4e8c 100644 --- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/PrerenderingInterfaces.d.ts +++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/PrerenderingInterfaces.d.ts @@ -8,7 +8,7 @@ interface RenderToStringCallback { interface RenderToStringResult { html: string; - statusCode: number; + statusCode?: number; globals?: { [key: string]: any }; } From 5a5b309cdf3086d8aeeae83a19bddd40bdb53941 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 4 May 2017 18:20:38 +0100 Subject: [PATCH 032/411] Bump aspnet-prerendering to 2.0.5 for release --- .../npm/aspnet-prerendering/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/package.json b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/package.json index 9c644abc..a162d463 100644 --- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/package.json +++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/package.json @@ -1,6 +1,6 @@ { "name": "aspnet-prerendering", - "version": "2.0.4", + "version": "2.0.5", "description": "Helpers for server-side rendering of JavaScript applications in ASP.NET Core projects. Works in conjunction with the Microsoft.AspNetCore.SpaServices NuGet package.", "main": "index.js", "scripts": { From 76c7db42b9cf08928d7d77fa464694d01051059a Mon Sep 17 00:00:00 2001 From: Rick Anderson Date: Mon, 24 Apr 2017 11:19:28 -1000 Subject: [PATCH 033/411] Update README.md --- README.md | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 36cddfcc..db4ce553 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,11 @@ This project is part of ASP.NET Core. You can find samples, documentation and ge ## What is this? -`JavaScriptServices` is a set of technologies for ASP.NET Core developers. It provides infrastructure that you'll find useful if you use Angular 2 / React / Knockout / etc. on the client, or if you build your client-side resources using Webpack, or otherwise want to execute JavaScript on the server at runtime. +`JavaScriptServices` is a set of client-side technologies for ASP.NET Core. It provides infrastructure that you'll find useful if you: + +- Use Angular 2 / React / Knockout / etc. +- Build your client-side resources using Webpack. +- Execute JavaScript on the server at runtime. This repo contains: @@ -22,22 +26,22 @@ This repo contains: * A Yeoman generator that creates preconfigured app starting points ([guide](http://blog.stevensanderson.com/2016/05/02/angular2-react-knockout-apps-on-aspnet-core/)) * Samples and docs -Everything here is cross-platform, and works with .NET Core 1.0.1 or later on Windows, Linux, or OS X. +It's cross-platform (Windows, Linux, or macOS) and works with .NET Core 1.0.1 or later. ## Creating new applications -If you want to build a brand-new ASP.NET Core app that uses Angular 2 / React / Knockout on the client, consider starting with the `aspnetcore-spa` generator. This lets you choose your client-side framework, and generates a starting point that includes applicable features such as Webpack dev middleware, server-side prerendering, and efficient production builds. It's much easier than configuring everything to work together manually! +If you want to build a brand-new ASP.NET Core app that uses Angular 2 / React / Knockout on the client, consider starting with the `aspnetcore-spa` generator. This lets you choose your client-side framework. It generates a starting point that includes applicable features such as Webpack dev middleware, server-side prerendering, and efficient production builds. It's much easier than configuring everything to work together manually! -To do this, first install Yeoman and these generator templates: +To do this, install Yeoman and these generator templates: npm install -g yo generator-aspnetcore-spa -Then you can generate your new application starting point: +Generate your new application starting point: cd some-empty-directory yo aspnetcore-spa -Finally, once the generator has run and restored all the dependencies, you can start up your new ASP.NET Core Single Page Application: +Once the generator has run and restored all the dependencies, you can start up your new ASP.NET Core SPA: dotnet run @@ -56,7 +60,7 @@ If you have an existing ASP.NET Core application, or if you just want to use the * Find [documentation and usage examples here](https://github.com/aspnet/JavaScriptServices/tree/dev/src/Microsoft.AspNetCore.SpaServices#microsoftaspnetcorespaservices). * `Microsoft.AspNetCore.AngularServices` * This builds on the `SpaServices` package and includes features specific to Angular 2. Currently, this includes validation helpers and a "cache priming" feature, which let you pre-evaluate ajax requests on the server so that client-side code doesn't need to make network calls once it's loaded. - * The code is [here](https://github.com/aspnet/JavaScriptServices/tree/dev/src/Microsoft.AspNetCore.AngularServices), and you'll find a usage example for [the validation helper here](https://github.com/aspnet/JavaScriptServices/blob/dev/samples/angular/MusicStore/wwwroot/ng-app/components/admin/album-edit/album-edit.ts), and for the [cache priming here](https://github.com/aspnet/JavaScriptServices/blob/dev/samples/angular/MusicStore/Views/Home/Index.cshtml#L7-8). Full docs are to be written. + * The code is [here](https://github.com/aspnet/JavaScriptServices/tree/dev/src/Microsoft.AspNetCore.AngularServices), and you'll find a usage example for [the validation helper here](https://github.com/aspnet/JavaScriptServices/blob/dev/samples/angular/MusicStore/wwwroot/ng-app/components/admin/album-edit/album-edit.ts), and for the [cache priming here](https://github.com/aspnet/JavaScriptServices/blob/dev/samples/angular/MusicStore/Views/Home/Index.cshtml#L7-8). Complete documentation is planned. There was previously a `Microsoft.AspNetCore.ReactServices` but this is not currently needed - all applicable functionality is in `Microsoft.AspNetCore.SpaServices`, because it's sufficiently general. We might add a new `Microsoft.AspNetCore.ReactServices` package in the future if new React-specific requirements emerge. @@ -64,15 +68,18 @@ If you want to build a helper library for some other SPA framework, you can do s ## Samples and templates -Inside this repo, [the `templates` directory](https://github.com/aspnet/JavaScriptServices/tree/dev/templates) contains the application starting points that the `aspnetcore-spa` generator emits. If you want, you can clone this repo and run those applications directly. But it's easier to [use the Yeoman tool to run the generator](http://blog.stevensanderson.com/2016/05/02/angular2-react-knockout-apps-on-aspnet-core/). +Inside this repo, [the `templates` directory](https://github.com/aspnet/JavaScriptServices/tree/dev/templates) contains the application starting points that the `aspnetcore-spa` generator emits. You can clone this repo and run those applications directly. But it's easier to [use the Yeoman tool to run the generator](http://blog.stevensanderson.com/2016/05/02/angular2-react-knockout-apps-on-aspnet-core/). + +The [ `samples` directory](https://github.com/aspnet/JavaScriptServices/tree/dev/samples) contains examples of: -Also in this repo, [the `samples` directory](https://github.com/aspnet/JavaScriptServices/tree/dev/samples) contains examples of using the JavaScript services family of packages with Angular 2 and React, plus examples of standalone `NodeServices` usage for runtime code transpilation and image processing. +- Using the JavaScript services family of packages with Angular 2 and React. +- A standalone `NodeServices` usage for runtime code transpilation and image processing. **To run the samples:** * Clone this repo * At the repo's root directory (the one containing `src`, `samples`, etc.), run `dotnet restore` - * Change directory to the sample you want to run (e.g., `cd samples/angular/MusicStore`) + * Change directory to the sample you want to run (for example, `cd samples/angular/MusicStore`) * Restore Node dependencies by running `npm install` * If you're trying to run the Angular 2 "Music Store" sample, then also run `gulp` (which you need to have installed globally). None of the other samples require this. * Run the application (`dotnet run`) @@ -84,8 +91,8 @@ If you're interested in contributing to the various packages, samples, and proje * Cloning the repo * Running `dotnet restore` at the repo root dir - * Going to whatever sample or template you want to run (e.g., `cd templates/Angular2Spa`) + * Going to whatever sample or template you want to run (for example, `cd templates/Angular2Spa`) * Restoring NPM dependencies (run `npm install`) * Launching it (`dotnet run`) -If you're planning to submit a pull request, and if it's more than a trivial fix (e.g., for a typo), it's usually a good idea first to file an issue describing what you're proposing to do and how it will work. Then you can find out if it's likely that such a pull request will be accepted, and how it fits into wider ongoing plans. +If you're planning to submit a pull request, and if it's more than a trivial fix (for example, for a typo), it's usually a good idea first to file an issue describing what you're proposing to do and how it will work. Then you can find out if it's likely that such a pull request will be accepted, and how it fits into wider ongoing plans. From 8f3e9308cc2a751fb8289dc664ce476760167432 Mon Sep 17 00:00:00 2001 From: Rick Anderson Date: Mon, 24 Apr 2017 11:23:26 -1000 Subject: [PATCH 034/411] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index db4ce553..61120631 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,7 @@ If you want to build a helper library for some other SPA framework, you can do s Inside this repo, [the `templates` directory](https://github.com/aspnet/JavaScriptServices/tree/dev/templates) contains the application starting points that the `aspnetcore-spa` generator emits. You can clone this repo and run those applications directly. But it's easier to [use the Yeoman tool to run the generator](http://blog.stevensanderson.com/2016/05/02/angular2-react-knockout-apps-on-aspnet-core/). -The [ `samples` directory](https://github.com/aspnet/JavaScriptServices/tree/dev/samples) contains examples of: +The [`samples` directory](https://github.com/aspnet/JavaScriptServices/tree/dev/samples) contains examples of: - Using the JavaScript services family of packages with Angular 2 and React. - A standalone `NodeServices` usage for runtime code transpilation and image processing. From c570d79dcc49f7e4dd723b09d01989bae4bbd4d6 Mon Sep 17 00:00:00 2001 From: Rick Anderson Date: Tue, 25 Apr 2017 10:19:08 -1000 Subject: [PATCH 035/411] removed cache priming --- README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 61120631..874fa746 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,6 @@ This repo contains: * Hot module replacement (HMR) ([docs](https://github.com/aspnet/JavaScriptServices/tree/dev/src/Microsoft.AspNetCore.SpaServices#webpack-hot-module-replacement)) * Server-side and client-side routing integration ([docs](https://github.com/aspnet/JavaScriptServices/tree/dev/src/Microsoft.AspNetCore.SpaServices#routing-helper-mapspafallbackroute)) * Server-side and client-side validation integration - * "Cache priming" for Angular 2 apps * "Lazy loading" for Knockout apps * A Yeoman generator that creates preconfigured app starting points ([guide](http://blog.stevensanderson.com/2016/05/02/angular2-react-knockout-apps-on-aspnet-core/)) * Samples and docs @@ -59,8 +58,8 @@ If you have an existing ASP.NET Core application, or if you just want to use the * This provides infrastructure that's generally useful when building Single Page Applications (SPAs) with technologies such as Angular 2 or React (for example, server-side prerendering and webpack middleware). Internally, it uses the `NodeServices` package to implement its features. * Find [documentation and usage examples here](https://github.com/aspnet/JavaScriptServices/tree/dev/src/Microsoft.AspNetCore.SpaServices#microsoftaspnetcorespaservices). * `Microsoft.AspNetCore.AngularServices` - * This builds on the `SpaServices` package and includes features specific to Angular 2. Currently, this includes validation helpers and a "cache priming" feature, which let you pre-evaluate ajax requests on the server so that client-side code doesn't need to make network calls once it's loaded. - * The code is [here](https://github.com/aspnet/JavaScriptServices/tree/dev/src/Microsoft.AspNetCore.AngularServices), and you'll find a usage example for [the validation helper here](https://github.com/aspnet/JavaScriptServices/blob/dev/samples/angular/MusicStore/wwwroot/ng-app/components/admin/album-edit/album-edit.ts), and for the [cache priming here](https://github.com/aspnet/JavaScriptServices/blob/dev/samples/angular/MusicStore/Views/Home/Index.cshtml#L7-8). Complete documentation is planned. + * This builds on the `SpaServices` package and includes features specific to Angular 2. Currently, this includes validation helpers. + * The code is [here](https://github.com/aspnet/JavaScriptServices/tree/dev/src/Microsoft.AspNetCore.AngularServices). You'll find a usage example for [the validation helper here](https://github.com/aspnet/JavaScriptServices/blob/dev/samples/angular/MusicStore/wwwroot/ng-app/components/admin/album-edit/album-edit.ts). There was previously a `Microsoft.AspNetCore.ReactServices` but this is not currently needed - all applicable functionality is in `Microsoft.AspNetCore.SpaServices`, because it's sufficiently general. We might add a new `Microsoft.AspNetCore.ReactServices` package in the future if new React-specific requirements emerge. From 6fa6765fa533906958db5c0021f11fdd2630236c Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 4 May 2017 19:52:30 +0100 Subject: [PATCH 036/411] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 874fa746..4d3d169f 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ This project is part of ASP.NET Core. You can find samples, documentation and ge `JavaScriptServices` is a set of client-side technologies for ASP.NET Core. It provides infrastructure that you'll find useful if you: -- Use Angular 2 / React / Knockout / etc. +- Use Angular 2 / React / Knockout / etc. - Build your client-side resources using Webpack. - Execute JavaScript on the server at runtime. From c9486eac0bbdf589c9955619697d8ca95a33cea4 Mon Sep 17 00:00:00 2001 From: Kevin Logan Date: Tue, 11 Apr 2017 17:50:04 -0500 Subject: [PATCH 037/411] Add blog link I keep searching for this very useful MSDN blog link. --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 4d3d169f..3dbb3edf 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,8 @@ This project is part of ASP.NET Core. You can find samples, documentation and ge - Build your client-side resources using Webpack. - Execute JavaScript on the server at runtime. +Read [Building Single Page Applications on ASP.NET Core with JavaScriptServices](https://blogs.msdn.microsoft.com/webdev/2017/02/14/building-single-page-applications-on-asp-net-core-with-javascriptservices/) for more details. + This repo contains: * A set of NuGet/NPM packages that implement functionality for: From 4abc39faa04d0d30062e3916f28dd8e3bf4f468a Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 4 May 2017 19:53:42 +0100 Subject: [PATCH 038/411] Bump generator-aspnetcore-spa to 0.9.1 for release --- templates/package-builder/src/yeoman/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/package-builder/src/yeoman/package.json b/templates/package-builder/src/yeoman/package.json index f591bbf8..c4eb7501 100644 --- a/templates/package-builder/src/yeoman/package.json +++ b/templates/package-builder/src/yeoman/package.json @@ -1,6 +1,6 @@ { "name": "generator-aspnetcore-spa", - "version": "0.9.0", + "version": "0.9.1", "description": "Single-Page App templates for ASP.NET Core", "author": "Microsoft", "license": "Apache-2.0", From 214a908c92c405c426407ab84f60bc74a4ae3eb9 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Fri, 5 May 2017 16:23:16 +0100 Subject: [PATCH 039/411] Temporarily pin React to 15.4.x, because 15.5.0 has conflict with Babel (Babel injects code that tries to evaluate PropTypes) --- templates/ReactReduxSpa/package.json | 4 ++-- templates/ReactSpa/package.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/ReactReduxSpa/package.json b/templates/ReactReduxSpa/package.json index e8e04fd1..b02c5138 100644 --- a/templates/ReactReduxSpa/package.json +++ b/templates/ReactReduxSpa/package.json @@ -28,8 +28,8 @@ "jquery": "^2.2.1", "json-loader": "^0.5.4", "node-noop": "^1.0.0", - "react": "^15.3.2", - "react-dom": "^15.3.2", + "react": "~15.4.0", + "react-dom": "~15.4.0", "react-redux": "^4.4.5", "react-router": "^2.8.1", "react-router-redux": "^4.0.6", diff --git a/templates/ReactSpa/package.json b/templates/ReactSpa/package.json index a4874e30..c8704b9f 100644 --- a/templates/ReactSpa/package.json +++ b/templates/ReactSpa/package.json @@ -21,8 +21,8 @@ "isomorphic-fetch": "^2.2.1", "jquery": "^2.2.1", "json-loader": "^0.5.4", - "react": "^15.3.2", - "react-dom": "^15.3.2", + "react": "~15.4.0", + "react-dom": "~15.4.0", "react-router": "^2.8.1", "style-loader": "^0.13.1", "typescript": "^2.2.1", From f2260d572fcfc5ebe7eb37050a7a53bfda70a2b7 Mon Sep 17 00:00:00 2001 From: Stephan Date: Thu, 4 May 2017 21:55:58 +0200 Subject: [PATCH 040/411] Templates: update React's component's State and Property type --- templates/ReactReduxSpa/ClientApp/components/Counter.tsx | 2 +- templates/ReactReduxSpa/ClientApp/components/FetchData.tsx | 2 +- templates/ReactReduxSpa/ClientApp/components/Home.tsx | 2 +- templates/ReactReduxSpa/ClientApp/components/Layout.tsx | 2 +- templates/ReactReduxSpa/ClientApp/components/NavMenu.tsx | 2 +- templates/ReactSpa/ClientApp/components/Counter.tsx | 2 +- templates/ReactSpa/ClientApp/components/FetchData.tsx | 2 +- templates/ReactSpa/ClientApp/components/Home.tsx | 2 +- templates/ReactSpa/ClientApp/components/Layout.tsx | 2 +- templates/ReactSpa/ClientApp/components/NavMenu.tsx | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/templates/ReactReduxSpa/ClientApp/components/Counter.tsx b/templates/ReactReduxSpa/ClientApp/components/Counter.tsx index 70cfbc7c..10372473 100644 --- a/templates/ReactReduxSpa/ClientApp/components/Counter.tsx +++ b/templates/ReactReduxSpa/ClientApp/components/Counter.tsx @@ -7,7 +7,7 @@ import * as WeatherForecasts from '../store/WeatherForecasts'; type CounterProps = CounterStore.CounterState & typeof CounterStore.actionCreators; -class Counter extends React.Component { +class Counter extends React.Component { public render() { return

Counter

diff --git a/templates/ReactReduxSpa/ClientApp/components/FetchData.tsx b/templates/ReactReduxSpa/ClientApp/components/FetchData.tsx index 649d0700..8a79cb85 100644 --- a/templates/ReactReduxSpa/ClientApp/components/FetchData.tsx +++ b/templates/ReactReduxSpa/ClientApp/components/FetchData.tsx @@ -10,7 +10,7 @@ type WeatherForecastProps = & typeof WeatherForecastsState.actionCreators // ... plus action creators we've requested & { params: { startDateIndex: string } }; // ... plus incoming routing parameters -class FetchData extends React.Component { +class FetchData extends React.Component { componentWillMount() { // This method runs when the component is first added to the page let startDateIndex = parseInt(this.props.params.startDateIndex) || 0; diff --git a/templates/ReactReduxSpa/ClientApp/components/Home.tsx b/templates/ReactReduxSpa/ClientApp/components/Home.tsx index 2fd6dcdf..d21063af 100644 --- a/templates/ReactReduxSpa/ClientApp/components/Home.tsx +++ b/templates/ReactReduxSpa/ClientApp/components/Home.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; -export default class Home extends React.Component { +export default class Home extends React.Component<{}, {}> { public render() { return

Hello, world!

diff --git a/templates/ReactReduxSpa/ClientApp/components/Layout.tsx b/templates/ReactReduxSpa/ClientApp/components/Layout.tsx index b9f877bd..b87c7313 100644 --- a/templates/ReactReduxSpa/ClientApp/components/Layout.tsx +++ b/templates/ReactReduxSpa/ClientApp/components/Layout.tsx @@ -5,7 +5,7 @@ export interface LayoutProps { body: React.ReactElement; } -export class Layout extends React.Component { +export class Layout extends React.Component { public render() { return
diff --git a/templates/ReactReduxSpa/ClientApp/components/NavMenu.tsx b/templates/ReactReduxSpa/ClientApp/components/NavMenu.tsx index e3158f61..feef09d3 100644 --- a/templates/ReactReduxSpa/ClientApp/components/NavMenu.tsx +++ b/templates/ReactReduxSpa/ClientApp/components/NavMenu.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { Link } from 'react-router'; -export class NavMenu extends React.Component { +export class NavMenu extends React.Component<{}, {}> { public render() { return
diff --git a/templates/ReactSpa/ClientApp/components/Counter.tsx b/templates/ReactSpa/ClientApp/components/Counter.tsx index 233bed06..ef51b168 100644 --- a/templates/ReactSpa/ClientApp/components/Counter.tsx +++ b/templates/ReactSpa/ClientApp/components/Counter.tsx @@ -4,7 +4,7 @@ interface CounterState { currentCount: number; } -export class Counter extends React.Component { +export class Counter extends React.Component<{}, CounterState> { constructor() { super(); this.state = { currentCount: 0 }; diff --git a/templates/ReactSpa/ClientApp/components/FetchData.tsx b/templates/ReactSpa/ClientApp/components/FetchData.tsx index e76625bd..9fe5eb11 100644 --- a/templates/ReactSpa/ClientApp/components/FetchData.tsx +++ b/templates/ReactSpa/ClientApp/components/FetchData.tsx @@ -6,7 +6,7 @@ interface FetchDataExampleState { loading: boolean; } -export class FetchData extends React.Component { +export class FetchData extends React.Component<{}, FetchDataExampleState> { constructor() { super(); this.state = { forecasts: [], loading: true }; diff --git a/templates/ReactSpa/ClientApp/components/Home.tsx b/templates/ReactSpa/ClientApp/components/Home.tsx index 9f68e05c..3c092a51 100644 --- a/templates/ReactSpa/ClientApp/components/Home.tsx +++ b/templates/ReactSpa/ClientApp/components/Home.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; -export class Home extends React.Component { +export class Home extends React.Component<{}, {}> { public render() { return

Hello, world!

diff --git a/templates/ReactSpa/ClientApp/components/Layout.tsx b/templates/ReactSpa/ClientApp/components/Layout.tsx index b9f877bd..b87c7313 100644 --- a/templates/ReactSpa/ClientApp/components/Layout.tsx +++ b/templates/ReactSpa/ClientApp/components/Layout.tsx @@ -5,7 +5,7 @@ export interface LayoutProps { body: React.ReactElement; } -export class Layout extends React.Component { +export class Layout extends React.Component { public render() { return
diff --git a/templates/ReactSpa/ClientApp/components/NavMenu.tsx b/templates/ReactSpa/ClientApp/components/NavMenu.tsx index e3158f61..feef09d3 100644 --- a/templates/ReactSpa/ClientApp/components/NavMenu.tsx +++ b/templates/ReactSpa/ClientApp/components/NavMenu.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { Link } from 'react-router'; -export class NavMenu extends React.Component { +export class NavMenu extends React.Component<{}, {}> { public render() { return
From d016950e506e9c944096ad618d89a5108ce77ba6 Mon Sep 17 00:00:00 2001 From: Ashley Grant Date: Tue, 9 May 2017 13:17:25 -0400 Subject: [PATCH 041/411] Add Aurelia and Vue to framework list Doing this due to a Stack Overflow question where a dev thought this project doesn't support Aurelia simply b/c this Readme file didn't include it. Went ahead and added Vue as well for completeness. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3dbb3edf..23e28ee7 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ This project is part of ASP.NET Core. You can find samples, documentation and ge `JavaScriptServices` is a set of client-side technologies for ASP.NET Core. It provides infrastructure that you'll find useful if you: -- Use Angular 2 / React / Knockout / etc. +- Use Angular 2 / React / Vue / Aurelia / Knockout / etc. - Build your client-side resources using Webpack. - Execute JavaScript on the server at runtime. From 9d58c8836b2a5c587b22d0795312ae70746e9d21 Mon Sep 17 00:00:00 2001 From: ferrx Date: Fri, 5 May 2017 15:56:28 -0400 Subject: [PATCH 042/411] Switched from av-ts to vue-property-decorator and vue-class-component --- templates/VueSpa/ClientApp/components/app/app.ts | 2 +- templates/VueSpa/ClientApp/components/counter/counter.ts | 2 +- templates/VueSpa/ClientApp/components/fetchdata/fetchdata.ts | 4 ++-- templates/VueSpa/package.json | 3 ++- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/templates/VueSpa/ClientApp/components/app/app.ts b/templates/VueSpa/ClientApp/components/app/app.ts index 75eaa8d8..f580f76b 100644 --- a/templates/VueSpa/ClientApp/components/app/app.ts +++ b/templates/VueSpa/ClientApp/components/app/app.ts @@ -1,5 +1,5 @@ import Vue from 'vue'; -import { Component } from 'av-ts'; +import { Component } from 'vue-property-decorator'; @Component({ components: { diff --git a/templates/VueSpa/ClientApp/components/counter/counter.ts b/templates/VueSpa/ClientApp/components/counter/counter.ts index 76f9a921..e48ef79b 100644 --- a/templates/VueSpa/ClientApp/components/counter/counter.ts +++ b/templates/VueSpa/ClientApp/components/counter/counter.ts @@ -1,5 +1,5 @@ import Vue from 'vue'; -import { Component } from 'av-ts'; +import { Component } from 'vue-property-decorator'; @Component export default class CounterComponent extends Vue { diff --git a/templates/VueSpa/ClientApp/components/fetchdata/fetchdata.ts b/templates/VueSpa/ClientApp/components/fetchdata/fetchdata.ts index c648f021..dcc37f02 100644 --- a/templates/VueSpa/ClientApp/components/fetchdata/fetchdata.ts +++ b/templates/VueSpa/ClientApp/components/fetchdata/fetchdata.ts @@ -1,5 +1,5 @@ import Vue from 'vue'; -import { Component, Lifecycle } from 'av-ts'; +import { Component } from 'vue-property-decorator'; interface WeatherForecast { dateFormatted: string; @@ -12,7 +12,7 @@ interface WeatherForecast { export default class FetchDataComponent extends Vue { forecasts: WeatherForecast[] = []; - @Lifecycle mounted() { + mounted() { fetch('http://github.com/api/SampleData/WeatherForecasts') .then(response => response.json() as Promise) .then(data => { diff --git a/templates/VueSpa/package.json b/templates/VueSpa/package.json index a8716eb5..57e71e0b 100644 --- a/templates/VueSpa/package.json +++ b/templates/VueSpa/package.json @@ -4,7 +4,6 @@ "devDependencies": { "@types/requirejs": "^2.1.28", "aspnet-webpack": "^1.0.27", - "av-ts": "^0.7.1", "awesome-typescript-loader": "^3.0.0", "bootstrap": "^3.3.6", "css-loader": "^0.25.0", @@ -17,7 +16,9 @@ "typescript": "^2.2.1", "url-loader": "^0.5.7", "vue": "^2.2.2", + "vue-class-component": "^5.0.1", "vue-loader": "^11.1.4", + "vue-property-decorator": "^5.0.1", "vue-router": "^2.3.0", "vue-template-compiler": "^2.2.2", "webpack": "^2.2.0", From 1d57ca384fd41ae13a2d970502da5c17a7baf6d1 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Fri, 12 May 2017 10:25:38 +0100 Subject: [PATCH 043/411] Remove vue-class-component dependency, because we're only referencing vue-property-decorator directly --- templates/VueSpa/package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/templates/VueSpa/package.json b/templates/VueSpa/package.json index 57e71e0b..e0674ee5 100644 --- a/templates/VueSpa/package.json +++ b/templates/VueSpa/package.json @@ -16,7 +16,6 @@ "typescript": "^2.2.1", "url-loader": "^0.5.7", "vue": "^2.2.2", - "vue-class-component": "^5.0.1", "vue-loader": "^11.1.4", "vue-property-decorator": "^5.0.1", "vue-router": "^2.3.0", From b5636ea871225137610815a7d6f2608dd6d00c40 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Tue, 16 May 2017 10:56:53 +0100 Subject: [PATCH 044/411] Clarify contribution instructions. Fixes #934. --- README.md | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 23e28ee7..74d0fc26 100644 --- a/README.md +++ b/README.md @@ -88,12 +88,13 @@ The [`samples` directory](https://github.com/aspnet/JavaScriptServices/tree/dev/ ## Contributing -If you're interested in contributing to the various packages, samples, and project templates in this repo, that's great! You can run the code in this repo just by: - - * Cloning the repo - * Running `dotnet restore` at the repo root dir - * Going to whatever sample or template you want to run (for example, `cd templates/Angular2Spa`) - * Restoring NPM dependencies (run `npm install`) - * Launching it (`dotnet run`) +If you're interested in contributing to the various packages, samples, and project templates in this repo, that's great! You can run the code in this repo as follows: + + * Clone the repo + * Run `dotnet restore` at the repo root dir + * Go to whatever sample or template you want to run (for example, `cd templates/Angular2Spa`) + * Restore NPM dependencies (run `npm install`) + * If the sample/template you're trying to run has a file called `webpack.config.vendor.js` at its root, run `webpack --config webpack.config.vendor.js`. It it has a file called `webpack.config.js`, run `webpack` (no args). You might need to install webpack first, by running `npm install -g webpack`. + * Launch it (`dotnet run`) If you're planning to submit a pull request, and if it's more than a trivial fix (for example, for a typo), it's usually a good idea first to file an issue describing what you're proposing to do and how it will work. Then you can find out if it's likely that such a pull request will be accepted, and how it fits into wider ongoing plans. From 5ade33b8709fb47ca9d93b0b3693302452ab8587 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 17 May 2017 10:13:46 +0100 Subject: [PATCH 045/411] Update to Angular 4 (but leave directory name as Angular2Spa until finished) --- .../ClientApp/app/app.module.client.ts | 21 ++++ .../ClientApp/app/app.module.server.ts | 14 +++ .../{app.module.ts => app.module.shared.ts} | 9 +- .../fetchdata/fetchdata.component.ts | 6 +- .../Angular2Spa/ClientApp/boot-client.ts | 27 ++--- .../Angular2Spa/ClientApp/boot-server.ts | 52 ++++----- .../Angular2Spa/ClientApp/test/boot-tests.ts | 3 +- templates/Angular2Spa/package.json | 100 +++++++++--------- .../Angular2Spa/webpack.config.vendor.js | 6 +- 9 files changed, 132 insertions(+), 106 deletions(-) create mode 100644 templates/Angular2Spa/ClientApp/app/app.module.client.ts create mode 100644 templates/Angular2Spa/ClientApp/app/app.module.server.ts rename templates/Angular2Spa/ClientApp/app/{app.module.ts => app.module.shared.ts} (81%) diff --git a/templates/Angular2Spa/ClientApp/app/app.module.client.ts b/templates/Angular2Spa/ClientApp/app/app.module.client.ts new file mode 100644 index 00000000..ee778122 --- /dev/null +++ b/templates/Angular2Spa/ClientApp/app/app.module.client.ts @@ -0,0 +1,21 @@ +import { NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { FormsModule } from '@angular/forms'; +import { HttpModule } from '@angular/http'; +import { sharedConfig } from './app.module.shared'; + +@NgModule({ + bootstrap: sharedConfig.bootstrap, + declarations: sharedConfig.declarations, + imports: [ + BrowserModule, + FormsModule, + HttpModule, + ...sharedConfig.imports + ], + providers: [ + { provide: 'ORIGIN_URL', useValue: location.origin } + ] +}) +export class AppModule { +} diff --git a/templates/Angular2Spa/ClientApp/app/app.module.server.ts b/templates/Angular2Spa/ClientApp/app/app.module.server.ts new file mode 100644 index 00000000..f2b6eb4b --- /dev/null +++ b/templates/Angular2Spa/ClientApp/app/app.module.server.ts @@ -0,0 +1,14 @@ +import { NgModule } from '@angular/core'; +import { ServerModule } from '@angular/platform-server'; +import { sharedConfig } from './app.module.shared'; + +@NgModule({ + bootstrap: sharedConfig.bootstrap, + declarations: sharedConfig.declarations, + imports: [ + ServerModule, + ...sharedConfig.imports + ] +}) +export class AppModule { +} diff --git a/templates/Angular2Spa/ClientApp/app/app.module.ts b/templates/Angular2Spa/ClientApp/app/app.module.shared.ts similarity index 81% rename from templates/Angular2Spa/ClientApp/app/app.module.ts rename to templates/Angular2Spa/ClientApp/app/app.module.shared.ts index 6d912da0..18615017 100644 --- a/templates/Angular2Spa/ClientApp/app/app.module.ts +++ b/templates/Angular2Spa/ClientApp/app/app.module.shared.ts @@ -1,13 +1,13 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { UniversalModule } from 'angular2-universal'; + import { AppComponent } from './components/app/app.component' import { NavMenuComponent } from './components/navmenu/navmenu.component'; import { HomeComponent } from './components/home/home.component'; import { FetchDataComponent } from './components/fetchdata/fetchdata.component'; import { CounterComponent } from './components/counter/counter.component'; -@NgModule({ +export const sharedConfig: NgModule = { bootstrap: [ AppComponent ], declarations: [ AppComponent, @@ -17,7 +17,6 @@ import { CounterComponent } from './components/counter/counter.component'; HomeComponent ], imports: [ - UniversalModule, // Must be first import. This automatically imports BrowserModule, HttpModule, and JsonpModule too. RouterModule.forRoot([ { path: '', redirectTo: 'home', pathMatch: 'full' }, { path: 'home', component: HomeComponent }, @@ -26,6 +25,4 @@ import { CounterComponent } from './components/counter/counter.component'; { path: '**', redirectTo: 'home' } ]) ] -}) -export class AppModule { -} +}; diff --git a/templates/Angular2Spa/ClientApp/app/components/fetchdata/fetchdata.component.ts b/templates/Angular2Spa/ClientApp/app/components/fetchdata/fetchdata.component.ts index e93d4fa0..9c98b76e 100644 --- a/templates/Angular2Spa/ClientApp/app/components/fetchdata/fetchdata.component.ts +++ b/templates/Angular2Spa/ClientApp/app/components/fetchdata/fetchdata.component.ts @@ -1,4 +1,4 @@ -import { Component } from '@angular/core'; +import { Component, Inject } from '@angular/core'; import { Http } from '@angular/http'; @Component({ @@ -8,8 +8,8 @@ import { Http } from '@angular/http'; export class FetchDataComponent { public forecasts: WeatherForecast[]; - constructor(http: Http) { - http.get('/api/SampleData/WeatherForecasts').subscribe(result => { + constructor(http: Http, @Inject('ORIGIN_URL') originUrl: string) { + http.get(originUrl + '/api/SampleData/WeatherForecasts').subscribe(result => { this.forecasts = result.json() as WeatherForecast[]; }); } diff --git a/templates/Angular2Spa/ClientApp/boot-client.ts b/templates/Angular2Spa/ClientApp/boot-client.ts index 963598a7..45c471c4 100644 --- a/templates/Angular2Spa/ClientApp/boot-client.ts +++ b/templates/Angular2Spa/ClientApp/boot-client.ts @@ -1,29 +1,22 @@ -import 'angular2-universal-polyfills/browser'; +import 'reflect-metadata'; +import 'zone.js'; import { enableProdMode } from '@angular/core'; -import { platformUniversalDynamic } from 'angular2-universal'; -import { AppModule } from './app/app.module'; -import 'bootstrap'; -const rootElemTagName = 'app'; // Update this if you change your root component selector +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; +import { AppModule } from './app/app.module.client'; -// Enable either Hot Module Reloading or production mode if (module['hot']) { module['hot'].accept(); module['hot'].dispose(() => { // Before restarting the app, we create a new root element and dispose the old one - const oldRootElem = document.querySelector(rootElemTagName); - const newRootElem = document.createElement(rootElemTagName); + const oldRootElem = document.querySelector('app'); + const newRootElem = document.createElement('app'); oldRootElem.parentNode.insertBefore(newRootElem, oldRootElem); - platform.destroy(); + modulePromise.then(appModule => appModule.destroy()); }); } else { enableProdMode(); } -// Boot the application, either now or when the DOM content is loaded -const platform = platformUniversalDynamic(); -const bootApplication = () => { platform.bootstrapModule(AppModule); }; -if (document.readyState === 'complete') { - bootApplication(); -} else { - document.addEventListener('DOMContentLoaded', bootApplication); -} +// Note: @ng-tools/webpack looks for the following expression when performing production +// builds. Don't change how this line looks, otherwise you may break tree-shaking. +const modulePromise = platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/templates/Angular2Spa/ClientApp/boot-server.ts b/templates/Angular2Spa/ClientApp/boot-server.ts index b39c2560..08474cfa 100644 --- a/templates/Angular2Spa/ClientApp/boot-server.ts +++ b/templates/Angular2Spa/ClientApp/boot-server.ts @@ -1,34 +1,36 @@ -import 'angular2-universal-polyfills'; -import 'angular2-universal-patch'; +import 'reflect-metadata'; import 'zone.js'; +import 'rxjs/add/operator/first'; +import { enableProdMode, ApplicationRef, NgZone, ValueProvider } from '@angular/core'; +import { platformDynamicServer, PlatformState, INITIAL_CONFIG } from '@angular/platform-server'; import { createServerRenderer, RenderResult } from 'aspnet-prerendering'; -import { enableProdMode } from '@angular/core'; -import { platformNodeDynamic } from 'angular2-universal'; -import { AppModule } from './app/app.module'; +import { AppModule } from './app/app.module.server'; enableProdMode(); -const platform = platformNodeDynamic(); export default createServerRenderer(params => { - return new Promise((resolve, reject) => { - const requestZone = Zone.current.fork({ - name: 'angular-universal request', - properties: { - baseUrl: '/', - requestUrl: params.url, - originUrl: params.origin, - preboot: false, - document: '' - }, - onHandleError: (parentZone, currentZone, targetZone, error) => { - // If any error occurs while rendering the module, reject the whole operation - reject(error); - return true; - } - }); + const providers = [ + { provide: INITIAL_CONFIG, useValue: { document: '', url: params.url } }, + { provide: 'ORIGIN_URL', useValue: params.origin } + ]; + + return platformDynamicServer(providers).bootstrapModule(AppModule).then(moduleRef => { + const appRef = moduleRef.injector.get(ApplicationRef); + const state = moduleRef.injector.get(PlatformState); + const zone = moduleRef.injector.get(NgZone); - return requestZone.run>(() => platform.serializeModule(AppModule)).then(html => { - resolve({ html: html }); - }, reject); + return new Promise((resolve, reject) => { + zone.onError.subscribe(errorInfo => reject(errorInfo)); + appRef.isStable.first(isStable => isStable).subscribe(() => { + // Because 'onStable' fires before 'onError', we have to delay slightly before + // completing the request in case there's an error to report + setImmediate(() => { + resolve({ + html: state.renderToString() + }); + moduleRef.destroy(); + }); + }); + }); }); }); diff --git a/templates/Angular2Spa/ClientApp/test/boot-tests.ts b/templates/Angular2Spa/ClientApp/test/boot-tests.ts index 6121b049..fe3591e9 100644 --- a/templates/Angular2Spa/ClientApp/test/boot-tests.ts +++ b/templates/Angular2Spa/ClientApp/test/boot-tests.ts @@ -1,5 +1,6 @@ // Load required polyfills and testing libraries -import 'angular2-universal-polyfills'; +import 'reflect-metadata'; +import 'zone.js'; import 'zone.js/dist/long-stack-trace-zone'; import 'zone.js/dist/proxy.js'; import 'zone.js/dist/sync-test'; diff --git a/templates/Angular2Spa/package.json b/templates/Angular2Spa/package.json index 8324fd52..b34915bf 100644 --- a/templates/Angular2Spa/package.json +++ b/templates/Angular2Spa/package.json @@ -5,58 +5,56 @@ "test": "karma start ClientApp/test/karma.conf.js" }, "dependencies": { - "@angular/common": "^2.4.5", - "@angular/compiler": "^2.4.5", - "@angular/core": "^2.4.5", - "@angular/forms": "^2.4.5", - "@angular/http": "^2.4.5", - "@angular/platform-browser": "^2.4.5", - "@angular/platform-browser-dynamic": "^2.4.5", - "@angular/platform-server": "^2.4.5", - "@angular/router": "^3.4.5", - "@types/node": "^6.0.42", - "angular2-platform-node": "~2.0.11", - "angular2-template-loader": "^0.6.2", - "angular2-universal": "^2.1.0-rc.1", - "angular2-universal-patch": "^0.2.1", - "angular2-universal-polyfills": "^2.1.0-rc.1", - "aspnet-prerendering": "^2.0.0", - "aspnet-webpack": "^1.0.17", - "awesome-typescript-loader": "^3.0.0", - "bootstrap": "^3.3.7", - "css": "^2.2.1", - "css-loader": "^0.25.0", - "es6-shim": "^0.35.1", - "event-source-polyfill": "^0.0.7", - "expose-loader": "^0.7.1", - "extract-text-webpack-plugin": "^2.0.0-rc", - "file-loader": "^0.9.0", - "html-loader": "^0.4.4", - "isomorphic-fetch": "^2.2.1", - "jquery": "^2.2.1", - "json-loader": "^0.5.4", - "preboot": "^4.5.2", - "raw-loader": "^0.5.1", - "rxjs": "^5.0.1", - "style-loader": "^0.13.1", - "to-string-loader": "^1.1.5", - "typescript": "^2.2.1", - "url-loader": "^0.5.7", - "webpack": "^2.2.0", - "webpack-hot-middleware": "^2.12.2", - "webpack-merge": "^0.14.1", - "zone.js": "^0.7.6" + "@angular/animations": "4.1.2", + "@angular/common": "4.1.2", + "@angular/compiler": "4.1.2", + "@angular/core": "4.1.2", + "@angular/forms": "4.1.2", + "@angular/http": "4.1.2", + "@angular/platform-browser": "4.1.2", + "@angular/platform-browser-dynamic": "4.1.2", + "@angular/platform-server": "4.1.2", + "@angular/router": "4.1.2", + "@types/node": "7.0.18", + "angular2-template-loader": "0.6.2", + "aspnet-prerendering": "^2.0.5", + "aspnet-webpack": "^1.0.29", + "awesome-typescript-loader": "3.1.3", + "bootstrap": "3.3.7", + "css": "2.2.1", + "css-loader": "0.28.1", + "es6-shim": "0.35.3", + "event-source-polyfill": "0.0.9", + "expose-loader": "0.7.3", + "extract-text-webpack-plugin": "2.1.0", + "file-loader": "0.11.1", + "html-loader": "0.4.5", + "isomorphic-fetch": "2.2.1", + "jquery": "3.2.1", + "json-loader": "0.5.4", + "preboot": "4.5.2", + "raw-loader": "0.5.1", + "reflect-metadata": "0.1.10", + "rxjs": "5.4.0", + "style-loader": "0.17.0", + "to-string-loader": "1.1.5", + "typescript": "2.3.2", + "url-loader": "0.5.8", + "webpack": "2.5.1", + "webpack-hot-middleware": "2.18.0", + "webpack-merge": "4.1.0", + "zone.js": "0.8.10" }, "devDependencies": { - "@types/chai": "^3.4.34", - "@types/jasmine": "^2.5.37", - "chai": "^3.5.0", - "jasmine-core": "^2.5.2", - "karma": "^1.3.0", - "karma-chai": "^0.1.0", - "karma-chrome-launcher": "^2.0.0", - "karma-cli": "^1.0.1", - "karma-jasmine": "^1.0.2", - "karma-webpack": "^1.8.0" + "@types/chai": "3.5.2", + "@types/jasmine": "2.5.47", + "chai": "3.5.0", + "jasmine-core": "2.6.1", + "karma": "1.7.0", + "karma-chai": "0.1.0", + "karma-chrome-launcher": "2.1.1", + "karma-cli": "1.0.1", + "karma-jasmine": "1.1.0", + "karma-webpack": "2.0.3" } } diff --git a/templates/Angular2Spa/webpack.config.vendor.js b/templates/Angular2Spa/webpack.config.vendor.js index df1cfa85..7b0c3017 100644 --- a/templates/Angular2Spa/webpack.config.vendor.js +++ b/templates/Angular2Spa/webpack.config.vendor.js @@ -16,16 +16,15 @@ module.exports = (env) => { }, entry: { vendor: [ + '@angular/animations', '@angular/common', '@angular/compiler', '@angular/core', + '@angular/forms', '@angular/http', '@angular/platform-browser', '@angular/platform-browser-dynamic', '@angular/router', - '@angular/platform-server', - 'angular2-universal', - 'angular2-universal-polyfills', 'bootstrap', 'bootstrap/dist/css/bootstrap.css', 'es6-shim', @@ -43,6 +42,7 @@ module.exports = (env) => { plugins: [ new webpack.ProvidePlugin({ $: 'jquery', jQuery: 'jquery' }), // Maps these identifiers to the jQuery package (because Bootstrap expects it to be a global variable) new webpack.ContextReplacementPlugin(/\@angular\b.*\b(bundles|linker)/, path.join(__dirname, './ClientApp')), // Workaround for https://github.com/angular/angular/issues/11580 + new webpack.ContextReplacementPlugin(/angular(\\|\/)core(\\|\/)@angular/, path.join(__dirname, './ClientApp')), // Workaround for https://github.com/angular/angular/issues/14898 new webpack.IgnorePlugin(/^vertx$/) // Workaround for https://github.com/stefanpenner/es6-promise/issues/100 ] }; From 3390d75528ddcb300b7157a7a988aee761a61e4c Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 17 May 2017 10:18:26 +0100 Subject: [PATCH 046/411] Begin re-enabling tests in AppVeyor (still need to diagnose why they intermittently time out) --- appveyor.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 2878fd5b..4afed57f 100755 --- a/appveyor.yml +++ b/appveyor.yml @@ -31,17 +31,17 @@ artifacts: # - ps: .\build.ps1 clone_depth: 1 test_script: - # - dotnet restore ./src - # - npm install -g selenium-standalone - # - selenium-standalone install + - dotnet restore ./src + - npm install -g selenium-standalone + - selenium-standalone install # The nosys flag is needed for selenium to work on Appveyor - # - ps: Start-Process selenium-standalone 'start','--','-Djna.nosys=true' - # - ps: Push-Location - # - cd test - # - npm install - # - npm test + - ps: Start-Process selenium-standalone 'start','--','-Djna.nosys=true' + - ps: Push-Location + - cd test + - npm install + - npm test on_finish : - # - ps: Pop-Location + - ps: Pop-Location # After running tests, upload results to Appveyor - # - ps: (new-object net.webclient).UploadFile("https://ci.appveyor.com/api/testresults/junit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path .\test\tmp\junit\*.xml)) + - ps: (new-object net.webclient).UploadFile("https://ci.appveyor.com/api/testresults/junit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path .\test\tmp\junit\*.xml)) deploy: off From cd240907f8363fabd37c261ad6669a8b8b8399bb Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 17 May 2017 10:43:20 +0100 Subject: [PATCH 047/411] Update tests to work with latest tooling --- appveyor.yml | 2 +- test/templates/angular.spec.ts | 162 ++++++++++++++++----------------- test/templates/util/yeoman.ts | 1 - 3 files changed, 79 insertions(+), 86 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 4afed57f..4898f788 100755 --- a/appveyor.yml +++ b/appveyor.yml @@ -31,7 +31,7 @@ artifacts: # - ps: .\build.ps1 clone_depth: 1 test_script: - - dotnet restore ./src + - dotnet restore - npm install -g selenium-standalone - selenium-standalone install # The nosys flag is needed for selenium to work on Appveyor diff --git a/test/templates/angular.spec.ts b/test/templates/angular.spec.ts index 355af3e6..047a9383 100644 --- a/test/templates/angular.spec.ts +++ b/test/templates/angular.spec.ts @@ -5,102 +5,96 @@ import { generateProjectSync } from './util/yeoman'; import { AspNetProcess, AspNetCoreEnviroment, defaultUrl, publishProjectSync } from './util/aspnet'; import { getValue, getCssPropertyValue } from './util/webdriverio'; -// Currently we test both 'csproj' and 'project.json' project types. Eventually we'll only need csproj. -['csproj', 'projectjson'].forEach(toolingType => { - // First, generate a new project using the locally-built generator-aspnetcore-spa - // Do this outside the Mocha fixture, otherwise Mocha will time out - const appDir = path.resolve(__dirname, '../generated/angular', toolingType); - const publishedAppDir = path.resolve(appDir, './bin/Release/published'); - if (!process.env.SKIP_PROJECT_GENERATION) { - generateProjectSync(appDir, { - framework: 'angular-2', - name: 'Test App', - sdkVersion: toolingType === 'projectjson' ? '1.0.0-preview2-1-003177' : '1.0.0-preview3-004056', - tests: false - }); - publishProjectSync(appDir, publishedAppDir); - } - - function testBasicNavigation() { - describe('Basic navigation', () => { - beforeEach(() => browser.url(http://github.com/defaultUrl)); - - it('should initially display the home page', () => { - expect(browser.getText('h1')).to.eq('Hello, world!'); - expect(browser.getText('li a[href="https://angular.io/"]')).to.eq('Angular 2'); - }); - - it('should be able to show the counter page', () => { - browser.click('a[href="http://github.com/counter"]'); - expect(browser.getText('h1')).to.eq('Counter'); - - // Test clicking the 'increment' button - expect(browser.getText('counter strong')).to.eq('0'); - browser.click('counter button'); - expect(browser.getText('counter strong')).to.eq('1'); - }); - - it('should be able to show the fetchdata page', () => { - browser.click('a[href="http://github.com/fetch-data"]'); - expect(browser.getText('h1')).to.eq('Weather forecast'); - - browser.waitForExist('fetchdata table'); - expect(getValue(browser.elements('fetchdata table tbody tr')).length).to.eq(5); - }); +// First, generate a new project using the locally-built generator-aspnetcore-spa +// Do this outside the Mocha fixture, otherwise Mocha will time out +const appDir = path.resolve(__dirname, '../generated/angular'); +const publishedAppDir = path.resolve(appDir, './bin/Release/published'); +if (!process.env.SKIP_PROJECT_GENERATION) { + generateProjectSync(appDir, { + framework: 'angular', + name: 'Test App', + tests: false + }); + publishProjectSync(appDir, publishedAppDir); +} + +function testBasicNavigation() { + describe('Basic navigation', () => { + beforeEach(() => browser.url(http://github.com/defaultUrl)); + + it('should initially display the home page', () => { + expect(browser.getText('h1')).to.eq('Hello, world!'); + expect(browser.getText('li a[href="https://angular.io/"]')).to.eq('Angular 2'); }); - } - function testHotModuleReplacement() { - describe('Hot module replacement', () => { - beforeEach(() => browser.url(http://github.com/defaultUrl)); + it('should be able to show the counter page', () => { + browser.click('a[href="http://github.com/counter"]'); + expect(browser.getText('h1')).to.eq('Counter'); - it('should update when HTML is changed', () => { - expect(browser.getText('h1')).to.eq('Hello, world!'); + // Test clicking the 'increment' button + expect(browser.getText('counter strong')).to.eq('0'); + browser.click('counter button'); + expect(browser.getText('counter strong')).to.eq('1'); + }); - const filePath = path.resolve(appDir, './ClientApp/app/components/home/home.component.html'); - const origFileContents = fs.readFileSync(filePath, 'utf8'); + it('should be able to show the fetchdata page', () => { + browser.click('a[href="http://github.com/fetch-data"]'); + expect(browser.getText('h1')).to.eq('Weather forecast'); - try { - const newFileContents = origFileContents.replace('

Hello, world!

', '

HMR is working

'); - fs.writeFileSync(filePath, newFileContents, { encoding: 'utf8' }); + browser.waitForExist('fetchdata table'); + expect(getValue(browser.elements('fetchdata table tbody tr')).length).to.eq(5); + }); + }); +} - browser.waitUntil(() => browser.getText('h1').toString() === 'HMR is working'); - } finally { - // Restore old contents so that other tests don't have to account for this - fs.writeFileSync(filePath, origFileContents, { encoding: 'utf8' }); - } - }); +function testHotModuleReplacement() { + describe('Hot module replacement', () => { + beforeEach(() => browser.url(http://github.com/defaultUrl)); - it('should update when CSS is changed', () => { - expect(getCssPropertyValue(browser, 'li.link-active a', 'color')).to.eq('rgba(255,255,255,1)'); + it('should update when HTML is changed', () => { + expect(browser.getText('h1')).to.eq('Hello, world!'); - const filePath = path.resolve(appDir, './ClientApp/app/components/navmenu/navmenu.component.css'); - const origFileContents = fs.readFileSync(filePath, 'utf8'); + const filePath = path.resolve(appDir, './ClientApp/app/components/home/home.component.html'); + const origFileContents = fs.readFileSync(filePath, 'utf8'); - try { - const newFileContents = origFileContents.replace('color: white;', 'color: purple;'); - fs.writeFileSync(filePath, newFileContents, { encoding: 'utf8' }); + try { + const newFileContents = origFileContents.replace('

Hello, world!

', '

HMR is working

'); + fs.writeFileSync(filePath, newFileContents, { encoding: 'utf8' }); - browser.waitUntil(() => getCssPropertyValue(browser, 'li.link-active a', 'color') === 'rgba(128,0,128,1)'); - } finally { - // Restore old contents so that other tests don't have to account for this - fs.writeFileSync(filePath, origFileContents, { encoding: 'utf8' }); - } - }); + browser.waitUntil(() => browser.getText('h1').toString() === 'HMR is working'); + } finally { + // Restore old contents so that other tests don't have to account for this + fs.writeFileSync(filePath, origFileContents, { encoding: 'utf8' }); + } }); - } - // Now launch dotnet and use selenium to perform tests - describe('Angular template: dev mode', () => { - AspNetProcess.RunInMochaContext(appDir, AspNetCoreEnviroment.development); - testBasicNavigation(); - testHotModuleReplacement(); - }); + it('should update when CSS is changed', () => { + expect(getCssPropertyValue(browser, 'li.link-active a', 'color')).to.eq('rgba(255,255,255,1)'); + + const filePath = path.resolve(appDir, './ClientApp/app/components/navmenu/navmenu.component.css'); + const origFileContents = fs.readFileSync(filePath, 'utf8'); + + try { + const newFileContents = origFileContents.replace('color: white;', 'color: purple;'); + fs.writeFileSync(filePath, newFileContents, { encoding: 'utf8' }); - describe('Angular template: production mode', () => { - // csproj tooling takes the assembly name from .csproj, whereas project.json takes it from the directory name - const assemblyName = toolingType === 'csproj' ? 'TestApp.dll' : 'projectjson.dll'; - AspNetProcess.RunInMochaContext(publishedAppDir, AspNetCoreEnviroment.production, assemblyName); - testBasicNavigation(); + browser.waitUntil(() => getCssPropertyValue(browser, 'li.link-active a', 'color') === 'rgba(128,0,128,1)'); + } finally { + // Restore old contents so that other tests don't have to account for this + fs.writeFileSync(filePath, origFileContents, { encoding: 'utf8' }); + } + }); }); +} + +// Now launch dotnet and use selenium to perform tests +describe('Angular template: dev mode', () => { + AspNetProcess.RunInMochaContext(appDir, AspNetCoreEnviroment.development); + testBasicNavigation(); + testHotModuleReplacement(); }); + +describe('Angular template: production mode', () => { + AspNetProcess.RunInMochaContext(publishedAppDir, AspNetCoreEnviroment.production, 'TestApp.dll'); + testBasicNavigation(); +}); \ No newline at end of file diff --git a/test/templates/util/yeoman.ts b/test/templates/util/yeoman.ts index 9f98ede6..12177fc7 100644 --- a/test/templates/util/yeoman.ts +++ b/test/templates/util/yeoman.ts @@ -9,7 +9,6 @@ const yoPackageDirAbsolute = path.resolve('./node_modules/yo'); export interface GeneratorOptions { framework: string; name: string; - sdkVersion?: string; tests?: boolean; } From 3c1a1ffaa4f3bb4677cfbbb61bf896616cfeff45 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 17 May 2017 11:04:41 +0100 Subject: [PATCH 048/411] Attempt to make selenium-standalone run on AppVeyor --- appveyor.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 4898f788..e3d61d78 100755 --- a/appveyor.yml +++ b/appveyor.yml @@ -34,8 +34,7 @@ test_script: - dotnet restore - npm install -g selenium-standalone - selenium-standalone install - # The nosys flag is needed for selenium to work on Appveyor - - ps: Start-Process selenium-standalone 'start','--','-Djna.nosys=true' + - ps: Start-Process selenium-standalone 'start' - ps: Push-Location - cd test - npm install From d7a3289164ac6d30189d6ea97a740e2e5c297e15 Mon Sep 17 00:00:00 2001 From: Mads Kristensen Date: Tue, 16 May 2017 09:41:44 -0700 Subject: [PATCH 049/411] Outputs vs-2017.3.host.json file This should now write out the correct file for VS to pick up. The icon is missing since I'm not totally sure about how we should inject that into the _.template.config_ folder. Also, is there a description of each template we can use? --- templates/package-builder/src/build/build.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/templates/package-builder/src/build/build.ts b/templates/package-builder/src/build/build.ts index d9d7d5f5..58c0a614 100644 --- a/templates/package-builder/src/build/build.ts +++ b/templates/package-builder/src/build/build.ts @@ -160,6 +160,14 @@ function buildDotNetNewNuGetPackage() { fs.writeFileSync(path.join(templateConfigDir, 'dotnetcli.host.json'), JSON.stringify({ symbolInfo: {} }, null, 2)); + + fs.writeFileSync(path.join(templateConfigDir, 'vs-2017.3.host.json'), JSON.stringify({ + name: { text: templateConfig.displayName }, + description: { text: templateConfig.displayName }, + order: 2000, + learnMoreLink: "https://github.com/aspnet/JavaScriptServices", + uiFilters: [ "oneaspnet" ] + }, null, 2)); }); // Invoke NuGet to create the final package From ca9c6387d0e24a651f015993ab505cee6b733ce3 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 17 May 2017 11:00:15 +0100 Subject: [PATCH 050/411] Add template icons --- templates/Angular2Spa/.template.config/icon.png | Bin 0 -> 1833 bytes templates/AureliaSpa/.template.config/icon.png | Bin 0 -> 2355 bytes templates/KnockoutSpa/.template.config/icon.png | Bin 0 -> 6109 bytes .../ReactReduxSpa/.template.config/icon.png | Bin 0 -> 2876 bytes templates/ReactSpa/.template.config/icon.png | Bin 0 -> 2431 bytes templates/VueSpa/.template.config/icon.png | Bin 0 -> 1661 bytes 6 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 templates/Angular2Spa/.template.config/icon.png create mode 100644 templates/AureliaSpa/.template.config/icon.png create mode 100644 templates/KnockoutSpa/.template.config/icon.png create mode 100644 templates/ReactReduxSpa/.template.config/icon.png create mode 100644 templates/ReactSpa/.template.config/icon.png create mode 100644 templates/VueSpa/.template.config/icon.png diff --git a/templates/Angular2Spa/.template.config/icon.png b/templates/Angular2Spa/.template.config/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..0d47965db7e40d0e24764b952c03551ae8490f31 GIT binary patch literal 1833 zcmX|=3sh4_8pkhrP$cA`#PC!>R0Q(`T;*xPOCbUgLxEBituBa&g?g&iDsqJiXmtf- z)k+Cs5NZ#W)z%`5kPtMos2~WKknj=$n1n|Hk`R)e&^L*@~ls!d46@r2VCfu)u)1uo+92nw-w@e)nT$pmilJ9c8I)5WyyA^IeG8s8v?lDeA9sZDc`MOdhW2VDZ5_JwPZ5Ex zh(0bkdTzG7PVBm)b+ymCgp8?Y&-If^#qM;|(o*-{wE3ns`Dfnhi?`G{H{Y_q8ZNv& zK=4!6{o80TEUBiApB9GlZs;eJ(}I`tjV~3P6H7Ci5qjK2)xY$;a-)7xlAhh}6*agf zYyju0DF0Q{(eq+mfQJA3$JC2mQHR@oVipHRU;D=yG+K4NaQtrV!mFOSUfGgrMs@y% z+-93@bYgL6O!rPUXvds9oc$kaq+wjCpH#gGjGucf)OPk6wDUT};35B~cnkL2j3L)r&V+dOv; zI);qiAo9SIC^#7#y%$2DEsbLB+>+KQ z>hG`tyOtg`e__aB(~{q!QFmc{*8kA(F}Sx7d%yHvjZr`OXZWtZZ1h4&kC@aT_Wr#L zZ@KjZ`BPzcap=@Wrt}c6DXH5lAUWp!w}0$A@!s_gJ2CCIqGm^u`j?P2KD)lXEH6@& z`0dMQFlyYJ5cFjcRXS9wt1kF$2fyP9Hvbd)us?s9~M3(&vJHpiv7K^#Z0*zu> zg#FgA+>V`M1xK*zj?$R|wYgorC2Np2mYoX31+`7JsFeX4)2pCIQ{IobYfVU9g0zwjB?9zsA2~^sQe_a{|kXxP}koPtUG9(3wZBsv}0=BZ3CqB8>*k z7JJ$LUyH0P5pdcnmh;bk#T8E~lcpI3$pn{is>j_>qM@|4qp2?SVkq5#u=_13Hz=fj z%EG4ckW-q{x0W)FxBBwJdTWt?tYt=7C+Vams^<$`KD{K;1f$EJ@W%G3%3dM}_HhJE z(ahuWg}_YjjE6)8`*v_r(Syy|g8^-#CIz}?ft_(>&fdk+fzSOo_d5*gtl^V#M4%A0?CC%@Ij+9V3(Dv((O=gELMC)KJ3bxj`*>e zL_GP{>gwQ33X)-0n&m7EZ16!iaX5P)8N5dQ8pHzGXwdCLBgx`Qhv@JD>+RFbix^h&a`-I-|| zzVTHmM!0QI{=&eBzqXF{&GsXi1LV&M`K8yR{;`(*VTd@J>N^~l&n0NH91eN+s@J=v zs>H{uZf*$oEG>OgONx%@A*7`kLnEeL{8R);z(Yi|3?10yp-D*L<-wBGP~+*;tX8W zRk+9ZtGYysZ0+U1%WVwnrabodtGO8*&zgXfGj_ox6ZRK9)C}<6p@^{P(AwZ+_`l`% BRnq_f literal 0 HcmV?d00001 diff --git a/templates/AureliaSpa/.template.config/icon.png b/templates/AureliaSpa/.template.config/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..5a82b498eb54df3edf098fc06467ccb1cb6a0d1a GIT binary patch literal 2355 zcmV-33C#A1P)=USqXWvk^)o!oP?ut15JXtCTx zma&Dun`f`+I+5u^m*P&InP;%)VW;0Yl-e_odQzS2N}J+7mW*Yot8=-WZ?e`bi@tHY zjApIVB#G)voa;D|q%?rqCW+ZLlb2_$v2VAEVyKvGu-ht&u^)NfJCu!EqoHW9-a3<; zV64|Ah=p6FvTnHHG>@EMt>-q7;3|r;Hihdnj&4Gf;XIYqAcp8Pj-O(#uOWKgDvHt` zh37ev?Kh99WU<^aj(AX;ie9MdJd)ijjJ9jIn`N$vU8d6@hUqzxg;%BNEQ-5mx0NAs z=RA|tB8Qn{t=S)ivS+nnoLs}yskWwF^GgxMg5iBq6? zTB6V!gsT&BpJ1)#D2RwxqtX?CoL;M$CwAW`iq@JIu9B$ASf!ZB|c~PI0U#pK9Y^e}%g!k-5`aKS*Onsex6^f=q88aB!|@*gMLw>*cXA|A%^TLiQOH9id&}A6n?5@ zvZ)bqksfc}9)#i|h1eN_+8cu4AcfW!f#f8H+#Q3{6@cd^hua*3=_rWZ9fQ#lf9olT z&k%o&7HZNIf2R#^<|c=6NS5d)h=@_2o?)(uSf$?|h1nW{m0hZ(WU&euYq;k6Wm3N0otAqL^Q-rweX{R-|`O zpM_JQkXxvp7H_i=bGH_EdQF>{UaO;Hu(oTrkQQsk6?=P8pX4Hihftp9C5DU?X{Zfv z%@%&i8hhO#gsWz=s19(~9)W;SpEY37YybcNv2;>SQvd-21_lWU4Gj?z5)&6292_1Z zBqk;+FfubUIy^o>K|w=9L`zImR9RVDTV7vcWMyV)YjbvZd3kz#eSLp_e}IF9iI9?# zla!T}mzS5An3$fPsi~@~ud%YTw6wLhx3{>tySu!+zQ4b~!O6?a&d$!y(9qG+($&}4 z+1lFL-r(Wk;p61w<>lt*=;-L^>Few6?(XpM@$vEU^Yrxe^!4@j_xk$!`uqF){QUj? z{{BYU2Fm~d1wcteK~#9!rIvYER8<(p&z)i4cR|PvBSH|x1(7s_zzPFVDM+DcwE`(H zkOa(%Ot3OEAT?9af(VRNb{VE&fKYIN(b!}uWeJQ*t^Vqqb7#Bf4i_Hy{V_Aox$}PS zeeXHnITxsbTF3+QLDR2$?R@mM(cSggHglHiY{{;N#8S#3(`W5xuU{BlN8_P*AkJTp zzppWC`+^1;-|Epr`g?9b0%vPqsU#K;Z7A$Q6fT*CoWJE7gGbR|;#HbYDAm6@eaus% zk1l7DjzU=HG|_BV{!=fsyL*S40?8!=yOGVt(Oa0&rSgaBl+g`&m|bB}?#~1`#Jim| z$LN_b2(8Ctn6WDaloF&Hp%7B3w0RhQ1mW}<^)lX6Gl@wR1SkZxZE(1!XLxXM7XU^P z-SrCAGsG4+M1C!k3KT;7NDm}yB@ZmixUNF>0;OErr_Be4C?ZHjAr?dZUUOjVcfF25 zw5D8d{WhE@YxIPYT9}lDqU%8?+$dn1Qb$6EkWY3Z4pGLSWny3xxc)FIQRH`FIM^->9GSXBw69;d~DW3RCC=?Dn0S9*!RH`RJ zzQXm<4_$lIP?u#?+!jJkufq1zvRY*(?LYj&9DaFERYBVC{e$dZ)&m9sx#iOXyIy_| zf#c)jd*H&+JXlrLcwc5ufknyXoFvHf&IfKFoY9_G(|8Z3e?<@I`d;JKr@PYjPZf4y zK1U&ZvHhi0uvT&jH?Nz~yI$f|Ij^FAKMn2QG66ciGstE3z^CaK1x;(^rD zw>8xPu7b5a^(LmtO33=R%r`@I%`zqPu8lXG6|P2I3x zBEj|)FgsqsO@a;34Lm?ra2cBX583n9->>B)-wRMKaM^AkD})VYxdC7qQ(MGIoE0z( z>yvgpcwj*k(0;=d@E^}4%z>Hr>>5Dtgk(LnUk}gni?|uzbhfT$pRjCx#V}FY@odW+gD;5T!{i2QJnUC zp5rOnUa=7ykuP^=ewv2%IN106FR^`z5>|-KQ&nm?vl%ZvM`&MAqKXswb{?fpKJ}gr z(0?4Ax#4%n4NZrr@K7V03*LaTJ0#i=DwjF?84&r;-(3B13Fd>c58%f5}(a zeiXhtwXH!RiiqxPSxs&yX>xtMC4B2@Z5fHB<{dP(hoVJ z()T;tRk#^!q~>)$$_jq!9)<<7tU=i1siYA3CS_S|S`PjkWGB%0=69WZAcIyz25`?*7f1oPq7d@86J Z`yX78Fv2fUZ=V1F002ovPDHLkV1kW!in{;+ literal 0 HcmV?d00001 diff --git a/templates/KnockoutSpa/.template.config/icon.png b/templates/KnockoutSpa/.template.config/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..adeddc23cf5f3f58c1b9e37cffd76b073e4f5d23 GIT binary patch literal 6109 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 F|1avXAK?H1 literal 0 HcmV?d00001 diff --git a/templates/VueSpa/.template.config/icon.png b/templates/VueSpa/.template.config/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..2e861ee5268ef542e7134f2b2e806f567447a0e8 GIT binary patch literal 1661 zcmXw23piA17@naR*DSd_6;Ud-qA(XTW6qgD?w4fTw#*pgGFB-p%H_^PTs+|NDO5|DRtH= zx&?tJjNJrv5Kk*aqd1(JGSD~J-B+*=R*Kyk5J)M46=K}{JX0wK2+=DNYC}NIRA8^) zqY7OFVI{hVkl9f<1kg}0V1L1L3gm#}&msD80NGQH zzzP&M5BOqs6_zimElvbEO9i}8ST1sHK1lS5WVPgB?h7S>uTUdGW5+VC0(T&eF)?wU zNI-D%j$EvqT~!6EL~d6l?yB$lzy*-O6iA6uJ0+NDBi7?W#BgLD0a7G?4zTc)mk+Fjb+H z8-*-|2_wLY+wpp5CkFma)<$3xIqNg z8B6L#8k7gA#5Ng+IE z;Q8r`?Z8h~ks9Q`1NYe?aTY&SQ?q1l4!!ii(O_1!>mXh2=J5dInK}I1Ne3vpE@yOlrn7YkpH_;)j=DT#)~kXpZbxGEyjJP zohA9@Qr|c>Tq?c1RMS`Oy!OgauN=G#nyY^@I$YgWZG8U@!hHS#`Z%=T;K!&+RpPab z;*C~0!-gYgG}aB1ef$Tj#?wb{JveJ?0DT=~{A2KkHu283*P3oy{C44=?}%$`H9F(H zRVRO1klhwoVI1A(r4Y57cZMp$rk~-vpEeiR3W}`W*7hRT_cXzFLiNYjRUS+mVVRFk z+HF7BKC9=$hBTwG{+oU2DOQwIW{w9$`}ESD1f&vV97___1QE1mkXDDk=$bs8+5dKP zMONXS&U!6wOhVWOTS;~wpLL;o`3u^xxZ_G`3qShC&6h#9)vtY=Mmmf0}v3pPE|D?c{eKOanxk;8e}gw79pVGFbF(_L#;PW;k* zZ#rpW*=wdu;B1B#>DE0Ssk6+_lp6Ov59#@&{=S@=TU~x!>#uW81GJDOyz>lx>5?ba z!L+jFO-mX?D|1tll4ob8ELA0&c^<59=HzF1g8uog^|k-zjoXxx_l|kX1uc5ogW!C3 zB=<%bUZX#0sMZa==Si5;E0Z1??}weW+FdJ#++Q)(BqOU00$6Xhl-6zhLdf#4|mgA8(WLZ|qa=D^C4pS`|F@ rPHMiXB+qGGGeOsShM-@OkT_|YIbrAU)G;UvoJE|MyT4m4i;MmT6-4S# literal 0 HcmV?d00001 From 4e847f45454ac9e6e874b02bc7846b3b174e1471 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 17 May 2017 11:09:45 +0100 Subject: [PATCH 051/411] Reference icon in vs-2017.3.host.json files --- templates/package-builder/src/build/build.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/templates/package-builder/src/build/build.ts b/templates/package-builder/src/build/build.ts index 58c0a614..5e343c1c 100644 --- a/templates/package-builder/src/build/build.ts +++ b/templates/package-builder/src/build/build.ts @@ -163,10 +163,11 @@ function buildDotNetNewNuGetPackage() { fs.writeFileSync(path.join(templateConfigDir, 'vs-2017.3.host.json'), JSON.stringify({ name: { text: templateConfig.displayName }, - description: { text: templateConfig.displayName }, + description: { text: `Web application built with MVC ASP.NET Core and ${templateConfig.displayName}` }, order: 2000, - learnMoreLink: "https://github.com/aspnet/JavaScriptServices", - uiFilters: [ "oneaspnet" ] + icon: 'icon.png', + learnMoreLink: 'https://github.com/aspnet/JavaScriptServices', + uiFilters: [ 'oneaspnet' ] }, null, 2)); }); From 45ec148decfc42a0f781fe46e9289b517cbb5e5e Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 17 May 2017 11:22:59 +0100 Subject: [PATCH 052/411] Update AppVeyor to use .NET Core 1.0.4 SDK --- appveyor.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index e3d61d78..f39e2e4f 100755 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,17 +4,12 @@ install: - ps: Install-Product node 6.9.2 x64 # .NET Core SDK binaries # Download .NET Core SDK and add to PATH - - ps: $urlCurrent = "https://go.microsoft.com/fwlink/?LinkID=834991" - - ps: $urlPreview = "https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.0/dotnet-dev-win-x64.latest.zip" + - ps: $urlCurrent = "https://download.microsoft.com/download/E/7/8/E782433E-7737-4E6C-BFBF-290A0A81C3D7/dotnet-dev-win-x64.1.0.4.zip" - ps: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetsdk" - ps: mkdir $env:DOTNET_INSTALL_DIR -Force | Out-Null - ps: $tempFileCurrent = [System.IO.Path]::GetTempFileName() - - ps: $tempFilePreview = [System.IO.Path]::GetTempFileName() - ps: (New-Object System.Net.WebClient).DownloadFile($urlCurrent, $tempFileCurrent) - - ps: (New-Object System.Net.WebClient).DownloadFile($urlPreview, $tempFilePreview) - ps: Add-Type -AssemblyName System.IO.Compression.FileSystem; [System.IO.Compression.ZipFile]::ExtractToDirectory($tempFileCurrent, $env:DOTNET_INSTALL_DIR) - - ps: Add-Type -AssemblyName System.IO.Compression.FileSystem; [System.IO.Compression.ZipFile]::ExtractToDirectory($tempFilePreview, $env:DOTNET_INSTALL_DIR + "preview") - - ps: Copy-Item "${env:DOTNET_INSTALL_DIR}preview\*" "${env:DOTNET_INSTALL_DIR}" -Force -Recurse - ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path" build_script: - ps: Push-Location From 82dca64b8aaa5a62afd8ac3331fe362637ac2dd7 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 17 May 2017 11:37:33 +0100 Subject: [PATCH 053/411] When generating test project, do include test files --- test/templates/angular.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/templates/angular.spec.ts b/test/templates/angular.spec.ts index 047a9383..2c6bd4d8 100644 --- a/test/templates/angular.spec.ts +++ b/test/templates/angular.spec.ts @@ -13,7 +13,7 @@ if (!process.env.SKIP_PROJECT_GENERATION) { generateProjectSync(appDir, { framework: 'angular', name: 'Test App', - tests: false + tests: true }); publishProjectSync(appDir, publishedAppDir); } From 5ec31b3672136ebad33fb2065e85d72377243d18 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 17 May 2017 11:43:33 +0100 Subject: [PATCH 054/411] Try another way to get AppVeyor to pass through -Djna.nosys=true --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index f39e2e4f..a6e41fba 100755 --- a/appveyor.yml +++ b/appveyor.yml @@ -29,7 +29,7 @@ test_script: - dotnet restore - npm install -g selenium-standalone - selenium-standalone install - - ps: Start-Process selenium-standalone 'start' + - ps: Start-Process selenium-standalone 'start','-Djna.nosys=true' - ps: Push-Location - cd test - npm install From 144ad6a561e9ad1a502de5fe64916f31ecd73087 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 17 May 2017 12:04:43 +0100 Subject: [PATCH 055/411] Further attempt to make Djna.nosys=true work on AppVeyor --- appveyor.yml | 5 ++--- test/start-selenium.js | 30 ++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 test/start-selenium.js diff --git a/appveyor.yml b/appveyor.yml index a6e41fba..f8e8861d 100755 --- a/appveyor.yml +++ b/appveyor.yml @@ -27,9 +27,8 @@ artifacts: clone_depth: 1 test_script: - dotnet restore - - npm install -g selenium-standalone - - selenium-standalone install - - ps: Start-Process selenium-standalone 'start','-Djna.nosys=true' + - npm install selenium-standalone + - ps: Start-Process node './start-selenium.js' - ps: Push-Location - cd test - npm install diff --git a/test/start-selenium.js b/test/start-selenium.js new file mode 100644 index 00000000..093b33d3 --- /dev/null +++ b/test/start-selenium.js @@ -0,0 +1,30 @@ +var seleniumStandalone = require('selenium-standalone'); + +var installOptions = { + progressCb: function(totalLength, progressLength, chunkLength) { + var percent = 100 * progressLength / totalLength; + console.log('Installing selenium-standalone: ' + percent.toFixed(0) + '%'); + } +}; + +console.log('Installing selenium-standalone...'); +seleniumStandalone.install(installOptions, function(err) { + if (err) { + throw err; + } + + var startOptions = { + javaArgs: ['-Djna.nosys=true'], + spawnOptions: { stdio: 'inherit' } + }; + + console.log('Starting selenium-standalone...'); + seleniumStandalone.start(startOptions, function(err, seleniumProcess) { + if (err) { + throw err; + } + + console.log('Started Selenium server'); + + }); +}); \ No newline at end of file From 5086d0cc1c3c3a022faa0857dbb20e231156a522 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 17 May 2017 12:25:23 +0100 Subject: [PATCH 056/411] Fix test script --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index f8e8861d..d0f6bbcf 100755 --- a/appveyor.yml +++ b/appveyor.yml @@ -27,10 +27,10 @@ artifacts: clone_depth: 1 test_script: - dotnet restore - - npm install selenium-standalone - - ps: Start-Process node './start-selenium.js' - ps: Push-Location - cd test + - npm install selenium-standalone + - ps: Start-Process node './start-selenium.js' - npm install - npm test on_finish : From 84aec29cf221514a5973af6d7b5e81f1fe2bb94a Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 17 May 2017 14:27:11 +0100 Subject: [PATCH 057/411] Bump template package versions to 0.9.2 for publish --- templates/package-builder/src/yeoman/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/package-builder/src/yeoman/package.json b/templates/package-builder/src/yeoman/package.json index c4eb7501..505a6881 100644 --- a/templates/package-builder/src/yeoman/package.json +++ b/templates/package-builder/src/yeoman/package.json @@ -1,6 +1,6 @@ { "name": "generator-aspnetcore-spa", - "version": "0.9.1", + "version": "0.9.2", "description": "Single-Page App templates for ASP.NET Core", "author": "Microsoft", "license": "Apache-2.0", From 7a11cf97fd02d57f84ee7c9d236d36753afb607f Mon Sep 17 00:00:00 2001 From: Keven van Zuijlen Date: Tue, 28 Mar 2017 13:46:51 +0200 Subject: [PATCH 058/411] Updated react-router to react-router-dom 4.0.0 --- templates/ReactSpa/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/ReactSpa/package.json b/templates/ReactSpa/package.json index c8704b9f..ee1272ec 100644 --- a/templates/ReactSpa/package.json +++ b/templates/ReactSpa/package.json @@ -23,7 +23,7 @@ "json-loader": "^0.5.4", "react": "~15.4.0", "react-dom": "~15.4.0", - "react-router": "^2.8.1", + "react-router-dom": "^4.0.0", "style-loader": "^0.13.1", "typescript": "^2.2.1", "url-loader": "^0.5.7", From d2c56d19d0d722bdf81c24f557befee8bbba4853 Mon Sep 17 00:00:00 2001 From: Keven van Zuijlen Date: Tue, 28 Mar 2017 14:21:25 +0200 Subject: [PATCH 059/411] Implemented react-router-dom v4 --- templates/ReactSpa/ClientApp/boot.tsx | 4 ++-- templates/ReactSpa/ClientApp/components/Layout.tsx | 4 ++-- .../ReactSpa/ClientApp/components/NavMenu.tsx | 14 +++++++------- templates/ReactSpa/ClientApp/routes.tsx | 12 ++++++------ 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/templates/ReactSpa/ClientApp/boot.tsx b/templates/ReactSpa/ClientApp/boot.tsx index 5bc2ec2c..e1cd9f97 100644 --- a/templates/ReactSpa/ClientApp/boot.tsx +++ b/templates/ReactSpa/ClientApp/boot.tsx @@ -2,12 +2,12 @@ import './css/site.css'; import 'bootstrap'; import * as React from 'react'; import * as ReactDOM from 'react-dom'; -import { browserHistory, Router } from 'react-router'; +import { BrowserRouter as Router } from 'react-router-dom'; import routes from './routes'; // This code starts up the React app when it runs in a browser. It sets up the routing configuration // and injects the app into a DOM element. ReactDOM.render( - , + , document.getElementById('react-app') ); diff --git a/templates/ReactSpa/ClientApp/components/Layout.tsx b/templates/ReactSpa/ClientApp/components/Layout.tsx index b87c7313..8c8870e2 100644 --- a/templates/ReactSpa/ClientApp/components/Layout.tsx +++ b/templates/ReactSpa/ClientApp/components/Layout.tsx @@ -2,7 +2,7 @@ import * as React from 'react'; import { NavMenu } from './NavMenu'; export interface LayoutProps { - body: React.ReactElement; + children?: React.ReactNode; } export class Layout extends React.Component { @@ -13,7 +13,7 @@ export class Layout extends React.Component {
- { this.props.body } + { this.props.children }
; diff --git a/templates/ReactSpa/ClientApp/components/NavMenu.tsx b/templates/ReactSpa/ClientApp/components/NavMenu.tsx index feef09d3..5547ab4a 100644 --- a/templates/ReactSpa/ClientApp/components/NavMenu.tsx +++ b/templates/ReactSpa/ClientApp/components/NavMenu.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import { Link } from 'react-router'; +import { Link, NavLink } from 'react-router-dom'; export class NavMenu extends React.Component<{}, {}> { public render() { @@ -18,19 +18,19 @@ export class NavMenu extends React.Component<{}, {}> {
  • - + Home - +
  • - + Counter - +
  • - + Fetch data - +
diff --git a/templates/ReactSpa/ClientApp/routes.tsx b/templates/ReactSpa/ClientApp/routes.tsx index 5a3dafb6..dfacf05c 100644 --- a/templates/ReactSpa/ClientApp/routes.tsx +++ b/templates/ReactSpa/ClientApp/routes.tsx @@ -1,15 +1,15 @@ import * as React from 'react'; -import { Router, Route, HistoryBase } from 'react-router'; +import { Route } from 'react-router-dom'; import { Layout } from './components/Layout'; import { Home } from './components/Home'; import { FetchData } from './components/FetchData'; import { Counter } from './components/Counter'; -export default - - - -; +export default + + + +; // Allow Hot Module Reloading declare var module: any; From c791ceee492a895bab51278303510b79b6b0f703 Mon Sep 17 00:00:00 2001 From: Keven van Zuijlen Date: Wed, 12 Apr 2017 21:00:15 +0200 Subject: [PATCH 060/411] Updatged package.json and webpack vendor config --- templates/ReactReduxSpa/package.json | 11 ++++++----- templates/ReactReduxSpa/webpack.config.vendor.js | 3 ++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/templates/ReactReduxSpa/package.json b/templates/ReactReduxSpa/package.json index b02c5138..1929cbbd 100644 --- a/templates/ReactReduxSpa/package.json +++ b/templates/ReactReduxSpa/package.json @@ -2,12 +2,12 @@ "name": "WebApplicationBasic", "version": "0.0.0", "dependencies": { - "@types/history": "^2.0.0", + "@types/history": "^4.5.0", "@types/react": "^0.14.29", "@types/react-dom": "^0.14.14", "@types/react-redux": "^4.4.29", - "@types/react-router": "^2.0.30", - "@types/react-router-redux": "4.0.30", + "@types/react-router": "^4.0.4", + "@types/react-router-redux": "^5.0.0", "@types/redux": "3.5.27", "@types/webpack": "^2.2.0", "@types/webpack-env": "^1.13.0", @@ -25,14 +25,15 @@ "event-source-polyfill": "^0.0.7", "extract-text-webpack-plugin": "^2.0.0-rc", "file-loader": "^0.8.5", + "history": "^4.6.1", "jquery": "^2.2.1", "json-loader": "^0.5.4", "node-noop": "^1.0.0", "react": "~15.4.0", "react-dom": "~15.4.0", "react-redux": "^4.4.5", - "react-router": "^2.8.1", - "react-router-redux": "^4.0.6", + "react-router-dom": "^4.1.0", + "react-router-redux": "^5.0.0-alpha.5", "redux": "^3.6.0", "redux-thunk": "^2.2.0", "style-loader": "^0.13.0", diff --git a/templates/ReactReduxSpa/webpack.config.vendor.js b/templates/ReactReduxSpa/webpack.config.vendor.js index bd180821..dbc03036 100644 --- a/templates/ReactReduxSpa/webpack.config.vendor.js +++ b/templates/ReactReduxSpa/webpack.config.vendor.js @@ -21,9 +21,10 @@ module.exports = (env) => { 'bootstrap/dist/css/bootstrap.css', 'domain-task', 'event-source-polyfill', + 'history', 'react', 'react-dom', - 'react-router', + 'react-router-dom', 'react-redux', 'redux', 'redux-thunk', From 785e7d48a2894a7c0b4ba6e3a5bd56f99534c75c Mon Sep 17 00:00:00 2001 From: Keven van Zuijlen Date: Wed, 12 Apr 2017 21:28:23 +0200 Subject: [PATCH 061/411] Implemented react-router v4 to ReactRedux template --- .../ReactReduxSpa/ClientApp/boot-client.tsx | 12 ++-- .../ReactReduxSpa/ClientApp/boot-server.tsx | 64 +++++++++---------- .../ClientApp/components/Counter.tsx | 4 +- .../ClientApp/components/FetchData.tsx | 14 ++-- .../ClientApp/components/Layout.tsx | 4 +- .../ClientApp/components/NavMenu.tsx | 14 ++-- .../ReactReduxSpa/ClientApp/configureStore.ts | 8 ++- templates/ReactReduxSpa/ClientApp/routes.tsx | 14 ++-- templates/ReactReduxSpa/package.json | 2 +- 9 files changed, 67 insertions(+), 69 deletions(-) diff --git a/templates/ReactReduxSpa/ClientApp/boot-client.tsx b/templates/ReactReduxSpa/ClientApp/boot-client.tsx index 4dc12af3..58d85a39 100644 --- a/templates/ReactReduxSpa/ClientApp/boot-client.tsx +++ b/templates/ReactReduxSpa/ClientApp/boot-client.tsx @@ -2,23 +2,25 @@ import './css/site.css'; import 'bootstrap'; import * as React from 'react'; import * as ReactDOM from 'react-dom'; -import { browserHistory, Router } from 'react-router'; import { Provider } from 'react-redux'; -import { syncHistoryWithStore } from 'react-router-redux'; +import { ConnectedRouter } from 'react-router-redux'; +import { createBrowserHistory } from 'history'; import routes from './routes'; import configureStore from './configureStore'; import { ApplicationState } from './store'; +// Create browser history to use in the Redux store +const history = createBrowserHistory(); + // Get the application-wide store instance, prepopulating with state from the server where available. const initialState = (window as any).initialReduxState as ApplicationState; -const store = configureStore(initialState); -const history = syncHistoryWithStore(browserHistory, store); +const store = configureStore(history, initialState); // This code starts up the React app when it runs in a browser. It sets up the routing configuration // and injects the app into a DOM element. ReactDOM.render( - + , document.getElementById('react-app') ); diff --git a/templates/ReactReduxSpa/ClientApp/boot-server.tsx b/templates/ReactReduxSpa/ClientApp/boot-server.tsx index 4d43376b..93d818fa 100644 --- a/templates/ReactReduxSpa/ClientApp/boot-server.tsx +++ b/templates/ReactReduxSpa/ClientApp/boot-server.tsx @@ -1,50 +1,46 @@ import * as React from 'react'; import { Provider } from 'react-redux'; import { renderToString } from 'react-dom/server'; -import { match, RouterContext } from 'react-router'; -import createMemoryHistory from 'history/lib/createMemoryHistory'; +import { StaticRouter } from 'react-router-dom'; +import { replace } from "react-router-redux"; +import { createMemoryHistory } from 'history'; import { createServerRenderer, RenderResult } from 'aspnet-prerendering'; import routes from './routes'; import configureStore from './configureStore'; export default createServerRenderer(params => { return new Promise((resolve, reject) => { - // Match the incoming request against the list of client-side routes - const store = configureStore(); - match({ routes, location: params.location }, (error, redirectLocation, renderProps: any) => { - if (error) { - throw error; - } + // Create memory history to use in the Redux store + const history = createMemoryHistory(); + const store = configureStore(history); - // If there's a redirection, just send this information back to the host application - if (redirectLocation) { - resolve({ redirectUrl: redirectLocation.pathname }); - return; - } + // Dispatch the current location so that the router knows where to go + store.dispatch(replace(params.location)); - // If it didn't match any route, renderProps will be undefined - if (!renderProps) { - throw new Error(`The location '${ params.url }' doesn't match any route configured in react-router.`); - } + const context : any = {}; - // Build an instance of the application - const app = ( - - - - ); + const app = ( + + + + ); - // Perform an initial render that will cause any async tasks (e.g., data access) to begin - renderToString(app); + // Perform an initial render that will cause any async tasks (e.g., data access) to begin + renderToString(app); - // Once the tasks are done, we can perform the final render - // We also send the redux store state, so the client can continue execution where the server left off - params.domainTasks.then(() => { - resolve({ - html: renderToString(app), - globals: { initialReduxState: store.getState() } - }); - }, reject); // Also propagate any errors back into the host application - }); + // If there's a redirection, just send this information back to the host application (Maybe improve this?) + if (context.url) { + resolve({ redirectUrl: context.url }); + return; + } + + // Once the tasks are done, we can perform the final render + // We also send the redux store state, so the client can continue execution where the server left off + params.domainTasks.then(() => { + resolve({ + html: renderToString(app), + globals: { initialReduxState: store.getState() } + }); + }, reject); // Also propagate any errors back into the host application }); }); diff --git a/templates/ReactReduxSpa/ClientApp/components/Counter.tsx b/templates/ReactReduxSpa/ClientApp/components/Counter.tsx index 10372473..f56cb4bf 100644 --- a/templates/ReactReduxSpa/ClientApp/components/Counter.tsx +++ b/templates/ReactReduxSpa/ClientApp/components/Counter.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import { Link } from 'react-router'; +import { Link, RouteComponentProps } from 'react-router-dom'; import { connect } from 'react-redux'; import { ApplicationState } from '../store'; import * as CounterStore from '../store/Counter'; @@ -22,7 +22,7 @@ class Counter extends React.Component { } // Wire up the React component to the Redux store -export default connect( +export default connect>( (state: ApplicationState) => state.counter, // Selects which state properties are merged into the component's props CounterStore.actionCreators // Selects which action creators are merged into the component's props )(Counter); diff --git a/templates/ReactReduxSpa/ClientApp/components/FetchData.tsx b/templates/ReactReduxSpa/ClientApp/components/FetchData.tsx index 8a79cb85..e6380b21 100644 --- a/templates/ReactReduxSpa/ClientApp/components/FetchData.tsx +++ b/templates/ReactReduxSpa/ClientApp/components/FetchData.tsx @@ -1,25 +1,25 @@ import * as React from 'react'; -import { Link } from 'react-router'; +import { Link, RouteComponentProps } from 'react-router-dom'; import { connect } from 'react-redux'; import { ApplicationState } from '../store'; import * as WeatherForecastsState from '../store/WeatherForecasts'; // At runtime, Redux will merge together... type WeatherForecastProps = - WeatherForecastsState.WeatherForecastsState // ... state we've requested from the Redux store - & typeof WeatherForecastsState.actionCreators // ... plus action creators we've requested - & { params: { startDateIndex: string } }; // ... plus incoming routing parameters + WeatherForecastsState.WeatherForecastsState // ... state we've requested from the Redux store + & typeof WeatherForecastsState.actionCreators // ... plus action creators we've requested + & RouteComponentProps<{ startDateIndex: string }>; // ... plus incoming routing parameters class FetchData extends React.Component { componentWillMount() { // This method runs when the component is first added to the page - let startDateIndex = parseInt(this.props.params.startDateIndex) || 0; + let startDateIndex = parseInt(this.props.match.params.startDateIndex) || 0; this.props.requestWeatherForecasts(startDateIndex); } componentWillReceiveProps(nextProps: WeatherForecastProps) { // This method runs when incoming props (e.g., route params) change - let startDateIndex = parseInt(nextProps.params.startDateIndex) || 0; + let startDateIndex = parseInt(nextProps.match.params.startDateIndex) || 0; this.props.requestWeatherForecasts(startDateIndex); } @@ -67,7 +67,7 @@ class FetchData extends React.Component { } } -export default connect( +export default connect( (state: ApplicationState) => state.weatherForecasts, // Selects which state properties are merged into the component's props WeatherForecastsState.actionCreators // Selects which action creators are merged into the component's props )(FetchData); diff --git a/templates/ReactReduxSpa/ClientApp/components/Layout.tsx b/templates/ReactReduxSpa/ClientApp/components/Layout.tsx index b87c7313..18179ff7 100644 --- a/templates/ReactReduxSpa/ClientApp/components/Layout.tsx +++ b/templates/ReactReduxSpa/ClientApp/components/Layout.tsx @@ -2,7 +2,7 @@ import * as React from 'react'; import { NavMenu } from './NavMenu'; export interface LayoutProps { - body: React.ReactElement; + children?: React.ReactElement; } export class Layout extends React.Component { @@ -13,7 +13,7 @@ export class Layout extends React.Component {
- { this.props.body } + { this.props.children }
; diff --git a/templates/ReactReduxSpa/ClientApp/components/NavMenu.tsx b/templates/ReactReduxSpa/ClientApp/components/NavMenu.tsx index feef09d3..17471480 100644 --- a/templates/ReactReduxSpa/ClientApp/components/NavMenu.tsx +++ b/templates/ReactReduxSpa/ClientApp/components/NavMenu.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import { Link } from 'react-router'; +import { NavLink, Link } from 'react-router-dom'; export class NavMenu extends React.Component<{}, {}> { public render() { @@ -18,19 +18,19 @@ export class NavMenu extends React.Component<{}, {}> {
  • - + Home - +
  • - + Counter - +
  • - + Fetch data - +
diff --git a/templates/ReactReduxSpa/ClientApp/configureStore.ts b/templates/ReactReduxSpa/ClientApp/configureStore.ts index 5b38388e..ed1f5519 100644 --- a/templates/ReactReduxSpa/ClientApp/configureStore.ts +++ b/templates/ReactReduxSpa/ClientApp/configureStore.ts @@ -1,15 +1,17 @@ import { createStore, applyMiddleware, compose, combineReducers, GenericStoreEnhancer } from 'redux'; import thunk from 'redux-thunk'; -import { routerReducer } from 'react-router-redux'; +import { routerReducer, routerMiddleware } from 'react-router-redux'; import * as Store from './store'; +import { History } from 'history'; -export default function configureStore(initialState?: Store.ApplicationState) { +export default function configureStore(history: History, initialState?: Store.ApplicationState) { // Build middleware. These are functions that can process the actions before they reach the store. const windowIfDefined = typeof window === 'undefined' ? null : window as any; // If devTools is installed, connect to it const devToolsExtension = windowIfDefined && windowIfDefined.devToolsExtension as () => GenericStoreEnhancer; + const middlewares = [thunk, routerMiddleware(history)]; const createStoreWithMiddleware = compose( - applyMiddleware(thunk), + applyMiddleware(...middlewares), devToolsExtension ? devToolsExtension() : f => f )(createStore); diff --git a/templates/ReactReduxSpa/ClientApp/routes.tsx b/templates/ReactReduxSpa/ClientApp/routes.tsx index 6845bfbb..8e3465a3 100644 --- a/templates/ReactReduxSpa/ClientApp/routes.tsx +++ b/templates/ReactReduxSpa/ClientApp/routes.tsx @@ -1,17 +1,15 @@ import * as React from 'react'; -import { Router, Route, HistoryBase } from 'react-router'; +import { Route } from 'react-router-dom'; import { Layout } from './components/Layout'; import Home from './components/Home'; import FetchData from './components/FetchData'; import Counter from './components/Counter'; -export default - - - - { /* Optional route segment that does not affect NavMenu highlighting */ } - -; +export default + + + +; // Enable Hot Module Replacement (HMR) if (module.hot) { diff --git a/templates/ReactReduxSpa/package.json b/templates/ReactReduxSpa/package.json index 1929cbbd..d4e4052f 100644 --- a/templates/ReactReduxSpa/package.json +++ b/templates/ReactReduxSpa/package.json @@ -6,7 +6,7 @@ "@types/react": "^0.14.29", "@types/react-dom": "^0.14.14", "@types/react-redux": "^4.4.29", - "@types/react-router": "^4.0.4", + "@types/react-router-dom": "^4.0.3", "@types/react-router-redux": "^5.0.0", "@types/redux": "3.5.27", "@types/webpack": "^2.2.0", From e658ee637567b480e1581210dc54feae01000cd1 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 17 May 2017 12:44:12 +0100 Subject: [PATCH 062/411] Simplifications in ReactSpa and ReactReduxSpa --- .../ReactReduxSpa/ClientApp/boot-server.tsx | 27 +++++++++---------- .../ClientApp/components/Counter.tsx | 9 ++++--- .../ClientApp/components/FetchData.tsx | 4 +-- .../ClientApp/components/Home.tsx | 3 ++- .../ReactReduxSpa/ClientApp/configureStore.ts | 3 +-- templates/ReactReduxSpa/package.json | 4 +-- templates/ReactSpa/ClientApp/boot.tsx | 4 +-- templates/ReactSpa/webpack.config.vendor.js | 2 +- 8 files changed, 28 insertions(+), 28 deletions(-) diff --git a/templates/ReactReduxSpa/ClientApp/boot-server.tsx b/templates/ReactReduxSpa/ClientApp/boot-server.tsx index 93d818fa..3d9241a8 100644 --- a/templates/ReactReduxSpa/ClientApp/boot-server.tsx +++ b/templates/ReactReduxSpa/ClientApp/boot-server.tsx @@ -2,7 +2,7 @@ import * as React from 'react'; import { Provider } from 'react-redux'; import { renderToString } from 'react-dom/server'; import { StaticRouter } from 'react-router-dom'; -import { replace } from "react-router-redux"; +import { replace } from 'react-router-redux'; import { createMemoryHistory } from 'history'; import { createServerRenderer, RenderResult } from 'aspnet-prerendering'; import routes from './routes'; @@ -10,31 +10,28 @@ import configureStore from './configureStore'; export default createServerRenderer(params => { return new Promise((resolve, reject) => { - // Create memory history to use in the Redux store - const history = createMemoryHistory(); - const store = configureStore(history); - - // Dispatch the current location so that the router knows where to go + // Prepare Redux store with in-memory history, and dispatch a navigation event + // corresponding to the incoming URL + const store = configureStore(createMemoryHistory()); store.dispatch(replace(params.location)); - const context : any = {}; - + // Prepare an instance of the application and perform an inital render that will + // cause any async tasks (e.g., data access) to begin + const routerContext: any = {}; const app = ( - + ); - - // Perform an initial render that will cause any async tasks (e.g., data access) to begin renderToString(app); - // If there's a redirection, just send this information back to the host application (Maybe improve this?) - if (context.url) { - resolve({ redirectUrl: context.url }); + // If there's a redirection, just send this information back to the host application + if (routerContext.url) { + resolve({ redirectUrl: routerContext.url }); return; } - // Once the tasks are done, we can perform the final render + // Once any async tasks are done, we can perform the final render // We also send the redux store state, so the client can continue execution where the server left off params.domainTasks.then(() => { resolve({ diff --git a/templates/ReactReduxSpa/ClientApp/components/Counter.tsx b/templates/ReactReduxSpa/ClientApp/components/Counter.tsx index f56cb4bf..da275fb0 100644 --- a/templates/ReactReduxSpa/ClientApp/components/Counter.tsx +++ b/templates/ReactReduxSpa/ClientApp/components/Counter.tsx @@ -5,7 +5,10 @@ import { ApplicationState } from '../store'; import * as CounterStore from '../store/Counter'; import * as WeatherForecasts from '../store/WeatherForecasts'; -type CounterProps = CounterStore.CounterState & typeof CounterStore.actionCreators; +type CounterProps = + CounterStore.CounterState + & typeof CounterStore.actionCreators + & RouteComponentProps<{}>; class Counter extends React.Component { public render() { @@ -22,7 +25,7 @@ class Counter extends React.Component { } // Wire up the React component to the Redux store -export default connect>( +export default connect( (state: ApplicationState) => state.counter, // Selects which state properties are merged into the component's props CounterStore.actionCreators // Selects which action creators are merged into the component's props -)(Counter); +)(Counter) as typeof Counter; \ No newline at end of file diff --git a/templates/ReactReduxSpa/ClientApp/components/FetchData.tsx b/templates/ReactReduxSpa/ClientApp/components/FetchData.tsx index e6380b21..dd8a7f44 100644 --- a/templates/ReactReduxSpa/ClientApp/components/FetchData.tsx +++ b/templates/ReactReduxSpa/ClientApp/components/FetchData.tsx @@ -67,7 +67,7 @@ class FetchData extends React.Component { } } -export default connect( +export default connect( (state: ApplicationState) => state.weatherForecasts, // Selects which state properties are merged into the component's props WeatherForecastsState.actionCreators // Selects which action creators are merged into the component's props -)(FetchData); +)(FetchData) as typeof FetchData; diff --git a/templates/ReactReduxSpa/ClientApp/components/Home.tsx b/templates/ReactReduxSpa/ClientApp/components/Home.tsx index d21063af..c79e5de6 100644 --- a/templates/ReactReduxSpa/ClientApp/components/Home.tsx +++ b/templates/ReactReduxSpa/ClientApp/components/Home.tsx @@ -1,6 +1,7 @@ import * as React from 'react'; +import { RouteComponentProps } from 'react-router-dom'; -export default class Home extends React.Component<{}, {}> { +export default class Home extends React.Component, {}> { public render() { return

Hello, world!

diff --git a/templates/ReactReduxSpa/ClientApp/configureStore.ts b/templates/ReactReduxSpa/ClientApp/configureStore.ts index ed1f5519..251aced9 100644 --- a/templates/ReactReduxSpa/ClientApp/configureStore.ts +++ b/templates/ReactReduxSpa/ClientApp/configureStore.ts @@ -9,9 +9,8 @@ export default function configureStore(history: History, initialState?: Store.Ap const windowIfDefined = typeof window === 'undefined' ? null : window as any; // If devTools is installed, connect to it const devToolsExtension = windowIfDefined && windowIfDefined.devToolsExtension as () => GenericStoreEnhancer; - const middlewares = [thunk, routerMiddleware(history)]; const createStoreWithMiddleware = compose( - applyMiddleware(...middlewares), + applyMiddleware(thunk, routerMiddleware(history)), devToolsExtension ? devToolsExtension() : f => f )(createStore); diff --git a/templates/ReactReduxSpa/package.json b/templates/ReactReduxSpa/package.json index d4e4052f..5d956edb 100644 --- a/templates/ReactReduxSpa/package.json +++ b/templates/ReactReduxSpa/package.json @@ -7,7 +7,7 @@ "@types/react-dom": "^0.14.14", "@types/react-redux": "^4.4.29", "@types/react-router-dom": "^4.0.3", - "@types/react-router-redux": "^5.0.0", + "@types/react-router-redux": "5.0.1", "@types/redux": "3.5.27", "@types/webpack": "^2.2.0", "@types/webpack-env": "^1.13.0", @@ -33,7 +33,7 @@ "react-dom": "~15.4.0", "react-redux": "^4.4.5", "react-router-dom": "^4.1.0", - "react-router-redux": "^5.0.0-alpha.5", + "react-router-redux": "5.0.0-alpha.6", "redux": "^3.6.0", "redux-thunk": "^2.2.0", "style-loader": "^0.13.0", diff --git a/templates/ReactSpa/ClientApp/boot.tsx b/templates/ReactSpa/ClientApp/boot.tsx index e1cd9f97..1d15e40e 100644 --- a/templates/ReactSpa/ClientApp/boot.tsx +++ b/templates/ReactSpa/ClientApp/boot.tsx @@ -2,12 +2,12 @@ import './css/site.css'; import 'bootstrap'; import * as React from 'react'; import * as ReactDOM from 'react-dom'; -import { BrowserRouter as Router } from 'react-router-dom'; +import { BrowserRouter } from 'react-router-dom'; import routes from './routes'; // This code starts up the React app when it runs in a browser. It sets up the routing configuration // and injects the app into a DOM element. ReactDOM.render( - , + , document.getElementById('react-app') ); diff --git a/templates/ReactSpa/webpack.config.vendor.js b/templates/ReactSpa/webpack.config.vendor.js index c8eacdb4..11fc2a64 100644 --- a/templates/ReactSpa/webpack.config.vendor.js +++ b/templates/ReactSpa/webpack.config.vendor.js @@ -17,7 +17,7 @@ module.exports = (env) => { ] }, entry: { - vendor: ['bootstrap', 'bootstrap/dist/css/bootstrap.css', 'event-source-polyfill', 'isomorphic-fetch', 'react', 'react-dom', 'react-router', 'jquery'], + vendor: ['bootstrap', 'bootstrap/dist/css/bootstrap.css', 'event-source-polyfill', 'isomorphic-fetch', 'react', 'react-dom', 'react-router-dom', 'jquery'], }, output: { path: path.join(__dirname, 'wwwroot', 'dist'), From ef9dbfe44b877a57c1debad0f9a7ecca12216da6 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 17 May 2017 21:04:47 +0100 Subject: [PATCH 063/411] Update aspnet-webpack-react to v2.0.0, now supporting Webpack 2+ and React Hot Loader 3+ only --- .../npm/aspnet-webpack-react/README.md | 5 + .../npm/aspnet-webpack-react/package.json | 15 +-- .../src/HotModuleReplacement.ts | 116 ++++++++---------- .../npm/aspnet-webpack-react/src/index.ts | 7 +- 4 files changed, 66 insertions(+), 77 deletions(-) diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/README.md b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/README.md index 30cdc0c2..65f78bc1 100644 --- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/README.md +++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/README.md @@ -4,3 +4,8 @@ This NPM package is an internal implementation detail of the `Microsoft.AspNetCo You should not use this package directly in your own applications, because it is not supported, and there are no guarantees about how its APIs will change in the future. + +## History + +* Version 1.x amends the Webpack config to insert `react-transform` and `react-transform-hmr` entries on `babel-loader`. +* Version 2.x drops support for the Babel plugin, and instead amends the Webpack config to insert `react-hot-loader/webpack` and `react-hot-loader/patch` entries. This means it works with React Hot Loader v3. diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/package.json b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/package.json index 20b47c1f..ab98d2fd 100644 --- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/package.json +++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/package.json @@ -1,6 +1,6 @@ { "name": "aspnet-webpack-react", - "version": "1.0.5", + "version": "2.0.0", "description": "Helpers for using Webpack with React in ASP.NET Core projects. Works in conjunction with the Microsoft.AspNetCore.SpaServices NuGet package.", "main": "index.js", "scripts": { @@ -16,22 +16,13 @@ "type": "git", "url": "https://github.com/aspnet/JavaScriptServices.git" }, - "dependencies": { - "babel-core": "^6.7.2", - "babel-loader": "^6.2.4", - "babel-plugin-react-transform": "^2.0.2", - "babel-preset-es2015": "^6.6.0", - "babel-preset-react": "^6.5.0", - "react": "^15.0.0", - "react-transform-hmr": "^1.0.4" - }, "devDependencies": { "@types/webpack": "^2.2.0", "rimraf": "^2.5.4", "typescript": "^2.0.0", - "webpack": "^1.12.14" + "webpack": "^2.2.0" }, "peerDependencies": { - "webpack": "^1.13.2 || ^2.2.0" + "webpack": "^2.2.0" } } diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/src/HotModuleReplacement.ts b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/src/HotModuleReplacement.ts index b1787def..ca1bad63 100644 --- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/src/HotModuleReplacement.ts +++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/src/HotModuleReplacement.ts @@ -1,78 +1,66 @@ import * as webpack from 'webpack'; -type OldOrNewModule = webpack.OldModule & webpack.NewModule; -export function addReactHotModuleReplacementBabelTransform(webpackConfig: webpack.Configuration) { - const moduleConfig = webpackConfig.module as OldOrNewModule; - const moduleRules = moduleConfig.rules // Webpack >= 2.1.0 beta 23 - || moduleConfig.loaders; // Legacy/back-compat +const reactHotLoaderWebpackLoader = 'react-hot-loader/webpack'; +const reactHotLoaderPatch = 'react-hot-loader/patch'; +const supportedTypeScriptLoaders = ['ts-loader', 'awesome-typescript-loader']; + +export function addReactHotModuleReplacementConfig(webpackConfig: webpack.Configuration) { + const moduleConfig = webpackConfig.module as webpack.NewModule; + const moduleRules = moduleConfig.rules; if (!moduleRules) { - return; // Unknown rules list format + return; // Unknown rules list format. Might be Webpack 1.x, which is not supported. } - moduleRules.forEach(rule => { - // Allow rules/loaders entries to be either { loader: ... } or { use: ... } - // Ignore other config formats (too many combinations to support them all) - let loaderConfig = - (rule as webpack.NewUseRule).use // Recommended config format for Webpack 2.x - || (rule as webpack.LoaderRule).loader; // Typical config format for Webpack 1.x - if (!loaderConfig) { - return; // Not a supported rule format (e.g., an array) + // Find the rule that loads TypeScript files, and prepend 'react-hot-loader/webpack' + // to its array of loaders + for (let ruleIndex = 0; ruleIndex < moduleRules.length; ruleIndex++) { + // We only support NewUseRule (i.e., { use: ... }) because OldUseRule doesn't accept array values + const rule = moduleRules[ruleIndex] as webpack.NewUseRule; + if (!rule.use) { + continue; } - // Allow use/loader values to be either { loader: 'name' } or 'name' - // We don't need to support other possible ways of specifying loaders (e.g., arrays), - // so skip unrecognized formats. - const loaderNameString = - (loaderConfig as (webpack.OldLoader | webpack.NewLoader)).loader - || (loaderConfig as string); - if (!loaderNameString || (typeof loaderNameString !== 'string')) { - return; // Not a supported loader format (e.g., an array) + // We're looking for the first 'use' value that's a TypeScript loader + const loadersArray = rule.use instanceof Array ? rule.use : [rule.use]; + const isTypescriptLoader = supportedTypeScriptLoaders.some(typeScriptLoaderName => containsLoader(loadersArray, typeScriptLoaderName)); + if (!isTypescriptLoader) { + continue; } - // Find the babel-loader entry - if (loaderNameString.match(/\bbabel-loader\b/)) { - // If the rule is of the form { use: 'name' }, then replace it - // with { use: { loader: 'name' }} so we can attach options - if ((rule as webpack.NewUseRule).use && typeof loaderConfig === 'string') { - loaderConfig = (rule as webpack.NewUseRule).use = { loader: loaderConfig }; - } - - const configItemWithOptions = typeof loaderConfig === 'string' - ? rule // The rule is of the form { loader: 'name' }, so put options on the rule - : loaderConfig; // The rule is of the form { use/loader: { loader: 'name' }}, so put options on the use/loader - - // Ensure the config has an 'options' (or a legacy 'query') - let optionsObject = - (configItemWithOptions as webpack.NewLoader).options // Recommended config format for Webpack 2.x - || (configItemWithOptions as webpack.OldLoaderRule).query; // Legacy - if (!optionsObject) { - // If neither options nor query was set, define a new value, - // using the legacy format ('query') for compatibility with Webpack 1.x - optionsObject = (configItemWithOptions as webpack.OldLoaderRule).query = {}; - } + // This is the one - prefix it with the react-hot-loader loader + // (unless it's already in there somewhere) + if (!containsLoader(loadersArray, reactHotLoaderWebpackLoader)) { + loadersArray.unshift(reactHotLoaderWebpackLoader); + rule.use = loadersArray; // In case we normalised it to an array + } + break; + } - // Ensure Babel plugins includes 'react-transform' - const plugins = optionsObject['plugins'] = optionsObject['plugins'] || []; - const hasReactTransform = plugins.some(p => p && p[0] === 'react-transform'); - if (!hasReactTransform) { - plugins.push(['react-transform', {}]); - } + // Ensure the entrypoint is prefixed with 'react-hot-loader/patch' (unless it's already in there). + // We only support entrypoints of the form { name: value } (not just 'name' or ['name']) + // because that gives us a place to prepend the new value + if (!webpackConfig.entry || typeof webpackConfig.entry === 'string' || webpackConfig.entry instanceof Array) { + throw new Error('Cannot enable React HMR because \'entry\' in Webpack config is not of the form { name: value }'); + } + const entryConfig = webpackConfig.entry as webpack.Entry; + Object.getOwnPropertyNames(entryConfig).forEach(entrypointName => { + if (typeof(entryConfig[entrypointName]) === 'string') { + // Normalise to array + entryConfig[entrypointName] = [entryConfig[entrypointName] as string]; + } - // Ensure 'react-transform' plugin is configured to use 'react-transform-hmr' - plugins.forEach(pluginConfig => { - if (pluginConfig && pluginConfig[0] === 'react-transform') { - const pluginOpts = pluginConfig[1] = pluginConfig[1] || {}; - const transforms = pluginOpts.transforms = pluginOpts.transforms || []; - const hasReactTransformHmr = transforms.some(t => t.transform === 'react-transform-hmr'); - if (!hasReactTransformHmr) { - transforms.push({ - transform: 'react-transform-hmr', - imports: ['react'], - locals: ['module'] // Important for Webpack HMR - }); - } - } - }); + let entryValueArray = entryConfig[entrypointName] as string[]; + if (entryValueArray.indexOf(reactHotLoaderPatch) < 0) { + entryValueArray.unshift(reactHotLoaderPatch); } }); } + +function containsLoader(loadersArray: webpack.Loader[], loaderName: string) { + return loadersArray.some(loader => { + // Allow 'use' values to be either { loader: 'name' } or 'name' + // No need to support legacy webpack.OldLoader + const actualLoaderName = (loader as webpack.NewLoader).loader || (loader as string); + return actualLoaderName && new RegExp(`\\b${ loaderName }\\b`).test(actualLoaderName); + }); +} diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/src/index.ts b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/src/index.ts index 34dab602..c4284f2f 100644 --- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/src/index.ts +++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/src/index.ts @@ -1 +1,6 @@ -export { addReactHotModuleReplacementBabelTransform } from './HotModuleReplacement'; +export { addReactHotModuleReplacementConfig } from './HotModuleReplacement'; + +// Temporarily alias addReactHotModuleReplacementConfig as addReactHotModuleReplacementBabelTransform for backward +// compatibility with aspnet-webpack 1.x. In aspnet-webpack 2.0, we can drop the old name (and also deprecate +// some other no-longer-supported functionality, such as LoadViaWebpack). +export { addReactHotModuleReplacementConfig as addReactHotModuleReplacementBabelTransform } from './HotModuleReplacement'; From eeaf4e659047caca77166429cdb95acb3511d590 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 17 May 2017 21:37:47 +0100 Subject: [PATCH 064/411] Update ReactSpa to React Hot Loader 3. Remove babel dependency. --- templates/ReactSpa/.babelrc | 3 --- templates/ReactSpa/ClientApp/boot.tsx | 30 +++++++++++++++++++------ templates/ReactSpa/ClientApp/routes.tsx | 8 +------ templates/ReactSpa/package.json | 8 +++---- templates/ReactSpa/tsconfig.json | 5 +++-- templates/ReactSpa/webpack.config.js | 1 - 6 files changed, 30 insertions(+), 25 deletions(-) delete mode 100644 templates/ReactSpa/.babelrc diff --git a/templates/ReactSpa/.babelrc b/templates/ReactSpa/.babelrc deleted file mode 100644 index 86c445f5..00000000 --- a/templates/ReactSpa/.babelrc +++ /dev/null @@ -1,3 +0,0 @@ -{ - "presets": ["es2015", "react"] -} diff --git a/templates/ReactSpa/ClientApp/boot.tsx b/templates/ReactSpa/ClientApp/boot.tsx index 1d15e40e..3b2debf7 100644 --- a/templates/ReactSpa/ClientApp/boot.tsx +++ b/templates/ReactSpa/ClientApp/boot.tsx @@ -2,12 +2,28 @@ import './css/site.css'; import 'bootstrap'; import * as React from 'react'; import * as ReactDOM from 'react-dom'; +import { AppContainer } from 'react-hot-loader'; import { BrowserRouter } from 'react-router-dom'; -import routes from './routes'; +import * as RoutesModule from './routes'; +let routes = RoutesModule.routes; -// This code starts up the React app when it runs in a browser. It sets up the routing configuration -// and injects the app into a DOM element. -ReactDOM.render( - , - document.getElementById('react-app') -); +function renderApp() { + // This code starts up the React app when it runs in a browser. It sets up the routing + // configuration and injects the app into a DOM element. + ReactDOM.render( + + + , + document.getElementById('react-app') + ); +} + +renderApp(); + +// Allow Hot Module Replacement +if (module.hot) { + module.hot.accept('./routes', () => { + routes = require('./routes').routes; + renderApp(); + }); +} diff --git a/templates/ReactSpa/ClientApp/routes.tsx b/templates/ReactSpa/ClientApp/routes.tsx index dfacf05c..22fd32e6 100644 --- a/templates/ReactSpa/ClientApp/routes.tsx +++ b/templates/ReactSpa/ClientApp/routes.tsx @@ -5,14 +5,8 @@ import { Home } from './components/Home'; import { FetchData } from './components/FetchData'; import { Counter } from './components/Counter'; -export default +export const routes = ; - -// Allow Hot Module Reloading -declare var module: any; -if (module.hot) { - module.hot.accept(); -} diff --git a/templates/ReactSpa/package.json b/templates/ReactSpa/package.json index ee1272ec..c38c79d6 100644 --- a/templates/ReactSpa/package.json +++ b/templates/ReactSpa/package.json @@ -6,13 +6,10 @@ "@types/react": "^0.14.38", "@types/react-dom": "^0.14.17", "@types/react-router": "^2.0.38", + "@types/webpack-env": "^1.13.0", "aspnet-webpack": "^1.0.27", - "aspnet-webpack-react": "^1.0.4", + "aspnet-webpack-react": "^2.0.0", "awesome-typescript-loader": "^3.0.0", - "babel-core": "^6.17.0", - "babel-loader": "^6.2.5", - "babel-preset-es2015": "^6.16.0", - "babel-preset-react": "^6.16.0", "bootstrap": "^3.3.6", "css-loader": "^0.25.0", "event-source-polyfill": "^0.0.7", @@ -23,6 +20,7 @@ "json-loader": "^0.5.4", "react": "~15.4.0", "react-dom": "~15.4.0", + "react-hot-loader": "3.0.0-beta.7", "react-router-dom": "^4.0.0", "style-loader": "^0.13.1", "typescript": "^2.2.1", diff --git a/templates/ReactSpa/tsconfig.json b/templates/ReactSpa/tsconfig.json index 74881116..cd7432a8 100644 --- a/templates/ReactSpa/tsconfig.json +++ b/templates/ReactSpa/tsconfig.json @@ -2,10 +2,11 @@ "compilerOptions": { "baseUrl": ".", "moduleResolution": "node", - "target": "es6", - "jsx": "preserve", + "target": "es5", + "jsx": "react", "sourceMap": true, "skipDefaultLibCheck": true, + "types": [ "webpack-env" ], "paths": { // Fix "Duplicate identifier" errors caused by multiple dependencies fetching their own copies of type definitions. // We tell TypeScript which type definitions module to treat as the canonical one (instead of combining all of them). diff --git a/templates/ReactSpa/webpack.config.js b/templates/ReactSpa/webpack.config.js index a54d5cee..e2254d67 100644 --- a/templates/ReactSpa/webpack.config.js +++ b/templates/ReactSpa/webpack.config.js @@ -17,7 +17,6 @@ module.exports = (env) => { }, module: { rules: [ - { test: /\.ts(x?)$/, include: /ClientApp/, use: { loader: 'babel-loader', options: { cacheDirectory: true } } }, { test: /\.tsx?$/, include: /ClientApp/, use: 'awesome-typescript-loader?silent=true' }, { test: /\.css$/, use: isDevBuild ? ['style-loader', 'css-loader'] : ExtractTextPlugin.extract({ use: 'css-loader?minimize' }) }, { test: /\.(png|jpg|jpeg|gif|svg)$/, use: 'url-loader?limit=25000' } From 48b923fcd5a10a620a2b9931da0b3439d39fdc5d Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 17 May 2017 21:51:13 +0100 Subject: [PATCH 065/411] Update ReactReduxSpa to React Hot Loader 3, and remove Babel dependency --- templates/ReactReduxSpa/.babelrc | 3 -- .../ReactReduxSpa/ClientApp/boot-client.tsx | 34 ++++++++++++++----- .../ReactReduxSpa/ClientApp/boot-server.tsx | 2 +- templates/ReactReduxSpa/ClientApp/routes.tsx | 7 +--- templates/ReactReduxSpa/package.json | 7 ++-- templates/ReactReduxSpa/tsconfig.json | 4 +-- templates/ReactReduxSpa/webpack.config.js | 1 - 7 files changed, 31 insertions(+), 27 deletions(-) delete mode 100644 templates/ReactReduxSpa/.babelrc diff --git a/templates/ReactReduxSpa/.babelrc b/templates/ReactReduxSpa/.babelrc deleted file mode 100644 index 7991bdb0..00000000 --- a/templates/ReactReduxSpa/.babelrc +++ /dev/null @@ -1,3 +0,0 @@ -{ - "presets": [["es2015", { "modules": false }], "react"] -} diff --git a/templates/ReactReduxSpa/ClientApp/boot-client.tsx b/templates/ReactReduxSpa/ClientApp/boot-client.tsx index 58d85a39..cd84cc9a 100644 --- a/templates/ReactReduxSpa/ClientApp/boot-client.tsx +++ b/templates/ReactReduxSpa/ClientApp/boot-client.tsx @@ -2,12 +2,14 @@ import './css/site.css'; import 'bootstrap'; import * as React from 'react'; import * as ReactDOM from 'react-dom'; +import { AppContainer } from 'react-hot-loader'; import { Provider } from 'react-redux'; import { ConnectedRouter } from 'react-router-redux'; import { createBrowserHistory } from 'history'; -import routes from './routes'; import configureStore from './configureStore'; import { ApplicationState } from './store'; +import * as RoutesModule from './routes'; +let routes = RoutesModule.routes; // Create browser history to use in the Redux store const history = createBrowserHistory(); @@ -16,11 +18,25 @@ const history = createBrowserHistory(); const initialState = (window as any).initialReduxState as ApplicationState; const store = configureStore(history, initialState); -// This code starts up the React app when it runs in a browser. It sets up the routing configuration -// and injects the app into a DOM element. -ReactDOM.render( - - - , - document.getElementById('react-app') -); +function renderApp() { + // This code starts up the React app when it runs in a browser. It sets up the routing configuration + // and injects the app into a DOM element. + ReactDOM.render( + + + + + , + document.getElementById('react-app') + ); +} + +renderApp(); + +// Allow Hot Module Replacement +if (module.hot) { + module.hot.accept('./routes', () => { + routes = require('./routes').routes; + renderApp(); + }); +} diff --git a/templates/ReactReduxSpa/ClientApp/boot-server.tsx b/templates/ReactReduxSpa/ClientApp/boot-server.tsx index 3d9241a8..62be9682 100644 --- a/templates/ReactReduxSpa/ClientApp/boot-server.tsx +++ b/templates/ReactReduxSpa/ClientApp/boot-server.tsx @@ -5,7 +5,7 @@ import { StaticRouter } from 'react-router-dom'; import { replace } from 'react-router-redux'; import { createMemoryHistory } from 'history'; import { createServerRenderer, RenderResult } from 'aspnet-prerendering'; -import routes from './routes'; +import { routes } from './routes'; import configureStore from './configureStore'; export default createServerRenderer(params => { diff --git a/templates/ReactReduxSpa/ClientApp/routes.tsx b/templates/ReactReduxSpa/ClientApp/routes.tsx index 8e3465a3..d8042201 100644 --- a/templates/ReactReduxSpa/ClientApp/routes.tsx +++ b/templates/ReactReduxSpa/ClientApp/routes.tsx @@ -5,13 +5,8 @@ import Home from './components/Home'; import FetchData from './components/FetchData'; import Counter from './components/Counter'; -export default +export const routes = ; - -// Enable Hot Module Replacement (HMR) -if (module.hot) { - module.hot.accept(); -} diff --git a/templates/ReactReduxSpa/package.json b/templates/ReactReduxSpa/package.json index 5d956edb..c5485beb 100644 --- a/templates/ReactReduxSpa/package.json +++ b/templates/ReactReduxSpa/package.json @@ -13,12 +13,8 @@ "@types/webpack-env": "^1.13.0", "aspnet-prerendering": "^2.0.0", "aspnet-webpack": "^1.0.27", - "aspnet-webpack-react": "^1.0.4", + "aspnet-webpack-react": "^2.0.0", "awesome-typescript-loader": "^3.0.0", - "babel-core": "^6.5.2", - "babel-loader": "^6.2.3", - "babel-preset-es2015": "^6.5.0", - "babel-preset-react": "^6.5.0", "bootstrap": "^3.3.6", "css-loader": "^0.23.1", "domain-task": "^3.0.0", @@ -31,6 +27,7 @@ "node-noop": "^1.0.0", "react": "~15.4.0", "react-dom": "~15.4.0", + "react-hot-loader": "3.0.0-beta.7", "react-redux": "^4.4.5", "react-router-dom": "^4.1.0", "react-router-redux": "5.0.0-alpha.6", diff --git a/templates/ReactReduxSpa/tsconfig.json b/templates/ReactReduxSpa/tsconfig.json index 5d357aef..0a2eb677 100644 --- a/templates/ReactReduxSpa/tsconfig.json +++ b/templates/ReactReduxSpa/tsconfig.json @@ -2,8 +2,8 @@ "compilerOptions": { "baseUrl": ".", "moduleResolution": "node", - "target": "es6", - "jsx": "preserve", + "target": "es5", + "jsx": "react", "experimentalDecorators": true, "sourceMap": true, "skipDefaultLibCheck": true, diff --git a/templates/ReactReduxSpa/webpack.config.js b/templates/ReactReduxSpa/webpack.config.js index 98ebbc23..5a613b81 100644 --- a/templates/ReactReduxSpa/webpack.config.js +++ b/templates/ReactReduxSpa/webpack.config.js @@ -17,7 +17,6 @@ module.exports = (env) => { }, module: { rules: [ - { test: /\.tsx?$/, include: /ClientApp/, use: { loader: 'babel-loader', options: { cacheDirectory: true } } }, { test: /\.tsx?$/, include: /ClientApp/, use: 'awesome-typescript-loader?silent=true' } ] }, From c9d235d4253052dc3d7f8f55c03279fe2c2a4adc Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 17 May 2017 22:06:32 +0100 Subject: [PATCH 066/411] Update ReactSpa to latest versions of dependencies, and pin to exact versions. Simplify some instructions. --- .../ClientApp/components/FetchData.tsx | 1 - .../ReactSpa/ClientApp/components/Home.tsx | 2 +- templates/ReactSpa/package.json | 46 +++++++++---------- 3 files changed, 24 insertions(+), 25 deletions(-) diff --git a/templates/ReactSpa/ClientApp/components/FetchData.tsx b/templates/ReactSpa/ClientApp/components/FetchData.tsx index 9fe5eb11..6474f012 100644 --- a/templates/ReactSpa/ClientApp/components/FetchData.tsx +++ b/templates/ReactSpa/ClientApp/components/FetchData.tsx @@ -27,7 +27,6 @@ export class FetchData extends React.Component<{}, FetchDataExampleState> {

Weather forecast

This component demonstrates fetching data from the server.

{ contents } -

For more sophisticated applications, consider an architecture such as Redux or Flux for managing state. You can generate an ASP.NET Core application with React and Redux using dotnet new aspnet/spa/reactredux instead of using this template.

; } diff --git a/templates/ReactSpa/ClientApp/components/Home.tsx b/templates/ReactSpa/ClientApp/components/Home.tsx index 3c092a51..76d8d047 100644 --- a/templates/ReactSpa/ClientApp/components/Home.tsx +++ b/templates/ReactSpa/ClientApp/components/Home.tsx @@ -21,7 +21,7 @@ export class Home extends React.Component<{}, {}> {

Going further

For larger applications, or for server-side prerendering (i.e., for isomorphic or universal applications), you should consider using a Flux/Redux-like architecture. - You can generate an ASP.NET Core application with React and Redux using dotnet new aspnet/spa/reactredux instead of using this template. + You can generate an ASP.NET Core application with React and Redux using dotnet new reactredux instead of using this template.

; } diff --git a/templates/ReactSpa/package.json b/templates/ReactSpa/package.json index c38c79d6..65f2f4dc 100644 --- a/templates/ReactSpa/package.json +++ b/templates/ReactSpa/package.json @@ -2,30 +2,30 @@ "name": "WebApplicationBasic", "version": "0.0.0", "devDependencies": { - "@types/history": "^2.0.39", - "@types/react": "^0.14.38", - "@types/react-dom": "^0.14.17", - "@types/react-router": "^2.0.38", - "@types/webpack-env": "^1.13.0", - "aspnet-webpack": "^1.0.27", + "@types/history": "4.5.1", + "@types/react": "15.0.24", + "@types/react-dom": "15.5.0", + "@types/react-router": "4.0.9", + "@types/webpack-env": "1.13.0", + "aspnet-webpack": "^1.0.29", "aspnet-webpack-react": "^2.0.0", - "awesome-typescript-loader": "^3.0.0", - "bootstrap": "^3.3.6", - "css-loader": "^0.25.0", - "event-source-polyfill": "^0.0.7", - "extract-text-webpack-plugin": "^2.0.0-rc", - "file-loader": "^0.9.0", - "isomorphic-fetch": "^2.2.1", - "jquery": "^2.2.1", - "json-loader": "^0.5.4", - "react": "~15.4.0", - "react-dom": "~15.4.0", + "awesome-typescript-loader": "3.1.3", + "bootstrap": "3.3.7", + "css-loader": "0.28.1", + "event-source-polyfill": "0.0.9", + "extract-text-webpack-plugin": "2.1.0", + "file-loader": "0.11.1", + "isomorphic-fetch": "2.2.1", + "jquery": "3.2.1", + "json-loader": "0.5.4", + "react": "15.5.4", + "react-dom": "15.5.4", "react-hot-loader": "3.0.0-beta.7", - "react-router-dom": "^4.0.0", - "style-loader": "^0.13.1", - "typescript": "^2.2.1", - "url-loader": "^0.5.7", - "webpack": "^2.2.0", - "webpack-hot-middleware": "^2.12.2" + "react-router-dom": "4.1.1", + "style-loader": "0.17.0", + "typescript": "2.3.2", + "url-loader": "0.5.8", + "webpack": "2.5.1", + "webpack-hot-middleware": "2.18.0" } } From 33b275a7d3faa7bafd6514da4e373ed42c9c2875 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 17 May 2017 22:21:37 +0100 Subject: [PATCH 067/411] Update ReactReduxSpa to latest versions of all dependencies, and pin to exact versions --- .../ClientApp/components/Layout.tsx | 6 +- .../ReactReduxSpa/ClientApp/configureStore.ts | 15 ++--- templates/ReactReduxSpa/package.json | 63 +++++++++---------- 3 files changed, 40 insertions(+), 44 deletions(-) diff --git a/templates/ReactReduxSpa/ClientApp/components/Layout.tsx b/templates/ReactReduxSpa/ClientApp/components/Layout.tsx index 18179ff7..db3f6461 100644 --- a/templates/ReactReduxSpa/ClientApp/components/Layout.tsx +++ b/templates/ReactReduxSpa/ClientApp/components/Layout.tsx @@ -1,11 +1,7 @@ import * as React from 'react'; import { NavMenu } from './NavMenu'; -export interface LayoutProps { - children?: React.ReactElement; -} - -export class Layout extends React.Component { +export class Layout extends React.Component<{}, {}> { public render() { return
diff --git a/templates/ReactReduxSpa/ClientApp/configureStore.ts b/templates/ReactReduxSpa/ClientApp/configureStore.ts index 251aced9..65ff9060 100644 --- a/templates/ReactReduxSpa/ClientApp/configureStore.ts +++ b/templates/ReactReduxSpa/ClientApp/configureStore.ts @@ -1,10 +1,11 @@ -import { createStore, applyMiddleware, compose, combineReducers, GenericStoreEnhancer } from 'redux'; +import { createStore, applyMiddleware, compose, combineReducers, GenericStoreEnhancer, Store } from 'redux'; import thunk from 'redux-thunk'; import { routerReducer, routerMiddleware } from 'react-router-redux'; -import * as Store from './store'; +import * as StoreModule from './store'; +import { ApplicationState, reducers } from './store'; import { History } from 'history'; -export default function configureStore(history: History, initialState?: Store.ApplicationState) { +export default function configureStore(history: History, initialState?: ApplicationState) { // Build middleware. These are functions that can process the actions before they reach the store. const windowIfDefined = typeof window === 'undefined' ? null : window as any; // If devTools is installed, connect to it @@ -15,13 +16,13 @@ export default function configureStore(history: History, initialState?: Store.Ap )(createStore); // Combine all reducers and instantiate the app-wide store instance - const allReducers = buildRootReducer(Store.reducers); - const store = createStoreWithMiddleware(allReducers, initialState) as Redux.Store; + const allReducers = buildRootReducer(reducers); + const store = createStoreWithMiddleware(allReducers, initialState) as Store; // Enable Webpack hot module replacement for reducers if (module.hot) { module.hot.accept('./store', () => { - const nextRootReducer = require('./store'); + const nextRootReducer = require('./store'); store.replaceReducer(buildRootReducer(nextRootReducer.reducers)); }); } @@ -30,5 +31,5 @@ export default function configureStore(history: History, initialState?: Store.Ap } function buildRootReducer(allReducers) { - return combineReducers(Object.assign({}, allReducers, { routing: routerReducer })); + return combineReducers(Object.assign({}, allReducers, { routing: routerReducer })); } diff --git a/templates/ReactReduxSpa/package.json b/templates/ReactReduxSpa/package.json index c5485beb..56edd57c 100644 --- a/templates/ReactReduxSpa/package.json +++ b/templates/ReactReduxSpa/package.json @@ -2,42 +2,41 @@ "name": "WebApplicationBasic", "version": "0.0.0", "dependencies": { - "@types/history": "^4.5.0", - "@types/react": "^0.14.29", - "@types/react-dom": "^0.14.14", - "@types/react-redux": "^4.4.29", - "@types/react-router-dom": "^4.0.3", + "@types/history": "4.5.1", + "@types/react": "15.0.24", + "@types/react-dom": "15.5.0", + "@types/react-redux": "4.4.40", + "@types/react-router-dom": "4.0.4", "@types/react-router-redux": "5.0.1", - "@types/redux": "3.5.27", - "@types/webpack": "^2.2.0", - "@types/webpack-env": "^1.13.0", - "aspnet-prerendering": "^2.0.0", - "aspnet-webpack": "^1.0.27", + "@types/webpack": "2.2.15", + "@types/webpack-env": "1.13.0", + "aspnet-prerendering": "^2.0.5", + "aspnet-webpack": "^1.0.29", "aspnet-webpack-react": "^2.0.0", - "awesome-typescript-loader": "^3.0.0", - "bootstrap": "^3.3.6", - "css-loader": "^0.23.1", + "awesome-typescript-loader": "3.1.3", + "bootstrap": "3.3.7", + "css-loader": "0.28.1", "domain-task": "^3.0.0", - "event-source-polyfill": "^0.0.7", - "extract-text-webpack-plugin": "^2.0.0-rc", - "file-loader": "^0.8.5", - "history": "^4.6.1", - "jquery": "^2.2.1", - "json-loader": "^0.5.4", - "node-noop": "^1.0.0", - "react": "~15.4.0", - "react-dom": "~15.4.0", + "event-source-polyfill": "0.0.9", + "extract-text-webpack-plugin": "2.1.0", + "file-loader": "0.11.1", + "history": "4.6.1", + "jquery": "3.2.1", + "json-loader": "0.5.4", + "node-noop": "1.0.0", + "react": "15.5.4", + "react-dom": "15.5.4", "react-hot-loader": "3.0.0-beta.7", - "react-redux": "^4.4.5", - "react-router-dom": "^4.1.0", + "react-redux": "5.0.4", + "react-router-dom": "4.1.1", "react-router-redux": "5.0.0-alpha.6", - "redux": "^3.6.0", - "redux-thunk": "^2.2.0", - "style-loader": "^0.13.0", - "typescript": "^2.2.1", - "url-loader": "^0.5.7", - "webpack": "^2.2.0", - "webpack-hot-middleware": "^2.12.2", - "webpack-merge": "^0.14.1" + "redux": "3.6.0", + "redux-thunk": "2.2.0", + "style-loader": "0.17.0", + "typescript": "2.3.2", + "url-loader": "0.5.8", + "webpack": "2.5.1", + "webpack-hot-middleware": "2.18.0", + "webpack-merge": "4.1.0" } } From 178a05cc33bbc04cfdc4c088b5aed317925a0e98 Mon Sep 17 00:00:00 2001 From: Mads Kristensen Date: Wed, 17 May 2017 10:17:15 -0700 Subject: [PATCH 068/411] Added missing Framework symbol --- templates/package-builder/src/build/build.ts | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/templates/package-builder/src/build/build.ts b/templates/package-builder/src/build/build.ts index 5e343c1c..0bac5c8a 100644 --- a/templates/package-builder/src/build/build.ts +++ b/templates/package-builder/src/build/build.ts @@ -152,6 +152,18 @@ function buildDotNetNewNuGetPackage() { type: 'bind', binding: 'dotnet-cli-version', replaces: 'sdkVersionInjectedHere' + }, + Framework: { + type: "parameter", + description: "The target framework for the project.", + datatype: "choice", + choices: [ + { + choice: "netcoreapp1.1", + description: "Target netcoreapp1.1" + } + ], + defaultValue: "netcoreapp1.1" } }, tags: { language: 'C#', type: 'project' }, From a74b7aea6b7c69245379badce26d67a9e28a4747 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 18 May 2017 12:10:15 +0100 Subject: [PATCH 069/411] Bump template package versions to 0.9.3 for release --- templates/package-builder/src/yeoman/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/package-builder/src/yeoman/package.json b/templates/package-builder/src/yeoman/package.json index 505a6881..efa503f7 100644 --- a/templates/package-builder/src/yeoman/package.json +++ b/templates/package-builder/src/yeoman/package.json @@ -1,6 +1,6 @@ { "name": "generator-aspnetcore-spa", - "version": "0.9.2", + "version": "0.9.3", "description": "Single-Page App templates for ASP.NET Core", "author": "Microsoft", "license": "Apache-2.0", From 85e59efa21a24c4fb306d23d13d22461deceabe9 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 18 May 2017 13:40:58 +0100 Subject: [PATCH 070/411] Rename Angular2Spa to AngularSpa, plus rephrase "Angular 2" as "Angular" in many places --- JavaScriptServices.sln | 2 +- README.md | 14 +++--- .../album-delete-prompt.ts | 2 +- .../Webpack/Clientside/PrerenderingSample.ts | 4 +- ...icrosoft.AspNetCore.AngularServices.csproj | 2 +- .../PrimeCacheHelper.cs | 2 +- .../README.md | 4 +- .../README.md | 40 +++++++++--------- .../.template.config/icon.png | Bin .../AngularSpa.csproj} | 0 .../ClientApp/app/app.module.client.ts | 0 .../ClientApp/app/app.module.server.ts | 0 .../ClientApp/app/app.module.shared.ts | 0 .../app/components/app/app.component.css | 0 .../app/components/app/app.component.html | 0 .../app/components/app/app.component.ts | 0 .../components/counter/counter.component.html | 2 +- .../counter/counter.component.spec.ts | 0 .../components/counter/counter.component.ts | 0 .../fetchdata/fetchdata.component.html | 0 .../fetchdata/fetchdata.component.ts | 0 .../app/components/home/home.component.html | 6 +-- .../app/components/home/home.component.ts | 0 .../components/navmenu/navmenu.component.css | 0 .../components/navmenu/navmenu.component.html | 0 .../components/navmenu/navmenu.component.ts | 0 .../ClientApp/boot-client.ts | 0 .../ClientApp/boot-server.ts | 0 .../ClientApp/test/boot-tests.ts | 0 .../ClientApp/test/karma.conf.js | 0 .../Controllers/HomeController.cs | 0 .../Controllers/SampleDataController.cs | 0 .../{Angular2Spa => AngularSpa}/Program.cs | 0 .../{Angular2Spa => AngularSpa}/Startup.cs | 0 .../Views/Home/Index.cshtml | 0 .../Views/Shared/Error.cshtml | 0 .../Views/Shared/_Layout.cshtml | 0 .../Views/_ViewImports.cshtml | 0 .../Views/_ViewStart.cshtml | 0 .../appsettings.json | 0 .../{Angular2Spa => AngularSpa}/global.json | 0 .../{Angular2Spa => AngularSpa}/package.json | 0 .../template_gitignore | 0 .../{Angular2Spa => AngularSpa}/tsconfig.json | 0 .../{Angular2Spa => AngularSpa}/web.config | 0 .../webpack.config.js | 0 .../webpack.config.vendor.js | 0 .../wwwroot/favicon.ico | Bin templates/package-builder/src/build/build.ts | 2 +- test/templates/angular.spec.ts | 2 +- 50 files changed, 41 insertions(+), 41 deletions(-) rename templates/{Angular2Spa => AngularSpa}/.template.config/icon.png (100%) rename templates/{Angular2Spa/Angular2Spa.csproj => AngularSpa/AngularSpa.csproj} (100%) rename templates/{Angular2Spa => AngularSpa}/ClientApp/app/app.module.client.ts (100%) rename templates/{Angular2Spa => AngularSpa}/ClientApp/app/app.module.server.ts (100%) rename templates/{Angular2Spa => AngularSpa}/ClientApp/app/app.module.shared.ts (100%) rename templates/{Angular2Spa => AngularSpa}/ClientApp/app/components/app/app.component.css (100%) rename templates/{Angular2Spa => AngularSpa}/ClientApp/app/components/app/app.component.html (100%) rename templates/{Angular2Spa => AngularSpa}/ClientApp/app/components/app/app.component.ts (100%) rename templates/{Angular2Spa => AngularSpa}/ClientApp/app/components/counter/counter.component.html (69%) rename templates/{Angular2Spa => AngularSpa}/ClientApp/app/components/counter/counter.component.spec.ts (100%) rename templates/{Angular2Spa => AngularSpa}/ClientApp/app/components/counter/counter.component.ts (100%) rename templates/{Angular2Spa => AngularSpa}/ClientApp/app/components/fetchdata/fetchdata.component.html (100%) rename templates/{Angular2Spa => AngularSpa}/ClientApp/app/components/fetchdata/fetchdata.component.ts (100%) rename templates/{Angular2Spa => AngularSpa}/ClientApp/app/components/home/home.component.html (77%) rename templates/{Angular2Spa => AngularSpa}/ClientApp/app/components/home/home.component.ts (100%) rename templates/{Angular2Spa => AngularSpa}/ClientApp/app/components/navmenu/navmenu.component.css (100%) rename templates/{Angular2Spa => AngularSpa}/ClientApp/app/components/navmenu/navmenu.component.html (100%) rename templates/{Angular2Spa => AngularSpa}/ClientApp/app/components/navmenu/navmenu.component.ts (100%) rename templates/{Angular2Spa => AngularSpa}/ClientApp/boot-client.ts (100%) rename templates/{Angular2Spa => AngularSpa}/ClientApp/boot-server.ts (100%) rename templates/{Angular2Spa => AngularSpa}/ClientApp/test/boot-tests.ts (100%) rename templates/{Angular2Spa => AngularSpa}/ClientApp/test/karma.conf.js (100%) rename templates/{Angular2Spa => AngularSpa}/Controllers/HomeController.cs (100%) mode change 100755 => 100644 rename templates/{Angular2Spa => AngularSpa}/Controllers/SampleDataController.cs (100%) rename templates/{Angular2Spa => AngularSpa}/Program.cs (100%) rename templates/{Angular2Spa => AngularSpa}/Startup.cs (100%) mode change 100755 => 100644 rename templates/{Angular2Spa => AngularSpa}/Views/Home/Index.cshtml (100%) rename templates/{Angular2Spa => AngularSpa}/Views/Shared/Error.cshtml (100%) mode change 100755 => 100644 rename templates/{Angular2Spa => AngularSpa}/Views/Shared/_Layout.cshtml (100%) rename templates/{Angular2Spa => AngularSpa}/Views/_ViewImports.cshtml (100%) mode change 100755 => 100644 rename templates/{Angular2Spa => AngularSpa}/Views/_ViewStart.cshtml (100%) mode change 100755 => 100644 rename templates/{Angular2Spa => AngularSpa}/appsettings.json (100%) mode change 100755 => 100644 rename templates/{Angular2Spa => AngularSpa}/global.json (100%) rename templates/{Angular2Spa => AngularSpa}/package.json (100%) rename templates/{Angular2Spa => AngularSpa}/template_gitignore (100%) rename templates/{Angular2Spa => AngularSpa}/tsconfig.json (100%) rename templates/{Angular2Spa => AngularSpa}/web.config (100%) rename templates/{Angular2Spa => AngularSpa}/webpack.config.js (100%) rename templates/{Angular2Spa => AngularSpa}/webpack.config.vendor.js (100%) rename templates/{Angular2Spa => AngularSpa}/wwwroot/favicon.ico (100%) mode change 100755 => 100644 diff --git a/JavaScriptServices.sln b/JavaScriptServices.sln index ba91c6bb..a560cb20 100644 --- a/JavaScriptServices.sln +++ b/JavaScriptServices.sln @@ -46,7 +46,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "templates", "templates", "{ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KnockoutSpa", "templates\KnockoutSpa\KnockoutSpa.csproj", "{F60248B1-940E-43FB-BEA0-589362AA6320}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Angular2Spa", "templates\Angular2Spa\Angular2Spa.csproj", "{4D4B84C9-13F7-40CA-B05A-DC98FD6019AC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AngularSpa", "templates\AngularSpa\AngularSpa.csproj", "{4D4B84C9-13F7-40CA-B05A-DC98FD6019AC}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AureliaSpa", "templates\AureliaSpa\AureliaSpa.csproj", "{4D57B6E1-7141-48ED-959E-872BDD4A2F72}" EndProject diff --git a/README.md b/README.md index 74d0fc26..5639485e 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ This project is part of ASP.NET Core. You can find samples, documentation and ge `JavaScriptServices` is a set of client-side technologies for ASP.NET Core. It provides infrastructure that you'll find useful if you: -- Use Angular 2 / React / Vue / Aurelia / Knockout / etc. +- Use Angular / React / Vue / Aurelia / Knockout / etc. - Build your client-side resources using Webpack. - Execute JavaScript on the server at runtime. @@ -31,7 +31,7 @@ It's cross-platform (Windows, Linux, or macOS) and works with .NET Core 1.0.1 or ## Creating new applications -If you want to build a brand-new ASP.NET Core app that uses Angular 2 / React / Knockout on the client, consider starting with the `aspnetcore-spa` generator. This lets you choose your client-side framework. It generates a starting point that includes applicable features such as Webpack dev middleware, server-side prerendering, and efficient production builds. It's much easier than configuring everything to work together manually! +If you want to build a brand-new ASP.NET Core app that uses Angular / React / Knockout on the client, consider starting with the `aspnetcore-spa` generator. This lets you choose your client-side framework. It generates a starting point that includes applicable features such as Webpack dev middleware, server-side prerendering, and efficient production builds. It's much easier than configuring everything to work together manually! To do this, install Yeoman and these generator templates: @@ -57,10 +57,10 @@ If you have an existing ASP.NET Core application, or if you just want to use the * Most applications developers don't need to use this directly, but you can do so if you want to implement your own functionality that involves calling Node.js code from .NET at runtime. * Find [documentation and usage examples here](https://github.com/aspnet/JavaScriptServices/tree/dev/src/Microsoft.AspNetCore.NodeServices#microsoftaspnetcorenodeservices). * `Microsoft.AspNetCore.SpaServices` - * This provides infrastructure that's generally useful when building Single Page Applications (SPAs) with technologies such as Angular 2 or React (for example, server-side prerendering and webpack middleware). Internally, it uses the `NodeServices` package to implement its features. + * This provides infrastructure that's generally useful when building Single Page Applications (SPAs) with technologies such as Angular or React (for example, server-side prerendering and webpack middleware). Internally, it uses the `NodeServices` package to implement its features. * Find [documentation and usage examples here](https://github.com/aspnet/JavaScriptServices/tree/dev/src/Microsoft.AspNetCore.SpaServices#microsoftaspnetcorespaservices). * `Microsoft.AspNetCore.AngularServices` - * This builds on the `SpaServices` package and includes features specific to Angular 2. Currently, this includes validation helpers. + * This builds on the `SpaServices` package and includes features specific to Angular. Currently, this includes validation helpers. * The code is [here](https://github.com/aspnet/JavaScriptServices/tree/dev/src/Microsoft.AspNetCore.AngularServices). You'll find a usage example for [the validation helper here](https://github.com/aspnet/JavaScriptServices/blob/dev/samples/angular/MusicStore/wwwroot/ng-app/components/admin/album-edit/album-edit.ts). There was previously a `Microsoft.AspNetCore.ReactServices` but this is not currently needed - all applicable functionality is in `Microsoft.AspNetCore.SpaServices`, because it's sufficiently general. We might add a new `Microsoft.AspNetCore.ReactServices` package in the future if new React-specific requirements emerge. @@ -73,7 +73,7 @@ Inside this repo, [the `templates` directory](https://github.com/aspnet/JavaScri The [`samples` directory](https://github.com/aspnet/JavaScriptServices/tree/dev/samples) contains examples of: -- Using the JavaScript services family of packages with Angular 2 and React. +- Using the JavaScript services family of packages with Angular and React. - A standalone `NodeServices` usage for runtime code transpilation and image processing. **To run the samples:** @@ -82,7 +82,7 @@ The [`samples` directory](https://github.com/aspnet/JavaScriptServices/tree/dev/ * At the repo's root directory (the one containing `src`, `samples`, etc.), run `dotnet restore` * Change directory to the sample you want to run (for example, `cd samples/angular/MusicStore`) * Restore Node dependencies by running `npm install` - * If you're trying to run the Angular 2 "Music Store" sample, then also run `gulp` (which you need to have installed globally). None of the other samples require this. + * If you're trying to run the Angular "Music Store" sample, then also run `gulp` (which you need to have installed globally). None of the other samples require this. * Run the application (`dotnet run`) * Browse to [http://localhost:5000](http://localhost:5000) @@ -92,7 +92,7 @@ If you're interested in contributing to the various packages, samples, and proje * Clone the repo * Run `dotnet restore` at the repo root dir - * Go to whatever sample or template you want to run (for example, `cd templates/Angular2Spa`) + * Go to whatever sample or template you want to run (for example, `cd templates/AngularSpa`) * Restore NPM dependencies (run `npm install`) * If the sample/template you're trying to run has a file called `webpack.config.vendor.js` at its root, run `webpack --config webpack.config.vendor.js`. It it has a file called `webpack.config.js`, run `webpack` (no args). You might need to install webpack first, by running `npm install -g webpack`. * Launch it (`dotnet run`) diff --git a/samples/angular/MusicStore/wwwroot/ng-app/components/admin/album-delete-prompt/album-delete-prompt.ts b/samples/angular/MusicStore/wwwroot/ng-app/components/admin/album-delete-prompt/album-delete-prompt.ts index a3039560..9ad66747 100644 --- a/samples/angular/MusicStore/wwwroot/ng-app/components/admin/album-delete-prompt/album-delete-prompt.ts +++ b/samples/angular/MusicStore/wwwroot/ng-app/components/admin/album-delete-prompt/album-delete-prompt.ts @@ -14,7 +14,7 @@ export class AlbumDeletePrompt { public show(album: models.Album) { this.album = album; - // Consider rewriting this using Angular 2's "Renderer" API so as to avoid direct DOM access + // Consider rewriting this using Angular's "Renderer" API so as to avoid direct DOM access (window).jQuery(".modal", this._elementRef.nativeElement).modal(); } } diff --git a/samples/misc/Webpack/Clientside/PrerenderingSample.ts b/samples/misc/Webpack/Clientside/PrerenderingSample.ts index 143ddd04..c9d0ca16 100644 --- a/samples/misc/Webpack/Clientside/PrerenderingSample.ts +++ b/samples/misc/Webpack/Clientside/PrerenderingSample.ts @@ -2,8 +2,8 @@ export default function (params: any): Promise<{ html: string, globals?: any }> return new Promise((resolve, reject) => { // Here, you could put any logic that synchronously or asynchronously prerenders - // your SPA components. For example, see the boot-server.ts files in the Angular2Spa - // and ReactReduxSpa templates for ways to prerender Angular 2 and React components. + // your SPA components. For example, see the boot-server.ts files in the AngularSpa + // and ReactReduxSpa templates for ways to prerender Angular and React components. // // If you wanted, you could use a property on the 'params.data' object to specify // which SPA component or template to render. diff --git a/src/Microsoft.AspNetCore.AngularServices/Microsoft.AspNetCore.AngularServices.csproj b/src/Microsoft.AspNetCore.AngularServices/Microsoft.AspNetCore.AngularServices.csproj index 2c6a0151..5f3e1570 100644 --- a/src/Microsoft.AspNetCore.AngularServices/Microsoft.AspNetCore.AngularServices.csproj +++ b/src/Microsoft.AspNetCore.AngularServices/Microsoft.AspNetCore.AngularServices.csproj @@ -3,7 +3,7 @@ - Helpers for building Angular 2 applications on ASP.NET Core. + Helpers for building Angular applications on ASP.NET Core. net451;netstandard1.6 aspnetcore;aspnetcoremvc;nodeservices true diff --git a/src/Microsoft.AspNetCore.AngularServices/PrimeCacheHelper.cs b/src/Microsoft.AspNetCore.AngularServices/PrimeCacheHelper.cs index b2153c74..a755d700 100644 --- a/src/Microsoft.AspNetCore.AngularServices/PrimeCacheHelper.cs +++ b/src/Microsoft.AspNetCore.AngularServices/PrimeCacheHelper.cs @@ -10,7 +10,7 @@ namespace Microsoft.AspNetCore.AngularServices { /// - /// Helpers for prepopulating Angular 2's 'http' service with data. + /// Helpers for prepopulating Angular's 'http' service with data. /// public static class PrimeCacheHelper { diff --git a/src/Microsoft.AspNetCore.NodeServices/README.md b/src/Microsoft.AspNetCore.NodeServices/README.md index c206a573..fe905c58 100644 --- a/src/Microsoft.AspNetCore.NodeServices/README.md +++ b/src/Microsoft.AspNetCore.NodeServices/README.md @@ -10,7 +10,7 @@ This NuGet package provides a fast and robust way to invoke Node.js code from a It is the underlying mechanism supporting the following packages: * [`Microsoft.AspNetCore.SpaServices`](https://github.com/aspnet/JavaScriptServices/tree/dev/src/Microsoft.AspNetCore.SpaServices) - builds on NodeServices, adding functionality commonly used in Single Page Applications, such as server-side prerendering, webpack middleware, and integration between server-side and client-side routing. - * [`Microsoft.AspNetCore.AngularServices`](https://github.com/aspnet/JavaScriptServices/tree/dev/src/Microsoft.AspNetCore.AngularServices) and [`Microsoft.AspNetCore.ReactServices`](https://github.com/aspnet/JavaScriptServices/tree/dev/src/Microsoft.AspNetCore.ReactServices) - these build on `SpaServices`, adding helpers specific to Angular 2 and React, such as cache priming and integrating server-side and client-side validation + * [`Microsoft.AspNetCore.AngularServices`](https://github.com/aspnet/JavaScriptServices/tree/dev/src/Microsoft.AspNetCore.AngularServices) and [`Microsoft.AspNetCore.ReactServices`](https://github.com/aspnet/JavaScriptServices/tree/dev/src/Microsoft.AspNetCore.ReactServices) - these build on `SpaServices`, adding helpers specific to Angular and React, such as cache priming and integrating server-side and client-side validation ### Requirements @@ -32,7 +32,7 @@ For .NET Framework apps: * `nuget install Microsoft.AspNetCore.NodeServices` -### Do you just want to build an ASP.NET Core app with Angular 2 / React / Knockout / etc.? +### Do you just want to build an ASP.NET Core app with Angular / React / Knockout / etc.? In that case, you don't need to use NodeServices directly (or install it manually). You can either: diff --git a/src/Microsoft.AspNetCore.SpaServices/README.md b/src/Microsoft.AspNetCore.SpaServices/README.md index acecbece..fc2ddd2c 100644 --- a/src/Microsoft.AspNetCore.SpaServices/README.md +++ b/src/Microsoft.AspNetCore.SpaServices/README.md @@ -1,10 +1,10 @@ # Microsoft.AspNetCore.SpaServices -If you're building an ASP.NET Core application, and want to use Angular 2, React, Knockout, or another single-page app (SPA) framework, this NuGet package contains useful infrastructure for you. +If you're building an ASP.NET Core application, and want to use Angular, React, Knockout, or another single-page app (SPA) framework, this NuGet package contains useful infrastructure for you. This package enables: - * [**Server-side prerendering**](#server-side-prerendering) for *universal* (a.k.a. *isomorphic*) applications, where your Angular 2 / React / etc. components are first rendered on the server, and then transferred to the client where execution continues + * [**Server-side prerendering**](#server-side-prerendering) for *universal* (a.k.a. *isomorphic*) applications, where your Angular / React / etc. components are first rendered on the server, and then transferred to the client where execution continues * [**Webpack middleware**](#webpack-dev-middleware) so that, during development, any webpack-built resources will be generated on demand, without you having to run webpack manually or compile files to disk * [**Hot module replacement**](#webpack-hot-module-replacement) so that, during development, your code and markup changes will be pushed to your browser and updated in the running application automatically, without even needing to reload the page * [**Routing helpers**](#routing-helper-mapspafallbackroute) for integrating server-side routing with client-side routing @@ -42,9 +42,9 @@ Also, if you want to debug projects created with the aspnetcore-spa generator, s ## Server-side prerendering -The `SpaServices` package isn't tied to any particular client-side framework, and it doesn't force you to set up your client-side application in any one particular style. So, `SpaServices` doesn't contain hard-coded logic for rendering Angular 2 / React / etc. components. +The `SpaServices` package isn't tied to any particular client-side framework, and it doesn't force you to set up your client-side application in any one particular style. So, `SpaServices` doesn't contain hard-coded logic for rendering Angular / React / etc. components. -Instead, what `SpaServices` offers is ASP.NET Core APIs that know how to invoke a JavaScript function that you supply, passing through context information that you'll need for server-side prerendering, and then injects the resulting HTML string into your rendered page. In this document, you'll find examples of setting this up to render Angular 2 and React components. +Instead, what `SpaServices` offers is ASP.NET Core APIs that know how to invoke a JavaScript function that you supply, passing through context information that you'll need for server-side prerendering, and then injects the resulting HTML string into your rendered page. In this document, you'll find examples of setting this up to render Angular and React components. ### 1. Enable the asp-prerender-* tag helpers @@ -86,7 +86,7 @@ module.exports = prerendering.createServerRenderer(function(params) { If you try running your app now, you should see the HTML snippet generated by your JavaScript getting injected into your page. -As you can see, your JavaScript code receives context information (such as the URL being requested), and returns a `Promise` so that it can asynchronously supply the markup to be injected into the page. You can put whatever logic you like here, but typically you'll want to execute a component from your Angular 2 / React / etc. application. +As you can see, your JavaScript code receives context information (such as the URL being requested), and returns a `Promise` so that it can asynchronously supply the markup to be injected into the page. You can put whatever logic you like here, but typically you'll want to execute a component from your Angular / React / etc. application. **Passing data from .NET code into JavaScript code** @@ -211,21 +211,21 @@ Finally, run `webpack` on the command line to build `ClientApp/dist/main-server. Webpack is a broad and powerful tool and can do far more than just invoke the TypeScript compiler. To learn more, see the [webpack website](https://webpack.github.io/). -### 5(a). Prerendering Angular 2 components +### 5(a). Prerendering Angular components -If you're building an Angular 2 application, you can run your components on the server inside your `boot-server.ts` file so they will be injected into the resulting web page. +If you're building an Angular application, you can run your components on the server inside your `boot-server.ts` file so they will be injected into the resulting web page. -First install the NPM package `angular2-universal` - this contains infrastructure for executing Angular 2 components inside Node.js: +First install the NPM package `angular2-universal` - this contains infrastructure for executing Angular components inside Node.js: ``` npm install --save angular2-universal ``` -Now you can use the [`angular2-universal` APIs](https://github.com/angular/universal) from your `boot-server.ts` TypeScript module to execute your Angular 2 component on the server. The code needed for this is fairly complex, but that's unavoidable because Angular 2 supports so many different ways of being configured, and you need to provide wiring for whatever combination of DI modules you're using. +Now you can use the [`angular2-universal` APIs](https://github.com/angular/universal) from your `boot-server.ts` TypeScript module to execute your Angular component on the server. The code needed for this is fairly complex, but that's unavoidable because Angular supports so many different ways of being configured, and you need to provide wiring for whatever combination of DI modules you're using. -You can find an example `boot-server.ts` that renders arbitrary Angular 2 components [here](https://github.com/aspnet/JavaScriptServices/blob/dev/templates/Angular2Spa/ClientApp/boot-server.ts). If you use this with your own application, you might need to edit the `serverBindings` array to reference any other DI services that your Angular 2 component depends on. +You can find an example `boot-server.ts` that renders arbitrary Angular components [here](https://github.com/aspnet/JavaScriptServices/blob/dev/templates/AngularSpa/ClientApp/boot-server.ts). If you use this with your own application, you might need to edit the `serverBindings` array to reference any other DI services that your Angular component depends on. -The easiest way to get started with Angular 2 server-side rendering on ASP.NET Core is to use the [aspnetcore-spa generator](http://blog.stevensanderson.com/2016/05/02/angular2-react-knockout-apps-on-aspnet-core/), which creates a ready-made working starting point. +The easiest way to get started with Angular server-side rendering on ASP.NET Core is to use the [aspnetcore-spa generator](http://blog.stevensanderson.com/2016/05/02/angular2-react-knockout-apps-on-aspnet-core/), which creates a ready-made working starting point. ### 5(b). Prerendering React components @@ -301,7 +301,7 @@ The above example is extremely simple - it doesn't use `react-router`, and it do For an example server-side boot module that knows how to evaluate `react-router` routes and render the correct React component, see [this example](https://github.com/aspnet/JavaScriptServices/blob/dev/templates/ReactReduxSpa/ClientApp/boot-server.tsx). -Supporting asynchronous data loading involves more considerations. Unlike Angular 2 applications that run asynchronously on the server and freely overwrite server-generated markup with client-generated markup, React strictly wants to run synchronously on the server and always produce the same markup on the server as it does on the client. +Supporting asynchronous data loading involves more considerations. Unlike Angular applications that run asynchronously on the server and freely overwrite server-generated markup with client-generated markup, React strictly wants to run synchronously on the server and always produce the same markup on the server as it does on the client. To make this work, you most likely need some way to know in advance what data your React components will need to use, load it separately from those components, and have some way of transferring information about the loaded data from server to client. If you try to implement this in a generalized way, you'll end up reinventing something like the Flux/Redux pattern. @@ -374,19 +374,19 @@ So that's enough to build TypeScript. Here's where webpack dev middleware comes Following on from the preceding example that builds TypeScript, you could extend your Webpack configuration further to support building LESS. There are three major approaches to doing this: -1. **If using Angular 2, use its native style loader to attach the styles to components**. This is extremely simple and is usually the right choice if you are using Angular 2. However it only applies to Angular 2 components, not to any other part of the host page, so sometimes you might want to combine this technique with options 2 or 3 below. +1. **If using Angular, use its native style loader to attach the styles to components**. This is extremely simple and is usually the right choice if you are using Angular. However it only applies to Angular components, not to any other part of the host page, so sometimes you might want to combine this technique with options 2 or 3 below. 2. **Or, use Webpack's style loader to attach the styles at runtime**. The CSS markup will be included in your JavaScript bundles and will be attached to the document dynamically. This has certain benefits during development but isn't recommended in production. -3. **Or, have each build write a standalone `.css` file to disk**. At runtime, load it using a regular `` tag. This is likely to be the approach you'll want for production use (at least for non-Angular 2 applications, such as React applications) as it's the most robust and best-performing option. +3. **Or, have each build write a standalone `.css` file to disk**. At runtime, load it using a regular `` tag. This is likely to be the approach you'll want for production use (at least for non-Angular applications, such as React applications) as it's the most robust and best-performing option. If instead of LESS you prefer SASS or another CSS preprocessor, the exact same techniques should work, but of course you'll need to replace the `less-loader` with an equivalent Webpack loader for SASS or your chosen preprocessor. -#### Approach 1: Scoping styles to Angular 2 components +#### Approach 1: Scoping styles to Angular components -If you are using Angular 2, this is the easiest way to perform styling. It works with both server and client rendering, supports Hot Module Replacement, and robustly scopes styles to particular components (and optionally, their descendant elements). +If you are using Angular, this is the easiest way to perform styling. It works with both server and client rendering, supports Hot Module Replacement, and robustly scopes styles to particular components (and optionally, their descendant elements). -This repository's Angular 2 template uses this technique to scope styles to components out of the box. It defines those styles as `.css` files. For example, its components reference `.css` files like this: +This repository's Angular template uses this technique to scope styles to components out of the box. It defines those styles as `.css` files. For example, its components reference `.css` files like this: ```javascript @Component({ @@ -415,7 +415,7 @@ Next, add the following loader configuration to the `loaders` array in `webpack. { test: /\.less/, include: /ClientApp/, loader: 'raw-loader!less-loader' } ``` -Notice how this chains together with `less-loader` (which transforms `.less` syntax to plain CSS syntax), then the `raw` loader (which turn the result into a string literal). With this in place, you can reference `.less` files from your Angular 2 components in the obvious way: +Notice how this chains together with `less-loader` (which transforms `.less` syntax to plain CSS syntax), then the `raw` loader (which turn the result into a string literal). With this in place, you can reference `.less` files from your Angular components in the obvious way: ```javascript @Component({ @@ -429,7 +429,7 @@ export class SomeComponent { ... } #### Approach 2: Loading the styles using Webpack and JavaScript -This technique works with any client-side framework (not just Angular 2), and can also apply styles to the entire document rather than just individual components. It's a little simpler to set up than technique 3, plus it works flawlessly with Hot Module Replacement (HMR). The downside is that it's really only good for development time, because in production you probably don't want users to wait until JavaScript is loaded before styles are applied to the page (this would mean they'd see a 'flash of unstyled content' while the page is being loaded). +This technique works with any client-side framework (not just Angular), and can also apply styles to the entire document rather than just individual components. It's a little simpler to set up than technique 3, plus it works flawlessly with Hot Module Replacement (HMR). The downside is that it's really only good for development time, because in production you probably don't want users to wait until JavaScript is loaded before styles are applied to the page (this would mean they'd see a 'flash of unstyled content' while the page is being loaded). First create a `.less` file in your project. For example, create a file at `ClientApp/styles/mystyles.less` containing: @@ -631,7 +631,7 @@ Now if you edit any React component (e.g., in `.jsx` or `.tsx` files), the updat Webpack has built-in HMR support for various types of module, such as styles and React components as described above. But to support HMR for other code modules, you need to add a small block of code that calls `module.hot.accept` to receive the updated module and update the running application. -This is [documented in detail on the Webpack site](https://webpack.github.io/docs/hot-module-replacement.html). Or to get a working HMR-enabled ASP.NET Core site with Angular 2, React, React+Redux, or Knockout, you can use the [aspnetcore-spa generator](http://blog.stevensanderson.com/2016/05/02/angular2-react-knockout-apps-on-aspnet-core/). +This is [documented in detail on the Webpack site](https://webpack.github.io/docs/hot-module-replacement.html). Or to get a working HMR-enabled ASP.NET Core site with Angular, React, React+Redux, or Knockout, you can use the [aspnetcore-spa generator](http://blog.stevensanderson.com/2016/05/02/angular2-react-knockout-apps-on-aspnet-core/). #### Passing options to the Webpack Hot Middleware client diff --git a/templates/Angular2Spa/.template.config/icon.png b/templates/AngularSpa/.template.config/icon.png similarity index 100% rename from templates/Angular2Spa/.template.config/icon.png rename to templates/AngularSpa/.template.config/icon.png diff --git a/templates/Angular2Spa/Angular2Spa.csproj b/templates/AngularSpa/AngularSpa.csproj similarity index 100% rename from templates/Angular2Spa/Angular2Spa.csproj rename to templates/AngularSpa/AngularSpa.csproj diff --git a/templates/Angular2Spa/ClientApp/app/app.module.client.ts b/templates/AngularSpa/ClientApp/app/app.module.client.ts similarity index 100% rename from templates/Angular2Spa/ClientApp/app/app.module.client.ts rename to templates/AngularSpa/ClientApp/app/app.module.client.ts diff --git a/templates/Angular2Spa/ClientApp/app/app.module.server.ts b/templates/AngularSpa/ClientApp/app/app.module.server.ts similarity index 100% rename from templates/Angular2Spa/ClientApp/app/app.module.server.ts rename to templates/AngularSpa/ClientApp/app/app.module.server.ts diff --git a/templates/Angular2Spa/ClientApp/app/app.module.shared.ts b/templates/AngularSpa/ClientApp/app/app.module.shared.ts similarity index 100% rename from templates/Angular2Spa/ClientApp/app/app.module.shared.ts rename to templates/AngularSpa/ClientApp/app/app.module.shared.ts diff --git a/templates/Angular2Spa/ClientApp/app/components/app/app.component.css b/templates/AngularSpa/ClientApp/app/components/app/app.component.css similarity index 100% rename from templates/Angular2Spa/ClientApp/app/components/app/app.component.css rename to templates/AngularSpa/ClientApp/app/components/app/app.component.css diff --git a/templates/Angular2Spa/ClientApp/app/components/app/app.component.html b/templates/AngularSpa/ClientApp/app/components/app/app.component.html similarity index 100% rename from templates/Angular2Spa/ClientApp/app/components/app/app.component.html rename to templates/AngularSpa/ClientApp/app/components/app/app.component.html diff --git a/templates/Angular2Spa/ClientApp/app/components/app/app.component.ts b/templates/AngularSpa/ClientApp/app/components/app/app.component.ts similarity index 100% rename from templates/Angular2Spa/ClientApp/app/components/app/app.component.ts rename to templates/AngularSpa/ClientApp/app/components/app/app.component.ts diff --git a/templates/Angular2Spa/ClientApp/app/components/counter/counter.component.html b/templates/AngularSpa/ClientApp/app/components/counter/counter.component.html similarity index 69% rename from templates/Angular2Spa/ClientApp/app/components/counter/counter.component.html rename to templates/AngularSpa/ClientApp/app/components/counter/counter.component.html index cc2bbd59..2521eda7 100644 --- a/templates/Angular2Spa/ClientApp/app/components/counter/counter.component.html +++ b/templates/AngularSpa/ClientApp/app/components/counter/counter.component.html @@ -1,6 +1,6 @@

Counter

-

This is a simple example of an Angular 2 component.

+

This is a simple example of an Angular component.

Current count: {{ currentCount }}

diff --git a/templates/Angular2Spa/ClientApp/app/components/counter/counter.component.spec.ts b/templates/AngularSpa/ClientApp/app/components/counter/counter.component.spec.ts similarity index 100% rename from templates/Angular2Spa/ClientApp/app/components/counter/counter.component.spec.ts rename to templates/AngularSpa/ClientApp/app/components/counter/counter.component.spec.ts diff --git a/templates/Angular2Spa/ClientApp/app/components/counter/counter.component.ts b/templates/AngularSpa/ClientApp/app/components/counter/counter.component.ts similarity index 100% rename from templates/Angular2Spa/ClientApp/app/components/counter/counter.component.ts rename to templates/AngularSpa/ClientApp/app/components/counter/counter.component.ts diff --git a/templates/Angular2Spa/ClientApp/app/components/fetchdata/fetchdata.component.html b/templates/AngularSpa/ClientApp/app/components/fetchdata/fetchdata.component.html similarity index 100% rename from templates/Angular2Spa/ClientApp/app/components/fetchdata/fetchdata.component.html rename to templates/AngularSpa/ClientApp/app/components/fetchdata/fetchdata.component.html diff --git a/templates/Angular2Spa/ClientApp/app/components/fetchdata/fetchdata.component.ts b/templates/AngularSpa/ClientApp/app/components/fetchdata/fetchdata.component.ts similarity index 100% rename from templates/Angular2Spa/ClientApp/app/components/fetchdata/fetchdata.component.ts rename to templates/AngularSpa/ClientApp/app/components/fetchdata/fetchdata.component.ts diff --git a/templates/Angular2Spa/ClientApp/app/components/home/home.component.html b/templates/AngularSpa/ClientApp/app/components/home/home.component.html similarity index 77% rename from templates/Angular2Spa/ClientApp/app/components/home/home.component.html rename to templates/AngularSpa/ClientApp/app/components/home/home.component.html index 034d34eb..3f2c0584 100644 --- a/templates/Angular2Spa/ClientApp/app/components/home/home.component.html +++ b/templates/AngularSpa/ClientApp/app/components/home/home.component.html @@ -2,15 +2,15 @@

Hello, world!

Welcome to your new single-page application, built with:

To help you get started, we've also set up:

  • Client-side navigation. For example, click Counter then Back to return here.
    • -
  • Server-side prerendering. For faster initial loading and improved SEO, your Angular 2 app is prerendered on the server. The resulting HTML is then transferred to the browser where a client-side copy of the app takes over.
    • +
  • Server-side prerendering. For faster initial loading and improved SEO, your Angular app is prerendered on the server. The resulting HTML is then transferred to the browser where a client-side copy of the app takes over.
  • Webpack dev middleware. In development mode, there's no need to run the webpack build tool. Your client-side resources are dynamically built on demand. Updates are available as soon as you modify any file.
    • -
  • Hot module replacement. In development mode, you don't even need to reload the page after making most changes. Within seconds of saving changes to files, your Angular 2 app will be rebuilt and a new instance injected is into the page.
    • +
  • Hot module replacement. In development mode, you don't even need to reload the page after making most changes. Within seconds of saving changes to files, your Angular app will be rebuilt and a new instance injected is into the page.
  • Efficient production builds. In production mode, development-time features are disabled, and the webpack build tool produces minified static CSS and JavaScript files.
diff --git a/templates/Angular2Spa/ClientApp/app/components/home/home.component.ts b/templates/AngularSpa/ClientApp/app/components/home/home.component.ts similarity index 100% rename from templates/Angular2Spa/ClientApp/app/components/home/home.component.ts rename to templates/AngularSpa/ClientApp/app/components/home/home.component.ts diff --git a/templates/Angular2Spa/ClientApp/app/components/navmenu/navmenu.component.css b/templates/AngularSpa/ClientApp/app/components/navmenu/navmenu.component.css similarity index 100% rename from templates/Angular2Spa/ClientApp/app/components/navmenu/navmenu.component.css rename to templates/AngularSpa/ClientApp/app/components/navmenu/navmenu.component.css diff --git a/templates/Angular2Spa/ClientApp/app/components/navmenu/navmenu.component.html b/templates/AngularSpa/ClientApp/app/components/navmenu/navmenu.component.html similarity index 100% rename from templates/Angular2Spa/ClientApp/app/components/navmenu/navmenu.component.html rename to templates/AngularSpa/ClientApp/app/components/navmenu/navmenu.component.html diff --git a/templates/Angular2Spa/ClientApp/app/components/navmenu/navmenu.component.ts b/templates/AngularSpa/ClientApp/app/components/navmenu/navmenu.component.ts similarity index 100% rename from templates/Angular2Spa/ClientApp/app/components/navmenu/navmenu.component.ts rename to templates/AngularSpa/ClientApp/app/components/navmenu/navmenu.component.ts diff --git a/templates/Angular2Spa/ClientApp/boot-client.ts b/templates/AngularSpa/ClientApp/boot-client.ts similarity index 100% rename from templates/Angular2Spa/ClientApp/boot-client.ts rename to templates/AngularSpa/ClientApp/boot-client.ts diff --git a/templates/Angular2Spa/ClientApp/boot-server.ts b/templates/AngularSpa/ClientApp/boot-server.ts similarity index 100% rename from templates/Angular2Spa/ClientApp/boot-server.ts rename to templates/AngularSpa/ClientApp/boot-server.ts diff --git a/templates/Angular2Spa/ClientApp/test/boot-tests.ts b/templates/AngularSpa/ClientApp/test/boot-tests.ts similarity index 100% rename from templates/Angular2Spa/ClientApp/test/boot-tests.ts rename to templates/AngularSpa/ClientApp/test/boot-tests.ts diff --git a/templates/Angular2Spa/ClientApp/test/karma.conf.js b/templates/AngularSpa/ClientApp/test/karma.conf.js similarity index 100% rename from templates/Angular2Spa/ClientApp/test/karma.conf.js rename to templates/AngularSpa/ClientApp/test/karma.conf.js diff --git a/templates/Angular2Spa/Controllers/HomeController.cs b/templates/AngularSpa/Controllers/HomeController.cs old mode 100755 new mode 100644 similarity index 100% rename from templates/Angular2Spa/Controllers/HomeController.cs rename to templates/AngularSpa/Controllers/HomeController.cs diff --git a/templates/Angular2Spa/Controllers/SampleDataController.cs b/templates/AngularSpa/Controllers/SampleDataController.cs similarity index 100% rename from templates/Angular2Spa/Controllers/SampleDataController.cs rename to templates/AngularSpa/Controllers/SampleDataController.cs diff --git a/templates/Angular2Spa/Program.cs b/templates/AngularSpa/Program.cs similarity index 100% rename from templates/Angular2Spa/Program.cs rename to templates/AngularSpa/Program.cs diff --git a/templates/Angular2Spa/Startup.cs b/templates/AngularSpa/Startup.cs old mode 100755 new mode 100644 similarity index 100% rename from templates/Angular2Spa/Startup.cs rename to templates/AngularSpa/Startup.cs diff --git a/templates/Angular2Spa/Views/Home/Index.cshtml b/templates/AngularSpa/Views/Home/Index.cshtml similarity index 100% rename from templates/Angular2Spa/Views/Home/Index.cshtml rename to templates/AngularSpa/Views/Home/Index.cshtml diff --git a/templates/Angular2Spa/Views/Shared/Error.cshtml b/templates/AngularSpa/Views/Shared/Error.cshtml old mode 100755 new mode 100644 similarity index 100% rename from templates/Angular2Spa/Views/Shared/Error.cshtml rename to templates/AngularSpa/Views/Shared/Error.cshtml diff --git a/templates/Angular2Spa/Views/Shared/_Layout.cshtml b/templates/AngularSpa/Views/Shared/_Layout.cshtml similarity index 100% rename from templates/Angular2Spa/Views/Shared/_Layout.cshtml rename to templates/AngularSpa/Views/Shared/_Layout.cshtml diff --git a/templates/Angular2Spa/Views/_ViewImports.cshtml b/templates/AngularSpa/Views/_ViewImports.cshtml old mode 100755 new mode 100644 similarity index 100% rename from templates/Angular2Spa/Views/_ViewImports.cshtml rename to templates/AngularSpa/Views/_ViewImports.cshtml diff --git a/templates/Angular2Spa/Views/_ViewStart.cshtml b/templates/AngularSpa/Views/_ViewStart.cshtml old mode 100755 new mode 100644 similarity index 100% rename from templates/Angular2Spa/Views/_ViewStart.cshtml rename to templates/AngularSpa/Views/_ViewStart.cshtml diff --git a/templates/Angular2Spa/appsettings.json b/templates/AngularSpa/appsettings.json old mode 100755 new mode 100644 similarity index 100% rename from templates/Angular2Spa/appsettings.json rename to templates/AngularSpa/appsettings.json diff --git a/templates/Angular2Spa/global.json b/templates/AngularSpa/global.json similarity index 100% rename from templates/Angular2Spa/global.json rename to templates/AngularSpa/global.json diff --git a/templates/Angular2Spa/package.json b/templates/AngularSpa/package.json similarity index 100% rename from templates/Angular2Spa/package.json rename to templates/AngularSpa/package.json diff --git a/templates/Angular2Spa/template_gitignore b/templates/AngularSpa/template_gitignore similarity index 100% rename from templates/Angular2Spa/template_gitignore rename to templates/AngularSpa/template_gitignore diff --git a/templates/Angular2Spa/tsconfig.json b/templates/AngularSpa/tsconfig.json similarity index 100% rename from templates/Angular2Spa/tsconfig.json rename to templates/AngularSpa/tsconfig.json diff --git a/templates/Angular2Spa/web.config b/templates/AngularSpa/web.config similarity index 100% rename from templates/Angular2Spa/web.config rename to templates/AngularSpa/web.config diff --git a/templates/Angular2Spa/webpack.config.js b/templates/AngularSpa/webpack.config.js similarity index 100% rename from templates/Angular2Spa/webpack.config.js rename to templates/AngularSpa/webpack.config.js diff --git a/templates/Angular2Spa/webpack.config.vendor.js b/templates/AngularSpa/webpack.config.vendor.js similarity index 100% rename from templates/Angular2Spa/webpack.config.vendor.js rename to templates/AngularSpa/webpack.config.vendor.js diff --git a/templates/Angular2Spa/wwwroot/favicon.ico b/templates/AngularSpa/wwwroot/favicon.ico old mode 100755 new mode 100644 similarity index 100% rename from templates/Angular2Spa/wwwroot/favicon.ico rename to templates/AngularSpa/wwwroot/favicon.ico diff --git a/templates/package-builder/src/build/build.ts b/templates/package-builder/src/build/build.ts index 0bac5c8a..7f935ee9 100644 --- a/templates/package-builder/src/build/build.ts +++ b/templates/package-builder/src/build/build.ts @@ -23,7 +23,7 @@ const commonTemplatePrepublishSteps = [ const commonForceInclusionRegex = /^(wwwroot|ClientApp)\/dist\//; // Files to be included in template, even though gitignored const templates: { [key: string]: { dir: string, dotNetNewId: string, displayName: string, prepublish?: string[], forceInclusion?: RegExp } } = { - 'angular': { dir: '../../templates/Angular2Spa/', dotNetNewId: 'Angular', displayName: 'Angular' }, + 'angular': { dir: '../../templates/AngularSpa/', dotNetNewId: 'Angular', displayName: 'Angular' }, 'aurelia': { dir: '../../templates/AureliaSpa/', dotNetNewId: 'Aurelia', displayName: 'Aurelia' }, 'knockout': { dir: '../../templates/KnockoutSpa/', dotNetNewId: 'Knockout', displayName: 'Knockout.js' }, 'react-redux': { dir: '../../templates/ReactReduxSpa/', dotNetNewId: 'ReactRedux', displayName: 'React.js and Redux' }, diff --git a/test/templates/angular.spec.ts b/test/templates/angular.spec.ts index 2c6bd4d8..9a96d139 100644 --- a/test/templates/angular.spec.ts +++ b/test/templates/angular.spec.ts @@ -24,7 +24,7 @@ function testBasicNavigation() { it('should initially display the home page', () => { expect(browser.getText('h1')).to.eq('Hello, world!'); - expect(browser.getText('li a[href="https://angular.io/"]')).to.eq('Angular 2'); + expect(browser.getText('li a[href="https://angular.io/"]')).to.eq('Angular'); }); it('should be able to show the counter page', () => { From e081d5e091ab334878a1e57b826a1ec8aee0b04b Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 18 May 2017 10:33:08 +0100 Subject: [PATCH 071/411] Make build.sh consistent with other ASP.NET repos --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 4f7b3dd3..b0bcadb5 100755 --- a/build.sh +++ b/build.sh @@ -38,7 +38,7 @@ if test ! -d $buildFolder; then chmod +x $buildFile # Cleanup - if test ! -d $tempFolder; then + if test -d $tempFolder; then rm -rf $tempFolder fi fi From 244deca019c578cc081aed0e56387f1daf5d6ad6 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 18 May 2017 11:28:54 +0100 Subject: [PATCH 072/411] Update libraries and samples to .NET Core 2.0 --- build/common.props | 8 +++++--- build/dependencies.props | 9 +++------ build/version.props | 6 ------ samples/angular/MusicStore/MusicStore.csproj | 2 +- samples/misc/LatencyTest/LatencyTest.csproj | 2 +- .../NodeServicesExamples/NodeServicesExamples.csproj | 2 +- samples/misc/Webpack/Webpack.csproj | 2 +- samples/react/MusicStore/MusicStore.csproj | 7 +------ samples/react/ReactGrid/ReactGrid.csproj | 2 +- .../Microsoft.AspNetCore.AngularServices.csproj | 2 +- .../Microsoft.AspNetCore.NodeServices.Sockets.csproj | 6 +++--- .../Microsoft.AspNetCore.NodeServices.csproj | 4 ++-- .../Microsoft.AspNetCore.ReactServices.csproj | 2 +- .../Microsoft.AspNetCore.SpaServices.csproj | 2 +- templates/WebApplicationBasic/WebApplicationBasic.csproj | 4 ++-- version.props | 7 +++++++ 16 files changed, 31 insertions(+), 36 deletions(-) delete mode 100644 build/version.props create mode 100644 version.props diff --git a/build/common.props b/build/common.props index de4792ed..89ade5d9 100644 --- a/build/common.props +++ b/build/common.props @@ -1,7 +1,6 @@ - - + Microsoft ASP.NET Core @@ -10,11 +9,14 @@ $(MSBuildThisFileDirectory)Key.snk true true - true $(VersionSuffix)-$(BuildNumber) + + + + diff --git a/build/dependencies.props b/build/dependencies.props index c03920fd..aab2fe98 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,14 +1,11 @@ - 1.1.0 - 1.1.1 - 1.0.0-msbuild3-final + 2.0.0-* 5.0.2 4.3.0 + 2.1.0-* 10.0.1 - 2.0.0-* - 4.5.24 - 1.6.1 + $(BundledNETStandardPackageVersion) 4.7.0 diff --git a/build/version.props b/build/version.props deleted file mode 100644 index 2ebde7d5..00000000 --- a/build/version.props +++ /dev/null @@ -1,6 +0,0 @@ - - - 1.1.2 - preview1 - - diff --git a/samples/angular/MusicStore/MusicStore.csproj b/samples/angular/MusicStore/MusicStore.csproj index 61b754bd..8f811943 100644 --- a/samples/angular/MusicStore/MusicStore.csproj +++ b/samples/angular/MusicStore/MusicStore.csproj @@ -3,7 +3,7 @@ - netcoreapp1.1 + netcoreapp2.0 true false diff --git a/samples/misc/LatencyTest/LatencyTest.csproj b/samples/misc/LatencyTest/LatencyTest.csproj index 3aec2336..8c17cdb5 100644 --- a/samples/misc/LatencyTest/LatencyTest.csproj +++ b/samples/misc/LatencyTest/LatencyTest.csproj @@ -3,7 +3,7 @@ - netcoreapp1.1 + netcoreapp2.0 false exe diff --git a/samples/misc/NodeServicesExamples/NodeServicesExamples.csproj b/samples/misc/NodeServicesExamples/NodeServicesExamples.csproj index 62343096..e2d0753b 100644 --- a/samples/misc/NodeServicesExamples/NodeServicesExamples.csproj +++ b/samples/misc/NodeServicesExamples/NodeServicesExamples.csproj @@ -3,7 +3,7 @@ - netcoreapp1.1 + netcoreapp2.0 true false diff --git a/samples/misc/Webpack/Webpack.csproj b/samples/misc/Webpack/Webpack.csproj index 2f5b7d72..d2606828 100644 --- a/samples/misc/Webpack/Webpack.csproj +++ b/samples/misc/Webpack/Webpack.csproj @@ -3,7 +3,7 @@ - netcoreapp1.1 + netcoreapp2.0 true false diff --git a/samples/react/MusicStore/MusicStore.csproj b/samples/react/MusicStore/MusicStore.csproj index 388bcc73..e8ab8d92 100644 --- a/samples/react/MusicStore/MusicStore.csproj +++ b/samples/react/MusicStore/MusicStore.csproj @@ -3,7 +3,7 @@ - netcoreapp1.1 + netcoreapp2.0 true false @@ -31,9 +31,4 @@ - - - - - diff --git a/samples/react/ReactGrid/ReactGrid.csproj b/samples/react/ReactGrid/ReactGrid.csproj index 55717763..cefd991a 100644 --- a/samples/react/ReactGrid/ReactGrid.csproj +++ b/samples/react/ReactGrid/ReactGrid.csproj @@ -3,7 +3,7 @@ - netcoreapp1.1 + netcoreapp2.0 true false diff --git a/src/Microsoft.AspNetCore.AngularServices/Microsoft.AspNetCore.AngularServices.csproj b/src/Microsoft.AspNetCore.AngularServices/Microsoft.AspNetCore.AngularServices.csproj index 5f3e1570..9b7863fe 100644 --- a/src/Microsoft.AspNetCore.AngularServices/Microsoft.AspNetCore.AngularServices.csproj +++ b/src/Microsoft.AspNetCore.AngularServices/Microsoft.AspNetCore.AngularServices.csproj @@ -4,7 +4,7 @@ Helpers for building Angular applications on ASP.NET Core. - net451;netstandard1.6 + netcoreapp2.0 aspnetcore;aspnetcoremvc;nodeservices true diff --git a/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj b/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj index 3319bf29..8ebd6a62 100644 --- a/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj +++ b/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj @@ -4,7 +4,7 @@ Socket-based RPC for Microsoft.AspNetCore.NodeServices. - net451;netstandard1.6 + netcoreapp2.0 aspnetcore;aspnetcoremvc;nodeservices true @@ -17,11 +17,11 @@ - + - + diff --git a/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj b/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj index 5c440e4a..0473d705 100644 --- a/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj +++ b/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj @@ -4,7 +4,7 @@ Invoke Node.js modules at runtime in ASP.NET Core applications. - net451;netstandard1.6 + netcoreapp2.0 aspnetcore;aspnetcoremvc;nodeservices true @@ -19,7 +19,7 @@ - + diff --git a/src/Microsoft.AspNetCore.ReactServices/Microsoft.AspNetCore.ReactServices.csproj b/src/Microsoft.AspNetCore.ReactServices/Microsoft.AspNetCore.ReactServices.csproj index 0f6e26a5..97f288a6 100644 --- a/src/Microsoft.AspNetCore.ReactServices/Microsoft.AspNetCore.ReactServices.csproj +++ b/src/Microsoft.AspNetCore.ReactServices/Microsoft.AspNetCore.ReactServices.csproj @@ -4,7 +4,7 @@ Helpers for building React applications on ASP.NET Core. - net451;netstandard1.6 + netcoreapp2.0 aspnetcore;aspnetcoremvc;nodeservices true diff --git a/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj b/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj index 6eaa3655..39839ed6 100644 --- a/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj +++ b/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj @@ -4,7 +4,7 @@ Helpers for building single-page applications on ASP.NET MVC Core. - net451;netstandard1.6 + netcoreapp2.0 aspnetcore;aspnetcoremvc;nodeservices true diff --git a/templates/WebApplicationBasic/WebApplicationBasic.csproj b/templates/WebApplicationBasic/WebApplicationBasic.csproj index eba7c6c2..12a3277e 100644 --- a/templates/WebApplicationBasic/WebApplicationBasic.csproj +++ b/templates/WebApplicationBasic/WebApplicationBasic.csproj @@ -3,7 +3,7 @@ - netcoreapp1.1 + netcoreapp2.0 true false @@ -14,7 +14,7 @@ - + diff --git a/version.props b/version.props new file mode 100644 index 00000000..6af4f81d --- /dev/null +++ b/version.props @@ -0,0 +1,7 @@ + + + + 2.0.0 + preview2 + + From 58fd9150b9b9d9ac3bde48ba106b165936cf2722 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 18 May 2017 11:37:40 +0100 Subject: [PATCH 073/411] Update AppVeyor build to use .NET Core 2.0 Preview 1 --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index d0f6bbcf..9cf40d55 100755 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,8 +3,8 @@ init: install: - ps: Install-Product node 6.9.2 x64 # .NET Core SDK binaries - # Download .NET Core SDK and add to PATH - - ps: $urlCurrent = "https://download.microsoft.com/download/E/7/8/E782433E-7737-4E6C-BFBF-290A0A81C3D7/dotnet-dev-win-x64.1.0.4.zip" + # Download .NET Core 2.0 Preview 1 SDK and add to PATH + - ps: $urlCurrent = "https://download.microsoft.com/download/3/7/F/37F1CA21-E5EE-4309-9714-E914703ED05A/dotnet-dev-win-x64.2.0.0-preview1-005977.exe" - ps: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetsdk" - ps: mkdir $env:DOTNET_INSTALL_DIR -Force | Out-Null - ps: $tempFileCurrent = [System.IO.Path]::GetTempFileName() From deaaa43e02073a9b469e4c44b336072c857407d6 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 18 May 2017 11:41:54 +0100 Subject: [PATCH 074/411] Fix SDK download URL for AppVeyor --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 9cf40d55..fa27d46a 100755 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,7 +4,7 @@ install: - ps: Install-Product node 6.9.2 x64 # .NET Core SDK binaries # Download .NET Core 2.0 Preview 1 SDK and add to PATH - - ps: $urlCurrent = "https://download.microsoft.com/download/3/7/F/37F1CA21-E5EE-4309-9714-E914703ED05A/dotnet-dev-win-x64.2.0.0-preview1-005977.exe" + - ps: $urlCurrent = "https://download.microsoft.com/download/0/6/5/0656B047-5F2F-4281-A851-F30776F8616D/dotnet-dev-win-x64.2.0.0-preview1-005977.zip" - ps: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetsdk" - ps: mkdir $env:DOTNET_INSTALL_DIR -Force | Out-Null - ps: $tempFileCurrent = [System.IO.Path]::GetTempFileName() From 58fa07d4dc1cb6b13c6c35d6b8046b25b23a9c76 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 18 May 2017 11:55:45 +0100 Subject: [PATCH 075/411] Build fixes following .NET Core 2.0 update --- samples/angular/MusicStore/Startup.cs | 2 +- samples/react/MusicStore/Startup.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/angular/MusicStore/Startup.cs b/samples/angular/MusicStore/Startup.cs index c4e37bff..ae1961fc 100755 --- a/samples/angular/MusicStore/Startup.cs +++ b/samples/angular/MusicStore/Startup.cs @@ -28,7 +28,7 @@ public void ConfigureServices(IServiceCollection services) }); // Add EF services to the service container - services.AddEntityFramework() + services .AddEntityFrameworkSqlite() .AddDbContext(options => { options.UseSqlite("Data Source=music-db.sqlite"); diff --git a/samples/react/MusicStore/Startup.cs b/samples/react/MusicStore/Startup.cs index 1bc6003d..6b649e9a 100755 --- a/samples/react/MusicStore/Startup.cs +++ b/samples/react/MusicStore/Startup.cs @@ -30,7 +30,7 @@ public void ConfigureServices(IServiceCollection services) }); // Add EF services to the service container - services.AddEntityFramework() + services .AddEntityFrameworkSqlite() .AddDbContext(options => { options.UseSqlite("Data Source=music-db.sqlite"); From baae62132b6114486f5c8f77a42676c44c20ce45 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 18 May 2017 13:52:58 +0100 Subject: [PATCH 076/411] Remove projects and packages obsoleted in v2 --- JavaScriptServices.sln | 51 +- samples/angular/MusicStore/.gitignore | 9 - .../MusicStore/Apis/AlbumsApiController.cs | 216 -- .../MusicStore/Apis/ArtistsApiController.cs | 30 - .../MusicStore/Apis/GenresApiController.cs | 70 - .../Apis/Models/AccountViewModels.cs | 63 - .../angular/MusicStore/Apis/Models/Album.cs | 40 - .../angular/MusicStore/Apis/Models/Artist.cs | 12 - .../MusicStore/Apis/Models/CartItem.cs | 21 - .../angular/MusicStore/Apis/Models/Genre.cs | 24 - .../Apis/Models/MusicStoreContext.cs | 34 - .../angular/MusicStore/Apis/Models/Order.cs | 73 - .../MusicStore/Apis/Models/OrderDetail.cs | 14 - .../MusicStore/Apis/Models/SampleData.cs | 915 ------ .../Apis/Models/SentimentAnalysis.cs | 38 - .../MusicStore/Apis/Models/ShoppingCart.cs | 207 -- .../MusicStore/Controllers/HomeController.cs | 17 - .../Infrastructure/NoCacheAttribute.cs | 19 - .../MusicStore/Infrastructure/PagedList.cs | 150 - .../Infrastructure/SortDirection.cs | 13 - .../Infrastructure/SortExpression.cs | 87 - samples/angular/MusicStore/MusicStore.csproj | 31 - samples/angular/MusicStore/Startup.cs | 103 - .../MusicStore/Views/Home/Index.cshtml | 23 - .../MusicStore/Views/Shared/Error.cshtml | 6 - .../MusicStore/Views/Shared/_Layout.cshtml | 40 - .../MusicStore/Views/_ViewImports.cshtml | 4 - .../MusicStore/Views/_ViewStart.cshtml | 3 - samples/angular/MusicStore/gulpfile.js | 53 - samples/angular/MusicStore/package.json | 32 - samples/angular/MusicStore/tsconfig.json | 13 - samples/angular/MusicStore/tsd.json | 12 - .../MusicStore/typings/es6-shim/es6-shim.d.ts | 668 ----- samples/angular/MusicStore/typings/tsd.d.ts | 2 - .../MusicStore/typings/url-workaround.d.ts | 7 - .../angular/MusicStore/wwwroot/css/site.css | 3 - .../MusicStore/wwwroot/css/styles.less | 14 - .../wwwroot/images/home-showcase.png | Bin 254130 -> 0 bytes .../MusicStore/wwwroot/images/logo.png | Bin 2963 -> 0 bytes .../MusicStore/wwwroot/images/placeholder.png | Bin 1221 -> 0 bytes .../MusicStore/wwwroot/ng-app/boot-client.ts | 8 - .../MusicStore/wwwroot/ng-app/boot-server.ts | 30 - .../admin/admin-home/admin-home.html | 3 - .../components/admin/admin-home/admin-home.ts | 19 - .../album-delete-prompt.html | 17 - .../album-delete-prompt.ts | 20 - .../admin/album-details/album-details.html | 50 - .../admin/album-details/album-details.ts | 20 - .../admin/album-edit/album-edit.html | 47 - .../components/admin/album-edit/album-edit.ts | 94 - .../admin/albums-list/albums-list.html | 44 - .../admin/albums-list/albums-list.ts | 68 - .../admin/form-field/form-field.html | 9 - .../components/admin/form-field/form-field.ts | 19 - .../wwwroot/ng-app/components/app/app.css | 0 .../wwwroot/ng-app/components/app/app.html | 30 - .../wwwroot/ng-app/components/app/app.ts | 33 - .../public/album-details/album-details.html | 26 - .../public/album-details/album-details.ts | 18 - .../public/album-tile/album-tile.html | 4 - .../public/album-tile/album-tile.ts | 12 - .../public/genre-contents/genre-contents.html | 7 - .../public/genre-contents/genre-contents.ts | 20 - .../public/genres-list/genres-list.html | 13 - .../public/genres-list/genres-list.ts | 19 - .../ng-app/components/public/home/home.html | 10 - .../ng-app/components/public/home/home.ts | 19 - .../wwwroot/ng-app/models/models.ts | 16 - .../MusicStore/wwwroot/system.config.js | 3 - samples/angular/MusicStore/wwwroot/web.config | 9 - samples/react/MusicStore/.babelrc | 3 - samples/react/MusicStore/.gitignore | 4 - .../MusicStore/Apis/AlbumsApiController.cs | 201 -- .../MusicStore/Apis/ArtistsApiController.cs | 30 - .../MusicStore/Apis/GenresApiController.cs | 70 - .../Apis/Models/AccountViewModels.cs | 63 - samples/react/MusicStore/Apis/Models/Album.cs | 40 - .../react/MusicStore/Apis/Models/Artist.cs | 12 - .../react/MusicStore/Apis/Models/CartItem.cs | 21 - samples/react/MusicStore/Apis/Models/Genre.cs | 24 - .../Apis/Models/MusicStoreContext.cs | 34 - samples/react/MusicStore/Apis/Models/Order.cs | 73 - .../MusicStore/Apis/Models/OrderDetail.cs | 14 - .../MusicStore/Apis/Models/SampleData.cs | 915 ------ .../MusicStore/Apis/Models/ShoppingCart.cs | 207 -- .../MusicStore/Controllers/HomeController.cs | 16 - .../Infrastructure/NoCacheAttribute.cs | 19 - .../MusicStore/Infrastructure/PagedList.cs | 150 - .../Infrastructure/SortDirection.cs | 13 - .../Infrastructure/SortExpression.cs | 87 - samples/react/MusicStore/MusicStore.csproj | 34 - .../MusicStore/Properties/launchSettings.json | 25 - .../react/MusicStore/ReactApp/boot-server.tsx | 50 - samples/react/MusicStore/ReactApp/boot.tsx | 25 - .../ReactApp/components/NavMenu.tsx | 49 - .../components/public/AlbumDetails.tsx | 58 - .../ReactApp/components/public/AlbumTile.tsx | 17 - .../components/public/GenreDetails.tsx | 45 - .../ReactApp/components/public/Genres.tsx | 38 - .../ReactApp/components/public/Home.tsx | 34 - .../MusicStore/ReactApp/configureStore.ts | 34 - samples/react/MusicStore/ReactApp/routes.tsx | 25 - .../MusicStore/ReactApp/store/AlbumDetails.ts | 81 - .../ReactApp/store/FeaturedAlbums.ts | 62 - .../MusicStore/ReactApp/store/GenreDetails.ts | 68 - .../MusicStore/ReactApp/store/GenreList.ts | 55 - .../react/MusicStore/ReactApp/store/index.ts | 27 - .../MusicStore/ReactApp/styles/styles.css | 3 - samples/react/MusicStore/SiteSettings.cs | 13 - samples/react/MusicStore/Startup.cs | 114 - .../react/MusicStore/Views/Home/Index.cshtml | 11 - .../MusicStore/Views/Shared/Error.cshtml | 6 - .../MusicStore/Views/Shared/_Layout.cshtml | 12 - .../MusicStore/Views/_ViewImports.cshtml | 3 - .../react/MusicStore/Views/_ViewStart.cshtml | 3 - samples/react/MusicStore/package.json | 52 - samples/react/MusicStore/tsconfig.json | 21 - samples/react/MusicStore/webpack.config.js | 32 - samples/react/MusicStore/wwwroot/favicon.ico | Bin 32038 -> 0 bytes .../wwwroot/images/home-showcase.png | Bin 254130 -> 0 bytes .../react/MusicStore/wwwroot/images/logo.png | Bin 2963 -> 0 bytes .../MusicStore/wwwroot/images/placeholder.png | Bin 1221 -> 0 bytes samples/react/MusicStore/wwwroot/web.config | 9 - samples/react/ReactGrid/.babelrc | 3 - samples/react/ReactGrid/.gitignore | 3 - .../ReactGrid/Controllers/HomeController.cs | 17 - .../Controllers/PeopleApiController.cs | 30 - samples/react/ReactGrid/README.txt | 2 - .../react/ReactGrid/ReactApp/boot-client.jsx | 8 - .../react/ReactGrid/ReactApp/boot-server.jsx | 23 - .../ReactApp/components/CustomPager.jsx | 50 - .../ReactApp/components/PeopleGrid.jsx | 31 - .../ReactApp/components/PersonEditor.jsx | 57 - .../ReactApp/components/ReactApp.jsx | 18 - .../ReactGrid/ReactApp/data/columnMeta.jsx | 60 - .../react/ReactGrid/ReactApp/data/fakeData.js | 2486 ----------------- samples/react/ReactGrid/ReactGrid.csproj | 25 - samples/react/ReactGrid/Startup.cs | 65 - .../react/ReactGrid/Views/Home/Index.cshtml | 6 - .../react/ReactGrid/Views/Shared/Error.cshtml | 6 - .../ReactGrid/Views/Shared/_Layout.cshtml | 14 - .../react/ReactGrid/Views/_ViewImports.cshtml | 3 - .../react/ReactGrid/Views/_ViewStart.cshtml | 3 - samples/react/ReactGrid/appsettings.json | 1 - samples/react/ReactGrid/jsconfig.json | 6 - samples/react/ReactGrid/package.json | 39 - samples/react/ReactGrid/webpack.config.js | 28 - samples/react/ReactGrid/wwwroot/favicon.ico | Bin 32038 -> 0 bytes samples/react/ReactGrid/wwwroot/web.config | 9 - .../.gitignore | 1 - ...icrosoft.AspNetCore.AngularServices.csproj | 20 - .../PrimeCacheHelper.cs | 81 - .../.gitignore | 1 - .../Microsoft.AspNetCore.ReactServices.csproj | 20 - .../WebApplicationBasic/ClientApp/App.ts | 5 - .../ClientApp/css/site.css | 24 - .../Controllers/HomeController.cs | 35 - templates/WebApplicationBasic/Program.cs | 31 - templates/WebApplicationBasic/Startup.cs | 59 - .../Views/Home/About.cshtml | 7 - .../Views/Home/Contact.cshtml | 17 - .../Views/Home/Index.cshtml | 114 - .../Views/Shared/Error.cshtml | 6 - .../Views/Shared/_Layout.cshtml | 43 - .../Views/_ViewImports.cshtml | 2 - .../Views/_ViewStart.cshtml | 3 - .../WebApplicationBasic.csproj | 36 - .../WebApplicationBasic/appsettings.json | 10 - templates/WebApplicationBasic/global.json | 3 - templates/WebApplicationBasic/package.json | 18 - .../WebApplicationBasic/template_gitignore | 236 -- templates/WebApplicationBasic/tsconfig.json | 13 - templates/WebApplicationBasic/web.config | 14 - .../WebApplicationBasic/webpack.config.dev.js | 12 - .../WebApplicationBasic/webpack.config.js | 35 - .../webpack.config.prod.js | 8 - .../webpack.config.vendor.js | 36 - .../WebApplicationBasic/wwwroot/favicon.ico | Bin 32038 -> 0 bytes .../wwwroot/images/ASP-NET-Banners-01.png | Bin 8314 -> 0 bytes .../wwwroot/images/ASP-NET-Banners-02.png | Bin 8616 -> 0 bytes .../wwwroot/images/Banner-01-Azure.png | Bin 14436 -> 0 bytes .../wwwroot/images/Banner-02-VS.png | Bin 12388 -> 0 bytes 182 files changed, 1 insertion(+), 10688 deletions(-) delete mode 100644 samples/angular/MusicStore/.gitignore delete mode 100644 samples/angular/MusicStore/Apis/AlbumsApiController.cs delete mode 100644 samples/angular/MusicStore/Apis/ArtistsApiController.cs delete mode 100644 samples/angular/MusicStore/Apis/GenresApiController.cs delete mode 100644 samples/angular/MusicStore/Apis/Models/AccountViewModels.cs delete mode 100644 samples/angular/MusicStore/Apis/Models/Album.cs delete mode 100644 samples/angular/MusicStore/Apis/Models/Artist.cs delete mode 100644 samples/angular/MusicStore/Apis/Models/CartItem.cs delete mode 100644 samples/angular/MusicStore/Apis/Models/Genre.cs delete mode 100644 samples/angular/MusicStore/Apis/Models/MusicStoreContext.cs delete mode 100644 samples/angular/MusicStore/Apis/Models/Order.cs delete mode 100644 samples/angular/MusicStore/Apis/Models/OrderDetail.cs delete mode 100644 samples/angular/MusicStore/Apis/Models/SampleData.cs delete mode 100644 samples/angular/MusicStore/Apis/Models/SentimentAnalysis.cs delete mode 100644 samples/angular/MusicStore/Apis/Models/ShoppingCart.cs delete mode 100755 samples/angular/MusicStore/Controllers/HomeController.cs delete mode 100644 samples/angular/MusicStore/Infrastructure/NoCacheAttribute.cs delete mode 100644 samples/angular/MusicStore/Infrastructure/PagedList.cs delete mode 100644 samples/angular/MusicStore/Infrastructure/SortDirection.cs delete mode 100644 samples/angular/MusicStore/Infrastructure/SortExpression.cs delete mode 100644 samples/angular/MusicStore/MusicStore.csproj delete mode 100755 samples/angular/MusicStore/Startup.cs delete mode 100755 samples/angular/MusicStore/Views/Home/Index.cshtml delete mode 100755 samples/angular/MusicStore/Views/Shared/Error.cshtml delete mode 100755 samples/angular/MusicStore/Views/Shared/_Layout.cshtml delete mode 100755 samples/angular/MusicStore/Views/_ViewImports.cshtml delete mode 100755 samples/angular/MusicStore/Views/_ViewStart.cshtml delete mode 100755 samples/angular/MusicStore/gulpfile.js delete mode 100644 samples/angular/MusicStore/package.json delete mode 100644 samples/angular/MusicStore/tsconfig.json delete mode 100644 samples/angular/MusicStore/tsd.json delete mode 100644 samples/angular/MusicStore/typings/es6-shim/es6-shim.d.ts delete mode 100644 samples/angular/MusicStore/typings/tsd.d.ts delete mode 100644 samples/angular/MusicStore/typings/url-workaround.d.ts delete mode 100644 samples/angular/MusicStore/wwwroot/css/site.css delete mode 100644 samples/angular/MusicStore/wwwroot/css/styles.less delete mode 100644 samples/angular/MusicStore/wwwroot/images/home-showcase.png delete mode 100644 samples/angular/MusicStore/wwwroot/images/logo.png delete mode 100644 samples/angular/MusicStore/wwwroot/images/placeholder.png delete mode 100644 samples/angular/MusicStore/wwwroot/ng-app/boot-client.ts delete mode 100644 samples/angular/MusicStore/wwwroot/ng-app/boot-server.ts delete mode 100644 samples/angular/MusicStore/wwwroot/ng-app/components/admin/admin-home/admin-home.html delete mode 100644 samples/angular/MusicStore/wwwroot/ng-app/components/admin/admin-home/admin-home.ts delete mode 100644 samples/angular/MusicStore/wwwroot/ng-app/components/admin/album-delete-prompt/album-delete-prompt.html delete mode 100644 samples/angular/MusicStore/wwwroot/ng-app/components/admin/album-delete-prompt/album-delete-prompt.ts delete mode 100644 samples/angular/MusicStore/wwwroot/ng-app/components/admin/album-details/album-details.html delete mode 100644 samples/angular/MusicStore/wwwroot/ng-app/components/admin/album-details/album-details.ts delete mode 100644 samples/angular/MusicStore/wwwroot/ng-app/components/admin/album-edit/album-edit.html delete mode 100644 samples/angular/MusicStore/wwwroot/ng-app/components/admin/album-edit/album-edit.ts delete mode 100644 samples/angular/MusicStore/wwwroot/ng-app/components/admin/albums-list/albums-list.html delete mode 100644 samples/angular/MusicStore/wwwroot/ng-app/components/admin/albums-list/albums-list.ts delete mode 100644 samples/angular/MusicStore/wwwroot/ng-app/components/admin/form-field/form-field.html delete mode 100644 samples/angular/MusicStore/wwwroot/ng-app/components/admin/form-field/form-field.ts delete mode 100644 samples/angular/MusicStore/wwwroot/ng-app/components/app/app.css delete mode 100644 samples/angular/MusicStore/wwwroot/ng-app/components/app/app.html delete mode 100644 samples/angular/MusicStore/wwwroot/ng-app/components/app/app.ts delete mode 100644 samples/angular/MusicStore/wwwroot/ng-app/components/public/album-details/album-details.html delete mode 100644 samples/angular/MusicStore/wwwroot/ng-app/components/public/album-details/album-details.ts delete mode 100644 samples/angular/MusicStore/wwwroot/ng-app/components/public/album-tile/album-tile.html delete mode 100644 samples/angular/MusicStore/wwwroot/ng-app/components/public/album-tile/album-tile.ts delete mode 100644 samples/angular/MusicStore/wwwroot/ng-app/components/public/genre-contents/genre-contents.html delete mode 100644 samples/angular/MusicStore/wwwroot/ng-app/components/public/genre-contents/genre-contents.ts delete mode 100644 samples/angular/MusicStore/wwwroot/ng-app/components/public/genres-list/genres-list.html delete mode 100644 samples/angular/MusicStore/wwwroot/ng-app/components/public/genres-list/genres-list.ts delete mode 100644 samples/angular/MusicStore/wwwroot/ng-app/components/public/home/home.html delete mode 100644 samples/angular/MusicStore/wwwroot/ng-app/components/public/home/home.ts delete mode 100644 samples/angular/MusicStore/wwwroot/ng-app/models/models.ts delete mode 100644 samples/angular/MusicStore/wwwroot/system.config.js delete mode 100644 samples/angular/MusicStore/wwwroot/web.config delete mode 100644 samples/react/MusicStore/.babelrc delete mode 100644 samples/react/MusicStore/.gitignore delete mode 100644 samples/react/MusicStore/Apis/AlbumsApiController.cs delete mode 100644 samples/react/MusicStore/Apis/ArtistsApiController.cs delete mode 100644 samples/react/MusicStore/Apis/GenresApiController.cs delete mode 100644 samples/react/MusicStore/Apis/Models/AccountViewModels.cs delete mode 100644 samples/react/MusicStore/Apis/Models/Album.cs delete mode 100644 samples/react/MusicStore/Apis/Models/Artist.cs delete mode 100644 samples/react/MusicStore/Apis/Models/CartItem.cs delete mode 100644 samples/react/MusicStore/Apis/Models/Genre.cs delete mode 100644 samples/react/MusicStore/Apis/Models/MusicStoreContext.cs delete mode 100644 samples/react/MusicStore/Apis/Models/Order.cs delete mode 100644 samples/react/MusicStore/Apis/Models/OrderDetail.cs delete mode 100644 samples/react/MusicStore/Apis/Models/SampleData.cs delete mode 100644 samples/react/MusicStore/Apis/Models/ShoppingCart.cs delete mode 100755 samples/react/MusicStore/Controllers/HomeController.cs delete mode 100644 samples/react/MusicStore/Infrastructure/NoCacheAttribute.cs delete mode 100644 samples/react/MusicStore/Infrastructure/PagedList.cs delete mode 100644 samples/react/MusicStore/Infrastructure/SortDirection.cs delete mode 100644 samples/react/MusicStore/Infrastructure/SortExpression.cs delete mode 100644 samples/react/MusicStore/MusicStore.csproj delete mode 100644 samples/react/MusicStore/Properties/launchSettings.json delete mode 100644 samples/react/MusicStore/ReactApp/boot-server.tsx delete mode 100644 samples/react/MusicStore/ReactApp/boot.tsx delete mode 100644 samples/react/MusicStore/ReactApp/components/NavMenu.tsx delete mode 100644 samples/react/MusicStore/ReactApp/components/public/AlbumDetails.tsx delete mode 100644 samples/react/MusicStore/ReactApp/components/public/AlbumTile.tsx delete mode 100644 samples/react/MusicStore/ReactApp/components/public/GenreDetails.tsx delete mode 100644 samples/react/MusicStore/ReactApp/components/public/Genres.tsx delete mode 100644 samples/react/MusicStore/ReactApp/components/public/Home.tsx delete mode 100644 samples/react/MusicStore/ReactApp/configureStore.ts delete mode 100644 samples/react/MusicStore/ReactApp/routes.tsx delete mode 100644 samples/react/MusicStore/ReactApp/store/AlbumDetails.ts delete mode 100644 samples/react/MusicStore/ReactApp/store/FeaturedAlbums.ts delete mode 100644 samples/react/MusicStore/ReactApp/store/GenreDetails.ts delete mode 100644 samples/react/MusicStore/ReactApp/store/GenreList.ts delete mode 100644 samples/react/MusicStore/ReactApp/store/index.ts delete mode 100644 samples/react/MusicStore/ReactApp/styles/styles.css delete mode 100644 samples/react/MusicStore/SiteSettings.cs delete mode 100755 samples/react/MusicStore/Startup.cs delete mode 100755 samples/react/MusicStore/Views/Home/Index.cshtml delete mode 100755 samples/react/MusicStore/Views/Shared/Error.cshtml delete mode 100755 samples/react/MusicStore/Views/Shared/_Layout.cshtml delete mode 100755 samples/react/MusicStore/Views/_ViewImports.cshtml delete mode 100755 samples/react/MusicStore/Views/_ViewStart.cshtml delete mode 100644 samples/react/MusicStore/package.json delete mode 100644 samples/react/MusicStore/tsconfig.json delete mode 100644 samples/react/MusicStore/webpack.config.js delete mode 100755 samples/react/MusicStore/wwwroot/favicon.ico delete mode 100644 samples/react/MusicStore/wwwroot/images/home-showcase.png delete mode 100644 samples/react/MusicStore/wwwroot/images/logo.png delete mode 100644 samples/react/MusicStore/wwwroot/images/placeholder.png delete mode 100644 samples/react/MusicStore/wwwroot/web.config delete mode 100644 samples/react/ReactGrid/.babelrc delete mode 100644 samples/react/ReactGrid/.gitignore delete mode 100755 samples/react/ReactGrid/Controllers/HomeController.cs delete mode 100644 samples/react/ReactGrid/Controllers/PeopleApiController.cs delete mode 100644 samples/react/ReactGrid/README.txt delete mode 100644 samples/react/ReactGrid/ReactApp/boot-client.jsx delete mode 100644 samples/react/ReactGrid/ReactApp/boot-server.jsx delete mode 100644 samples/react/ReactGrid/ReactApp/components/CustomPager.jsx delete mode 100644 samples/react/ReactGrid/ReactApp/components/PeopleGrid.jsx delete mode 100644 samples/react/ReactGrid/ReactApp/components/PersonEditor.jsx delete mode 100644 samples/react/ReactGrid/ReactApp/components/ReactApp.jsx delete mode 100644 samples/react/ReactGrid/ReactApp/data/columnMeta.jsx delete mode 100644 samples/react/ReactGrid/ReactApp/data/fakeData.js delete mode 100644 samples/react/ReactGrid/ReactGrid.csproj delete mode 100755 samples/react/ReactGrid/Startup.cs delete mode 100755 samples/react/ReactGrid/Views/Home/Index.cshtml delete mode 100755 samples/react/ReactGrid/Views/Shared/Error.cshtml delete mode 100755 samples/react/ReactGrid/Views/Shared/_Layout.cshtml delete mode 100755 samples/react/ReactGrid/Views/_ViewImports.cshtml delete mode 100755 samples/react/ReactGrid/Views/_ViewStart.cshtml delete mode 100755 samples/react/ReactGrid/appsettings.json delete mode 100644 samples/react/ReactGrid/jsconfig.json delete mode 100644 samples/react/ReactGrid/package.json delete mode 100644 samples/react/ReactGrid/webpack.config.js delete mode 100755 samples/react/ReactGrid/wwwroot/favicon.ico delete mode 100644 samples/react/ReactGrid/wwwroot/web.config delete mode 100644 src/Microsoft.AspNetCore.AngularServices/.gitignore delete mode 100644 src/Microsoft.AspNetCore.AngularServices/Microsoft.AspNetCore.AngularServices.csproj delete mode 100644 src/Microsoft.AspNetCore.AngularServices/PrimeCacheHelper.cs delete mode 100644 src/Microsoft.AspNetCore.ReactServices/.gitignore delete mode 100644 src/Microsoft.AspNetCore.ReactServices/Microsoft.AspNetCore.ReactServices.csproj delete mode 100644 templates/WebApplicationBasic/ClientApp/App.ts delete mode 100755 templates/WebApplicationBasic/ClientApp/css/site.css delete mode 100755 templates/WebApplicationBasic/Controllers/HomeController.cs delete mode 100644 templates/WebApplicationBasic/Program.cs delete mode 100755 templates/WebApplicationBasic/Startup.cs delete mode 100755 templates/WebApplicationBasic/Views/Home/About.cshtml delete mode 100755 templates/WebApplicationBasic/Views/Home/Contact.cshtml delete mode 100755 templates/WebApplicationBasic/Views/Home/Index.cshtml delete mode 100755 templates/WebApplicationBasic/Views/Shared/Error.cshtml delete mode 100755 templates/WebApplicationBasic/Views/Shared/_Layout.cshtml delete mode 100755 templates/WebApplicationBasic/Views/_ViewImports.cshtml delete mode 100755 templates/WebApplicationBasic/Views/_ViewStart.cshtml delete mode 100644 templates/WebApplicationBasic/WebApplicationBasic.csproj delete mode 100755 templates/WebApplicationBasic/appsettings.json delete mode 100644 templates/WebApplicationBasic/global.json delete mode 100644 templates/WebApplicationBasic/package.json delete mode 100644 templates/WebApplicationBasic/template_gitignore delete mode 100644 templates/WebApplicationBasic/tsconfig.json delete mode 100644 templates/WebApplicationBasic/web.config delete mode 100644 templates/WebApplicationBasic/webpack.config.dev.js delete mode 100644 templates/WebApplicationBasic/webpack.config.js delete mode 100644 templates/WebApplicationBasic/webpack.config.prod.js delete mode 100644 templates/WebApplicationBasic/webpack.config.vendor.js delete mode 100755 templates/WebApplicationBasic/wwwroot/favicon.ico delete mode 100755 templates/WebApplicationBasic/wwwroot/images/ASP-NET-Banners-01.png delete mode 100755 templates/WebApplicationBasic/wwwroot/images/ASP-NET-Banners-02.png delete mode 100755 templates/WebApplicationBasic/wwwroot/images/Banner-01-Azure.png delete mode 100755 templates/WebApplicationBasic/wwwroot/images/Banner-02-VS.png diff --git a/JavaScriptServices.sln b/JavaScriptServices.sln index a560cb20..e401470b 100644 --- a/JavaScriptServices.sln +++ b/JavaScriptServices.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26228.4 +VisualStudioVersion = 15.0.26430.4 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{27304DDE-AFB2-4F8B-B765-E3E2F11E886C}" EndProject @@ -11,10 +11,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.NodeSe EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.SpaServices", "src\Microsoft.AspNetCore.SpaServices\Microsoft.AspNetCore.SpaServices.csproj", "{66B071A8-EFC8-4A06-BEF6-06B99AE27EEC}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.AngularServices", "src\Microsoft.AspNetCore.AngularServices\Microsoft.AspNetCore.AngularServices.csproj", "{58AAABB6-9D21-42F6-BC97-3DD282B55FD6}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ReactServices", "src\Microsoft.AspNetCore.ReactServices\Microsoft.AspNetCore.ReactServices.csproj", "{F1081B9A-8D67-4A5E-80C6-615F9A975D4F}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{99EAF1FE-22C8-4526-BE78-74B24125D37F}" ProjectSection(SolutionItems) = preProject .gitignore = .gitignore @@ -32,16 +28,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Webpack", "samples\misc\Web EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NodeServicesExamples", "samples\misc\NodeServicesExamples\NodeServicesExamples.csproj", "{93EFCC5F-C6EE-4623-894F-A42B22C0B6FE}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "angular", "angular", "{B54435EB-D5E8-4CEC-A02E-DDCB0C750E34}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MusicStore", "samples\angular\MusicStore\MusicStore.csproj", "{63FC66E7-559B-4426-93E1-2D951EFC8293}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "react", "react", "{BD77E73E-13BC-4550-99DA-51869BD8DFC4}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactGrid", "samples\react\ReactGrid\ReactGrid.csproj", "{3B023106-88DB-4C3A-B01F-C1AECB02D80B}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MusicStore", "samples\react\MusicStore\MusicStore.csproj", "{6E898586-79CA-4AA8-946E-943B3682F376}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "templates", "templates", "{1598B415-73F1-4B37-B3B4-0A10677ABB2D}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KnockoutSpa", "templates\KnockoutSpa\KnockoutSpa.csproj", "{F60248B1-940E-43FB-BEA0-589362AA6320}" @@ -54,8 +40,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactSpa", "templates\React EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactReduxSpa", "templates\ReactReduxSpa\ReactReduxSpa.csproj", "{9D4D15A1-A25B-44EC-AB63-F1CE9986712E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebApplicationBasic", "templates\WebApplicationBasic\WebApplicationBasic.csproj", "{86911E07-C733-4C18-B49F-9A007A651246}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{E415FE14-13B0-469F-836D-95059E6BAA6E}" ProjectSection(SolutionItems) = preProject src\build\common.props = src\build\common.props @@ -82,14 +66,6 @@ Global {66B071A8-EFC8-4A06-BEF6-06B99AE27EEC}.Debug|Any CPU.Build.0 = Debug|Any CPU {66B071A8-EFC8-4A06-BEF6-06B99AE27EEC}.Release|Any CPU.ActiveCfg = Release|Any CPU {66B071A8-EFC8-4A06-BEF6-06B99AE27EEC}.Release|Any CPU.Build.0 = Release|Any CPU - {58AAABB6-9D21-42F6-BC97-3DD282B55FD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {58AAABB6-9D21-42F6-BC97-3DD282B55FD6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {58AAABB6-9D21-42F6-BC97-3DD282B55FD6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {58AAABB6-9D21-42F6-BC97-3DD282B55FD6}.Release|Any CPU.Build.0 = Release|Any CPU - {F1081B9A-8D67-4A5E-80C6-615F9A975D4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F1081B9A-8D67-4A5E-80C6-615F9A975D4F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F1081B9A-8D67-4A5E-80C6-615F9A975D4F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F1081B9A-8D67-4A5E-80C6-615F9A975D4F}.Release|Any CPU.Build.0 = Release|Any CPU {1931B19A-EC42-4D56-B2D0-FB06D17244DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1931B19A-EC42-4D56-B2D0-FB06D17244DA}.Debug|Any CPU.Build.0 = Debug|Any CPU {1931B19A-EC42-4D56-B2D0-FB06D17244DA}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -102,18 +78,6 @@ Global {93EFCC5F-C6EE-4623-894F-A42B22C0B6FE}.Debug|Any CPU.Build.0 = Debug|Any CPU {93EFCC5F-C6EE-4623-894F-A42B22C0B6FE}.Release|Any CPU.ActiveCfg = Release|Any CPU {93EFCC5F-C6EE-4623-894F-A42B22C0B6FE}.Release|Any CPU.Build.0 = Release|Any CPU - {63FC66E7-559B-4426-93E1-2D951EFC8293}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {63FC66E7-559B-4426-93E1-2D951EFC8293}.Debug|Any CPU.Build.0 = Debug|Any CPU - {63FC66E7-559B-4426-93E1-2D951EFC8293}.Release|Any CPU.ActiveCfg = Release|Any CPU - {63FC66E7-559B-4426-93E1-2D951EFC8293}.Release|Any CPU.Build.0 = Release|Any CPU - {3B023106-88DB-4C3A-B01F-C1AECB02D80B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3B023106-88DB-4C3A-B01F-C1AECB02D80B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3B023106-88DB-4C3A-B01F-C1AECB02D80B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3B023106-88DB-4C3A-B01F-C1AECB02D80B}.Release|Any CPU.Build.0 = Release|Any CPU - {6E898586-79CA-4AA8-946E-943B3682F376}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6E898586-79CA-4AA8-946E-943B3682F376}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6E898586-79CA-4AA8-946E-943B3682F376}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6E898586-79CA-4AA8-946E-943B3682F376}.Release|Any CPU.Build.0 = Release|Any CPU {F60248B1-940E-43FB-BEA0-589362AA6320}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F60248B1-940E-43FB-BEA0-589362AA6320}.Debug|Any CPU.Build.0 = Debug|Any CPU {F60248B1-940E-43FB-BEA0-589362AA6320}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -134,10 +98,6 @@ Global {9D4D15A1-A25B-44EC-AB63-F1CE9986712E}.Debug|Any CPU.Build.0 = Debug|Any CPU {9D4D15A1-A25B-44EC-AB63-F1CE9986712E}.Release|Any CPU.ActiveCfg = Release|Any CPU {9D4D15A1-A25B-44EC-AB63-F1CE9986712E}.Release|Any CPU.Build.0 = Release|Any CPU - {86911E07-C733-4C18-B49F-9A007A651246}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {86911E07-C733-4C18-B49F-9A007A651246}.Debug|Any CPU.Build.0 = Debug|Any CPU - {86911E07-C733-4C18-B49F-9A007A651246}.Release|Any CPU.ActiveCfg = Release|Any CPU - {86911E07-C733-4C18-B49F-9A007A651246}.Release|Any CPU.Build.0 = Release|Any CPU {49D7665A-20EC-43FC-B8E8-EA0204F2D8C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {49D7665A-20EC-43FC-B8E8-EA0204F2D8C3}.Debug|Any CPU.Build.0 = Debug|Any CPU {49D7665A-20EC-43FC-B8E8-EA0204F2D8C3}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -150,24 +110,15 @@ Global {66B77203-1469-41DF-92F2-2BE6900BD36F} = {27304DDE-AFB2-4F8B-B765-E3E2F11E886C} {F46DEF99-6FAA-4406-B5D8-6FF34EF669E3} = {27304DDE-AFB2-4F8B-B765-E3E2F11E886C} {66B071A8-EFC8-4A06-BEF6-06B99AE27EEC} = {27304DDE-AFB2-4F8B-B765-E3E2F11E886C} - {58AAABB6-9D21-42F6-BC97-3DD282B55FD6} = {27304DDE-AFB2-4F8B-B765-E3E2F11E886C} - {F1081B9A-8D67-4A5E-80C6-615F9A975D4F} = {27304DDE-AFB2-4F8B-B765-E3E2F11E886C} {E6A161EA-646C-4033-9090-95BE809AB8D9} = {23836492-E7F4-4376-85BF-A635C304AC46} {1931B19A-EC42-4D56-B2D0-FB06D17244DA} = {E6A161EA-646C-4033-9090-95BE809AB8D9} {DE479DC3-1461-4EAD-A188-4AF7AA4AE344} = {E6A161EA-646C-4033-9090-95BE809AB8D9} {93EFCC5F-C6EE-4623-894F-A42B22C0B6FE} = {E6A161EA-646C-4033-9090-95BE809AB8D9} - {B54435EB-D5E8-4CEC-A02E-DDCB0C750E34} = {23836492-E7F4-4376-85BF-A635C304AC46} - {63FC66E7-559B-4426-93E1-2D951EFC8293} = {B54435EB-D5E8-4CEC-A02E-DDCB0C750E34} - {BD77E73E-13BC-4550-99DA-51869BD8DFC4} = {23836492-E7F4-4376-85BF-A635C304AC46} - {3B023106-88DB-4C3A-B01F-C1AECB02D80B} = {BD77E73E-13BC-4550-99DA-51869BD8DFC4} - {6E898586-79CA-4AA8-946E-943B3682F376} = {BD77E73E-13BC-4550-99DA-51869BD8DFC4} {F60248B1-940E-43FB-BEA0-589362AA6320} = {1598B415-73F1-4B37-B3B4-0A10677ABB2D} {4D4B84C9-13F7-40CA-B05A-DC98FD6019AC} = {1598B415-73F1-4B37-B3B4-0A10677ABB2D} {4D57B6E1-7141-48ED-959E-872BDD4A2F72} = {1598B415-73F1-4B37-B3B4-0A10677ABB2D} {868A630E-C61B-4807-B7A8-7EB53BE1C28A} = {1598B415-73F1-4B37-B3B4-0A10677ABB2D} {9D4D15A1-A25B-44EC-AB63-F1CE9986712E} = {1598B415-73F1-4B37-B3B4-0A10677ABB2D} - {86911E07-C733-4C18-B49F-9A007A651246} = {1598B415-73F1-4B37-B3B4-0A10677ABB2D} - {E415FE14-13B0-469F-836D-95059E6BAA6E} = {27304DDE-AFB2-4F8B-B765-E3E2F11E886C} {49D7665A-20EC-43FC-B8E8-EA0204F2D8C3} = {1598B415-73F1-4B37-B3B4-0A10677ABB2D} EndGlobalSection EndGlobal diff --git a/samples/angular/MusicStore/.gitignore b/samples/angular/MusicStore/.gitignore deleted file mode 100644 index a31c74a1..00000000 --- a/samples/angular/MusicStore/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -/node_modules/ -/wwwroot/lib/ -/wwwroot/ng-app/**/*.js -/music-db.sqlite -/Properties/launchSettings.json - -# Obviously you don't really want your DB to go in wwwroot, but due to https://github.com/aspnet/Microsoft.Data.Sqlite/issues/188 -# it currently does when run from IIS Express. Will resolve this once RC2 is out, which is supposed to eliminate the inconsistency. -/wwwroot/music-db.sqlite diff --git a/samples/angular/MusicStore/Apis/AlbumsApiController.cs b/samples/angular/MusicStore/Apis/AlbumsApiController.cs deleted file mode 100644 index 3b98a1eb..00000000 --- a/samples/angular/MusicStore/Apis/AlbumsApiController.cs +++ /dev/null @@ -1,216 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; -using Microsoft.EntityFrameworkCore; -using AutoMapper; -using MusicStore.Models; -using MusicStore.Infrastructure; - -namespace MusicStore.Apis -{ - [Route("api/albums")] - public class AlbumsApiController : Controller - { - private readonly MusicStoreContext _storeContext; - - public AlbumsApiController(MusicStoreContext storeContext) - { - _storeContext = storeContext; - } - - [HttpGet] - [NoCache] - public async Task Paged(int page = 1, int pageSize = 50, string sortBy = null) - { - await _storeContext.Genres.LoadAsync(); - await _storeContext.Artists.LoadAsync(); - - var albums = await _storeContext.Albums - .Include(a => a.Genre) - .Include(a => a.Artist) - .ToPagedListAsync(page, pageSize, sortBy, - a => a.Title, // sortExpression - SortDirection.Ascending, // defaultSortDirection - a => Mapper.Map(a, new AlbumResultDto())); // selector - - return Json(albums); - } - - [HttpGet("all")] - [NoCache] - public async Task All() - { - var albums = await _storeContext.Albums - .Include(a => a.Genre) - .Include(a => a.Artist) - .OrderBy(a => a.Title) - .ToListAsync(); - - return Json(albums.Select(a => Mapper.Map(a, new AlbumResultDto()))); - } - - [HttpGet("mostPopular")] - [NoCache] - public async Task MostPopular(int count = 6) - { - count = count > 0 && count < 20 ? count : 6; - var albums = await _storeContext.Albums - .OrderByDescending(a => a.OrderDetails.Count()) - .Take(count) - .ToListAsync(); - - // TODO: Move the .Select() to end of albums query when EF supports it - return Json(albums.Select(a => Mapper.Map(a, new AlbumResultDto()))); - } - - [HttpGet("{albumId:int}")] - [NoCache] - public async Task Details(int albumId) - { - await _storeContext.Genres.LoadAsync(); - await _storeContext.Artists.LoadAsync(); - - var album = await _storeContext.Albums - .Include(a => a.Artist) - .Include(a => a.Genre) - .Where(a => a.AlbumId == albumId) - .SingleOrDefaultAsync(); - - var albumResult = Mapper.Map(album, new AlbumResultDto()); - - // TODO: Add null checking and return 404 in that case - - return Json(albumResult); - } - - [HttpPost] - [Authorize("app-ManageStore")] - public async Task CreateAlbum([FromBody]AlbumChangeDto album) - { - if (!ModelState.IsValid) - { - // Return the model errors - return BadRequest(ModelState); - } - - // Save the changes to the DB - var dbAlbum = new Album(); - _storeContext.Albums.Add(Mapper.Map(album, dbAlbum)); - await _storeContext.SaveChangesAsync(); - - // TODO: Handle missing record, key violations, concurrency issues, etc. - - return new ObjectResult(new { - Data = dbAlbum.AlbumId, - Message = "Album created successfully." - }); - } - - [HttpPut("{albumId:int}/update")] - public async Task UpdateAlbum(int albumId, [FromBody] AlbumChangeDto album) - { - if (!ModelState.IsValid) - { - // Return the model errors - return BadRequest(ModelState); - } - - var dbAlbum = await _storeContext.Albums.SingleOrDefaultAsync(a => a.AlbumId == albumId); - - if (dbAlbum == null) - { - return new ObjectResult(new { - Message = string.Format("The album with ID {0} was not found.", albumId) - }) { StatusCode = 404 }; - } - - // Save the changes to the DB - Mapper.Map(album, dbAlbum); - await _storeContext.SaveChangesAsync(); - - // TODO: Handle missing record, key violations, concurrency issues, etc. - - return new ObjectResult (new { - Message = "Album updated successfully." - }); - } - - [HttpDelete("{albumId:int}")] - [Authorize("app-ManageStore")] - public async Task DeleteAlbum(int albumId) - { - var album = await _storeContext.Albums.SingleOrDefaultAsync(a => a.AlbumId == albumId); - - if (album != null) - { - _storeContext.Albums.Remove(album); - - // Save the changes to the DB - await _storeContext.SaveChangesAsync(); - - // TODO: Handle missing record, key violations, concurrency issues, etc. - } - - return new ObjectResult (new { - Message = "Album deleted successfully." - }); - } - } - - [ModelMetadataType(typeof(Album))] - public class AlbumChangeDto : IValidatableObject - { - public int GenreId { get; set; } - - public int ArtistId { get; set; } - - public string Title { get; set; } - - public decimal Price { get; set; } - - public string AlbumArtUrl { get; set; } - - public IEnumerable Validate(ValidationContext validationContext) - { - // An example of object-level (i.e., multi-property) validation - if (this.GenreId == 13 /* Indie */) { - switch (SentimentAnalysis.GetSentiment(Title)) { - case SentimentAnalysis.SentimentResult.Positive: - yield return new ValidationResult("Sounds too positive. Indie music requires more ambiguity."); - break; - case SentimentAnalysis.SentimentResult.Negative: - yield return new ValidationResult("Sounds too negative. Indie music requires more ambiguity."); - break; - } - } - } - } - - public class AlbumResultDto : AlbumChangeDto - { - public AlbumResultDto() - { - Artist = new ArtistResultDto(); - Genre = new GenreResultDto(); - } - - public int AlbumId { get; set; } - - public ArtistResultDto Artist { get; private set; } - - public GenreResultDto Genre { get; private set; } - } - - public class ArtistResultDto - { - public string Name { get; set; } - } - - public class GenreResultDto - { - public string Name { get; set; } - } -} diff --git a/samples/angular/MusicStore/Apis/ArtistsApiController.cs b/samples/angular/MusicStore/Apis/ArtistsApiController.cs deleted file mode 100644 index f3568aeb..00000000 --- a/samples/angular/MusicStore/Apis/ArtistsApiController.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Mvc; -using Microsoft.EntityFrameworkCore; -using MusicStore.Models; - -namespace MusicStore.Apis -{ - [Route("api/artists")] - public class ArtistsApiController : Controller - { - private readonly MusicStoreContext _storeContext; - - public ArtistsApiController(MusicStoreContext storeContext) - { - _storeContext = storeContext; - } - - [HttpGet("lookup")] - public async Task Lookup() - { - var artists = await _storeContext.Artists - .OrderBy(a => a.Name) - .ToListAsync(); - - return Json(artists); - } - } -} diff --git a/samples/angular/MusicStore/Apis/GenresApiController.cs b/samples/angular/MusicStore/Apis/GenresApiController.cs deleted file mode 100644 index 338ca2fc..00000000 --- a/samples/angular/MusicStore/Apis/GenresApiController.cs +++ /dev/null @@ -1,70 +0,0 @@ -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Mvc; -using Microsoft.EntityFrameworkCore; -using MusicStore.Models; -using MusicStore.Infrastructure; - -namespace MusicStore.Apis -{ - [Route("api/genres")] - public class GenresApiController : Controller - { - private readonly MusicStoreContext _storeContext; - - public GenresApiController(MusicStoreContext storeContext) - { - _storeContext = storeContext; - } - - [HttpGet] - public async Task GenreList() - { - var genres = await _storeContext.Genres - //.Include(g => g.Albums) - .OrderBy(g => g.Name) - .ToListAsync(); - - return Json(genres); - } - - [HttpGet("genre-lookup")] - public async Task Lookup() - { - var genres = await _storeContext.Genres - .Select(g => new { g.GenreId, g.Name }) - .ToListAsync(); - - return Json(genres); - } - - [HttpGet("menu")] - public async Task GenreMenuList(int count = 9) - { - count = count > 0 && count < 20 ? count : 9; - - var genres = await _storeContext.Genres - .OrderByDescending(g => - g.Albums.Sum(a => - a.OrderDetails.Sum(od => od.Quantity))) - .Take(count) - .ToListAsync(); - - return Json(genres); - } - - [HttpGet("{genreId:int}/albums")] - [NoCache] - public async Task GenreAlbums(int genreId) - { - var albums = await _storeContext.Albums - .Where(a => a.GenreId == genreId) - //.Include(a => a.Genre) - //.Include(a => a.Artist) - //.OrderBy(a => a.Genre.Name) - .ToListAsync(); - - return Json(albums); - } - } -} diff --git a/samples/angular/MusicStore/Apis/Models/AccountViewModels.cs b/samples/angular/MusicStore/Apis/Models/AccountViewModels.cs deleted file mode 100644 index 831978a5..00000000 --- a/samples/angular/MusicStore/Apis/Models/AccountViewModels.cs +++ /dev/null @@ -1,63 +0,0 @@ -using System.ComponentModel.DataAnnotations; - -namespace MusicStore.Models -{ - public class ExternalLoginConfirmationViewModel - { - [Required] - [Display(Name = "User name")] - public string UserName { get; set; } - } - - public class ManageUserViewModel - { - [Required] - [DataType(DataType.Password)] - [Display(Name = "Current password")] - public string OldPassword { get; set; } - - [Required] - [StringLength(100, ErrorMessage = "The {0} must be at least {2} characters long.", MinimumLength = 6)] - [DataType(DataType.Password)] - [Display(Name = "New password")] - public string NewPassword { get; set; } - - [DataType(DataType.Password)] - [Display(Name = "Confirm new password")] - [Compare("NewPassword", ErrorMessage = "The new password and confirmation password do not match.")] - public string ConfirmPassword { get; set; } - } - - public class LoginViewModel - { - [Required] - [Display(Name = "User name")] - public string UserName { get; set; } - - [Required] - [DataType(DataType.Password)] - [Display(Name = "Password")] - public string Password { get; set; } - - [Display(Name = "Remember me?")] - public bool RememberMe { get; set; } - } - - public class RegisterViewModel - { - [Required] - [Display(Name = "User name")] - public string UserName { get; set; } - - [Required] - [StringLength(100, ErrorMessage = "The {0} must be at least {2} characters long.", MinimumLength = 6)] - [DataType(DataType.Password)] - [Display(Name = "Password")] - public string Password { get; set; } - - [DataType(DataType.Password)] - [Display(Name = "Confirm password")] - [Compare("Password", ErrorMessage = "The password and confirmation password do not match.")] - public string ConfirmPassword { get; set; } - } -} diff --git a/samples/angular/MusicStore/Apis/Models/Album.cs b/samples/angular/MusicStore/Apis/Models/Album.cs deleted file mode 100644 index b4495f34..00000000 --- a/samples/angular/MusicStore/Apis/Models/Album.cs +++ /dev/null @@ -1,40 +0,0 @@ -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; - -namespace MusicStore.Models -{ - public class Album - { - public Album() - { - // TODO: Temporary hack to populate the orderdetails until EF does this automatically. - OrderDetails = new List(); - } - - [ScaffoldColumn(false)] - public int AlbumId { get; set; } - - public int GenreId { get; set; } - - public int ArtistId { get; set; } - - [Required] - [StringLength(160, MinimumLength = 2)] - public string Title { get; set; } - - [Required] - [RangeAttribute(typeof(decimal), "0.01", "100")] // Long-form constructor to work around https://github.com/dotnet/coreclr/issues/2172 - [DataType(DataType.Currency)] - public decimal Price { get; set; } - - [Display(Name = "Album Art URL")] - [StringLength(1024)] - public string AlbumArtUrl { get; set; } - - public virtual Genre Genre { get; set; } - - public virtual Artist Artist { get; set; } - - public virtual ICollection OrderDetails { get; set; } - } -} diff --git a/samples/angular/MusicStore/Apis/Models/Artist.cs b/samples/angular/MusicStore/Apis/Models/Artist.cs deleted file mode 100644 index b364a898..00000000 --- a/samples/angular/MusicStore/Apis/Models/Artist.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.ComponentModel.DataAnnotations; - -namespace MusicStore.Models -{ - public class Artist - { - public int ArtistId { get; set; } - - [Required] - public string Name { get; set; } - } -} diff --git a/samples/angular/MusicStore/Apis/Models/CartItem.cs b/samples/angular/MusicStore/Apis/Models/CartItem.cs deleted file mode 100644 index 7209462d..00000000 --- a/samples/angular/MusicStore/Apis/Models/CartItem.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using System.ComponentModel.DataAnnotations; - -namespace MusicStore.Models -{ - public class CartItem - { - [Key] - public int CartItemId { get; set; } - - [Required] - public string CartId { get; set; } - public int AlbumId { get; set; } - public int Count { get; set; } - - [DataType(DataType.DateTime)] - public DateTime DateCreated { get; set; } - - public virtual Album Album { get; set; } - } -} diff --git a/samples/angular/MusicStore/Apis/Models/Genre.cs b/samples/angular/MusicStore/Apis/Models/Genre.cs deleted file mode 100644 index eed5616c..00000000 --- a/samples/angular/MusicStore/Apis/Models/Genre.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using Newtonsoft.Json; - -namespace MusicStore.Models -{ - public class Genre - { - public Genre() - { - Albums = new List(); - } - - public int GenreId { get; set; } - - [Required] - public string Name { get; set; } - - public string Description { get; set; } - - [JsonIgnore] - public virtual ICollection Albums { get; set; } - } -} diff --git a/samples/angular/MusicStore/Apis/Models/MusicStoreContext.cs b/samples/angular/MusicStore/Apis/Models/MusicStoreContext.cs deleted file mode 100644 index aee7aedd..00000000 --- a/samples/angular/MusicStore/Apis/Models/MusicStoreContext.cs +++ /dev/null @@ -1,34 +0,0 @@ -using Microsoft.AspNetCore.Identity.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore; - -namespace MusicStore.Models -{ - public class ApplicationUser : IdentityUser { } - - public class MusicStoreContext : IdentityDbContext - { - public MusicStoreContext(DbContextOptions options) : base(options) - { - } - - public DbSet Albums { get; set; } - public DbSet Artists { get; set; } - public DbSet Orders { get; set; } - public DbSet Genres { get; set; } - public DbSet CartItems { get; set; } - public DbSet OrderDetails { get; set; } - - protected override void OnModelCreating(ModelBuilder builder) - { - // Configure pluralization - builder.Entity().ToTable("Albums"); - builder.Entity().ToTable("Artists"); - builder.Entity().ToTable("Orders"); - builder.Entity().ToTable("Genres"); - builder.Entity().ToTable("CartItems"); - builder.Entity().ToTable("OrderDetails"); - - base.OnModelCreating(builder); - } - } -} diff --git a/samples/angular/MusicStore/Apis/Models/Order.cs b/samples/angular/MusicStore/Apis/Models/Order.cs deleted file mode 100644 index 110a77d8..00000000 --- a/samples/angular/MusicStore/Apis/Models/Order.cs +++ /dev/null @@ -1,73 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; - -namespace MusicStore.Models -{ - //[Bind(Include = "FirstName,LastName,Address,City,State,PostalCode,Country,Phone,Email")] - public class Order - { - public Order() - { - OrderDetails = new List(); - } - - [ScaffoldColumn(false)] - public int OrderId { get; set; } - - [ScaffoldColumn(false)] - public DateTime OrderDate { get; set; } - - [Required] - [ScaffoldColumn(false)] - public string Username { get; set; } - - [Required] - [Display(Name = "First Name")] - [StringLength(160)] - public string FirstName { get; set; } - - [Required] - [Display(Name = "Last Name")] - [StringLength(160)] - public string LastName { get; set; } - - [Required] - [StringLength(70, MinimumLength = 3)] - public string Address { get; set; } - - [Required] - [StringLength(40)] - public string City { get; set; } - - [Required] - [StringLength(40)] - public string State { get; set; } - - [Required] - [Display(Name = "Postal Code")] - [StringLength(10, MinimumLength = 5)] - public string PostalCode { get; set; } - - [Required] - [StringLength(40)] - public string Country { get; set; } - - [Required] - [StringLength(24)] - [DataType(DataType.PhoneNumber)] - public string Phone { get; set; } - - [Required] - [Display(Name = "Email Address")] - [RegularExpression(@"[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,4}", - ErrorMessage = "Email is not valid.")] - [DataType(DataType.EmailAddress)] - public string Email { get; set; } - - [ScaffoldColumn(false)] - public decimal Total { get; set; } - - public ICollection OrderDetails { get; set; } - } -} diff --git a/samples/angular/MusicStore/Apis/Models/OrderDetail.cs b/samples/angular/MusicStore/Apis/Models/OrderDetail.cs deleted file mode 100644 index cb1e6930..00000000 --- a/samples/angular/MusicStore/Apis/Models/OrderDetail.cs +++ /dev/null @@ -1,14 +0,0 @@ -namespace MusicStore.Models -{ - public class OrderDetail - { - public int OrderDetailId { get; set; } - public int OrderId { get; set; } - public int AlbumId { get; set; } - public int Quantity { get; set; } - public decimal UnitPrice { get; set; } - - public virtual Album Album { get; set; } - public virtual Order Order { get; set; } - } -} diff --git a/samples/angular/MusicStore/Apis/Models/SampleData.cs b/samples/angular/MusicStore/Apis/Models/SampleData.cs deleted file mode 100644 index b1d98a7c..00000000 --- a/samples/angular/MusicStore/Apis/Models/SampleData.cs +++ /dev/null @@ -1,915 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Security.Claims; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Identity; -using Microsoft.AspNetCore.Identity.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Options; - -namespace MusicStore.Models -{ - public static class SampleData - { - const string imgUrl = "/images/placeholder.png"; - - public static async Task InitializeMusicStoreDatabaseAsync(IServiceProvider serviceProvider) - { - using (var db = serviceProvider.GetService()) - { - if (await db.Database.EnsureCreatedAsync()) - { - await InsertTestData(serviceProvider); - } - } - } - - private static async Task InsertTestData(IServiceProvider serviceProvider) - { - var albums = GetAlbums(imgUrl, Genres, Artists); - await AddOrUpdateAsync(serviceProvider, g => g.GenreId, Genres.Select(genre => genre.Value)); - await AddOrUpdateAsync(serviceProvider, a => a.ArtistId, Artists.Select(artist => artist.Value)); - await AddOrUpdateAsync(serviceProvider, a => a.AlbumId, albums); - } - - // TODO [EF] This may be replaced by a first class mechanism in EF - private static async Task AddOrUpdateAsync( - IServiceProvider serviceProvider, - Func propertyToMatch, IEnumerable entities) - where TEntity : class - { - // Query in a separate context so that we can attach existing entities as modified - List existingData; - - using (var scope = serviceProvider.GetRequiredService().CreateScope()) - using (var db = scope.ServiceProvider.GetService()) - { - existingData = db.Set().ToList(); - } - - using (var scope = serviceProvider.GetRequiredService().CreateScope()) - using (var db = scope.ServiceProvider.GetService()) - { - foreach (var item in entities) - { - db.Entry(item).State = existingData.Any(g => propertyToMatch(g).Equals(propertyToMatch(item))) - ? EntityState.Modified - : EntityState.Added; - } - - await db.SaveChangesAsync(); - } - } - - private static Album[] GetAlbums(string imgUrl, Dictionary genres, Dictionary artists) - { - var albums = new Album[] - { - new Album { Title = "The Best Of The Men At Work", Genre = genres["Pop"], Price = 8.99M, Artist = artists["Men At Work"], AlbumArtUrl = imgUrl }, - new Album { Title = "...And Justice For All", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Metallica"], AlbumArtUrl = imgUrl }, - new Album { Title = "עד גבול האור", Genre = genres["World"], Price = 8.99M, Artist = artists["אריק אינשטיין"], AlbumArtUrl = imgUrl }, - new Album { Title = "Black Light Syndrome", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Terry Bozzio, Tony Levin & Steve Stevens"], AlbumArtUrl = imgUrl }, - new Album { Title = "10,000 Days", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Tool"], AlbumArtUrl = imgUrl }, - new Album { Title = "11i", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["Supreme Beings of Leisure"], AlbumArtUrl = imgUrl }, - new Album { Title = "1960", Genre = genres["Indie"], Price = 8.99M, Artist = artists["Soul-Junk"], AlbumArtUrl = imgUrl }, - new Album { Title = "4x4=12 ", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["deadmau5"], AlbumArtUrl = imgUrl }, - new Album { Title = "A Copland Celebration, Vol. I", Genre = genres["Classical"], Price = 8.99M, Artist = artists["London Symphony Orchestra"], AlbumArtUrl = imgUrl }, - new Album { Title = "A Lively Mind", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["Paul Oakenfold"], AlbumArtUrl = imgUrl }, - new Album { Title = "A Matter of Life and Death", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Iron Maiden"], AlbumArtUrl = imgUrl }, - new Album { Title = "A Real Dead One", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Iron Maiden"], AlbumArtUrl = imgUrl }, - new Album { Title = "A Real Live One", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Iron Maiden"], AlbumArtUrl = imgUrl }, - new Album { Title = "A Rush of Blood to the Head", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Coldplay"], AlbumArtUrl = imgUrl }, - new Album { Title = "A Soprano Inspired", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Britten Sinfonia, Ivor Bolton & Lesley Garrett"], AlbumArtUrl = imgUrl }, - new Album { Title = "A Winter Symphony", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Sarah Brightman"], AlbumArtUrl = imgUrl }, - new Album { Title = "Abbey Road", Genre = genres["Rock"], Price = 8.99M, Artist = artists["The Beatles"], AlbumArtUrl = imgUrl }, - new Album { Title = "Ace Of Spades", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Motörhead"], AlbumArtUrl = imgUrl }, - new Album { Title = "Achtung Baby", Genre = genres["Rock"], Price = 8.99M, Artist = artists["U2"], AlbumArtUrl = imgUrl }, - new Album { Title = "Acústico MTV", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Os Paralamas Do Sucesso"], AlbumArtUrl = imgUrl }, - new Album { Title = "Adams, John: The Chairman Dances", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Edo de Waart & San Francisco Symphony"], AlbumArtUrl = imgUrl }, - new Album { Title = "Adrenaline", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Deftones"], AlbumArtUrl = imgUrl }, - new Album { Title = "Ænima", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Tool"], AlbumArtUrl = imgUrl }, - new Album { Title = "Afrociberdelia", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Chico Science & Nação Zumbi"], AlbumArtUrl = imgUrl }, - new Album { Title = "After the Goldrush", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Neil Young"], AlbumArtUrl = imgUrl }, - new Album { Title = "Airdrawn Dagger", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["Sasha"], AlbumArtUrl = imgUrl }, - new Album { Title = "Album Title Goes Here", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["deadmau5"], AlbumArtUrl = imgUrl }, - new Album { Title = "Alcohol Fueled Brewtality Live! [Disc 1]", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Black Label Society"], AlbumArtUrl = imgUrl }, - new Album { Title = "Alcohol Fueled Brewtality Live! [Disc 2]", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Black Label Society"], AlbumArtUrl = imgUrl }, - new Album { Title = "Alive 2007", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["Daft Punk"], AlbumArtUrl = imgUrl }, - new Album { Title = "All I Ask of You", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Sarah Brightman"], AlbumArtUrl = imgUrl }, - new Album { Title = "Amen (So Be It)", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Paddy Casey"], AlbumArtUrl = imgUrl }, - new Album { Title = "Animal Vehicle", Genre = genres["Pop"], Price = 8.99M, Artist = artists["The Axis of Awesome"], AlbumArtUrl = imgUrl }, - new Album { Title = "Ao Vivo [IMPORT]", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Zeca Pagodinho"], AlbumArtUrl = imgUrl }, - new Album { Title = "Apocalyptic Love", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Slash"], AlbumArtUrl = imgUrl }, - new Album { Title = "Appetite for Destruction", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Guns N' Roses"], AlbumArtUrl = imgUrl }, - new Album { Title = "Are You Experienced?", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Jimi Hendrix"], AlbumArtUrl = imgUrl }, - new Album { Title = "Arquivo II", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Os Paralamas Do Sucesso"], AlbumArtUrl = imgUrl }, - new Album { Title = "Arquivo Os Paralamas Do Sucesso", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Os Paralamas Do Sucesso"], AlbumArtUrl = imgUrl }, - new Album { Title = "A-Sides", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Soundgarden"], AlbumArtUrl = imgUrl }, - new Album { Title = "Audioslave", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Audioslave"], AlbumArtUrl = imgUrl }, - new Album { Title = "Automatic for the People", Genre = genres["Alternative"], Price = 8.99M, Artist = artists["R.E.M."], AlbumArtUrl = imgUrl }, - new Album { Title = "Axé Bahia 2001", Genre = genres["Pop"], Price = 8.99M, Artist = artists["Various Artists"], AlbumArtUrl = imgUrl }, - new Album { Title = "Babel", Genre = genres["Alternative"], Price = 8.99M, Artist = artists["Mumford & Sons"], AlbumArtUrl = imgUrl }, - new Album { Title = "Bach: Goldberg Variations", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Wilhelm Kempff"], AlbumArtUrl = imgUrl }, - new Album { Title = "Bach: The Brandenburg Concertos", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Orchestra of The Age of Enlightenment"], AlbumArtUrl = imgUrl }, - new Album { Title = "Bach: The Cello Suites", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Yo-Yo Ma"], AlbumArtUrl = imgUrl }, - new Album { Title = "Bach: Toccata & Fugue in D Minor", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Ton Koopman"], AlbumArtUrl = imgUrl }, - new Album { Title = "Bad Motorfinger", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Soundgarden"], AlbumArtUrl = imgUrl }, - new Album { Title = "Balls to the Wall", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Accept"], AlbumArtUrl = imgUrl }, - new Album { Title = "Banadeek Ta'ala", Genre = genres["World"], Price = 8.99M, Artist = artists["Amr Diab"], AlbumArtUrl = imgUrl }, - new Album { Title = "Barbie Girl", Genre = genres["Pop"], Price = 8.99M, Artist = artists["Aqua"], AlbumArtUrl = imgUrl }, - new Album { Title = "Bark at the Moon (Remastered)", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Ozzy Osbourne"], AlbumArtUrl = imgUrl }, - new Album { Title = "Bartok: Violin & Viola Concertos", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Yehudi Menuhin"], AlbumArtUrl = imgUrl }, - new Album { Title = "Barulhinho Bom", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Marisa Monte"], AlbumArtUrl = imgUrl }, - new Album { Title = "BBC Sessions [Disc 1] [Live]", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Led Zeppelin"], AlbumArtUrl = imgUrl }, - new Album { Title = "BBC Sessions [Disc 2] [Live]", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Led Zeppelin"], AlbumArtUrl = imgUrl }, - new Album { Title = "Be Here Now", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Oasis"], AlbumArtUrl = imgUrl }, - new Album { Title = "Bedrock 11 Compiled & Mixed", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["John Digweed"], AlbumArtUrl = imgUrl }, - new Album { Title = "Berlioz: Symphonie Fantastique", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Michael Tilson Thomas"], AlbumArtUrl = imgUrl }, - new Album { Title = "Beyond Good And Evil", Genre = genres["Rock"], Price = 8.99M, Artist = artists["The Cult"], AlbumArtUrl = imgUrl }, - new Album { Title = "Big Bad Wolf ", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["Armand Van Helden"], AlbumArtUrl = imgUrl }, - new Album { Title = "Big Ones", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Aerosmith"], AlbumArtUrl = imgUrl }, - new Album { Title = "Black Album", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Metallica"], AlbumArtUrl = imgUrl }, - new Album { Title = "Black Sabbath Vol. 4 (Remaster)", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Black Sabbath"], AlbumArtUrl = imgUrl }, - new Album { Title = "Black Sabbath", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Black Sabbath"], AlbumArtUrl = imgUrl }, - new Album { Title = "Black", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Metallica"], AlbumArtUrl = imgUrl }, - new Album { Title = "Blackwater Park", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Opeth"], AlbumArtUrl = imgUrl }, - new Album { Title = "Blizzard of Ozz", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Ozzy Osbourne"], AlbumArtUrl = imgUrl }, - new Album { Title = "Blood", Genre = genres["Rock"], Price = 8.99M, Artist = artists["In This Moment"], AlbumArtUrl = imgUrl }, - new Album { Title = "Blue Moods", Genre = genres["Jazz"], Price = 8.99M, Artist = artists["Incognito"], AlbumArtUrl = imgUrl }, - new Album { Title = "Blue", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Weezer"], AlbumArtUrl = imgUrl }, - new Album { Title = "Bongo Fury", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Frank Zappa & Captain Beefheart"], AlbumArtUrl = imgUrl }, - new Album { Title = "Boys & Girls", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Alabama Shakes"], AlbumArtUrl = imgUrl }, - new Album { Title = "Brave New World", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Iron Maiden"], AlbumArtUrl = imgUrl }, - new Album { Title = "B-Sides 1980-1990", Genre = genres["Rock"], Price = 8.99M, Artist = artists["U2"], AlbumArtUrl = imgUrl }, - new Album { Title = "Bunkka", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["Paul Oakenfold"], AlbumArtUrl = imgUrl }, - new Album { Title = "By The Way", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Red Hot Chili Peppers"], AlbumArtUrl = imgUrl }, - new Album { Title = "Cake: B-Sides and Rarities", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["Cake"], AlbumArtUrl = imgUrl }, - new Album { Title = "Californication", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Red Hot Chili Peppers"], AlbumArtUrl = imgUrl }, - new Album { Title = "Carmina Burana", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Boston Symphony Orchestra & Seiji Ozawa"], AlbumArtUrl = imgUrl }, - new Album { Title = "Carried to Dust (Bonus Track Version)", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["Calexico"], AlbumArtUrl = imgUrl }, - new Album { Title = "Carry On", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["Chris Cornell"], AlbumArtUrl = imgUrl }, - new Album { Title = "Cássia Eller - Sem Limite [Disc 1]", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Cássia Eller"], AlbumArtUrl = imgUrl }, - new Album { Title = "Chemical Wedding", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Bruce Dickinson"], AlbumArtUrl = imgUrl }, - new Album { Title = "Chill: Brazil (Disc 1)", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Marcos Valle"], AlbumArtUrl = imgUrl }, - new Album { Title = "Chill: Brazil (Disc 2)", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Antônio Carlos Jobim"], AlbumArtUrl = imgUrl }, - new Album { Title = "Chocolate Starfish And The Hot Dog Flavored Water", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Limp Bizkit"], AlbumArtUrl = imgUrl }, - new Album { Title = "Chronicle, Vol. 1", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Creedence Clearwater Revival"], AlbumArtUrl = imgUrl }, - new Album { Title = "Chronicle, Vol. 2", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Creedence Clearwater Revival"], AlbumArtUrl = imgUrl }, - new Album { Title = "Ciao, Baby", Genre = genres["Rock"], Price = 8.99M, Artist = artists["TheStart"], AlbumArtUrl = imgUrl }, - new Album { Title = "Cidade Negra - Hits", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Cidade Negra"], AlbumArtUrl = imgUrl }, - new Album { Title = "Classic Munkle: Turbo Edition", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["Munkle"], AlbumArtUrl = imgUrl }, - new Album { Title = "Classics: The Best of Sarah Brightman", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Sarah Brightman"], AlbumArtUrl = imgUrl }, - new Album { Title = "Coda", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Led Zeppelin"], AlbumArtUrl = imgUrl }, - new Album { Title = "Come Away With Me", Genre = genres["Jazz"], Price = 8.99M, Artist = artists["Norah Jones"], AlbumArtUrl = imgUrl }, - new Album { Title = "Come Taste The Band", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Deep Purple"], AlbumArtUrl = imgUrl }, - new Album { Title = "Comfort Eagle", Genre = genres["Alternative"], Price = 8.99M, Artist = artists["Cake"], AlbumArtUrl = imgUrl }, - new Album { Title = "Common Reaction", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Uh Huh Her "], AlbumArtUrl = imgUrl }, - new Album { Title = "Compositores", Genre = genres["Rock"], Price = 8.99M, Artist = artists["O Terço"], AlbumArtUrl = imgUrl }, - new Album { Title = "Contraband", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Velvet Revolver"], AlbumArtUrl = imgUrl }, - new Album { Title = "Core", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Stone Temple Pilots"], AlbumArtUrl = imgUrl }, - new Album { Title = "Cornerstone", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Styx"], AlbumArtUrl = imgUrl }, - new Album { Title = "Cosmicolor", Genre = genres["Rap"], Price = 8.99M, Artist = artists["M-Flo"], AlbumArtUrl = imgUrl }, - new Album { Title = "Cross", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["Justice"], AlbumArtUrl = imgUrl }, - new Album { Title = "Culture of Fear", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["Thievery Corporation"], AlbumArtUrl = imgUrl }, - new Album { Title = "Da Lama Ao Caos", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Chico Science & Nação Zumbi"], AlbumArtUrl = imgUrl }, - new Album { Title = "Dakshina", Genre = genres["World"], Price = 8.99M, Artist = artists["Deva Premal"], AlbumArtUrl = imgUrl }, - new Album { Title = "Dark Side of the Moon", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Pink Floyd"], AlbumArtUrl = imgUrl }, - new Album { Title = "Death Magnetic", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Metallica"], AlbumArtUrl = imgUrl }, - new Album { Title = "Deep End of Down", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Above the Fold"], AlbumArtUrl = imgUrl }, - new Album { Title = "Deep Purple In Rock", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Deep Purple"], AlbumArtUrl = imgUrl }, - new Album { Title = "Deixa Entrar", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Falamansa"], AlbumArtUrl = imgUrl }, - new Album { Title = "Deja Vu", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Crosby, Stills, Nash, and Young"], AlbumArtUrl = imgUrl }, - new Album { Title = "Di Korpu Ku Alma", Genre = genres["World"], Price = 8.99M, Artist = artists["Lura"], AlbumArtUrl = imgUrl }, - new Album { Title = "Diary of a Madman (Remastered)", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Ozzy Osbourne"], AlbumArtUrl = imgUrl }, - new Album { Title = "Diary of a Madman", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Ozzy Osbourne"], AlbumArtUrl = imgUrl }, - new Album { Title = "Dirt", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Alice in Chains"], AlbumArtUrl = imgUrl }, - new Album { Title = "Diver Down", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Van Halen"], AlbumArtUrl = imgUrl }, - new Album { Title = "Djavan Ao Vivo - Vol. 02", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Djavan"], AlbumArtUrl = imgUrl }, - new Album { Title = "Djavan Ao Vivo - Vol. 1", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Djavan"], AlbumArtUrl = imgUrl }, - new Album { Title = "Drum'n'bass for Papa", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["Plug"], AlbumArtUrl = imgUrl }, - new Album { Title = "Duluth", Genre = genres["Country"], Price = 8.99M, Artist = artists["Trampled By Turtles"], AlbumArtUrl = imgUrl }, - new Album { Title = "Dummy", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["Portishead"], AlbumArtUrl = imgUrl }, - new Album { Title = "Duos II", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Luciana Souza/Romero Lubambo"], AlbumArtUrl = imgUrl }, - new Album { Title = "Earl Scruggs and Friends", Genre = genres["Country"], Price = 8.99M, Artist = artists["Earl Scruggs"], AlbumArtUrl = imgUrl }, - new Album { Title = "Eden", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Sarah Brightman"], AlbumArtUrl = imgUrl }, - new Album { Title = "El Camino", Genre = genres["Rock"], Price = 8.99M, Artist = artists["The Black Keys"], AlbumArtUrl = imgUrl }, - new Album { Title = "Elegant Gypsy", Genre = genres["Jazz"], Price = 8.99M, Artist = artists["Al di Meola"], AlbumArtUrl = imgUrl }, - new Album { Title = "Elements Of Life", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["Tiësto"], AlbumArtUrl = imgUrl }, - new Album { Title = "Elis Regina-Minha História", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Elis Regina"], AlbumArtUrl = imgUrl }, - new Album { Title = "Emergency On Planet Earth", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Jamiroquai"], AlbumArtUrl = imgUrl }, - new Album { Title = "Emotion", Genre = genres["World"], Price = 8.99M, Artist = artists["Papa Wemba"], AlbumArtUrl = imgUrl }, - new Album { Title = "English Renaissance", Genre = genres["Classical"], Price = 8.99M, Artist = artists["The King's Singers"], AlbumArtUrl = imgUrl }, - new Album { Title = "Every Kind of Light", Genre = genres["Rock"], Price = 8.99M, Artist = artists["The Posies"], AlbumArtUrl = imgUrl }, - new Album { Title = "Faceless", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Godsmack"], AlbumArtUrl = imgUrl }, - new Album { Title = "Facelift", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Alice in Chains"], AlbumArtUrl = imgUrl }, - new Album { Title = "Fair Warning", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Van Halen"], AlbumArtUrl = imgUrl }, - new Album { Title = "Fear of a Black Planet", Genre = genres["Rap"], Price = 8.99M, Artist = artists["Public Enemy"], AlbumArtUrl = imgUrl }, - new Album { Title = "Fear Of The Dark", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Iron Maiden"], AlbumArtUrl = imgUrl }, - new Album { Title = "Feels Like Home", Genre = genres["Jazz"], Price = 8.99M, Artist = artists["Norah Jones"], AlbumArtUrl = imgUrl }, - new Album { Title = "Fireball", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Deep Purple"], AlbumArtUrl = imgUrl }, - new Album { Title = "Fly", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Sarah Brightman"], AlbumArtUrl = imgUrl }, - new Album { Title = "For Those About To Rock We Salute You", Genre = genres["Rock"], Price = 8.99M, Artist = artists["AC/DC"], AlbumArtUrl = imgUrl }, - new Album { Title = "Four", Genre = genres["Blues"], Price = 8.99M, Artist = artists["Blues Traveler"], AlbumArtUrl = imgUrl }, - new Album { Title = "Frank", Genre = genres["Pop"], Price = 8.99M, Artist = artists["Amy Winehouse"], AlbumArtUrl = imgUrl }, - new Album { Title = "Further Down the Spiral", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["Nine Inch Nails"], AlbumArtUrl = imgUrl }, - new Album { Title = "Garage Inc. (Disc 1)", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Metallica"], AlbumArtUrl = imgUrl }, - new Album { Title = "Garage Inc. (Disc 2)", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Metallica"], AlbumArtUrl = imgUrl }, - new Album { Title = "Garbage", Genre = genres["Alternative"], Price = 8.99M, Artist = artists["Garbage"], AlbumArtUrl = imgUrl }, - new Album { Title = "Good News For People Who Love Bad News", Genre = genres["Indie"], Price = 8.99M, Artist = artists["Modest Mouse"], AlbumArtUrl = imgUrl }, - new Album { Title = "Gordon", Genre = genres["Alternative"], Price = 8.99M, Artist = artists["Barenaked Ladies"], AlbumArtUrl = imgUrl }, - new Album { Title = "Górecki: Symphony No. 3", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Adrian Leaper & Doreen de Feis"], AlbumArtUrl = imgUrl }, - new Album { Title = "Greatest Hits I", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Queen"], AlbumArtUrl = imgUrl }, - new Album { Title = "Greatest Hits II", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Queen"], AlbumArtUrl = imgUrl }, - new Album { Title = "Greatest Hits", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["Duck Sauce"], AlbumArtUrl = imgUrl }, - new Album { Title = "Greatest Hits", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Lenny Kravitz"], AlbumArtUrl = imgUrl }, - new Album { Title = "Greatest Hits", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Lenny Kravitz"], AlbumArtUrl = imgUrl }, - new Album { Title = "Greatest Kiss", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Kiss"], AlbumArtUrl = imgUrl }, - new Album { Title = "Greetings from Michigan", Genre = genres["Indie"], Price = 8.99M, Artist = artists["Sufjan Stevens"], AlbumArtUrl = imgUrl }, - new Album { Title = "Group Therapy", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["Above & Beyond"], AlbumArtUrl = imgUrl }, - new Album { Title = "Handel: The Messiah (Highlights)", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Scholars Baroque Ensemble"], AlbumArtUrl = imgUrl }, - new Album { Title = "Haydn: Symphonies 99 - 104", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Royal Philharmonic Orchestra"], AlbumArtUrl = imgUrl }, - new Album { Title = "Heart of the Night", Genre = genres["Jazz"], Price = 8.99M, Artist = artists["Spyro Gyra"], AlbumArtUrl = imgUrl }, - new Album { Title = "Heart On", Genre = genres["Rock"], Price = 8.99M, Artist = artists["The Eagles of Death Metal"], AlbumArtUrl = imgUrl }, - new Album { Title = "Holy Diver", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Dio"], AlbumArtUrl = imgUrl }, - new Album { Title = "Homework", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["Daft Punk"], AlbumArtUrl = imgUrl }, - new Album { Title = "Hot Rocks, 1964-1971 (Disc 1)", Genre = genres["Rock"], Price = 8.99M, Artist = artists["The Rolling Stones"], AlbumArtUrl = imgUrl }, - new Album { Title = "Houses Of The Holy", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Led Zeppelin"], AlbumArtUrl = imgUrl }, - new Album { Title = "How To Dismantle An Atomic Bomb", Genre = genres["Rock"], Price = 8.99M, Artist = artists["U2"], AlbumArtUrl = imgUrl }, - new Album { Title = "Human", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Projected"], AlbumArtUrl = imgUrl }, - new Album { Title = "Hunky Dory", Genre = genres["Rock"], Price = 8.99M, Artist = artists["David Bowie"], AlbumArtUrl = imgUrl }, - new Album { Title = "Hymns", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Projected"], AlbumArtUrl = imgUrl }, - new Album { Title = "Hysteria", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Def Leppard"], AlbumArtUrl = imgUrl }, - new Album { Title = "In Absentia", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Porcupine Tree"], AlbumArtUrl = imgUrl }, - new Album { Title = "In Between", Genre = genres["Pop"], Price = 8.99M, Artist = artists["Paul Van Dyk"], AlbumArtUrl = imgUrl }, - new Album { Title = "In Rainbows", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Radiohead"], AlbumArtUrl = imgUrl }, - new Album { Title = "In Step", Genre = genres["Blues"], Price = 8.99M, Artist = artists["Stevie Ray Vaughan & Double Trouble"], AlbumArtUrl = imgUrl }, - new Album { Title = "In the court of the Crimson King", Genre = genres["Rock"], Price = 8.99M, Artist = artists["King Crimson"], AlbumArtUrl = imgUrl }, - new Album { Title = "In Through The Out Door", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Led Zeppelin"], AlbumArtUrl = imgUrl }, - new Album { Title = "In Your Honor [Disc 1]", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Foo Fighters"], AlbumArtUrl = imgUrl }, - new Album { Title = "In Your Honor [Disc 2]", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Foo Fighters"], AlbumArtUrl = imgUrl }, - new Album { Title = "Indestructible", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Rancid"], AlbumArtUrl = imgUrl }, - new Album { Title = "Infinity", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Journey"], AlbumArtUrl = imgUrl }, - new Album { Title = "Into The Light", Genre = genres["Rock"], Price = 8.99M, Artist = artists["David Coverdale"], AlbumArtUrl = imgUrl }, - new Album { Title = "Introspective", Genre = genres["Pop"], Price = 8.99M, Artist = artists["Pet Shop Boys"], AlbumArtUrl = imgUrl }, - new Album { Title = "Iron Maiden", Genre = genres["Blues"], Price = 8.99M, Artist = artists["Iron Maiden"], AlbumArtUrl = imgUrl }, - new Album { Title = "ISAM", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["Amon Tobin"], AlbumArtUrl = imgUrl }, - new Album { Title = "IV", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Led Zeppelin"], AlbumArtUrl = imgUrl }, - new Album { Title = "Jagged Little Pill", Genre = genres["Alternative"], Price = 8.99M, Artist = artists["Alanis Morissette"], AlbumArtUrl = imgUrl }, - new Album { Title = "Jagged Little Pill", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Alanis Morissette"], AlbumArtUrl = imgUrl }, - new Album { Title = "Jorge Ben Jor 25 Anos", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Jorge Ben"], AlbumArtUrl = imgUrl }, - new Album { Title = "Jota Quest-1995", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Jota Quest"], AlbumArtUrl = imgUrl }, - new Album { Title = "Kick", Genre = genres["Alternative"], Price = 8.99M, Artist = artists["INXS"], AlbumArtUrl = imgUrl }, - new Album { Title = "Kill 'Em All", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Metallica"], AlbumArtUrl = imgUrl }, - new Album { Title = "Kind of Blue", Genre = genres["Jazz"], Price = 8.99M, Artist = artists["Miles Davis"], AlbumArtUrl = imgUrl }, - new Album { Title = "King For A Day Fool For A Lifetime", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Faith No More"], AlbumArtUrl = imgUrl }, - new Album { Title = "Kiss", Genre = genres["Pop"], Price = 8.99M, Artist = artists["Carly Rae Jepsen"], AlbumArtUrl = imgUrl }, - new Album { Title = "Last Call", Genre = genres["Country"], Price = 8.99M, Artist = artists["Cayouche"], AlbumArtUrl = imgUrl }, - new Album { Title = "Le Freak", Genre = genres["R&B"], Price = 8.99M, Artist = artists["Chic"], AlbumArtUrl = imgUrl }, - new Album { Title = "Le Tigre", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Le Tigre"], AlbumArtUrl = imgUrl }, - new Album { Title = "Led Zeppelin I", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Led Zeppelin"], AlbumArtUrl = imgUrl }, - new Album { Title = "Led Zeppelin II", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Led Zeppelin"], AlbumArtUrl = imgUrl }, - new Album { Title = "Led Zeppelin III", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Led Zeppelin"], AlbumArtUrl = imgUrl }, - new Album { Title = "Let There Be Rock", Genre = genres["Rock"], Price = 8.99M, Artist = artists["AC/DC"], AlbumArtUrl = imgUrl }, - new Album { Title = "Little Earthquakes", Genre = genres["Alternative"], Price = 8.99M, Artist = artists["Tori Amos"], AlbumArtUrl = imgUrl }, - new Album { Title = "Live [Disc 1]", Genre = genres["Blues"], Price = 8.99M, Artist = artists["The Black Crowes"], AlbumArtUrl = imgUrl }, - new Album { Title = "Live [Disc 2]", Genre = genres["Blues"], Price = 8.99M, Artist = artists["The Black Crowes"], AlbumArtUrl = imgUrl }, - new Album { Title = "Live After Death", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Iron Maiden"], AlbumArtUrl = imgUrl }, - new Album { Title = "Live At Donington 1992 (Disc 1)", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Iron Maiden"], AlbumArtUrl = imgUrl }, - new Album { Title = "Live At Donington 1992 (Disc 2)", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Iron Maiden"], AlbumArtUrl = imgUrl }, - new Album { Title = "Live on Earth", Genre = genres["Jazz"], Price = 8.99M, Artist = artists["The Cat Empire"], AlbumArtUrl = imgUrl }, - new Album { Title = "Live On Two Legs [Live]", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Pearl Jam"], AlbumArtUrl = imgUrl }, - new Album { Title = "Living After Midnight", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Judas Priest"], AlbumArtUrl = imgUrl }, - new Album { Title = "Living", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Paddy Casey"], AlbumArtUrl = imgUrl }, - new Album { Title = "Load", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Metallica"], AlbumArtUrl = imgUrl }, - new Album { Title = "Love Changes Everything", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Sarah Brightman"], AlbumArtUrl = imgUrl }, - new Album { Title = "MacArthur Park Suite", Genre = genres["R&B"], Price = 8.99M, Artist = artists["Donna Summer"], AlbumArtUrl = imgUrl }, - new Album { Title = "Machine Head", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Deep Purple"], AlbumArtUrl = imgUrl }, - new Album { Title = "Magical Mystery Tour", Genre = genres["Pop"], Price = 8.99M, Artist = artists["The Beatles"], AlbumArtUrl = imgUrl }, - new Album { Title = "Mais Do Mesmo", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Legião Urbana"], AlbumArtUrl = imgUrl }, - new Album { Title = "Maquinarama", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Skank"], AlbumArtUrl = imgUrl }, - new Album { Title = "Marasim", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Jagjit Singh"], AlbumArtUrl = imgUrl }, - new Album { Title = "Mascagni: Cavalleria Rusticana", Genre = genres["Classical"], Price = 8.99M, Artist = artists["James Levine"], AlbumArtUrl = imgUrl }, - new Album { Title = "Master of Puppets", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Metallica"], AlbumArtUrl = imgUrl }, - new Album { Title = "Mechanics & Mathematics", Genre = genres["Pop"], Price = 8.99M, Artist = artists["Venus Hum"], AlbumArtUrl = imgUrl }, - new Album { Title = "Mental Jewelry", Genre = genres["Alternative"], Price = 8.99M, Artist = artists["Live"], AlbumArtUrl = imgUrl }, - new Album { Title = "Metallics", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Metallica"], AlbumArtUrl = imgUrl }, - new Album { Title = "meteora", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Linkin Park"], AlbumArtUrl = imgUrl }, - new Album { Title = "Meus Momentos", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Gonzaguinha"], AlbumArtUrl = imgUrl }, - new Album { Title = "Mezmerize", Genre = genres["Metal"], Price = 8.99M, Artist = artists["System Of A Down"], AlbumArtUrl = imgUrl }, - new Album { Title = "Mezzanine", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["Massive Attack"], AlbumArtUrl = imgUrl }, - new Album { Title = "Miles Ahead", Genre = genres["Jazz"], Price = 8.99M, Artist = artists["Miles Davis"], AlbumArtUrl = imgUrl }, - new Album { Title = "Milton Nascimento Ao Vivo", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Milton Nascimento"], AlbumArtUrl = imgUrl }, - new Album { Title = "Minas", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Milton Nascimento"], AlbumArtUrl = imgUrl }, - new Album { Title = "Minha Historia", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Chico Buarque"], AlbumArtUrl = imgUrl }, - new Album { Title = "Misplaced Childhood", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Marillion"], AlbumArtUrl = imgUrl }, - new Album { Title = "MK III The Final Concerts [Disc 1]", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Deep Purple"], AlbumArtUrl = imgUrl }, - new Album { Title = "Morning Dance", Genre = genres["Jazz"], Price = 8.99M, Artist = artists["Spyro Gyra"], AlbumArtUrl = imgUrl }, - new Album { Title = "Motley Crue Greatest Hits", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Mötley Crüe"], AlbumArtUrl = imgUrl }, - new Album { Title = "Moving Pictures", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Rush"], AlbumArtUrl = imgUrl }, - new Album { Title = "Mozart: Chamber Music", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Nash Ensemble"], AlbumArtUrl = imgUrl }, - new Album { Title = "Mozart: Symphonies Nos. 40 & 41", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Berliner Philharmoniker"], AlbumArtUrl = imgUrl }, - new Album { Title = "Murder Ballads", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Nick Cave and the Bad Seeds"], AlbumArtUrl = imgUrl }, - new Album { Title = "Music For The Jilted Generation", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["The Prodigy"], AlbumArtUrl = imgUrl }, - new Album { Title = "My Generation - The Very Best Of The Who", Genre = genres["Rock"], Price = 8.99M, Artist = artists["The Who"], AlbumArtUrl = imgUrl }, - new Album { Title = "My Name is Skrillex", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["Skrillex"], AlbumArtUrl = imgUrl }, - new Album { Title = "Na Pista", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Cláudio Zoli"], AlbumArtUrl = imgUrl }, - new Album { Title = "Nevermind", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Nirvana"], AlbumArtUrl = imgUrl }, - new Album { Title = "New Adventures In Hi-Fi", Genre = genres["Rock"], Price = 8.99M, Artist = artists["R.E.M."], AlbumArtUrl = imgUrl }, - new Album { Title = "New Divide", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Linkin Park"], AlbumArtUrl = imgUrl }, - new Album { Title = "New York Dolls", Genre = genres["Punk"], Price = 8.99M, Artist = artists["New York Dolls"], AlbumArtUrl = imgUrl }, - new Album { Title = "News Of The World", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Queen"], AlbumArtUrl = imgUrl }, - new Album { Title = "Nielsen: The Six Symphonies", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Göteborgs Symfoniker & Neeme Järvi"], AlbumArtUrl = imgUrl }, - new Album { Title = "Night At The Opera", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Queen"], AlbumArtUrl = imgUrl }, - new Album { Title = "Night Castle", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Trans-Siberian Orchestra"], AlbumArtUrl = imgUrl }, - new Album { Title = "Nkolo", Genre = genres["World"], Price = 8.99M, Artist = artists["Lokua Kanza"], AlbumArtUrl = imgUrl }, - new Album { Title = "No More Tears (Remastered)", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Ozzy Osbourne"], AlbumArtUrl = imgUrl }, - new Album { Title = "No Prayer For The Dying", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Iron Maiden"], AlbumArtUrl = imgUrl }, - new Album { Title = "No Security", Genre = genres["Rock"], Price = 8.99M, Artist = artists["The Rolling Stones"], AlbumArtUrl = imgUrl }, - new Album { Title = "O Brother, Where Art Thou?", Genre = genres["Country"], Price = 8.99M, Artist = artists["Alison Krauss"], AlbumArtUrl = imgUrl }, - new Album { Title = "O Samba Poconé", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Skank"], AlbumArtUrl = imgUrl }, - new Album { Title = "O(+>", Genre = genres["R&B"], Price = 8.99M, Artist = artists["Prince"], AlbumArtUrl = imgUrl }, - new Album { Title = "Oceania", Genre = genres["Rock"], Price = 8.99M, Artist = artists["The Smashing Pumpkins"], AlbumArtUrl = imgUrl }, - new Album { Title = "Off the Deep End", Genre = genres["Pop"], Price = 8.99M, Artist = artists["Weird Al"], AlbumArtUrl = imgUrl }, - new Album { Title = "OK Computer", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Radiohead"], AlbumArtUrl = imgUrl }, - new Album { Title = "Olodum", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Olodum"], AlbumArtUrl = imgUrl }, - new Album { Title = "One Love", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["David Guetta"], AlbumArtUrl = imgUrl }, - new Album { Title = "Operation: Mindcrime", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Queensrÿche"], AlbumArtUrl = imgUrl }, - new Album { Title = "Opiate", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Tool"], AlbumArtUrl = imgUrl }, - new Album { Title = "Outbreak", Genre = genres["Jazz"], Price = 8.99M, Artist = artists["Dennis Chambers"], AlbumArtUrl = imgUrl }, - new Album { Title = "Pachelbel: Canon & Gigue", Genre = genres["Classical"], Price = 8.99M, Artist = artists["English Concert & Trevor Pinnock"], AlbumArtUrl = imgUrl }, - new Album { Title = "Paid in Full", Genre = genres["Rap"], Price = 8.99M, Artist = artists["Eric B. and Rakim"], AlbumArtUrl = imgUrl }, - new Album { Title = "Para Siempre", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Vicente Fernandez"], AlbumArtUrl = imgUrl }, - new Album { Title = "Pause", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["Four Tet"], AlbumArtUrl = imgUrl }, - new Album { Title = "Peace Sells... but Who's Buying", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Megadeth"], AlbumArtUrl = imgUrl }, - new Album { Title = "Physical Graffiti [Disc 1]", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Led Zeppelin"], AlbumArtUrl = imgUrl }, - new Album { Title = "Physical Graffiti [Disc 2]", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Led Zeppelin"], AlbumArtUrl = imgUrl }, - new Album { Title = "Physical Graffiti", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Led Zeppelin"], AlbumArtUrl = imgUrl }, - new Album { Title = "Piece Of Mind", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Iron Maiden"], AlbumArtUrl = imgUrl }, - new Album { Title = "Pinkerton", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Weezer"], AlbumArtUrl = imgUrl }, - new Album { Title = "Plays Metallica By Four Cellos", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Apocalyptica"], AlbumArtUrl = imgUrl }, - new Album { Title = "Pop", Genre = genres["Rock"], Price = 8.99M, Artist = artists["U2"], AlbumArtUrl = imgUrl }, - new Album { Title = "Powerslave", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Iron Maiden"], AlbumArtUrl = imgUrl }, - new Album { Title = "Prenda Minha", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Caetano Veloso"], AlbumArtUrl = imgUrl }, - new Album { Title = "Presence", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Led Zeppelin"], AlbumArtUrl = imgUrl }, - new Album { Title = "Pretty Hate Machine", Genre = genres["Alternative"], Price = 8.99M, Artist = artists["Nine Inch Nails"], AlbumArtUrl = imgUrl }, - new Album { Title = "Prisoner", Genre = genres["Rock"], Price = 8.99M, Artist = artists["The Jezabels"], AlbumArtUrl = imgUrl }, - new Album { Title = "Privateering", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Mark Knopfler"], AlbumArtUrl = imgUrl }, - new Album { Title = "Prokofiev: Romeo & Juliet", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Michael Tilson Thomas"], AlbumArtUrl = imgUrl }, - new Album { Title = "Prokofiev: Symphony No.1", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Sergei Prokofiev & Yuri Temirkanov"], AlbumArtUrl = imgUrl }, - new Album { Title = "PSY's Best 6th Part 1", Genre = genres["Pop"], Price = 8.99M, Artist = artists["PSY"], AlbumArtUrl = imgUrl }, - new Album { Title = "Purcell: The Fairy Queen", Genre = genres["Classical"], Price = 8.99M, Artist = artists["London Classical Players"], AlbumArtUrl = imgUrl }, - new Album { Title = "Purpendicular", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Deep Purple"], AlbumArtUrl = imgUrl }, - new Album { Title = "Purple", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Stone Temple Pilots"], AlbumArtUrl = imgUrl }, - new Album { Title = "Quanta Gente Veio Ver (Live)", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Gilberto Gil"], AlbumArtUrl = imgUrl }, - new Album { Title = "Quanta Gente Veio ver--Bônus De Carnaval", Genre = genres["Jazz"], Price = 8.99M, Artist = artists["Gilberto Gil"], AlbumArtUrl = imgUrl }, - new Album { Title = "Quiet Songs", Genre = genres["Jazz"], Price = 8.99M, Artist = artists["Aisha Duo"], AlbumArtUrl = imgUrl }, - new Album { Title = "Raices", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Los Tigres del Norte"], AlbumArtUrl = imgUrl }, - new Album { Title = "Raising Hell", Genre = genres["Rap"], Price = 8.99M, Artist = artists["Run DMC"], AlbumArtUrl = imgUrl }, - new Album { Title = "Raoul and the Kings of Spain ", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Tears For Fears"], AlbumArtUrl = imgUrl }, - new Album { Title = "Rattle And Hum", Genre = genres["Rock"], Price = 8.99M, Artist = artists["U2"], AlbumArtUrl = imgUrl }, - new Album { Title = "Raul Seixas", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Raul Seixas"], AlbumArtUrl = imgUrl }, - new Album { Title = "Recovery [Explicit]", Genre = genres["Rap"], Price = 8.99M, Artist = artists["Eminem"], AlbumArtUrl = imgUrl }, - new Album { Title = "Reign In Blood", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Slayer"], AlbumArtUrl = imgUrl }, - new Album { Title = "Relayed", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Yes"], AlbumArtUrl = imgUrl }, - new Album { Title = "ReLoad", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Metallica"], AlbumArtUrl = imgUrl }, - new Album { Title = "Respighi:Pines of Rome", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Eugene Ormandy"], AlbumArtUrl = imgUrl }, - new Album { Title = "Restless and Wild", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Accept"], AlbumArtUrl = imgUrl }, - new Album { Title = "Retrospective I (1974-1980)", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Rush"], AlbumArtUrl = imgUrl }, - new Album { Title = "Revelations", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["Audioslave"], AlbumArtUrl = imgUrl }, - new Album { Title = "Revolver", Genre = genres["Rock"], Price = 8.99M, Artist = artists["The Beatles"], AlbumArtUrl = imgUrl }, - new Album { Title = "Ride the Lighting ", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Metallica"], AlbumArtUrl = imgUrl }, - new Album { Title = "Ride The Lightning", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Metallica"], AlbumArtUrl = imgUrl }, - new Album { Title = "Ring My Bell", Genre = genres["R&B"], Price = 8.99M, Artist = artists["Anita Ward"], AlbumArtUrl = imgUrl }, - new Album { Title = "Riot Act", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Pearl Jam"], AlbumArtUrl = imgUrl }, - new Album { Title = "Rise of the Phoenix", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Before the Dawn"], AlbumArtUrl = imgUrl }, - new Album { Title = "Rock In Rio [CD1]", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Iron Maiden"], AlbumArtUrl = imgUrl }, - new Album { Title = "Rock In Rio [CD2]", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Iron Maiden"], AlbumArtUrl = imgUrl }, - new Album { Title = "Rock In Rio [CD2]", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Iron Maiden"], AlbumArtUrl = imgUrl }, - new Album { Title = "Roda De Funk", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Funk Como Le Gusta"], AlbumArtUrl = imgUrl }, - new Album { Title = "Room for Squares", Genre = genres["Pop"], Price = 8.99M, Artist = artists["John Mayer"], AlbumArtUrl = imgUrl }, - new Album { Title = "Root Down", Genre = genres["Jazz"], Price = 8.99M, Artist = artists["Jimmy Smith"], AlbumArtUrl = imgUrl }, - new Album { Title = "Rounds", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["Four Tet"], AlbumArtUrl = imgUrl }, - new Album { Title = "Rubber Factory", Genre = genres["Rock"], Price = 8.99M, Artist = artists["The Black Keys"], AlbumArtUrl = imgUrl }, - new Album { Title = "Rust in Peace", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Megadeth"], AlbumArtUrl = imgUrl }, - new Album { Title = "Sambas De Enredo 2001", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Various Artists"], AlbumArtUrl = imgUrl }, - new Album { Title = "Santana - As Years Go By", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Santana"], AlbumArtUrl = imgUrl }, - new Album { Title = "Santana Live", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Santana"], AlbumArtUrl = imgUrl }, - new Album { Title = "Saturday Night Fever", Genre = genres["R&B"], Price = 8.99M, Artist = artists["Bee Gees"], AlbumArtUrl = imgUrl }, - new Album { Title = "Scary Monsters and Nice Sprites", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["Skrillex"], AlbumArtUrl = imgUrl }, - new Album { Title = "Scheherazade", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Chicago Symphony Orchestra & Fritz Reiner"], AlbumArtUrl = imgUrl }, - new Album { Title = "SCRIABIN: Vers la flamme", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Christopher O'Riley"], AlbumArtUrl = imgUrl }, - new Album { Title = "Second Coming", Genre = genres["Rock"], Price = 8.99M, Artist = artists["The Stone Roses"], AlbumArtUrl = imgUrl }, - new Album { Title = "Serie Sem Limite (Disc 1)", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Tim Maia"], AlbumArtUrl = imgUrl }, - new Album { Title = "Serie Sem Limite (Disc 2)", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Tim Maia"], AlbumArtUrl = imgUrl }, - new Album { Title = "Serious About Men", Genre = genres["Rap"], Price = 8.99M, Artist = artists["The Rubberbandits"], AlbumArtUrl = imgUrl }, - new Album { Title = "Seventh Son of a Seventh Son", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Iron Maiden"], AlbumArtUrl = imgUrl }, - new Album { Title = "Short Bus", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Filter"], AlbumArtUrl = imgUrl }, - new Album { Title = "Sibelius: Finlandia", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Berliner Philharmoniker"], AlbumArtUrl = imgUrl }, - new Album { Title = "Singles Collection", Genre = genres["Rock"], Price = 8.99M, Artist = artists["David Bowie"], AlbumArtUrl = imgUrl }, - new Album { Title = "Six Degrees of Inner Turbulence", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Dream Theater"], AlbumArtUrl = imgUrl }, - new Album { Title = "Slave To The Empire", Genre = genres["Metal"], Price = 8.99M, Artist = artists["T&N"], AlbumArtUrl = imgUrl }, - new Album { Title = "Slaves And Masters", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Deep Purple"], AlbumArtUrl = imgUrl }, - new Album { Title = "Slouching Towards Bethlehem", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Robert James"], AlbumArtUrl = imgUrl }, - new Album { Title = "Smash", Genre = genres["Rock"], Price = 8.99M, Artist = artists["The Offspring"], AlbumArtUrl = imgUrl }, - new Album { Title = "Something Special", Genre = genres["Country"], Price = 8.99M, Artist = artists["Dolly Parton"], AlbumArtUrl = imgUrl }, - new Album { Title = "Somewhere in Time", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Iron Maiden"], AlbumArtUrl = imgUrl }, - new Album { Title = "Song(s) You Know By Heart", Genre = genres["Country"], Price = 8.99M, Artist = artists["Jimmy Buffett"], AlbumArtUrl = imgUrl }, - new Album { Title = "Sound of Music", Genre = genres["Punk"], Price = 8.99M, Artist = artists["Adicts"], AlbumArtUrl = imgUrl }, - new Album { Title = "South American Getaway", Genre = genres["Classical"], Price = 8.99M, Artist = artists["The 12 Cellists of The Berlin Philharmonic"], AlbumArtUrl = imgUrl }, - new Album { Title = "Sozinho Remix Ao Vivo", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Caetano Veloso"], AlbumArtUrl = imgUrl }, - new Album { Title = "Speak of the Devil", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Ozzy Osbourne"], AlbumArtUrl = imgUrl }, - new Album { Title = "Spiritual State", Genre = genres["Rap"], Price = 8.99M, Artist = artists["Nujabes"], AlbumArtUrl = imgUrl }, - new Album { Title = "St. Anger", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Metallica"], AlbumArtUrl = imgUrl }, - new Album { Title = "Still Life", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Opeth"], AlbumArtUrl = imgUrl }, - new Album { Title = "Stop Making Sense", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Talking Heads"], AlbumArtUrl = imgUrl }, - new Album { Title = "Stormbringer", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Deep Purple"], AlbumArtUrl = imgUrl }, - new Album { Title = "Stranger than Fiction", Genre = genres["Punk"], Price = 8.99M, Artist = artists["Bad Religion"], AlbumArtUrl = imgUrl }, - new Album { Title = "Strauss: Waltzes", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Eugene Ormandy"], AlbumArtUrl = imgUrl }, - new Album { Title = "Supermodified", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["Amon Tobin"], AlbumArtUrl = imgUrl }, - new Album { Title = "Supernatural", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Santana"], AlbumArtUrl = imgUrl }, - new Album { Title = "Surfing with the Alien (Remastered)", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Joe Satriani"], AlbumArtUrl = imgUrl }, - new Album { Title = "Switched-On Bach", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Wendy Carlos"], AlbumArtUrl = imgUrl }, - new Album { Title = "Symphony", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Sarah Brightman"], AlbumArtUrl = imgUrl }, - new Album { Title = "Szymanowski: Piano Works, Vol. 1", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Martin Roscoe"], AlbumArtUrl = imgUrl }, - new Album { Title = "Tchaikovsky: The Nutcracker", Genre = genres["Classical"], Price = 8.99M, Artist = artists["London Symphony Orchestra"], AlbumArtUrl = imgUrl }, - new Album { Title = "Ted Nugent", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Ted Nugent"], AlbumArtUrl = imgUrl }, - new Album { Title = "Teflon Don", Genre = genres["Rap"], Price = 8.99M, Artist = artists["Rick Ross"], AlbumArtUrl = imgUrl }, - new Album { Title = "Tell Another Joke at the Ol' Choppin' Block", Genre = genres["Indie"], Price = 8.99M, Artist = artists["Danielson Famile"], AlbumArtUrl = imgUrl }, - new Album { Title = "Temple of the Dog", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["Temple of the Dog"], AlbumArtUrl = imgUrl }, - new Album { Title = "Ten", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Pearl Jam"], AlbumArtUrl = imgUrl }, - new Album { Title = "Texas Flood", Genre = genres["Blues"], Price = 8.99M, Artist = artists["Stevie Ray Vaughan"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Battle Rages On", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Deep Purple"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Beast Live", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Paul D'Ianno"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Best Of 1980-1990", Genre = genres["Rock"], Price = 8.99M, Artist = artists["U2"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Best of 1990–2000", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Sarah Brightman"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Best of Beethoven", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Nicolaus Esterhazy Sinfonia"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Best Of Billy Cobham", Genre = genres["Jazz"], Price = 8.99M, Artist = artists["Billy Cobham"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Best of Ed Motta", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Ed Motta"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Best Of Van Halen, Vol. I", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Van Halen"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Bridge", Genre = genres["R&B"], Price = 8.99M, Artist = artists["Melanie Fiona"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Cage", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Tygers of Pan Tang"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Chicago Transit Authority", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Chicago "], AlbumArtUrl = imgUrl }, - new Album { Title = "The Chronic", Genre = genres["Rap"], Price = 8.99M, Artist = artists["Dr. Dre"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Colour And The Shape", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Foo Fighters"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Crane Wife", Genre = genres["Alternative"], Price = 8.99M, Artist = artists["The Decemberists"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Cream Of Clapton", Genre = genres["Blues"], Price = 8.99M, Artist = artists["Eric Clapton"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Cure", Genre = genres["Pop"], Price = 8.99M, Artist = artists["The Cure"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Dark Side Of The Moon", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Pink Floyd"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Divine Conspiracy", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Epica"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Doors", Genre = genres["Rock"], Price = 8.99M, Artist = artists["The Doors"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Dream of the Blue Turtles", Genre = genres["Pop"], Price = 8.99M, Artist = artists["Sting"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Essential Miles Davis [Disc 1]", Genre = genres["Jazz"], Price = 8.99M, Artist = artists["Miles Davis"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Essential Miles Davis [Disc 2]", Genre = genres["Jazz"], Price = 8.99M, Artist = artists["Miles Davis"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Final Concerts (Disc 2)", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Deep Purple"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Final Frontier", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Iron Maiden"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Head and the Heart", Genre = genres["Rock"], Price = 8.99M, Artist = artists["The Head and the Heart"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Joshua Tree", Genre = genres["Rock"], Price = 8.99M, Artist = artists["U2"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Last Night of the Proms", Genre = genres["Classical"], Price = 8.99M, Artist = artists["BBC Concert Orchestra"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Lumineers", Genre = genres["Rock"], Price = 8.99M, Artist = artists["The Lumineers"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Number of The Beast", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Iron Maiden"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Number of The Beast", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Iron Maiden"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Police Greatest Hits", Genre = genres["Rock"], Price = 8.99M, Artist = artists["The Police"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Song Remains The Same (Disc 1)", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Led Zeppelin"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Song Remains The Same (Disc 2)", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Led Zeppelin"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Southern Harmony and Musical Companion", Genre = genres["Blues"], Price = 8.99M, Artist = artists["The Black Crowes"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Spade", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Butch Walker & The Black Widows"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Stone Roses", Genre = genres["Rock"], Price = 8.99M, Artist = artists["The Stone Roses"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Suburbs", Genre = genres["Indie"], Price = 8.99M, Artist = artists["Arcade Fire"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Three Tenors Disc1/Disc2", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Carreras, Pavarotti, Domingo"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Trees They Grow So High", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Sarah Brightman"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Wall", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Pink Floyd"], AlbumArtUrl = imgUrl }, - new Album { Title = "The X Factor", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Iron Maiden"], AlbumArtUrl = imgUrl }, - new Album { Title = "Them Crooked Vultures", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Them Crooked Vultures"], AlbumArtUrl = imgUrl }, - new Album { Title = "This Is Happening", Genre = genres["Rock"], Price = 8.99M, Artist = artists["LCD Soundsystem"], AlbumArtUrl = imgUrl }, - new Album { Title = "Thunder, Lightning, Strike", Genre = genres["Rock"], Price = 8.99M, Artist = artists["The Go! Team"], AlbumArtUrl = imgUrl }, - new Album { Title = "Time to Say Goodbye", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Sarah Brightman"], AlbumArtUrl = imgUrl }, - new Album { Title = "Time, Love & Tenderness", Genre = genres["Pop"], Price = 8.99M, Artist = artists["Michael Bolton"], AlbumArtUrl = imgUrl }, - new Album { Title = "Tomorrow Starts Today", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Mobile"], AlbumArtUrl = imgUrl }, - new Album { Title = "Tribute", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Ozzy Osbourne"], AlbumArtUrl = imgUrl }, - new Album { Title = "Tuesday Night Music Club", Genre = genres["Alternative"], Price = 8.99M, Artist = artists["Sheryl Crow"], AlbumArtUrl = imgUrl }, - new Album { Title = "Umoja", Genre = genres["Rock"], Price = 8.99M, Artist = artists["BLØF"], AlbumArtUrl = imgUrl }, - new Album { Title = "Under the Pink", Genre = genres["Alternative"], Price = 8.99M, Artist = artists["Tori Amos"], AlbumArtUrl = imgUrl }, - new Album { Title = "Undertow", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Tool"], AlbumArtUrl = imgUrl }, - new Album { Title = "Un-Led-Ed", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Dread Zeppelin"], AlbumArtUrl = imgUrl }, - new Album { Title = "Unplugged [Live]", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Kiss"], AlbumArtUrl = imgUrl }, - new Album { Title = "Unplugged", Genre = genres["Blues"], Price = 8.99M, Artist = artists["Eric Clapton"], AlbumArtUrl = imgUrl }, - new Album { Title = "Unplugged", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Eric Clapton"], AlbumArtUrl = imgUrl }, - new Album { Title = "Untrue", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["Burial"], AlbumArtUrl = imgUrl }, - new Album { Title = "Use Your Illusion I", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Guns N' Roses"], AlbumArtUrl = imgUrl }, - new Album { Title = "Use Your Illusion II", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Guns N' Roses"], AlbumArtUrl = imgUrl }, - new Album { Title = "Use Your Illusion II", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Guns N' Roses"], AlbumArtUrl = imgUrl }, - new Album { Title = "Van Halen III", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Van Halen"], AlbumArtUrl = imgUrl }, - new Album { Title = "Van Halen", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Van Halen"], AlbumArtUrl = imgUrl }, - new Album { Title = "Version 2.0", Genre = genres["Alternative"], Price = 8.99M, Artist = artists["Garbage"], AlbumArtUrl = imgUrl }, - new Album { Title = "Vinicius De Moraes", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Vinícius De Moraes"], AlbumArtUrl = imgUrl }, - new Album { Title = "Virtual XI", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Iron Maiden"], AlbumArtUrl = imgUrl }, - new Album { Title = "Voodoo Lounge", Genre = genres["Rock"], Price = 8.99M, Artist = artists["The Rolling Stones"], AlbumArtUrl = imgUrl }, - new Album { Title = "Vozes do MPB", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Various Artists"], AlbumArtUrl = imgUrl }, - new Album { Title = "Vs.", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Pearl Jam"], AlbumArtUrl = imgUrl }, - new Album { Title = "Wagner: Favourite Overtures", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Sir Georg Solti & Wiener Philharmoniker"], AlbumArtUrl = imgUrl }, - new Album { Title = "Walking Into Clarksdale", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Page & Plant"], AlbumArtUrl = imgUrl }, - new Album { Title = "Wapi Yo", Genre = genres["World"], Price = 8.99M, Artist = artists["Lokua Kanza"], AlbumArtUrl = imgUrl }, - new Album { Title = "War", Genre = genres["Rock"], Price = 8.99M, Artist = artists["U2"], AlbumArtUrl = imgUrl }, - new Album { Title = "Warner 25 Anos", Genre = genres["Jazz"], Price = 8.99M, Artist = artists["Antônio Carlos Jobim"], AlbumArtUrl = imgUrl }, - new Album { Title = "Wasteland R&Btheque", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Raunchy"], AlbumArtUrl = imgUrl }, - new Album { Title = "Watermark", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["Enya"], AlbumArtUrl = imgUrl }, - new Album { Title = "We Were Exploding Anyway", Genre = genres["Rock"], Price = 8.99M, Artist = artists["65daysofstatic"], AlbumArtUrl = imgUrl }, - new Album { Title = "Weill: The Seven Deadly Sins", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Orchestre de l'Opéra de Lyon"], AlbumArtUrl = imgUrl }, - new Album { Title = "White Pony", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Deftones"], AlbumArtUrl = imgUrl }, - new Album { Title = "Who's Next", Genre = genres["Rock"], Price = 8.99M, Artist = artists["The Who"], AlbumArtUrl = imgUrl }, - new Album { Title = "Wish You Were Here", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Pink Floyd"], AlbumArtUrl = imgUrl }, - new Album { Title = "With Oden on Our Side", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Amon Amarth"], AlbumArtUrl = imgUrl }, - new Album { Title = "Worlds", Genre = genres["Jazz"], Price = 8.99M, Artist = artists["Aaron Goldberg"], AlbumArtUrl = imgUrl }, - new Album { Title = "Worship Music", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Anthrax"], AlbumArtUrl = imgUrl }, - new Album { Title = "X&Y", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Coldplay"], AlbumArtUrl = imgUrl }, - new Album { Title = "Xinti", Genre = genres["World"], Price = 8.99M, Artist = artists["Sara Tavares"], AlbumArtUrl = imgUrl }, - new Album { Title = "Yano", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Yano"], AlbumArtUrl = imgUrl }, - new Album { Title = "Yesterday Once More Disc 1/Disc 2", Genre = genres["Pop"], Price = 8.99M, Artist = artists["The Carpenters"], AlbumArtUrl = imgUrl }, - new Album { Title = "Zooropa", Genre = genres["Rock"], Price = 8.99M, Artist = artists["U2"], AlbumArtUrl = imgUrl }, - new Album { Title = "Zoso", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Led Zeppelin"], AlbumArtUrl = imgUrl }, - }; - - foreach (var album in albums) - { - album.ArtistId = album.Artist.ArtistId; - album.GenreId = album.Genre.GenreId; - } - - return albums; - } - - private static Dictionary artists; - public static Dictionary Artists - { - get - { - if (artists == null) - { - var artistsList = new Artist[] - { - new Artist { Name = "65daysofstatic" }, - new Artist { Name = "Aaron Goldberg" }, - new Artist { Name = "Above & Beyond" }, - new Artist { Name = "Above the Fold" }, - new Artist { Name = "AC/DC" }, - new Artist { Name = "Accept" }, - new Artist { Name = "Adicts" }, - new Artist { Name = "Adrian Leaper & Doreen de Feis" }, - new Artist { Name = "Aerosmith" }, - new Artist { Name = "Aisha Duo" }, - new Artist { Name = "Al di Meola" }, - new Artist { Name = "Alabama Shakes" }, - new Artist { Name = "Alanis Morissette" }, - new Artist { Name = "Alberto Turco & Nova Schola Gregoriana" }, - new Artist { Name = "Alice in Chains" }, - new Artist { Name = "Alison Krauss" }, - new Artist { Name = "Amon Amarth" }, - new Artist { Name = "Amon Tobin" }, - new Artist { Name = "Amr Diab" }, - new Artist { Name = "Amy Winehouse" }, - new Artist { Name = "Anita Ward" }, - new Artist { Name = "Anthrax" }, - new Artist { Name = "Antônio Carlos Jobim" }, - new Artist { Name = "Apocalyptica" }, - new Artist { Name = "Aqua" }, - new Artist { Name = "Armand Van Helden" }, - new Artist { Name = "Arcade Fire" }, - new Artist { Name = "Audioslave" }, - new Artist { Name = "Bad Religion" }, - new Artist { Name = "Barenaked Ladies" }, - new Artist { Name = "BBC Concert Orchestra" }, - new Artist { Name = "Bee Gees" }, - new Artist { Name = "Before the Dawn" }, - new Artist { Name = "Berliner Philharmoniker" }, - new Artist { Name = "Billy Cobham" }, - new Artist { Name = "Black Label Society" }, - new Artist { Name = "Black Sabbath" }, - new Artist { Name = "BLØF" }, - new Artist { Name = "Blues Traveler" }, - new Artist { Name = "Boston Symphony Orchestra & Seiji Ozawa" }, - new Artist { Name = "Britten Sinfonia, Ivor Bolton & Lesley Garrett" }, - new Artist { Name = "Bruce Dickinson" }, - new Artist { Name = "Buddy Guy" }, - new Artist { Name = "Burial" }, - new Artist { Name = "Butch Walker & The Black Widows" }, - new Artist { Name = "Caetano Veloso" }, - new Artist { Name = "Cake" }, - new Artist { Name = "Calexico" }, - new Artist { Name = "Carly Rae Jepsen" }, - new Artist { Name = "Carreras, Pavarotti, Domingo" }, - new Artist { Name = "Cássia Eller" }, - new Artist { Name = "Cayouche" }, - new Artist { Name = "Chic" }, - new Artist { Name = "Chicago " }, - new Artist { Name = "Chicago Symphony Orchestra & Fritz Reiner" }, - new Artist { Name = "Chico Buarque" }, - new Artist { Name = "Chico Science & Nação Zumbi" }, - new Artist { Name = "Choir Of Westminster Abbey & Simon Preston" }, - new Artist { Name = "Chris Cornell" }, - new Artist { Name = "Christopher O'Riley" }, - new Artist { Name = "Cidade Negra" }, - new Artist { Name = "Cláudio Zoli" }, - new Artist { Name = "Coldplay" }, - new Artist { Name = "Creedence Clearwater Revival" }, - new Artist { Name = "Crosby, Stills, Nash, and Young" }, - new Artist { Name = "Daft Punk" }, - new Artist { Name = "Danielson Famile" }, - new Artist { Name = "David Bowie" }, - new Artist { Name = "David Coverdale" }, - new Artist { Name = "David Guetta" }, - new Artist { Name = "deadmau5" }, - new Artist { Name = "Deep Purple" }, - new Artist { Name = "Def Leppard" }, - new Artist { Name = "Deftones" }, - new Artist { Name = "Dennis Chambers" }, - new Artist { Name = "Deva Premal" }, - new Artist { Name = "Dio" }, - new Artist { Name = "Djavan" }, - new Artist { Name = "Dolly Parton" }, - new Artist { Name = "Donna Summer" }, - new Artist { Name = "Dr. Dre" }, - new Artist { Name = "Dread Zeppelin" }, - new Artist { Name = "Dream Theater" }, - new Artist { Name = "Duck Sauce" }, - new Artist { Name = "Earl Scruggs" }, - new Artist { Name = "Ed Motta" }, - new Artist { Name = "Edo de Waart & San Francisco Symphony" }, - new Artist { Name = "Elis Regina" }, - new Artist { Name = "Eminem" }, - new Artist { Name = "English Concert & Trevor Pinnock" }, - new Artist { Name = "Enya" }, - new Artist { Name = "Epica" }, - new Artist { Name = "Eric B. and Rakim" }, - new Artist { Name = "Eric Clapton" }, - new Artist { Name = "Eugene Ormandy" }, - new Artist { Name = "Faith No More" }, - new Artist { Name = "Falamansa" }, - new Artist { Name = "Filter" }, - new Artist { Name = "Foo Fighters" }, - new Artist { Name = "Four Tet" }, - new Artist { Name = "Frank Zappa & Captain Beefheart" }, - new Artist { Name = "Fretwork" }, - new Artist { Name = "Funk Como Le Gusta" }, - new Artist { Name = "Garbage" }, - new Artist { Name = "Gerald Moore" }, - new Artist { Name = "Gilberto Gil" }, - new Artist { Name = "Godsmack" }, - new Artist { Name = "Gonzaguinha" }, - new Artist { Name = "Göteborgs Symfoniker & Neeme Järvi" }, - new Artist { Name = "Guns N' Roses" }, - new Artist { Name = "Gustav Mahler" }, - new Artist { Name = "In This Moment" }, - new Artist { Name = "Incognito" }, - new Artist { Name = "INXS" }, - new Artist { Name = "Iron Maiden" }, - new Artist { Name = "Jagjit Singh" }, - new Artist { Name = "James Levine" }, - new Artist { Name = "Jamiroquai" }, - new Artist { Name = "Jimi Hendrix" }, - new Artist { Name = "Jimmy Buffett" }, - new Artist { Name = "Jimmy Smith" }, - new Artist { Name = "Joe Satriani" }, - new Artist { Name = "John Digweed" }, - new Artist { Name = "John Mayer" }, - new Artist { Name = "Jorge Ben" }, - new Artist { Name = "Jota Quest" }, - new Artist { Name = "Journey" }, - new Artist { Name = "Judas Priest" }, - new Artist { Name = "Julian Bream" }, - new Artist { Name = "Justice" }, - new Artist { Name = "Orchestre de l'Opéra de Lyon" }, - new Artist { Name = "King Crimson" }, - new Artist { Name = "Kiss" }, - new Artist { Name = "LCD Soundsystem" }, - new Artist { Name = "Le Tigre" }, - new Artist { Name = "Led Zeppelin" }, - new Artist { Name = "Legião Urbana" }, - new Artist { Name = "Lenny Kravitz" }, - new Artist { Name = "Les Arts Florissants & William Christie" }, - new Artist { Name = "Limp Bizkit" }, - new Artist { Name = "Linkin Park" }, - new Artist { Name = "Live" }, - new Artist { Name = "Lokua Kanza" }, - new Artist { Name = "London Symphony Orchestra" }, - new Artist { Name = "Los Tigres del Norte" }, - new Artist { Name = "Luciana Souza/Romero Lubambo" }, - new Artist { Name = "Lulu Santos" }, - new Artist { Name = "Lura" }, - new Artist { Name = "Marcos Valle" }, - new Artist { Name = "Marillion" }, - new Artist { Name = "Marisa Monte" }, - new Artist { Name = "Mark Knopfler" }, - new Artist { Name = "Martin Roscoe" }, - new Artist { Name = "Massive Attack" }, - new Artist { Name = "Maurizio Pollini" }, - new Artist { Name = "Megadeth" }, - new Artist { Name = "Mela Tenenbaum, Pro Musica Prague & Richard Kapp" }, - new Artist { Name = "Melanie Fiona" }, - new Artist { Name = "Men At Work" }, - new Artist { Name = "Metallica" }, - new Artist { Name = "M-Flo" }, - new Artist { Name = "Michael Bolton" }, - new Artist { Name = "Michael Tilson Thomas" }, - new Artist { Name = "Miles Davis" }, - new Artist { Name = "Milton Nascimento" }, - new Artist { Name = "Mobile" }, - new Artist { Name = "Modest Mouse" }, - new Artist { Name = "Mötley Crüe" }, - new Artist { Name = "Motörhead" }, - new Artist { Name = "Mumford & Sons" }, - new Artist { Name = "Munkle" }, - new Artist { Name = "Nash Ensemble" }, - new Artist { Name = "Neil Young" }, - new Artist { Name = "New York Dolls" }, - new Artist { Name = "Nick Cave and the Bad Seeds" }, - new Artist { Name = "Nicolaus Esterhazy Sinfonia" }, - new Artist { Name = "Nine Inch Nails" }, - new Artist { Name = "Nirvana" }, - new Artist { Name = "Norah Jones" }, - new Artist { Name = "Nujabes" }, - new Artist { Name = "O Terço" }, - new Artist { Name = "Oasis" }, - new Artist { Name = "Olodum" }, - new Artist { Name = "Opeth" }, - new Artist { Name = "Orchestra of The Age of Enlightenment" }, - new Artist { Name = "Os Paralamas Do Sucesso" }, - new Artist { Name = "Ozzy Osbourne" }, - new Artist { Name = "Paddy Casey" }, - new Artist { Name = "Page & Plant" }, - new Artist { Name = "Papa Wemba" }, - new Artist { Name = "Paul D'Ianno" }, - new Artist { Name = "Paul Oakenfold" }, - new Artist { Name = "Paul Van Dyk" }, - new Artist { Name = "Pearl Jam" }, - new Artist { Name = "Pet Shop Boys" }, - new Artist { Name = "Pink Floyd" }, - new Artist { Name = "Plug" }, - new Artist { Name = "Porcupine Tree" }, - new Artist { Name = "Portishead" }, - new Artist { Name = "Prince" }, - new Artist { Name = "Projected" }, - new Artist { Name = "PSY" }, - new Artist { Name = "Public Enemy" }, - new Artist { Name = "Queen" }, - new Artist { Name = "Queensrÿche" }, - new Artist { Name = "R.E.M." }, - new Artist { Name = "Radiohead" }, - new Artist { Name = "Rancid" }, - new Artist { Name = "Raul Seixas" }, - new Artist { Name = "Raunchy" }, - new Artist { Name = "Red Hot Chili Peppers" }, - new Artist { Name = "Rick Ross" }, - new Artist { Name = "Robert James" }, - new Artist { Name = "London Classical Players" }, - new Artist { Name = "Royal Philharmonic Orchestra" }, - new Artist { Name = "Run DMC" }, - new Artist { Name = "Rush" }, - new Artist { Name = "Santana" }, - new Artist { Name = "Sara Tavares" }, - new Artist { Name = "Sarah Brightman" }, - new Artist { Name = "Sasha" }, - new Artist { Name = "Scholars Baroque Ensemble" }, - new Artist { Name = "Scorpions" }, - new Artist { Name = "Sergei Prokofiev & Yuri Temirkanov" }, - new Artist { Name = "Sheryl Crow" }, - new Artist { Name = "Sir Georg Solti & Wiener Philharmoniker" }, - new Artist { Name = "Skank" }, - new Artist { Name = "Skrillex" }, - new Artist { Name = "Slash" }, - new Artist { Name = "Slayer" }, - new Artist { Name = "Soul-Junk" }, - new Artist { Name = "Soundgarden" }, - new Artist { Name = "Spyro Gyra" }, - new Artist { Name = "Stevie Ray Vaughan & Double Trouble" }, - new Artist { Name = "Stevie Ray Vaughan" }, - new Artist { Name = "Sting" }, - new Artist { Name = "Stone Temple Pilots" }, - new Artist { Name = "Styx" }, - new Artist { Name = "Sufjan Stevens" }, - new Artist { Name = "Supreme Beings of Leisure" }, - new Artist { Name = "System Of A Down" }, - new Artist { Name = "T&N" }, - new Artist { Name = "Talking Heads" }, - new Artist { Name = "Tears For Fears" }, - new Artist { Name = "Ted Nugent" }, - new Artist { Name = "Temple of the Dog" }, - new Artist { Name = "Terry Bozzio, Tony Levin & Steve Stevens" }, - new Artist { Name = "The 12 Cellists of The Berlin Philharmonic" }, - new Artist { Name = "The Axis of Awesome" }, - new Artist { Name = "The Beatles" }, - new Artist { Name = "The Black Crowes" }, - new Artist { Name = "The Black Keys" }, - new Artist { Name = "The Carpenters" }, - new Artist { Name = "The Cat Empire" }, - new Artist { Name = "The Cult" }, - new Artist { Name = "The Cure" }, - new Artist { Name = "The Decemberists" }, - new Artist { Name = "The Doors" }, - new Artist { Name = "The Eagles of Death Metal" }, - new Artist { Name = "The Go! Team" }, - new Artist { Name = "The Head and the Heart" }, - new Artist { Name = "The Jezabels" }, - new Artist { Name = "The King's Singers" }, - new Artist { Name = "The Lumineers" }, - new Artist { Name = "The Offspring" }, - new Artist { Name = "The Police" }, - new Artist { Name = "The Posies" }, - new Artist { Name = "The Prodigy" }, - new Artist { Name = "The Rolling Stones" }, - new Artist { Name = "The Rubberbandits" }, - new Artist { Name = "The Smashing Pumpkins" }, - new Artist { Name = "The Stone Roses" }, - new Artist { Name = "The Who" }, - new Artist { Name = "Them Crooked Vultures" }, - new Artist { Name = "TheStart" }, - new Artist { Name = "Thievery Corporation" }, - new Artist { Name = "Tiësto" }, - new Artist { Name = "Tim Maia" }, - new Artist { Name = "Ton Koopman" }, - new Artist { Name = "Tool" }, - new Artist { Name = "Tori Amos" }, - new Artist { Name = "Trampled By Turtles" }, - new Artist { Name = "Trans-Siberian Orchestra" }, - new Artist { Name = "Tygers of Pan Tang" }, - new Artist { Name = "U2" }, - new Artist { Name = "UB40" }, - new Artist { Name = "Uh Huh Her " }, - new Artist { Name = "Van Halen" }, - new Artist { Name = "Various Artists" }, - new Artist { Name = "Velvet Revolver" }, - new Artist { Name = "Venus Hum" }, - new Artist { Name = "Vicente Fernandez" }, - new Artist { Name = "Vinícius De Moraes" }, - new Artist { Name = "Weezer" }, - new Artist { Name = "Weird Al" }, - new Artist { Name = "Wendy Carlos" }, - new Artist { Name = "Wilhelm Kempff" }, - new Artist { Name = "Yano" }, - new Artist { Name = "Yehudi Menuhin" }, - new Artist { Name = "Yes" }, - new Artist { Name = "Yo-Yo Ma" }, - new Artist { Name = "Zeca Pagodinho" }, - new Artist { Name = "אריק אינשטיין"} - }; - - // TODO [EF] Swap to store generated keys when available - int artistId = 1; - artists = new Dictionary(); - foreach (Artist artist in artistsList) - { - artist.ArtistId = artistId++; - artists.Add(artist.Name, artist); - } - } - - return artists; - } - } - - private static Dictionary genres; - public static Dictionary Genres - { - get - { - if (genres == null) - { - var genresList = new Genre[] - { - new Genre { Name = "Pop" }, - new Genre { Name = "Rock" }, - new Genre { Name = "Jazz" }, - new Genre { Name = "Metal" }, - new Genre { Name = "Electronic" }, - new Genre { Name = "Blues" }, - new Genre { Name = "Latin" }, - new Genre { Name = "Rap" }, - new Genre { Name = "Classical" }, - new Genre { Name = "Alternative" }, - new Genre { Name = "Country" }, - new Genre { Name = "R&B" }, - new Genre { Name = "Indie" }, - new Genre { Name = "Punk" }, - new Genre { Name = "World" } - }; - - genres = new Dictionary(); - // TODO [EF] Swap to store generated keys when available - int genreId = 1; - foreach (Genre genre in genresList) - { - genre.GenreId = genreId++; - - // TODO [EF] Remove when null values are supported by update pipeline - genre.Description = genre.Name + " is great music (if you like it)."; - - genres.Add(genre.Name, genre); - } - } - - return genres; - } - } - } -} diff --git a/samples/angular/MusicStore/Apis/Models/SentimentAnalysis.cs b/samples/angular/MusicStore/Apis/Models/SentimentAnalysis.cs deleted file mode 100644 index 8167ec3d..00000000 --- a/samples/angular/MusicStore/Apis/Models/SentimentAnalysis.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System.Linq; -using System.Text.RegularExpressions; - -namespace MusicStore.Models -{ - // Obviously this is not a serious sentiment analyser. It is only here to provide an amusing demonstration of cross-property - // validation in AlbumsApiController. - public static class SentimentAnalysis - { - private static string[] positiveSentimentWords = new[] { "happy", "fun", "joy", "love", "delight", "bunny", "bunnies", "asp.net" }; - - private static string[] negativeSentimentWords = new[] { "sad", "pain", "despair", "hate", "scorn", "death", "package management" }; - - public static SentimentResult GetSentiment(string text) { - var numPositiveWords = CountWordOccurrences(text, positiveSentimentWords); - var numNegativeWords = CountWordOccurrences(text, negativeSentimentWords); - if (numPositiveWords > numNegativeWords) { - return SentimentResult.Positive; - } else if (numNegativeWords > numPositiveWords) { - return SentimentResult.Negative; - } else { - return SentimentResult.Neutral; - } - } - - private static int CountWordOccurrences(string text, string[] words) - { - // Very simplistic matching technique for this sample. Not scalable and not really even correct. - return new Regex(string.Join("|", words), RegexOptions.IgnoreCase).Matches(text).Count; - } - - public enum SentimentResult { - Negative, - Neutral, - Positive, - } - } -} diff --git a/samples/angular/MusicStore/Apis/Models/ShoppingCart.cs b/samples/angular/MusicStore/Apis/Models/ShoppingCart.cs deleted file mode 100644 index 1d2465ab..00000000 --- a/samples/angular/MusicStore/Apis/Models/ShoppingCart.cs +++ /dev/null @@ -1,207 +0,0 @@ -using Microsoft.AspNetCore.Http; -using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.Linq; - -namespace MusicStore.Models -{ - public partial class ShoppingCart - { - MusicStoreContext _db; - string ShoppingCartId { get; set; } - - public ShoppingCart(MusicStoreContext db) - { - _db = db; - } - - public static ShoppingCart GetCart(MusicStoreContext db, HttpContext context) - { - var cart = new ShoppingCart(db); - cart.ShoppingCartId = cart.GetCartId(context); - return cart; - } - - public void AddToCart(Album album) - { - // Get the matching cart and album instances - var cartItem = _db.CartItems.SingleOrDefault( - c => c.CartId == ShoppingCartId - && c.AlbumId == album.AlbumId); - - if (cartItem == null) - { - // TODO [EF] Swap to store generated key once we support identity pattern - var nextCartItemId = _db.CartItems.Any() - ? _db.CartItems.Max(c => c.CartItemId) + 1 - : 1; - - // Create a new cart item if no cart item exists - cartItem = new CartItem - { - CartItemId = nextCartItemId, - AlbumId = album.AlbumId, - CartId = ShoppingCartId, - Count = 1, - DateCreated = DateTime.Now - }; - - _db.CartItems.Add(cartItem); - } - else - { - // If the item does exist in the cart, then add one to the quantity - cartItem.Count++; - - // TODO [EF] Remove this line once change detection is available - _db.Update(cartItem); - } - } - - public int RemoveFromCart(int id) - { - // Get the cart - var cartItem = _db.CartItems.Single( - cart => cart.CartId == ShoppingCartId - && cart.CartItemId == id); - - int itemCount = 0; - - if (cartItem != null) - { - if (cartItem.Count > 1) - { - cartItem.Count--; - - // TODO [EF] Remove this line once change detection is available - _db.Update(cartItem); - - itemCount = cartItem.Count; - } - else - { - _db.CartItems.Remove(cartItem); - } - } - - return itemCount; - } - - public void EmptyCart() - { - var cartItems = _db.CartItems.Where(cart => cart.CartId == ShoppingCartId); - - foreach (var cartItem in cartItems) - { - _db.Remove(cartItem); - } - } - - public List GetCartItems() - { - var cartItems = _db.CartItems.Where(cart => cart.CartId == ShoppingCartId).ToList(); - //TODO: Auto population of the related album data not available until EF feature is lighted up. - foreach (var cartItem in cartItems) - { - cartItem.Album = _db.Albums.Single(a => a.AlbumId == cartItem.AlbumId); - } - - return cartItems; - } - - public int GetCount() - { - // Get the count of each item in the cart and sum them up - int? count = (from cartItems in _db.CartItems - where cartItems.CartId == ShoppingCartId - select (int?)cartItems.Count).Sum(); - - // Return 0 if all entries are null - return count ?? 0; - } - - public decimal GetTotal() - { - // Multiply album price by count of that album to get - // the current price for each of those albums in the cart - // sum all album price totals to get the cart total - - // TODO Collapse to a single query once EF supports querying related data - decimal total = 0; - foreach (var item in _db.CartItems.Where(c => c.CartId == ShoppingCartId)) - { - var album = _db.Albums.Single(a => a.AlbumId == item.AlbumId); - total += item.Count * album.Price; - } - - return total; - } - - public int CreateOrder(Order order) - { - decimal orderTotal = 0; - - var cartItems = GetCartItems(); - - // TODO [EF] Swap to store generated identity key when supported - var nextId = _db.OrderDetails.Any() - ? _db.OrderDetails.Max(o => o.OrderDetailId) + 1 - : 1; - - // Iterate over the items in the cart, adding the order details for each - foreach (var item in cartItems) - { - //var album = _db.Albums.Find(item.AlbumId); - var album = _db.Albums.Single(a => a.AlbumId == item.AlbumId); - - var orderDetail = new OrderDetail - { - OrderDetailId = nextId, - AlbumId = item.AlbumId, - OrderId = order.OrderId, - UnitPrice = album.Price, - Quantity = item.Count, - }; - - // Set the order total of the shopping cart - orderTotal += (item.Count * album.Price); - - _db.OrderDetails.Add(orderDetail); - - nextId++; - } - - // Set the order's total to the orderTotal count - order.Total = orderTotal; - - // Empty the shopping cart - EmptyCart(); - - // Return the OrderId as the confirmation number - return order.OrderId; - } - - // We're using HttpContextBase to allow access to cookies. - public string GetCartId(HttpContext context) - { - var sessionCookie = context.Request.Cookies["Session"]; - string cartId = null; - - if (string.IsNullOrWhiteSpace(sessionCookie)) - { - //A GUID to hold the cartId. - cartId = Guid.NewGuid().ToString(); - - // Send cart Id as a cookie to the client. - context.Response.Cookies.Append("Session", cartId); - } - else - { - cartId = sessionCookie; - } - - return cartId; - } - } -} diff --git a/samples/angular/MusicStore/Controllers/HomeController.cs b/samples/angular/MusicStore/Controllers/HomeController.cs deleted file mode 100755 index 07e97022..00000000 --- a/samples/angular/MusicStore/Controllers/HomeController.cs +++ /dev/null @@ -1,17 +0,0 @@ -using Microsoft.AspNetCore.Mvc; - -namespace MusicStore.Controllers -{ - public class HomeController : Controller - { - public IActionResult Index() - { - return View(); - } - - public IActionResult Error() - { - return View("~/Views/Shared/Error.cshtml"); - } - } -} diff --git a/samples/angular/MusicStore/Infrastructure/NoCacheAttribute.cs b/samples/angular/MusicStore/Infrastructure/NoCacheAttribute.cs deleted file mode 100644 index 856023a8..00000000 --- a/samples/angular/MusicStore/Infrastructure/NoCacheAttribute.cs +++ /dev/null @@ -1,19 +0,0 @@ -using Microsoft.AspNetCore.Mvc; -using System; -using Microsoft.AspNetCore.Mvc.Filters; - -namespace MusicStore.Infrastructure -{ - [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method)] - public sealed class NoCacheAttribute : ActionFilterAttribute - { - public override void OnResultExecuting(ResultExecutingContext context) - { - context.HttpContext.Response.Headers["Cache-Control"] = "no-cache, no-store, max-age=0"; - context.HttpContext.Response.Headers["Pragma"] = "no-cache"; - context.HttpContext.Response.Headers["Expires"] = "-1"; - - base.OnResultExecuting(context); - } - } -} diff --git a/samples/angular/MusicStore/Infrastructure/PagedList.cs b/samples/angular/MusicStore/Infrastructure/PagedList.cs deleted file mode 100644 index b2cb2c57..00000000 --- a/samples/angular/MusicStore/Infrastructure/PagedList.cs +++ /dev/null @@ -1,150 +0,0 @@ -using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Linq.Expressions; -using System.Threading.Tasks; - -namespace MusicStore.Infrastructure -{ - public interface IPagedList - { - IEnumerable Data { get; } - - int Page { get; } - - int PageSize { get; } - - int TotalCount { get; } - } - - internal class PagedList : IPagedList - { - public PagedList(IEnumerable data, int page, int pageSize, int totalCount) - { - Data = data; - Page = page; - PageSize = pageSize; - TotalCount = totalCount; - } - - public IEnumerable Data { get; private set; } - - public int Page { get; private set; } - - public int PageSize { get; private set; } - - public int TotalCount { get; private set; } - } - - public static class PagedListExtensions - { - public static IPagedList ToPagedList(this IQueryable query, int page, int pageSize) - { - if (query == null) - { - throw new ArgumentNullException("query"); - } - - var pagingConfig = new PagingConfig(page, pageSize); - var skipCount = ValidatePagePropertiesAndGetSkipCount(pagingConfig); - - var data = query - .Skip(skipCount) - .Take(pagingConfig.PageSize) - .ToList(); - - if (skipCount > 0 && data.Count == 0) - { - // Requested page has no records, just return the first page - pagingConfig.Page = 1; - data = query - .Take(pagingConfig.PageSize) - .ToList(); - } - - return new PagedList(data, pagingConfig.Page, pagingConfig.PageSize, query.Count()); - } - - public static Task> ToPagedListAsync(this IQueryable query, int page, int pageSize, string sortExpression, Expression> defaultSortExpression, SortDirection defaultSortDirection = SortDirection.Ascending) - where TModel : class - { - return ToPagedListAsync(query, page, pageSize, sortExpression, defaultSortExpression, defaultSortDirection, null); - } - - public static async Task> ToPagedListAsync(this IQueryable query, int page, int pageSize, string sortExpression, Expression> defaultSortExpression, SortDirection defaultSortDirection, Func selector) - where TModel : class - where TResult : class - { - if (query == null) - { - throw new ArgumentNullException("query"); - } - - var pagingConfig = new PagingConfig(page, pageSize); - var skipCount = ValidatePagePropertiesAndGetSkipCount(pagingConfig); - var dataQuery = query; - - if (defaultSortExpression != null) - { - dataQuery = dataQuery - .SortBy(sortExpression, defaultSortExpression); - } - - var data = await dataQuery - .Skip(skipCount) - .Take(pagingConfig.PageSize) - .ToListAsync(); - - if (skipCount > 0 && data.Count == 0) - { - // Requested page has no records, just return the first page - pagingConfig.Page = 1; - data = await dataQuery - .Take(pagingConfig.PageSize) - .ToListAsync(); - } - - var count = await query.CountAsync(); - - var resultData = selector != null - ? data.Select(selector) - : data.Cast(); - - return new PagedList(resultData, pagingConfig.Page, pagingConfig.PageSize, count); - } - - private static int ValidatePagePropertiesAndGetSkipCount(PagingConfig pagingConfig) - { - if (pagingConfig.Page < 1) - { - pagingConfig.Page = 1; - } - - if (pagingConfig.PageSize < 10) - { - pagingConfig.PageSize = 10; - } - - if (pagingConfig.PageSize > 100) - { - pagingConfig.PageSize = 100; - } - - return pagingConfig.PageSize * (pagingConfig.Page - 1); - } - - internal class PagingConfig - { - public PagingConfig(int page, int pageSize) - { - Page = page; - PageSize = pageSize; - } - - public int Page { get; set; } - - public int PageSize { get; set; } - } - } -} diff --git a/samples/angular/MusicStore/Infrastructure/SortDirection.cs b/samples/angular/MusicStore/Infrastructure/SortDirection.cs deleted file mode 100644 index 28f7e86c..00000000 --- a/samples/angular/MusicStore/Infrastructure/SortDirection.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace MusicStore.Infrastructure -{ - public enum SortDirection - { - Ascending, - Descending - } -} diff --git a/samples/angular/MusicStore/Infrastructure/SortExpression.cs b/samples/angular/MusicStore/Infrastructure/SortExpression.cs deleted file mode 100644 index 88ba312c..00000000 --- a/samples/angular/MusicStore/Infrastructure/SortExpression.cs +++ /dev/null @@ -1,87 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Linq.Expressions; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; - -namespace MusicStore.Infrastructure -{ - public static class SortExpression - { - private const string SORT_DIRECTION_DESC = " DESC"; - - public static IQueryable SortBy(this IQueryable query, string sortExpression, Expression> defaultSortExpression, SortDirection defaultSortDirection = SortDirection.Ascending) where TModel : class - { - return SortBy(query, sortExpression ?? Create(defaultSortExpression, defaultSortDirection)); - } - - public static string Create(Expression> expression, SortDirection sortDirection = SortDirection.Ascending) where TModel : class - { - var expressionText = ExpressionHelper.GetExpressionText(expression); - // TODO: Validate the expression depth, etc. - - var sortExpression = expressionText; - - if (sortDirection == SortDirection.Descending) - { - sortExpression += SORT_DIRECTION_DESC; - } - - return sortExpression; - } - - public static IQueryable SortBy(this IQueryable source, string sortExpression) where T : class - { - if (source == null) - { - throw new ArgumentNullException("source"); - } - - if (String.IsNullOrWhiteSpace(sortExpression)) - { - return source; - } - - sortExpression = sortExpression.Trim(); - var isDescending = false; - - // DataSource control passes the sort parameter with a direction - // if the direction is descending - if (sortExpression.EndsWith(SORT_DIRECTION_DESC, StringComparison.OrdinalIgnoreCase)) - { - isDescending = true; - var descIndex = sortExpression.Length - SORT_DIRECTION_DESC.Length; - sortExpression = sortExpression.Substring(0, descIndex).Trim(); - } - - if (string.IsNullOrEmpty(sortExpression)) - { - return source; - } - - ParameterExpression parameter = Expression.Parameter(source.ElementType, String.Empty); - - // Build up the property expression, e.g.: (m => m.Foo.Bar) - var sortExpressionParts = sortExpression.Split('.'); - Expression propertyExpression = parameter; - foreach (var property in sortExpressionParts) - { - propertyExpression = Expression.Property(propertyExpression, property); - } - - LambdaExpression lambda = Expression.Lambda(propertyExpression, parameter); - - var methodName = (isDescending) ? "OrderByDescending" : "OrderBy"; - - Expression methodCallExpression = Expression.Call( - typeof(Queryable), - methodName, - new[] { source.ElementType, propertyExpression.Type }, - source.Expression, - Expression.Quote(lambda)); - - return (IQueryable)source.Provider.CreateQuery(methodCallExpression); - } - } -} diff --git a/samples/angular/MusicStore/MusicStore.csproj b/samples/angular/MusicStore/MusicStore.csproj deleted file mode 100644 index 8f811943..00000000 --- a/samples/angular/MusicStore/MusicStore.csproj +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - netcoreapp2.0 - true - false - - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/angular/MusicStore/Startup.cs b/samples/angular/MusicStore/Startup.cs deleted file mode 100755 index ae1961fc..00000000 --- a/samples/angular/MusicStore/Startup.cs +++ /dev/null @@ -1,103 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Identity.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; -using Microsoft.Extensions.PlatformAbstractions; -using AutoMapper; -using MusicStore.Apis; -using MusicStore.Models; - -namespace MusicStore -{ - public class Startup - { - // This method gets called by the runtime. Use this method to add services to the container. - public void ConfigureServices(IServiceCollection services) - { - services.AddMvc().AddJsonOptions(options => - { - options.SerializerSettings.ContractResolver = null; - }); - - // Add EF services to the service container - services - .AddEntityFrameworkSqlite() - .AddDbContext(options => { - options.UseSqlite("Data Source=music-db.sqlite"); - }); - - // Add Identity services to the services container - services.AddIdentity() - .AddEntityFrameworkStores() - .AddDefaultTokenProviders(); - - // Configure Auth - services.Configure(options => - { - options.AddPolicy("app-ManageStore", new AuthorizationPolicyBuilder().RequireClaim("app-ManageStore", "Allowed").Build()); - }); - - Mapper.Initialize(cfg => - { - cfg.CreateMap(); - cfg.CreateMap(); - cfg.CreateMap(); - cfg.CreateMap(); - cfg.CreateMap(); - cfg.CreateMap(); - cfg.CreateMap(); - cfg.CreateMap(); - }); - } - - // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory, IHostingEnvironment env) - { - app.UseDeveloperExceptionPage(); - - // Initialize the sample data - SampleData.InitializeMusicStoreDatabaseAsync(app.ApplicationServices).Wait(); - - app.UseStaticFiles(); - loggerFactory.AddConsole(); - - // Add MVC to the request pipeline. - app.UseMvc(routes => - { - // Matches requests that correspond to an existent controller/action pair - routes.MapRoute( - name: "default", - template: "{controller=Home}/{action=Index}/{id?}"); - - // Matches any other request that doesn't appear to have a filename extension (defined as 'having a dot in the last URI segment'). - // This means you'll correctly get 404s for /some/dir/non-existent-image.png instead of returning the SPA HTML. - // However, it means requests like /customers/isaac.newton will *not* be mapped into the SPA, so if you need to accept - // URIs like that you'll need to match all URIs, e.g.: - // routes.MapRoute("spa-fallback", "{*anything}", new { controller = "Home", action = "Index" }); - // (which of course will match /customers/isaac.png too, so in that case it would serve the PNG image at that URL if one is on disk, - // or the SPA HTML if not). - routes.MapSpaFallbackRoute("spa-fallback", new { controller = "Home", action = "Index" }); - }); - } - - public static void Main(string[] args) - { - var host = new WebHostBuilder() - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIISIntegration() - .UseKestrel() - .UseStartup() - .Build(); - - host.Run(); - } - } -} diff --git a/samples/angular/MusicStore/Views/Home/Index.cshtml b/samples/angular/MusicStore/Views/Home/Index.cshtml deleted file mode 100755 index a2799f70..00000000 --- a/samples/angular/MusicStore/Views/Home/Index.cshtml +++ /dev/null @@ -1,23 +0,0 @@ -@{ - ViewData["Title"] = "Home Page"; -} - - - Loading... - @await Html.PrimeCacheAsync(Url.Action("GenreMenuList", "GenresApi")) - @await Html.PrimeCacheAsync(Url.Action("MostPopular", "AlbumsApi")) - - -@section scripts { - - - - - - - - - - - -} diff --git a/samples/angular/MusicStore/Views/Shared/Error.cshtml b/samples/angular/MusicStore/Views/Shared/Error.cshtml deleted file mode 100755 index 473b35d6..00000000 --- a/samples/angular/MusicStore/Views/Shared/Error.cshtml +++ /dev/null @@ -1,6 +0,0 @@ -@{ - ViewData["Title"] = "Error"; -} - -

Error.

-

An error occurred while processing your request.

diff --git a/samples/angular/MusicStore/Views/Shared/_Layout.cshtml b/samples/angular/MusicStore/Views/Shared/_Layout.cshtml deleted file mode 100755 index 562ccf83..00000000 --- a/samples/angular/MusicStore/Views/Shared/_Layout.cshtml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - Music Store - - - - - - - - - - - - - @RenderBody() - - - - - - - - - - - @RenderSection("scripts", required: false) - - diff --git a/samples/angular/MusicStore/Views/_ViewImports.cshtml b/samples/angular/MusicStore/Views/_ViewImports.cshtml deleted file mode 100755 index 3e7a43a3..00000000 --- a/samples/angular/MusicStore/Views/_ViewImports.cshtml +++ /dev/null @@ -1,4 +0,0 @@ -@using MusicStore -@using Microsoft.AspNetCore.AngularServices -@addTagHelper "*, Microsoft.AspNetCore.Mvc.TagHelpers" -@addTagHelper "*, Microsoft.AspNetCore.SpaServices" diff --git a/samples/angular/MusicStore/Views/_ViewStart.cshtml b/samples/angular/MusicStore/Views/_ViewStart.cshtml deleted file mode 100755 index 820a2f6e..00000000 --- a/samples/angular/MusicStore/Views/_ViewStart.cshtml +++ /dev/null @@ -1,3 +0,0 @@ -@{ - Layout = "_Layout"; -} diff --git a/samples/angular/MusicStore/gulpfile.js b/samples/angular/MusicStore/gulpfile.js deleted file mode 100755 index 215f9932..00000000 --- a/samples/angular/MusicStore/gulpfile.js +++ /dev/null @@ -1,53 +0,0 @@ -/// - -"use strict"; - -var path = require('path'); -var gulp = require('gulp'); -var del = require('del'); -var typescript = require('gulp-typescript'); -var inlineNg2Template = require('gulp-inline-ng2-template'); -var sourcemaps = require('gulp-sourcemaps'); - -var webroot = "./wwwroot/"; - -var config = { - libBase: 'node_modules', - lib: [ - require.resolve('bootstrap/dist/css/bootstrap.css'), - path.dirname(require.resolve('bootstrap/dist/fonts/glyphicons-halflings-regular.woff')) + '/**', - require.resolve('angular2/bundles/angular2-polyfills.js'), - require.resolve('traceur/bin/traceur-runtime.js'), - require.resolve('es6-module-loader/dist/es6-module-loader-sans-promises.js'), - require.resolve('systemjs/dist/system.src.js'), - require.resolve('angular2/bundles/angular2.dev.js'), - require.resolve('angular2/bundles/router.dev.js'), - require.resolve('angular2/bundles/http.dev.js'), - require.resolve('angular2-aspnet/bundles/angular2-aspnet.js'), - require.resolve('jquery/dist/jquery.js'), - require.resolve('bootstrap/dist/js/bootstrap.js'), - require.resolve('rxjs/bundles/Rx.js') - ] -}; - -gulp.task('build.lib', function () { - return gulp.src(config.lib, { base: config.libBase }) - .pipe(gulp.dest(webroot + 'lib')); -}); - -gulp.task('build', ['build.lib'], function () { - var tsProject = typescript.createProject('./tsconfig.json', { typescript: require('typescript') }); - var tsSrcInlined = gulp.src([webroot + '**/*.ts', 'typings/**/*.d.ts'], { base: webroot }) - .pipe(inlineNg2Template({ base: webroot })); - return tsSrcInlined - .pipe(sourcemaps.init()) - .pipe(typescript(tsProject)) - .pipe(sourcemaps.write()) - .pipe(gulp.dest(webroot)); -}); - -gulp.task('clean', function () { - return del([webroot + 'lib']); -}); - -gulp.task('default', ['build']); diff --git a/samples/angular/MusicStore/package.json b/samples/angular/MusicStore/package.json deleted file mode 100644 index 9946fcbb..00000000 --- a/samples/angular/MusicStore/package.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "name": "MusicStore", - "version": "0.0.0", - "dependencies": { - "angular2": "2.0.0-beta.15", - "angular2-aspnet": "^0.0.6", - "angular2-universal": "0.98.1", - "angular2-express-engine": "0.11.1", - "angular2-hapi-engine": "0.11.1", - "aspnet-prerendering": "^1.0.1", - "bootstrap": "^3.3.5", - "css": "^2.2.1", - "es6-module-loader": "0.15.0", - "es6-shim": "^0.35.0", - "isomorphic-fetch": "^2.2.1", - "jquery": "^2.1.4", - "less": "^2.5.3", - "preboot": "2.0.5", - "rxjs": "5.0.0-beta.2", - "systemjs": "^0.19.3", - "traceur": "0.0.106", - "zone.js": "^0.6.10" - }, - "devDependencies": { - "del": "^2.0.2", - "gulp": "^3.9.0", - "gulp-inline-ng2-template": "0.0.7", - "gulp-sourcemaps": "^1.6.0", - "gulp-typescript": "^2.9.0", - "typescript": "^1.6.2" - } -} diff --git a/samples/angular/MusicStore/tsconfig.json b/samples/angular/MusicStore/tsconfig.json deleted file mode 100644 index a4c5eeb7..00000000 --- a/samples/angular/MusicStore/tsconfig.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "compilerOptions": { - "module": "commonjs", - "target": "es5", - "sourceMap": false, - "emitDecoratorMetadata": true, - "experimentalDecorators": true, - "noLib": false - }, - "exclude": [ - "node_modules" - ] -} diff --git a/samples/angular/MusicStore/tsd.json b/samples/angular/MusicStore/tsd.json deleted file mode 100644 index dc2f9671..00000000 --- a/samples/angular/MusicStore/tsd.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "version": "v4", - "repo": "borisyankov/DefinitelyTyped", - "ref": "master", - "path": "typings", - "bundle": "typings/tsd.d.ts", - "installed": { - "es6-shim/es6-shim.d.ts": { - "commit": "ec9eb4b28c74665a602c22db3457f0a76fa0fa23" - } - } -} diff --git a/samples/angular/MusicStore/typings/es6-shim/es6-shim.d.ts b/samples/angular/MusicStore/typings/es6-shim/es6-shim.d.ts deleted file mode 100644 index 1c3df0ed..00000000 --- a/samples/angular/MusicStore/typings/es6-shim/es6-shim.d.ts +++ /dev/null @@ -1,668 +0,0 @@ -// Type definitions for es6-shim v0.31.2 -// Project: https://github.com/paulmillr/es6-shim -// Definitions by: Ron Buckton -// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped - -declare type PropertyKey = string | number | symbol; - -interface IteratorResult { - done: boolean; - value?: T; -} - -interface IterableShim { - /** - * Shim for an ES6 iterable. Not intended for direct use by user code. - */ - "_es6-shim iterator_"(): Iterator; -} - -interface Iterator { - next(value?: any): IteratorResult; - return?(value?: any): IteratorResult; - throw?(e?: any): IteratorResult; -} - -interface IterableIteratorShim extends IterableShim, Iterator { - /** - * Shim for an ES6 iterable iterator. Not intended for direct use by user code. - */ - "_es6-shim iterator_"(): IterableIteratorShim; -} - -interface StringConstructor { - /** - * Return the String value whose elements are, in order, the elements in the List elements. - * If length is 0, the empty string is returned. - */ - fromCodePoint(...codePoints: number[]): string; - - /** - * String.raw is intended for use as a tag function of a Tagged Template String. When called - * as such the first argument will be a well formed template call site object and the rest - * parameter will contain the substitution values. - * @param template A well-formed template string call site representation. - * @param substitutions A set of substitution values. - */ - raw(template: TemplateStringsArray, ...substitutions: any[]): string; -} - -interface String { - /** - * Returns a nonnegative integer Number less than 1114112 (0x110000) that is the code point - * value of the UTF-16 encoded code point starting at the string element at position pos in - * the String resulting from converting this object to a String. - * If there is no element at that position, the result is undefined. - * If a valid UTF-16 surrogate pair does not begin at pos, the result is the code unit at pos. - */ - codePointAt(pos: number): number; - - /** - * Returns true if searchString appears as a substring of the result of converting this - * object to a String, at one or more positions that are - * greater than or equal to position; otherwise, returns false. - * @param searchString search string - * @param position If position is undefined, 0 is assumed, so as to search all of the String. - */ - includes(searchString: string, position?: number): boolean; - - /** - * Returns true if the sequence of elements of searchString converted to a String is the - * same as the corresponding elements of this object (converted to a String) starting at - * endPosition – length(this). Otherwise returns false. - */ - endsWith(searchString: string, endPosition?: number): boolean; - - /** - * Returns a String value that is made from count copies appended together. If count is 0, - * T is the empty String is returned. - * @param count number of copies to append - */ - repeat(count: number): string; - - /** - * Returns true if the sequence of elements of searchString converted to a String is the - * same as the corresponding elements of this object (converted to a String) starting at - * position. Otherwise returns false. - */ - startsWith(searchString: string, position?: number): boolean; - - /** - * Returns an HTML anchor element and sets the name attribute to the text value - * @param name - */ - anchor(name: string): string; - - /** Returns a HTML element */ - big(): string; - - /** Returns a HTML element */ - blink(): string; - - /** Returns a HTML element */ - bold(): string; - - /** Returns a HTML element */ - fixed(): string - - /** Returns a HTML element and sets the color attribute value */ - fontcolor(color: string): string - - /** Returns a HTML element and sets the size attribute value */ - fontsize(size: number): string; - - /** Returns a HTML element and sets the size attribute value */ - fontsize(size: string): string; - - /** Returns an HTML element */ - italics(): string; - - /** Returns an HTML element and sets the href attribute value */ - link(url: string): string; - - /** Returns a HTML element */ - small(): string; - - /** Returns a HTML element */ - strike(): string; - - /** Returns a HTML element */ - sub(): string; - - /** Returns a HTML element */ - sup(): string; - - /** - * Shim for an ES6 iterable. Not intended for direct use by user code. - */ - "_es6-shim iterator_"(): IterableIteratorShim; -} - -interface ArrayConstructor { - /** - * Creates an array from an array-like object. - * @param arrayLike An array-like object to convert to an array. - * @param mapfn A mapping function to call on every element of the array. - * @param thisArg Value of 'this' used to invoke the mapfn. - */ - from(arrayLike: ArrayLike, mapfn: (v: T, k: number) => U, thisArg?: any): Array; - - /** - * Creates an array from an iterable object. - * @param iterable An iterable object to convert to an array. - * @param mapfn A mapping function to call on every element of the array. - * @param thisArg Value of 'this' used to invoke the mapfn. - */ - from(iterable: IterableShim, mapfn: (v: T, k: number) => U, thisArg?: any): Array; - - /** - * Creates an array from an array-like object. - * @param arrayLike An array-like object to convert to an array. - */ - from(arrayLike: ArrayLike): Array; - - /** - * Creates an array from an iterable object. - * @param iterable An iterable object to convert to an array. - */ - from(iterable: IterableShim): Array; - - /** - * Returns a new array from a set of elements. - * @param items A set of elements to include in the new array object. - */ - of(...items: T[]): Array; -} - -interface Array { - /** - * Returns the value of the first element in the array where predicate is true, and undefined - * otherwise. - * @param predicate find calls predicate once for each element of the array, in ascending - * order, until it finds one where predicate returns true. If such an element is found, find - * immediately returns that element value. Otherwise, find returns undefined. - * @param thisArg If provided, it will be used as the this value for each invocation of - * predicate. If it is not provided, undefined is used instead. - */ - find(predicate: (value: T, index: number, obj: Array) => boolean, thisArg?: any): T; - - /** - * Returns the index of the first element in the array where predicate is true, and undefined - * otherwise. - * @param predicate find calls predicate once for each element of the array, in ascending - * order, until it finds one where predicate returns true. If such an element is found, find - * immediately returns that element value. Otherwise, find returns undefined. - * @param thisArg If provided, it will be used as the this value for each invocation of - * predicate. If it is not provided, undefined is used instead. - */ - findIndex(predicate: (value: T) => boolean, thisArg?: any): number; - - /** - * Returns the this object after filling the section identified by start and end with value - * @param value value to fill array section with - * @param start index to start filling the array at. If start is negative, it is treated as - * length+start where length is the length of the array. - * @param end index to stop filling the array at. If end is negative, it is treated as - * length+end. - */ - fill(value: T, start?: number, end?: number): T[]; - - /** - * Returns the this object after copying a section of the array identified by start and end - * to the same array starting at position target - * @param target If target is negative, it is treated as length+target where length is the - * length of the array. - * @param start If start is negative, it is treated as length+start. If end is negative, it - * is treated as length+end. - * @param end If not specified, length of the this object is used as its default value. - */ - copyWithin(target: number, start: number, end?: number): T[]; - - /** - * Returns an array of key, value pairs for every entry in the array - */ - entries(): IterableIteratorShim<[number, T]>; - - /** - * Returns an list of keys in the array - */ - keys(): IterableIteratorShim; - - /** - * Returns an list of values in the array - */ - values(): IterableIteratorShim; - - /** - * Shim for an ES6 iterable. Not intended for direct use by user code. - */ - "_es6-shim iterator_"(): IterableIteratorShim; -} - -interface NumberConstructor { - /** - * The value of Number.EPSILON is the difference between 1 and the smallest value greater than 1 - * that is representable as a Number value, which is approximately: - * 2.2204460492503130808472633361816 x 10‍−‍16. - */ - EPSILON: number; - - /** - * Returns true if passed value is finite. - * Unlike the global isFininte, Number.isFinite doesn't forcibly convert the parameter to a - * number. Only finite values of the type number, result in true. - * @param number A numeric value. - */ - isFinite(number: number): boolean; - - /** - * Returns true if the value passed is an integer, false otherwise. - * @param number A numeric value. - */ - isInteger(number: number): boolean; - - /** - * Returns a Boolean value that indicates whether a value is the reserved value NaN (not a - * number). Unlike the global isNaN(), Number.isNaN() doesn't forcefully convert the parameter - * to a number. Only values of the type number, that are also NaN, result in true. - * @param number A numeric value. - */ - isNaN(number: number): boolean; - - /** - * Returns true if the value passed is a safe integer. - * @param number A numeric value. - */ - isSafeInteger(number: number): boolean; - - /** - * The value of the largest integer n such that n and n + 1 are both exactly representable as - * a Number value. - * The value of Number.MIN_SAFE_INTEGER is 9007199254740991 2^53 − 1. - */ - MAX_SAFE_INTEGER: number; - - /** - * The value of the smallest integer n such that n and n − 1 are both exactly representable as - * a Number value. - * The value of Number.MIN_SAFE_INTEGER is −9007199254740991 (−(2^53 − 1)). - */ - MIN_SAFE_INTEGER: number; - - /** - * Converts a string to a floating-point number. - * @param string A string that contains a floating-point number. - */ - parseFloat(string: string): number; - - /** - * Converts A string to an integer. - * @param s A string to convert into a number. - * @param radix A value between 2 and 36 that specifies the base of the number in numString. - * If this argument is not supplied, strings with a prefix of '0x' are considered hexadecimal. - * All other strings are considered decimal. - */ - parseInt(string: string, radix?: number): number; -} - -interface ObjectConstructor { - /** - * Copy the values of all of the enumerable own properties from one or more source objects to a - * target object. Returns the target object. - * @param target The target object to copy to. - * @param sources One or more source objects to copy properties from. - */ - assign(target: any, ...sources: any[]): any; - - /** - * Returns true if the values are the same value, false otherwise. - * @param value1 The first value. - * @param value2 The second value. - */ - is(value1: any, value2: any): boolean; - - /** - * Sets the prototype of a specified object o to object proto or null. Returns the object o. - * @param o The object to change its prototype. - * @param proto The value of the new prototype or null. - * @remarks Requires `__proto__` support. - */ - setPrototypeOf(o: any, proto: any): any; -} - -interface RegExp { - /** - * Returns a string indicating the flags of the regular expression in question. This field is read-only. - * The characters in this string are sequenced and concatenated in the following order: - * - * - "g" for global - * - "i" for ignoreCase - * - "m" for multiline - * - "u" for unicode - * - "y" for sticky - * - * If no flags are set, the value is the empty string. - */ - flags: string; -} - -interface Math { - /** - * Returns the number of leading zero bits in the 32-bit binary representation of a number. - * @param x A numeric expression. - */ - clz32(x: number): number; - - /** - * Returns the result of 32-bit multiplication of two numbers. - * @param x First number - * @param y Second number - */ - imul(x: number, y: number): number; - - /** - * Returns the sign of the x, indicating whether x is positive, negative or zero. - * @param x The numeric expression to test - */ - sign(x: number): number; - - /** - * Returns the base 10 logarithm of a number. - * @param x A numeric expression. - */ - log10(x: number): number; - - /** - * Returns the base 2 logarithm of a number. - * @param x A numeric expression. - */ - log2(x: number): number; - - /** - * Returns the natural logarithm of 1 + x. - * @param x A numeric expression. - */ - log1p(x: number): number; - - /** - * Returns the result of (e^x - 1) of x (e raised to the power of x, where e is the base of - * the natural logarithms). - * @param x A numeric expression. - */ - expm1(x: number): number; - - /** - * Returns the hyperbolic cosine of a number. - * @param x A numeric expression that contains an angle measured in radians. - */ - cosh(x: number): number; - - /** - * Returns the hyperbolic sine of a number. - * @param x A numeric expression that contains an angle measured in radians. - */ - sinh(x: number): number; - - /** - * Returns the hyperbolic tangent of a number. - * @param x A numeric expression that contains an angle measured in radians. - */ - tanh(x: number): number; - - /** - * Returns the inverse hyperbolic cosine of a number. - * @param x A numeric expression that contains an angle measured in radians. - */ - acosh(x: number): number; - - /** - * Returns the inverse hyperbolic sine of a number. - * @param x A numeric expression that contains an angle measured in radians. - */ - asinh(x: number): number; - - /** - * Returns the inverse hyperbolic tangent of a number. - * @param x A numeric expression that contains an angle measured in radians. - */ - atanh(x: number): number; - - /** - * Returns the square root of the sum of squares of its arguments. - * @param values Values to compute the square root for. - * If no arguments are passed, the result is +0. - * If there is only one argument, the result is the absolute value. - * If any argument is +Infinity or -Infinity, the result is +Infinity. - * If any argument is NaN, the result is NaN. - * If all arguments are either +0 or −0, the result is +0. - */ - hypot(...values: number[]): number; - - /** - * Returns the integral part of the a numeric expression, x, removing any fractional digits. - * If x is already an integer, the result is x. - * @param x A numeric expression. - */ - trunc(x: number): number; - - /** - * Returns the nearest single precision float representation of a number. - * @param x A numeric expression. - */ - fround(x: number): number; - - /** - * Returns an implementation-dependent approximation to the cube root of number. - * @param x A numeric expression. - */ - cbrt(x: number): number; -} - -interface PromiseLike { - /** - * Attaches callbacks for the resolution and/or rejection of the Promise. - * @param onfulfilled The callback to execute when the Promise is resolved. - * @param onrejected The callback to execute when the Promise is rejected. - * @returns A Promise for the completion of which ever callback is executed. - */ - then(onfulfilled?: (value: T) => TResult | PromiseLike, onrejected?: (reason: any) => TResult | PromiseLike): PromiseLike; - then(onfulfilled?: (value: T) => TResult | PromiseLike, onrejected?: (reason: any) => void): PromiseLike; -} - -/** - * Represents the completion of an asynchronous operation - */ -interface Promise { - /** - * Attaches callbacks for the resolution and/or rejection of the Promise. - * @param onfulfilled The callback to execute when the Promise is resolved. - * @param onrejected The callback to execute when the Promise is rejected. - * @returns A Promise for the completion of which ever callback is executed. - */ - then(onfulfilled?: (value: T) => TResult | PromiseLike, onrejected?: (reason: any) => TResult | PromiseLike): Promise; - then(onfulfilled?: (value: T) => TResult | PromiseLike, onrejected?: (reason: any) => void): Promise; - - /** - * Attaches a callback for only the rejection of the Promise. - * @param onrejected The callback to execute when the Promise is rejected. - * @returns A Promise for the completion of the callback. - */ - catch(onrejected?: (reason: any) => T | PromiseLike): Promise; - catch(onrejected?: (reason: any) => void): Promise; -} - -interface PromiseConstructor { - /** - * A reference to the prototype. - */ - prototype: Promise; - - /** - * Creates a new Promise. - * @param executor A callback used to initialize the promise. This callback is passed two arguments: - * a resolve callback used resolve the promise with a value or the result of another promise, - * and a reject callback used to reject the promise with a provided reason or error. - */ - new (executor: (resolve: (value?: T | PromiseLike) => void, reject: (reason?: any) => void) => void): Promise; - - /** - * Creates a Promise that is resolved with an array of results when all of the provided Promises - * resolve, or rejected when any Promise is rejected. - * @param values An array of Promises. - * @returns A new Promise. - */ - all(values: IterableShim>): Promise; - - /** - * Creates a Promise that is resolved or rejected when any of the provided Promises are resolved - * or rejected. - * @param values An array of Promises. - * @returns A new Promise. - */ - race(values: IterableShim>): Promise; - - /** - * Creates a new rejected promise for the provided reason. - * @param reason The reason the promise was rejected. - * @returns A new rejected Promise. - */ - reject(reason: any): Promise; - - /** - * Creates a new rejected promise for the provided reason. - * @param reason The reason the promise was rejected. - * @returns A new rejected Promise. - */ - reject(reason: any): Promise; - - /** - * Creates a new resolved promise for the provided value. - * @param value A promise. - * @returns A promise whose internal state matches the provided promise. - */ - resolve(value: T | PromiseLike): Promise; - - /** - * Creates a new resolved promise . - * @returns A resolved promise. - */ - resolve(): Promise; -} - -declare var Promise: PromiseConstructor; - -interface Map { - clear(): void; - delete(key: K): boolean; - forEach(callbackfn: (value: V, index: K, map: Map) => void, thisArg?: any): void; - get(key: K): V; - has(key: K): boolean; - set(key: K, value?: V): Map; - size: number; - entries(): IterableIteratorShim<[K, V]>; - keys(): IterableIteratorShim; - values(): IterableIteratorShim; -} - -interface MapConstructor { - new (): Map; - new (iterable: IterableShim<[K, V]>): Map; - prototype: Map; -} - -declare var Map: MapConstructor; - -interface Set { - add(value: T): Set; - clear(): void; - delete(value: T): boolean; - forEach(callbackfn: (value: T, index: T, set: Set) => void, thisArg?: any): void; - has(value: T): boolean; - size: number; - entries(): IterableIteratorShim<[T, T]>; - keys(): IterableIteratorShim; - values(): IterableIteratorShim; -} - -interface SetConstructor { - new (): Set; - new (iterable: IterableShim): Set; - prototype: Set; -} - -declare var Set: SetConstructor; - -interface WeakMap { - delete(key: K): boolean; - get(key: K): V; - has(key: K): boolean; - set(key: K, value?: V): WeakMap; -} - -interface WeakMapConstructor { - new (): WeakMap; - new (iterable: IterableShim<[K, V]>): WeakMap; - prototype: WeakMap; -} - -declare var WeakMap: WeakMapConstructor; - -interface WeakSet { - add(value: T): WeakSet; - delete(value: T): boolean; - has(value: T): boolean; -} - -interface WeakSetConstructor { - new (): WeakSet; - new (iterable: IterableShim): WeakSet; - prototype: WeakSet; -} - -declare var WeakSet: WeakSetConstructor; - -declare namespace Reflect { - function apply(target: Function, thisArgument: any, argumentsList: ArrayLike): any; - function construct(target: Function, argumentsList: ArrayLike): any; - function defineProperty(target: any, propertyKey: PropertyKey, attributes: PropertyDescriptor): boolean; - function deleteProperty(target: any, propertyKey: PropertyKey): boolean; - function enumerate(target: any): IterableIteratorShim; - function get(target: any, propertyKey: PropertyKey, receiver?: any): any; - function getOwnPropertyDescriptor(target: any, propertyKey: PropertyKey): PropertyDescriptor; - function getPrototypeOf(target: any): any; - function has(target: any, propertyKey: PropertyKey): boolean; - function isExtensible(target: any): boolean; - function ownKeys(target: any): Array; - function preventExtensions(target: any): boolean; - function set(target: any, propertyKey: PropertyKey, value: any, receiver?: any): boolean; - function setPrototypeOf(target: any, proto: any): boolean; -} - -declare module "es6-shim" { - var String: StringConstructor; - var Array: ArrayConstructor; - var Number: NumberConstructor; - var Math: Math; - var Object: ObjectConstructor; - var Map: MapConstructor; - var Set: SetConstructor; - var WeakMap: WeakMapConstructor; - var WeakSet: WeakSetConstructor; - var Promise: PromiseConstructor; - namespace Reflect { - function apply(target: Function, thisArgument: any, argumentsList: ArrayLike): any; - function construct(target: Function, argumentsList: ArrayLike): any; - function defineProperty(target: any, propertyKey: PropertyKey, attributes: PropertyDescriptor): boolean; - function deleteProperty(target: any, propertyKey: PropertyKey): boolean; - function enumerate(target: any): Iterator; - function get(target: any, propertyKey: PropertyKey, receiver?: any): any; - function getOwnPropertyDescriptor(target: any, propertyKey: PropertyKey): PropertyDescriptor; - function getPrototypeOf(target: any): any; - function has(target: any, propertyKey: PropertyKey): boolean; - function isExtensible(target: any): boolean; - function ownKeys(target: any): Array; - function preventExtensions(target: any): boolean; - function set(target: any, propertyKey: PropertyKey, value: any, receiver?: any): boolean; - function setPrototypeOf(target: any, proto: any): boolean; - } -} diff --git a/samples/angular/MusicStore/typings/tsd.d.ts b/samples/angular/MusicStore/typings/tsd.d.ts deleted file mode 100644 index 8b614f9a..00000000 --- a/samples/angular/MusicStore/typings/tsd.d.ts +++ /dev/null @@ -1,2 +0,0 @@ - -/// diff --git a/samples/angular/MusicStore/typings/url-workaround.d.ts b/samples/angular/MusicStore/typings/url-workaround.d.ts deleted file mode 100644 index 9d167602..00000000 --- a/samples/angular/MusicStore/typings/url-workaround.d.ts +++ /dev/null @@ -1,7 +0,0 @@ -// This file is a workaround for angular2-universal-preview version 0.84.2 relying on the declaration of -// Node's 'url' module. Ideally it would not declare dependencies on Node APIs except where it also supplies -// the definitions itself. - -declare module 'url' { - export interface Url {} -} diff --git a/samples/angular/MusicStore/wwwroot/css/site.css b/samples/angular/MusicStore/wwwroot/css/site.css deleted file mode 100644 index 952e03fb..00000000 --- a/samples/angular/MusicStore/wwwroot/css/site.css +++ /dev/null @@ -1,3 +0,0 @@ -body { - padding-top: 50px; -} diff --git a/samples/angular/MusicStore/wwwroot/css/styles.less b/samples/angular/MusicStore/wwwroot/css/styles.less deleted file mode 100644 index 564f8f40..00000000 --- a/samples/angular/MusicStore/wwwroot/css/styles.less +++ /dev/null @@ -1,14 +0,0 @@ -@base: #f938ab; - -.box-shadow(@style, @c) when (iscolor(@c)) { - -webkit-box-shadow: @style @c; - box-shadow: @style @c; -} -.box-shadow(@style, @alpha: 50%) when (isnumber(@alpha)) { - .box-shadow(@style, rgba(0, 0, 0, @alpha)); -} -.box { - color: saturate(@base, 5%); - border-color: lighten(@base, 30%); - div { .box-shadow(0 0 5px, 30%) } -} diff --git a/samples/angular/MusicStore/wwwroot/images/home-showcase.png b/samples/angular/MusicStore/wwwroot/images/home-showcase.png deleted file mode 100644 index 258c19d3cd29d8e94fc95877682f45f3190dcb72..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 254130 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 diff --git a/samples/angular/MusicStore/wwwroot/images/logo.png b/samples/angular/MusicStore/wwwroot/images/logo.png deleted file mode 100644 index d334c8625625b78836bb729ed9b7a10fa04bb702..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2963 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 { - const serverBindings = [ - ngCore.provide(BASE_URL, { useValue: '/' }), - ngCore.provide(ORIGIN_URL, { useValue: params.origin }), - ngCore.provide(REQUEST_URL, { useValue: params.url }), - ngUniversal.NODE_HTTP_PROVIDERS, - ngUniversal.NODE_ROUTER_PROVIDERS, - FormBuilder - ]; - - return ngUniversal.bootloader({ - directives: [App], - providers: serverBindings, - async: true, - preboot: false, - // TODO: Render just the component instead of wrapping it inside an extra HTML document - // Waiting on https://github.com/angular/universal/issues/347 - template: '\n' - }).serializeApplication().then(html => { - return { html }; - }); -} diff --git a/samples/angular/MusicStore/wwwroot/ng-app/components/admin/admin-home/admin-home.html b/samples/angular/MusicStore/wwwroot/ng-app/components/admin/admin-home/admin-home.html deleted file mode 100644 index 79e4fcdd..00000000 --- a/samples/angular/MusicStore/wwwroot/ng-app/components/admin/admin-home/admin-home.html +++ /dev/null @@ -1,3 +0,0 @@ -

Store Manager

- - diff --git a/samples/angular/MusicStore/wwwroot/ng-app/components/admin/admin-home/admin-home.ts b/samples/angular/MusicStore/wwwroot/ng-app/components/admin/admin-home/admin-home.ts deleted file mode 100644 index 47a501a0..00000000 --- a/samples/angular/MusicStore/wwwroot/ng-app/components/admin/admin-home/admin-home.ts +++ /dev/null @@ -1,19 +0,0 @@ -import * as ng from 'angular2/core'; -import * as router from 'angular2/router'; -import { AlbumsList } from '../albums-list/albums-list'; -import { AlbumDetails } from '../album-details/album-details'; -import { AlbumEdit } from '../album-edit/album-edit'; - -@ng.Component({ - selector: 'admin-home', - templateUrl: './ng-app/components/admin/admin-home/admin-home.html', - directives: [router.ROUTER_DIRECTIVES] -}) -@router.RouteConfig([ - { path: 'albums', name: 'Albums', component: AlbumsList }, - { path: 'album/details/:albumId', name: 'AlbumDetails', component: AlbumDetails }, - { path: 'album/edit/:albumId', name: 'AlbumEdit', component: AlbumEdit } -]) -export class AdminHome { - -} diff --git a/samples/angular/MusicStore/wwwroot/ng-app/components/admin/album-delete-prompt/album-delete-prompt.html b/samples/angular/MusicStore/wwwroot/ng-app/components/admin/album-delete-prompt/album-delete-prompt.html deleted file mode 100644 index 2f6b0ba6..00000000 --- a/samples/angular/MusicStore/wwwroot/ng-app/components/admin/album-delete-prompt/album-delete-prompt.html +++ /dev/null @@ -1,17 +0,0 @@ -
-
-
-
- -

Delete {{ album.Title }}

-
-
-

Really delete {{ album.Title }} by {{ album.Artist.Name }}?

-
-
- - -
-
-
-
diff --git a/samples/angular/MusicStore/wwwroot/ng-app/components/admin/album-delete-prompt/album-delete-prompt.ts b/samples/angular/MusicStore/wwwroot/ng-app/components/admin/album-delete-prompt/album-delete-prompt.ts deleted file mode 100644 index 9ad66747..00000000 --- a/samples/angular/MusicStore/wwwroot/ng-app/components/admin/album-delete-prompt/album-delete-prompt.ts +++ /dev/null @@ -1,20 +0,0 @@ -import * as ng from 'angular2/core'; -import * as models from '../../../models/models'; - -@ng.Component({ - selector: 'album-delete-prompt', - templateUrl: './ng-app/components/admin/album-delete-prompt/album-delete-prompt.html' -}) -export class AlbumDeletePrompt { - public album: models.Album; - - constructor(@ng.Inject(ng.ElementRef) private _elementRef: ng.ElementRef) { - } - - public show(album: models.Album) { - this.album = album; - - // Consider rewriting this using Angular's "Renderer" API so as to avoid direct DOM access - (window).jQuery(".modal", this._elementRef.nativeElement).modal(); - } -} diff --git a/samples/angular/MusicStore/wwwroot/ng-app/components/admin/album-details/album-details.html b/samples/angular/MusicStore/wwwroot/ng-app/components/admin/album-details/album-details.html deleted file mode 100644 index a13e0d1d..00000000 --- a/samples/angular/MusicStore/wwwroot/ng-app/components/admin/album-details/album-details.html +++ /dev/null @@ -1,50 +0,0 @@ -

Album Details

-
- -
-
- -
-

{{ albumData.Artist.Name }}

-
-
-
- -
-

{{ albumData.Genre.Name }}

-
-
-
- -
-

{{ albumData.Title }}

-
-
-
- -
-

{{ albumData.Price | currency:'USD':true }}

-
-
-
- -
-

{{ albumData.AlbumArtUrl }}

-
-
-
- -
- {{ albumData.Title }} -
-
-
-
- Edit - - Back to List -
-
-
- - diff --git a/samples/angular/MusicStore/wwwroot/ng-app/components/admin/album-details/album-details.ts b/samples/angular/MusicStore/wwwroot/ng-app/components/admin/album-details/album-details.ts deleted file mode 100644 index 05ac4da6..00000000 --- a/samples/angular/MusicStore/wwwroot/ng-app/components/admin/album-details/album-details.ts +++ /dev/null @@ -1,20 +0,0 @@ -import * as ng from 'angular2/core'; -import * as router from 'angular2/router'; -import * as models from '../../../models/models'; -import { Http, HTTP_BINDINGS } from 'angular2/http'; -import { AlbumDeletePrompt } from '../album-delete-prompt/album-delete-prompt'; - -@ng.Component({ - selector: 'album-details', - templateUrl: './ng-app/components/admin/album-details/album-details.html', - directives: [router.ROUTER_DIRECTIVES, AlbumDeletePrompt] -}) -export class AlbumDetails { - public albumData: models.Album; - - constructor(http: Http, routeParam: router.RouteParams) { - http.get('/api/albums/' + routeParam.params['albumId']).subscribe(result => { - this.albumData = result.json(); - }); - } -} diff --git a/samples/angular/MusicStore/wwwroot/ng-app/components/admin/album-edit/album-edit.html b/samples/angular/MusicStore/wwwroot/ng-app/components/admin/album-edit/album-edit.html deleted file mode 100644 index 3b09db19..00000000 --- a/samples/angular/MusicStore/wwwroot/ng-app/components/admin/album-edit/album-edit.html +++ /dev/null @@ -1,47 +0,0 @@ -

Album Edit

-
- -
- - - - - - - - - - - - - -
- $ - -
- - - - - - - - - - - -
Done! Your changes were saved.
-
{{ errorMessage }}
- - - Back to List - -
- - diff --git a/samples/angular/MusicStore/wwwroot/ng-app/components/admin/album-edit/album-edit.ts b/samples/angular/MusicStore/wwwroot/ng-app/components/admin/album-edit/album-edit.ts deleted file mode 100644 index 4b83c3b4..00000000 --- a/samples/angular/MusicStore/wwwroot/ng-app/components/admin/album-edit/album-edit.ts +++ /dev/null @@ -1,94 +0,0 @@ -import * as ng from 'angular2/core'; -import { Observable } from 'rxjs'; -import { Control, ControlGroup, FormBuilder, Validators, FORM_DIRECTIVES } from 'angular2/common'; -import * as router from 'angular2/router'; -import * as models from '../../../models/models'; -import { Http, HTTP_BINDINGS, Headers, Response } from 'angular2/http'; -import { AlbumDeletePrompt } from '../album-delete-prompt/album-delete-prompt'; -import { FormField } from '../form-field/form-field'; -import * as AspNet from 'angular2-aspnet'; - -@ng.Component({ - selector: 'album-edit', - templateUrl: './ng-app/components/admin/album-edit/album-edit.html', - directives: [router.ROUTER_DIRECTIVES, AlbumDeletePrompt, FormField, FORM_DIRECTIVES] -}) -export class AlbumEdit { - public form: ControlGroup; - public artists: models.Artist[]; - public genres: models.Genre[]; - public originalAlbum: models.Album; - public changesSaved: boolean; - public formErrors: string[] = []; - - private _http: Http; - - constructor(fb: FormBuilder, http: Http, routeParam: router.RouteParams) { - this._http = http; - - var albumId = parseInt(routeParam.params['albumId']); - http.get('/api/albums/' + albumId).subscribe(result => { - var json = result.json(); - this.originalAlbum = json; - (this.form.controls['Title']).updateValue(json.Title); - (this.form.controls['Price']).updateValue(json.Price); - (this.form.controls['ArtistId']).updateValue(json.ArtistId); - (this.form.controls['GenreId']).updateValue(json.GenreId); - (this.form.controls['AlbumArtUrl']).updateValue(json.AlbumArtUrl); - }); - - http.get('/api/artists/lookup').subscribe(result => { - this.artists = result.json(); - }); - - http.get('/api/genres/genre-lookup').subscribe(result => { - this.genres = result.json(); - }); - - this.form = fb.group({ - AlbumId: fb.control(albumId), - ArtistId: fb.control(0, Validators.required), - GenreId: fb.control(0, Validators.required), - Title: fb.control('', Validators.required), - Price: fb.control('', Validators.compose([Validators.required, AlbumEdit._validatePrice])), - AlbumArtUrl: fb.control('', Validators.required) - }); - - this.form.valueChanges.subscribe(() => { - this.changesSaved = false; - }); - } - - public onSubmitModelBased() { - // Force all fields to show any validation errors even if they haven't been touched - Object.keys(this.form.controls).forEach(controlName => { - this.form.controls[controlName].markAsTouched(); - }); - - if (this.form.valid) { - var controls = this.form.controls; - var albumId = this.originalAlbum.AlbumId; - - this._putJson(`/api/albums/${ albumId }/update`, this.form.value).subscribe(successResponse => { - this.changesSaved = true; - }, errorResponse => { - AspNet.Validation.showValidationErrors(errorResponse, this.form); - }); - } - } - - private static _validatePrice(control: Control): { [key: string]: boolean } { - return /^\d+\.\d+$/.test(control.value) ? null : { Price: true }; - } - - // Need feedback on whether this really is the easiest way to PUT some JSON - private _putJson(url: string, body: any): Observable { - return this._http.put(url, JSON.stringify(body), { - headers: new Headers({ 'Content-Type': 'application/json' }) - }); - } - - private ngDoCheck() { - this.formErrors = this.form.dirty ? Object.keys(this.form.errors || {}) : []; - } -} diff --git a/samples/angular/MusicStore/wwwroot/ng-app/components/admin/albums-list/albums-list.html b/samples/angular/MusicStore/wwwroot/ng-app/components/admin/albums-list/albums-list.html deleted file mode 100644 index 51889e7d..00000000 --- a/samples/angular/MusicStore/wwwroot/ng-app/components/admin/albums-list/albums-list.html +++ /dev/null @@ -1,44 +0,0 @@ -

Albums

- - - - - - - - - - - - - - - - - - - - - - -
GenreArtistTitlePrice
{{ row.Genre.Name }}{{ row.Artist.Name }}{{ row.Title }}{{ row.Price | currency:'USD':true }} -
- Details - Edit - Delete -
-
- -
- - - - - -
- -

{{ totalCount }} total albums

diff --git a/samples/angular/MusicStore/wwwroot/ng-app/components/admin/albums-list/albums-list.ts b/samples/angular/MusicStore/wwwroot/ng-app/components/admin/albums-list/albums-list.ts deleted file mode 100644 index 989d6e97..00000000 --- a/samples/angular/MusicStore/wwwroot/ng-app/components/admin/albums-list/albums-list.ts +++ /dev/null @@ -1,68 +0,0 @@ -import * as ng from 'angular2/core'; -import * as router from 'angular2/router'; -import { Http, HTTP_BINDINGS } from 'angular2/http'; -import * as models from '../../../models/models'; -import { AlbumDeletePrompt } from '../album-delete-prompt/album-delete-prompt'; - -@ng.Component({ - selector: 'albums-list', - templateUrl: './ng-app/components/admin/albums-list/albums-list.html', - directives: [router.ROUTER_DIRECTIVES, AlbumDeletePrompt] -}) -export class AlbumsList { - public rows: models.Album[]; - public canGoBack: boolean; - public canGoForward: boolean; - public pageLinks: any[]; - public totalCount: number; - public get pageIndex() { - return this._pageIndex; - } - - private _http: Http; - private _pageIndex = 1; - private _sortBy = "Title"; - private _sortByDesc = false; - - constructor(http: Http) { - this._http = http; - this.refreshData(); - } - - public sortBy(col: string) { - this._sortByDesc = col === this._sortBy ? !this._sortByDesc : false; - this._sortBy = col; - this.refreshData(); - } - - public goToPage(pageIndex: number) { - this._pageIndex = pageIndex; - this.refreshData(); - } - - public goToLast() { - this.goToPage(this.pageLinks[this.pageLinks.length - 1].index); - } - - refreshData() { - var sortBy = this._sortBy + (this._sortByDesc ? ' DESC' : ''); - this._http.get(`/api/albums?page=${ this._pageIndex }&pageSize=50&sortBy=${ sortBy }`).subscribe(result => { - var json = result.json(); - this.rows = json.Data; - - var numPages = Math.ceil(json.TotalCount / json.PageSize); - this.pageLinks = []; - for (var i = 1; i <= numPages; i++) { - this.pageLinks.push({ - index: i, - text: i.toString(), - isCurrent: i === json.Page - }); - } - - this.canGoBack = this.pageLinks.length && !this.pageLinks[0].isCurrent; - this.canGoForward = this.pageLinks.length && !this.pageLinks[this.pageLinks.length - 1].isCurrent; - this.totalCount = json.TotalCount; - }); - } -} diff --git a/samples/angular/MusicStore/wwwroot/ng-app/components/admin/form-field/form-field.html b/samples/angular/MusicStore/wwwroot/ng-app/components/admin/form-field/form-field.html deleted file mode 100644 index 82e773b0..00000000 --- a/samples/angular/MusicStore/wwwroot/ng-app/components/admin/form-field/form-field.html +++ /dev/null @@ -1,9 +0,0 @@ -
- -
- - -
-
diff --git a/samples/angular/MusicStore/wwwroot/ng-app/components/admin/form-field/form-field.ts b/samples/angular/MusicStore/wwwroot/ng-app/components/admin/form-field/form-field.ts deleted file mode 100644 index 267d7784..00000000 --- a/samples/angular/MusicStore/wwwroot/ng-app/components/admin/form-field/form-field.ts +++ /dev/null @@ -1,19 +0,0 @@ -import * as ng from 'angular2/core'; -import { AbstractControl } from 'angular2/common'; - -@ng.Component({ - selector: 'form-field', - properties: ['label', 'validate'], - templateUrl: './ng-app/components/admin/form-field/form-field.html' -}) -export class FormField { - public errorMessages: string[] = []; - private validate: AbstractControl; - - private ngDoCheck() { - var errors = (this.validate && this.validate.dirty && this.validate.errors) || {}; - this.errorMessages = Object.keys(errors).map(key => { - return 'Error: ' + key; - }); - } -} diff --git a/samples/angular/MusicStore/wwwroot/ng-app/components/app/app.css b/samples/angular/MusicStore/wwwroot/ng-app/components/app/app.css deleted file mode 100644 index e69de29b..00000000 diff --git a/samples/angular/MusicStore/wwwroot/ng-app/components/app/app.html b/samples/angular/MusicStore/wwwroot/ng-app/components/app/app.html deleted file mode 100644 index a257b202..00000000 --- a/samples/angular/MusicStore/wwwroot/ng-app/components/app/app.html +++ /dev/null @@ -1,30 +0,0 @@ - -
- -
diff --git a/samples/angular/MusicStore/wwwroot/ng-app/components/app/app.ts b/samples/angular/MusicStore/wwwroot/ng-app/components/app/app.ts deleted file mode 100644 index cd83aa45..00000000 --- a/samples/angular/MusicStore/wwwroot/ng-app/components/app/app.ts +++ /dev/null @@ -1,33 +0,0 @@ -import * as ng from 'angular2/core'; -import * as router from 'angular2/router'; -import { Http, HTTP_BINDINGS } from 'angular2/http'; -import { Home } from '../public/home/home'; -import { AlbumDetails } from '../public/album-details/album-details'; -import { GenreContents } from '../public/genre-contents/genre-contents'; -import { GenresList } from '../public/genres-list/genres-list'; -import { AdminHome } from '../admin/admin-home/admin-home'; -import * as models from '../../models/models'; - -@ng.Component({ - selector: 'app', - templateUrl: './ng-app/components/app/app.html', - styleUrls: ['./ng-app/components/app/app.css'], - directives: [router.ROUTER_DIRECTIVES] -}) -@router.RouteConfig([ - { path: '/', component: Home, name: 'Home' }, - { path: '/album/:albumId', component: AlbumDetails, name: 'Album' }, - { path: '/genre/:genreId', component: GenreContents, name: 'Genre' }, - { path: '/genres', component: GenresList, name: 'GenresList' }, - { path: '/admin/...', component: AdminHome, name: 'Admin' } -]) -export class App { - public genres: models.Genre[]; - - constructor(http: Http) { - http.get('/api/genres/menu').subscribe(result => { - this.genres = result.json(); - }); - } -} - diff --git a/samples/angular/MusicStore/wwwroot/ng-app/components/public/album-details/album-details.html b/samples/angular/MusicStore/wwwroot/ng-app/components/public/album-details/album-details.html deleted file mode 100644 index d015364e..00000000 --- a/samples/angular/MusicStore/wwwroot/ng-app/components/public/album-details/album-details.html +++ /dev/null @@ -1,26 +0,0 @@ -
-

{{ albumData.Title }}

- -

- {{ albumData.Title }} -

- -
-

- Genre: - {{ albumData.Genre.Name }} -

-

- Artist: - {{ albumData.Artist.Name }} -

-

- Price: - {{ albumData.Price | currency:'USD':true }} -

-

- - Add to cart -

-
-
diff --git a/samples/angular/MusicStore/wwwroot/ng-app/components/public/album-details/album-details.ts b/samples/angular/MusicStore/wwwroot/ng-app/components/public/album-details/album-details.ts deleted file mode 100644 index 61d7d4ea..00000000 --- a/samples/angular/MusicStore/wwwroot/ng-app/components/public/album-details/album-details.ts +++ /dev/null @@ -1,18 +0,0 @@ -import * as ng from 'angular2/core'; -import * as router from 'angular2/router'; -import { Http } from 'angular2/http'; -import * as models from '../../../models/models'; - -@ng.Component({ - selector: 'album-details', - templateUrl: './ng-app/components/public/album-details/album-details.html' -}) -export class AlbumDetails { - public albumData: models.Album; - - constructor(http: Http, routeParam: router.RouteParams) { - http.get('/api/albums/' + routeParam.params['albumId']).subscribe(result => { - this.albumData = result.json(); - }); - } -} diff --git a/samples/angular/MusicStore/wwwroot/ng-app/components/public/album-tile/album-tile.html b/samples/angular/MusicStore/wwwroot/ng-app/components/public/album-tile/album-tile.html deleted file mode 100644 index 0df947d1..00000000 --- a/samples/angular/MusicStore/wwwroot/ng-app/components/public/album-tile/album-tile.html +++ /dev/null @@ -1,4 +0,0 @@ - - {{ albumData.Title }} -

{{ albumData.Title }}

- diff --git a/samples/angular/MusicStore/wwwroot/ng-app/components/public/album-tile/album-tile.ts b/samples/angular/MusicStore/wwwroot/ng-app/components/public/album-tile/album-tile.ts deleted file mode 100644 index d289ec96..00000000 --- a/samples/angular/MusicStore/wwwroot/ng-app/components/public/album-tile/album-tile.ts +++ /dev/null @@ -1,12 +0,0 @@ -import * as ng from 'angular2/core'; -import * as router from 'angular2/router'; -import * as models from '../../../models/models'; - -@ng.Component({ - selector: 'album-tile', - properties: ['albumData'], - templateUrl: './ng-app/components/public/album-tile/album-tile.html', - directives: [router.ROUTER_DIRECTIVES] -}) -export class AlbumTile { -} diff --git a/samples/angular/MusicStore/wwwroot/ng-app/components/public/genre-contents/genre-contents.html b/samples/angular/MusicStore/wwwroot/ng-app/components/public/genre-contents/genre-contents.html deleted file mode 100644 index 7738ce5e..00000000 --- a/samples/angular/MusicStore/wwwroot/ng-app/components/public/genre-contents/genre-contents.html +++ /dev/null @@ -1,7 +0,0 @@ -

Albums

- -
    -
  • - -
    • -
diff --git a/samples/angular/MusicStore/wwwroot/ng-app/components/public/genre-contents/genre-contents.ts b/samples/angular/MusicStore/wwwroot/ng-app/components/public/genre-contents/genre-contents.ts deleted file mode 100644 index 0571cc8a..00000000 --- a/samples/angular/MusicStore/wwwroot/ng-app/components/public/genre-contents/genre-contents.ts +++ /dev/null @@ -1,20 +0,0 @@ -import * as ng from 'angular2/core'; -import * as router from 'angular2/router'; -import { Http } from 'angular2/http'; -import * as models from '../../../models/models'; -import { AlbumTile } from '../album-tile/album-tile'; - -@ng.Component({ - selector: 'genre-contents', - templateUrl: './ng-app/components/public/genre-contents/genre-contents.html', - directives: [AlbumTile] -}) -export class GenreContents { - public albums: models.Album[]; - - constructor(http: Http, routeParam: router.RouteParams) { - http.get(`/api/genres/${ routeParam.params['genreId'] }/albums`).subscribe(result => { - this.albums = result.json(); - }); - } -} diff --git a/samples/angular/MusicStore/wwwroot/ng-app/components/public/genres-list/genres-list.html b/samples/angular/MusicStore/wwwroot/ng-app/components/public/genres-list/genres-list.html deleted file mode 100644 index e91d6f3a..00000000 --- a/samples/angular/MusicStore/wwwroot/ng-app/components/public/genres-list/genres-list.html +++ /dev/null @@ -1,13 +0,0 @@ -

Browse Genres

- -

- Select from {{ genres.length }} genres: -

- - diff --git a/samples/angular/MusicStore/wwwroot/ng-app/components/public/genres-list/genres-list.ts b/samples/angular/MusicStore/wwwroot/ng-app/components/public/genres-list/genres-list.ts deleted file mode 100644 index f45b77a3..00000000 --- a/samples/angular/MusicStore/wwwroot/ng-app/components/public/genres-list/genres-list.ts +++ /dev/null @@ -1,19 +0,0 @@ -import * as ng from 'angular2/core'; -import * as router from 'angular2/router'; -import { Http } from 'angular2/http'; -import * as models from '../../../models/models'; - -@ng.Component({ - selector: 'genres-list', - templateUrl: './ng-app/components/public/genres-list/genres-list.html', - directives: [router.ROUTER_DIRECTIVES] -}) -export class GenresList { - public genres: models.Genre[]; - - constructor(http: Http) { - http.get('/api/genres').subscribe(result => { - this.genres = result.json(); - }); - } -} diff --git a/samples/angular/MusicStore/wwwroot/ng-app/components/public/home/home.html b/samples/angular/MusicStore/wwwroot/ng-app/components/public/home/home.html deleted file mode 100644 index 133a495c..00000000 --- a/samples/angular/MusicStore/wwwroot/ng-app/components/public/home/home.html +++ /dev/null @@ -1,10 +0,0 @@ -
-

MVC Music Store

- -
- -
    -
  • - -
    • -
diff --git a/samples/angular/MusicStore/wwwroot/ng-app/components/public/home/home.ts b/samples/angular/MusicStore/wwwroot/ng-app/components/public/home/home.ts deleted file mode 100644 index 51989da6..00000000 --- a/samples/angular/MusicStore/wwwroot/ng-app/components/public/home/home.ts +++ /dev/null @@ -1,19 +0,0 @@ -import * as ng from 'angular2/core'; -import { Http } from 'angular2/http'; -import { AlbumTile } from '../album-tile/album-tile'; -import * as models from '../../../models/models'; - -@ng.Component({ - selector: 'home', - templateUrl: './ng-app/components/public/home/home.html', - directives: [AlbumTile] -}) -export class Home { - public mostPopular: models.Album[]; - - constructor(http: Http) { - http.get('/api/albums/mostPopular').subscribe(result => { - this.mostPopular = result.json(); - }); - } -} diff --git a/samples/angular/MusicStore/wwwroot/ng-app/models/models.ts b/samples/angular/MusicStore/wwwroot/ng-app/models/models.ts deleted file mode 100644 index 44c705af..00000000 --- a/samples/angular/MusicStore/wwwroot/ng-app/models/models.ts +++ /dev/null @@ -1,16 +0,0 @@ -export interface Album { - AlbumId: number; - Title: string; - AlbumArtUrl: string; -} - -export interface Genre { - GenreId: number; - Name: string; - Description: string; -} - -export interface Artist { - ArtistId: number; - Name: string; -} diff --git a/samples/angular/MusicStore/wwwroot/system.config.js b/samples/angular/MusicStore/wwwroot/system.config.js deleted file mode 100644 index 400211f4..00000000 --- a/samples/angular/MusicStore/wwwroot/system.config.js +++ /dev/null @@ -1,3 +0,0 @@ -System.config({ - defaultJSExtensions: true -}); diff --git a/samples/angular/MusicStore/wwwroot/web.config b/samples/angular/MusicStore/wwwroot/web.config deleted file mode 100644 index bb50c716..00000000 --- a/samples/angular/MusicStore/wwwroot/web.config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/samples/react/MusicStore/.babelrc b/samples/react/MusicStore/.babelrc deleted file mode 100644 index 86c445f5..00000000 --- a/samples/react/MusicStore/.babelrc +++ /dev/null @@ -1,3 +0,0 @@ -{ - "presets": ["es2015", "react"] -} diff --git a/samples/react/MusicStore/.gitignore b/samples/react/MusicStore/.gitignore deleted file mode 100644 index 8d1beebe..00000000 --- a/samples/react/MusicStore/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -music-db.sqlite -/wwwroot/dist/ -/node_modules/ -yarn.lock diff --git a/samples/react/MusicStore/Apis/AlbumsApiController.cs b/samples/react/MusicStore/Apis/AlbumsApiController.cs deleted file mode 100644 index 511f63c8..00000000 --- a/samples/react/MusicStore/Apis/AlbumsApiController.cs +++ /dev/null @@ -1,201 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; -using Microsoft.EntityFrameworkCore; -using AutoMapper; -using MusicStore.Models; -using MusicStore.Infrastructure; - -namespace MusicStore.Apis -{ - [Route("api/albums")] - public class AlbumsApiController : Controller - { - private readonly MusicStoreContext _storeContext; - - public AlbumsApiController(MusicStoreContext storeContext) - { - _storeContext = storeContext; - } - - [HttpGet] - [NoCache] - public async Task Paged(int page = 1, int pageSize = 50, string sortBy = null) - { - await _storeContext.Genres.LoadAsync(); - await _storeContext.Artists.LoadAsync(); - - var albums = await _storeContext.Albums - .Include(a => a.Genre) - .Include(a => a.Artist) - .ToPagedListAsync(page, pageSize, sortBy, - a => a.Title, // sortExpression - SortDirection.Ascending, // defaultSortDirection - a => Mapper.Map(a, new AlbumResultDto())); // selector - - return Json(albums); - } - - [HttpGet("all")] - [NoCache] - public async Task All() - { - var albums = await _storeContext.Albums - .Include(a => a.Genre) - .Include(a => a.Artist) - .OrderBy(a => a.Title) - .ToListAsync(); - - return Json(albums.Select(a => Mapper.Map(a, new AlbumResultDto()))); - } - - [HttpGet("mostPopular")] - [NoCache] - public async Task MostPopular(int count = 6) - { - count = count > 0 && count < 20 ? count : 6; - var albums = await _storeContext.Albums - .OrderByDescending(a => a.OrderDetails.Count()) - .Take(count) - .ToListAsync(); - - // TODO: Move the .Select() to end of albums query when EF supports it - return Json(albums.Select(a => Mapper.Map(a, new AlbumResultDto()))); - } - - [HttpGet("{albumId:int}")] - [NoCache] - public async Task Details(int albumId) - { - await _storeContext.Genres.LoadAsync(); - await _storeContext.Artists.LoadAsync(); - - var album = await _storeContext.Albums - .Include(a => a.Artist) - .Include(a => a.Genre) - .Where(a => a.AlbumId == albumId) - .SingleOrDefaultAsync(); - - var albumResult = Mapper.Map(album, new AlbumResultDto()); - - // TODO: Add null checking and return 404 in that case - - return Json(albumResult); - } - - [HttpPost] - [Authorize("app-ManageStore")] - public async Task CreateAlbum([FromBody]AlbumChangeDto album) - { - if (!ModelState.IsValid) - { - // Return the model errors - return BadRequest(ModelState); - } - - // Save the changes to the DB - var dbAlbum = new Album(); - _storeContext.Albums.Add(Mapper.Map(album, dbAlbum)); - await _storeContext.SaveChangesAsync(); - - // TODO: Handle missing record, key violations, concurrency issues, etc. - - return new ObjectResult(new { - Data = dbAlbum.AlbumId, - Message = "Album created successfully." - }); - } - - [HttpPut("{albumId:int}/update")] - public async Task UpdateAlbum(int albumId, [FromBody] AlbumChangeDto album) - { - if (!ModelState.IsValid) - { - // Return the model errors - return BadRequest(ModelState); - } - - var dbAlbum = await _storeContext.Albums.SingleOrDefaultAsync(a => a.AlbumId == albumId); - - if (dbAlbum == null) - { - return new ObjectResult(new { - Message = string.Format("The album with ID {0} was not found.", albumId) - }) { StatusCode = 404 }; - } - - // Save the changes to the DB - Mapper.Map(album, dbAlbum); - await _storeContext.SaveChangesAsync(); - - // TODO: Handle missing record, key violations, concurrency issues, etc. - - return new ObjectResult (new { - Message = "Album updated successfully." - }); - } - - [HttpDelete("{albumId:int}")] - [Authorize("app-ManageStore")] - public async Task DeleteAlbum(int albumId) - { - var album = await _storeContext.Albums.SingleOrDefaultAsync(a => a.AlbumId == albumId); - - if (album != null) - { - _storeContext.Albums.Remove(album); - - // Save the changes to the DB - await _storeContext.SaveChangesAsync(); - - // TODO: Handle missing record, key violations, concurrency issues, etc. - } - - return new ObjectResult (new { - Message = "Album deleted successfully." - }); - } - } - - [ModelMetadataType(typeof(Album))] - public class AlbumChangeDto - { - public int GenreId { get; set; } - - public int ArtistId { get; set; } - - public string Title { get; set; } - - public decimal Price { get; set; } - - public string AlbumArtUrl { get; set; } - } - - public class AlbumResultDto : AlbumChangeDto - { - public AlbumResultDto() - { - Artist = new ArtistResultDto(); - Genre = new GenreResultDto(); - } - - public int AlbumId { get; set; } - - public ArtistResultDto Artist { get; private set; } - - public GenreResultDto Genre { get; private set; } - } - - public class ArtistResultDto - { - public string Name { get; set; } - } - - public class GenreResultDto - { - public string Name { get; set; } - } -} diff --git a/samples/react/MusicStore/Apis/ArtistsApiController.cs b/samples/react/MusicStore/Apis/ArtistsApiController.cs deleted file mode 100644 index f3568aeb..00000000 --- a/samples/react/MusicStore/Apis/ArtistsApiController.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Mvc; -using Microsoft.EntityFrameworkCore; -using MusicStore.Models; - -namespace MusicStore.Apis -{ - [Route("api/artists")] - public class ArtistsApiController : Controller - { - private readonly MusicStoreContext _storeContext; - - public ArtistsApiController(MusicStoreContext storeContext) - { - _storeContext = storeContext; - } - - [HttpGet("lookup")] - public async Task Lookup() - { - var artists = await _storeContext.Artists - .OrderBy(a => a.Name) - .ToListAsync(); - - return Json(artists); - } - } -} diff --git a/samples/react/MusicStore/Apis/GenresApiController.cs b/samples/react/MusicStore/Apis/GenresApiController.cs deleted file mode 100644 index 338ca2fc..00000000 --- a/samples/react/MusicStore/Apis/GenresApiController.cs +++ /dev/null @@ -1,70 +0,0 @@ -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Mvc; -using Microsoft.EntityFrameworkCore; -using MusicStore.Models; -using MusicStore.Infrastructure; - -namespace MusicStore.Apis -{ - [Route("api/genres")] - public class GenresApiController : Controller - { - private readonly MusicStoreContext _storeContext; - - public GenresApiController(MusicStoreContext storeContext) - { - _storeContext = storeContext; - } - - [HttpGet] - public async Task GenreList() - { - var genres = await _storeContext.Genres - //.Include(g => g.Albums) - .OrderBy(g => g.Name) - .ToListAsync(); - - return Json(genres); - } - - [HttpGet("genre-lookup")] - public async Task Lookup() - { - var genres = await _storeContext.Genres - .Select(g => new { g.GenreId, g.Name }) - .ToListAsync(); - - return Json(genres); - } - - [HttpGet("menu")] - public async Task GenreMenuList(int count = 9) - { - count = count > 0 && count < 20 ? count : 9; - - var genres = await _storeContext.Genres - .OrderByDescending(g => - g.Albums.Sum(a => - a.OrderDetails.Sum(od => od.Quantity))) - .Take(count) - .ToListAsync(); - - return Json(genres); - } - - [HttpGet("{genreId:int}/albums")] - [NoCache] - public async Task GenreAlbums(int genreId) - { - var albums = await _storeContext.Albums - .Where(a => a.GenreId == genreId) - //.Include(a => a.Genre) - //.Include(a => a.Artist) - //.OrderBy(a => a.Genre.Name) - .ToListAsync(); - - return Json(albums); - } - } -} diff --git a/samples/react/MusicStore/Apis/Models/AccountViewModels.cs b/samples/react/MusicStore/Apis/Models/AccountViewModels.cs deleted file mode 100644 index 831978a5..00000000 --- a/samples/react/MusicStore/Apis/Models/AccountViewModels.cs +++ /dev/null @@ -1,63 +0,0 @@ -using System.ComponentModel.DataAnnotations; - -namespace MusicStore.Models -{ - public class ExternalLoginConfirmationViewModel - { - [Required] - [Display(Name = "User name")] - public string UserName { get; set; } - } - - public class ManageUserViewModel - { - [Required] - [DataType(DataType.Password)] - [Display(Name = "Current password")] - public string OldPassword { get; set; } - - [Required] - [StringLength(100, ErrorMessage = "The {0} must be at least {2} characters long.", MinimumLength = 6)] - [DataType(DataType.Password)] - [Display(Name = "New password")] - public string NewPassword { get; set; } - - [DataType(DataType.Password)] - [Display(Name = "Confirm new password")] - [Compare("NewPassword", ErrorMessage = "The new password and confirmation password do not match.")] - public string ConfirmPassword { get; set; } - } - - public class LoginViewModel - { - [Required] - [Display(Name = "User name")] - public string UserName { get; set; } - - [Required] - [DataType(DataType.Password)] - [Display(Name = "Password")] - public string Password { get; set; } - - [Display(Name = "Remember me?")] - public bool RememberMe { get; set; } - } - - public class RegisterViewModel - { - [Required] - [Display(Name = "User name")] - public string UserName { get; set; } - - [Required] - [StringLength(100, ErrorMessage = "The {0} must be at least {2} characters long.", MinimumLength = 6)] - [DataType(DataType.Password)] - [Display(Name = "Password")] - public string Password { get; set; } - - [DataType(DataType.Password)] - [Display(Name = "Confirm password")] - [Compare("Password", ErrorMessage = "The password and confirmation password do not match.")] - public string ConfirmPassword { get; set; } - } -} diff --git a/samples/react/MusicStore/Apis/Models/Album.cs b/samples/react/MusicStore/Apis/Models/Album.cs deleted file mode 100644 index 68e26ff9..00000000 --- a/samples/react/MusicStore/Apis/Models/Album.cs +++ /dev/null @@ -1,40 +0,0 @@ -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; - -namespace MusicStore.Models -{ - public class Album - { - public Album() - { - // TODO: Temporary hack to populate the orderdetails until EF does this automatically. - OrderDetails = new List(); - } - - [ScaffoldColumn(false)] - public int AlbumId { get; set; } - - public int GenreId { get; set; } - - public int ArtistId { get; set; } - - [Required] - [StringLength(160, MinimumLength = 2)] - public string Title { get; set; } - - [Required] - [RangeAttribute(typeof(double), "0.01", "100")] // Long-form constructor to work around https://github.com/dotnet/coreclr/issues/2172 - [DataType(DataType.Currency)] - public decimal Price { get; set; } - - [Display(Name = "Album Art URL")] - [StringLength(1024)] - public string AlbumArtUrl { get; set; } - - public virtual Genre Genre { get; set; } - - public virtual Artist Artist { get; set; } - - public virtual ICollection OrderDetails { get; set; } - } -} diff --git a/samples/react/MusicStore/Apis/Models/Artist.cs b/samples/react/MusicStore/Apis/Models/Artist.cs deleted file mode 100644 index b364a898..00000000 --- a/samples/react/MusicStore/Apis/Models/Artist.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.ComponentModel.DataAnnotations; - -namespace MusicStore.Models -{ - public class Artist - { - public int ArtistId { get; set; } - - [Required] - public string Name { get; set; } - } -} diff --git a/samples/react/MusicStore/Apis/Models/CartItem.cs b/samples/react/MusicStore/Apis/Models/CartItem.cs deleted file mode 100644 index 7209462d..00000000 --- a/samples/react/MusicStore/Apis/Models/CartItem.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using System.ComponentModel.DataAnnotations; - -namespace MusicStore.Models -{ - public class CartItem - { - [Key] - public int CartItemId { get; set; } - - [Required] - public string CartId { get; set; } - public int AlbumId { get; set; } - public int Count { get; set; } - - [DataType(DataType.DateTime)] - public DateTime DateCreated { get; set; } - - public virtual Album Album { get; set; } - } -} diff --git a/samples/react/MusicStore/Apis/Models/Genre.cs b/samples/react/MusicStore/Apis/Models/Genre.cs deleted file mode 100644 index eed5616c..00000000 --- a/samples/react/MusicStore/Apis/Models/Genre.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using Newtonsoft.Json; - -namespace MusicStore.Models -{ - public class Genre - { - public Genre() - { - Albums = new List(); - } - - public int GenreId { get; set; } - - [Required] - public string Name { get; set; } - - public string Description { get; set; } - - [JsonIgnore] - public virtual ICollection Albums { get; set; } - } -} diff --git a/samples/react/MusicStore/Apis/Models/MusicStoreContext.cs b/samples/react/MusicStore/Apis/Models/MusicStoreContext.cs deleted file mode 100644 index aee7aedd..00000000 --- a/samples/react/MusicStore/Apis/Models/MusicStoreContext.cs +++ /dev/null @@ -1,34 +0,0 @@ -using Microsoft.AspNetCore.Identity.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore; - -namespace MusicStore.Models -{ - public class ApplicationUser : IdentityUser { } - - public class MusicStoreContext : IdentityDbContext - { - public MusicStoreContext(DbContextOptions options) : base(options) - { - } - - public DbSet Albums { get; set; } - public DbSet Artists { get; set; } - public DbSet Orders { get; set; } - public DbSet Genres { get; set; } - public DbSet CartItems { get; set; } - public DbSet OrderDetails { get; set; } - - protected override void OnModelCreating(ModelBuilder builder) - { - // Configure pluralization - builder.Entity().ToTable("Albums"); - builder.Entity().ToTable("Artists"); - builder.Entity().ToTable("Orders"); - builder.Entity().ToTable("Genres"); - builder.Entity().ToTable("CartItems"); - builder.Entity().ToTable("OrderDetails"); - - base.OnModelCreating(builder); - } - } -} diff --git a/samples/react/MusicStore/Apis/Models/Order.cs b/samples/react/MusicStore/Apis/Models/Order.cs deleted file mode 100644 index 110a77d8..00000000 --- a/samples/react/MusicStore/Apis/Models/Order.cs +++ /dev/null @@ -1,73 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; - -namespace MusicStore.Models -{ - //[Bind(Include = "FirstName,LastName,Address,City,State,PostalCode,Country,Phone,Email")] - public class Order - { - public Order() - { - OrderDetails = new List(); - } - - [ScaffoldColumn(false)] - public int OrderId { get; set; } - - [ScaffoldColumn(false)] - public DateTime OrderDate { get; set; } - - [Required] - [ScaffoldColumn(false)] - public string Username { get; set; } - - [Required] - [Display(Name = "First Name")] - [StringLength(160)] - public string FirstName { get; set; } - - [Required] - [Display(Name = "Last Name")] - [StringLength(160)] - public string LastName { get; set; } - - [Required] - [StringLength(70, MinimumLength = 3)] - public string Address { get; set; } - - [Required] - [StringLength(40)] - public string City { get; set; } - - [Required] - [StringLength(40)] - public string State { get; set; } - - [Required] - [Display(Name = "Postal Code")] - [StringLength(10, MinimumLength = 5)] - public string PostalCode { get; set; } - - [Required] - [StringLength(40)] - public string Country { get; set; } - - [Required] - [StringLength(24)] - [DataType(DataType.PhoneNumber)] - public string Phone { get; set; } - - [Required] - [Display(Name = "Email Address")] - [RegularExpression(@"[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,4}", - ErrorMessage = "Email is not valid.")] - [DataType(DataType.EmailAddress)] - public string Email { get; set; } - - [ScaffoldColumn(false)] - public decimal Total { get; set; } - - public ICollection OrderDetails { get; set; } - } -} diff --git a/samples/react/MusicStore/Apis/Models/OrderDetail.cs b/samples/react/MusicStore/Apis/Models/OrderDetail.cs deleted file mode 100644 index cb1e6930..00000000 --- a/samples/react/MusicStore/Apis/Models/OrderDetail.cs +++ /dev/null @@ -1,14 +0,0 @@ -namespace MusicStore.Models -{ - public class OrderDetail - { - public int OrderDetailId { get; set; } - public int OrderId { get; set; } - public int AlbumId { get; set; } - public int Quantity { get; set; } - public decimal UnitPrice { get; set; } - - public virtual Album Album { get; set; } - public virtual Order Order { get; set; } - } -} diff --git a/samples/react/MusicStore/Apis/Models/SampleData.cs b/samples/react/MusicStore/Apis/Models/SampleData.cs deleted file mode 100644 index b1d98a7c..00000000 --- a/samples/react/MusicStore/Apis/Models/SampleData.cs +++ /dev/null @@ -1,915 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Security.Claims; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Identity; -using Microsoft.AspNetCore.Identity.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Options; - -namespace MusicStore.Models -{ - public static class SampleData - { - const string imgUrl = "/images/placeholder.png"; - - public static async Task InitializeMusicStoreDatabaseAsync(IServiceProvider serviceProvider) - { - using (var db = serviceProvider.GetService()) - { - if (await db.Database.EnsureCreatedAsync()) - { - await InsertTestData(serviceProvider); - } - } - } - - private static async Task InsertTestData(IServiceProvider serviceProvider) - { - var albums = GetAlbums(imgUrl, Genres, Artists); - await AddOrUpdateAsync(serviceProvider, g => g.GenreId, Genres.Select(genre => genre.Value)); - await AddOrUpdateAsync(serviceProvider, a => a.ArtistId, Artists.Select(artist => artist.Value)); - await AddOrUpdateAsync(serviceProvider, a => a.AlbumId, albums); - } - - // TODO [EF] This may be replaced by a first class mechanism in EF - private static async Task AddOrUpdateAsync( - IServiceProvider serviceProvider, - Func propertyToMatch, IEnumerable entities) - where TEntity : class - { - // Query in a separate context so that we can attach existing entities as modified - List existingData; - - using (var scope = serviceProvider.GetRequiredService().CreateScope()) - using (var db = scope.ServiceProvider.GetService()) - { - existingData = db.Set().ToList(); - } - - using (var scope = serviceProvider.GetRequiredService().CreateScope()) - using (var db = scope.ServiceProvider.GetService()) - { - foreach (var item in entities) - { - db.Entry(item).State = existingData.Any(g => propertyToMatch(g).Equals(propertyToMatch(item))) - ? EntityState.Modified - : EntityState.Added; - } - - await db.SaveChangesAsync(); - } - } - - private static Album[] GetAlbums(string imgUrl, Dictionary genres, Dictionary artists) - { - var albums = new Album[] - { - new Album { Title = "The Best Of The Men At Work", Genre = genres["Pop"], Price = 8.99M, Artist = artists["Men At Work"], AlbumArtUrl = imgUrl }, - new Album { Title = "...And Justice For All", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Metallica"], AlbumArtUrl = imgUrl }, - new Album { Title = "עד גבול האור", Genre = genres["World"], Price = 8.99M, Artist = artists["אריק אינשטיין"], AlbumArtUrl = imgUrl }, - new Album { Title = "Black Light Syndrome", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Terry Bozzio, Tony Levin & Steve Stevens"], AlbumArtUrl = imgUrl }, - new Album { Title = "10,000 Days", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Tool"], AlbumArtUrl = imgUrl }, - new Album { Title = "11i", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["Supreme Beings of Leisure"], AlbumArtUrl = imgUrl }, - new Album { Title = "1960", Genre = genres["Indie"], Price = 8.99M, Artist = artists["Soul-Junk"], AlbumArtUrl = imgUrl }, - new Album { Title = "4x4=12 ", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["deadmau5"], AlbumArtUrl = imgUrl }, - new Album { Title = "A Copland Celebration, Vol. I", Genre = genres["Classical"], Price = 8.99M, Artist = artists["London Symphony Orchestra"], AlbumArtUrl = imgUrl }, - new Album { Title = "A Lively Mind", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["Paul Oakenfold"], AlbumArtUrl = imgUrl }, - new Album { Title = "A Matter of Life and Death", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Iron Maiden"], AlbumArtUrl = imgUrl }, - new Album { Title = "A Real Dead One", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Iron Maiden"], AlbumArtUrl = imgUrl }, - new Album { Title = "A Real Live One", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Iron Maiden"], AlbumArtUrl = imgUrl }, - new Album { Title = "A Rush of Blood to the Head", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Coldplay"], AlbumArtUrl = imgUrl }, - new Album { Title = "A Soprano Inspired", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Britten Sinfonia, Ivor Bolton & Lesley Garrett"], AlbumArtUrl = imgUrl }, - new Album { Title = "A Winter Symphony", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Sarah Brightman"], AlbumArtUrl = imgUrl }, - new Album { Title = "Abbey Road", Genre = genres["Rock"], Price = 8.99M, Artist = artists["The Beatles"], AlbumArtUrl = imgUrl }, - new Album { Title = "Ace Of Spades", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Motörhead"], AlbumArtUrl = imgUrl }, - new Album { Title = "Achtung Baby", Genre = genres["Rock"], Price = 8.99M, Artist = artists["U2"], AlbumArtUrl = imgUrl }, - new Album { Title = "Acústico MTV", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Os Paralamas Do Sucesso"], AlbumArtUrl = imgUrl }, - new Album { Title = "Adams, John: The Chairman Dances", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Edo de Waart & San Francisco Symphony"], AlbumArtUrl = imgUrl }, - new Album { Title = "Adrenaline", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Deftones"], AlbumArtUrl = imgUrl }, - new Album { Title = "Ænima", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Tool"], AlbumArtUrl = imgUrl }, - new Album { Title = "Afrociberdelia", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Chico Science & Nação Zumbi"], AlbumArtUrl = imgUrl }, - new Album { Title = "After the Goldrush", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Neil Young"], AlbumArtUrl = imgUrl }, - new Album { Title = "Airdrawn Dagger", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["Sasha"], AlbumArtUrl = imgUrl }, - new Album { Title = "Album Title Goes Here", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["deadmau5"], AlbumArtUrl = imgUrl }, - new Album { Title = "Alcohol Fueled Brewtality Live! [Disc 1]", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Black Label Society"], AlbumArtUrl = imgUrl }, - new Album { Title = "Alcohol Fueled Brewtality Live! [Disc 2]", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Black Label Society"], AlbumArtUrl = imgUrl }, - new Album { Title = "Alive 2007", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["Daft Punk"], AlbumArtUrl = imgUrl }, - new Album { Title = "All I Ask of You", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Sarah Brightman"], AlbumArtUrl = imgUrl }, - new Album { Title = "Amen (So Be It)", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Paddy Casey"], AlbumArtUrl = imgUrl }, - new Album { Title = "Animal Vehicle", Genre = genres["Pop"], Price = 8.99M, Artist = artists["The Axis of Awesome"], AlbumArtUrl = imgUrl }, - new Album { Title = "Ao Vivo [IMPORT]", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Zeca Pagodinho"], AlbumArtUrl = imgUrl }, - new Album { Title = "Apocalyptic Love", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Slash"], AlbumArtUrl = imgUrl }, - new Album { Title = "Appetite for Destruction", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Guns N' Roses"], AlbumArtUrl = imgUrl }, - new Album { Title = "Are You Experienced?", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Jimi Hendrix"], AlbumArtUrl = imgUrl }, - new Album { Title = "Arquivo II", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Os Paralamas Do Sucesso"], AlbumArtUrl = imgUrl }, - new Album { Title = "Arquivo Os Paralamas Do Sucesso", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Os Paralamas Do Sucesso"], AlbumArtUrl = imgUrl }, - new Album { Title = "A-Sides", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Soundgarden"], AlbumArtUrl = imgUrl }, - new Album { Title = "Audioslave", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Audioslave"], AlbumArtUrl = imgUrl }, - new Album { Title = "Automatic for the People", Genre = genres["Alternative"], Price = 8.99M, Artist = artists["R.E.M."], AlbumArtUrl = imgUrl }, - new Album { Title = "Axé Bahia 2001", Genre = genres["Pop"], Price = 8.99M, Artist = artists["Various Artists"], AlbumArtUrl = imgUrl }, - new Album { Title = "Babel", Genre = genres["Alternative"], Price = 8.99M, Artist = artists["Mumford & Sons"], AlbumArtUrl = imgUrl }, - new Album { Title = "Bach: Goldberg Variations", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Wilhelm Kempff"], AlbumArtUrl = imgUrl }, - new Album { Title = "Bach: The Brandenburg Concertos", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Orchestra of The Age of Enlightenment"], AlbumArtUrl = imgUrl }, - new Album { Title = "Bach: The Cello Suites", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Yo-Yo Ma"], AlbumArtUrl = imgUrl }, - new Album { Title = "Bach: Toccata & Fugue in D Minor", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Ton Koopman"], AlbumArtUrl = imgUrl }, - new Album { Title = "Bad Motorfinger", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Soundgarden"], AlbumArtUrl = imgUrl }, - new Album { Title = "Balls to the Wall", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Accept"], AlbumArtUrl = imgUrl }, - new Album { Title = "Banadeek Ta'ala", Genre = genres["World"], Price = 8.99M, Artist = artists["Amr Diab"], AlbumArtUrl = imgUrl }, - new Album { Title = "Barbie Girl", Genre = genres["Pop"], Price = 8.99M, Artist = artists["Aqua"], AlbumArtUrl = imgUrl }, - new Album { Title = "Bark at the Moon (Remastered)", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Ozzy Osbourne"], AlbumArtUrl = imgUrl }, - new Album { Title = "Bartok: Violin & Viola Concertos", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Yehudi Menuhin"], AlbumArtUrl = imgUrl }, - new Album { Title = "Barulhinho Bom", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Marisa Monte"], AlbumArtUrl = imgUrl }, - new Album { Title = "BBC Sessions [Disc 1] [Live]", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Led Zeppelin"], AlbumArtUrl = imgUrl }, - new Album { Title = "BBC Sessions [Disc 2] [Live]", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Led Zeppelin"], AlbumArtUrl = imgUrl }, - new Album { Title = "Be Here Now", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Oasis"], AlbumArtUrl = imgUrl }, - new Album { Title = "Bedrock 11 Compiled & Mixed", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["John Digweed"], AlbumArtUrl = imgUrl }, - new Album { Title = "Berlioz: Symphonie Fantastique", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Michael Tilson Thomas"], AlbumArtUrl = imgUrl }, - new Album { Title = "Beyond Good And Evil", Genre = genres["Rock"], Price = 8.99M, Artist = artists["The Cult"], AlbumArtUrl = imgUrl }, - new Album { Title = "Big Bad Wolf ", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["Armand Van Helden"], AlbumArtUrl = imgUrl }, - new Album { Title = "Big Ones", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Aerosmith"], AlbumArtUrl = imgUrl }, - new Album { Title = "Black Album", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Metallica"], AlbumArtUrl = imgUrl }, - new Album { Title = "Black Sabbath Vol. 4 (Remaster)", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Black Sabbath"], AlbumArtUrl = imgUrl }, - new Album { Title = "Black Sabbath", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Black Sabbath"], AlbumArtUrl = imgUrl }, - new Album { Title = "Black", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Metallica"], AlbumArtUrl = imgUrl }, - new Album { Title = "Blackwater Park", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Opeth"], AlbumArtUrl = imgUrl }, - new Album { Title = "Blizzard of Ozz", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Ozzy Osbourne"], AlbumArtUrl = imgUrl }, - new Album { Title = "Blood", Genre = genres["Rock"], Price = 8.99M, Artist = artists["In This Moment"], AlbumArtUrl = imgUrl }, - new Album { Title = "Blue Moods", Genre = genres["Jazz"], Price = 8.99M, Artist = artists["Incognito"], AlbumArtUrl = imgUrl }, - new Album { Title = "Blue", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Weezer"], AlbumArtUrl = imgUrl }, - new Album { Title = "Bongo Fury", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Frank Zappa & Captain Beefheart"], AlbumArtUrl = imgUrl }, - new Album { Title = "Boys & Girls", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Alabama Shakes"], AlbumArtUrl = imgUrl }, - new Album { Title = "Brave New World", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Iron Maiden"], AlbumArtUrl = imgUrl }, - new Album { Title = "B-Sides 1980-1990", Genre = genres["Rock"], Price = 8.99M, Artist = artists["U2"], AlbumArtUrl = imgUrl }, - new Album { Title = "Bunkka", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["Paul Oakenfold"], AlbumArtUrl = imgUrl }, - new Album { Title = "By The Way", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Red Hot Chili Peppers"], AlbumArtUrl = imgUrl }, - new Album { Title = "Cake: B-Sides and Rarities", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["Cake"], AlbumArtUrl = imgUrl }, - new Album { Title = "Californication", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Red Hot Chili Peppers"], AlbumArtUrl = imgUrl }, - new Album { Title = "Carmina Burana", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Boston Symphony Orchestra & Seiji Ozawa"], AlbumArtUrl = imgUrl }, - new Album { Title = "Carried to Dust (Bonus Track Version)", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["Calexico"], AlbumArtUrl = imgUrl }, - new Album { Title = "Carry On", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["Chris Cornell"], AlbumArtUrl = imgUrl }, - new Album { Title = "Cássia Eller - Sem Limite [Disc 1]", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Cássia Eller"], AlbumArtUrl = imgUrl }, - new Album { Title = "Chemical Wedding", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Bruce Dickinson"], AlbumArtUrl = imgUrl }, - new Album { Title = "Chill: Brazil (Disc 1)", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Marcos Valle"], AlbumArtUrl = imgUrl }, - new Album { Title = "Chill: Brazil (Disc 2)", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Antônio Carlos Jobim"], AlbumArtUrl = imgUrl }, - new Album { Title = "Chocolate Starfish And The Hot Dog Flavored Water", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Limp Bizkit"], AlbumArtUrl = imgUrl }, - new Album { Title = "Chronicle, Vol. 1", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Creedence Clearwater Revival"], AlbumArtUrl = imgUrl }, - new Album { Title = "Chronicle, Vol. 2", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Creedence Clearwater Revival"], AlbumArtUrl = imgUrl }, - new Album { Title = "Ciao, Baby", Genre = genres["Rock"], Price = 8.99M, Artist = artists["TheStart"], AlbumArtUrl = imgUrl }, - new Album { Title = "Cidade Negra - Hits", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Cidade Negra"], AlbumArtUrl = imgUrl }, - new Album { Title = "Classic Munkle: Turbo Edition", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["Munkle"], AlbumArtUrl = imgUrl }, - new Album { Title = "Classics: The Best of Sarah Brightman", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Sarah Brightman"], AlbumArtUrl = imgUrl }, - new Album { Title = "Coda", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Led Zeppelin"], AlbumArtUrl = imgUrl }, - new Album { Title = "Come Away With Me", Genre = genres["Jazz"], Price = 8.99M, Artist = artists["Norah Jones"], AlbumArtUrl = imgUrl }, - new Album { Title = "Come Taste The Band", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Deep Purple"], AlbumArtUrl = imgUrl }, - new Album { Title = "Comfort Eagle", Genre = genres["Alternative"], Price = 8.99M, Artist = artists["Cake"], AlbumArtUrl = imgUrl }, - new Album { Title = "Common Reaction", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Uh Huh Her "], AlbumArtUrl = imgUrl }, - new Album { Title = "Compositores", Genre = genres["Rock"], Price = 8.99M, Artist = artists["O Terço"], AlbumArtUrl = imgUrl }, - new Album { Title = "Contraband", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Velvet Revolver"], AlbumArtUrl = imgUrl }, - new Album { Title = "Core", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Stone Temple Pilots"], AlbumArtUrl = imgUrl }, - new Album { Title = "Cornerstone", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Styx"], AlbumArtUrl = imgUrl }, - new Album { Title = "Cosmicolor", Genre = genres["Rap"], Price = 8.99M, Artist = artists["M-Flo"], AlbumArtUrl = imgUrl }, - new Album { Title = "Cross", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["Justice"], AlbumArtUrl = imgUrl }, - new Album { Title = "Culture of Fear", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["Thievery Corporation"], AlbumArtUrl = imgUrl }, - new Album { Title = "Da Lama Ao Caos", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Chico Science & Nação Zumbi"], AlbumArtUrl = imgUrl }, - new Album { Title = "Dakshina", Genre = genres["World"], Price = 8.99M, Artist = artists["Deva Premal"], AlbumArtUrl = imgUrl }, - new Album { Title = "Dark Side of the Moon", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Pink Floyd"], AlbumArtUrl = imgUrl }, - new Album { Title = "Death Magnetic", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Metallica"], AlbumArtUrl = imgUrl }, - new Album { Title = "Deep End of Down", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Above the Fold"], AlbumArtUrl = imgUrl }, - new Album { Title = "Deep Purple In Rock", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Deep Purple"], AlbumArtUrl = imgUrl }, - new Album { Title = "Deixa Entrar", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Falamansa"], AlbumArtUrl = imgUrl }, - new Album { Title = "Deja Vu", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Crosby, Stills, Nash, and Young"], AlbumArtUrl = imgUrl }, - new Album { Title = "Di Korpu Ku Alma", Genre = genres["World"], Price = 8.99M, Artist = artists["Lura"], AlbumArtUrl = imgUrl }, - new Album { Title = "Diary of a Madman (Remastered)", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Ozzy Osbourne"], AlbumArtUrl = imgUrl }, - new Album { Title = "Diary of a Madman", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Ozzy Osbourne"], AlbumArtUrl = imgUrl }, - new Album { Title = "Dirt", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Alice in Chains"], AlbumArtUrl = imgUrl }, - new Album { Title = "Diver Down", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Van Halen"], AlbumArtUrl = imgUrl }, - new Album { Title = "Djavan Ao Vivo - Vol. 02", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Djavan"], AlbumArtUrl = imgUrl }, - new Album { Title = "Djavan Ao Vivo - Vol. 1", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Djavan"], AlbumArtUrl = imgUrl }, - new Album { Title = "Drum'n'bass for Papa", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["Plug"], AlbumArtUrl = imgUrl }, - new Album { Title = "Duluth", Genre = genres["Country"], Price = 8.99M, Artist = artists["Trampled By Turtles"], AlbumArtUrl = imgUrl }, - new Album { Title = "Dummy", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["Portishead"], AlbumArtUrl = imgUrl }, - new Album { Title = "Duos II", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Luciana Souza/Romero Lubambo"], AlbumArtUrl = imgUrl }, - new Album { Title = "Earl Scruggs and Friends", Genre = genres["Country"], Price = 8.99M, Artist = artists["Earl Scruggs"], AlbumArtUrl = imgUrl }, - new Album { Title = "Eden", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Sarah Brightman"], AlbumArtUrl = imgUrl }, - new Album { Title = "El Camino", Genre = genres["Rock"], Price = 8.99M, Artist = artists["The Black Keys"], AlbumArtUrl = imgUrl }, - new Album { Title = "Elegant Gypsy", Genre = genres["Jazz"], Price = 8.99M, Artist = artists["Al di Meola"], AlbumArtUrl = imgUrl }, - new Album { Title = "Elements Of Life", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["Tiësto"], AlbumArtUrl = imgUrl }, - new Album { Title = "Elis Regina-Minha História", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Elis Regina"], AlbumArtUrl = imgUrl }, - new Album { Title = "Emergency On Planet Earth", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Jamiroquai"], AlbumArtUrl = imgUrl }, - new Album { Title = "Emotion", Genre = genres["World"], Price = 8.99M, Artist = artists["Papa Wemba"], AlbumArtUrl = imgUrl }, - new Album { Title = "English Renaissance", Genre = genres["Classical"], Price = 8.99M, Artist = artists["The King's Singers"], AlbumArtUrl = imgUrl }, - new Album { Title = "Every Kind of Light", Genre = genres["Rock"], Price = 8.99M, Artist = artists["The Posies"], AlbumArtUrl = imgUrl }, - new Album { Title = "Faceless", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Godsmack"], AlbumArtUrl = imgUrl }, - new Album { Title = "Facelift", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Alice in Chains"], AlbumArtUrl = imgUrl }, - new Album { Title = "Fair Warning", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Van Halen"], AlbumArtUrl = imgUrl }, - new Album { Title = "Fear of a Black Planet", Genre = genres["Rap"], Price = 8.99M, Artist = artists["Public Enemy"], AlbumArtUrl = imgUrl }, - new Album { Title = "Fear Of The Dark", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Iron Maiden"], AlbumArtUrl = imgUrl }, - new Album { Title = "Feels Like Home", Genre = genres["Jazz"], Price = 8.99M, Artist = artists["Norah Jones"], AlbumArtUrl = imgUrl }, - new Album { Title = "Fireball", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Deep Purple"], AlbumArtUrl = imgUrl }, - new Album { Title = "Fly", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Sarah Brightman"], AlbumArtUrl = imgUrl }, - new Album { Title = "For Those About To Rock We Salute You", Genre = genres["Rock"], Price = 8.99M, Artist = artists["AC/DC"], AlbumArtUrl = imgUrl }, - new Album { Title = "Four", Genre = genres["Blues"], Price = 8.99M, Artist = artists["Blues Traveler"], AlbumArtUrl = imgUrl }, - new Album { Title = "Frank", Genre = genres["Pop"], Price = 8.99M, Artist = artists["Amy Winehouse"], AlbumArtUrl = imgUrl }, - new Album { Title = "Further Down the Spiral", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["Nine Inch Nails"], AlbumArtUrl = imgUrl }, - new Album { Title = "Garage Inc. (Disc 1)", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Metallica"], AlbumArtUrl = imgUrl }, - new Album { Title = "Garage Inc. (Disc 2)", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Metallica"], AlbumArtUrl = imgUrl }, - new Album { Title = "Garbage", Genre = genres["Alternative"], Price = 8.99M, Artist = artists["Garbage"], AlbumArtUrl = imgUrl }, - new Album { Title = "Good News For People Who Love Bad News", Genre = genres["Indie"], Price = 8.99M, Artist = artists["Modest Mouse"], AlbumArtUrl = imgUrl }, - new Album { Title = "Gordon", Genre = genres["Alternative"], Price = 8.99M, Artist = artists["Barenaked Ladies"], AlbumArtUrl = imgUrl }, - new Album { Title = "Górecki: Symphony No. 3", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Adrian Leaper & Doreen de Feis"], AlbumArtUrl = imgUrl }, - new Album { Title = "Greatest Hits I", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Queen"], AlbumArtUrl = imgUrl }, - new Album { Title = "Greatest Hits II", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Queen"], AlbumArtUrl = imgUrl }, - new Album { Title = "Greatest Hits", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["Duck Sauce"], AlbumArtUrl = imgUrl }, - new Album { Title = "Greatest Hits", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Lenny Kravitz"], AlbumArtUrl = imgUrl }, - new Album { Title = "Greatest Hits", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Lenny Kravitz"], AlbumArtUrl = imgUrl }, - new Album { Title = "Greatest Kiss", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Kiss"], AlbumArtUrl = imgUrl }, - new Album { Title = "Greetings from Michigan", Genre = genres["Indie"], Price = 8.99M, Artist = artists["Sufjan Stevens"], AlbumArtUrl = imgUrl }, - new Album { Title = "Group Therapy", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["Above & Beyond"], AlbumArtUrl = imgUrl }, - new Album { Title = "Handel: The Messiah (Highlights)", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Scholars Baroque Ensemble"], AlbumArtUrl = imgUrl }, - new Album { Title = "Haydn: Symphonies 99 - 104", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Royal Philharmonic Orchestra"], AlbumArtUrl = imgUrl }, - new Album { Title = "Heart of the Night", Genre = genres["Jazz"], Price = 8.99M, Artist = artists["Spyro Gyra"], AlbumArtUrl = imgUrl }, - new Album { Title = "Heart On", Genre = genres["Rock"], Price = 8.99M, Artist = artists["The Eagles of Death Metal"], AlbumArtUrl = imgUrl }, - new Album { Title = "Holy Diver", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Dio"], AlbumArtUrl = imgUrl }, - new Album { Title = "Homework", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["Daft Punk"], AlbumArtUrl = imgUrl }, - new Album { Title = "Hot Rocks, 1964-1971 (Disc 1)", Genre = genres["Rock"], Price = 8.99M, Artist = artists["The Rolling Stones"], AlbumArtUrl = imgUrl }, - new Album { Title = "Houses Of The Holy", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Led Zeppelin"], AlbumArtUrl = imgUrl }, - new Album { Title = "How To Dismantle An Atomic Bomb", Genre = genres["Rock"], Price = 8.99M, Artist = artists["U2"], AlbumArtUrl = imgUrl }, - new Album { Title = "Human", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Projected"], AlbumArtUrl = imgUrl }, - new Album { Title = "Hunky Dory", Genre = genres["Rock"], Price = 8.99M, Artist = artists["David Bowie"], AlbumArtUrl = imgUrl }, - new Album { Title = "Hymns", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Projected"], AlbumArtUrl = imgUrl }, - new Album { Title = "Hysteria", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Def Leppard"], AlbumArtUrl = imgUrl }, - new Album { Title = "In Absentia", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Porcupine Tree"], AlbumArtUrl = imgUrl }, - new Album { Title = "In Between", Genre = genres["Pop"], Price = 8.99M, Artist = artists["Paul Van Dyk"], AlbumArtUrl = imgUrl }, - new Album { Title = "In Rainbows", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Radiohead"], AlbumArtUrl = imgUrl }, - new Album { Title = "In Step", Genre = genres["Blues"], Price = 8.99M, Artist = artists["Stevie Ray Vaughan & Double Trouble"], AlbumArtUrl = imgUrl }, - new Album { Title = "In the court of the Crimson King", Genre = genres["Rock"], Price = 8.99M, Artist = artists["King Crimson"], AlbumArtUrl = imgUrl }, - new Album { Title = "In Through The Out Door", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Led Zeppelin"], AlbumArtUrl = imgUrl }, - new Album { Title = "In Your Honor [Disc 1]", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Foo Fighters"], AlbumArtUrl = imgUrl }, - new Album { Title = "In Your Honor [Disc 2]", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Foo Fighters"], AlbumArtUrl = imgUrl }, - new Album { Title = "Indestructible", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Rancid"], AlbumArtUrl = imgUrl }, - new Album { Title = "Infinity", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Journey"], AlbumArtUrl = imgUrl }, - new Album { Title = "Into The Light", Genre = genres["Rock"], Price = 8.99M, Artist = artists["David Coverdale"], AlbumArtUrl = imgUrl }, - new Album { Title = "Introspective", Genre = genres["Pop"], Price = 8.99M, Artist = artists["Pet Shop Boys"], AlbumArtUrl = imgUrl }, - new Album { Title = "Iron Maiden", Genre = genres["Blues"], Price = 8.99M, Artist = artists["Iron Maiden"], AlbumArtUrl = imgUrl }, - new Album { Title = "ISAM", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["Amon Tobin"], AlbumArtUrl = imgUrl }, - new Album { Title = "IV", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Led Zeppelin"], AlbumArtUrl = imgUrl }, - new Album { Title = "Jagged Little Pill", Genre = genres["Alternative"], Price = 8.99M, Artist = artists["Alanis Morissette"], AlbumArtUrl = imgUrl }, - new Album { Title = "Jagged Little Pill", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Alanis Morissette"], AlbumArtUrl = imgUrl }, - new Album { Title = "Jorge Ben Jor 25 Anos", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Jorge Ben"], AlbumArtUrl = imgUrl }, - new Album { Title = "Jota Quest-1995", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Jota Quest"], AlbumArtUrl = imgUrl }, - new Album { Title = "Kick", Genre = genres["Alternative"], Price = 8.99M, Artist = artists["INXS"], AlbumArtUrl = imgUrl }, - new Album { Title = "Kill 'Em All", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Metallica"], AlbumArtUrl = imgUrl }, - new Album { Title = "Kind of Blue", Genre = genres["Jazz"], Price = 8.99M, Artist = artists["Miles Davis"], AlbumArtUrl = imgUrl }, - new Album { Title = "King For A Day Fool For A Lifetime", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Faith No More"], AlbumArtUrl = imgUrl }, - new Album { Title = "Kiss", Genre = genres["Pop"], Price = 8.99M, Artist = artists["Carly Rae Jepsen"], AlbumArtUrl = imgUrl }, - new Album { Title = "Last Call", Genre = genres["Country"], Price = 8.99M, Artist = artists["Cayouche"], AlbumArtUrl = imgUrl }, - new Album { Title = "Le Freak", Genre = genres["R&B"], Price = 8.99M, Artist = artists["Chic"], AlbumArtUrl = imgUrl }, - new Album { Title = "Le Tigre", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Le Tigre"], AlbumArtUrl = imgUrl }, - new Album { Title = "Led Zeppelin I", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Led Zeppelin"], AlbumArtUrl = imgUrl }, - new Album { Title = "Led Zeppelin II", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Led Zeppelin"], AlbumArtUrl = imgUrl }, - new Album { Title = "Led Zeppelin III", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Led Zeppelin"], AlbumArtUrl = imgUrl }, - new Album { Title = "Let There Be Rock", Genre = genres["Rock"], Price = 8.99M, Artist = artists["AC/DC"], AlbumArtUrl = imgUrl }, - new Album { Title = "Little Earthquakes", Genre = genres["Alternative"], Price = 8.99M, Artist = artists["Tori Amos"], AlbumArtUrl = imgUrl }, - new Album { Title = "Live [Disc 1]", Genre = genres["Blues"], Price = 8.99M, Artist = artists["The Black Crowes"], AlbumArtUrl = imgUrl }, - new Album { Title = "Live [Disc 2]", Genre = genres["Blues"], Price = 8.99M, Artist = artists["The Black Crowes"], AlbumArtUrl = imgUrl }, - new Album { Title = "Live After Death", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Iron Maiden"], AlbumArtUrl = imgUrl }, - new Album { Title = "Live At Donington 1992 (Disc 1)", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Iron Maiden"], AlbumArtUrl = imgUrl }, - new Album { Title = "Live At Donington 1992 (Disc 2)", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Iron Maiden"], AlbumArtUrl = imgUrl }, - new Album { Title = "Live on Earth", Genre = genres["Jazz"], Price = 8.99M, Artist = artists["The Cat Empire"], AlbumArtUrl = imgUrl }, - new Album { Title = "Live On Two Legs [Live]", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Pearl Jam"], AlbumArtUrl = imgUrl }, - new Album { Title = "Living After Midnight", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Judas Priest"], AlbumArtUrl = imgUrl }, - new Album { Title = "Living", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Paddy Casey"], AlbumArtUrl = imgUrl }, - new Album { Title = "Load", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Metallica"], AlbumArtUrl = imgUrl }, - new Album { Title = "Love Changes Everything", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Sarah Brightman"], AlbumArtUrl = imgUrl }, - new Album { Title = "MacArthur Park Suite", Genre = genres["R&B"], Price = 8.99M, Artist = artists["Donna Summer"], AlbumArtUrl = imgUrl }, - new Album { Title = "Machine Head", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Deep Purple"], AlbumArtUrl = imgUrl }, - new Album { Title = "Magical Mystery Tour", Genre = genres["Pop"], Price = 8.99M, Artist = artists["The Beatles"], AlbumArtUrl = imgUrl }, - new Album { Title = "Mais Do Mesmo", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Legião Urbana"], AlbumArtUrl = imgUrl }, - new Album { Title = "Maquinarama", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Skank"], AlbumArtUrl = imgUrl }, - new Album { Title = "Marasim", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Jagjit Singh"], AlbumArtUrl = imgUrl }, - new Album { Title = "Mascagni: Cavalleria Rusticana", Genre = genres["Classical"], Price = 8.99M, Artist = artists["James Levine"], AlbumArtUrl = imgUrl }, - new Album { Title = "Master of Puppets", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Metallica"], AlbumArtUrl = imgUrl }, - new Album { Title = "Mechanics & Mathematics", Genre = genres["Pop"], Price = 8.99M, Artist = artists["Venus Hum"], AlbumArtUrl = imgUrl }, - new Album { Title = "Mental Jewelry", Genre = genres["Alternative"], Price = 8.99M, Artist = artists["Live"], AlbumArtUrl = imgUrl }, - new Album { Title = "Metallics", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Metallica"], AlbumArtUrl = imgUrl }, - new Album { Title = "meteora", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Linkin Park"], AlbumArtUrl = imgUrl }, - new Album { Title = "Meus Momentos", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Gonzaguinha"], AlbumArtUrl = imgUrl }, - new Album { Title = "Mezmerize", Genre = genres["Metal"], Price = 8.99M, Artist = artists["System Of A Down"], AlbumArtUrl = imgUrl }, - new Album { Title = "Mezzanine", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["Massive Attack"], AlbumArtUrl = imgUrl }, - new Album { Title = "Miles Ahead", Genre = genres["Jazz"], Price = 8.99M, Artist = artists["Miles Davis"], AlbumArtUrl = imgUrl }, - new Album { Title = "Milton Nascimento Ao Vivo", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Milton Nascimento"], AlbumArtUrl = imgUrl }, - new Album { Title = "Minas", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Milton Nascimento"], AlbumArtUrl = imgUrl }, - new Album { Title = "Minha Historia", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Chico Buarque"], AlbumArtUrl = imgUrl }, - new Album { Title = "Misplaced Childhood", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Marillion"], AlbumArtUrl = imgUrl }, - new Album { Title = "MK III The Final Concerts [Disc 1]", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Deep Purple"], AlbumArtUrl = imgUrl }, - new Album { Title = "Morning Dance", Genre = genres["Jazz"], Price = 8.99M, Artist = artists["Spyro Gyra"], AlbumArtUrl = imgUrl }, - new Album { Title = "Motley Crue Greatest Hits", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Mötley Crüe"], AlbumArtUrl = imgUrl }, - new Album { Title = "Moving Pictures", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Rush"], AlbumArtUrl = imgUrl }, - new Album { Title = "Mozart: Chamber Music", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Nash Ensemble"], AlbumArtUrl = imgUrl }, - new Album { Title = "Mozart: Symphonies Nos. 40 & 41", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Berliner Philharmoniker"], AlbumArtUrl = imgUrl }, - new Album { Title = "Murder Ballads", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Nick Cave and the Bad Seeds"], AlbumArtUrl = imgUrl }, - new Album { Title = "Music For The Jilted Generation", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["The Prodigy"], AlbumArtUrl = imgUrl }, - new Album { Title = "My Generation - The Very Best Of The Who", Genre = genres["Rock"], Price = 8.99M, Artist = artists["The Who"], AlbumArtUrl = imgUrl }, - new Album { Title = "My Name is Skrillex", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["Skrillex"], AlbumArtUrl = imgUrl }, - new Album { Title = "Na Pista", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Cláudio Zoli"], AlbumArtUrl = imgUrl }, - new Album { Title = "Nevermind", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Nirvana"], AlbumArtUrl = imgUrl }, - new Album { Title = "New Adventures In Hi-Fi", Genre = genres["Rock"], Price = 8.99M, Artist = artists["R.E.M."], AlbumArtUrl = imgUrl }, - new Album { Title = "New Divide", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Linkin Park"], AlbumArtUrl = imgUrl }, - new Album { Title = "New York Dolls", Genre = genres["Punk"], Price = 8.99M, Artist = artists["New York Dolls"], AlbumArtUrl = imgUrl }, - new Album { Title = "News Of The World", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Queen"], AlbumArtUrl = imgUrl }, - new Album { Title = "Nielsen: The Six Symphonies", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Göteborgs Symfoniker & Neeme Järvi"], AlbumArtUrl = imgUrl }, - new Album { Title = "Night At The Opera", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Queen"], AlbumArtUrl = imgUrl }, - new Album { Title = "Night Castle", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Trans-Siberian Orchestra"], AlbumArtUrl = imgUrl }, - new Album { Title = "Nkolo", Genre = genres["World"], Price = 8.99M, Artist = artists["Lokua Kanza"], AlbumArtUrl = imgUrl }, - new Album { Title = "No More Tears (Remastered)", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Ozzy Osbourne"], AlbumArtUrl = imgUrl }, - new Album { Title = "No Prayer For The Dying", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Iron Maiden"], AlbumArtUrl = imgUrl }, - new Album { Title = "No Security", Genre = genres["Rock"], Price = 8.99M, Artist = artists["The Rolling Stones"], AlbumArtUrl = imgUrl }, - new Album { Title = "O Brother, Where Art Thou?", Genre = genres["Country"], Price = 8.99M, Artist = artists["Alison Krauss"], AlbumArtUrl = imgUrl }, - new Album { Title = "O Samba Poconé", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Skank"], AlbumArtUrl = imgUrl }, - new Album { Title = "O(+>", Genre = genres["R&B"], Price = 8.99M, Artist = artists["Prince"], AlbumArtUrl = imgUrl }, - new Album { Title = "Oceania", Genre = genres["Rock"], Price = 8.99M, Artist = artists["The Smashing Pumpkins"], AlbumArtUrl = imgUrl }, - new Album { Title = "Off the Deep End", Genre = genres["Pop"], Price = 8.99M, Artist = artists["Weird Al"], AlbumArtUrl = imgUrl }, - new Album { Title = "OK Computer", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Radiohead"], AlbumArtUrl = imgUrl }, - new Album { Title = "Olodum", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Olodum"], AlbumArtUrl = imgUrl }, - new Album { Title = "One Love", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["David Guetta"], AlbumArtUrl = imgUrl }, - new Album { Title = "Operation: Mindcrime", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Queensrÿche"], AlbumArtUrl = imgUrl }, - new Album { Title = "Opiate", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Tool"], AlbumArtUrl = imgUrl }, - new Album { Title = "Outbreak", Genre = genres["Jazz"], Price = 8.99M, Artist = artists["Dennis Chambers"], AlbumArtUrl = imgUrl }, - new Album { Title = "Pachelbel: Canon & Gigue", Genre = genres["Classical"], Price = 8.99M, Artist = artists["English Concert & Trevor Pinnock"], AlbumArtUrl = imgUrl }, - new Album { Title = "Paid in Full", Genre = genres["Rap"], Price = 8.99M, Artist = artists["Eric B. and Rakim"], AlbumArtUrl = imgUrl }, - new Album { Title = "Para Siempre", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Vicente Fernandez"], AlbumArtUrl = imgUrl }, - new Album { Title = "Pause", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["Four Tet"], AlbumArtUrl = imgUrl }, - new Album { Title = "Peace Sells... but Who's Buying", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Megadeth"], AlbumArtUrl = imgUrl }, - new Album { Title = "Physical Graffiti [Disc 1]", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Led Zeppelin"], AlbumArtUrl = imgUrl }, - new Album { Title = "Physical Graffiti [Disc 2]", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Led Zeppelin"], AlbumArtUrl = imgUrl }, - new Album { Title = "Physical Graffiti", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Led Zeppelin"], AlbumArtUrl = imgUrl }, - new Album { Title = "Piece Of Mind", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Iron Maiden"], AlbumArtUrl = imgUrl }, - new Album { Title = "Pinkerton", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Weezer"], AlbumArtUrl = imgUrl }, - new Album { Title = "Plays Metallica By Four Cellos", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Apocalyptica"], AlbumArtUrl = imgUrl }, - new Album { Title = "Pop", Genre = genres["Rock"], Price = 8.99M, Artist = artists["U2"], AlbumArtUrl = imgUrl }, - new Album { Title = "Powerslave", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Iron Maiden"], AlbumArtUrl = imgUrl }, - new Album { Title = "Prenda Minha", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Caetano Veloso"], AlbumArtUrl = imgUrl }, - new Album { Title = "Presence", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Led Zeppelin"], AlbumArtUrl = imgUrl }, - new Album { Title = "Pretty Hate Machine", Genre = genres["Alternative"], Price = 8.99M, Artist = artists["Nine Inch Nails"], AlbumArtUrl = imgUrl }, - new Album { Title = "Prisoner", Genre = genres["Rock"], Price = 8.99M, Artist = artists["The Jezabels"], AlbumArtUrl = imgUrl }, - new Album { Title = "Privateering", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Mark Knopfler"], AlbumArtUrl = imgUrl }, - new Album { Title = "Prokofiev: Romeo & Juliet", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Michael Tilson Thomas"], AlbumArtUrl = imgUrl }, - new Album { Title = "Prokofiev: Symphony No.1", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Sergei Prokofiev & Yuri Temirkanov"], AlbumArtUrl = imgUrl }, - new Album { Title = "PSY's Best 6th Part 1", Genre = genres["Pop"], Price = 8.99M, Artist = artists["PSY"], AlbumArtUrl = imgUrl }, - new Album { Title = "Purcell: The Fairy Queen", Genre = genres["Classical"], Price = 8.99M, Artist = artists["London Classical Players"], AlbumArtUrl = imgUrl }, - new Album { Title = "Purpendicular", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Deep Purple"], AlbumArtUrl = imgUrl }, - new Album { Title = "Purple", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Stone Temple Pilots"], AlbumArtUrl = imgUrl }, - new Album { Title = "Quanta Gente Veio Ver (Live)", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Gilberto Gil"], AlbumArtUrl = imgUrl }, - new Album { Title = "Quanta Gente Veio ver--Bônus De Carnaval", Genre = genres["Jazz"], Price = 8.99M, Artist = artists["Gilberto Gil"], AlbumArtUrl = imgUrl }, - new Album { Title = "Quiet Songs", Genre = genres["Jazz"], Price = 8.99M, Artist = artists["Aisha Duo"], AlbumArtUrl = imgUrl }, - new Album { Title = "Raices", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Los Tigres del Norte"], AlbumArtUrl = imgUrl }, - new Album { Title = "Raising Hell", Genre = genres["Rap"], Price = 8.99M, Artist = artists["Run DMC"], AlbumArtUrl = imgUrl }, - new Album { Title = "Raoul and the Kings of Spain ", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Tears For Fears"], AlbumArtUrl = imgUrl }, - new Album { Title = "Rattle And Hum", Genre = genres["Rock"], Price = 8.99M, Artist = artists["U2"], AlbumArtUrl = imgUrl }, - new Album { Title = "Raul Seixas", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Raul Seixas"], AlbumArtUrl = imgUrl }, - new Album { Title = "Recovery [Explicit]", Genre = genres["Rap"], Price = 8.99M, Artist = artists["Eminem"], AlbumArtUrl = imgUrl }, - new Album { Title = "Reign In Blood", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Slayer"], AlbumArtUrl = imgUrl }, - new Album { Title = "Relayed", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Yes"], AlbumArtUrl = imgUrl }, - new Album { Title = "ReLoad", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Metallica"], AlbumArtUrl = imgUrl }, - new Album { Title = "Respighi:Pines of Rome", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Eugene Ormandy"], AlbumArtUrl = imgUrl }, - new Album { Title = "Restless and Wild", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Accept"], AlbumArtUrl = imgUrl }, - new Album { Title = "Retrospective I (1974-1980)", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Rush"], AlbumArtUrl = imgUrl }, - new Album { Title = "Revelations", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["Audioslave"], AlbumArtUrl = imgUrl }, - new Album { Title = "Revolver", Genre = genres["Rock"], Price = 8.99M, Artist = artists["The Beatles"], AlbumArtUrl = imgUrl }, - new Album { Title = "Ride the Lighting ", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Metallica"], AlbumArtUrl = imgUrl }, - new Album { Title = "Ride The Lightning", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Metallica"], AlbumArtUrl = imgUrl }, - new Album { Title = "Ring My Bell", Genre = genres["R&B"], Price = 8.99M, Artist = artists["Anita Ward"], AlbumArtUrl = imgUrl }, - new Album { Title = "Riot Act", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Pearl Jam"], AlbumArtUrl = imgUrl }, - new Album { Title = "Rise of the Phoenix", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Before the Dawn"], AlbumArtUrl = imgUrl }, - new Album { Title = "Rock In Rio [CD1]", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Iron Maiden"], AlbumArtUrl = imgUrl }, - new Album { Title = "Rock In Rio [CD2]", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Iron Maiden"], AlbumArtUrl = imgUrl }, - new Album { Title = "Rock In Rio [CD2]", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Iron Maiden"], AlbumArtUrl = imgUrl }, - new Album { Title = "Roda De Funk", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Funk Como Le Gusta"], AlbumArtUrl = imgUrl }, - new Album { Title = "Room for Squares", Genre = genres["Pop"], Price = 8.99M, Artist = artists["John Mayer"], AlbumArtUrl = imgUrl }, - new Album { Title = "Root Down", Genre = genres["Jazz"], Price = 8.99M, Artist = artists["Jimmy Smith"], AlbumArtUrl = imgUrl }, - new Album { Title = "Rounds", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["Four Tet"], AlbumArtUrl = imgUrl }, - new Album { Title = "Rubber Factory", Genre = genres["Rock"], Price = 8.99M, Artist = artists["The Black Keys"], AlbumArtUrl = imgUrl }, - new Album { Title = "Rust in Peace", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Megadeth"], AlbumArtUrl = imgUrl }, - new Album { Title = "Sambas De Enredo 2001", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Various Artists"], AlbumArtUrl = imgUrl }, - new Album { Title = "Santana - As Years Go By", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Santana"], AlbumArtUrl = imgUrl }, - new Album { Title = "Santana Live", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Santana"], AlbumArtUrl = imgUrl }, - new Album { Title = "Saturday Night Fever", Genre = genres["R&B"], Price = 8.99M, Artist = artists["Bee Gees"], AlbumArtUrl = imgUrl }, - new Album { Title = "Scary Monsters and Nice Sprites", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["Skrillex"], AlbumArtUrl = imgUrl }, - new Album { Title = "Scheherazade", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Chicago Symphony Orchestra & Fritz Reiner"], AlbumArtUrl = imgUrl }, - new Album { Title = "SCRIABIN: Vers la flamme", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Christopher O'Riley"], AlbumArtUrl = imgUrl }, - new Album { Title = "Second Coming", Genre = genres["Rock"], Price = 8.99M, Artist = artists["The Stone Roses"], AlbumArtUrl = imgUrl }, - new Album { Title = "Serie Sem Limite (Disc 1)", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Tim Maia"], AlbumArtUrl = imgUrl }, - new Album { Title = "Serie Sem Limite (Disc 2)", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Tim Maia"], AlbumArtUrl = imgUrl }, - new Album { Title = "Serious About Men", Genre = genres["Rap"], Price = 8.99M, Artist = artists["The Rubberbandits"], AlbumArtUrl = imgUrl }, - new Album { Title = "Seventh Son of a Seventh Son", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Iron Maiden"], AlbumArtUrl = imgUrl }, - new Album { Title = "Short Bus", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Filter"], AlbumArtUrl = imgUrl }, - new Album { Title = "Sibelius: Finlandia", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Berliner Philharmoniker"], AlbumArtUrl = imgUrl }, - new Album { Title = "Singles Collection", Genre = genres["Rock"], Price = 8.99M, Artist = artists["David Bowie"], AlbumArtUrl = imgUrl }, - new Album { Title = "Six Degrees of Inner Turbulence", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Dream Theater"], AlbumArtUrl = imgUrl }, - new Album { Title = "Slave To The Empire", Genre = genres["Metal"], Price = 8.99M, Artist = artists["T&N"], AlbumArtUrl = imgUrl }, - new Album { Title = "Slaves And Masters", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Deep Purple"], AlbumArtUrl = imgUrl }, - new Album { Title = "Slouching Towards Bethlehem", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Robert James"], AlbumArtUrl = imgUrl }, - new Album { Title = "Smash", Genre = genres["Rock"], Price = 8.99M, Artist = artists["The Offspring"], AlbumArtUrl = imgUrl }, - new Album { Title = "Something Special", Genre = genres["Country"], Price = 8.99M, Artist = artists["Dolly Parton"], AlbumArtUrl = imgUrl }, - new Album { Title = "Somewhere in Time", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Iron Maiden"], AlbumArtUrl = imgUrl }, - new Album { Title = "Song(s) You Know By Heart", Genre = genres["Country"], Price = 8.99M, Artist = artists["Jimmy Buffett"], AlbumArtUrl = imgUrl }, - new Album { Title = "Sound of Music", Genre = genres["Punk"], Price = 8.99M, Artist = artists["Adicts"], AlbumArtUrl = imgUrl }, - new Album { Title = "South American Getaway", Genre = genres["Classical"], Price = 8.99M, Artist = artists["The 12 Cellists of The Berlin Philharmonic"], AlbumArtUrl = imgUrl }, - new Album { Title = "Sozinho Remix Ao Vivo", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Caetano Veloso"], AlbumArtUrl = imgUrl }, - new Album { Title = "Speak of the Devil", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Ozzy Osbourne"], AlbumArtUrl = imgUrl }, - new Album { Title = "Spiritual State", Genre = genres["Rap"], Price = 8.99M, Artist = artists["Nujabes"], AlbumArtUrl = imgUrl }, - new Album { Title = "St. Anger", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Metallica"], AlbumArtUrl = imgUrl }, - new Album { Title = "Still Life", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Opeth"], AlbumArtUrl = imgUrl }, - new Album { Title = "Stop Making Sense", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Talking Heads"], AlbumArtUrl = imgUrl }, - new Album { Title = "Stormbringer", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Deep Purple"], AlbumArtUrl = imgUrl }, - new Album { Title = "Stranger than Fiction", Genre = genres["Punk"], Price = 8.99M, Artist = artists["Bad Religion"], AlbumArtUrl = imgUrl }, - new Album { Title = "Strauss: Waltzes", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Eugene Ormandy"], AlbumArtUrl = imgUrl }, - new Album { Title = "Supermodified", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["Amon Tobin"], AlbumArtUrl = imgUrl }, - new Album { Title = "Supernatural", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Santana"], AlbumArtUrl = imgUrl }, - new Album { Title = "Surfing with the Alien (Remastered)", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Joe Satriani"], AlbumArtUrl = imgUrl }, - new Album { Title = "Switched-On Bach", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Wendy Carlos"], AlbumArtUrl = imgUrl }, - new Album { Title = "Symphony", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Sarah Brightman"], AlbumArtUrl = imgUrl }, - new Album { Title = "Szymanowski: Piano Works, Vol. 1", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Martin Roscoe"], AlbumArtUrl = imgUrl }, - new Album { Title = "Tchaikovsky: The Nutcracker", Genre = genres["Classical"], Price = 8.99M, Artist = artists["London Symphony Orchestra"], AlbumArtUrl = imgUrl }, - new Album { Title = "Ted Nugent", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Ted Nugent"], AlbumArtUrl = imgUrl }, - new Album { Title = "Teflon Don", Genre = genres["Rap"], Price = 8.99M, Artist = artists["Rick Ross"], AlbumArtUrl = imgUrl }, - new Album { Title = "Tell Another Joke at the Ol' Choppin' Block", Genre = genres["Indie"], Price = 8.99M, Artist = artists["Danielson Famile"], AlbumArtUrl = imgUrl }, - new Album { Title = "Temple of the Dog", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["Temple of the Dog"], AlbumArtUrl = imgUrl }, - new Album { Title = "Ten", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Pearl Jam"], AlbumArtUrl = imgUrl }, - new Album { Title = "Texas Flood", Genre = genres["Blues"], Price = 8.99M, Artist = artists["Stevie Ray Vaughan"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Battle Rages On", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Deep Purple"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Beast Live", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Paul D'Ianno"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Best Of 1980-1990", Genre = genres["Rock"], Price = 8.99M, Artist = artists["U2"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Best of 1990–2000", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Sarah Brightman"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Best of Beethoven", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Nicolaus Esterhazy Sinfonia"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Best Of Billy Cobham", Genre = genres["Jazz"], Price = 8.99M, Artist = artists["Billy Cobham"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Best of Ed Motta", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Ed Motta"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Best Of Van Halen, Vol. I", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Van Halen"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Bridge", Genre = genres["R&B"], Price = 8.99M, Artist = artists["Melanie Fiona"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Cage", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Tygers of Pan Tang"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Chicago Transit Authority", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Chicago "], AlbumArtUrl = imgUrl }, - new Album { Title = "The Chronic", Genre = genres["Rap"], Price = 8.99M, Artist = artists["Dr. Dre"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Colour And The Shape", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Foo Fighters"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Crane Wife", Genre = genres["Alternative"], Price = 8.99M, Artist = artists["The Decemberists"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Cream Of Clapton", Genre = genres["Blues"], Price = 8.99M, Artist = artists["Eric Clapton"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Cure", Genre = genres["Pop"], Price = 8.99M, Artist = artists["The Cure"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Dark Side Of The Moon", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Pink Floyd"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Divine Conspiracy", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Epica"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Doors", Genre = genres["Rock"], Price = 8.99M, Artist = artists["The Doors"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Dream of the Blue Turtles", Genre = genres["Pop"], Price = 8.99M, Artist = artists["Sting"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Essential Miles Davis [Disc 1]", Genre = genres["Jazz"], Price = 8.99M, Artist = artists["Miles Davis"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Essential Miles Davis [Disc 2]", Genre = genres["Jazz"], Price = 8.99M, Artist = artists["Miles Davis"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Final Concerts (Disc 2)", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Deep Purple"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Final Frontier", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Iron Maiden"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Head and the Heart", Genre = genres["Rock"], Price = 8.99M, Artist = artists["The Head and the Heart"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Joshua Tree", Genre = genres["Rock"], Price = 8.99M, Artist = artists["U2"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Last Night of the Proms", Genre = genres["Classical"], Price = 8.99M, Artist = artists["BBC Concert Orchestra"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Lumineers", Genre = genres["Rock"], Price = 8.99M, Artist = artists["The Lumineers"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Number of The Beast", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Iron Maiden"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Number of The Beast", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Iron Maiden"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Police Greatest Hits", Genre = genres["Rock"], Price = 8.99M, Artist = artists["The Police"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Song Remains The Same (Disc 1)", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Led Zeppelin"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Song Remains The Same (Disc 2)", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Led Zeppelin"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Southern Harmony and Musical Companion", Genre = genres["Blues"], Price = 8.99M, Artist = artists["The Black Crowes"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Spade", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Butch Walker & The Black Widows"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Stone Roses", Genre = genres["Rock"], Price = 8.99M, Artist = artists["The Stone Roses"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Suburbs", Genre = genres["Indie"], Price = 8.99M, Artist = artists["Arcade Fire"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Three Tenors Disc1/Disc2", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Carreras, Pavarotti, Domingo"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Trees They Grow So High", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Sarah Brightman"], AlbumArtUrl = imgUrl }, - new Album { Title = "The Wall", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Pink Floyd"], AlbumArtUrl = imgUrl }, - new Album { Title = "The X Factor", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Iron Maiden"], AlbumArtUrl = imgUrl }, - new Album { Title = "Them Crooked Vultures", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Them Crooked Vultures"], AlbumArtUrl = imgUrl }, - new Album { Title = "This Is Happening", Genre = genres["Rock"], Price = 8.99M, Artist = artists["LCD Soundsystem"], AlbumArtUrl = imgUrl }, - new Album { Title = "Thunder, Lightning, Strike", Genre = genres["Rock"], Price = 8.99M, Artist = artists["The Go! Team"], AlbumArtUrl = imgUrl }, - new Album { Title = "Time to Say Goodbye", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Sarah Brightman"], AlbumArtUrl = imgUrl }, - new Album { Title = "Time, Love & Tenderness", Genre = genres["Pop"], Price = 8.99M, Artist = artists["Michael Bolton"], AlbumArtUrl = imgUrl }, - new Album { Title = "Tomorrow Starts Today", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Mobile"], AlbumArtUrl = imgUrl }, - new Album { Title = "Tribute", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Ozzy Osbourne"], AlbumArtUrl = imgUrl }, - new Album { Title = "Tuesday Night Music Club", Genre = genres["Alternative"], Price = 8.99M, Artist = artists["Sheryl Crow"], AlbumArtUrl = imgUrl }, - new Album { Title = "Umoja", Genre = genres["Rock"], Price = 8.99M, Artist = artists["BLØF"], AlbumArtUrl = imgUrl }, - new Album { Title = "Under the Pink", Genre = genres["Alternative"], Price = 8.99M, Artist = artists["Tori Amos"], AlbumArtUrl = imgUrl }, - new Album { Title = "Undertow", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Tool"], AlbumArtUrl = imgUrl }, - new Album { Title = "Un-Led-Ed", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Dread Zeppelin"], AlbumArtUrl = imgUrl }, - new Album { Title = "Unplugged [Live]", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Kiss"], AlbumArtUrl = imgUrl }, - new Album { Title = "Unplugged", Genre = genres["Blues"], Price = 8.99M, Artist = artists["Eric Clapton"], AlbumArtUrl = imgUrl }, - new Album { Title = "Unplugged", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Eric Clapton"], AlbumArtUrl = imgUrl }, - new Album { Title = "Untrue", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["Burial"], AlbumArtUrl = imgUrl }, - new Album { Title = "Use Your Illusion I", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Guns N' Roses"], AlbumArtUrl = imgUrl }, - new Album { Title = "Use Your Illusion II", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Guns N' Roses"], AlbumArtUrl = imgUrl }, - new Album { Title = "Use Your Illusion II", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Guns N' Roses"], AlbumArtUrl = imgUrl }, - new Album { Title = "Van Halen III", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Van Halen"], AlbumArtUrl = imgUrl }, - new Album { Title = "Van Halen", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Van Halen"], AlbumArtUrl = imgUrl }, - new Album { Title = "Version 2.0", Genre = genres["Alternative"], Price = 8.99M, Artist = artists["Garbage"], AlbumArtUrl = imgUrl }, - new Album { Title = "Vinicius De Moraes", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Vinícius De Moraes"], AlbumArtUrl = imgUrl }, - new Album { Title = "Virtual XI", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Iron Maiden"], AlbumArtUrl = imgUrl }, - new Album { Title = "Voodoo Lounge", Genre = genres["Rock"], Price = 8.99M, Artist = artists["The Rolling Stones"], AlbumArtUrl = imgUrl }, - new Album { Title = "Vozes do MPB", Genre = genres["Latin"], Price = 8.99M, Artist = artists["Various Artists"], AlbumArtUrl = imgUrl }, - new Album { Title = "Vs.", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Pearl Jam"], AlbumArtUrl = imgUrl }, - new Album { Title = "Wagner: Favourite Overtures", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Sir Georg Solti & Wiener Philharmoniker"], AlbumArtUrl = imgUrl }, - new Album { Title = "Walking Into Clarksdale", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Page & Plant"], AlbumArtUrl = imgUrl }, - new Album { Title = "Wapi Yo", Genre = genres["World"], Price = 8.99M, Artist = artists["Lokua Kanza"], AlbumArtUrl = imgUrl }, - new Album { Title = "War", Genre = genres["Rock"], Price = 8.99M, Artist = artists["U2"], AlbumArtUrl = imgUrl }, - new Album { Title = "Warner 25 Anos", Genre = genres["Jazz"], Price = 8.99M, Artist = artists["Antônio Carlos Jobim"], AlbumArtUrl = imgUrl }, - new Album { Title = "Wasteland R&Btheque", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Raunchy"], AlbumArtUrl = imgUrl }, - new Album { Title = "Watermark", Genre = genres["Electronic"], Price = 8.99M, Artist = artists["Enya"], AlbumArtUrl = imgUrl }, - new Album { Title = "We Were Exploding Anyway", Genre = genres["Rock"], Price = 8.99M, Artist = artists["65daysofstatic"], AlbumArtUrl = imgUrl }, - new Album { Title = "Weill: The Seven Deadly Sins", Genre = genres["Classical"], Price = 8.99M, Artist = artists["Orchestre de l'Opéra de Lyon"], AlbumArtUrl = imgUrl }, - new Album { Title = "White Pony", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Deftones"], AlbumArtUrl = imgUrl }, - new Album { Title = "Who's Next", Genre = genres["Rock"], Price = 8.99M, Artist = artists["The Who"], AlbumArtUrl = imgUrl }, - new Album { Title = "Wish You Were Here", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Pink Floyd"], AlbumArtUrl = imgUrl }, - new Album { Title = "With Oden on Our Side", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Amon Amarth"], AlbumArtUrl = imgUrl }, - new Album { Title = "Worlds", Genre = genres["Jazz"], Price = 8.99M, Artist = artists["Aaron Goldberg"], AlbumArtUrl = imgUrl }, - new Album { Title = "Worship Music", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Anthrax"], AlbumArtUrl = imgUrl }, - new Album { Title = "X&Y", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Coldplay"], AlbumArtUrl = imgUrl }, - new Album { Title = "Xinti", Genre = genres["World"], Price = 8.99M, Artist = artists["Sara Tavares"], AlbumArtUrl = imgUrl }, - new Album { Title = "Yano", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Yano"], AlbumArtUrl = imgUrl }, - new Album { Title = "Yesterday Once More Disc 1/Disc 2", Genre = genres["Pop"], Price = 8.99M, Artist = artists["The Carpenters"], AlbumArtUrl = imgUrl }, - new Album { Title = "Zooropa", Genre = genres["Rock"], Price = 8.99M, Artist = artists["U2"], AlbumArtUrl = imgUrl }, - new Album { Title = "Zoso", Genre = genres["Rock"], Price = 8.99M, Artist = artists["Led Zeppelin"], AlbumArtUrl = imgUrl }, - }; - - foreach (var album in albums) - { - album.ArtistId = album.Artist.ArtistId; - album.GenreId = album.Genre.GenreId; - } - - return albums; - } - - private static Dictionary artists; - public static Dictionary Artists - { - get - { - if (artists == null) - { - var artistsList = new Artist[] - { - new Artist { Name = "65daysofstatic" }, - new Artist { Name = "Aaron Goldberg" }, - new Artist { Name = "Above & Beyond" }, - new Artist { Name = "Above the Fold" }, - new Artist { Name = "AC/DC" }, - new Artist { Name = "Accept" }, - new Artist { Name = "Adicts" }, - new Artist { Name = "Adrian Leaper & Doreen de Feis" }, - new Artist { Name = "Aerosmith" }, - new Artist { Name = "Aisha Duo" }, - new Artist { Name = "Al di Meola" }, - new Artist { Name = "Alabama Shakes" }, - new Artist { Name = "Alanis Morissette" }, - new Artist { Name = "Alberto Turco & Nova Schola Gregoriana" }, - new Artist { Name = "Alice in Chains" }, - new Artist { Name = "Alison Krauss" }, - new Artist { Name = "Amon Amarth" }, - new Artist { Name = "Amon Tobin" }, - new Artist { Name = "Amr Diab" }, - new Artist { Name = "Amy Winehouse" }, - new Artist { Name = "Anita Ward" }, - new Artist { Name = "Anthrax" }, - new Artist { Name = "Antônio Carlos Jobim" }, - new Artist { Name = "Apocalyptica" }, - new Artist { Name = "Aqua" }, - new Artist { Name = "Armand Van Helden" }, - new Artist { Name = "Arcade Fire" }, - new Artist { Name = "Audioslave" }, - new Artist { Name = "Bad Religion" }, - new Artist { Name = "Barenaked Ladies" }, - new Artist { Name = "BBC Concert Orchestra" }, - new Artist { Name = "Bee Gees" }, - new Artist { Name = "Before the Dawn" }, - new Artist { Name = "Berliner Philharmoniker" }, - new Artist { Name = "Billy Cobham" }, - new Artist { Name = "Black Label Society" }, - new Artist { Name = "Black Sabbath" }, - new Artist { Name = "BLØF" }, - new Artist { Name = "Blues Traveler" }, - new Artist { Name = "Boston Symphony Orchestra & Seiji Ozawa" }, - new Artist { Name = "Britten Sinfonia, Ivor Bolton & Lesley Garrett" }, - new Artist { Name = "Bruce Dickinson" }, - new Artist { Name = "Buddy Guy" }, - new Artist { Name = "Burial" }, - new Artist { Name = "Butch Walker & The Black Widows" }, - new Artist { Name = "Caetano Veloso" }, - new Artist { Name = "Cake" }, - new Artist { Name = "Calexico" }, - new Artist { Name = "Carly Rae Jepsen" }, - new Artist { Name = "Carreras, Pavarotti, Domingo" }, - new Artist { Name = "Cássia Eller" }, - new Artist { Name = "Cayouche" }, - new Artist { Name = "Chic" }, - new Artist { Name = "Chicago " }, - new Artist { Name = "Chicago Symphony Orchestra & Fritz Reiner" }, - new Artist { Name = "Chico Buarque" }, - new Artist { Name = "Chico Science & Nação Zumbi" }, - new Artist { Name = "Choir Of Westminster Abbey & Simon Preston" }, - new Artist { Name = "Chris Cornell" }, - new Artist { Name = "Christopher O'Riley" }, - new Artist { Name = "Cidade Negra" }, - new Artist { Name = "Cláudio Zoli" }, - new Artist { Name = "Coldplay" }, - new Artist { Name = "Creedence Clearwater Revival" }, - new Artist { Name = "Crosby, Stills, Nash, and Young" }, - new Artist { Name = "Daft Punk" }, - new Artist { Name = "Danielson Famile" }, - new Artist { Name = "David Bowie" }, - new Artist { Name = "David Coverdale" }, - new Artist { Name = "David Guetta" }, - new Artist { Name = "deadmau5" }, - new Artist { Name = "Deep Purple" }, - new Artist { Name = "Def Leppard" }, - new Artist { Name = "Deftones" }, - new Artist { Name = "Dennis Chambers" }, - new Artist { Name = "Deva Premal" }, - new Artist { Name = "Dio" }, - new Artist { Name = "Djavan" }, - new Artist { Name = "Dolly Parton" }, - new Artist { Name = "Donna Summer" }, - new Artist { Name = "Dr. Dre" }, - new Artist { Name = "Dread Zeppelin" }, - new Artist { Name = "Dream Theater" }, - new Artist { Name = "Duck Sauce" }, - new Artist { Name = "Earl Scruggs" }, - new Artist { Name = "Ed Motta" }, - new Artist { Name = "Edo de Waart & San Francisco Symphony" }, - new Artist { Name = "Elis Regina" }, - new Artist { Name = "Eminem" }, - new Artist { Name = "English Concert & Trevor Pinnock" }, - new Artist { Name = "Enya" }, - new Artist { Name = "Epica" }, - new Artist { Name = "Eric B. and Rakim" }, - new Artist { Name = "Eric Clapton" }, - new Artist { Name = "Eugene Ormandy" }, - new Artist { Name = "Faith No More" }, - new Artist { Name = "Falamansa" }, - new Artist { Name = "Filter" }, - new Artist { Name = "Foo Fighters" }, - new Artist { Name = "Four Tet" }, - new Artist { Name = "Frank Zappa & Captain Beefheart" }, - new Artist { Name = "Fretwork" }, - new Artist { Name = "Funk Como Le Gusta" }, - new Artist { Name = "Garbage" }, - new Artist { Name = "Gerald Moore" }, - new Artist { Name = "Gilberto Gil" }, - new Artist { Name = "Godsmack" }, - new Artist { Name = "Gonzaguinha" }, - new Artist { Name = "Göteborgs Symfoniker & Neeme Järvi" }, - new Artist { Name = "Guns N' Roses" }, - new Artist { Name = "Gustav Mahler" }, - new Artist { Name = "In This Moment" }, - new Artist { Name = "Incognito" }, - new Artist { Name = "INXS" }, - new Artist { Name = "Iron Maiden" }, - new Artist { Name = "Jagjit Singh" }, - new Artist { Name = "James Levine" }, - new Artist { Name = "Jamiroquai" }, - new Artist { Name = "Jimi Hendrix" }, - new Artist { Name = "Jimmy Buffett" }, - new Artist { Name = "Jimmy Smith" }, - new Artist { Name = "Joe Satriani" }, - new Artist { Name = "John Digweed" }, - new Artist { Name = "John Mayer" }, - new Artist { Name = "Jorge Ben" }, - new Artist { Name = "Jota Quest" }, - new Artist { Name = "Journey" }, - new Artist { Name = "Judas Priest" }, - new Artist { Name = "Julian Bream" }, - new Artist { Name = "Justice" }, - new Artist { Name = "Orchestre de l'Opéra de Lyon" }, - new Artist { Name = "King Crimson" }, - new Artist { Name = "Kiss" }, - new Artist { Name = "LCD Soundsystem" }, - new Artist { Name = "Le Tigre" }, - new Artist { Name = "Led Zeppelin" }, - new Artist { Name = "Legião Urbana" }, - new Artist { Name = "Lenny Kravitz" }, - new Artist { Name = "Les Arts Florissants & William Christie" }, - new Artist { Name = "Limp Bizkit" }, - new Artist { Name = "Linkin Park" }, - new Artist { Name = "Live" }, - new Artist { Name = "Lokua Kanza" }, - new Artist { Name = "London Symphony Orchestra" }, - new Artist { Name = "Los Tigres del Norte" }, - new Artist { Name = "Luciana Souza/Romero Lubambo" }, - new Artist { Name = "Lulu Santos" }, - new Artist { Name = "Lura" }, - new Artist { Name = "Marcos Valle" }, - new Artist { Name = "Marillion" }, - new Artist { Name = "Marisa Monte" }, - new Artist { Name = "Mark Knopfler" }, - new Artist { Name = "Martin Roscoe" }, - new Artist { Name = "Massive Attack" }, - new Artist { Name = "Maurizio Pollini" }, - new Artist { Name = "Megadeth" }, - new Artist { Name = "Mela Tenenbaum, Pro Musica Prague & Richard Kapp" }, - new Artist { Name = "Melanie Fiona" }, - new Artist { Name = "Men At Work" }, - new Artist { Name = "Metallica" }, - new Artist { Name = "M-Flo" }, - new Artist { Name = "Michael Bolton" }, - new Artist { Name = "Michael Tilson Thomas" }, - new Artist { Name = "Miles Davis" }, - new Artist { Name = "Milton Nascimento" }, - new Artist { Name = "Mobile" }, - new Artist { Name = "Modest Mouse" }, - new Artist { Name = "Mötley Crüe" }, - new Artist { Name = "Motörhead" }, - new Artist { Name = "Mumford & Sons" }, - new Artist { Name = "Munkle" }, - new Artist { Name = "Nash Ensemble" }, - new Artist { Name = "Neil Young" }, - new Artist { Name = "New York Dolls" }, - new Artist { Name = "Nick Cave and the Bad Seeds" }, - new Artist { Name = "Nicolaus Esterhazy Sinfonia" }, - new Artist { Name = "Nine Inch Nails" }, - new Artist { Name = "Nirvana" }, - new Artist { Name = "Norah Jones" }, - new Artist { Name = "Nujabes" }, - new Artist { Name = "O Terço" }, - new Artist { Name = "Oasis" }, - new Artist { Name = "Olodum" }, - new Artist { Name = "Opeth" }, - new Artist { Name = "Orchestra of The Age of Enlightenment" }, - new Artist { Name = "Os Paralamas Do Sucesso" }, - new Artist { Name = "Ozzy Osbourne" }, - new Artist { Name = "Paddy Casey" }, - new Artist { Name = "Page & Plant" }, - new Artist { Name = "Papa Wemba" }, - new Artist { Name = "Paul D'Ianno" }, - new Artist { Name = "Paul Oakenfold" }, - new Artist { Name = "Paul Van Dyk" }, - new Artist { Name = "Pearl Jam" }, - new Artist { Name = "Pet Shop Boys" }, - new Artist { Name = "Pink Floyd" }, - new Artist { Name = "Plug" }, - new Artist { Name = "Porcupine Tree" }, - new Artist { Name = "Portishead" }, - new Artist { Name = "Prince" }, - new Artist { Name = "Projected" }, - new Artist { Name = "PSY" }, - new Artist { Name = "Public Enemy" }, - new Artist { Name = "Queen" }, - new Artist { Name = "Queensrÿche" }, - new Artist { Name = "R.E.M." }, - new Artist { Name = "Radiohead" }, - new Artist { Name = "Rancid" }, - new Artist { Name = "Raul Seixas" }, - new Artist { Name = "Raunchy" }, - new Artist { Name = "Red Hot Chili Peppers" }, - new Artist { Name = "Rick Ross" }, - new Artist { Name = "Robert James" }, - new Artist { Name = "London Classical Players" }, - new Artist { Name = "Royal Philharmonic Orchestra" }, - new Artist { Name = "Run DMC" }, - new Artist { Name = "Rush" }, - new Artist { Name = "Santana" }, - new Artist { Name = "Sara Tavares" }, - new Artist { Name = "Sarah Brightman" }, - new Artist { Name = "Sasha" }, - new Artist { Name = "Scholars Baroque Ensemble" }, - new Artist { Name = "Scorpions" }, - new Artist { Name = "Sergei Prokofiev & Yuri Temirkanov" }, - new Artist { Name = "Sheryl Crow" }, - new Artist { Name = "Sir Georg Solti & Wiener Philharmoniker" }, - new Artist { Name = "Skank" }, - new Artist { Name = "Skrillex" }, - new Artist { Name = "Slash" }, - new Artist { Name = "Slayer" }, - new Artist { Name = "Soul-Junk" }, - new Artist { Name = "Soundgarden" }, - new Artist { Name = "Spyro Gyra" }, - new Artist { Name = "Stevie Ray Vaughan & Double Trouble" }, - new Artist { Name = "Stevie Ray Vaughan" }, - new Artist { Name = "Sting" }, - new Artist { Name = "Stone Temple Pilots" }, - new Artist { Name = "Styx" }, - new Artist { Name = "Sufjan Stevens" }, - new Artist { Name = "Supreme Beings of Leisure" }, - new Artist { Name = "System Of A Down" }, - new Artist { Name = "T&N" }, - new Artist { Name = "Talking Heads" }, - new Artist { Name = "Tears For Fears" }, - new Artist { Name = "Ted Nugent" }, - new Artist { Name = "Temple of the Dog" }, - new Artist { Name = "Terry Bozzio, Tony Levin & Steve Stevens" }, - new Artist { Name = "The 12 Cellists of The Berlin Philharmonic" }, - new Artist { Name = "The Axis of Awesome" }, - new Artist { Name = "The Beatles" }, - new Artist { Name = "The Black Crowes" }, - new Artist { Name = "The Black Keys" }, - new Artist { Name = "The Carpenters" }, - new Artist { Name = "The Cat Empire" }, - new Artist { Name = "The Cult" }, - new Artist { Name = "The Cure" }, - new Artist { Name = "The Decemberists" }, - new Artist { Name = "The Doors" }, - new Artist { Name = "The Eagles of Death Metal" }, - new Artist { Name = "The Go! Team" }, - new Artist { Name = "The Head and the Heart" }, - new Artist { Name = "The Jezabels" }, - new Artist { Name = "The King's Singers" }, - new Artist { Name = "The Lumineers" }, - new Artist { Name = "The Offspring" }, - new Artist { Name = "The Police" }, - new Artist { Name = "The Posies" }, - new Artist { Name = "The Prodigy" }, - new Artist { Name = "The Rolling Stones" }, - new Artist { Name = "The Rubberbandits" }, - new Artist { Name = "The Smashing Pumpkins" }, - new Artist { Name = "The Stone Roses" }, - new Artist { Name = "The Who" }, - new Artist { Name = "Them Crooked Vultures" }, - new Artist { Name = "TheStart" }, - new Artist { Name = "Thievery Corporation" }, - new Artist { Name = "Tiësto" }, - new Artist { Name = "Tim Maia" }, - new Artist { Name = "Ton Koopman" }, - new Artist { Name = "Tool" }, - new Artist { Name = "Tori Amos" }, - new Artist { Name = "Trampled By Turtles" }, - new Artist { Name = "Trans-Siberian Orchestra" }, - new Artist { Name = "Tygers of Pan Tang" }, - new Artist { Name = "U2" }, - new Artist { Name = "UB40" }, - new Artist { Name = "Uh Huh Her " }, - new Artist { Name = "Van Halen" }, - new Artist { Name = "Various Artists" }, - new Artist { Name = "Velvet Revolver" }, - new Artist { Name = "Venus Hum" }, - new Artist { Name = "Vicente Fernandez" }, - new Artist { Name = "Vinícius De Moraes" }, - new Artist { Name = "Weezer" }, - new Artist { Name = "Weird Al" }, - new Artist { Name = "Wendy Carlos" }, - new Artist { Name = "Wilhelm Kempff" }, - new Artist { Name = "Yano" }, - new Artist { Name = "Yehudi Menuhin" }, - new Artist { Name = "Yes" }, - new Artist { Name = "Yo-Yo Ma" }, - new Artist { Name = "Zeca Pagodinho" }, - new Artist { Name = "אריק אינשטיין"} - }; - - // TODO [EF] Swap to store generated keys when available - int artistId = 1; - artists = new Dictionary(); - foreach (Artist artist in artistsList) - { - artist.ArtistId = artistId++; - artists.Add(artist.Name, artist); - } - } - - return artists; - } - } - - private static Dictionary genres; - public static Dictionary Genres - { - get - { - if (genres == null) - { - var genresList = new Genre[] - { - new Genre { Name = "Pop" }, - new Genre { Name = "Rock" }, - new Genre { Name = "Jazz" }, - new Genre { Name = "Metal" }, - new Genre { Name = "Electronic" }, - new Genre { Name = "Blues" }, - new Genre { Name = "Latin" }, - new Genre { Name = "Rap" }, - new Genre { Name = "Classical" }, - new Genre { Name = "Alternative" }, - new Genre { Name = "Country" }, - new Genre { Name = "R&B" }, - new Genre { Name = "Indie" }, - new Genre { Name = "Punk" }, - new Genre { Name = "World" } - }; - - genres = new Dictionary(); - // TODO [EF] Swap to store generated keys when available - int genreId = 1; - foreach (Genre genre in genresList) - { - genre.GenreId = genreId++; - - // TODO [EF] Remove when null values are supported by update pipeline - genre.Description = genre.Name + " is great music (if you like it)."; - - genres.Add(genre.Name, genre); - } - } - - return genres; - } - } - } -} diff --git a/samples/react/MusicStore/Apis/Models/ShoppingCart.cs b/samples/react/MusicStore/Apis/Models/ShoppingCart.cs deleted file mode 100644 index 1d2465ab..00000000 --- a/samples/react/MusicStore/Apis/Models/ShoppingCart.cs +++ /dev/null @@ -1,207 +0,0 @@ -using Microsoft.AspNetCore.Http; -using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.Linq; - -namespace MusicStore.Models -{ - public partial class ShoppingCart - { - MusicStoreContext _db; - string ShoppingCartId { get; set; } - - public ShoppingCart(MusicStoreContext db) - { - _db = db; - } - - public static ShoppingCart GetCart(MusicStoreContext db, HttpContext context) - { - var cart = new ShoppingCart(db); - cart.ShoppingCartId = cart.GetCartId(context); - return cart; - } - - public void AddToCart(Album album) - { - // Get the matching cart and album instances - var cartItem = _db.CartItems.SingleOrDefault( - c => c.CartId == ShoppingCartId - && c.AlbumId == album.AlbumId); - - if (cartItem == null) - { - // TODO [EF] Swap to store generated key once we support identity pattern - var nextCartItemId = _db.CartItems.Any() - ? _db.CartItems.Max(c => c.CartItemId) + 1 - : 1; - - // Create a new cart item if no cart item exists - cartItem = new CartItem - { - CartItemId = nextCartItemId, - AlbumId = album.AlbumId, - CartId = ShoppingCartId, - Count = 1, - DateCreated = DateTime.Now - }; - - _db.CartItems.Add(cartItem); - } - else - { - // If the item does exist in the cart, then add one to the quantity - cartItem.Count++; - - // TODO [EF] Remove this line once change detection is available - _db.Update(cartItem); - } - } - - public int RemoveFromCart(int id) - { - // Get the cart - var cartItem = _db.CartItems.Single( - cart => cart.CartId == ShoppingCartId - && cart.CartItemId == id); - - int itemCount = 0; - - if (cartItem != null) - { - if (cartItem.Count > 1) - { - cartItem.Count--; - - // TODO [EF] Remove this line once change detection is available - _db.Update(cartItem); - - itemCount = cartItem.Count; - } - else - { - _db.CartItems.Remove(cartItem); - } - } - - return itemCount; - } - - public void EmptyCart() - { - var cartItems = _db.CartItems.Where(cart => cart.CartId == ShoppingCartId); - - foreach (var cartItem in cartItems) - { - _db.Remove(cartItem); - } - } - - public List GetCartItems() - { - var cartItems = _db.CartItems.Where(cart => cart.CartId == ShoppingCartId).ToList(); - //TODO: Auto population of the related album data not available until EF feature is lighted up. - foreach (var cartItem in cartItems) - { - cartItem.Album = _db.Albums.Single(a => a.AlbumId == cartItem.AlbumId); - } - - return cartItems; - } - - public int GetCount() - { - // Get the count of each item in the cart and sum them up - int? count = (from cartItems in _db.CartItems - where cartItems.CartId == ShoppingCartId - select (int?)cartItems.Count).Sum(); - - // Return 0 if all entries are null - return count ?? 0; - } - - public decimal GetTotal() - { - // Multiply album price by count of that album to get - // the current price for each of those albums in the cart - // sum all album price totals to get the cart total - - // TODO Collapse to a single query once EF supports querying related data - decimal total = 0; - foreach (var item in _db.CartItems.Where(c => c.CartId == ShoppingCartId)) - { - var album = _db.Albums.Single(a => a.AlbumId == item.AlbumId); - total += item.Count * album.Price; - } - - return total; - } - - public int CreateOrder(Order order) - { - decimal orderTotal = 0; - - var cartItems = GetCartItems(); - - // TODO [EF] Swap to store generated identity key when supported - var nextId = _db.OrderDetails.Any() - ? _db.OrderDetails.Max(o => o.OrderDetailId) + 1 - : 1; - - // Iterate over the items in the cart, adding the order details for each - foreach (var item in cartItems) - { - //var album = _db.Albums.Find(item.AlbumId); - var album = _db.Albums.Single(a => a.AlbumId == item.AlbumId); - - var orderDetail = new OrderDetail - { - OrderDetailId = nextId, - AlbumId = item.AlbumId, - OrderId = order.OrderId, - UnitPrice = album.Price, - Quantity = item.Count, - }; - - // Set the order total of the shopping cart - orderTotal += (item.Count * album.Price); - - _db.OrderDetails.Add(orderDetail); - - nextId++; - } - - // Set the order's total to the orderTotal count - order.Total = orderTotal; - - // Empty the shopping cart - EmptyCart(); - - // Return the OrderId as the confirmation number - return order.OrderId; - } - - // We're using HttpContextBase to allow access to cookies. - public string GetCartId(HttpContext context) - { - var sessionCookie = context.Request.Cookies["Session"]; - string cartId = null; - - if (string.IsNullOrWhiteSpace(sessionCookie)) - { - //A GUID to hold the cartId. - cartId = Guid.NewGuid().ToString(); - - // Send cart Id as a cookie to the client. - context.Response.Cookies.Append("Session", cartId); - } - else - { - cartId = sessionCookie; - } - - return cartId; - } - } -} diff --git a/samples/react/MusicStore/Controllers/HomeController.cs b/samples/react/MusicStore/Controllers/HomeController.cs deleted file mode 100755 index 1048e083..00000000 --- a/samples/react/MusicStore/Controllers/HomeController.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Mvc; - -namespace MusicStore.Controllers -{ - public class HomeController : Controller - { - public IActionResult Index() - { - return View(); - } - } -} diff --git a/samples/react/MusicStore/Infrastructure/NoCacheAttribute.cs b/samples/react/MusicStore/Infrastructure/NoCacheAttribute.cs deleted file mode 100644 index 856023a8..00000000 --- a/samples/react/MusicStore/Infrastructure/NoCacheAttribute.cs +++ /dev/null @@ -1,19 +0,0 @@ -using Microsoft.AspNetCore.Mvc; -using System; -using Microsoft.AspNetCore.Mvc.Filters; - -namespace MusicStore.Infrastructure -{ - [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method)] - public sealed class NoCacheAttribute : ActionFilterAttribute - { - public override void OnResultExecuting(ResultExecutingContext context) - { - context.HttpContext.Response.Headers["Cache-Control"] = "no-cache, no-store, max-age=0"; - context.HttpContext.Response.Headers["Pragma"] = "no-cache"; - context.HttpContext.Response.Headers["Expires"] = "-1"; - - base.OnResultExecuting(context); - } - } -} diff --git a/samples/react/MusicStore/Infrastructure/PagedList.cs b/samples/react/MusicStore/Infrastructure/PagedList.cs deleted file mode 100644 index b2cb2c57..00000000 --- a/samples/react/MusicStore/Infrastructure/PagedList.cs +++ /dev/null @@ -1,150 +0,0 @@ -using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Linq.Expressions; -using System.Threading.Tasks; - -namespace MusicStore.Infrastructure -{ - public interface IPagedList - { - IEnumerable Data { get; } - - int Page { get; } - - int PageSize { get; } - - int TotalCount { get; } - } - - internal class PagedList : IPagedList - { - public PagedList(IEnumerable data, int page, int pageSize, int totalCount) - { - Data = data; - Page = page; - PageSize = pageSize; - TotalCount = totalCount; - } - - public IEnumerable Data { get; private set; } - - public int Page { get; private set; } - - public int PageSize { get; private set; } - - public int TotalCount { get; private set; } - } - - public static class PagedListExtensions - { - public static IPagedList ToPagedList(this IQueryable query, int page, int pageSize) - { - if (query == null) - { - throw new ArgumentNullException("query"); - } - - var pagingConfig = new PagingConfig(page, pageSize); - var skipCount = ValidatePagePropertiesAndGetSkipCount(pagingConfig); - - var data = query - .Skip(skipCount) - .Take(pagingConfig.PageSize) - .ToList(); - - if (skipCount > 0 && data.Count == 0) - { - // Requested page has no records, just return the first page - pagingConfig.Page = 1; - data = query - .Take(pagingConfig.PageSize) - .ToList(); - } - - return new PagedList(data, pagingConfig.Page, pagingConfig.PageSize, query.Count()); - } - - public static Task> ToPagedListAsync(this IQueryable query, int page, int pageSize, string sortExpression, Expression> defaultSortExpression, SortDirection defaultSortDirection = SortDirection.Ascending) - where TModel : class - { - return ToPagedListAsync(query, page, pageSize, sortExpression, defaultSortExpression, defaultSortDirection, null); - } - - public static async Task> ToPagedListAsync(this IQueryable query, int page, int pageSize, string sortExpression, Expression> defaultSortExpression, SortDirection defaultSortDirection, Func selector) - where TModel : class - where TResult : class - { - if (query == null) - { - throw new ArgumentNullException("query"); - } - - var pagingConfig = new PagingConfig(page, pageSize); - var skipCount = ValidatePagePropertiesAndGetSkipCount(pagingConfig); - var dataQuery = query; - - if (defaultSortExpression != null) - { - dataQuery = dataQuery - .SortBy(sortExpression, defaultSortExpression); - } - - var data = await dataQuery - .Skip(skipCount) - .Take(pagingConfig.PageSize) - .ToListAsync(); - - if (skipCount > 0 && data.Count == 0) - { - // Requested page has no records, just return the first page - pagingConfig.Page = 1; - data = await dataQuery - .Take(pagingConfig.PageSize) - .ToListAsync(); - } - - var count = await query.CountAsync(); - - var resultData = selector != null - ? data.Select(selector) - : data.Cast(); - - return new PagedList(resultData, pagingConfig.Page, pagingConfig.PageSize, count); - } - - private static int ValidatePagePropertiesAndGetSkipCount(PagingConfig pagingConfig) - { - if (pagingConfig.Page < 1) - { - pagingConfig.Page = 1; - } - - if (pagingConfig.PageSize < 10) - { - pagingConfig.PageSize = 10; - } - - if (pagingConfig.PageSize > 100) - { - pagingConfig.PageSize = 100; - } - - return pagingConfig.PageSize * (pagingConfig.Page - 1); - } - - internal class PagingConfig - { - public PagingConfig(int page, int pageSize) - { - Page = page; - PageSize = pageSize; - } - - public int Page { get; set; } - - public int PageSize { get; set; } - } - } -} diff --git a/samples/react/MusicStore/Infrastructure/SortDirection.cs b/samples/react/MusicStore/Infrastructure/SortDirection.cs deleted file mode 100644 index 28f7e86c..00000000 --- a/samples/react/MusicStore/Infrastructure/SortDirection.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace MusicStore.Infrastructure -{ - public enum SortDirection - { - Ascending, - Descending - } -} diff --git a/samples/react/MusicStore/Infrastructure/SortExpression.cs b/samples/react/MusicStore/Infrastructure/SortExpression.cs deleted file mode 100644 index 88ba312c..00000000 --- a/samples/react/MusicStore/Infrastructure/SortExpression.cs +++ /dev/null @@ -1,87 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Linq.Expressions; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; - -namespace MusicStore.Infrastructure -{ - public static class SortExpression - { - private const string SORT_DIRECTION_DESC = " DESC"; - - public static IQueryable SortBy(this IQueryable query, string sortExpression, Expression> defaultSortExpression, SortDirection defaultSortDirection = SortDirection.Ascending) where TModel : class - { - return SortBy(query, sortExpression ?? Create(defaultSortExpression, defaultSortDirection)); - } - - public static string Create(Expression> expression, SortDirection sortDirection = SortDirection.Ascending) where TModel : class - { - var expressionText = ExpressionHelper.GetExpressionText(expression); - // TODO: Validate the expression depth, etc. - - var sortExpression = expressionText; - - if (sortDirection == SortDirection.Descending) - { - sortExpression += SORT_DIRECTION_DESC; - } - - return sortExpression; - } - - public static IQueryable SortBy(this IQueryable source, string sortExpression) where T : class - { - if (source == null) - { - throw new ArgumentNullException("source"); - } - - if (String.IsNullOrWhiteSpace(sortExpression)) - { - return source; - } - - sortExpression = sortExpression.Trim(); - var isDescending = false; - - // DataSource control passes the sort parameter with a direction - // if the direction is descending - if (sortExpression.EndsWith(SORT_DIRECTION_DESC, StringComparison.OrdinalIgnoreCase)) - { - isDescending = true; - var descIndex = sortExpression.Length - SORT_DIRECTION_DESC.Length; - sortExpression = sortExpression.Substring(0, descIndex).Trim(); - } - - if (string.IsNullOrEmpty(sortExpression)) - { - return source; - } - - ParameterExpression parameter = Expression.Parameter(source.ElementType, String.Empty); - - // Build up the property expression, e.g.: (m => m.Foo.Bar) - var sortExpressionParts = sortExpression.Split('.'); - Expression propertyExpression = parameter; - foreach (var property in sortExpressionParts) - { - propertyExpression = Expression.Property(propertyExpression, property); - } - - LambdaExpression lambda = Expression.Lambda(propertyExpression, parameter); - - var methodName = (isDescending) ? "OrderByDescending" : "OrderBy"; - - Expression methodCallExpression = Expression.Call( - typeof(Queryable), - methodName, - new[] { source.ElementType, propertyExpression.Type }, - source.Expression, - Expression.Quote(lambda)); - - return (IQueryable)source.Provider.CreateQuery(methodCallExpression); - } - } -} diff --git a/samples/react/MusicStore/MusicStore.csproj b/samples/react/MusicStore/MusicStore.csproj deleted file mode 100644 index e8ab8d92..00000000 --- a/samples/react/MusicStore/MusicStore.csproj +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - netcoreapp2.0 - true - false - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/react/MusicStore/Properties/launchSettings.json b/samples/react/MusicStore/Properties/launchSettings.json deleted file mode 100644 index e4360431..00000000 --- a/samples/react/MusicStore/Properties/launchSettings.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:51586/", - "sslPort": 0 - } - }, - "profiles": { - "IIS Express": { - "commandName": "IISExpress", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - }, - "dotnet cli": { - "commandName": "Project", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - } - } -} \ No newline at end of file diff --git a/samples/react/MusicStore/ReactApp/boot-server.tsx b/samples/react/MusicStore/ReactApp/boot-server.tsx deleted file mode 100644 index 7aaa1f11..00000000 --- a/samples/react/MusicStore/ReactApp/boot-server.tsx +++ /dev/null @@ -1,50 +0,0 @@ -import * as React from 'react'; -import { Provider } from 'react-redux'; -import { renderToString } from 'react-dom/server'; -import { match, RouterContext } from 'react-router'; -import createMemoryHistory from 'history/lib/createMemoryHistory'; -import { routes } from './routes'; -import configureStore from './configureStore'; -type BootResult = { html?: string, globals?: { [key: string]: any }, redirectUrl?: string}; - -export default function (params: any): Promise<{ html: string }> { - return new Promise((resolve, reject) => { - // Match the incoming request against the list of client-side routes - match({ routes, location: params.location }, (error, redirectLocation, renderProps: any) => { - if (error) { - throw error; - } - - // If there's a redirection, just send this information back to the host application - if (redirectLocation) { - resolve({ redirectUrl: redirectLocation.pathname }); - return; - } - - // If it didn't match any route, renderProps will be undefined - if (!renderProps) { - throw new Error(`The location '${ params.url }' doesn't match any route configured in react-router.`); - } - - // Build an instance of the application - const store = configureStore(); - const app = ( - - - - ); - - // Perform an initial render that will cause any async tasks (e.g., data access) to begin - renderToString(app); - - // Once the tasks are done, we can perform the final render - // We also send the redux store state, so the client can continue execution where the server left off - params.domainTasks.then(() => { - resolve({ - html: renderToString(app), - globals: { initialReduxState: store.getState() } - }); - }, reject); // Also propagate any errors back into the host application - }); - }); -} diff --git a/samples/react/MusicStore/ReactApp/boot.tsx b/samples/react/MusicStore/ReactApp/boot.tsx deleted file mode 100644 index ea3807db..00000000 --- a/samples/react/MusicStore/ReactApp/boot.tsx +++ /dev/null @@ -1,25 +0,0 @@ -import './styles/styles.css'; -import 'bootstrap/dist/css/bootstrap.css'; - -import * as React from 'react'; -import * as ReactDOM from 'react-dom'; -import { browserHistory, Router } from 'react-router'; -import { Provider } from 'react-redux'; -import { syncHistoryWithStore } from 'react-router-redux'; -import { routes } from './routes'; -import configureStore from './configureStore'; -import { ApplicationState } from './store'; - -// Get the application-wide store instance, prepopulating with state from the server where available. -const initialState = (window as any).initialReduxState as ApplicationState; -const store = configureStore(initialState); -const history = syncHistoryWithStore(browserHistory, store); - -// This code starts up the React app when it runs in a browser. It sets up the routing configuration -// and injects the app into a DOM element. -ReactDOM.render( - - - , - document.getElementById('react-app') -); diff --git a/samples/react/MusicStore/ReactApp/components/NavMenu.tsx b/samples/react/MusicStore/ReactApp/components/NavMenu.tsx deleted file mode 100644 index 6e85da85..00000000 --- a/samples/react/MusicStore/ReactApp/components/NavMenu.tsx +++ /dev/null @@ -1,49 +0,0 @@ -import * as React from 'react'; -import { Navbar, Nav, NavItem, NavDropdown, MenuItem } from 'react-bootstrap'; -import { Link } from 'react-router'; -import { LinkContainer } from 'react-router-bootstrap'; -import { provide } from 'redux-typed'; -import { ApplicationState } from '../store'; -import * as GenreList from '../store/GenreList'; - -class NavMenu extends React.Component { - componentWillMount() { - this.props.requestGenresList(); - } - - public render() { - const genres = this.props.genres.slice(0, 5); - return ( - - - Music Store - - - - - - - ); - } -} - -// Selects which part of global state maps to this component, and defines a type for the resulting props -const provider = provide( - (state: ApplicationState) => state.genreList, - GenreList.actionCreators -); -type NavMenuProps = typeof provider.allProps; -export default provider.connect(NavMenu); diff --git a/samples/react/MusicStore/ReactApp/components/public/AlbumDetails.tsx b/samples/react/MusicStore/ReactApp/components/public/AlbumDetails.tsx deleted file mode 100644 index 6e6fab2e..00000000 --- a/samples/react/MusicStore/ReactApp/components/public/AlbumDetails.tsx +++ /dev/null @@ -1,58 +0,0 @@ -import * as React from 'react'; -import { Link } from 'react-router'; -import { provide } from 'redux-typed'; -import { ApplicationState } from '../../store'; -import * as AlbumDetailsState from '../../store/AlbumDetails'; - -interface RouteParams { - albumId: string; -} - -class AlbumDetails extends React.Component { - componentWillMount() { - this.props.requestAlbumDetails(parseInt(this.props.params.albumId)); - } - - componentWillReceiveProps(nextProps: AlbumDetailsProps) { - this.props.requestAlbumDetails(parseInt(nextProps.params.albumId)); - } - - public render() { - if (this.props.album) { - const albumData = this.props.album; - return
-

{ albumData.Title }

- -

{

- -
-

- Genre: - { albumData.Genre.Name } -

-

- Artist: - { albumData.Artist.Name } -

-

- Price: - ${ albumData.Price.toFixed(2) } -

-

- Add to cart -

-
-
; - } else { - return

Loading...

; - } - } -} - -// Selects which part of global state maps to this component, and defines a type for the resulting props -const provider = provide( - (state: ApplicationState) => state.albumDetails, - AlbumDetailsState.actionCreators -).withExternalProps<{ params: RouteParams }>(); -type AlbumDetailsProps = typeof provider.allProps; -export default provider.connect(AlbumDetails); diff --git a/samples/react/MusicStore/ReactApp/components/public/AlbumTile.tsx b/samples/react/MusicStore/ReactApp/components/public/AlbumTile.tsx deleted file mode 100644 index 04b74d54..00000000 --- a/samples/react/MusicStore/ReactApp/components/public/AlbumTile.tsx +++ /dev/null @@ -1,17 +0,0 @@ -import * as React from 'react'; -import { Link } from 'react-router'; -import { Album } from '../../store/FeaturedAlbums'; - -export class AlbumTile extends React.Component<{ album: Album, key?: any }, void> { - public render() { - const { album } = this.props; - return ( -
  • - - { -

    { album.Title }

    - -
    • - ); - } -} diff --git a/samples/react/MusicStore/ReactApp/components/public/GenreDetails.tsx b/samples/react/MusicStore/ReactApp/components/public/GenreDetails.tsx deleted file mode 100644 index 59dc50b5..00000000 --- a/samples/react/MusicStore/ReactApp/components/public/GenreDetails.tsx +++ /dev/null @@ -1,45 +0,0 @@ -import * as React from 'react'; -import { Link } from 'react-router'; -import { provide } from 'redux-typed'; -import { ApplicationState } from '../../store'; -import * as GenreDetailsStore from '../../store/GenreDetails'; -import { AlbumTile } from './AlbumTile'; - -interface RouteParams { - genreId: string -} - -class GenreDetails extends React.Component { - componentWillMount() { - this.props.requestGenreDetails(parseInt(this.props.params.genreId)); - } - - componentWillReceiveProps(nextProps: GenreDetailsProps) { - this.props.requestGenreDetails(parseInt(nextProps.params.genreId)); - } - - public render() { - if (this.props.isLoaded) { - return
    -

    Albums

    - -
      - {this.props.albums.map(album => - - )} -
    -
    ; - } else { - return

    Loading...

    ; - } - } -} - -// Selects which part of global state maps to this component, and defines a type for the resulting props -const provider = provide( - (state: ApplicationState) => state.genreDetails, - GenreDetailsStore.actionCreators -).withExternalProps<{ params: RouteParams }>(); - -type GenreDetailsProps = typeof provider.allProps; -export default provider.connect(GenreDetails); diff --git a/samples/react/MusicStore/ReactApp/components/public/Genres.tsx b/samples/react/MusicStore/ReactApp/components/public/Genres.tsx deleted file mode 100644 index 1e03789b..00000000 --- a/samples/react/MusicStore/ReactApp/components/public/Genres.tsx +++ /dev/null @@ -1,38 +0,0 @@ -import * as React from 'react'; -import { Link } from 'react-router'; -import { provide } from 'redux-typed'; -import { ApplicationState } from '../../store'; -import * as GenreList from '../../store/GenreList'; - -class Genres extends React.Component { - componentWillMount() { - this.props.requestGenresList(); - } - - public render() { - const { genres } = this.props; - return
    -

    Browse Genres

    - -

    Select from { this.props.isLoaded ? genres.length : '...' } genres:

    - -
      - {genres.map(genre => -
    • - - { genre.Name } - -
      • - )} -
    -
    ; - } -} - -// Selects which part of global state maps to this component, and defines a type for the resulting props -const provider = provide( - (state: ApplicationState) => state.genreList, - GenreList.actionCreators -); -type GenresProps = typeof provider.allProps; -export default provider.connect(Genres); diff --git a/samples/react/MusicStore/ReactApp/components/public/Home.tsx b/samples/react/MusicStore/ReactApp/components/public/Home.tsx deleted file mode 100644 index b0f03d80..00000000 --- a/samples/react/MusicStore/ReactApp/components/public/Home.tsx +++ /dev/null @@ -1,34 +0,0 @@ -import * as React from 'react'; -import { Link } from 'react-router'; -import { provide } from 'redux-typed'; -import { ApplicationState } from '../../store'; -import { actionCreators } from '../../store/FeaturedAlbums'; -import { AlbumTile } from './AlbumTile'; - -class Home extends React.Component { - componentWillMount() { - this.props.requestFeaturedAlbums(); - } - - public render() { - return
    -
    -

    MVC Music Store

    - -
    -
      - {this.props.albums.map(album => - - )} -
    -
    ; - } -} - -// Selects which part of global state maps to this component, and defines a type for the resulting props -const provider = provide( - (state: ApplicationState) => state.featuredAlbums, - actionCreators -); -type HomeProps = typeof provider.allProps; -export default provider.connect(Home); diff --git a/samples/react/MusicStore/ReactApp/configureStore.ts b/samples/react/MusicStore/ReactApp/configureStore.ts deleted file mode 100644 index cda811e9..00000000 --- a/samples/react/MusicStore/ReactApp/configureStore.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { createStore, applyMiddleware, compose, combineReducers, GenericStoreEnhancer, Store as ReduxStore } from 'redux'; -import thunk from 'redux-thunk'; -import { routerReducer } from 'react-router-redux'; -import * as Store from './store'; -import { typedToPlain } from 'redux-typed'; - -export default function configureStore(initialState?: Store.ApplicationState) { - // Build middleware. These are functions that can process the actions before they reach the store. - const windowIfDefined = typeof window === 'undefined' ? null : window as any; - // If devTools is installed, connect to it - const devToolsExtension = windowIfDefined && windowIfDefined.devToolsExtension as () => GenericStoreEnhancer; - const createStoreWithMiddleware = compose( - applyMiddleware(thunk, typedToPlain), - devToolsExtension ? devToolsExtension() : f => f - )(createStore); - - // Combine all reducers and instantiate the app-wide store instance - const allReducers = buildRootReducer(Store.reducers); - const store = createStoreWithMiddleware(allReducers, initialState) as ReduxStore; - - // Enable Webpack hot module replacement for reducers - if (module.hot) { - module.hot.accept('./store', () => { - const nextRootReducer = require('./store'); - store.replaceReducer(buildRootReducer(nextRootReducer.reducers)); - }); - } - - return store; -} - -function buildRootReducer(allReducers) { - return combineReducers(Object.assign({}, allReducers, { routing: routerReducer })); -} diff --git a/samples/react/MusicStore/ReactApp/routes.tsx b/samples/react/MusicStore/ReactApp/routes.tsx deleted file mode 100644 index bf4f5fca..00000000 --- a/samples/react/MusicStore/ReactApp/routes.tsx +++ /dev/null @@ -1,25 +0,0 @@ -import * as React from 'react'; -import { Router, Route, HistoryBase } from 'react-router'; -import NavMenu from './components/NavMenu'; -import Home from './components/public/Home'; -import Genres from './components/public/Genres'; -import GenreDetails from './components/public/GenreDetails'; -import AlbumDetails from './components/public/AlbumDetails'; - -class Layout extends React.Component<{ body: React.ReactElement }, void> { - public render() { - return
    - -
    - { this.props.body } -
    -
    ; - } -} - -export const routes = - - - - -; diff --git a/samples/react/MusicStore/ReactApp/store/AlbumDetails.ts b/samples/react/MusicStore/ReactApp/store/AlbumDetails.ts deleted file mode 100644 index ad3f458e..00000000 --- a/samples/react/MusicStore/ReactApp/store/AlbumDetails.ts +++ /dev/null @@ -1,81 +0,0 @@ -import { fetch, addTask } from 'domain-task'; -import { typeName, isActionType, Action, Reducer } from 'redux-typed'; -import { ActionCreator } from './'; -import { Genre } from './GenreList'; - -// ----------------- -// STATE - This defines the type of data maintained in the Redux store. - -export interface AlbumDetailsState { - album: AlbumDetails; - requestedAlbumId: number; -} - -export interface AlbumDetails { - AlbumId: number; - Title: string; - AlbumArtUrl: string; - Genre: Genre; - Artist: Artist; - Price: number; -} - -interface Artist { - Name: string; -} - -// ----------------- -// ACTIONS - These are serializable (hence replayable) descriptions of state transitions. -// They do not themselves have any side-effects; they just describe something that is going to happen. -// Use @typeName and isActionType for type detection that works even after serialization/deserialization. - -@typeName("REQUEST_ALBUM_DETAILS") -class RequestAlbumDetails extends Action { - constructor(public albumId: number) { - super(); - } -} - -@typeName("RECEIVE_ALBUM_DETAILS") -class ReceiveAlbumDetails extends Action { - constructor(public album: AlbumDetails) { - super(); - } -} - -// ---------------- -// ACTION CREATORS - These are functions exposed to UI components that will trigger a state transition. -// They don't directly mutate state, but they can have external side-effects (such as loading data). - -export const actionCreators = { - requestAlbumDetails: (albumId: number): ActionCreator => (dispatch, getState) => { - // Only load if it's not already loaded (or currently being loaded) - if (albumId !== getState().albumDetails.requestedAlbumId) { - let fetchTask = fetch(`/api/albums/${ albumId }`) - .then(results => results.json()) - .then(album => { - // Only replace state if it's still the most recent request - if (albumId === getState().albumDetails.requestedAlbumId) { - dispatch(new ReceiveAlbumDetails(album)); - } - }); - - addTask(fetchTask); // Ensure server-side prerendering waits for this to complete - dispatch(new RequestAlbumDetails(albumId)); - } - } -}; - -// ---------------- -// REDUCER - For a given state and action, returns the new state. To support time travel, this must not mutate the old state. -// For unrecognized actions, must return the existing state (or default initial state if none was supplied). -const unloadedState: AlbumDetailsState = { requestedAlbumId: null as number, album: null }; -export const reducer: Reducer = (state, action) => { - if (isActionType(action, RequestAlbumDetails)) { - return { requestedAlbumId: action.albumId, album: null }; - } else if (isActionType(action, ReceiveAlbumDetails)) { - return { requestedAlbumId: action.album.AlbumId, album: action.album }; - } else { - return state || unloadedState; - } -}; diff --git a/samples/react/MusicStore/ReactApp/store/FeaturedAlbums.ts b/samples/react/MusicStore/ReactApp/store/FeaturedAlbums.ts deleted file mode 100644 index f9e78282..00000000 --- a/samples/react/MusicStore/ReactApp/store/FeaturedAlbums.ts +++ /dev/null @@ -1,62 +0,0 @@ -import { fetch, addTask } from 'domain-task'; -import { typeName, isActionType, Action, Reducer } from 'redux-typed'; -import { ActionCreator } from './'; - -// ----------------- -// STATE - This defines the type of data maintained in the Redux store. - -export interface FeaturedAlbumsState { - albums: Album[]; - isLoaded: boolean; -} - -export interface Album { - AlbumId: number; - Title: string; - AlbumArtUrl: string; -} - -// ----------------- -// ACTIONS - These are serializable (hence replayable) descriptions of state transitions. -// They do not themselves have any side-effects; they just describe something that is going to happen. -// Use @typeName and isActionType for type detection that works even after serialization/deserialization. - -@typeName("REQUEST_FEATURED_ALBUMS") -class RequestFeaturedAlbums extends Action { -} - -@typeName("RECEIVE_FEATURED_ALBUMS") -class ReceiveFeaturedAlbums extends Action { - constructor(public albums: Album[]) { - super(); - } -} - -// ---------------- -// ACTION CREATORS - These are functions exposed to UI components that will trigger a state transition. -// They don't directly mutate state, but they can have external side-effects (such as loading data). - -export const actionCreators = { - requestFeaturedAlbums: (): ActionCreator => (dispatch, getState) => { - if (!getState().featuredAlbums.isLoaded) { - let fetchTask = fetch('http://github.com/api/albums/mostPopular') - .then(results => results.json()) - .then(albums => dispatch(new ReceiveFeaturedAlbums(albums))); - - addTask(fetchTask); // Ensure server-side prerendering waits for this to complete - return dispatch(new RequestFeaturedAlbums()); - } - } -}; - -// ---------------- -// REDUCER - For a given state and action, returns the new state. To support time travel, this must not mutate the old state. -// For unrecognized actions, must return the existing state (or default initial state if none was supplied). - -export const reducer: Reducer = (state, action) => { - if (isActionType(action, ReceiveFeaturedAlbums)) { - return { albums: action.albums, isLoaded: true }; - } else { - return state || { albums: [], isLoaded: false }; - } -}; diff --git a/samples/react/MusicStore/ReactApp/store/GenreDetails.ts b/samples/react/MusicStore/ReactApp/store/GenreDetails.ts deleted file mode 100644 index 24848a10..00000000 --- a/samples/react/MusicStore/ReactApp/store/GenreDetails.ts +++ /dev/null @@ -1,68 +0,0 @@ -import { fetch, addTask } from 'domain-task'; -import { typeName, isActionType, Action, Reducer } from 'redux-typed'; -import { ActionCreator } from './'; -import { Album } from './FeaturedAlbums'; - -// ----------------- -// STATE - This defines the type of data maintained in the Redux store. - -export interface GenreDetailsState { - requestedGenreId: number; - albums: Album[]; - isLoaded: boolean; -} - -// ----------------- -// ACTIONS - These are serializable (hence replayable) descriptions of state transitions. -// They do not themselves have any side-effects; they just describe something that is going to happen. -// Use @typeName and isActionType for type detection that works even after serialization/deserialization. - -@typeName("REQUEST_GENRE_DETAILS") -class RequestGenreDetails extends Action { - constructor(public genreId: number) { - super(); - } -} - -@typeName("RECEIVE_GENRE_DETAILS") -class ReceiveGenreDetails extends Action { - constructor(public genreId: number, public albums: Album[]) { - super(); - } -} - -// ---------------- -// ACTION CREATORS - These are functions exposed to UI components that will trigger a state transition. -// They don't directly mutate state, but they can have external side-effects (such as loading data). - -export const actionCreators = { - requestGenreDetails: (genreId: number): ActionCreator => (dispatch, getState) => { - // Only load if it's not already loaded (or currently being loaded) - if (genreId !== getState().genreDetails.requestedGenreId) { - let fetchTask = fetch(`/api/genres/${ genreId }/albums`) - .then(results => results.json()) - .then(albums => { - // Only replace state if it's still the most recent request - if (genreId === getState().genreDetails.requestedGenreId) { - dispatch(new ReceiveGenreDetails(genreId, albums)); - } - }); - - addTask(fetchTask); // Ensure server-side prerendering waits for this to complete - dispatch(new RequestGenreDetails(genreId)); - } - } -}; - -// ---------------- -// REDUCER - For a given state and action, returns the new state. To support time travel, this must not mutate the old state. -// For unrecognized actions, must return the existing state (or default initial state if none was supplied). -export const reducer: Reducer = (state, action) => { - if (isActionType(action, RequestGenreDetails)) { - return { requestedGenreId: action.genreId, albums: [], isLoaded: false }; - } else if (isActionType(action, ReceiveGenreDetails)) { - return { requestedGenreId: action.genreId, albums: action.albums, isLoaded: true }; - } else { - return state || { requestedGenreId: null as number, albums: [], isLoaded: false }; - } -}; diff --git a/samples/react/MusicStore/ReactApp/store/GenreList.ts b/samples/react/MusicStore/ReactApp/store/GenreList.ts deleted file mode 100644 index 8843f22e..00000000 --- a/samples/react/MusicStore/ReactApp/store/GenreList.ts +++ /dev/null @@ -1,55 +0,0 @@ -import { fetch, addTask } from 'domain-task'; -import { typeName, isActionType, Action, Reducer } from 'redux-typed'; -import { ActionCreator } from './'; - -// ----------------- -// STATE - This defines the type of data maintained in the Redux store. - -export interface GenresListState { - genres: Genre[]; - isLoaded: boolean; -} - -export interface Genre { - GenreId: string; - Name: string; -} - -// ----------------- -// ACTIONS - These are serializable (hence replayable) descriptions of state transitions. -// They do not themselves have any side-effects; they just describe something that is going to happen. -// Use @typeName and isActionType for type detection that works even after serialization/deserialization. - -@typeName("RECEIVE_GENRES_LIST") -class ReceiveGenresList extends Action { - constructor(public genres: Genre[]) { - super(); - } -} - -// ---------------- -// ACTION CREATORS - These are functions exposed to UI components that will trigger a state transition. -// They don't directly mutate state, but they can have external side-effects (such as loading data). - -export const actionCreators = { - requestGenresList: (): ActionCreator => (dispatch, getState) => { - if (!getState().genreList.isLoaded) { - let fetchTask = fetch('http://github.com/api/genres') - .then(results => results.json()) - .then(genres => dispatch(new ReceiveGenresList(genres))); - addTask(fetchTask); // Ensure server-side prerendering waits for this to complete - } - } -}; - -// ---------------- -// REDUCER - For a given state and action, returns the new state. To support time travel, this must not mutate the old state. -// For unrecognized actions, must return the existing state (or default initial state if none was supplied). - -export const reducer: Reducer = (state, action) => { - if (isActionType(action, ReceiveGenresList)) { - return { genres: action.genres, isLoaded: true }; - } else { - return state || { genres: [], isLoaded: false }; - } -}; diff --git a/samples/react/MusicStore/ReactApp/store/index.ts b/samples/react/MusicStore/ReactApp/store/index.ts deleted file mode 100644 index 50f6178c..00000000 --- a/samples/react/MusicStore/ReactApp/store/index.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { ActionCreatorGeneric } from 'redux-typed'; -import * as FeaturedAlbums from './FeaturedAlbums'; -import * as GenreList from './GenreList'; -import * as GenreDetails from './GenreDetails'; -import * as AlbumDetails from './AlbumDetails'; - -// The top-level state object -export interface ApplicationState { - featuredAlbums: FeaturedAlbums.FeaturedAlbumsState; - genreList: GenreList.GenresListState, - genreDetails: GenreDetails.GenreDetailsState, - albumDetails: AlbumDetails.AlbumDetailsState -} - -// Whenever an action is dispatched, Redux will update each top-level application state property using -// the reducer with the matching name. It's important that the names match exactly, and that the reducer -// acts on the corresponding ApplicationState property type. -export const reducers = { - featuredAlbums: FeaturedAlbums.reducer, - genreList: GenreList.reducer, - genreDetails: GenreDetails.reducer, - albumDetails: AlbumDetails.reducer -}; - -// This type can be used as a hint on action creators so that its 'dispatch' and 'getState' params are -// correctly typed to match your store. -export type ActionCreator = ActionCreatorGeneric; diff --git a/samples/react/MusicStore/ReactApp/styles/styles.css b/samples/react/MusicStore/ReactApp/styles/styles.css deleted file mode 100644 index a8fc8a14..00000000 --- a/samples/react/MusicStore/ReactApp/styles/styles.css +++ /dev/null @@ -1,3 +0,0 @@ -body { - padding-top: 50px; -} diff --git a/samples/react/MusicStore/SiteSettings.cs b/samples/react/MusicStore/SiteSettings.cs deleted file mode 100644 index 50a86c24..00000000 --- a/samples/react/MusicStore/SiteSettings.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace MusicStore -{ - public class SiteSettings - { - public string DefaultAdminUsername { get; set; } - public string DefaultAdminPassword { get; set; } - } -} diff --git a/samples/react/MusicStore/Startup.cs b/samples/react/MusicStore/Startup.cs deleted file mode 100755 index 6b649e9a..00000000 --- a/samples/react/MusicStore/Startup.cs +++ /dev/null @@ -1,114 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Identity.EntityFrameworkCore; -using Microsoft.AspNetCore.SpaServices.Webpack; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; -using Microsoft.Extensions.PlatformAbstractions; -using AutoMapper; -using MusicStore.Apis; -using MusicStore.Models; -using Newtonsoft.Json.Serialization; - -namespace MusicStore -{ - public class Startup - { - // This method gets called by the runtime. Use this method to add services to the container. - public void ConfigureServices(IServiceCollection services) - { - services.AddMvc().AddJsonOptions(options => - { - options.SerializerSettings.ContractResolver = null; - }); - - // Add EF services to the service container - services - .AddEntityFrameworkSqlite() - .AddDbContext(options => { - options.UseSqlite("Data Source=music-db.sqlite"); - }); - - // Add Identity services to the services container - services.AddIdentity() - .AddEntityFrameworkStores() - .AddDefaultTokenProviders(); - - // Configure Auth - services.Configure(options => - { - options.AddPolicy("app-ManageStore", new AuthorizationPolicyBuilder().RequireClaim("app-ManageStore", "Allowed").Build()); - }); - - Mapper.Initialize(cfg => - { - cfg.CreateMap(); - cfg.CreateMap(); - cfg.CreateMap(); - cfg.CreateMap(); - cfg.CreateMap(); - cfg.CreateMap(); - cfg.CreateMap(); - cfg.CreateMap(); - }); - } - - // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory, IHostingEnvironment env) - { - app.UseDeveloperExceptionPage(); - - // Initialize the sample data - SampleData.InitializeMusicStoreDatabaseAsync(app.ApplicationServices).Wait(); - - // In dev mode, the JS/TS/etc is compiled and served dynamically and supports hot replacement. - // In production, we assume you've used webpack to emit the prebuilt content to disk. - if (env.IsDevelopment()) { - app.UseWebpackDevMiddleware(new WebpackDevMiddlewareOptions { - HotModuleReplacement = true, - ReactHotModuleReplacement = true - }); - } - - app.UseStaticFiles(); - loggerFactory.AddConsole(); - - // Add MVC to the request pipeline. - app.UseMvc(routes => - { - // Matches requests that correspond to an existent controller/action pair - routes.MapRoute( - name: "default", - template: "{controller=Home}/{action=Index}/{id?}"); - - // Matches any other request that doesn't appear to have a filename extension (defined as 'having a dot in the last URI segment'). - // This means you'll correctly get 404s for /some/dir/non-existent-image.png instead of returning the SPA HTML. - // However, it means requests like /customers/isaac.newton will *not* be mapped into the SPA, so if you need to accept - // URIs like that you'll need to match all URIs, e.g.: - // routes.MapRoute("spa-fallback", "{*anything}", new { controller = "Home", action = "Index" }); - // (which of course will match /customers/isaac.png too, so in that case it would serve the PNG image at that URL if one is on disk, - // or the SPA HTML if not). - routes.MapSpaFallbackRoute("spa-fallback", new { controller = "Home", action = "Index" }); - }); - } - - public static void Main(string[] args) - { - var host = new WebHostBuilder() - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIISIntegration() - .UseKestrel() - .UseStartup() - .Build(); - - host.Run(); - } - } -} diff --git a/samples/react/MusicStore/Views/Home/Index.cshtml b/samples/react/MusicStore/Views/Home/Index.cshtml deleted file mode 100755 index 9595e016..00000000 --- a/samples/react/MusicStore/Views/Home/Index.cshtml +++ /dev/null @@ -1,11 +0,0 @@ -@{ - ViewData["Title"] = "Home Page"; -} - -
    - -@section scripts { - - -} diff --git a/samples/react/MusicStore/Views/Shared/Error.cshtml b/samples/react/MusicStore/Views/Shared/Error.cshtml deleted file mode 100755 index 473b35d6..00000000 --- a/samples/react/MusicStore/Views/Shared/Error.cshtml +++ /dev/null @@ -1,6 +0,0 @@ -@{ - ViewData["Title"] = "Error"; -} - -

    Error.

    -

    An error occurred while processing your request.

    diff --git a/samples/react/MusicStore/Views/Shared/_Layout.cshtml b/samples/react/MusicStore/Views/Shared/_Layout.cshtml deleted file mode 100755 index 47e4e48f..00000000 --- a/samples/react/MusicStore/Views/Shared/_Layout.cshtml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - @ViewData["Title"] - - - - @RenderBody() - @RenderSection("scripts", required: false) - - diff --git a/samples/react/MusicStore/Views/_ViewImports.cshtml b/samples/react/MusicStore/Views/_ViewImports.cshtml deleted file mode 100755 index 17302928..00000000 --- a/samples/react/MusicStore/Views/_ViewImports.cshtml +++ /dev/null @@ -1,3 +0,0 @@ -@using MusicStore -@addTagHelper "*, Microsoft.AspNetCore.Mvc.TagHelpers" -@addTagHelper "*, Microsoft.AspNetCore.SpaServices" diff --git a/samples/react/MusicStore/Views/_ViewStart.cshtml b/samples/react/MusicStore/Views/_ViewStart.cshtml deleted file mode 100755 index 820a2f6e..00000000 --- a/samples/react/MusicStore/Views/_ViewStart.cshtml +++ /dev/null @@ -1,3 +0,0 @@ -@{ - Layout = "_Layout"; -} diff --git a/samples/react/MusicStore/package.json b/samples/react/MusicStore/package.json deleted file mode 100644 index bd501e76..00000000 --- a/samples/react/MusicStore/package.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "name": "music-store", - "version": "0.0.0", - "dependencies": { - "@types/history": "^2.0.0", - "@types/react": "^0.14.29", - "@types/react-bootstrap": "^0.0.35", - "@types/react-dom": "^0.14.14", - "@types/react-redux": "^4.4.29", - "@types/react-router": "^2.0.30", - "@types/react-router-bootstrap": "^0.0.27", - "@types/react-router-redux": "^4.0.30", - "@types/redux-thunk": "^2.1.28", - "@types/source-map": "^0.1.28", - "@types/uglify-js": "^2.0.27", - "@types/webpack": "^1.12.35", - "@types/webpack-env": "^1.12.1", - "@types/whatwg-fetch": "0.0.28", - "aspnet-prerendering": "^1.0.7", - "aspnet-webpack": "^1.0.17", - "aspnet-webpack-react": "^1.0.2", - "babel-core": "^6.5.2", - "babel-loader": "^6.2.3", - "babel-preset-es2015": "^6.5.0", - "babel-preset-react": "^6.5.0", - "bootstrap": "^3.3.6", - "css-loader": "^0.23.1", - "domain-task": "^2.0.1", - "event-source-polyfill": "^0.0.7", - "extract-text-webpack-plugin": "^1.0.1", - "file-loader": "^0.8.5", - "jquery": "^2.2.1", - "react": "^15.3.2", - "react-bootstrap": "^0.30.6", - "react-dom": "^15.3.2", - "react-redux": "^4.4.5", - "react-router": "^2.8.1", - "react-router-bootstrap": "^0.23.1", - "react-router-redux": "^4.0.6", - "redux": "^3.6.0", - "redux-thunk": "^2.1.0", - "redux-typed": "^2.0.0", - "style-loader": "^0.13.0", - "ts-loader": "^0.8.1", - "typescript": "^2.0.3", - "url-loader": "^0.5.7", - "webpack": "^1.13.2", - "webpack-hot-middleware": "^2.12.2", - "webpack-merge": "^0.14.1", - "webpack-node-externals": "^1.4.3" - } -} diff --git a/samples/react/MusicStore/tsconfig.json b/samples/react/MusicStore/tsconfig.json deleted file mode 100644 index 15a9f3fa..00000000 --- a/samples/react/MusicStore/tsconfig.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "compilerOptions": { - "baseUrl": ".", - "moduleResolution": "node", - "target": "es6", - "jsx": "preserve", - "sourceMap": true, - "experimentalDecorators": true, - "types": [ "webpack-env", "whatwg-fetch" ], - "paths": { - // Fix "Duplicate identifier" errors caused by multiple dependencies fetching their own copies of type definitions. - // We tell TypeScript which type definitions module to treat as the canonical one (instead of combining all of them). - "history": ["./node_modules/@types/history/index"], - "redux": ["./node_modules/@types/redux/index"], - "react": ["./node_modules/@types/react/index"] - } - }, - "exclude": [ - "node_modules" - ] -} diff --git a/samples/react/MusicStore/webpack.config.js b/samples/react/MusicStore/webpack.config.js deleted file mode 100644 index 521e68d0..00000000 --- a/samples/react/MusicStore/webpack.config.js +++ /dev/null @@ -1,32 +0,0 @@ -var path = require('path'); -var webpack = require('webpack'); -var ExtractTextPlugin = require('extract-text-webpack-plugin'); - -module.exports = { - devtool: 'inline-source-map', - resolve: { - extensions: [ '', '.js', '.jsx', '.ts', '.tsx' ] - }, - module: { - loaders: [ - { test: /\.ts(x?)$/, include: /ReactApp/, exclude: /node_modules/, loader: 'babel-loader' }, - { test: /\.ts(x?)$/, include: /ReactApp/, exclude: /node_modules/, loader: 'ts-loader?silent' }, - { test: /\.css$/, loader: ExtractTextPlugin.extract('style-loader', 'css-loader') }, - { test: /\.(png|woff|woff2|eot|ttf|svg)$/, loader: 'url-loader?limit=100000' } - ] - }, - entry: { - main: ['./ReactApp/boot.tsx'], - vendor: ['react'] - }, - output: { - path: path.join(__dirname, 'wwwroot', 'dist'), - filename: '[name].js', - publicPath: '/dist/' - }, - plugins: [ - new webpack.optimize.OccurenceOrderPlugin(), - new ExtractTextPlugin('main.css'), - new webpack.optimize.CommonsChunkPlugin('vendor', 'vendor.bundle.js') // Moves vendor content out of other bundles - ] -}; diff --git a/samples/react/MusicStore/wwwroot/favicon.ico b/samples/react/MusicStore/wwwroot/favicon.ico deleted file mode 100755 index a3a799985c43bc7309d701b2cad129023377dc71..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32038 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 diff --git a/samples/react/MusicStore/wwwroot/images/logo.png b/samples/react/MusicStore/wwwroot/images/logo.png deleted file mode 100644 index d334c8625625b78836bb729ed9b7a10fa04bb702..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2963 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 - - - - - - - - diff --git a/samples/react/ReactGrid/.babelrc b/samples/react/ReactGrid/.babelrc deleted file mode 100644 index d4e5f8d4..00000000 --- a/samples/react/ReactGrid/.babelrc +++ /dev/null @@ -1,3 +0,0 @@ -{ - "presets": ["es2015", "react"] -} diff --git a/samples/react/ReactGrid/.gitignore b/samples/react/ReactGrid/.gitignore deleted file mode 100644 index f050c809..00000000 --- a/samples/react/ReactGrid/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/node_modules/ -/wwwroot/dist/ -/Properties/launchSettings.json diff --git a/samples/react/ReactGrid/Controllers/HomeController.cs b/samples/react/ReactGrid/Controllers/HomeController.cs deleted file mode 100755 index b7a48c4f..00000000 --- a/samples/react/ReactGrid/Controllers/HomeController.cs +++ /dev/null @@ -1,17 +0,0 @@ -using Microsoft.AspNetCore.Mvc; - -namespace ReactExample.Controllers -{ - public class HomeController : Controller - { - public IActionResult Index() - { - return View(); - } - - public IActionResult Error() - { - return View("~/Views/Shared/Error.cshtml"); - } - } -} diff --git a/samples/react/ReactGrid/Controllers/PeopleApiController.cs b/samples/react/ReactGrid/Controllers/PeopleApiController.cs deleted file mode 100644 index fd3e29c2..00000000 --- a/samples/react/ReactGrid/Controllers/PeopleApiController.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Mvc; - -namespace ReactExample.Controllers -{ - public class PeopleApiController : Controller - { - [HttpPut("api/people/{personId:int}")] - public ActionResult UpdatePerson([FromBody] PersonDto person) - { - if (!ModelState.IsValid) { - return BadRequest(ModelState); - } else { - return new OkResult(); - } - } - } - - public class PersonDto { - public string name { get; set; } - public string city { get; set; } - public string state { get; set; } - public string country { get; set; } - public string company { get; set; } - - [Range(1, 10)] - public int favoriteNumber { get; set; } - } -} diff --git a/samples/react/ReactGrid/README.txt b/samples/react/ReactGrid/README.txt deleted file mode 100644 index e702b308..00000000 --- a/samples/react/ReactGrid/README.txt +++ /dev/null @@ -1,2 +0,0 @@ -Portions of this sample application (particularly, the fake data) are based -on https://github.com/DavidWells/isomorphic-react-example diff --git a/samples/react/ReactGrid/ReactApp/boot-client.jsx b/samples/react/ReactGrid/ReactApp/boot-client.jsx deleted file mode 100644 index d109cdf0..00000000 --- a/samples/react/ReactGrid/ReactApp/boot-client.jsx +++ /dev/null @@ -1,8 +0,0 @@ -import React from 'react'; -import ReactDOM from 'react-dom'; -import { browserHistory } from 'react-router'; -import { ReactApp } from './components/ReactApp.jsx'; -import 'bootstrap/dist/css/bootstrap.css'; - -// In the browser, we render into a DOM node and hook up to the browser's history APIs -ReactDOM.render(, document.getElementById('react-app')); diff --git a/samples/react/ReactGrid/ReactApp/boot-server.jsx b/samples/react/ReactGrid/ReactApp/boot-server.jsx deleted file mode 100644 index b41e0c7a..00000000 --- a/samples/react/ReactGrid/ReactApp/boot-server.jsx +++ /dev/null @@ -1,23 +0,0 @@ -import React from 'react'; -import { renderToString } from 'react-dom/server'; -import { match, RouterContext } from 'react-router'; -import { routes } from './components/ReactApp'; -React; - -export default function renderApp (params) { - return new Promise((resolve, reject) => { - // Match the incoming request against the list of client-side routes - match({ routes, location: params.location }, (error, redirectLocation, renderProps) => { - if (error) { - throw error; - } - - // Build an instance of the application - const app = ; - - // Render it as an HTML string which can be injected into the response - const html = renderToString(app); - resolve({ html }); - }); - }); -} diff --git a/samples/react/ReactGrid/ReactApp/components/CustomPager.jsx b/samples/react/ReactGrid/ReactApp/components/CustomPager.jsx deleted file mode 100644 index 50a30088..00000000 --- a/samples/react/ReactGrid/ReactApp/components/CustomPager.jsx +++ /dev/null @@ -1,50 +0,0 @@ -import * as React from 'react'; -import { Link } from 'react-router'; - -export class CustomPager extends React.Component { - pageChange(event) { - this.props.setPage(parseInt(event.target.getAttribute("data-value"))); - } - - render() { - var previous = null; - var next = null; - - if(this.props.currentPage > 0){ - previous =
    {this.props.previousText}
    ; - } - - if(this.props.currentPage != (this.props.maxPage -1)){ - next =
    {this.props.nextText}
    ; - } - - var options = []; - - var startIndex = Math.max(this.props.currentPage - 5, 0); - var endIndex = Math.min(startIndex + 11, this.props.maxPage); - - if (this.props.maxPage >= 11 && (endIndex - startIndex) <= 10) { - startIndex = endIndex - 11; - } - - for(var i = startIndex; i < endIndex ; i++){ - var selected = this.props.currentPage == i ? "btn-default" : ""; - options.push(
    {i+1}
    ); - } - - return ( -
    - {previous} - {options} - {next} -
    - ); - } -} - -CustomPager.defaultProps = { - maxPage: 0, - nextText: '', - previousText: '', - currentPage: 0 -}; diff --git a/samples/react/ReactGrid/ReactApp/components/PeopleGrid.jsx b/samples/react/ReactGrid/ReactApp/components/PeopleGrid.jsx deleted file mode 100644 index 6ce0ade6..00000000 --- a/samples/react/ReactGrid/ReactApp/components/PeopleGrid.jsx +++ /dev/null @@ -1,31 +0,0 @@ -import React from 'react'; -import Griddle from 'griddle-react'; -import { CustomPager } from './CustomPager.jsx'; -import { fakeData } from '../data/fakeData.js'; -import { columnMeta } from '../data/columnMeta.jsx'; -const resultsPerPage = 10; - -// Griddle requires each row to have a property matching each column, even if you're not displaying -// any data from the row in that column -fakeData.forEach(row => { row.actions = ''; }); - -export class PeopleGrid extends React.Component { - render() { - var pageIndex = this.props.params ? (this.props.params.pageIndex || 1) - 1 : 0; - return ( -
    -

    People

    -
    - x.columnName)} - columnMetadata={columnMeta} - resultsPerPage={resultsPerPage} - tableClassName="table" - useCustomPagerComponent="true" - customPagerComponent={CustomPager} - externalCurrentPage={pageIndex} /> -
    -
    - ); - } -} diff --git a/samples/react/ReactGrid/ReactApp/components/PersonEditor.jsx b/samples/react/ReactGrid/ReactApp/components/PersonEditor.jsx deleted file mode 100644 index 3c78f586..00000000 --- a/samples/react/ReactGrid/ReactApp/components/PersonEditor.jsx +++ /dev/null @@ -1,57 +0,0 @@ -import React from 'react'; -import Formsy from 'formsy-react'; -import { Input } from 'formsy-react-components'; -import { fakeData } from '../data/fakeData.js'; - -export class PersonEditor extends React.Component { - constructor() { - super(); - this.state = { savedChanges: false }; - } - - onChange() { - this.setState({ savedChanges: false }); - } - - submit(model, reset, setErrors) { - PersonEditor.sendJson('put', `/api/people/${ this.props.params.personId }`, model).then(response => { - if (response.ok) { - this.setState({ savedChanges: true }); - } else { - // Parse server-side validation errors from the response and display them - response.json().then(setErrors); - } - }); - } - - render() { - var personId = parseInt(this.props.params.personId); - var person = fakeData.filter(p => p.id === personId)[0]; - var notificationBox = this.state.savedChanges - &&
    Done! Your changes were saved.
    ; - - return
    -
    -

    Edit { person.name }

    -
    - - - - - - - - { notificationBox } - - -
    ; - } - - static sendJson(method, url, object) { - return fetch(url, { - method: method, - headers: { 'Content-Type': 'application/json' }, - body: JSON.stringify(object) - }); - } -} diff --git a/samples/react/ReactGrid/ReactApp/components/ReactApp.jsx b/samples/react/ReactGrid/ReactApp/components/ReactApp.jsx deleted file mode 100644 index 64977a74..00000000 --- a/samples/react/ReactGrid/ReactApp/components/ReactApp.jsx +++ /dev/null @@ -1,18 +0,0 @@ -import React from 'react'; -import { Router, Route } from 'react-router'; -import { PeopleGrid } from './PeopleGrid.jsx'; -import { PersonEditor } from './PersonEditor.jsx'; - -export const routes = - - - -; - -export class ReactApp extends React.Component { - render() { - return ( - - ); - } -} diff --git a/samples/react/ReactGrid/ReactApp/data/columnMeta.jsx b/samples/react/ReactGrid/ReactApp/data/columnMeta.jsx deleted file mode 100644 index f66a8a95..00000000 --- a/samples/react/ReactGrid/ReactApp/data/columnMeta.jsx +++ /dev/null @@ -1,60 +0,0 @@ -import React from 'react'; -import { Link } from 'react-router'; - -class RowActionsComponent extends React.Component { - render() { - return Edit; - } -} - -export const columnMeta = [ - { - "columnName": "id", - "order": 1, - "locked": false, - "visible": true - }, - { - "columnName": "name", - "order": 2, - "locked": false, - "visible": true - }, - { - "columnName": "city", - "order": 3, - "locked": false, - "visible": true - }, - { - "columnName": "state", - "order": 4, - "locked": false, - "visible": true - }, - { - "columnName": "country", - "order": 5, - "locked": false, - "visible": true - }, - { - "columnName": "company", - "order": 6, - "locked": false, - "visible": true - }, - { - "columnName": "favoriteNumber", - "order": 7, - "locked": false, - "visible": true - }, - { - "columnName": "actions", - "order": 8, - "locked": true, - "visible": true, - "customComponent": RowActionsComponent - } -]; diff --git a/samples/react/ReactGrid/ReactApp/data/fakeData.js b/samples/react/ReactGrid/ReactApp/data/fakeData.js deleted file mode 100644 index 08c8c0e9..00000000 --- a/samples/react/ReactGrid/ReactApp/data/fakeData.js +++ /dev/null @@ -1,2486 +0,0 @@ -export const fakeData = [ - { - "id": 0, - "name": "Mayer Leonard", - "city": "Kapowsin", - "state": "Hawaii", - "country": "United Kingdom", - "company": "Ovolo", - "favoriteNumber": 7 - }, - { - "id": 1, - "name": "Koch Becker", - "city": "Johnsonburg", - "state": "New Jersey", - "country": "Madagascar", - "company": "Eventage", - "favoriteNumber": 2 - }, - { - "id": 2, - "name": "Lowery Hopkins", - "city": "Blanco", - "state": "Arizona", - "country": "Ukraine", - "company": "Comtext", - "favoriteNumber": 3 - }, - { - "id": 3, - "name": "Walters Mays", - "city": "Glendale", - "state": "Illinois", - "country": "New Zealand", - "company": "Corporana", - "favoriteNumber": 6 - }, - { - "id": 4, - "name": "Shaw Lowe", - "city": "Coultervillle", - "state": "Wyoming", - "country": "Ecuador", - "company": "Isologica", - "favoriteNumber": 2 - }, - { - "id": 5, - "name": "Ola Fernandez", - "city": "Deltaville", - "state": "Delaware", - "country": "Virgin Islands (US)", - "company": "Pawnagra", - "favoriteNumber": 7 - }, - { - "id": 6, - "name": "Park Carr", - "city": "Welda", - "state": "Kentucky", - "country": "Sri Lanka", - "company": "Cosmetex", - "favoriteNumber": 7 - }, - { - "id": 7, - "name": "Laverne Johnson", - "city": "Rosburg", - "state": "New Mexico", - "country": "Croatia", - "company": "Housedown", - "favoriteNumber": 9 - }, - { - "id": 8, - "name": "Lizzie Nelson", - "city": "Chumuckla", - "state": "Montana", - "country": "Turks & Caicos", - "company": "Everest", - "favoriteNumber": 2 - }, - { - "id": 9, - "name": "Clarke Clemons", - "city": "Inkerman", - "state": "Rhode Island", - "country": "Cambodia", - "company": "Apexia", - "favoriteNumber": 3 - }, - { - "id": 10, - "name": "Cindy Phelps", - "city": "Hachita", - "state": "North Carolina", - "country": "Namibia", - "company": "Pholio", - "favoriteNumber": 6 - }, - { - "id": 11, - "name": "Danielle Keller", - "city": "Stockdale", - "state": "Maryland", - "country": "Cape Verde", - "company": "Netility", - "favoriteNumber": 10 - }, - { - "id": 12, - "name": "Duke Hutchinson", - "city": "Needmore", - "state": "Indiana", - "country": "Brunei", - "company": "Electonic", - "favoriteNumber": 1 - }, - { - "id": 13, - "name": "Aimee Duffy", - "city": "Brownlee", - "state": "Vermont", - "country": "Lebanon", - "company": "Repetwire", - "favoriteNumber": 2 - }, - { - "id": 14, - "name": "Meadows Jimenez", - "city": "Winesburg", - "state": "Kansas", - "country": "Timor L'Este", - "company": "Quonk", - "favoriteNumber": 0 - }, - { - "id": 15, - "name": "Karla Potts", - "city": "Juarez", - "state": "Alaska", - "country": "Samoa", - "company": "Zentime", - "favoriteNumber": 3 - }, - { - "id": 16, - "name": "Rita Jensen", - "city": "Elwood", - "state": "North Dakota", - "country": "Greece", - "company": "Valpreal", - "favoriteNumber": 9 - }, - { - "id": 17, - "name": "Jackie Burke", - "city": "Delwood", - "state": "Arkansas", - "country": "Greenland", - "company": "Magmina", - "favoriteNumber": 4 - }, - { - "id": 18, - "name": "Corinne Moreno", - "city": "Wollochet", - "state": "New Hampshire", - "country": "Sierra Leone", - "company": "Marketoid", - "favoriteNumber": 1 - }, - { - "id": 19, - "name": "Giles Cohen", - "city": "Carbonville", - "state": "Massachusetts", - "country": "Tonga", - "company": "Ginkogene", - "favoriteNumber": 10 - }, - { - "id": 20, - "name": "Maynard Barnes", - "city": "Boling", - "state": "Utah", - "country": "Nepal", - "company": "Kyaguru", - "favoriteNumber": 8 - }, - { - "id": 21, - "name": "Singleton Lindsay", - "city": "Weogufka", - "state": "Tennessee", - "country": "Falkland Islands", - "company": "Egypto", - "favoriteNumber": 5 - }, - { - "id": 22, - "name": "Etta Kemp", - "city": "Como", - "state": "Pennsylvania", - "country": "Syria", - "company": "Marqet", - "favoriteNumber": 3 - }, - { - "id": 23, - "name": "Whitney Pennington", - "city": "Farmington", - "state": "Louisiana", - "country": "Suriname", - "company": "Prosure", - "favoriteNumber": 10 - }, - { - "id": 24, - "name": "Sophie Ellison", - "city": "Whitewater", - "state": "Idaho", - "country": "Malta", - "company": "Evidends", - "favoriteNumber": 1 - }, - { - "id": 25, - "name": "Logan Forbes", - "city": "Idledale", - "state": "Michigan", - "country": "Dominican Republic", - "company": "Pigzart", - "favoriteNumber": 3 - }, - { - "id": 26, - "name": "Haley Mcclure", - "city": "Eggertsville", - "state": "Colorado", - "country": "Honduras", - "company": "Ginkle", - "favoriteNumber": 8 - }, - { - "id": 27, - "name": "Williamson Hurley", - "city": "Edgar", - "state": "Texas", - "country": "Yemen", - "company": "Tetratrex", - "favoriteNumber": 3 - }, - { - "id": 28, - "name": "Heidi Hurst", - "city": "Curtice", - "state": "Nebraska", - "country": "Aruba", - "company": "Vendblend", - "favoriteNumber": 10 - }, - { - "id": 29, - "name": "Barker Long", - "city": "Orovada", - "state": "West Virginia", - "country": "Egypt", - "company": "Uniworld", - "favoriteNumber": 8 - }, - { - "id": 30, - "name": "Richard Patrick", - "city": "Gordon", - "state": "Oregon", - "country": "Malawi", - "company": "Quarx", - "favoriteNumber": 8 - }, - { - "id": 31, - "name": "Cameron Graham", - "city": "Noblestown", - "state": "Oklahoma", - "country": "Slovenia", - "company": "Zilidium", - "favoriteNumber": 5 - }, - { - "id": 32, - "name": "Lucy Quinn", - "city": "Greenock", - "state": "Ohio", - "country": "Australia", - "company": "Geoform", - "favoriteNumber": 10 - }, - { - "id": 33, - "name": "Dickson Greene", - "city": "Jeff", - "state": "Virginia", - "country": "Iraq", - "company": "Niquent", - "favoriteNumber": 6 - }, - { - "id": 34, - "name": "Jasmine Brock", - "city": "Tolu", - "state": "Mississippi", - "country": "Hungary", - "company": "Cytrek", - "favoriteNumber": 8 - }, - { - "id": 35, - "name": "Byers Donaldson", - "city": "Jugtown", - "state": "South Dakota", - "country": "Mongolia", - "company": "Slambda", - "favoriteNumber": 4 - }, - { - "id": 36, - "name": "Burns Blake", - "city": "Shawmut", - "state": "Iowa", - "country": "Ethiopia", - "company": "Comstar", - "favoriteNumber": 9 - }, - { - "id": 37, - "name": "Norman Wynn", - "city": "Hasty", - "state": "Washington", - "country": "Bangladesh", - "company": "Netplode", - "favoriteNumber": 7 - }, - { - "id": 38, - "name": "Anthony Weeks", - "city": "Chautauqua", - "state": "Florida", - "country": "Sudan", - "company": "Rubadub", - "favoriteNumber": 9 - }, - { - "id": 39, - "name": "Courtney Marshall", - "city": "Grazierville", - "state": "California", - "country": "Zambia", - "company": "Medicroix", - "favoriteNumber": 0 - }, - { - "id": 40, - "name": "Wilda Foster", - "city": "Ebro", - "state": "New York", - "country": "Cameroon", - "company": "Xixan", - "favoriteNumber": 0 - }, - { - "id": 41, - "name": "Buckner Hyde", - "city": "Century", - "state": "Minnesota", - "country": "Mexico", - "company": "Plasmos", - "favoriteNumber": 6 - }, - { - "id": 42, - "name": "Montgomery Woodard", - "city": "Nadine", - "state": "Georgia", - "country": "Zimbabwe", - "company": "Neptide", - "favoriteNumber": 1 - }, - { - "id": 43, - "name": "Shirley Boyle", - "city": "Groveville", - "state": "Connecticut", - "country": "Tunisia", - "company": "Interodeo", - "favoriteNumber": 1 - }, - { - "id": 44, - "name": "Mavis Welch", - "city": "Springhill", - "state": "South Carolina", - "country": "Italy", - "company": "Asimiline", - "favoriteNumber": 9 - }, - { - "id": 45, - "name": "Barr Flowers", - "city": "Bowden", - "state": "Missouri", - "country": "South Korea", - "company": "Terragen", - "favoriteNumber": 7 - }, - { - "id": 46, - "name": "Cabrera Koch", - "city": "Wanship", - "state": "Maine", - "country": "Mauritius", - "company": "Norsul", - "favoriteNumber": 9 - }, - { - "id": 47, - "name": "Williams Gamble", - "city": "Homestead", - "state": "Wisconsin", - "country": "Romania", - "company": "Gynk", - "favoriteNumber": 4 - }, - { - "id": 48, - "name": "Angelica Washington", - "city": "Roulette", - "state": "Alabama", - "country": "South Africa", - "company": "Exoswitch", - "favoriteNumber": 3 - }, - { - "id": 49, - "name": "Morse Navarro", - "city": "Balm", - "state": "Hawaii", - "country": "Malaysia", - "company": "Comtours", - "favoriteNumber": 7 - }, - { - "id": 50, - "name": "Harding Chambers", - "city": "Lupton", - "state": "New Jersey", - "country": "Oman", - "company": "Gadtron", - "favoriteNumber": 6 - }, - { - "id": 51, - "name": "Frederick Mcdowell", - "city": "Kimmell", - "state": "Arizona", - "country": "Ireland", - "company": "Delphide", - "favoriteNumber": 2 - }, - { - "id": 52, - "name": "Valentine Turner", - "city": "Hobucken", - "state": "Illinois", - "country": "France", - "company": "Sloganaut", - "favoriteNumber": 0 - }, - { - "id": 53, - "name": "Ruby Cooper", - "city": "Connerton", - "state": "Wyoming", - "country": "Iceland", - "company": "Exospace", - "favoriteNumber": 5 - }, - { - "id": 54, - "name": "Natalia Nielsen", - "city": "Holtville", - "state": "Delaware", - "country": "Equatorial Guinea", - "company": "Isoswitch", - "favoriteNumber": 6 - }, - { - "id": 55, - "name": "Bobbie Silva", - "city": "Fivepointville", - "state": "Kentucky", - "country": "Luxembourg", - "company": "Futuris", - "favoriteNumber": 0 - }, - { - "id": 56, - "name": "Clarice Hays", - "city": "Floriston", - "state": "New Mexico", - "country": "Cruise Ship", - "company": "Skyplex", - "favoriteNumber": 5 - }, - { - "id": 57, - "name": "Leblanc Bartlett", - "city": "Catherine", - "state": "Montana", - "country": "Belarus", - "company": "Ezentia", - "favoriteNumber": 10 - }, - { - "id": 58, - "name": "Jodie Martinez", - "city": "Edneyville", - "state": "Rhode Island", - "country": "Antigua & Barbuda", - "company": "Satiance", - "favoriteNumber": 7 - }, - { - "id": 59, - "name": "Pennington Townsend", - "city": "Ahwahnee", - "state": "North Carolina", - "country": "Chad", - "company": "Orbiflex", - "favoriteNumber": 8 - }, - { - "id": 60, - "name": "Garrison Buchanan", - "city": "Coinjock", - "state": "Maryland", - "country": "Reunion", - "company": "Zanity", - "favoriteNumber": 3 - }, - { - "id": 61, - "name": "Cardenas Reeves", - "city": "Greensburg", - "state": "Indiana", - "country": "Gabon", - "company": "Cogentry", - "favoriteNumber": 1 - }, - { - "id": 62, - "name": "Angeline Jacobson", - "city": "Freeburn", - "state": "Vermont", - "country": "Fiji", - "company": "Pearlessa", - "favoriteNumber": 4 - }, - { - "id": 63, - "name": "Turner Franks", - "city": "Fairforest", - "state": "Kansas", - "country": "New Caledonia", - "company": "Maximind", - "favoriteNumber": 1 - }, - { - "id": 64, - "name": "Murphy Santos", - "city": "Waiohinu", - "state": "Alaska", - "country": "Haiti", - "company": "Isodrive", - "favoriteNumber": 0 - }, - { - "id": 65, - "name": "Walls Cherry", - "city": "Avalon", - "state": "North Dakota", - "country": "Mozambique", - "company": "Bolax", - "favoriteNumber": 10 - }, - { - "id": 66, - "name": "Carney Olson", - "city": "Nanafalia", - "state": "Arkansas", - "country": "Pakistan", - "company": "Unq", - "favoriteNumber": 10 - }, - { - "id": 67, - "name": "Jennings Bowers", - "city": "Kenwood", - "state": "New Hampshire", - "country": "Cayman Islands", - "company": "Deepends", - "favoriteNumber": 10 - }, - { - "id": 68, - "name": "Browning Wooten", - "city": "Jessie", - "state": "Massachusetts", - "country": "Guam", - "company": "Eventex", - "favoriteNumber": 5 - }, - { - "id": 69, - "name": "Preston Britt", - "city": "Dennard", - "state": "Utah", - "country": "Cyprus", - "company": "Sureplex", - "favoriteNumber": 4 - }, - { - "id": 70, - "name": "Holly Martin", - "city": "Carrizo", - "state": "Tennessee", - "country": "Nicaragua", - "company": "Sonique", - "favoriteNumber": 1 - }, - { - "id": 71, - "name": "Zelma Barker", - "city": "Zarephath", - "state": "Pennsylvania", - "country": "Czech Republic", - "company": "Xanide", - "favoriteNumber": 9 - }, - { - "id": 72, - "name": "Burgess Zamora", - "city": "Tampico", - "state": "Louisiana", - "country": "Poland", - "company": "Isopop", - "favoriteNumber": 10 - }, - { - "id": 73, - "name": "Galloway Rich", - "city": "Zeba", - "state": "Idaho", - "country": "Uzbekistan", - "company": "Dragbot", - "favoriteNumber": 4 - }, - { - "id": 74, - "name": "Morris Lott", - "city": "Wattsville", - "state": "Michigan", - "country": "Turkmenistan", - "company": "Slumberia", - "favoriteNumber": 3 - }, - { - "id": 75, - "name": "Paul Mcleod", - "city": "Glenbrook", - "state": "Colorado", - "country": "Cuba", - "company": "Candecor", - "favoriteNumber": 6 - }, - { - "id": 76, - "name": "Phoebe Orr", - "city": "Holcombe", - "state": "Texas", - "country": "Faroe Islands", - "company": "Cubicide", - "favoriteNumber": 4 - }, - { - "id": 77, - "name": "Dalton Christensen", - "city": "Rossmore", - "state": "Nebraska", - "country": "Belgium", - "company": "Enormo", - "favoriteNumber": 4 - }, - { - "id": 78, - "name": "Flora Goff", - "city": "Gila", - "state": "West Virginia", - "country": "Philippines", - "company": "Miracula", - "favoriteNumber": 4 - }, - { - "id": 79, - "name": "Sheree Ross", - "city": "Welch", - "state": "Oregon", - "country": "French Polynesia", - "company": "Illumity", - "favoriteNumber": 0 - }, - { - "id": 80, - "name": "Nita Jefferson", - "city": "Calverton", - "state": "Oklahoma", - "country": "Estonia", - "company": "Cincyr", - "favoriteNumber": 2 - }, - { - "id": 81, - "name": "Elma Mendoza", - "city": "Cornfields", - "state": "Ohio", - "country": "Botswana", - "company": "Isotronic", - "favoriteNumber": 6 - }, - { - "id": 82, - "name": "Garcia Hensley", - "city": "Kohatk", - "state": "Virginia", - "country": "Congo", - "company": "Plasmox", - "favoriteNumber": 4 - }, - { - "id": 83, - "name": "Delgado Osborn", - "city": "Nescatunga", - "state": "Mississippi", - "country": "Montenegro", - "company": "Magneato", - "favoriteNumber": 1 - }, - { - "id": 84, - "name": "Chavez Simmons", - "city": "Roderfield", - "state": "South Dakota", - "country": "Norway", - "company": "Waab", - "favoriteNumber": 1 - }, - { - "id": 85, - "name": "Stuart Roach", - "city": "Hebron", - "state": "Iowa", - "country": "Georgia", - "company": "Applica", - "favoriteNumber": 0 - }, - { - "id": 86, - "name": "Georgia Henson", - "city": "Greenbackville", - "state": "Washington", - "country": "Guinea Bissau", - "company": "Talkalot", - "favoriteNumber": 7 - }, - { - "id": 87, - "name": "Ila Sanders", - "city": "Zortman", - "state": "Florida", - "country": "Brazil", - "company": "Koffee", - "favoriteNumber": 10 - }, - { - "id": 88, - "name": "Shepard Maldonado", - "city": "Lawrence", - "state": "California", - "country": "Netherlands", - "company": "Knowlysis", - "favoriteNumber": 1 - }, - { - "id": 89, - "name": "Ramirez Collins", - "city": "Healy", - "state": "New York", - "country": "Guernsey", - "company": "Entroflex", - "favoriteNumber": 4 - }, - { - "id": 90, - "name": "Magdalena Mcgee", - "city": "Goldfield", - "state": "Minnesota", - "country": "Qatar", - "company": "Xelegyl", - "favoriteNumber": 0 - }, - { - "id": 91, - "name": "Crystal Kinney", - "city": "Nogal", - "state": "Georgia", - "country": "Kuwait", - "company": "Zork", - "favoriteNumber": 3 - }, - { - "id": 92, - "name": "Witt Colon", - "city": "Yorklyn", - "state": "Connecticut", - "country": "Singapore", - "company": "Techmania", - "favoriteNumber": 8 - }, - { - "id": 93, - "name": "Joyce Randolph", - "city": "Leland", - "state": "South Carolina", - "country": "Dominica", - "company": "Realmo", - "favoriteNumber": 2 - }, - { - "id": 94, - "name": "Ora Oneil", - "city": "Gilgo", - "state": "Missouri", - "country": "Bahamas", - "company": "Hinway", - "favoriteNumber": 7 - }, - { - "id": 95, - "name": "Hansen Rose", - "city": "Starks", - "state": "Maine", - "country": "Iran", - "company": "Virxo", - "favoriteNumber": 6 - }, - { - "id": 96, - "name": "Isabelle Rush", - "city": "Datil", - "state": "Wisconsin", - "country": "Switzerland", - "company": "Ecraze", - "favoriteNumber": 4 - }, - { - "id": 97, - "name": "Hoffman Crosby", - "city": "Trucksville", - "state": "Alabama", - "country": "Indonesia", - "company": "Multron", - "favoriteNumber": 10 - }, - { - "id": 98, - "name": "Louella Cotton", - "city": "Shelby", - "state": "Hawaii", - "country": "Tajikistan", - "company": "Supportal", - "favoriteNumber": 0 - }, - { - "id": 99, - "name": "Elvia Drake", - "city": "Albrightsville", - "state": "New Jersey", - "country": "Grenada", - "company": "Kiosk", - "favoriteNumber": 10 - }, - { - "id": 100, - "name": "Tyson Guerra", - "city": "Sutton", - "state": "Arizona", - "country": "Benin", - "company": "Dadabase", - "favoriteNumber": 4 - }, - { - "id": 101, - "name": "Marion Sloan", - "city": "Winchester", - "state": "Illinois", - "country": "Venezuela", - "company": "Exostream", - "favoriteNumber": 0 - }, - { - "id": 102, - "name": "Faulkner Diaz", - "city": "Logan", - "state": "Wyoming", - "country": "Monaco", - "company": "Oceanica", - "favoriteNumber": 10 - }, - { - "id": 103, - "name": "Penelope Price", - "city": "Alafaya", - "state": "Delaware", - "country": "Chile", - "company": "Nebulean", - "favoriteNumber": 10 - }, - { - "id": 104, - "name": "Kaitlin Glover", - "city": "Succasunna", - "state": "Kentucky", - "country": "Puerto Rico", - "company": "Orbean", - "favoriteNumber": 4 - }, - { - "id": 105, - "name": "Elena English", - "city": "Wedgewood", - "state": "New Mexico", - "country": "Algeria", - "company": "Kiggle", - "favoriteNumber": 0 - }, - { - "id": 106, - "name": "Clemons Sweeney", - "city": "Saranap", - "state": "Montana", - "country": "Ghana", - "company": "Konnect", - "favoriteNumber": 8 - }, - { - "id": 107, - "name": "Kelsey Blevins", - "city": "Vincent", - "state": "Rhode Island", - "country": "Albania", - "company": "Xymonk", - "favoriteNumber": 7 - }, - { - "id": 108, - "name": "Schroeder Craft", - "city": "Roosevelt", - "state": "North Carolina", - "country": "Satellite", - "company": "Isotrack", - "favoriteNumber": 8 - }, - { - "id": 109, - "name": "Hill Clark", - "city": "Elrama", - "state": "Maryland", - "country": "Slovakia", - "company": "Waterbaby", - "favoriteNumber": 0 - }, - { - "id": 110, - "name": "Glover Meyers", - "city": "Riviera", - "state": "Indiana", - "country": "Liberia", - "company": "Digigene", - "favoriteNumber": 0 - }, - { - "id": 111, - "name": "Lola Parrish", - "city": "Ellerslie", - "state": "Vermont", - "country": "Azerbaijan", - "company": "Myopium", - "favoriteNumber": 1 - }, - { - "id": 112, - "name": "Nora Rivers", - "city": "Belvoir", - "state": "Kansas", - "country": "Afghanistan", - "company": "Comtrek", - "favoriteNumber": 10 - }, - { - "id": 113, - "name": "Cohen Pacheco", - "city": "Bethpage", - "state": "Alaska", - "country": "Netherlands Antilles", - "company": "Accufarm", - "favoriteNumber": 7 - }, - { - "id": 114, - "name": "Diann Horn", - "city": "Derwood", - "state": "North Dakota", - "country": "Seychelles", - "company": "Synkgen", - "favoriteNumber": 3 - }, - { - "id": 115, - "name": "Amalia Nicholson", - "city": "Hendersonville", - "state": "Arkansas", - "country": "Lesotho", - "company": "Geekus", - "favoriteNumber": 2 - }, - { - "id": 116, - "name": "Mcgee Kane", - "city": "Dante", - "state": "New Hampshire", - "country": "Nigeria", - "company": "Kinetica", - "favoriteNumber": 9 - }, - { - "id": 117, - "name": "Shaffer Simpson", - "city": "Verdi", - "state": "Massachusetts", - "country": "Costa Rica", - "company": "Orbixtar", - "favoriteNumber": 0 - }, - { - "id": 118, - "name": "Lott Heath", - "city": "Castleton", - "state": "Utah", - "country": "Burkina Faso", - "company": "Reversus", - "favoriteNumber": 8 - }, - { - "id": 119, - "name": "Sasha Alvarez", - "city": "Foxworth", - "state": "Tennessee", - "country": "Montserrat", - "company": "Farmex", - "favoriteNumber": 9 - }, - { - "id": 120, - "name": "Sonja Rhodes", - "city": "Trona", - "state": "Pennsylvania", - "country": "Liechtenstein", - "company": "Pyramis", - "favoriteNumber": 2 - }, - { - "id": 121, - "name": "Rachel Elliott", - "city": "Hessville", - "state": "Louisiana", - "country": "Vietnam", - "company": "Centice", - "favoriteNumber": 0 - }, - { - "id": 122, - "name": "Elisa Justice", - "city": "Urie", - "state": "Idaho", - "country": "Senegal", - "company": "Dancerity", - "favoriteNumber": 2 - }, - { - "id": 123, - "name": "Velazquez Anderson", - "city": "Lowell", - "state": "Michigan", - "country": "Burundi", - "company": "Digial", - "favoriteNumber": 5 - }, - { - "id": 124, - "name": "Janet Ford", - "city": "Darlington", - "state": "Colorado", - "country": "Turkey", - "company": "Sportan", - "favoriteNumber": 10 - }, - { - "id": 125, - "name": "Simon Peterson", - "city": "Linwood", - "state": "Texas", - "country": "Kazakhstan", - "company": "Zytrac", - "favoriteNumber": 7 - }, - { - "id": 126, - "name": "Smith Baird", - "city": "Marne", - "state": "Nebraska", - "country": "Swaziland", - "company": "Genmy", - "favoriteNumber": 7 - }, - { - "id": 127, - "name": "Rogers Peters", - "city": "Tedrow", - "state": "West Virginia", - "country": "Spain", - "company": "Octocore", - "favoriteNumber": 1 - }, - { - "id": 128, - "name": "Bowers Ayers", - "city": "Matthews", - "state": "Oregon", - "country": "St Lucia", - "company": "Biotica", - "favoriteNumber": 6 - }, - { - "id": 129, - "name": "Paulette Delaney", - "city": "Riegelwood", - "state": "Oklahoma", - "country": "Guinea", - "company": "Netbook", - "favoriteNumber": 3 - }, - { - "id": 130, - "name": "Pat Klein", - "city": "Jacksonburg", - "state": "Ohio", - "country": "El Salvador", - "company": "Recrisys", - "favoriteNumber": 5 - }, - { - "id": 131, - "name": "Dena Rosa", - "city": "Hollymead", - "state": "Virginia", - "country": "Russia", - "company": "Sealoud", - "favoriteNumber": 6 - }, - { - "id": 132, - "name": "Rochelle Barnett", - "city": "Genoa", - "state": "Mississippi", - "country": "Kenya", - "company": "Ersum", - "favoriteNumber": 6 - }, - { - "id": 133, - "name": "Odom Schultz", - "city": "Blende", - "state": "South Dakota", - "country": "Papua New Guinea", - "company": "Elentrix", - "favoriteNumber": 0 - }, - { - "id": 134, - "name": "Anderson Franco", - "city": "Yardville", - "state": "Iowa", - "country": "Sweden", - "company": "Wazzu", - "favoriteNumber": 4 - }, - { - "id": 135, - "name": "Rebecca Wyatt", - "city": "Berwind", - "state": "Washington", - "country": "St Vincent", - "company": "Bristo", - "favoriteNumber": 2 - }, - { - "id": 136, - "name": "Dollie Hooper", - "city": "Richmond", - "state": "Florida", - "country": "Uruguay", - "company": "Vantage", - "favoriteNumber": 1 - }, - { - "id": 137, - "name": "Mathews Sharpe", - "city": "Glenshaw", - "state": "California", - "country": "Trinidad & Tobago", - "company": "Quilk", - "favoriteNumber": 4 - }, - { - "id": 138, - "name": "Debra Skinner", - "city": "Leming", - "state": "New York", - "country": "Saint Pierre & Miquelon", - "company": "Billmed", - "favoriteNumber": 1 - }, - { - "id": 139, - "name": "Cross Wells", - "city": "Caroline", - "state": "Minnesota", - "country": "Mauritania", - "company": "Strozen", - "favoriteNumber": 3 - }, - { - "id": 140, - "name": "Dodson Aguirre", - "city": "Nash", - "state": "Georgia", - "country": "Palestine", - "company": "Tripsch", - "favoriteNumber": 5 - }, - { - "id": 141, - "name": "Edna Copeland", - "city": "Harrison", - "state": "Connecticut", - "country": "Macedonia", - "company": "Flum", - "favoriteNumber": 10 - }, - { - "id": 142, - "name": "Dominguez Goodwin", - "city": "Condon", - "state": "South Carolina", - "country": "Laos", - "company": "Interloo", - "favoriteNumber": 0 - }, - { - "id": 143, - "name": "Fry Leach", - "city": "Advance", - "state": "Missouri", - "country": "Angola", - "company": "Recritube", - "favoriteNumber": 7 - }, - { - "id": 144, - "name": "Mann Malone", - "city": "Lumberton", - "state": "Maine", - "country": "India", - "company": "Xylar", - "favoriteNumber": 9 - }, - { - "id": 145, - "name": "Bridget Ayala", - "city": "Bellamy", - "state": "Wisconsin", - "country": "Cote D Ivoire", - "company": "Comvex", - "favoriteNumber": 7 - }, - { - "id": 146, - "name": "Blackwell Blanchard", - "city": "Ticonderoga", - "state": "Alabama", - "country": "Barbados", - "company": "Applideck", - "favoriteNumber": 7 - }, - { - "id": 147, - "name": "Maxine Irwin", - "city": "Longoria", - "state": "Hawaii", - "country": "Armenia", - "company": "Pearlesex", - "favoriteNumber": 10 - }, - { - "id": 148, - "name": "Laura Bryant", - "city": "Chicopee", - "state": "New Jersey", - "country": "Bosnia & Herzegovina", - "company": "Poshome", - "favoriteNumber": 0 - }, - { - "id": 149, - "name": "Zimmerman Little", - "city": "Rosewood", - "state": "Arizona", - "country": "Guatemala", - "company": "Boink", - "favoriteNumber": 4 - }, - { - "id": 150, - "name": "Barlow Reed", - "city": "Buxton", - "state": "Illinois", - "country": "Tanzania", - "company": "Premiant", - "favoriteNumber": 5 - }, - { - "id": 151, - "name": "Anita Briggs", - "city": "Laurelton", - "state": "Wyoming", - "country": "United Arab Emirates", - "company": "Codact", - "favoriteNumber": 3 - }, - { - "id": 152, - "name": "Ortiz Newton", - "city": "Blandburg", - "state": "Delaware", - "country": "Moldova", - "company": "Enersave", - "favoriteNumber": 7 - }, - { - "id": 153, - "name": "Cox Monroe", - "city": "Dupuyer", - "state": "Kentucky", - "country": "Taiwan", - "company": "Uneeq", - "favoriteNumber": 3 - }, - { - "id": 154, - "name": "Elinor Hughes", - "city": "Yukon", - "state": "New Mexico", - "country": "Bulgaria", - "company": "Bovis", - "favoriteNumber": 5 - }, - { - "id": 155, - "name": "Ronda Burks", - "city": "Ferney", - "state": "Montana", - "country": "Isle of Man", - "company": "Signity", - "favoriteNumber": 6 - }, - { - "id": 156, - "name": "Lourdes Walls", - "city": "Norwood", - "state": "Rhode Island", - "country": "Argentina", - "company": "Snacktion", - "favoriteNumber": 5 - }, - { - "id": 157, - "name": "Susana Mcintosh", - "city": "Manchester", - "state": "North Carolina", - "country": "Israel", - "company": "Teraprene", - "favoriteNumber": 5 - }, - { - "id": 158, - "name": "Alfreda Henry", - "city": "Wilsonia", - "state": "Maryland", - "country": "Bhutan", - "company": "Coash", - "favoriteNumber": 3 - }, - { - "id": 159, - "name": "Tiffany Chaney", - "city": "Carrsville", - "state": "Indiana", - "country": "Morocco", - "company": "Cinaster", - "favoriteNumber": 7 - }, - { - "id": 160, - "name": "Morton Edwards", - "city": "Barstow", - "state": "Vermont", - "country": "Hong Kong", - "company": "Ultrasure", - "favoriteNumber": 10 - }, - { - "id": 161, - "name": "Marcy Serrano", - "city": "Idamay", - "state": "Kansas", - "country": "Finland", - "company": "Isbol", - "favoriteNumber": 3 - }, - { - "id": 162, - "name": "Wendi Gutierrez", - "city": "Camas", - "state": "Alaska", - "country": "Andorra", - "company": "Turnling", - "favoriteNumber": 6 - }, - { - "id": 163, - "name": "Miriam Gates", - "city": "Helen", - "state": "North Dakota", - "country": "Djibouti", - "company": "Undertap", - "favoriteNumber": 8 - }, - { - "id": 164, - "name": "Adrienne Horne", - "city": "Snyderville", - "state": "Arkansas", - "country": "Gambia", - "company": "Olympix", - "favoriteNumber": 2 - }, - { - "id": 165, - "name": "Steele Morales", - "city": "Kenvil", - "state": "New Hampshire", - "country": "Macau", - "company": "Animalia", - "favoriteNumber": 3 - }, - { - "id": 166, - "name": "Ericka Morgan", - "city": "Leroy", - "state": "Massachusetts", - "country": "Kyrgyz Republic", - "company": "Opticall", - "favoriteNumber": 5 - }, - { - "id": 167, - "name": "Deborah Davenport", - "city": "Albany", - "state": "Utah", - "country": "Thailand", - "company": "Vetron", - "favoriteNumber": 10 - }, - { - "id": 168, - "name": "Tameka Mcneil", - "city": "Frierson", - "state": "Tennessee", - "country": "St. Lucia", - "company": "Martgo", - "favoriteNumber": 1 - }, - { - "id": 169, - "name": "Jewell Shields", - "city": "Bannock", - "state": "Pennsylvania", - "country": "Maldives", - "company": "Lotron", - "favoriteNumber": 8 - }, - { - "id": 170, - "name": "Crawford Fox", - "city": "Nicholson", - "state": "Louisiana", - "country": "Rwanda", - "company": "Progenex", - "favoriteNumber": 8 - }, - { - "id": 171, - "name": "Vaughan Tanner", - "city": "Cuylerville", - "state": "Idaho", - "country": "Jamaica", - "company": "Zeam", - "favoriteNumber": 3 - }, - { - "id": 172, - "name": "Shauna Wagner", - "city": "Disautel", - "state": "Michigan", - "country": "China", - "company": "Isologia", - "favoriteNumber": 6 - }, - { - "id": 173, - "name": "Meagan Hines", - "city": "Whitmer", - "state": "Colorado", - "country": "Jordan", - "company": "Grainspot", - "favoriteNumber": 8 - }, - { - "id": 174, - "name": "Palmer Bender", - "city": "Beechmont", - "state": "Texas", - "country": "Japan", - "company": "Vurbo", - "favoriteNumber": 10 - }, - { - "id": 175, - "name": "Amanda Buck", - "city": "Elfrida", - "state": "Nebraska", - "country": "Latvia", - "company": "Frosnex", - "favoriteNumber": 5 - }, - { - "id": 176, - "name": "Kristin Cleveland", - "city": "Richville", - "state": "West Virginia", - "country": "Lithuania", - "company": "Honotron", - "favoriteNumber": 2 - }, - { - "id": 177, - "name": "Harrell Vaughan", - "city": "Munjor", - "state": "Oregon", - "country": "Anguilla", - "company": "Orbalix", - "favoriteNumber": 9 - }, - { - "id": 178, - "name": "Stanley Webb", - "city": "Harleigh", - "state": "Oklahoma", - "country": "Mali", - "company": "Motovate", - "favoriteNumber": 6 - }, - { - "id": 179, - "name": "Briana Mitchell", - "city": "Kansas", - "state": "Ohio", - "country": "Libya", - "company": "Zillatide", - "favoriteNumber": 10 - }, - { - "id": 180, - "name": "Lillian Osborne", - "city": "Eastmont", - "state": "Virginia", - "country": "Belize", - "company": "Circum", - "favoriteNumber": 6 - }, - { - "id": 181, - "name": "Hughes Morse", - "city": "Herlong", - "state": "Mississippi", - "country": "French West Indies", - "company": "Endipine", - "favoriteNumber": 0 - }, - { - "id": 182, - "name": "Elise Whitehead", - "city": "Hailesboro", - "state": "South Dakota", - "country": "Saudi Arabia", - "company": "Geekmosis", - "favoriteNumber": 10 - }, - { - "id": 183, - "name": "Alyce Chavez", - "city": "Bendon", - "state": "Iowa", - "country": "Portugal", - "company": "Dognost", - "favoriteNumber": 8 - }, - { - "id": 184, - "name": "Goff Walker", - "city": "Sultana", - "state": "Washington", - "country": "Germany", - "company": "Uncorp", - "favoriteNumber": 4 - }, - { - "id": 185, - "name": "Brennan Melton", - "city": "Baker", - "state": "Florida", - "country": "Austria", - "company": "Thredz", - "favoriteNumber": 0 - }, - { - "id": 186, - "name": "Toni Brennan", - "city": "Newry", - "state": "California", - "country": "Serbia", - "company": "Bitendrex", - "favoriteNumber": 0 - }, - { - "id": 187, - "name": "Mcmillan Lane", - "city": "Thornport", - "state": "New York", - "country": "Panama", - "company": "Kengen", - "favoriteNumber": 2 - }, - { - "id": 188, - "name": "Yang Trujillo", - "city": "Falmouth", - "state": "Minnesota", - "country": "Paraguay", - "company": "Vitricomp", - "favoriteNumber": 7 - }, - { - "id": 189, - "name": "Osborn Love", - "city": "Rehrersburg", - "state": "Georgia", - "country": "Peru", - "company": "Newcube", - "favoriteNumber": 7 - }, - { - "id": 190, - "name": "Randolph Giles", - "city": "Sandston", - "state": "Connecticut", - "country": "Niger", - "company": "Manglo", - "favoriteNumber": 6 - }, - { - "id": 191, - "name": "Alison Eaton", - "city": "Wauhillau", - "state": "South Carolina", - "country": "St Kitts & Nevis", - "company": "Buzzmaker", - "favoriteNumber": 7 - }, - { - "id": 192, - "name": "Frankie Pollard", - "city": "Salix", - "state": "Missouri", - "country": "Uganda", - "company": "Jasper", - "favoriteNumber": 3 - }, - { - "id": 193, - "name": "Shields Cole", - "city": "Olney", - "state": "Maine", - "country": "British Virgin Islands", - "company": "Anivet", - "favoriteNumber": 3 - }, - { - "id": 194, - "name": "Frieda Wilkins", - "city": "Darrtown", - "state": "Wisconsin", - "country": "Gibraltar", - "company": "Elemantra", - "favoriteNumber": 6 - }, - { - "id": 195, - "name": "Parker Meyer", - "city": "Deseret", - "state": "Alabama", - "country": "Bermuda", - "company": "Cablam", - "favoriteNumber": 6 - }, - { - "id": 196, - "name": "Sharpe Blankenship", - "city": "Sparkill", - "state": "Hawaii", - "country": "Jersey", - "company": "Affluex", - "favoriteNumber": 0 - }, - { - "id": 197, - "name": "Fletcher Pope", - "city": "Libertytown", - "state": "New Jersey", - "country": "Bahrain", - "company": "Veraq", - "favoriteNumber": 6 - }, - { - "id": 198, - "name": "Brittany Holland", - "city": "Stonybrook", - "state": "Arizona", - "country": "Cook Islands", - "company": "Menbrain", - "favoriteNumber": 6 - }, - { - "id": 199, - "name": "Tammi Good", - "city": "Gwynn", - "state": "Illinois", - "country": "Denmark", - "company": "Kangle", - "favoriteNumber": 5 - }, - { - "id": 200, - "name": "Durham Valentine", - "city": "Dodge", - "state": "Wyoming", - "country": "Bolivia", - "company": "Amtas", - "favoriteNumber": 9 - }, - { - "id": 201, - "name": "Gina Savage", - "city": "Camptown", - "state": "Delaware", - "country": "San Marino", - "company": "Golistic", - "favoriteNumber": 8 - }, - { - "id": 202, - "name": "Faith Crane", - "city": "Kingstowne", - "state": "Kentucky", - "country": "Guyana", - "company": "Providco", - "favoriteNumber": 1 - }, - { - "id": 203, - "name": "Mullins Hewitt", - "city": "Courtland", - "state": "New Mexico", - "country": "Colombia", - "company": "Paprikut", - "favoriteNumber": 0 - }, - { - "id": 204, - "name": "Kemp Barber", - "city": "Morriston", - "state": "Montana", - "country": "United Kingdom", - "company": "Geekfarm", - "favoriteNumber": 3 - }, - { - "id": 205, - "name": "Sheppard Shaw", - "city": "Vandiver", - "state": "Rhode Island", - "country": "Madagascar", - "company": "Fossiel", - "favoriteNumber": 9 - }, - { - "id": 206, - "name": "Keith Bradshaw", - "city": "Mulberry", - "state": "North Carolina", - "country": "Ukraine", - "company": "Comtent", - "favoriteNumber": 9 - }, - { - "id": 207, - "name": "Dianne Conley", - "city": "Tonopah", - "state": "Maryland", - "country": "New Zealand", - "company": "Joviold", - "favoriteNumber": 5 - }, - { - "id": 208, - "name": "Love Griffin", - "city": "Day", - "state": "Indiana", - "country": "Ecuador", - "company": "Vortexaco", - "favoriteNumber": 6 - }, - { - "id": 209, - "name": "Melody Delacruz", - "city": "Hanover", - "state": "Vermont", - "country": "Virgin Islands (US)", - "company": "Pyramia", - "favoriteNumber": 6 - }, - { - "id": 210, - "name": "Patsy Kramer", - "city": "Southmont", - "state": "Kansas", - "country": "Sri Lanka", - "company": "Bedder", - "favoriteNumber": 8 - }, - { - "id": 211, - "name": "Becky Richard", - "city": "Crenshaw", - "state": "Alaska", - "country": "Croatia", - "company": "Polarium", - "favoriteNumber": 1 - }, - { - "id": 212, - "name": "Leon Rivera", - "city": "Gibbsville", - "state": "North Dakota", - "country": "Turks & Caicos", - "company": "Micronaut", - "favoriteNumber": 3 - }, - { - "id": 213, - "name": "Simpson Randall", - "city": "Cetronia", - "state": "Arkansas", - "country": "Cambodia", - "company": "Intergeek", - "favoriteNumber": 2 - }, - { - "id": 214, - "name": "Daugherty Duke", - "city": "Levant", - "state": "New Hampshire", - "country": "Namibia", - "company": "Nutralab", - "favoriteNumber": 3 - }, - { - "id": 215, - "name": "Payne Morton", - "city": "Jamestown", - "state": "Massachusetts", - "country": "Cape Verde", - "company": "Insource", - "favoriteNumber": 7 - }, - { - "id": 216, - "name": "Perkins Leblanc", - "city": "Boyd", - "state": "Utah", - "country": "Brunei", - "company": "Dognosis", - "favoriteNumber": 1 - }, - { - "id": 217, - "name": "Phillips Douglas", - "city": "Wikieup", - "state": "Tennessee", - "country": "Lebanon", - "company": "Ziore", - "favoriteNumber": 9 - }, - { - "id": 218, - "name": "Graves Stark", - "city": "Barrelville", - "state": "Pennsylvania", - "country": "Timor L'Este", - "company": "Exovent", - "favoriteNumber": 8 - }, - { - "id": 219, - "name": "Munoz Johns", - "city": "Wyano", - "state": "Louisiana", - "country": "Samoa", - "company": "Escenta", - "favoriteNumber": 10 - }, - { - "id": 220, - "name": "Myra Salazar", - "city": "Gorst", - "state": "Idaho", - "country": "Greece", - "company": "Acrodance", - "favoriteNumber": 10 - }, - { - "id": 221, - "name": "Flynn Miranda", - "city": "Movico", - "state": "Michigan", - "country": "Greenland", - "company": "Artiq", - "favoriteNumber": 6 - }, - { - "id": 222, - "name": "Eloise Barr", - "city": "Greer", - "state": "Colorado", - "country": "Sierra Leone", - "company": "Insuresys", - "favoriteNumber": 5 - }, - { - "id": 223, - "name": "Harrington Daniels", - "city": "Dawn", - "state": "Texas", - "country": "Tonga", - "company": "Pharmex", - "favoriteNumber": 3 - }, - { - "id": 224, - "name": "Lester Carey", - "city": "Keller", - "state": "Nebraska", - "country": "Nepal", - "company": "Melbacor", - "favoriteNumber": 4 - }, - { - "id": 225, - "name": "Malinda Pittman", - "city": "Wyoming", - "state": "West Virginia", - "country": "Falkland Islands", - "company": "Rodeocean", - "favoriteNumber": 1 - }, - { - "id": 226, - "name": "Crane Smith", - "city": "Hoagland", - "state": "Oregon", - "country": "Syria", - "company": "Eclipsent", - "favoriteNumber": 8 - }, - { - "id": 227, - "name": "Ellison Underwood", - "city": "Neahkahnie", - "state": "Oklahoma", - "country": "Suriname", - "company": "Visualix", - "favoriteNumber": 4 - }, - { - "id": 228, - "name": "Shelby Hardy", - "city": "Bascom", - "state": "Ohio", - "country": "Malta", - "company": "Genekom", - "favoriteNumber": 8 - }, - { - "id": 229, - "name": "Sheena Maynard", - "city": "Morningside", - "state": "Virginia", - "country": "Dominican Republic", - "company": "Zillar", - "favoriteNumber": 10 - }, - { - "id": 230, - "name": "Tamera Roman", - "city": "Freelandville", - "state": "Mississippi", - "country": "Honduras", - "company": "Comtract", - "favoriteNumber": 6 - }, - { - "id": 231, - "name": "Juliette Hammond", - "city": "Lindcove", - "state": "South Dakota", - "country": "Yemen", - "company": "Coriander", - "favoriteNumber": 5 - }, - { - "id": 232, - "name": "Dean Holden", - "city": "Brantleyville", - "state": "Iowa", - "country": "Aruba", - "company": "Plexia", - "favoriteNumber": 5 - }, - { - "id": 233, - "name": "Whitfield Meadows", - "city": "Fedora", - "state": "Washington", - "country": "Egypt", - "company": "Isosure", - "favoriteNumber": 1 - }, - { - "id": 234, - "name": "Wiley Kelley", - "city": "Torboy", - "state": "Florida", - "country": "Malawi", - "company": "Zilladyne", - "favoriteNumber": 5 - }, - { - "id": 235, - "name": "Sherry Scott", - "city": "Garfield", - "state": "California", - "country": "Slovenia", - "company": "Otherway", - "favoriteNumber": 5 - }, - { - "id": 236, - "name": "Aline Sosa", - "city": "Martinez", - "state": "New York", - "country": "Australia", - "company": "Comstruct", - "favoriteNumber": 4 - }, - { - "id": 237, - "name": "Leta Rice", - "city": "Utting", - "state": "Minnesota", - "country": "Iraq", - "company": "Jumpstack", - "favoriteNumber": 8 - }, - { - "id": 238, - "name": "Ford Ingram", - "city": "Lafferty", - "state": "Georgia", - "country": "Hungary", - "company": "Sarasonic", - "favoriteNumber": 3 - }, - { - "id": 239, - "name": "Chan David", - "city": "Collins", - "state": "Connecticut", - "country": "Mongolia", - "company": "Velos", - "favoriteNumber": 6 - }, - { - "id": 240, - "name": "Jeanne Murray", - "city": "Carlos", - "state": "South Carolina", - "country": "Ethiopia", - "company": "Equitox", - "favoriteNumber": 6 - }, - { - "id": 241, - "name": "Fernandez Dean", - "city": "Wintersburg", - "state": "Missouri", - "country": "Bangladesh", - "company": "Orboid", - "favoriteNumber": 5 - }, - { - "id": 242, - "name": "Jordan Cox", - "city": "Orin", - "state": "Maine", - "country": "Sudan", - "company": "Roboid", - "favoriteNumber": 6 - }, - { - "id": 243, - "name": "Catherine Harper", - "city": "Bedias", - "state": "Wisconsin", - "country": "Zambia", - "company": "Photobin", - "favoriteNumber": 2 - }, - { - "id": 244, - "name": "Suarez Kelly", - "city": "Cressey", - "state": "Alabama", - "country": "Cameroon", - "company": "Xurban", - "favoriteNumber": 7 - }, - { - "id": 245, - "name": "Henderson Mcdonald", - "city": "Adamstown", - "state": "Hawaii", - "country": "Mexico", - "company": "Skinserve", - "favoriteNumber": 1 - }, - { - "id": 246, - "name": "Hardy Gibbs", - "city": "Chical", - "state": "New Jersey", - "country": "Zimbabwe", - "company": "Limage", - "favoriteNumber": 6 - }, - { - "id": 247, - "name": "Kimberley Yang", - "city": "Kenmar", - "state": "Arizona", - "country": "Tunisia", - "company": "Exotechno", - "favoriteNumber": 9 - }, - { - "id": 248, - "name": "Kristie Gilmore", - "city": "Fairview", - "state": "Illinois", - "country": "Italy", - "company": "Equicom", - "favoriteNumber": 4 - }, - { - "id": 249, - "name": "Jewel Hansen", - "city": "Worton", - "state": "Wyoming", - "country": "South Korea", - "company": "Sulfax", - "favoriteNumber": 6 - }, - { - "id": 250, - "name": "Cheryl Carter", - "city": "Caron", - "state": "Delaware", - "country": "Mauritius", - "company": "Netropic", - "favoriteNumber": 9 - }, - { - "id": 251, - "name": "Keisha Snider", - "city": "Waterloo", - "state": "Kentucky", - "country": "Romania", - "company": "Besto", - "favoriteNumber": 6 - }, - { - "id": 252, - "name": "Minnie Michael", - "city": "Cascades", - "state": "New Mexico", - "country": "South Africa", - "company": "Kidgrease", - "favoriteNumber": 10 - }, - { - "id": 253, - "name": "Sandy Mccullough", - "city": "Remington", - "state": "Montana", - "country": "Malaysia", - "company": "Zosis", - "favoriteNumber": 3 - }, - { - "id": 254, - "name": "Cervantes Maddox", - "city": "Sisquoc", - "state": "Rhode Island", - "country": "Oman", - "company": "Extremo", - "favoriteNumber": 6 - }, - { - "id": 255, - "name": "Sophia Logan", - "city": "Winfred", - "state": "North Carolina", - "country": "Ireland", - "company": "Enaut", - "favoriteNumber": 4 - }, - { - "id": 256, - "name": "Bertha Watson", - "city": "Caroleen", - "state": "Maryland", - "country": "France", - "company": "Musix", - "favoriteNumber": 9 - }, - { - "id": 257, - "name": "Emily Wilson", - "city": "Fairacres", - "state": "Indiana", - "country": "Iceland", - "company": "Comvene", - "favoriteNumber": 8 - }, - { - "id": 258, - "name": "Winters Petersen", - "city": "Wildwood", - "state": "Vermont", - "country": "Equatorial Guinea", - "company": "Webiotic", - "favoriteNumber": 0 - }, - { - "id": 259, - "name": "Chambers Finch", - "city": "Topaz", - "state": "Kansas", - "country": "Luxembourg", - "company": "Sultraxin", - "favoriteNumber": 5 - }, - { - "id": 260, - "name": "Byrd Mills", - "city": "Cloverdale", - "state": "Alaska", - "country": "Cruise Ship", - "company": "Accel", - "favoriteNumber": 2 - }, - { - "id": 261, - "name": "Gross Jacobs", - "city": "Duryea", - "state": "North Dakota", - "country": "Belarus", - "company": "Insuron", - "favoriteNumber": 5 - }, - { - "id": 262, - "name": "Jackson Sherman", - "city": "Waterview", - "state": "Arkansas", - "country": "Antigua & Barbuda", - "company": "Viagreat", - "favoriteNumber": 2 - }, - { - "id": 263, - "name": "Rhodes Boyer", - "city": "Enlow", - "state": "New Hampshire", - "country": "Chad", - "company": "Conferia", - "favoriteNumber": 4 - }, - { - "id": 264, - "name": "Campbell Rodgers", - "city": "Cumminsville", - "state": "Massachusetts", - "country": "Reunion", - "company": "Frolix", - "favoriteNumber": 10 - }, - { - "id": 265, - "name": "Bryant Sawyer", - "city": "Guilford", - "state": "Utah", - "country": "Gabon", - "company": "Rooforia", - "favoriteNumber": 10 - }, - { - "id": 266, - "name": "Joan Browning", - "city": "Elizaville", - "state": "Tennessee", - "country": "Fiji", - "company": "Kneedles", - "favoriteNumber": 6 - }, - { - "id": 267, - "name": "Jennie Mcintyre", - "city": "Draper", - "state": "Pennsylvania", - "country": "New Caledonia", - "company": "Isostream", - "favoriteNumber": 4 - }, - { - "id": 268, - "name": "Merle Jones", - "city": "Caspar", - "state": "Louisiana", - "country": "Haiti", - "company": "Tubesys", - "favoriteNumber": 4 - }, - { - "id": 269, - "name": "Ortega Burgess", - "city": "Thermal", - "state": "Idaho", - "country": "Mozambique", - "company": "Lovepad", - "favoriteNumber": 9 - }, - { - "id": 270, - "name": "Deanna Grimes", - "city": "Flintville", - "state": "Michigan", - "country": "Pakistan", - "company": "Omatom", - "favoriteNumber": 10 - }, - { - "id": 271, - "name": "Jeanie Ochoa", - "city": "Ruckersville", - "state": "Colorado", - "country": "Cayman Islands", - "company": "Momentia", - "favoriteNumber": 8 - }, - { - "id": 272, - "name": "Morrow Valencia", - "city": "Roberts", - "state": "Texas", - "country": "Guam", - "company": "Permadyne", - "favoriteNumber": 4 - }, - { - "id": 273, - "name": "Hull Wade", - "city": "Monument", - "state": "Nebraska", - "country": "Cyprus", - "company": "Indexia", - "favoriteNumber": 10 - }, - { - "id": 274, - "name": "Blanca Sheppard", - "city": "Wadsworth", - "state": "West Virginia", - "country": "Nicaragua", - "company": "Gogol", - "favoriteNumber": 7 - }, - { - "id": 275, - "name": "Stella Luna", - "city": "Dubois", - "state": "Oregon", - "country": "Czech Republic", - "company": "Intrawear", - "favoriteNumber": 1 - } -]; diff --git a/samples/react/ReactGrid/ReactGrid.csproj b/samples/react/ReactGrid/ReactGrid.csproj deleted file mode 100644 index cefd991a..00000000 --- a/samples/react/ReactGrid/ReactGrid.csproj +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - netcoreapp2.0 - true - false - - - - - - - - - - - - - - - - - diff --git a/samples/react/ReactGrid/Startup.cs b/samples/react/ReactGrid/Startup.cs deleted file mode 100755 index 147659b7..00000000 --- a/samples/react/ReactGrid/Startup.cs +++ /dev/null @@ -1,65 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.SpaServices.Webpack; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; -using Newtonsoft.Json.Serialization; - -namespace ReactGrid -{ - public class Startup - { - // This method gets called by the runtime. Use this method to add services to the container. - public void ConfigureServices(IServiceCollection services) - { - services.AddMvc().AddJsonOptions(options => - { - options.SerializerSettings.ContractResolver = new CamelCasePropertyNamesContractResolver(); - }); - } - - // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory, IHostingEnvironment env) - { - app.UseDeveloperExceptionPage(); - - if (env.IsDevelopment()) { - app.UseWebpackDevMiddleware(new WebpackDevMiddlewareOptions { - HotModuleReplacement = true, - ReactHotModuleReplacement = true - }); - } - - app.UseStaticFiles(); - loggerFactory.AddConsole(); - app.UseMvc(routes => - { - routes.MapRoute( - name: "default", - template: "{controller=Home}/{action=Index}/{id?}"); - - routes.MapSpaFallbackRoute( - name: "spa-fallback", - defaults: new { controller = "Home", action = "Index" }); - }); - } - - public static void Main(string[] args) - { - var host = new WebHostBuilder() - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIISIntegration() - .UseKestrel() - .UseStartup() - .Build(); - - host.Run(); - } - } -} diff --git a/samples/react/ReactGrid/Views/Home/Index.cshtml b/samples/react/ReactGrid/Views/Home/Index.cshtml deleted file mode 100755 index 59b13d5a..00000000 --- a/samples/react/ReactGrid/Views/Home/Index.cshtml +++ /dev/null @@ -1,6 +0,0 @@ -
    - -@section scripts { - -} diff --git a/samples/react/ReactGrid/Views/Shared/Error.cshtml b/samples/react/ReactGrid/Views/Shared/Error.cshtml deleted file mode 100755 index 473b35d6..00000000 --- a/samples/react/ReactGrid/Views/Shared/Error.cshtml +++ /dev/null @@ -1,6 +0,0 @@ -@{ - ViewData["Title"] = "Error"; -} - -

    Error.

    -

    An error occurred while processing your request.

    diff --git a/samples/react/ReactGrid/Views/Shared/_Layout.cshtml b/samples/react/ReactGrid/Views/Shared/_Layout.cshtml deleted file mode 100755 index 7ea62731..00000000 --- a/samples/react/ReactGrid/Views/Shared/_Layout.cshtml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - ReactExample - - - -
    - @RenderBody() -
    - @RenderSection("scripts", required: false) - - diff --git a/samples/react/ReactGrid/Views/_ViewImports.cshtml b/samples/react/ReactGrid/Views/_ViewImports.cshtml deleted file mode 100755 index 30438849..00000000 --- a/samples/react/ReactGrid/Views/_ViewImports.cshtml +++ /dev/null @@ -1,3 +0,0 @@ -@using ReactExample -@addTagHelper "*, Microsoft.AspNetCore.Mvc.TagHelpers" -@addTagHelper "*, Microsoft.AspNetCore.SpaServices" diff --git a/samples/react/ReactGrid/Views/_ViewStart.cshtml b/samples/react/ReactGrid/Views/_ViewStart.cshtml deleted file mode 100755 index 820a2f6e..00000000 --- a/samples/react/ReactGrid/Views/_ViewStart.cshtml +++ /dev/null @@ -1,3 +0,0 @@ -@{ - Layout = "_Layout"; -} diff --git a/samples/react/ReactGrid/appsettings.json b/samples/react/ReactGrid/appsettings.json deleted file mode 100755 index 0967ef42..00000000 --- a/samples/react/ReactGrid/appsettings.json +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/samples/react/ReactGrid/jsconfig.json b/samples/react/ReactGrid/jsconfig.json deleted file mode 100644 index 875bb90c..00000000 --- a/samples/react/ReactGrid/jsconfig.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "compilerOptions": { - "target": "ES6", - "module": "commonjs" - } -} diff --git a/samples/react/ReactGrid/package.json b/samples/react/ReactGrid/package.json deleted file mode 100644 index 9329a550..00000000 --- a/samples/react/ReactGrid/package.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "name": "ReactExample", - "version": "0.0.0", - "dependencies": { - "babel-core": "^6.13.2", - "bootstrap": "^3.3.7", - "domain-task": "^2.0.1", - "formsy-react": "^0.18.1", - "formsy-react-components": "^0.8.1", - "griddle-react": "^0.6.1", - "history": "^3.0.0", - "memory-fs": "^0.3.0", - "react": "^15.3.0", - "react-dom": "^15.3.0", - "react-router": "^2.6.1", - "require-from-string": "^1.2.0", - "underscore": "^1.8.3", - "webpack-externals-plugin": "^1.0.0" - }, - "devDependencies": { - "aspnet-prerendering": "^1.0.4", - "aspnet-webpack": "^1.0.9", - "aspnet-webpack-react": "^1.0.1", - "babel-loader": "^6.2.4", - "babel-plugin-react-transform": "^2.0.2", - "babel-preset-es2015": "^6.13.2", - "babel-preset-react": "^6.11.1", - "css-loader": "^0.23.1", - "express": "^4.14.0", - "extract-text-webpack-plugin": "^1.0.1", - "file-loader": "^0.9.0", - "react-transform-hmr": "^1.0.4", - "style-loader": "^0.13.1", - "url-loader": "^0.5.7", - "webpack": "^1.13.1", - "webpack-dev-middleware": "^1.6.1", - "webpack-hot-middleware": "^2.12.2" - } -} diff --git a/samples/react/ReactGrid/webpack.config.js b/samples/react/ReactGrid/webpack.config.js deleted file mode 100644 index b1151f12..00000000 --- a/samples/react/ReactGrid/webpack.config.js +++ /dev/null @@ -1,28 +0,0 @@ -var path = require('path'); -var webpack = require('webpack'); -var ExtractTextPlugin = require('extract-text-webpack-plugin'); - -module.exports = { - devtool: 'eval-source-map', - resolve: { - extensions: [ '', '.js', '.jsx' ] - }, - module: { - loaders: [ - { test: /\.jsx?$/, loader: 'babel-loader', exclude: /node_modules/ }, - { test: /\.css$/, loader: ExtractTextPlugin.extract('style-loader', 'css-loader') }, - { test: /\.(png|woff|woff2|eot|ttf|svg)$/, loader: 'url-loader?limit=100000' } - ] - }, - entry: { - main: ['./ReactApp/boot-client.jsx'] - }, - output: { - path: path.join(__dirname, '/wwwroot/dist'), - filename: '[name].js', - publicPath: '/dist/' // Tells webpack-dev-middleware where to serve the dynamically compiled content from - }, - plugins: [ - new ExtractTextPlugin('main.css') - ] -}; diff --git a/samples/react/ReactGrid/wwwroot/favicon.ico b/samples/react/ReactGrid/wwwroot/favicon.ico deleted file mode 100755 index a3a799985c43bc7309d701b2cad129023377dc71..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32038 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 - - - - - - - - diff --git a/src/Microsoft.AspNetCore.AngularServices/.gitignore b/src/Microsoft.AspNetCore.AngularServices/.gitignore deleted file mode 100644 index ae3c1726..00000000 --- a/src/Microsoft.AspNetCore.AngularServices/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/bin/ diff --git a/src/Microsoft.AspNetCore.AngularServices/Microsoft.AspNetCore.AngularServices.csproj b/src/Microsoft.AspNetCore.AngularServices/Microsoft.AspNetCore.AngularServices.csproj deleted file mode 100644 index 9b7863fe..00000000 --- a/src/Microsoft.AspNetCore.AngularServices/Microsoft.AspNetCore.AngularServices.csproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - Helpers for building Angular applications on ASP.NET Core. - netcoreapp2.0 - aspnetcore;aspnetcoremvc;nodeservices - true - - - - - - - - - - - diff --git a/src/Microsoft.AspNetCore.AngularServices/PrimeCacheHelper.cs b/src/Microsoft.AspNetCore.AngularServices/PrimeCacheHelper.cs deleted file mode 100644 index a755d700..00000000 --- a/src/Microsoft.AspNetCore.AngularServices/PrimeCacheHelper.cs +++ /dev/null @@ -1,81 +0,0 @@ -using System; -using System.Net; -using System.Net.Http; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Mvc.Rendering; -using Microsoft.AspNetCore.Html; -using Microsoft.Extensions.Logging; -using Newtonsoft.Json; - -namespace Microsoft.AspNetCore.AngularServices -{ - /// - /// Helpers for prepopulating Angular's 'http' service with data. - /// - public static class PrimeCacheHelper - { - /// - /// Performs an HTTP GET request to the specified URL and adds the resulting JSON data - /// to the Angular 'http' service cache. - /// - /// The . - /// The URL to be requested. - /// A task representing the HTML content to be rendered into the document. - [Obsolete("Use PrimeCacheAsync instead")] - public static Task PrimeCache(this IHtmlHelper html, string url) - { - return PrimeCacheAsync(html, url); - } - - /// - /// Performs an HTTP GET request to the specified URL and adds the resulting JSON data - /// to the Angular 'http' service cache. - /// - /// The . - /// The URL to be requested. - /// A task representing the HTML content to be rendered into the document. - public static async Task PrimeCacheAsync(this IHtmlHelper html, string url) - { - // TODO: Consider deduplicating the PrimeCacheAsync calls (that is, if there are multiple requests to precache - // the same URL, only return nonempty for one of them). This will make it easier to auto-prime-cache any - // HTTP requests made during server-side rendering, without risking unnecessary duplicate requests. - - if (string.IsNullOrEmpty(url)) - { - throw new ArgumentException("Value cannot be null or empty", nameof(url)); - } - - try - { - var request = html.ViewContext.HttpContext.Request; - var baseUriString = string.Concat( - request.Scheme, - "://", - request.Host.ToUriComponent(), - request.PathBase.ToUriComponent(), - request.Path.ToUriComponent(), - request.QueryString.ToUriComponent()); - var fullUri = new Uri(new Uri(baseUriString), url); - var response = await new HttpClient().GetAsync(fullUri.ToString()); - var responseBody = await response.Content.ReadAsStringAsync(); - return new HtmlString(FormatAsScript(url, response.StatusCode, responseBody)); - } - catch (Exception ex) - { - var logger = (ILogger)html.ViewContext.HttpContext.RequestServices.GetService(typeof(ILogger)); - logger?.LogWarning("Error priming cache for URL: " + url, ex); - return new HtmlString(string.Empty); - } - } - - private static string FormatAsScript(string url, HttpStatusCode responseStatusCode, string responseBody) - { - var preCachedUrl = JsonConvert.SerializeObject(url); - var preCachedJson = JsonConvert.SerializeObject(new { statusCode = responseStatusCode, body = responseBody }); - return ""; - } - } -} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.ReactServices/.gitignore b/src/Microsoft.AspNetCore.ReactServices/.gitignore deleted file mode 100644 index ae3c1726..00000000 --- a/src/Microsoft.AspNetCore.ReactServices/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/bin/ diff --git a/src/Microsoft.AspNetCore.ReactServices/Microsoft.AspNetCore.ReactServices.csproj b/src/Microsoft.AspNetCore.ReactServices/Microsoft.AspNetCore.ReactServices.csproj deleted file mode 100644 index 97f288a6..00000000 --- a/src/Microsoft.AspNetCore.ReactServices/Microsoft.AspNetCore.ReactServices.csproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - Helpers for building React applications on ASP.NET Core. - netcoreapp2.0 - aspnetcore;aspnetcoremvc;nodeservices - true - - - - - - - - - - - diff --git a/templates/WebApplicationBasic/ClientApp/App.ts b/templates/WebApplicationBasic/ClientApp/App.ts deleted file mode 100644 index 4cde26cb..00000000 --- a/templates/WebApplicationBasic/ClientApp/App.ts +++ /dev/null @@ -1,5 +0,0 @@ -import 'bootstrap'; -import './css/site.css'; - -// Replace with your TypeScript code -console.log('Hello, world!'); diff --git a/templates/WebApplicationBasic/ClientApp/css/site.css b/templates/WebApplicationBasic/ClientApp/css/site.css deleted file mode 100755 index af0456db..00000000 --- a/templates/WebApplicationBasic/ClientApp/css/site.css +++ /dev/null @@ -1,24 +0,0 @@ -body { - padding-top: 50px; - padding-bottom: 20px; -} - -/* Wrapping element */ -/* Set some basic padding to keep content from hitting the edges */ -.body-content { - padding-left: 15px; - padding-right: 15px; -} - -/* Set widths on the form inputs since otherwise they're 100% wide */ -input, -select, -textarea { - max-width: 280px; -} - -/* Carousel */ -.carousel-caption p { - font-size: 20px; - line-height: 1.4; -} diff --git a/templates/WebApplicationBasic/Controllers/HomeController.cs b/templates/WebApplicationBasic/Controllers/HomeController.cs deleted file mode 100755 index 03b3a060..00000000 --- a/templates/WebApplicationBasic/Controllers/HomeController.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Mvc; - -namespace WebApplicationBasic.Controllers -{ - public class HomeController : Controller - { - public IActionResult Index() - { - return View(); - } - - public IActionResult About() - { - ViewData["Message"] = "Your application description page."; - - return View(); - } - - public IActionResult Contact() - { - ViewData["Message"] = "Your contact page."; - - return View(); - } - - public IActionResult Error() - { - return View(); - } - } -} diff --git a/templates/WebApplicationBasic/Program.cs b/templates/WebApplicationBasic/Program.cs deleted file mode 100644 index b2e5e4b8..00000000 --- a/templates/WebApplicationBasic/Program.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; - -namespace WebApplicationBasic -{ - public class Program - { - public static void Main(string[] args) - { - var config = new ConfigurationBuilder() - .AddCommandLine(args) - .AddEnvironmentVariables(prefix: "ASPNETCORE_") - .Build(); - - var host = new WebHostBuilder() - .UseConfiguration(config) - .UseKestrel() - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIISIntegration() - .UseStartup() - .Build(); - - host.Run(); - } - } -} diff --git a/templates/WebApplicationBasic/Startup.cs b/templates/WebApplicationBasic/Startup.cs deleted file mode 100755 index fe5473d7..00000000 --- a/templates/WebApplicationBasic/Startup.cs +++ /dev/null @@ -1,59 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; - -namespace WebApplicationBasic -{ - public class Startup - { - public Startup(IHostingEnvironment env) - { - var builder = new ConfigurationBuilder() - .SetBasePath(env.ContentRootPath) - .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true) - .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true) - .AddEnvironmentVariables(); - Configuration = builder.Build(); - } - - public IConfigurationRoot Configuration { get; } - - // This method gets called by the runtime. Use this method to add services to the container. - public void ConfigureServices(IServiceCollection services) - { - // Add framework services. - services.AddMvc(); - } - - // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) - { - loggerFactory.AddConsole(Configuration.GetSection("Logging")); - loggerFactory.AddDebug(); - - if (env.IsDevelopment()) - { - app.UseDeveloperExceptionPage(); - } - else - { - app.UseExceptionHandler("/Home/Error"); - } - - app.UseStaticFiles(); - - app.UseMvc(routes => - { - routes.MapRoute( - name: "default", - template: "{controller=Home}/{action=Index}/{id?}"); - }); - } - } -} diff --git a/templates/WebApplicationBasic/Views/Home/About.cshtml b/templates/WebApplicationBasic/Views/Home/About.cshtml deleted file mode 100755 index b653a26f..00000000 --- a/templates/WebApplicationBasic/Views/Home/About.cshtml +++ /dev/null @@ -1,7 +0,0 @@ -@{ - ViewData["Title"] = "About"; -} -

    @ViewData["Title"].

    -

    @ViewData["Message"]

    - -

    Use this area to provide additional information.

    diff --git a/templates/WebApplicationBasic/Views/Home/Contact.cshtml b/templates/WebApplicationBasic/Views/Home/Contact.cshtml deleted file mode 100755 index f953aa63..00000000 --- a/templates/WebApplicationBasic/Views/Home/Contact.cshtml +++ /dev/null @@ -1,17 +0,0 @@ -@{ - ViewData["Title"] = "Contact"; -} -

    @ViewData["Title"].

    -

    @ViewData["Message"]

    - -
    - One Microsoft Way
    - Redmond, WA 98052-6399
    - P: - 425.555.0100 -
    - -
    - Support: Support@example.com
    - Marketing: Marketing@example.com -
    diff --git a/templates/WebApplicationBasic/Views/Home/Index.cshtml b/templates/WebApplicationBasic/Views/Home/Index.cshtml deleted file mode 100755 index 6fef9aef..00000000 --- a/templates/WebApplicationBasic/Views/Home/Index.cshtml +++ /dev/null @@ -1,114 +0,0 @@ -@{ - ViewData["Title"] = "Home Page"; -} - - - -
    -
    -

    Application uses

    -
      -
    • Sample pages using ASP.NET MVC 6
      • -
    • Gulp and Bower for managing client-side libraries
      • -
    • Theming using Bootstrap
      • -
    -
    -
    -

    How to

    - -
    -
    -

    Overview

    - -
    -
    -

    Run & Deploy

    - -
    -
    - -@section scripts { - -} diff --git a/templates/WebApplicationBasic/Views/Shared/Error.cshtml b/templates/WebApplicationBasic/Views/Shared/Error.cshtml deleted file mode 100755 index 473b35d6..00000000 --- a/templates/WebApplicationBasic/Views/Shared/Error.cshtml +++ /dev/null @@ -1,6 +0,0 @@ -@{ - ViewData["Title"] = "Error"; -} - -

    Error.

    -

    An error occurred while processing your request.

    diff --git a/templates/WebApplicationBasic/Views/Shared/_Layout.cshtml b/templates/WebApplicationBasic/Views/Shared/_Layout.cshtml deleted file mode 100755 index 787de23e..00000000 --- a/templates/WebApplicationBasic/Views/Shared/_Layout.cshtml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - @ViewData["Title"] - WebApplicationBasic - - - - - -
    -
    -
    - - WebApplicationBasic -
    -
    - -
    -
    -
    -
    - @RenderBody() -
    -
    -

    © 2016 - WebApplicationBasic

    -
    -
    - - - @RenderSection("scripts", required: false) - - diff --git a/templates/WebApplicationBasic/Views/_ViewImports.cshtml b/templates/WebApplicationBasic/Views/_ViewImports.cshtml deleted file mode 100755 index 6b9e366d..00000000 --- a/templates/WebApplicationBasic/Views/_ViewImports.cshtml +++ /dev/null @@ -1,2 +0,0 @@ -@using WebApplicationBasic -@addTagHelper "*, Microsoft.AspNetCore.Mvc.TagHelpers" diff --git a/templates/WebApplicationBasic/Views/_ViewStart.cshtml b/templates/WebApplicationBasic/Views/_ViewStart.cshtml deleted file mode 100755 index 820a2f6e..00000000 --- a/templates/WebApplicationBasic/Views/_ViewStart.cshtml +++ /dev/null @@ -1,3 +0,0 @@ -@{ - Layout = "_Layout"; -} diff --git a/templates/WebApplicationBasic/WebApplicationBasic.csproj b/templates/WebApplicationBasic/WebApplicationBasic.csproj deleted file mode 100644 index 12a3277e..00000000 --- a/templates/WebApplicationBasic/WebApplicationBasic.csproj +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - netcoreapp2.0 - true - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/templates/WebApplicationBasic/appsettings.json b/templates/WebApplicationBasic/appsettings.json deleted file mode 100755 index 723c096a..00000000 --- a/templates/WebApplicationBasic/appsettings.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "Logging": { - "IncludeScopes": false, - "LogLevel": { - "Default": "Debug", - "System": "Information", - "Microsoft": "Information" - } - } -} diff --git a/templates/WebApplicationBasic/global.json b/templates/WebApplicationBasic/global.json deleted file mode 100644 index 5a3dc985..00000000 --- a/templates/WebApplicationBasic/global.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "sdk": { "version": "1.0.0-preview2-1-003177" } -} diff --git a/templates/WebApplicationBasic/package.json b/templates/WebApplicationBasic/package.json deleted file mode 100644 index 8cc94585..00000000 --- a/templates/WebApplicationBasic/package.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "WebApplicationBasic", - "version": "0.0.0", - "devDependencies": { - "bootstrap": "^3.3.7", - "css-loader": "^0.23.1", - "event-source-polyfill": "^0.0.7", - "extendify": "^1.0.0", - "extract-text-webpack-plugin": "^1.0.1", - "file-loader": "^0.8.5", - "jquery": "^2.2.1", - "style-loader": "^0.13.0", - "ts-loader": "^0.8.1", - "typescript": "^2.0.3", - "url-loader": "^0.5.7", - "webpack": "^1.13.2" - } -} diff --git a/templates/WebApplicationBasic/template_gitignore b/templates/WebApplicationBasic/template_gitignore deleted file mode 100644 index 3e035eee..00000000 --- a/templates/WebApplicationBasic/template_gitignore +++ /dev/null @@ -1,236 +0,0 @@ -/Properties/launchSettings.json - -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. - -# User-specific files -*.suo -*.user -*.userosscache -*.sln.docstates - -# User-specific files (MonoDevelop/Xamarin Studio) -*.userprefs - -# Build results -[Dd]ebug/ -[Dd]ebugPublic/ -[Rr]elease/ -[Rr]eleases/ -x64/ -x86/ -build/ -bld/ -bin/ -Bin/ -obj/ -Obj/ - -# Visual Studio 2015 cache/options directory -.vs/ -/wwwroot/dist/ - -/yarn.lock - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* - -# NUNIT -*.VisualState.xml -TestResult.xml - -# Build Results of an ATL Project -[Dd]ebugPS/ -[Rr]eleasePS/ -dlldata.c - -*_i.c -*_p.c -*_i.h -*.ilk -*.meta -*.obj -*.pch -*.pdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*.log -*.vspscc -*.vssscc -.builds -*.pidb -*.svclog -*.scc - -# Chutzpah Test files -_Chutzpah* - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opendb -*.opensdf -*.sdf -*.cachefile - -# Visual Studio profiler -*.psess -*.vsp -*.vspx -*.sap - -# TFS 2012 Local Workspace -$tf/ - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper -*.DotSettings.user - -# JustCode is a .NET coding add-in -.JustCode - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# NCrunch -_NCrunch_* -.*crunch*.local.xml -nCrunchTemp_* - -# MightyMoose -*.mm.* -AutoTest.Net/ - -# Web workbench (sass) -.sass-cache/ - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ - -# Publish Web Output -*.[Pp]ublish.xml -*.azurePubxml -# TODO: Comment the next line if you want to checkin your web deploy settings -# but database connection strings (with potential passwords) will be unencrypted -*.pubxml -*.publishproj - -# NuGet Packages -*.nupkg -# The packages folder can be ignored because of Package Restore -**/packages/* -# except build/, which is used as an MSBuild target. -!**/packages/build/ -# Uncomment if necessary however generally it will be regenerated when needed -#!**/packages/repositories.config - -# Microsoft Azure Build Output -csx/ -*.build.csdef - -# Microsoft Azure Emulator -ecf/ -rcf/ - -# Microsoft Azure ApplicationInsights config file -ApplicationInsights.config - -# Windows Store app package directory -AppPackages/ -BundleArtifacts/ - -# Visual Studio cache files -# files ending in .cache can be ignored -*.[Cc]ache -# but keep track of directories ending in .cache -!*.[Cc]ache/ - -# Others -ClientBin/ -~$* -*~ -*.dbmdl -*.dbproj.schemaview -*.pfx -*.publishsettings -orleans.codegen.cs - -/node_modules - -# RIA/Silverlight projects -Generated_Code/ - -# Backup & report files from converting an old project file -# to a newer Visual Studio version. Backup files are not needed, -# because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML -UpgradeLog*.htm - -# SQL Server files -*.mdf -*.ldf - -# Business Intelligence projects -*.rdl.data -*.bim.layout -*.bim_*.settings - -# Microsoft Fakes -FakesAssemblies/ - -# GhostDoc plugin setting file -*.GhostDoc.xml - -# Node.js Tools for Visual Studio -.ntvs_analysis.dat - -# Visual Studio 6 build log -*.plg - -# Visual Studio 6 workspace options file -*.opt - -# Visual Studio LightSwitch build output -**/*.HTMLClient/GeneratedArtifacts -**/*.DesktopClient/GeneratedArtifacts -**/*.DesktopClient/ModelManifest.xml -**/*.Server/GeneratedArtifacts -**/*.Server/ModelManifest.xml -_Pvt_Extensions - -# Paket dependency manager -.paket/paket.exe - -# FAKE - F# Make -.fake/ diff --git a/templates/WebApplicationBasic/tsconfig.json b/templates/WebApplicationBasic/tsconfig.json deleted file mode 100644 index 046eabe4..00000000 --- a/templates/WebApplicationBasic/tsconfig.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "compilerOptions": { - "moduleResolution": "node", - "target": "es5", - "sourceMap": true, - "lib": ["es6", "dom"], - "skipDefaultLibCheck": true - }, - "exclude": [ - "bin", - "node_modules" - ] -} diff --git a/templates/WebApplicationBasic/web.config b/templates/WebApplicationBasic/web.config deleted file mode 100644 index a8d66727..00000000 --- a/templates/WebApplicationBasic/web.config +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - diff --git a/templates/WebApplicationBasic/webpack.config.dev.js b/templates/WebApplicationBasic/webpack.config.dev.js deleted file mode 100644 index e3410f6d..00000000 --- a/templates/WebApplicationBasic/webpack.config.dev.js +++ /dev/null @@ -1,12 +0,0 @@ -var path = require('path'); -var webpack = require('webpack'); - -module.exports = { - plugins: [ - // Plugins that apply in development builds only - new webpack.SourceMapDevToolPlugin({ - filename: '[file].map', // Remove this line if you prefer inline source maps - moduleFilenameTemplate: path.relative('./wwwroot/dist', '[resourcePath]') // Point sourcemap entries to the original file locations on disk - }) - ] -}; diff --git a/templates/WebApplicationBasic/webpack.config.js b/templates/WebApplicationBasic/webpack.config.js deleted file mode 100644 index 80ff4616..00000000 --- a/templates/WebApplicationBasic/webpack.config.js +++ /dev/null @@ -1,35 +0,0 @@ -var path = require('path'); -var webpack = require('webpack'); -var ExtractTextPlugin = require('extract-text-webpack-plugin'); -var merge = require('extendify')({ isDeep: true, arrays: 'concat' }); -var devConfig = require('./webpack.config.dev'); -var prodConfig = require('./webpack.config.prod'); -var isDevelopment = process.env.ASPNETCORE_ENVIRONMENT === 'Development'; -var extractCSS = new ExtractTextPlugin('site.css'); - -module.exports = merge({ - resolve: { - extensions: [ '', '.js', '.jsx', '.ts', '.tsx' ] - }, - module: { - loaders: [ - { test: /\.ts(x?)$/, include: /ClientApp/, loader: 'ts-loader?silent=true' }, - { test: /\.css/, loader: extractCSS.extract([ isDevelopment ? 'css-loader' : 'css-loader?minimize' ]) } - ] - }, - entry: { - main: ['./ClientApp/App.ts'] - }, - output: { - path: path.join(__dirname, 'wwwroot', 'dist'), - filename: '[name].js', - publicPath: '/dist/' - }, - plugins: [ - extractCSS, - new webpack.DllReferencePlugin({ - context: __dirname, - manifest: require('./wwwroot/dist/vendor-manifest.json') - }) - ] -}, isDevelopment ? devConfig : prodConfig); diff --git a/templates/WebApplicationBasic/webpack.config.prod.js b/templates/WebApplicationBasic/webpack.config.prod.js deleted file mode 100644 index 775f115f..00000000 --- a/templates/WebApplicationBasic/webpack.config.prod.js +++ /dev/null @@ -1,8 +0,0 @@ -var webpack = require('webpack'); - -module.exports = { - plugins: [ - new webpack.optimize.OccurenceOrderPlugin(), - new webpack.optimize.UglifyJsPlugin({ minimize: true }) - ] -}; diff --git a/templates/WebApplicationBasic/webpack.config.vendor.js b/templates/WebApplicationBasic/webpack.config.vendor.js deleted file mode 100644 index 2efe99e8..00000000 --- a/templates/WebApplicationBasic/webpack.config.vendor.js +++ /dev/null @@ -1,36 +0,0 @@ -var path = require('path'); -var webpack = require('webpack'); -var ExtractTextPlugin = require('extract-text-webpack-plugin'); -var extractCSS = new ExtractTextPlugin('vendor.css'); -var isDevelopment = process.env.ASPNETCORE_ENVIRONMENT === 'Development'; - -module.exports = { - resolve: { - extensions: [ '', '.js' ] - }, - module: { - loaders: [ - { test: /\.(png|woff|woff2|eot|ttf|svg)$/, loader: 'url-loader?limit=100000' }, - { test: /\.css/, loader: extractCSS.extract([ isDevelopment ? 'css-loader' : 'css-loader?minimize' ]) } - ] - }, - entry: { - vendor: ['bootstrap', 'bootstrap/dist/css/bootstrap.css', 'event-source-polyfill', 'style-loader', 'jquery'] - }, - output: { - path: path.join(__dirname, 'wwwroot', 'dist'), - filename: '[name].js', - library: '[name]_[hash]', - }, - plugins: [ - extractCSS, - new webpack.ProvidePlugin({ $: 'jquery', jQuery: 'jquery' }), // Maps these identifiers to the jQuery package (because Bootstrap expects it to be a global variable) - new webpack.optimize.OccurenceOrderPlugin(), - new webpack.DllPlugin({ - path: path.join(__dirname, 'wwwroot', 'dist', '[name]-manifest.json'), - name: '[name]_[hash]' - }) - ].concat(isDevelopment ? [] : [ - new webpack.optimize.UglifyJsPlugin({ compress: { warnings: false } }) - ]) -}; diff --git a/templates/WebApplicationBasic/wwwroot/favicon.ico b/templates/WebApplicationBasic/wwwroot/favicon.ico deleted file mode 100755 index a3a799985c43bc7309d701b2cad129023377dc71..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32038 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 R1gwujQ%z5`RQctb{{l=|@gx8M diff --git a/templates/WebApplicationBasic/wwwroot/images/Banner-02-VS.png b/templates/WebApplicationBasic/wwwroot/images/Banner-02-VS.png deleted file mode 100755 index c9f461137e80b7bed7a75d5f2d15d0defcfb2bfa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12388 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 From 33cc640942729fc95629355f68e7a8a3276d2691 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 18 May 2017 14:17:29 +0100 Subject: [PATCH 077/411] Remove obsolete 1.x APIs --- samples/misc/NodeServicesExamples/Startup.cs | 6 ++++- .../Webpack/Clientside/PrerenderingSample.ts | 17 ------------- .../FullPagePrerenderingController.cs | 25 ------------------- samples/misc/Webpack/Startup.cs | 6 ++++- samples/misc/Webpack/Views/Home/Index.cshtml | 3 --- ...NodeServicesServiceCollectionExtensions.cs | 14 ----------- .../INodeServices.cs | 21 ---------------- .../NodeServicesImpl.cs | 12 --------- .../Prerendering/JavaScriptModuleExport.cs | 6 ----- .../Prerendering/PrerenderTagHelper.cs | 13 +--------- 10 files changed, 11 insertions(+), 112 deletions(-) delete mode 100644 samples/misc/Webpack/Clientside/PrerenderingSample.ts delete mode 100644 samples/misc/Webpack/Controllers/FullPagePrerenderingController.cs diff --git a/samples/misc/NodeServicesExamples/Startup.cs b/samples/misc/NodeServicesExamples/Startup.cs index 1c38c60a..4ef4802a 100755 --- a/samples/misc/NodeServicesExamples/Startup.cs +++ b/samples/misc/NodeServicesExamples/Startup.cs @@ -41,7 +41,6 @@ public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory, IHo }); app.UseStaticFiles(); - loggerFactory.AddConsole(); app.UseMvc(routes => { routes.MapRoute( @@ -53,6 +52,11 @@ public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory, IHo public static void Main(string[] args) { var host = new WebHostBuilder() + .ConfigureLogging(factory => + { + factory.AddConsole(); + factory.AddDebug(); + }) .UseContentRoot(Directory.GetCurrentDirectory()) .UseIISIntegration() .UseKestrel() diff --git a/samples/misc/Webpack/Clientside/PrerenderingSample.ts b/samples/misc/Webpack/Clientside/PrerenderingSample.ts deleted file mode 100644 index c9d0ca16..00000000 --- a/samples/misc/Webpack/Clientside/PrerenderingSample.ts +++ /dev/null @@ -1,17 +0,0 @@ -export default function (params: any): Promise<{ html: string, globals?: any }> { - return new Promise((resolve, reject) => { - - // Here, you could put any logic that synchronously or asynchronously prerenders - // your SPA components. For example, see the boot-server.ts files in the AngularSpa - // and ReactReduxSpa templates for ways to prerender Angular and React components. - // - // If you wanted, you could use a property on the 'params.data' object to specify - // which SPA component or template to render. - - const html = ` -

    Hello

    - It works! You passed ${ JSON.stringify(params.data) } - and are currently requesting ${ params.location.path }`; - resolve({ html }); - }); -}; diff --git a/samples/misc/Webpack/Controllers/FullPagePrerenderingController.cs b/samples/misc/Webpack/Controllers/FullPagePrerenderingController.cs deleted file mode 100644 index 48935459..00000000 --- a/samples/misc/Webpack/Controllers/FullPagePrerenderingController.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System; -using Microsoft.AspNetCore.Mvc; -using Microsoft.AspNetCore.SpaServices.Prerendering; -using Webpack.ActionResults; - -namespace Webpack.Controllers -{ - // This sample shows how you could invoke the prerendering APIs directly from an MVC - // action result. - public class FullPagePrerenderingController : Controller - { - private static JavaScriptModuleExport BootModule = new JavaScriptModuleExport("Clientside/PrerenderingSample") - { - // Because the boot module is written in TypeScript, we need to specify a webpack - // config so it can be built. If it was written in JavaScript, this would not be needed. - WebpackConfig = "webpack.config.js" - }; - - public IActionResult Index() - { - var dataToSupply = new { nowTime = DateTime.Now.Ticks }; - return this.Prerender(BootModule, dataToSupply); - } - } -} diff --git a/samples/misc/Webpack/Startup.cs b/samples/misc/Webpack/Startup.cs index c81e5c0d..a471781e 100755 --- a/samples/misc/Webpack/Startup.cs +++ b/samples/misc/Webpack/Startup.cs @@ -32,7 +32,6 @@ public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory, IHo }); app.UseStaticFiles(); - loggerFactory.AddConsole(); app.UseMvc(routes => { routes.MapRoute( @@ -44,6 +43,11 @@ public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory, IHo public static void Main(string[] args) { var host = new WebHostBuilder() + .ConfigureLogging(factory => + { + factory.AddConsole(); + factory.AddDebug(); + }) .UseContentRoot(Directory.GetCurrentDirectory()) .UseIISIntegration() .UseKestrel() diff --git a/samples/misc/Webpack/Views/Home/Index.cshtml b/samples/misc/Webpack/Views/Home/Index.cshtml index 365dfaad..7828ec19 100755 --- a/samples/misc/Webpack/Views/Home/Index.cshtml +++ b/samples/misc/Webpack/Views/Home/Index.cshtml @@ -5,9 +5,6 @@

    Hello

    Hi there. Enter some text: -
    -See also: Full-page prerendering example - @section scripts { } diff --git a/src/Microsoft.AspNetCore.NodeServices/Configuration/NodeServicesServiceCollectionExtensions.cs b/src/Microsoft.AspNetCore.NodeServices/Configuration/NodeServicesServiceCollectionExtensions.cs index bc453ae1..f74ae088 100644 --- a/src/Microsoft.AspNetCore.NodeServices/Configuration/NodeServicesServiceCollectionExtensions.cs +++ b/src/Microsoft.AspNetCore.NodeServices/Configuration/NodeServicesServiceCollectionExtensions.cs @@ -15,20 +15,6 @@ public static class NodeServicesServiceCollectionExtensions public static void AddNodeServices(this IServiceCollection serviceCollection) => AddNodeServices(serviceCollection, _ => {}); - /// - /// Adds NodeServices support to the . - /// - /// The . - /// Options for configuring the instances. - [Obsolete("Use the AddNodeServices(Action setupAction) overload instead.")] - public static void AddNodeServices(this IServiceCollection serviceCollection, NodeServicesOptions options) - { - serviceCollection.AddSingleton(typeof (INodeServices), _ => - { - return NodeServicesFactory.CreateNodeServices(options); - }); - } - /// /// Adds NodeServices support to the . /// diff --git a/src/Microsoft.AspNetCore.NodeServices/INodeServices.cs b/src/Microsoft.AspNetCore.NodeServices/INodeServices.cs index c2a92893..2a1ce1aa 100644 --- a/src/Microsoft.AspNetCore.NodeServices/INodeServices.cs +++ b/src/Microsoft.AspNetCore.NodeServices/INodeServices.cs @@ -50,26 +50,5 @@ public interface INodeServices : IDisposable /// Any sequence of JSON-serializable arguments to be passed to the Node.js function. /// A representing the completion of the RPC call. Task InvokeExportAsync(CancellationToken cancellationToken, string moduleName, string exportedFunctionName, params object[] args); - - /// - /// Asynchronously invokes code in the Node.js instance. - /// - /// The JSON-serializable data type that the Node.js code will asynchronously return. - /// The path to the Node.js module (i.e., JavaScript file) relative to your project root whose default CommonJS export is the function to be invoked. - /// Any sequence of JSON-serializable arguments to be passed to the Node.js function. - /// A representing the completion of the RPC call. - [Obsolete("Use InvokeAsync instead")] - Task Invoke(string moduleName, params object[] args); - - /// - /// Asynchronously invokes code in the Node.js instance. - /// - /// The JSON-serializable data type that the Node.js code will asynchronously return. - /// The path to the Node.js module (i.e., JavaScript file) relative to your project root that contains the code to be invoked. - /// Specifies the CommonJS export to be invoked. - /// Any sequence of JSON-serializable arguments to be passed to the Node.js function. - /// A representing the completion of the RPC call. - [Obsolete("Use InvokeExportAsync instead")] - Task InvokeExport(string moduleName, string exportedFunctionName, params object[] args); } } \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.NodeServices/NodeServicesImpl.cs b/src/Microsoft.AspNetCore.NodeServices/NodeServicesImpl.cs index 8dd20444..d1cf9240 100644 --- a/src/Microsoft.AspNetCore.NodeServices/NodeServicesImpl.cs +++ b/src/Microsoft.AspNetCore.NodeServices/NodeServicesImpl.cs @@ -161,17 +161,5 @@ private INodeInstance CreateNewNodeInstance() { return _nodeInstanceFactory(); } - - // Obsolete method - will be removed soon - public Task Invoke(string moduleName, params object[] args) - { - return InvokeAsync(moduleName, args); - } - - // Obsolete method - will be removed soon - public Task InvokeExport(string moduleName, string exportedFunctionName, params object[] args) - { - return InvokeExportAsync(moduleName, exportedFunctionName, args); - } } } \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.SpaServices/Prerendering/JavaScriptModuleExport.cs b/src/Microsoft.AspNetCore.SpaServices/Prerendering/JavaScriptModuleExport.cs index 65e82d4e..97456b65 100644 --- a/src/Microsoft.AspNetCore.SpaServices/Prerendering/JavaScriptModuleExport.cs +++ b/src/Microsoft.AspNetCore.SpaServices/Prerendering/JavaScriptModuleExport.cs @@ -26,11 +26,5 @@ public JavaScriptModuleExport(string moduleName) /// If not set, the JavaScript module's default CommonJS export must itself be the prerendering function. /// public string ExportName { get; set; } - - /// - /// Obsolete. Do not use. Instead, configure Webpack to build a Node.js-compatible bundle and reference that directly. - /// - [Obsolete("Do not use. This feature will be removed. Instead, configure Webpack to build a Node.js-compatible bundle and reference that directly.")] - public string WebpackConfig { get; set; } } } \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.SpaServices/Prerendering/PrerenderTagHelper.cs b/src/Microsoft.AspNetCore.SpaServices/Prerendering/PrerenderTagHelper.cs index 6462e225..bad274f7 100644 --- a/src/Microsoft.AspNetCore.SpaServices/Prerendering/PrerenderTagHelper.cs +++ b/src/Microsoft.AspNetCore.SpaServices/Prerendering/PrerenderTagHelper.cs @@ -19,7 +19,6 @@ public class PrerenderTagHelper : TagHelper { private const string PrerenderModuleAttributeName = "asp-prerender-module"; private const string PrerenderExportAttributeName = "asp-prerender-export"; - private const string PrerenderWebpackConfigAttributeName = "asp-prerender-webpack-config"; private const string PrerenderDataAttributeName = "asp-prerender-data"; private const string PrerenderTimeoutAttributeName = "asp-prerender-timeout"; private static INodeServices _fallbackNodeServices; // Used only if no INodeServices was registered with DI @@ -59,13 +58,6 @@ public PrerenderTagHelper(IServiceProvider serviceProvider) [HtmlAttributeName(PrerenderExportAttributeName)] public string ExportName { get; set; } - /// - /// Obsolete. Do not use. Instead, configure Webpack to build a Node.js-compatible bundle and reference that directly. - /// - [Obsolete("Do not use. This feature will be removed. Instead, configure Webpack to build a Node.js-compatible bundle and reference that directly.")] - [HtmlAttributeName(PrerenderWebpackConfigAttributeName)] - public string WebpackConfigPath { get; set; } - /// /// An optional JSON-serializable parameter to be supplied to the prerendering code. /// @@ -111,10 +103,7 @@ public override async Task ProcessAsync(TagHelperContext context, TagHelperOutpu _nodeServices, new JavaScriptModuleExport(ModuleName) { - ExportName = ExportName, -#pragma warning disable CS0618 // Type or member is obsolete - WebpackConfig = WebpackConfigPath -#pragma warning restore CS0618 // Type or member is obsolete + ExportName = ExportName }, unencodedAbsoluteUrl, unencodedPathAndQuery, From 3ee16a5ba50317768630f6f5a8d542d986e52607 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Fri, 19 May 2017 09:28:33 +0100 Subject: [PATCH 078/411] Update templates to .NET Core 2.0 (but not yet own package refs until they are built in CI) --- templates/AngularSpa/AngularSpa.csproj | 10 +++++----- templates/AureliaSpa/AureliaSpa.csproj | 10 +++++----- templates/KnockoutSpa/KnockoutSpa.csproj | 10 +++++----- templates/ReactReduxSpa/ReactReduxSpa.csproj | 10 +++++----- templates/ReactSpa/ReactSpa.csproj | 10 +++++----- templates/VueSpa/VueSpa.csproj | 10 +++++----- 6 files changed, 30 insertions(+), 30 deletions(-) diff --git a/templates/AngularSpa/AngularSpa.csproj b/templates/AngularSpa/AngularSpa.csproj index b8bd8238..b0cea30f 100644 --- a/templates/AngularSpa/AngularSpa.csproj +++ b/templates/AngularSpa/AngularSpa.csproj @@ -1,15 +1,15 @@ - netcoreapp1.1 + netcoreapp2.0 true false - - + + - - + + diff --git a/templates/AureliaSpa/AureliaSpa.csproj b/templates/AureliaSpa/AureliaSpa.csproj index 287fc635..11c64e1b 100644 --- a/templates/AureliaSpa/AureliaSpa.csproj +++ b/templates/AureliaSpa/AureliaSpa.csproj @@ -1,15 +1,15 @@ - netcoreapp1.1 + netcoreapp2.0 true false - - + + - - + + diff --git a/templates/KnockoutSpa/KnockoutSpa.csproj b/templates/KnockoutSpa/KnockoutSpa.csproj index 287fc635..11c64e1b 100644 --- a/templates/KnockoutSpa/KnockoutSpa.csproj +++ b/templates/KnockoutSpa/KnockoutSpa.csproj @@ -1,15 +1,15 @@ - netcoreapp1.1 + netcoreapp2.0 true false - - + + - - + + diff --git a/templates/ReactReduxSpa/ReactReduxSpa.csproj b/templates/ReactReduxSpa/ReactReduxSpa.csproj index b8bd8238..b0cea30f 100644 --- a/templates/ReactReduxSpa/ReactReduxSpa.csproj +++ b/templates/ReactReduxSpa/ReactReduxSpa.csproj @@ -1,15 +1,15 @@ - netcoreapp1.1 + netcoreapp2.0 true false - - + + - - + + diff --git a/templates/ReactSpa/ReactSpa.csproj b/templates/ReactSpa/ReactSpa.csproj index 287fc635..11c64e1b 100644 --- a/templates/ReactSpa/ReactSpa.csproj +++ b/templates/ReactSpa/ReactSpa.csproj @@ -1,15 +1,15 @@ - netcoreapp1.1 + netcoreapp2.0 true false - - + + - - + + diff --git a/templates/VueSpa/VueSpa.csproj b/templates/VueSpa/VueSpa.csproj index 287fc635..11c64e1b 100644 --- a/templates/VueSpa/VueSpa.csproj +++ b/templates/VueSpa/VueSpa.csproj @@ -1,15 +1,15 @@ - netcoreapp1.1 + netcoreapp2.0 true false - - + + - - + + From 42b88c15f2bbbf6531f7170a149bf2dab3d24e9d Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Fri, 19 May 2017 11:36:17 +0100 Subject: [PATCH 079/411] Make all templates as consistent as possible with stock MVC Core 2.0 one --- templates/AngularSpa/AngularSpa.csproj | 19 +++++++----- .../AngularSpa/Controllers/HomeController.cs | 2 ++ templates/AngularSpa/Program.cs | 15 +++++----- templates/AngularSpa/Startup.cs | 21 ++++---------- .../AngularSpa/Views/Shared/Error.cshtml | 15 ++++++++++ .../AngularSpa/Views/Shared/_Layout.cshtml | 23 ++++++++------- .../AngularSpa/Views/_ViewImports.cshtml | 4 +-- .../AngularSpa/appsettings.Development.json | 19 ++++++++++++ templates/AngularSpa/appsettings.json | 13 ++++++--- templates/AngularSpa/web.config | 14 --------- templates/AureliaSpa/AureliaSpa.csproj | 17 ++++++----- .../app/components/navmenu/navmenu.html | 2 +- .../AureliaSpa/Controllers/HomeController.cs | 2 ++ templates/AureliaSpa/Program.cs | 15 +++++----- templates/AureliaSpa/Startup.cs | 22 ++++---------- .../AureliaSpa/Views/Shared/Error.cshtml | 15 ++++++++++ .../AureliaSpa/Views/Shared/_Layout.cshtml | 21 +++++++------- .../AureliaSpa/Views/_ViewImports.cshtml | 4 +-- .../AureliaSpa/appsettings.Development.json | 19 ++++++++++++ templates/AureliaSpa/appsettings.json | 13 ++++++--- .../KnockoutSpa/Controllers/HomeController.cs | 2 ++ templates/KnockoutSpa/KnockoutSpa.csproj | 17 ++++++----- templates/KnockoutSpa/Program.cs | 15 +++++----- templates/KnockoutSpa/Startup.cs | 18 +++--------- .../KnockoutSpa/Views/Shared/Error.cshtml | 15 ++++++++++ .../KnockoutSpa/Views/Shared/_Layout.cshtml | 29 ++++++++++--------- .../KnockoutSpa/Views/_ViewImports.cshtml | 4 +-- .../KnockoutSpa/appsettings.Development.json | 19 ++++++++++++ templates/KnockoutSpa/appsettings.json | 13 ++++++--- templates/KnockoutSpa/web.config | 14 --------- .../Controllers/HomeController.cs | 2 ++ templates/ReactReduxSpa/Program.cs | 15 +++++----- templates/ReactReduxSpa/ReactReduxSpa.csproj | 19 +++++++----- templates/ReactReduxSpa/Startup.cs | 21 ++++---------- .../ReactReduxSpa/Views/Shared/Error.cshtml | 15 ++++++++++ .../ReactReduxSpa/Views/Shared/_Layout.cshtml | 25 ++++++++-------- .../ReactReduxSpa/Views/_ViewImports.cshtml | 4 +-- .../appsettings.Development.json | 19 ++++++++++++ templates/ReactReduxSpa/appsettings.json | 13 ++++++--- templates/ReactReduxSpa/web.config | 14 --------- .../ReactSpa/Controllers/HomeController.cs | 2 ++ templates/ReactSpa/Program.cs | 15 +++++----- templates/ReactSpa/ReactSpa.csproj | 17 ++++++----- templates/ReactSpa/Startup.cs | 21 ++++---------- templates/ReactSpa/Views/Shared/Error.cshtml | 15 ++++++++++ .../ReactSpa/Views/Shared/_Layout.cshtml | 29 ++++++++++--------- templates/ReactSpa/Views/_ViewImports.cshtml | 4 +-- .../ReactSpa/appsettings.Development.json | 19 ++++++++++++ templates/ReactSpa/appsettings.json | 13 ++++++--- templates/ReactSpa/web.config | 14 --------- templates/VueSpa/ClientApp/boot.ts | 1 + .../ClientApp/components/navmenu/navmenu.css | 7 ----- templates/VueSpa/ClientApp/css/site.css | 6 ++++ .../VueSpa/Controllers/HomeController.cs | 2 ++ templates/VueSpa/Program.cs | 15 +++++----- templates/VueSpa/Startup.cs | 21 ++++---------- templates/VueSpa/Views/Shared/Error.cshtml | 15 ++++++++++ templates/VueSpa/Views/Shared/_Layout.cshtml | 26 ++++++++++------- templates/VueSpa/Views/_ViewImports.cshtml | 4 +-- templates/VueSpa/VueSpa.csproj | 17 ++++++----- templates/VueSpa/appsettings.Development.json | 19 ++++++++++++ templates/VueSpa/appsettings.json | 13 ++++++--- templates/VueSpa/web.config | 14 --------- templates/VueSpa/webpack.config.js | 3 +- 64 files changed, 513 insertions(+), 367 deletions(-) create mode 100644 templates/AngularSpa/appsettings.Development.json delete mode 100644 templates/AngularSpa/web.config create mode 100644 templates/AureliaSpa/appsettings.Development.json create mode 100644 templates/KnockoutSpa/appsettings.Development.json delete mode 100644 templates/KnockoutSpa/web.config create mode 100644 templates/ReactReduxSpa/appsettings.Development.json delete mode 100644 templates/ReactReduxSpa/web.config create mode 100644 templates/ReactSpa/appsettings.Development.json delete mode 100644 templates/ReactSpa/web.config create mode 100644 templates/VueSpa/ClientApp/css/site.css create mode 100644 templates/VueSpa/appsettings.Development.json delete mode 100644 templates/VueSpa/web.config diff --git a/templates/AngularSpa/AngularSpa.csproj b/templates/AngularSpa/AngularSpa.csproj index b0cea30f..7e49bba2 100644 --- a/templates/AngularSpa/AngularSpa.csproj +++ b/templates/AngularSpa/AngularSpa.csproj @@ -1,23 +1,25 @@ - + + netcoreapp2.0 true - false + $(PackageTargetFallback);portable-net45+win8+wp8+wpa81; + - - + - - + - - + + + + @@ -33,4 +35,5 @@ + \ No newline at end of file diff --git a/templates/AngularSpa/Controllers/HomeController.cs b/templates/AngularSpa/Controllers/HomeController.cs index 9d75da88..2889abd9 100644 --- a/templates/AngularSpa/Controllers/HomeController.cs +++ b/templates/AngularSpa/Controllers/HomeController.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Diagnostics; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; @@ -15,6 +16,7 @@ public IActionResult Index() public IActionResult Error() { + ViewData["RequestId"] = Activity.Current?.Id ?? HttpContext.TraceIdentifier; return View(); } } diff --git a/templates/AngularSpa/Program.cs b/templates/AngularSpa/Program.cs index 193f1e2a..e1e634e4 100644 --- a/templates/AngularSpa/Program.cs +++ b/templates/AngularSpa/Program.cs @@ -3,7 +3,10 @@ using System.IO; using System.Linq; using System.Threading.Tasks; +using Microsoft.AspNetCore; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Logging; namespace WebApplicationBasic { @@ -11,14 +14,12 @@ public class Program { public static void Main(string[] args) { - var host = new WebHostBuilder() - .UseKestrel() - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIISIntegration() + BuildWebHost(args).Run(); + } + + public static IWebHost BuildWebHost(string[] args) => + WebHost.CreateDefaultBuilder(args) .UseStartup() .Build(); - - host.Run(); - } } } diff --git a/templates/AngularSpa/Startup.cs b/templates/AngularSpa/Startup.cs index e5d73ed6..d381113d 100644 --- a/templates/AngularSpa/Startup.cs +++ b/templates/AngularSpa/Startup.cs @@ -7,41 +7,32 @@ using Microsoft.AspNetCore.SpaServices.Webpack; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; namespace WebApplicationBasic { public class Startup { - public Startup(IHostingEnvironment env) + public Startup(IConfiguration configuration) { - var builder = new ConfigurationBuilder() - .SetBasePath(env.ContentRootPath) - .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true) - .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true) - .AddEnvironmentVariables(); - Configuration = builder.Build(); + Configuration = configuration; } - public IConfigurationRoot Configuration { get; } + public IConfiguration Configuration { get; } // This method gets called by the runtime. Use this method to add services to the container. public void ConfigureServices(IServiceCollection services) { - // Add framework services. services.AddMvc(); } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) + public void Configure(IApplicationBuilder app, IHostingEnvironment env) { - loggerFactory.AddConsole(Configuration.GetSection("Logging")); - loggerFactory.AddDebug(); - if (env.IsDevelopment()) { app.UseDeveloperExceptionPage(); - app.UseWebpackDevMiddleware(new WebpackDevMiddlewareOptions { + app.UseWebpackDevMiddleware(new WebpackDevMiddlewareOptions + { HotModuleReplacement = true }); } diff --git a/templates/AngularSpa/Views/Shared/Error.cshtml b/templates/AngularSpa/Views/Shared/Error.cshtml index 473b35d6..78e35d5d 100644 --- a/templates/AngularSpa/Views/Shared/Error.cshtml +++ b/templates/AngularSpa/Views/Shared/Error.cshtml @@ -4,3 +4,18 @@

    Error.

    An error occurred while processing your request.

    + +@if (!string.IsNullOrEmpty((string)ViewData["RequestId"])) +{ +

    + Request ID: @ViewData["RequestId"] +

    +} + +

    Development Mode

    +

    + Swapping to Development environment will display more detailed information about the error that occurred. +

    +

    + Development environment should not be enabled in deployed applications, as it can result in sensitive information from exceptions being displayed to end users. For local debugging, development environment can be enabled by setting the ASPNETCORE_ENVIRONMENT environment variable to Development, and restarting the application. +

    diff --git a/templates/AngularSpa/Views/Shared/_Layout.cshtml b/templates/AngularSpa/Views/Shared/_Layout.cshtml index 799964fa..d5b7a0f5 100644 --- a/templates/AngularSpa/Views/Shared/_Layout.cshtml +++ b/templates/AngularSpa/Views/Shared/_Layout.cshtml @@ -1,15 +1,16 @@ - - - - @ViewData["Title"] - WebApplicationBasic - - - - - @RenderBody() + + + + @ViewData["Title"] - WebApplicationBasic + - @RenderSection("scripts", required: false) - + + + + @RenderBody() + + @RenderSection("scripts", required: false) + diff --git a/templates/AngularSpa/Views/_ViewImports.cshtml b/templates/AngularSpa/Views/_ViewImports.cshtml index e7b4f83f..8edbc68c 100644 --- a/templates/AngularSpa/Views/_ViewImports.cshtml +++ b/templates/AngularSpa/Views/_ViewImports.cshtml @@ -1,3 +1,3 @@ @using WebApplicationBasic -@addTagHelper "*, Microsoft.AspNetCore.Mvc.TagHelpers" -@addTagHelper "*, Microsoft.AspNetCore.SpaServices" +@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers +@addTagHelper *, Microsoft.AspNetCore.SpaServices diff --git a/templates/AngularSpa/appsettings.Development.json b/templates/AngularSpa/appsettings.Development.json new file mode 100644 index 00000000..457e0033 --- /dev/null +++ b/templates/AngularSpa/appsettings.Development.json @@ -0,0 +1,19 @@ +{ + "Logging": { + "IncludeScopes": false, + "Debug": { + "LogLevel": { + "Default": "Debug", + "System": "Information", + "Microsoft": "Information" + } + }, + "Console": { + "LogLevel": { + "Default": "Debug", + "System": "Information", + "Microsoft": "Information" + } + } + } +} diff --git a/templates/AngularSpa/appsettings.json b/templates/AngularSpa/appsettings.json index 723c096a..c851e129 100644 --- a/templates/AngularSpa/appsettings.json +++ b/templates/AngularSpa/appsettings.json @@ -1,10 +1,15 @@ { "Logging": { "IncludeScopes": false, - "LogLevel": { - "Default": "Debug", - "System": "Information", - "Microsoft": "Information" + "Debug": { + "LogLevel": { + "Default": "Warning" + } + }, + "Console": { + "LogLevel": { + "Default": "Warning" + } } } } diff --git a/templates/AngularSpa/web.config b/templates/AngularSpa/web.config deleted file mode 100644 index a8d66727..00000000 --- a/templates/AngularSpa/web.config +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - diff --git a/templates/AureliaSpa/AureliaSpa.csproj b/templates/AureliaSpa/AureliaSpa.csproj index 11c64e1b..83fa7d32 100644 --- a/templates/AureliaSpa/AureliaSpa.csproj +++ b/templates/AureliaSpa/AureliaSpa.csproj @@ -1,20 +1,20 @@ - + + netcoreapp2.0 true - false + $(PackageTargetFallback);portable-net45+win8+wp8+wpa81; + - - + - - + - - + + @@ -30,4 +30,5 @@     +     \ No newline at end of file diff --git a/templates/AureliaSpa/ClientApp/app/components/navmenu/navmenu.html b/templates/AureliaSpa/ClientApp/app/components/navmenu/navmenu.html index 38b97f9c..a604b7e8 100644 --- a/templates/AureliaSpa/ClientApp/app/components/navmenu/navmenu.html +++ b/templates/AureliaSpa/ClientApp/app/components/navmenu/navmenu.html @@ -9,7 +9,7 @@ - Aurelia + WebApplicationBasic
    diff --git a/templates/AureliaSpa/Controllers/HomeController.cs b/templates/AureliaSpa/Controllers/HomeController.cs index 9d75da88..2889abd9 100644 --- a/templates/AureliaSpa/Controllers/HomeController.cs +++ b/templates/AureliaSpa/Controllers/HomeController.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Diagnostics; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; @@ -15,6 +16,7 @@ public IActionResult Index() public IActionResult Error() { + ViewData["RequestId"] = Activity.Current?.Id ?? HttpContext.TraceIdentifier; return View(); } } diff --git a/templates/AureliaSpa/Program.cs b/templates/AureliaSpa/Program.cs index 193f1e2a..e1e634e4 100644 --- a/templates/AureliaSpa/Program.cs +++ b/templates/AureliaSpa/Program.cs @@ -3,7 +3,10 @@ using System.IO; using System.Linq; using System.Threading.Tasks; +using Microsoft.AspNetCore; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Logging; namespace WebApplicationBasic { @@ -11,14 +14,12 @@ public class Program { public static void Main(string[] args) { - var host = new WebHostBuilder() - .UseKestrel() - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIISIntegration() + BuildWebHost(args).Run(); + } + + public static IWebHost BuildWebHost(string[] args) => + WebHost.CreateDefaultBuilder(args) .UseStartup() .Build(); - - host.Run(); - } } } diff --git a/templates/AureliaSpa/Startup.cs b/templates/AureliaSpa/Startup.cs index 4e801454..d381113d 100644 --- a/templates/AureliaSpa/Startup.cs +++ b/templates/AureliaSpa/Startup.cs @@ -7,42 +7,32 @@ using Microsoft.AspNetCore.SpaServices.Webpack; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; namespace WebApplicationBasic { public class Startup { - public Startup(IHostingEnvironment env) + public Startup(IConfiguration configuration) { - var builder = new ConfigurationBuilder() - .SetBasePath(env.ContentRootPath) - .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true) - .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true) - .AddEnvironmentVariables(); - Configuration = builder.Build(); + Configuration = configuration; } - public IConfigurationRoot Configuration { get; } + public IConfiguration Configuration { get; } // This method gets called by the runtime. Use this method to add services to the container. public void ConfigureServices(IServiceCollection services) { - // Add framework services. services.AddMvc(); } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) + public void Configure(IApplicationBuilder app, IHostingEnvironment env) { - loggerFactory.AddConsole(Configuration.GetSection("Logging")); - loggerFactory.AddDebug(); - if (env.IsDevelopment()) { app.UseDeveloperExceptionPage(); - - app.UseWebpackDevMiddleware(new WebpackDevMiddlewareOptions { + app.UseWebpackDevMiddleware(new WebpackDevMiddlewareOptions + { HotModuleReplacement = true }); } diff --git a/templates/AureliaSpa/Views/Shared/Error.cshtml b/templates/AureliaSpa/Views/Shared/Error.cshtml index 473b35d6..78e35d5d 100644 --- a/templates/AureliaSpa/Views/Shared/Error.cshtml +++ b/templates/AureliaSpa/Views/Shared/Error.cshtml @@ -4,3 +4,18 @@

    Error.

    An error occurred while processing your request.

    + +@if (!string.IsNullOrEmpty((string)ViewData["RequestId"])) +{ +

    + Request ID: @ViewData["RequestId"] +

    +} + +

    Development Mode

    +

    + Swapping to Development environment will display more detailed information about the error that occurred. +

    +

    + Development environment should not be enabled in deployed applications, as it can result in sensitive information from exceptions being displayed to end users. For local debugging, development environment can be enabled by setting the ASPNETCORE_ENVIRONMENT environment variable to Development, and restarting the application. +

    diff --git a/templates/AureliaSpa/Views/Shared/_Layout.cshtml b/templates/AureliaSpa/Views/Shared/_Layout.cshtml index 9daed473..d5b7a0f5 100644 --- a/templates/AureliaSpa/Views/Shared/_Layout.cshtml +++ b/templates/AureliaSpa/Views/Shared/_Layout.cshtml @@ -1,15 +1,16 @@ - - - - @ViewData["Title"] - Aurelia + + + + @ViewData["Title"] - WebApplicationBasic + - - - - @RenderBody() + + + + @RenderBody() - @RenderSection("scripts", required: false) - + @RenderSection("scripts", required: false) + diff --git a/templates/AureliaSpa/Views/_ViewImports.cshtml b/templates/AureliaSpa/Views/_ViewImports.cshtml index e7b4f83f..8edbc68c 100644 --- a/templates/AureliaSpa/Views/_ViewImports.cshtml +++ b/templates/AureliaSpa/Views/_ViewImports.cshtml @@ -1,3 +1,3 @@ @using WebApplicationBasic -@addTagHelper "*, Microsoft.AspNetCore.Mvc.TagHelpers" -@addTagHelper "*, Microsoft.AspNetCore.SpaServices" +@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers +@addTagHelper *, Microsoft.AspNetCore.SpaServices diff --git a/templates/AureliaSpa/appsettings.Development.json b/templates/AureliaSpa/appsettings.Development.json new file mode 100644 index 00000000..457e0033 --- /dev/null +++ b/templates/AureliaSpa/appsettings.Development.json @@ -0,0 +1,19 @@ +{ + "Logging": { + "IncludeScopes": false, + "Debug": { + "LogLevel": { + "Default": "Debug", + "System": "Information", + "Microsoft": "Information" + } + }, + "Console": { + "LogLevel": { + "Default": "Debug", + "System": "Information", + "Microsoft": "Information" + } + } + } +} diff --git a/templates/AureliaSpa/appsettings.json b/templates/AureliaSpa/appsettings.json index 723c096a..c851e129 100644 --- a/templates/AureliaSpa/appsettings.json +++ b/templates/AureliaSpa/appsettings.json @@ -1,10 +1,15 @@ { "Logging": { "IncludeScopes": false, - "LogLevel": { - "Default": "Debug", - "System": "Information", - "Microsoft": "Information" + "Debug": { + "LogLevel": { + "Default": "Warning" + } + }, + "Console": { + "LogLevel": { + "Default": "Warning" + } } } } diff --git a/templates/KnockoutSpa/Controllers/HomeController.cs b/templates/KnockoutSpa/Controllers/HomeController.cs index 9d75da88..2889abd9 100755 --- a/templates/KnockoutSpa/Controllers/HomeController.cs +++ b/templates/KnockoutSpa/Controllers/HomeController.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Diagnostics; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; @@ -15,6 +16,7 @@ public IActionResult Index() public IActionResult Error() { + ViewData["RequestId"] = Activity.Current?.Id ?? HttpContext.TraceIdentifier; return View(); } } diff --git a/templates/KnockoutSpa/KnockoutSpa.csproj b/templates/KnockoutSpa/KnockoutSpa.csproj index 11c64e1b..83fa7d32 100644 --- a/templates/KnockoutSpa/KnockoutSpa.csproj +++ b/templates/KnockoutSpa/KnockoutSpa.csproj @@ -1,20 +1,20 @@ - + + netcoreapp2.0 true - false + $(PackageTargetFallback);portable-net45+win8+wp8+wpa81; + - - + - - + - - + + @@ -30,4 +30,5 @@ + \ No newline at end of file diff --git a/templates/KnockoutSpa/Program.cs b/templates/KnockoutSpa/Program.cs index 193f1e2a..e1e634e4 100644 --- a/templates/KnockoutSpa/Program.cs +++ b/templates/KnockoutSpa/Program.cs @@ -3,7 +3,10 @@ using System.IO; using System.Linq; using System.Threading.Tasks; +using Microsoft.AspNetCore; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Logging; namespace WebApplicationBasic { @@ -11,14 +14,12 @@ public class Program { public static void Main(string[] args) { - var host = new WebHostBuilder() - .UseKestrel() - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIISIntegration() + BuildWebHost(args).Run(); + } + + public static IWebHost BuildWebHost(string[] args) => + WebHost.CreateDefaultBuilder(args) .UseStartup() .Build(); - - host.Run(); - } } } diff --git a/templates/KnockoutSpa/Startup.cs b/templates/KnockoutSpa/Startup.cs index ab353f09..d381113d 100755 --- a/templates/KnockoutSpa/Startup.cs +++ b/templates/KnockoutSpa/Startup.cs @@ -7,37 +7,27 @@ using Microsoft.AspNetCore.SpaServices.Webpack; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; namespace WebApplicationBasic { public class Startup { - public Startup(IHostingEnvironment env) + public Startup(IConfiguration configuration) { - var builder = new ConfigurationBuilder() - .SetBasePath(env.ContentRootPath) - .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true) - .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true) - .AddEnvironmentVariables(); - Configuration = builder.Build(); + Configuration = configuration; } - public IConfigurationRoot Configuration { get; } + public IConfiguration Configuration { get; } // This method gets called by the runtime. Use this method to add services to the container. public void ConfigureServices(IServiceCollection services) { - // Add framework services. services.AddMvc(); } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) + public void Configure(IApplicationBuilder app, IHostingEnvironment env) { - loggerFactory.AddConsole(Configuration.GetSection("Logging")); - loggerFactory.AddDebug(); - if (env.IsDevelopment()) { app.UseDeveloperExceptionPage(); diff --git a/templates/KnockoutSpa/Views/Shared/Error.cshtml b/templates/KnockoutSpa/Views/Shared/Error.cshtml index 473b35d6..78e35d5d 100755 --- a/templates/KnockoutSpa/Views/Shared/Error.cshtml +++ b/templates/KnockoutSpa/Views/Shared/Error.cshtml @@ -4,3 +4,18 @@

    Error.

    An error occurred while processing your request.

    + +@if (!string.IsNullOrEmpty((string)ViewData["RequestId"])) +{ +

    + Request ID: @ViewData["RequestId"] +

    +} + +

    Development Mode

    +

    + Swapping to Development environment will display more detailed information about the error that occurred. +

    +

    + Development environment should not be enabled in deployed applications, as it can result in sensitive information from exceptions being displayed to end users. For local debugging, development environment can be enabled by setting the ASPNETCORE_ENVIRONMENT environment variable to Development, and restarting the application. +

    diff --git a/templates/KnockoutSpa/Views/Shared/_Layout.cshtml b/templates/KnockoutSpa/Views/Shared/_Layout.cshtml index a770ceb4..2860f315 100644 --- a/templates/KnockoutSpa/Views/Shared/_Layout.cshtml +++ b/templates/KnockoutSpa/Views/Shared/_Layout.cshtml @@ -1,19 +1,20 @@ - - - - @ViewData["Title"] - WebApplicationBasic + + + + @ViewData["Title"] - WebApplicationBasic + - - - - - - - @RenderBody() + + + + + + + @RenderBody() - - @RenderSection("scripts", required: false) - + + @RenderSection("scripts", required: false) + diff --git a/templates/KnockoutSpa/Views/_ViewImports.cshtml b/templates/KnockoutSpa/Views/_ViewImports.cshtml index e7b4f83f..8edbc68c 100755 --- a/templates/KnockoutSpa/Views/_ViewImports.cshtml +++ b/templates/KnockoutSpa/Views/_ViewImports.cshtml @@ -1,3 +1,3 @@ @using WebApplicationBasic -@addTagHelper "*, Microsoft.AspNetCore.Mvc.TagHelpers" -@addTagHelper "*, Microsoft.AspNetCore.SpaServices" +@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers +@addTagHelper *, Microsoft.AspNetCore.SpaServices diff --git a/templates/KnockoutSpa/appsettings.Development.json b/templates/KnockoutSpa/appsettings.Development.json new file mode 100644 index 00000000..457e0033 --- /dev/null +++ b/templates/KnockoutSpa/appsettings.Development.json @@ -0,0 +1,19 @@ +{ + "Logging": { + "IncludeScopes": false, + "Debug": { + "LogLevel": { + "Default": "Debug", + "System": "Information", + "Microsoft": "Information" + } + }, + "Console": { + "LogLevel": { + "Default": "Debug", + "System": "Information", + "Microsoft": "Information" + } + } + } +} diff --git a/templates/KnockoutSpa/appsettings.json b/templates/KnockoutSpa/appsettings.json index 723c096a..c851e129 100755 --- a/templates/KnockoutSpa/appsettings.json +++ b/templates/KnockoutSpa/appsettings.json @@ -1,10 +1,15 @@ { "Logging": { "IncludeScopes": false, - "LogLevel": { - "Default": "Debug", - "System": "Information", - "Microsoft": "Information" + "Debug": { + "LogLevel": { + "Default": "Warning" + } + }, + "Console": { + "LogLevel": { + "Default": "Warning" + } } } } diff --git a/templates/KnockoutSpa/web.config b/templates/KnockoutSpa/web.config deleted file mode 100644 index a8d66727..00000000 --- a/templates/KnockoutSpa/web.config +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - diff --git a/templates/ReactReduxSpa/Controllers/HomeController.cs b/templates/ReactReduxSpa/Controllers/HomeController.cs index 9d75da88..2889abd9 100755 --- a/templates/ReactReduxSpa/Controllers/HomeController.cs +++ b/templates/ReactReduxSpa/Controllers/HomeController.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Diagnostics; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; @@ -15,6 +16,7 @@ public IActionResult Index() public IActionResult Error() { + ViewData["RequestId"] = Activity.Current?.Id ?? HttpContext.TraceIdentifier; return View(); } } diff --git a/templates/ReactReduxSpa/Program.cs b/templates/ReactReduxSpa/Program.cs index 193f1e2a..e1e634e4 100644 --- a/templates/ReactReduxSpa/Program.cs +++ b/templates/ReactReduxSpa/Program.cs @@ -3,7 +3,10 @@ using System.IO; using System.Linq; using System.Threading.Tasks; +using Microsoft.AspNetCore; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Logging; namespace WebApplicationBasic { @@ -11,14 +14,12 @@ public class Program { public static void Main(string[] args) { - var host = new WebHostBuilder() - .UseKestrel() - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIISIntegration() + BuildWebHost(args).Run(); + } + + public static IWebHost BuildWebHost(string[] args) => + WebHost.CreateDefaultBuilder(args) .UseStartup() .Build(); - - host.Run(); - } } } diff --git a/templates/ReactReduxSpa/ReactReduxSpa.csproj b/templates/ReactReduxSpa/ReactReduxSpa.csproj index b0cea30f..7e49bba2 100644 --- a/templates/ReactReduxSpa/ReactReduxSpa.csproj +++ b/templates/ReactReduxSpa/ReactReduxSpa.csproj @@ -1,23 +1,25 @@ - + + netcoreapp2.0 true - false + $(PackageTargetFallback);portable-net45+win8+wp8+wpa81; + - - + - - + - - + + + + @@ -33,4 +35,5 @@ + \ No newline at end of file diff --git a/templates/ReactReduxSpa/Startup.cs b/templates/ReactReduxSpa/Startup.cs index 750d79c0..740f1139 100755 --- a/templates/ReactReduxSpa/Startup.cs +++ b/templates/ReactReduxSpa/Startup.cs @@ -7,41 +7,32 @@ using Microsoft.AspNetCore.SpaServices.Webpack; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; namespace WebApplicationBasic { public class Startup { - public Startup(IHostingEnvironment env) + public Startup(IConfiguration configuration) { - var builder = new ConfigurationBuilder() - .SetBasePath(env.ContentRootPath) - .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true) - .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true) - .AddEnvironmentVariables(); - Configuration = builder.Build(); + Configuration = configuration; } - public IConfigurationRoot Configuration { get; } + public IConfiguration Configuration { get; } // This method gets called by the runtime. Use this method to add services to the container. public void ConfigureServices(IServiceCollection services) { - // Add framework services. services.AddMvc(); } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) + public void Configure(IApplicationBuilder app, IHostingEnvironment env) { - loggerFactory.AddConsole(Configuration.GetSection("Logging")); - loggerFactory.AddDebug(); - if (env.IsDevelopment()) { app.UseDeveloperExceptionPage(); - app.UseWebpackDevMiddleware(new WebpackDevMiddlewareOptions { + app.UseWebpackDevMiddleware(new WebpackDevMiddlewareOptions + { HotModuleReplacement = true, ReactHotModuleReplacement = true }); diff --git a/templates/ReactReduxSpa/Views/Shared/Error.cshtml b/templates/ReactReduxSpa/Views/Shared/Error.cshtml index 473b35d6..78e35d5d 100755 --- a/templates/ReactReduxSpa/Views/Shared/Error.cshtml +++ b/templates/ReactReduxSpa/Views/Shared/Error.cshtml @@ -4,3 +4,18 @@

    Error.

    An error occurred while processing your request.

    + +@if (!string.IsNullOrEmpty((string)ViewData["RequestId"])) +{ +

    + Request ID: @ViewData["RequestId"] +

    +} + +

    Development Mode

    +

    + Swapping to Development environment will display more detailed information about the error that occurred. +

    +

    + Development environment should not be enabled in deployed applications, as it can result in sensitive information from exceptions being displayed to end users. For local debugging, development environment can be enabled by setting the ASPNETCORE_ENVIRONMENT environment variable to Development, and restarting the application. +

    diff --git a/templates/ReactReduxSpa/Views/Shared/_Layout.cshtml b/templates/ReactReduxSpa/Views/Shared/_Layout.cshtml index 67338828..388f8f90 100644 --- a/templates/ReactReduxSpa/Views/Shared/_Layout.cshtml +++ b/templates/ReactReduxSpa/Views/Shared/_Layout.cshtml @@ -1,17 +1,18 @@ - - - - @ViewData["Title"] - WebApplicationBasic + + + + @ViewData["Title"] - WebApplicationBasic + - - - - - @RenderBody() + + + + + @RenderBody() - - @RenderSection("scripts", required: false) - + + @RenderSection("scripts", required: false) + diff --git a/templates/ReactReduxSpa/Views/_ViewImports.cshtml b/templates/ReactReduxSpa/Views/_ViewImports.cshtml index e7b4f83f..8edbc68c 100755 --- a/templates/ReactReduxSpa/Views/_ViewImports.cshtml +++ b/templates/ReactReduxSpa/Views/_ViewImports.cshtml @@ -1,3 +1,3 @@ @using WebApplicationBasic -@addTagHelper "*, Microsoft.AspNetCore.Mvc.TagHelpers" -@addTagHelper "*, Microsoft.AspNetCore.SpaServices" +@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers +@addTagHelper *, Microsoft.AspNetCore.SpaServices diff --git a/templates/ReactReduxSpa/appsettings.Development.json b/templates/ReactReduxSpa/appsettings.Development.json new file mode 100644 index 00000000..457e0033 --- /dev/null +++ b/templates/ReactReduxSpa/appsettings.Development.json @@ -0,0 +1,19 @@ +{ + "Logging": { + "IncludeScopes": false, + "Debug": { + "LogLevel": { + "Default": "Debug", + "System": "Information", + "Microsoft": "Information" + } + }, + "Console": { + "LogLevel": { + "Default": "Debug", + "System": "Information", + "Microsoft": "Information" + } + } + } +} diff --git a/templates/ReactReduxSpa/appsettings.json b/templates/ReactReduxSpa/appsettings.json index 723c096a..c851e129 100755 --- a/templates/ReactReduxSpa/appsettings.json +++ b/templates/ReactReduxSpa/appsettings.json @@ -1,10 +1,15 @@ { "Logging": { "IncludeScopes": false, - "LogLevel": { - "Default": "Debug", - "System": "Information", - "Microsoft": "Information" + "Debug": { + "LogLevel": { + "Default": "Warning" + } + }, + "Console": { + "LogLevel": { + "Default": "Warning" + } } } } diff --git a/templates/ReactReduxSpa/web.config b/templates/ReactReduxSpa/web.config deleted file mode 100644 index a8d66727..00000000 --- a/templates/ReactReduxSpa/web.config +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - diff --git a/templates/ReactSpa/Controllers/HomeController.cs b/templates/ReactSpa/Controllers/HomeController.cs index 9d75da88..2889abd9 100755 --- a/templates/ReactSpa/Controllers/HomeController.cs +++ b/templates/ReactSpa/Controllers/HomeController.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Diagnostics; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; @@ -15,6 +16,7 @@ public IActionResult Index() public IActionResult Error() { + ViewData["RequestId"] = Activity.Current?.Id ?? HttpContext.TraceIdentifier; return View(); } } diff --git a/templates/ReactSpa/Program.cs b/templates/ReactSpa/Program.cs index 193f1e2a..e1e634e4 100644 --- a/templates/ReactSpa/Program.cs +++ b/templates/ReactSpa/Program.cs @@ -3,7 +3,10 @@ using System.IO; using System.Linq; using System.Threading.Tasks; +using Microsoft.AspNetCore; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Logging; namespace WebApplicationBasic { @@ -11,14 +14,12 @@ public class Program { public static void Main(string[] args) { - var host = new WebHostBuilder() - .UseKestrel() - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIISIntegration() + BuildWebHost(args).Run(); + } + + public static IWebHost BuildWebHost(string[] args) => + WebHost.CreateDefaultBuilder(args) .UseStartup() .Build(); - - host.Run(); - } } } diff --git a/templates/ReactSpa/ReactSpa.csproj b/templates/ReactSpa/ReactSpa.csproj index 11c64e1b..83fa7d32 100644 --- a/templates/ReactSpa/ReactSpa.csproj +++ b/templates/ReactSpa/ReactSpa.csproj @@ -1,20 +1,20 @@ - + + netcoreapp2.0 true - false + $(PackageTargetFallback);portable-net45+win8+wp8+wpa81; + - - + - - + - - + + @@ -30,4 +30,5 @@ + \ No newline at end of file diff --git a/templates/ReactSpa/Startup.cs b/templates/ReactSpa/Startup.cs index 750d79c0..740f1139 100755 --- a/templates/ReactSpa/Startup.cs +++ b/templates/ReactSpa/Startup.cs @@ -7,41 +7,32 @@ using Microsoft.AspNetCore.SpaServices.Webpack; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; namespace WebApplicationBasic { public class Startup { - public Startup(IHostingEnvironment env) + public Startup(IConfiguration configuration) { - var builder = new ConfigurationBuilder() - .SetBasePath(env.ContentRootPath) - .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true) - .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true) - .AddEnvironmentVariables(); - Configuration = builder.Build(); + Configuration = configuration; } - public IConfigurationRoot Configuration { get; } + public IConfiguration Configuration { get; } // This method gets called by the runtime. Use this method to add services to the container. public void ConfigureServices(IServiceCollection services) { - // Add framework services. services.AddMvc(); } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) + public void Configure(IApplicationBuilder app, IHostingEnvironment env) { - loggerFactory.AddConsole(Configuration.GetSection("Logging")); - loggerFactory.AddDebug(); - if (env.IsDevelopment()) { app.UseDeveloperExceptionPage(); - app.UseWebpackDevMiddleware(new WebpackDevMiddlewareOptions { + app.UseWebpackDevMiddleware(new WebpackDevMiddlewareOptions + { HotModuleReplacement = true, ReactHotModuleReplacement = true }); diff --git a/templates/ReactSpa/Views/Shared/Error.cshtml b/templates/ReactSpa/Views/Shared/Error.cshtml index 473b35d6..78e35d5d 100755 --- a/templates/ReactSpa/Views/Shared/Error.cshtml +++ b/templates/ReactSpa/Views/Shared/Error.cshtml @@ -4,3 +4,18 @@

    Error.

    An error occurred while processing your request.

    + +@if (!string.IsNullOrEmpty((string)ViewData["RequestId"])) +{ +

    + Request ID: @ViewData["RequestId"] +

    +} + +

    Development Mode

    +

    + Swapping to Development environment will display more detailed information about the error that occurred. +

    +

    + Development environment should not be enabled in deployed applications, as it can result in sensitive information from exceptions being displayed to end users. For local debugging, development environment can be enabled by setting the ASPNETCORE_ENVIRONMENT environment variable to Development, and restarting the application. +

    diff --git a/templates/ReactSpa/Views/Shared/_Layout.cshtml b/templates/ReactSpa/Views/Shared/_Layout.cshtml index a770ceb4..2860f315 100644 --- a/templates/ReactSpa/Views/Shared/_Layout.cshtml +++ b/templates/ReactSpa/Views/Shared/_Layout.cshtml @@ -1,19 +1,20 @@ - - - - @ViewData["Title"] - WebApplicationBasic + + + + @ViewData["Title"] - WebApplicationBasic + - - - - - - - @RenderBody() + + + + + + + @RenderBody() - - @RenderSection("scripts", required: false) - + + @RenderSection("scripts", required: false) + diff --git a/templates/ReactSpa/Views/_ViewImports.cshtml b/templates/ReactSpa/Views/_ViewImports.cshtml index e7b4f83f..8edbc68c 100755 --- a/templates/ReactSpa/Views/_ViewImports.cshtml +++ b/templates/ReactSpa/Views/_ViewImports.cshtml @@ -1,3 +1,3 @@ @using WebApplicationBasic -@addTagHelper "*, Microsoft.AspNetCore.Mvc.TagHelpers" -@addTagHelper "*, Microsoft.AspNetCore.SpaServices" +@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers +@addTagHelper *, Microsoft.AspNetCore.SpaServices diff --git a/templates/ReactSpa/appsettings.Development.json b/templates/ReactSpa/appsettings.Development.json new file mode 100644 index 00000000..457e0033 --- /dev/null +++ b/templates/ReactSpa/appsettings.Development.json @@ -0,0 +1,19 @@ +{ + "Logging": { + "IncludeScopes": false, + "Debug": { + "LogLevel": { + "Default": "Debug", + "System": "Information", + "Microsoft": "Information" + } + }, + "Console": { + "LogLevel": { + "Default": "Debug", + "System": "Information", + "Microsoft": "Information" + } + } + } +} diff --git a/templates/ReactSpa/appsettings.json b/templates/ReactSpa/appsettings.json index 723c096a..c851e129 100755 --- a/templates/ReactSpa/appsettings.json +++ b/templates/ReactSpa/appsettings.json @@ -1,10 +1,15 @@ { "Logging": { "IncludeScopes": false, - "LogLevel": { - "Default": "Debug", - "System": "Information", - "Microsoft": "Information" + "Debug": { + "LogLevel": { + "Default": "Warning" + } + }, + "Console": { + "LogLevel": { + "Default": "Warning" + } } } } diff --git a/templates/ReactSpa/web.config b/templates/ReactSpa/web.config deleted file mode 100644 index a8d66727..00000000 --- a/templates/ReactSpa/web.config +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - diff --git a/templates/VueSpa/ClientApp/boot.ts b/templates/VueSpa/ClientApp/boot.ts index 6349e8d0..b95bd381 100644 --- a/templates/VueSpa/ClientApp/boot.ts +++ b/templates/VueSpa/ClientApp/boot.ts @@ -1,3 +1,4 @@ +import './css/site.css'; import 'bootstrap'; import Vue from 'vue'; import VueRouter from 'vue-router'; diff --git a/templates/VueSpa/ClientApp/components/navmenu/navmenu.css b/templates/VueSpa/ClientApp/components/navmenu/navmenu.css index b57445c8..b7404b41 100644 --- a/templates/VueSpa/ClientApp/components/navmenu/navmenu.css +++ b/templates/VueSpa/ClientApp/components/navmenu/navmenu.css @@ -19,13 +19,6 @@ z-index: 1; } -@media (max-width: 767px) { - /* On small screens, the nav menu spans the full width of the screen. Leave a space for it. */ - body { - padding-top: 50px; - } -} - @media (min-width: 768px) { /* On small screens, convert the nav menu to a vertical sidebar */ .main-nav { diff --git a/templates/VueSpa/ClientApp/css/site.css b/templates/VueSpa/ClientApp/css/site.css new file mode 100644 index 00000000..41bc86f8 --- /dev/null +++ b/templates/VueSpa/ClientApp/css/site.css @@ -0,0 +1,6 @@ +@media (max-width: 767px) { + /* On small screens, the nav menu spans the full width of the screen. Leave a space for it. */ + body { + padding-top: 50px; + } +} \ No newline at end of file diff --git a/templates/VueSpa/Controllers/HomeController.cs b/templates/VueSpa/Controllers/HomeController.cs index 9d75da88..2889abd9 100644 --- a/templates/VueSpa/Controllers/HomeController.cs +++ b/templates/VueSpa/Controllers/HomeController.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Diagnostics; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; @@ -15,6 +16,7 @@ public IActionResult Index() public IActionResult Error() { + ViewData["RequestId"] = Activity.Current?.Id ?? HttpContext.TraceIdentifier; return View(); } } diff --git a/templates/VueSpa/Program.cs b/templates/VueSpa/Program.cs index 193f1e2a..e1e634e4 100644 --- a/templates/VueSpa/Program.cs +++ b/templates/VueSpa/Program.cs @@ -3,7 +3,10 @@ using System.IO; using System.Linq; using System.Threading.Tasks; +using Microsoft.AspNetCore; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Logging; namespace WebApplicationBasic { @@ -11,14 +14,12 @@ public class Program { public static void Main(string[] args) { - var host = new WebHostBuilder() - .UseKestrel() - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIISIntegration() + BuildWebHost(args).Run(); + } + + public static IWebHost BuildWebHost(string[] args) => + WebHost.CreateDefaultBuilder(args) .UseStartup() .Build(); - - host.Run(); - } } } diff --git a/templates/VueSpa/Startup.cs b/templates/VueSpa/Startup.cs index e5d73ed6..d381113d 100644 --- a/templates/VueSpa/Startup.cs +++ b/templates/VueSpa/Startup.cs @@ -7,41 +7,32 @@ using Microsoft.AspNetCore.SpaServices.Webpack; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; namespace WebApplicationBasic { public class Startup { - public Startup(IHostingEnvironment env) + public Startup(IConfiguration configuration) { - var builder = new ConfigurationBuilder() - .SetBasePath(env.ContentRootPath) - .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true) - .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true) - .AddEnvironmentVariables(); - Configuration = builder.Build(); + Configuration = configuration; } - public IConfigurationRoot Configuration { get; } + public IConfiguration Configuration { get; } // This method gets called by the runtime. Use this method to add services to the container. public void ConfigureServices(IServiceCollection services) { - // Add framework services. services.AddMvc(); } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) + public void Configure(IApplicationBuilder app, IHostingEnvironment env) { - loggerFactory.AddConsole(Configuration.GetSection("Logging")); - loggerFactory.AddDebug(); - if (env.IsDevelopment()) { app.UseDeveloperExceptionPage(); - app.UseWebpackDevMiddleware(new WebpackDevMiddlewareOptions { + app.UseWebpackDevMiddleware(new WebpackDevMiddlewareOptions + { HotModuleReplacement = true }); } diff --git a/templates/VueSpa/Views/Shared/Error.cshtml b/templates/VueSpa/Views/Shared/Error.cshtml index 473b35d6..78e35d5d 100644 --- a/templates/VueSpa/Views/Shared/Error.cshtml +++ b/templates/VueSpa/Views/Shared/Error.cshtml @@ -4,3 +4,18 @@

    Error.

    An error occurred while processing your request.

    + +@if (!string.IsNullOrEmpty((string)ViewData["RequestId"])) +{ +

    + Request ID: @ViewData["RequestId"] +

    +} + +

    Development Mode

    +

    + Swapping to Development environment will display more detailed information about the error that occurred. +

    +

    + Development environment should not be enabled in deployed applications, as it can result in sensitive information from exceptions being displayed to end users. For local debugging, development environment can be enabled by setting the ASPNETCORE_ENVIRONMENT environment variable to Development, and restarting the application. +

    diff --git a/templates/VueSpa/Views/Shared/_Layout.cshtml b/templates/VueSpa/Views/Shared/_Layout.cshtml index 562914fc..2860f315 100644 --- a/templates/VueSpa/Views/Shared/_Layout.cshtml +++ b/templates/VueSpa/Views/Shared/_Layout.cshtml @@ -1,16 +1,20 @@ - - - - @ViewData["Title"] - WebApplicationBasic + + + + @ViewData["Title"] - WebApplicationBasic + - - - - @RenderBody() + + + + + + + @RenderBody() - - @RenderSection("scripts", required: false) - + + @RenderSection("scripts", required: false) + diff --git a/templates/VueSpa/Views/_ViewImports.cshtml b/templates/VueSpa/Views/_ViewImports.cshtml index e7b4f83f..8edbc68c 100644 --- a/templates/VueSpa/Views/_ViewImports.cshtml +++ b/templates/VueSpa/Views/_ViewImports.cshtml @@ -1,3 +1,3 @@ @using WebApplicationBasic -@addTagHelper "*, Microsoft.AspNetCore.Mvc.TagHelpers" -@addTagHelper "*, Microsoft.AspNetCore.SpaServices" +@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers +@addTagHelper *, Microsoft.AspNetCore.SpaServices diff --git a/templates/VueSpa/VueSpa.csproj b/templates/VueSpa/VueSpa.csproj index 11c64e1b..83fa7d32 100644 --- a/templates/VueSpa/VueSpa.csproj +++ b/templates/VueSpa/VueSpa.csproj @@ -1,20 +1,20 @@ - + + netcoreapp2.0 true - false + $(PackageTargetFallback);portable-net45+win8+wp8+wpa81; + - - + - - + - - + + @@ -30,4 +30,5 @@ + \ No newline at end of file diff --git a/templates/VueSpa/appsettings.Development.json b/templates/VueSpa/appsettings.Development.json new file mode 100644 index 00000000..457e0033 --- /dev/null +++ b/templates/VueSpa/appsettings.Development.json @@ -0,0 +1,19 @@ +{ + "Logging": { + "IncludeScopes": false, + "Debug": { + "LogLevel": { + "Default": "Debug", + "System": "Information", + "Microsoft": "Information" + } + }, + "Console": { + "LogLevel": { + "Default": "Debug", + "System": "Information", + "Microsoft": "Information" + } + } + } +} diff --git a/templates/VueSpa/appsettings.json b/templates/VueSpa/appsettings.json index 723c096a..c851e129 100644 --- a/templates/VueSpa/appsettings.json +++ b/templates/VueSpa/appsettings.json @@ -1,10 +1,15 @@ { "Logging": { "IncludeScopes": false, - "LogLevel": { - "Default": "Debug", - "System": "Information", - "Microsoft": "Information" + "Debug": { + "LogLevel": { + "Default": "Warning" + } + }, + "Console": { + "LogLevel": { + "Default": "Warning" + } } } } diff --git a/templates/VueSpa/web.config b/templates/VueSpa/web.config deleted file mode 100644 index a8d66727..00000000 --- a/templates/VueSpa/web.config +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - diff --git a/templates/VueSpa/webpack.config.js b/templates/VueSpa/webpack.config.js index 6bfda964..d4153779 100644 --- a/templates/VueSpa/webpack.config.js +++ b/templates/VueSpa/webpack.config.js @@ -45,7 +45,8 @@ module.exports = (env) => { }) ] : [ // Plugins that apply in production builds only - new webpack.optimize.UglifyJsPlugin() + new webpack.optimize.UglifyJsPlugin(), + new ExtractTextPlugin('site.css') ]) }]; }; From b091932e10c7a8c7b90fc9a363f8935828992f83 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Fri, 19 May 2017 12:00:22 +0100 Subject: [PATCH 080/411] Temporarily remove templates from .sln to avoid dependency cycle --- JavaScriptServices.sln | 42 ------------------------------------------ 1 file changed, 42 deletions(-) diff --git a/JavaScriptServices.sln b/JavaScriptServices.sln index e401470b..f1dd9654 100644 --- a/JavaScriptServices.sln +++ b/JavaScriptServices.sln @@ -30,24 +30,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NodeServicesExamples", "sam EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "templates", "templates", "{1598B415-73F1-4B37-B3B4-0A10677ABB2D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KnockoutSpa", "templates\KnockoutSpa\KnockoutSpa.csproj", "{F60248B1-940E-43FB-BEA0-589362AA6320}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AngularSpa", "templates\AngularSpa\AngularSpa.csproj", "{4D4B84C9-13F7-40CA-B05A-DC98FD6019AC}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AureliaSpa", "templates\AureliaSpa\AureliaSpa.csproj", "{4D57B6E1-7141-48ED-959E-872BDD4A2F72}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactSpa", "templates\ReactSpa\ReactSpa.csproj", "{868A630E-C61B-4807-B7A8-7EB53BE1C28A}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactReduxSpa", "templates\ReactReduxSpa\ReactReduxSpa.csproj", "{9D4D15A1-A25B-44EC-AB63-F1CE9986712E}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{E415FE14-13B0-469F-836D-95059E6BAA6E}" ProjectSection(SolutionItems) = preProject src\build\common.props = src\build\common.props src\build\Key.snk = src\build\Key.snk EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VueSpa", "templates\VueSpa\VueSpa.csproj", "{49D7665A-20EC-43FC-B8E8-EA0204F2D8C3}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -78,30 +66,6 @@ Global {93EFCC5F-C6EE-4623-894F-A42B22C0B6FE}.Debug|Any CPU.Build.0 = Debug|Any CPU {93EFCC5F-C6EE-4623-894F-A42B22C0B6FE}.Release|Any CPU.ActiveCfg = Release|Any CPU {93EFCC5F-C6EE-4623-894F-A42B22C0B6FE}.Release|Any CPU.Build.0 = Release|Any CPU - {F60248B1-940E-43FB-BEA0-589362AA6320}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F60248B1-940E-43FB-BEA0-589362AA6320}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F60248B1-940E-43FB-BEA0-589362AA6320}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F60248B1-940E-43FB-BEA0-589362AA6320}.Release|Any CPU.Build.0 = Release|Any CPU - {4D4B84C9-13F7-40CA-B05A-DC98FD6019AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4D4B84C9-13F7-40CA-B05A-DC98FD6019AC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4D4B84C9-13F7-40CA-B05A-DC98FD6019AC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4D4B84C9-13F7-40CA-B05A-DC98FD6019AC}.Release|Any CPU.Build.0 = Release|Any CPU - {4D57B6E1-7141-48ED-959E-872BDD4A2F72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4D57B6E1-7141-48ED-959E-872BDD4A2F72}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4D57B6E1-7141-48ED-959E-872BDD4A2F72}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4D57B6E1-7141-48ED-959E-872BDD4A2F72}.Release|Any CPU.Build.0 = Release|Any CPU - {868A630E-C61B-4807-B7A8-7EB53BE1C28A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {868A630E-C61B-4807-B7A8-7EB53BE1C28A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {868A630E-C61B-4807-B7A8-7EB53BE1C28A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {868A630E-C61B-4807-B7A8-7EB53BE1C28A}.Release|Any CPU.Build.0 = Release|Any CPU - {9D4D15A1-A25B-44EC-AB63-F1CE9986712E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9D4D15A1-A25B-44EC-AB63-F1CE9986712E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9D4D15A1-A25B-44EC-AB63-F1CE9986712E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9D4D15A1-A25B-44EC-AB63-F1CE9986712E}.Release|Any CPU.Build.0 = Release|Any CPU - {49D7665A-20EC-43FC-B8E8-EA0204F2D8C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {49D7665A-20EC-43FC-B8E8-EA0204F2D8C3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {49D7665A-20EC-43FC-B8E8-EA0204F2D8C3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {49D7665A-20EC-43FC-B8E8-EA0204F2D8C3}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -114,11 +78,5 @@ Global {1931B19A-EC42-4D56-B2D0-FB06D17244DA} = {E6A161EA-646C-4033-9090-95BE809AB8D9} {DE479DC3-1461-4EAD-A188-4AF7AA4AE344} = {E6A161EA-646C-4033-9090-95BE809AB8D9} {93EFCC5F-C6EE-4623-894F-A42B22C0B6FE} = {E6A161EA-646C-4033-9090-95BE809AB8D9} - {F60248B1-940E-43FB-BEA0-589362AA6320} = {1598B415-73F1-4B37-B3B4-0A10677ABB2D} - {4D4B84C9-13F7-40CA-B05A-DC98FD6019AC} = {1598B415-73F1-4B37-B3B4-0A10677ABB2D} - {4D57B6E1-7141-48ED-959E-872BDD4A2F72} = {1598B415-73F1-4B37-B3B4-0A10677ABB2D} - {868A630E-C61B-4807-B7A8-7EB53BE1C28A} = {1598B415-73F1-4B37-B3B4-0A10677ABB2D} - {9D4D15A1-A25B-44EC-AB63-F1CE9986712E} = {1598B415-73F1-4B37-B3B4-0A10677ABB2D} - {49D7665A-20EC-43FC-B8E8-EA0204F2D8C3} = {1598B415-73F1-4B37-B3B4-0A10677ABB2D} EndGlobalSection EndGlobal From 9e59ed4bc8ef8687ca3f39291f531915f7d92b58 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Fri, 19 May 2017 12:12:52 +0100 Subject: [PATCH 081/411] Put back false on template csproj files --- templates/AngularSpa/AngularSpa.csproj | 1 + templates/AureliaSpa/AureliaSpa.csproj | 1 + templates/KnockoutSpa/KnockoutSpa.csproj | 1 + templates/ReactReduxSpa/ReactReduxSpa.csproj | 1 + templates/ReactSpa/ReactSpa.csproj | 1 + templates/VueSpa/VueSpa.csproj | 1 + 6 files changed, 6 insertions(+) diff --git a/templates/AngularSpa/AngularSpa.csproj b/templates/AngularSpa/AngularSpa.csproj index 7e49bba2..a890e833 100644 --- a/templates/AngularSpa/AngularSpa.csproj +++ b/templates/AngularSpa/AngularSpa.csproj @@ -4,6 +4,7 @@ netcoreapp2.0 true $(PackageTargetFallback);portable-net45+win8+wp8+wpa81; + false diff --git a/templates/AureliaSpa/AureliaSpa.csproj b/templates/AureliaSpa/AureliaSpa.csproj index 83fa7d32..c74d7a10 100644 --- a/templates/AureliaSpa/AureliaSpa.csproj +++ b/templates/AureliaSpa/AureliaSpa.csproj @@ -4,6 +4,7 @@ netcoreapp2.0 true $(PackageTargetFallback);portable-net45+win8+wp8+wpa81; + false diff --git a/templates/KnockoutSpa/KnockoutSpa.csproj b/templates/KnockoutSpa/KnockoutSpa.csproj index 83fa7d32..c74d7a10 100644 --- a/templates/KnockoutSpa/KnockoutSpa.csproj +++ b/templates/KnockoutSpa/KnockoutSpa.csproj @@ -4,6 +4,7 @@ netcoreapp2.0 true $(PackageTargetFallback);portable-net45+win8+wp8+wpa81; + false diff --git a/templates/ReactReduxSpa/ReactReduxSpa.csproj b/templates/ReactReduxSpa/ReactReduxSpa.csproj index 7e49bba2..a890e833 100644 --- a/templates/ReactReduxSpa/ReactReduxSpa.csproj +++ b/templates/ReactReduxSpa/ReactReduxSpa.csproj @@ -4,6 +4,7 @@ netcoreapp2.0 true $(PackageTargetFallback);portable-net45+win8+wp8+wpa81; + false diff --git a/templates/ReactSpa/ReactSpa.csproj b/templates/ReactSpa/ReactSpa.csproj index 83fa7d32..c74d7a10 100644 --- a/templates/ReactSpa/ReactSpa.csproj +++ b/templates/ReactSpa/ReactSpa.csproj @@ -4,6 +4,7 @@ netcoreapp2.0 true $(PackageTargetFallback);portable-net45+win8+wp8+wpa81; + false diff --git a/templates/VueSpa/VueSpa.csproj b/templates/VueSpa/VueSpa.csproj index 83fa7d32..c74d7a10 100644 --- a/templates/VueSpa/VueSpa.csproj +++ b/templates/VueSpa/VueSpa.csproj @@ -4,6 +4,7 @@ netcoreapp2.0 true $(PackageTargetFallback);portable-net45+win8+wp8+wpa81; + false From a4512873f919db178e8eb9cf591b4c08a2235d9f Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Fri, 19 May 2017 14:57:13 +0100 Subject: [PATCH 082/411] Update templates' SpaServices dependency to 2.0.0-* --- templates/AngularSpa/AngularSpa.csproj | 2 +- templates/AureliaSpa/AureliaSpa.csproj | 2 +- templates/KnockoutSpa/KnockoutSpa.csproj | 2 +- templates/ReactReduxSpa/ReactReduxSpa.csproj | 2 +- templates/ReactSpa/ReactSpa.csproj | 2 +- templates/VueSpa/VueSpa.csproj | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/AngularSpa/AngularSpa.csproj b/templates/AngularSpa/AngularSpa.csproj index a890e833..fc625cd8 100644 --- a/templates/AngularSpa/AngularSpa.csproj +++ b/templates/AngularSpa/AngularSpa.csproj @@ -9,7 +9,7 @@ - + diff --git a/templates/AureliaSpa/AureliaSpa.csproj b/templates/AureliaSpa/AureliaSpa.csproj index c74d7a10..0471a276 100644 --- a/templates/AureliaSpa/AureliaSpa.csproj +++ b/templates/AureliaSpa/AureliaSpa.csproj @@ -9,7 +9,7 @@ - + diff --git a/templates/KnockoutSpa/KnockoutSpa.csproj b/templates/KnockoutSpa/KnockoutSpa.csproj index c74d7a10..0471a276 100644 --- a/templates/KnockoutSpa/KnockoutSpa.csproj +++ b/templates/KnockoutSpa/KnockoutSpa.csproj @@ -9,7 +9,7 @@ - + diff --git a/templates/ReactReduxSpa/ReactReduxSpa.csproj b/templates/ReactReduxSpa/ReactReduxSpa.csproj index a890e833..fc625cd8 100644 --- a/templates/ReactReduxSpa/ReactReduxSpa.csproj +++ b/templates/ReactReduxSpa/ReactReduxSpa.csproj @@ -9,7 +9,7 @@ - + diff --git a/templates/ReactSpa/ReactSpa.csproj b/templates/ReactSpa/ReactSpa.csproj index c74d7a10..0471a276 100644 --- a/templates/ReactSpa/ReactSpa.csproj +++ b/templates/ReactSpa/ReactSpa.csproj @@ -9,7 +9,7 @@ - + diff --git a/templates/VueSpa/VueSpa.csproj b/templates/VueSpa/VueSpa.csproj index c74d7a10..0471a276 100644 --- a/templates/VueSpa/VueSpa.csproj +++ b/templates/VueSpa/VueSpa.csproj @@ -9,7 +9,7 @@ - + From d5483f3b6458cd1cb266ad87990d4deb7de5c95c Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Fri, 19 May 2017 15:16:49 +0100 Subject: [PATCH 083/411] Add workaround for 'publish' tests failing since 2.0 update --- test/templates/util/aspnet.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/templates/util/aspnet.ts b/test/templates/util/aspnet.ts index d320fc20..ec315ef7 100644 --- a/test/templates/util/aspnet.ts +++ b/test/templates/util/aspnet.ts @@ -115,7 +115,11 @@ export class AspNetProcess { } export function publishProjectSync(sourceDir: string, outputDir: string) { - childProcess.execSync(`dotnet publish -c Release -o ${ outputDir }`, { + // Workaround for: MSB4018: The "ResolvePublishAssemblies" task failed unexpectedly + // TODO: Remove this when the framework issue is fixed + const aspNetCore20PublishWorkaround = '/p:TargetManifestFiles='; + + childProcess.execSync(`dotnet publish -c Release -o ${ outputDir } ${ aspNetCore20PublishWorkaround }`, { cwd: sourceDir, stdio: 'inherit', encoding: 'utf8' From ad645cbfe95c40882cff45e4a781ee720f68c393 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Fri, 19 May 2017 15:35:24 +0100 Subject: [PATCH 084/411] Remove build reference cycle caused by samples --- .../misc/NodeServicesExamples/NodeServicesExamples.csproj | 5 ++++- samples/misc/Webpack/Webpack.csproj | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/samples/misc/NodeServicesExamples/NodeServicesExamples.csproj b/samples/misc/NodeServicesExamples/NodeServicesExamples.csproj index e2d0753b..0604193d 100644 --- a/samples/misc/NodeServicesExamples/NodeServicesExamples.csproj +++ b/samples/misc/NodeServicesExamples/NodeServicesExamples.csproj @@ -13,8 +13,11 @@ - + + + + diff --git a/samples/misc/Webpack/Webpack.csproj b/samples/misc/Webpack/Webpack.csproj index d2606828..9cabae2f 100644 --- a/samples/misc/Webpack/Webpack.csproj +++ b/samples/misc/Webpack/Webpack.csproj @@ -13,8 +13,11 @@ - + + + + From 3645ae6cf27582f7672042002a7202b68b423715 Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Sun, 21 May 2017 22:29:19 -0700 Subject: [PATCH 085/411] Generate Documentation files --- .../Microsoft.AspNetCore.NodeServices.csproj | 1 + .../Microsoft.AspNetCore.SpaServices.csproj | 1 + 2 files changed, 2 insertions(+) diff --git a/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj b/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj index 0473d705..f5be3acb 100644 --- a/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj +++ b/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj @@ -7,6 +7,7 @@ netcoreapp2.0 aspnetcore;aspnetcoremvc;nodeservices true + true diff --git a/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj b/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj index 39839ed6..53d7c7b4 100644 --- a/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj +++ b/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj @@ -7,6 +7,7 @@ netcoreapp2.0 aspnetcore;aspnetcoremvc;nodeservices true + true From 941ae9a34d4f2ce54d2e6f365a52e77bd375bdf8 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Tue, 23 May 2017 10:06:35 +0100 Subject: [PATCH 086/411] Add postActions to "dotnet new" templates --- templates/package-builder/src/build/build.ts | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/templates/package-builder/src/build/build.ts b/templates/package-builder/src/build/build.ts index 7f935ee9..3299aeb3 100644 --- a/templates/package-builder/src/build/build.ts +++ b/templates/package-builder/src/build/build.ts @@ -167,6 +167,20 @@ function buildDotNetNewNuGetPackage() { } }, tags: { language: 'C#', type: 'project' }, + postActions: [{ + condition: '(!skipRestore)', + description: 'Restores NuGet packages required by this project.', + manualInstructions: [{ text: 'Run \'dotnet restore\'' }], + actionId: '210D431B-A78B-4D2F-B762-4ED3E3EA9025', + continueOnError: true + }, { + condition: '(!skipRestore)', + description: 'Restores NPM packages required by this project.', + manualInstructions: [{ text: 'Run \'npm install\'' }], + actionId: '3A7C4B45-1F5D-4A30-959A-51B88E82B5D2', + args: { executable: 'npm', args: 'install' }, + continueOnError: false + }], }, null, 2)); fs.writeFileSync(path.join(templateConfigDir, 'dotnetcli.host.json'), JSON.stringify({ From ad9cfbb1764d7e29f6025c66cee6301c4b8c523d Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Tue, 23 May 2017 10:08:41 +0100 Subject: [PATCH 087/411] Make quotes consistent --- templates/package-builder/src/build/build.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/templates/package-builder/src/build/build.ts b/templates/package-builder/src/build/build.ts index 3299aeb3..28303356 100644 --- a/templates/package-builder/src/build/build.ts +++ b/templates/package-builder/src/build/build.ts @@ -134,7 +134,7 @@ function buildDotNetNewNuGetPackage() { fs.writeFileSync(path.join(templateConfigDir, 'template.json'), JSON.stringify({ author: 'Microsoft', - classifications: ["Web", "MVC", "SPA"], + classifications: ['Web', 'MVC', 'SPA'], groupIdentity: `Microsoft.AspNetCore.SpaTemplates.${templateConfig.dotNetNewId}`, identity: `Microsoft.AspNetCore.SpaTemplates.${templateConfig.dotNetNewId}.CSharp`, name: `MVC ASP.NET Core with ${templateConfig.displayName}`, @@ -154,16 +154,16 @@ function buildDotNetNewNuGetPackage() { replaces: 'sdkVersionInjectedHere' }, Framework: { - type: "parameter", - description: "The target framework for the project.", - datatype: "choice", + type: 'parameter', + description: 'The target framework for the project.', + datatype: 'choice', choices: [ { - choice: "netcoreapp1.1", - description: "Target netcoreapp1.1" + choice: 'netcoreapp1.1', + description: 'Target netcoreapp1.1' } ], - defaultValue: "netcoreapp1.1" + defaultValue: 'netcoreapp1.1' } }, tags: { language: 'C#', type: 'project' }, From b9e62cd4c954cd7f155c17f99631ee31362ac80d Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Tue, 23 May 2017 11:18:51 +0100 Subject: [PATCH 088/411] Fix "dotnet new" postAction issues (and disable the "npm install" action) --- templates/package-builder/src/build/build.ts | 49 ++++++++++++++------ 1 file changed, 34 insertions(+), 15 deletions(-) diff --git a/templates/package-builder/src/build/build.ts b/templates/package-builder/src/build/build.ts index 28303356..d1858b69 100644 --- a/templates/package-builder/src/build/build.ts +++ b/templates/package-builder/src/build/build.ts @@ -164,27 +164,46 @@ function buildDotNetNewNuGetPackage() { } ], defaultValue: 'netcoreapp1.1' + }, + skipRestore: { + type: 'parameter', + datatype: 'bool', + description: 'If specified, skips the automatic restore of packages on project creation.', + defaultValue: 'false' } }, tags: { language: 'C#', type: 'project' }, - postActions: [{ - condition: '(!skipRestore)', - description: 'Restores NuGet packages required by this project.', - manualInstructions: [{ text: 'Run \'dotnet restore\'' }], - actionId: '210D431B-A78B-4D2F-B762-4ED3E3EA9025', - continueOnError: true - }, { - condition: '(!skipRestore)', - description: 'Restores NPM packages required by this project.', - manualInstructions: [{ text: 'Run \'npm install\'' }], - actionId: '3A7C4B45-1F5D-4A30-959A-51B88E82B5D2', - args: { executable: 'npm', args: 'install' }, - continueOnError: false - }], + postActions: [ + { + condition: '(!skipRestore)', + description: 'Restores NuGet packages required by this project.', + manualInstructions: [{ text: 'Run \'dotnet restore\'' }], + actionId: '210D431B-A78B-4D2F-B762-4ED3E3EA9025', + continueOnError: true + }, + /* + // Currently it doesn't appear to be possible to run `npm install` from a + // postAction, due to https://github.com/dotnet/templating/issues/849 + // We will re-enable this when that bug is fixed. + { + condition: '(!skipRestore)', + description: 'Restores NPM packages required by this project.', + manualInstructions: [{ text: 'Run \'npm install\'' }], + actionId: '3A7C4B45-1F5D-4A30-959A-51B88E82B5D2', + args: { executable: 'npm', args: 'install' }, + continueOnError: false + } + */ + ], }, null, 2)); fs.writeFileSync(path.join(templateConfigDir, 'dotnetcli.host.json'), JSON.stringify({ - symbolInfo: {} + symbolInfo: { + skipRestore: { + longName: 'no-restore', + shortName: '' + } + } }, null, 2)); fs.writeFileSync(path.join(templateConfigDir, 'vs-2017.3.host.json'), JSON.stringify({ From e1c90b3601282b01c9e2514681d286c91c536bc3 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Tue, 23 May 2017 11:20:04 +0100 Subject: [PATCH 089/411] Change "dotnet new" config choices to reference netcoreapp2.0 (not that it makes a difference when it's the only choice) --- templates/package-builder/src/build/build.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/package-builder/src/build/build.ts b/templates/package-builder/src/build/build.ts index d1858b69..62f8cc01 100644 --- a/templates/package-builder/src/build/build.ts +++ b/templates/package-builder/src/build/build.ts @@ -159,11 +159,11 @@ function buildDotNetNewNuGetPackage() { datatype: 'choice', choices: [ { - choice: 'netcoreapp1.1', - description: 'Target netcoreapp1.1' + choice: 'netcoreapp2.0', + description: 'Target netcoreapp2.0' } ], - defaultValue: 'netcoreapp1.1' + defaultValue: 'netcoreapp2.0' }, skipRestore: { type: 'parameter', From 918e7edbffe2737dd4a2208bb713149e29f8aa2e Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Tue, 23 May 2017 17:05:42 +0100 Subject: [PATCH 090/411] Remove global.json files from templates for consistency with stock MVC template. --- templates/AngularSpa/global.json | 3 --- templates/AureliaSpa/global.json | 3 --- templates/KnockoutSpa/global.json | 3 --- templates/ReactReduxSpa/global.json | 3 --- templates/ReactSpa/global.json | 3 --- templates/VueSpa/global.json | 3 --- templates/package-builder/src/build/build.ts | 8 +------- 7 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 templates/AngularSpa/global.json delete mode 100644 templates/AureliaSpa/global.json delete mode 100644 templates/KnockoutSpa/global.json delete mode 100644 templates/ReactReduxSpa/global.json delete mode 100644 templates/ReactSpa/global.json delete mode 100644 templates/VueSpa/global.json diff --git a/templates/AngularSpa/global.json b/templates/AngularSpa/global.json deleted file mode 100644 index 3b968e2a..00000000 --- a/templates/AngularSpa/global.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "sdk": { "version": "sdkVersionInjectedHere" } -} diff --git a/templates/AureliaSpa/global.json b/templates/AureliaSpa/global.json deleted file mode 100644 index 3b968e2a..00000000 --- a/templates/AureliaSpa/global.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "sdk": { "version": "sdkVersionInjectedHere" } -} diff --git a/templates/KnockoutSpa/global.json b/templates/KnockoutSpa/global.json deleted file mode 100644 index 3b968e2a..00000000 --- a/templates/KnockoutSpa/global.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "sdk": { "version": "sdkVersionInjectedHere" } -} diff --git a/templates/ReactReduxSpa/global.json b/templates/ReactReduxSpa/global.json deleted file mode 100644 index 3b968e2a..00000000 --- a/templates/ReactReduxSpa/global.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "sdk": { "version": "sdkVersionInjectedHere" } -} diff --git a/templates/ReactSpa/global.json b/templates/ReactSpa/global.json deleted file mode 100644 index 3b968e2a..00000000 --- a/templates/ReactSpa/global.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "sdk": { "version": "sdkVersionInjectedHere" } -} diff --git a/templates/VueSpa/global.json b/templates/VueSpa/global.json deleted file mode 100644 index 3b968e2a..00000000 --- a/templates/VueSpa/global.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "sdk": { "version": "sdkVersionInjectedHere" } -} diff --git a/templates/package-builder/src/build/build.ts b/templates/package-builder/src/build/build.ts index 62f8cc01..a9879cb7 100644 --- a/templates/package-builder/src/build/build.ts +++ b/templates/package-builder/src/build/build.ts @@ -95,8 +95,7 @@ function buildYeomanNpmPackage(outputRoot: string) { { from: /.*\.csproj$/, to: 'tokenreplace-namePascalCase.csproj' } ]; const contentReplacements = [ - // global.json items - { from: /sdkVersionInjectedHere/, to: '<%= sdkVersion %>' } + // Currently, there are none ]; _.forEach(templates, (templateConfig, templateName) => { const outputDir = path.join(outputTemplatesRoot, templateName); @@ -148,11 +147,6 @@ function buildDotNetNewNuGetPackage() { exclude: ['.template.config/**'] }], symbols: { - sdkVersion: { - type: 'bind', - binding: 'dotnet-cli-version', - replaces: 'sdkVersionInjectedHere' - }, Framework: { type: 'parameter', description: 'The target framework for the project.', From 6baa2faf0993585f515a085d3c987ce78550431f Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 24 May 2017 14:47:23 +0100 Subject: [PATCH 091/411] Split out built-in templates into new package Microsoft.DotNet.Web.Spa.ProjectTemplates --- templates/package-builder/src/build/build.ts | 85 +++++++++++-------- ...mplates.nuspec => templatePackages.nuspec} | 2 +- 2 files changed, 52 insertions(+), 35 deletions(-) rename templates/package-builder/src/dotnetnew/{Microsoft.AspNetCore.SpaTemplates.nuspec => templatePackages.nuspec} (93%) diff --git a/templates/package-builder/src/build/build.ts b/templates/package-builder/src/build/build.ts index a9879cb7..99ff5383 100644 --- a/templates/package-builder/src/build/build.ts +++ b/templates/package-builder/src/build/build.ts @@ -12,25 +12,28 @@ const isWindows = /^win/.test(process.platform); const textFileExtensions = ['.gitignore', 'template_gitignore', '.config', '.cs', '.cshtml', '.csproj', '.html', '.js', '.json', '.jsx', '.md', '.nuspec', '.ts', '.tsx']; const yeomanGeneratorSource = './src/yeoman'; -// To support the "dotnet new" templates, we want to bundle prebuilt dist dev-mode files, because "dotnet new" can't auto-run -// webpack on project creation. Note that these script entries are *not* the same as the project's usual prepublish -// scripts, because here we want dev-mode builds (e.g., to support HMR), not prod-mode builds. -const commonTemplatePrepublishSteps = [ - 'npm install', - 'node node_modules/webpack/bin/webpack.js --config webpack.config.vendor.js', - 'node node_modules/webpack/bin/webpack.js' -]; +const dotNetPackages = { + builtIn: 'Microsoft.DotNet.Web.Spa.ProjectTemplates', + extra: 'Microsoft.AspNetCore.SpaTemplates' +}; + const commonForceInclusionRegex = /^(wwwroot|ClientApp)\/dist\//; // Files to be included in template, even though gitignored -const templates: { [key: string]: { dir: string, dotNetNewId: string, displayName: string, prepublish?: string[], forceInclusion?: RegExp } } = { - 'angular': { dir: '../../templates/AngularSpa/', dotNetNewId: 'Angular', displayName: 'Angular' }, - 'aurelia': { dir: '../../templates/AureliaSpa/', dotNetNewId: 'Aurelia', displayName: 'Aurelia' }, - 'knockout': { dir: '../../templates/KnockoutSpa/', dotNetNewId: 'Knockout', displayName: 'Knockout.js' }, - 'react-redux': { dir: '../../templates/ReactReduxSpa/', dotNetNewId: 'ReactRedux', displayName: 'React.js and Redux' }, - 'react': { dir: '../../templates/ReactSpa/', dotNetNewId: 'React', displayName: 'React.js' }, - 'vue': { dir: '../../templates/VueSpa/', dotNetNewId: 'Vue', displayName: 'Vue.js' } -}; +interface TemplateConfig { + dir: string; + dotNetNewId: string; + dotNetPackageId: string; + displayName: string; +} +const templates: { [key: string]: TemplateConfig } = { + 'angular': { dotNetPackageId: dotNetPackages.builtIn, dir: '../../templates/AngularSpa/', dotNetNewId: 'Angular', displayName: 'Angular' }, + 'aurelia': { dotNetPackageId: dotNetPackages.extra, dir: '../../templates/AureliaSpa/', dotNetNewId: 'Aurelia', displayName: 'Aurelia' }, + 'knockout': { dotNetPackageId: dotNetPackages.extra, dir: '../../templates/KnockoutSpa/', dotNetNewId: 'Knockout', displayName: 'Knockout.js' }, + 'react-redux': { dotNetPackageId: dotNetPackages.builtIn, dir: '../../templates/ReactReduxSpa/', dotNetNewId: 'ReactRedux', displayName: 'React.js and Redux' }, + 'react': { dotNetPackageId: dotNetPackages.builtIn, dir: '../../templates/ReactSpa/', dotNetNewId: 'React', displayName: 'React.js' }, + 'vue': { dotNetPackageId: dotNetPackages.extra, dir: '../../templates/VueSpa/', dotNetNewId: 'Vue', displayName: 'Vue.js' } +}; function isTextFile(filename: string): boolean { return textFileExtensions.indexOf(path.extname(filename).toLowerCase()) >= 0 @@ -111,7 +114,17 @@ function buildYeomanNpmPackage(outputRoot: string) { rimraf.sync(tempRoot); } -function buildDotNetNewNuGetPackage() { +function buildDotNetNewNuGetPackages(outputDir: string) { + const dotNetPackageIds = _.values(dotNetPackages); + dotNetPackageIds.forEach(packageId => { + const dotNetNewNupkgPath = buildDotNetNewNuGetPackage(packageId); + + // Move the .nupkg file to the output dir + fs.renameSync(dotNetNewNupkgPath, path.join(outputDir, path.basename(dotNetNewNupkgPath))); + }); +} + +function buildDotNetNewNuGetPackage(packageId: string) { const outputRoot = './dist/dotnetnew'; rimraf.sync(outputRoot); @@ -124,6 +137,11 @@ function buildDotNetNewNuGetPackage() { ]; const contentReplacements = []; _.forEach(templates, (templateConfig, templateName) => { + // Only include templates matching the output package ID + if (templateConfig.dotNetPackageId !== packageId) { + return; + } + const templateOutputDir = path.join(outputRoot, 'Content', templateName); writeTemplate(templateConfig.dir, templateOutputDir, contentReplacements, filenameReplacements, commonForceInclusionRegex); @@ -134,8 +152,8 @@ function buildDotNetNewNuGetPackage() { fs.writeFileSync(path.join(templateConfigDir, 'template.json'), JSON.stringify({ author: 'Microsoft', classifications: ['Web', 'MVC', 'SPA'], - groupIdentity: `Microsoft.AspNetCore.SpaTemplates.${templateConfig.dotNetNewId}`, - identity: `Microsoft.AspNetCore.SpaTemplates.${templateConfig.dotNetNewId}.CSharp`, + groupIdentity: `${packageId}.${templateConfig.dotNetNewId}`, + identity: `${packageId}.${templateConfig.dotNetNewId}.CSharp`, name: `MVC ASP.NET Core with ${templateConfig.displayName}`, preferNameDirectory: true, primaryOutputs: [{ path: `${sourceProjectName}.csproj` }], @@ -213,8 +231,11 @@ function buildDotNetNewNuGetPackage() { // Invoke NuGet to create the final package const yeomanPackageVersion = JSON.parse(fs.readFileSync(path.join(yeomanGeneratorSource, 'package.json'), 'utf8')).version; writeTemplate('./src/dotnetnew', outputRoot, [ + { from: /\{packageId\}/g, to: packageId }, { from: /\{version\}/g, to: yeomanPackageVersion }, - ], [], null); + ], [ + { from: /.*\.nuspec$/, to: `${packageId}.nuspec` }, + ], null); const nugetExe = path.join(process.cwd(), './bin/NuGet.exe'); const nugetStartInfo = { cwd: outputRoot, stdio: 'inherit' }; if (isWindows) { @@ -233,19 +254,18 @@ function buildDotNetNewNuGetPackage() { function runAllPrepublishScripts() { Object.getOwnPropertyNames(templates).forEach(templateKey => { - const templateInfo = templates[templateKey]; - - // First run standard prepublish steps - runScripts(templateInfo.dir, commonTemplatePrepublishSteps); - - // Second, run any template-specific prepublish steps - if (templateInfo.prepublish) { - runScripts(templateInfo.dir, templateInfo.prepublish); - } + // To support the "dotnet new" templates, we want to bundle prebuilt dist dev-mode files, because "dotnet new" can't auto-run + // webpack on project creation. Note that these script entries are *not* the same as the project's usual prepublish + // scripts, because here we want dev-mode builds (e.g., to support HMR), not prod-mode builds. + runPrepublishScripts(templates[templateKey].dir, [ + 'npm install', + 'node node_modules/webpack/bin/webpack.js --config webpack.config.vendor.js', + 'node node_modules/webpack/bin/webpack.js' + ]); }); } -function runScripts(rootDir: string, scripts: string[]) { +function runPrepublishScripts(rootDir: string, scripts: string[]) { console.log(`[Prepublish] In directory: ${ rootDir }`); scripts.forEach(script => { console.log(`[Prepublish] Running: ${ script }`); @@ -262,10 +282,7 @@ rimraf.sync(distDir); mkdirp.sync(artifactsDir); runAllPrepublishScripts(); buildYeomanNpmPackage(yeomanOutputRoot); -const dotNetNewNupkgPath = buildDotNetNewNuGetPackage(); - -// Move the .nupkg file to the artifacts dir -fs.renameSync(dotNetNewNupkgPath, path.join(artifactsDir, path.basename(dotNetNewNupkgPath))); +buildDotNetNewNuGetPackages(artifactsDir); // Finally, create a .tar.gz file containing the built generator-aspnetcore-spa. // The CI system can treat this as the final built artifact. diff --git a/templates/package-builder/src/dotnetnew/Microsoft.AspNetCore.SpaTemplates.nuspec b/templates/package-builder/src/dotnetnew/templatePackages.nuspec similarity index 93% rename from templates/package-builder/src/dotnetnew/Microsoft.AspNetCore.SpaTemplates.nuspec rename to templates/package-builder/src/dotnetnew/templatePackages.nuspec index 46a62f05..032a7c3a 100644 --- a/templates/package-builder/src/dotnetnew/Microsoft.AspNetCore.SpaTemplates.nuspec +++ b/templates/package-builder/src/dotnetnew/templatePackages.nuspec @@ -1,7 +1,7 @@ - Microsoft.AspNetCore.SpaTemplates + {packageId} {version} Single Page Application templates for ASP.NET Core Microsoft From 970dc6c457083f2d4b8a4eda8774ae49c05fefef Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 24 May 2017 15:01:00 +0100 Subject: [PATCH 092/411] Add --silent to npm install command in CI. Fixes #972 (at least, to the extent that fixing it is reasonably possible) --- build/repo.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/repo.targets b/build/repo.targets index 6a84c060..537aa367 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -7,6 +7,6 @@ - + From b86e9f9254753f1ce66cc0a8bce8af3f67ea8044 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 24 May 2017 15:10:37 +0100 Subject: [PATCH 093/411] Change template description to be consistent with others in 2.0 --- templates/package-builder/src/build/build.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/package-builder/src/build/build.ts b/templates/package-builder/src/build/build.ts index 99ff5383..57663990 100644 --- a/templates/package-builder/src/build/build.ts +++ b/templates/package-builder/src/build/build.ts @@ -154,7 +154,7 @@ function buildDotNetNewNuGetPackage(packageId: string) { classifications: ['Web', 'MVC', 'SPA'], groupIdentity: `${packageId}.${templateConfig.dotNetNewId}`, identity: `${packageId}.${templateConfig.dotNetNewId}.CSharp`, - name: `MVC ASP.NET Core with ${templateConfig.displayName}`, + name: `ASP.NET Core with ${templateConfig.displayName}`, preferNameDirectory: true, primaryOutputs: [{ path: `${sourceProjectName}.csproj` }], shortName: `${templateConfig.dotNetNewId.toLowerCase()}`, From c5922826463565d4be9c38191c12f4ff5e7c9d57 Mon Sep 17 00:00:00 2001 From: Thomas Hermann Date: Wed, 24 May 2017 12:21:36 -0400 Subject: [PATCH 094/411] Fix Node debugging by catching warning --- .../HostingModels/OutOfProcessNodeInstance.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Microsoft.AspNetCore.NodeServices/HostingModels/OutOfProcessNodeInstance.cs b/src/Microsoft.AspNetCore.NodeServices/HostingModels/OutOfProcessNodeInstance.cs index 443aacdd..7f6f172e 100644 --- a/src/Microsoft.AspNetCore.NodeServices/HostingModels/OutOfProcessNodeInstance.cs +++ b/src/Microsoft.AspNetCore.NodeServices/HostingModels/OutOfProcessNodeInstance.cs @@ -405,6 +405,7 @@ private static bool IsDebuggerMessage(string message) return message.StartsWith("Debugger attached", StringComparison.OrdinalIgnoreCase) || message.StartsWith("Debugger listening ", StringComparison.OrdinalIgnoreCase) || message.StartsWith("To start debugging", StringComparison.OrdinalIgnoreCase) || + message.Equals("Warning: This is an experimental feature and could change at any time.", StringComparison.OrdinalIgnoreCase) || message.Contains("chrome-devtools:"); } From a2bde750be2a3850e6b6e0e242145b27637265b6 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 25 May 2017 10:51:14 +0100 Subject: [PATCH 095/411] Make templates auto-run webpack on Debug build if wwwroot/dist is not already present --- templates/AngularSpa/AngularSpa.csproj | 10 +++++++++- templates/AureliaSpa/AureliaSpa.csproj | 10 +++++++++- templates/KnockoutSpa/KnockoutSpa.csproj | 10 +++++++++- templates/ReactReduxSpa/ReactReduxSpa.csproj | 10 +++++++++- templates/ReactSpa/ReactSpa.csproj | 10 +++++++++- templates/VueSpa/VueSpa.csproj | 10 +++++++++- 6 files changed, 54 insertions(+), 6 deletions(-) diff --git a/templates/AngularSpa/AngularSpa.csproj b/templates/AngularSpa/AngularSpa.csproj index fc625cd8..5643f98d 100644 --- a/templates/AngularSpa/AngularSpa.csproj +++ b/templates/AngularSpa/AngularSpa.csproj @@ -21,7 +21,15 @@ - + + + + + + + + diff --git a/templates/AureliaSpa/AureliaSpa.csproj b/templates/AureliaSpa/AureliaSpa.csproj index 0471a276..9d339553 100644 --- a/templates/AureliaSpa/AureliaSpa.csproj +++ b/templates/AureliaSpa/AureliaSpa.csproj @@ -16,7 +16,15 @@ - + + + + + + + + diff --git a/templates/KnockoutSpa/KnockoutSpa.csproj b/templates/KnockoutSpa/KnockoutSpa.csproj index 0471a276..9d339553 100644 --- a/templates/KnockoutSpa/KnockoutSpa.csproj +++ b/templates/KnockoutSpa/KnockoutSpa.csproj @@ -16,7 +16,15 @@ - + + + + + + + + diff --git a/templates/ReactReduxSpa/ReactReduxSpa.csproj b/templates/ReactReduxSpa/ReactReduxSpa.csproj index fc625cd8..5643f98d 100644 --- a/templates/ReactReduxSpa/ReactReduxSpa.csproj +++ b/templates/ReactReduxSpa/ReactReduxSpa.csproj @@ -21,7 +21,15 @@ - + + + + + + + + diff --git a/templates/ReactSpa/ReactSpa.csproj b/templates/ReactSpa/ReactSpa.csproj index 0471a276..9d339553 100644 --- a/templates/ReactSpa/ReactSpa.csproj +++ b/templates/ReactSpa/ReactSpa.csproj @@ -16,7 +16,15 @@ - + + + + + + + + diff --git a/templates/VueSpa/VueSpa.csproj b/templates/VueSpa/VueSpa.csproj index 0471a276..9d339553 100644 --- a/templates/VueSpa/VueSpa.csproj +++ b/templates/VueSpa/VueSpa.csproj @@ -16,7 +16,15 @@ - + + + + + + + + From 44512226c605c2dab206f0c13c1bbed35504fdd9 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 25 May 2017 10:54:30 +0100 Subject: [PATCH 096/411] Stop including prebuilt .js bundles with template packages, since they are now generated on first build --- templates/package-builder/src/build/build.ts | 30 +++++--------------- 1 file changed, 7 insertions(+), 23 deletions(-) diff --git a/templates/package-builder/src/build/build.ts b/templates/package-builder/src/build/build.ts index 57663990..b5c770af 100644 --- a/templates/package-builder/src/build/build.ts +++ b/templates/package-builder/src/build/build.ts @@ -17,8 +17,6 @@ const dotNetPackages = { extra: 'Microsoft.AspNetCore.SpaTemplates' }; -const commonForceInclusionRegex = /^(wwwroot|ClientApp)\/dist\//; // Files to be included in template, even though gitignored - interface TemplateConfig { dir: string; dotNetNewId: string; @@ -46,7 +44,7 @@ function writeFileEnsuringDirExists(root: string, filename: string, contents: st fs.writeFileSync(fullPath, contents); } -function listFilesExcludingGitignored(root: string, forceInclusion: RegExp): string[] { +function listFilesExcludingGitignored(root: string): string[] { // Note that the gitignore files, prior to be written by the generator, are called 'template_gitignore' // instead of '.gitignore'. This is a workaround for Yeoman doing strange stuff with .gitignore files // (it renames them to .npmignore, which is not helpful). @@ -55,11 +53,11 @@ function listFilesExcludingGitignored(root: string, forceInclusion: RegExp): str ? gitignore.compile(fs.readFileSync(gitIgnorePath, 'utf8')) : { accepts: () => true }; return glob.sync('**/*', { cwd: root, dot: true, nodir: true }) - .filter(fn => gitignoreEvaluator.accepts(fn) || (forceInclusion && forceInclusion.test(fn))); + .filter(fn => gitignoreEvaluator.accepts(fn)); } -function writeTemplate(sourceRoot: string, destRoot: string, contentReplacements: { from: RegExp, to: string }[], filenameReplacements: { from: RegExp, to: string }[], forceInclusion: RegExp) { - listFilesExcludingGitignored(sourceRoot, forceInclusion).forEach(fn => { +function writeTemplate(sourceRoot: string, destRoot: string, contentReplacements: { from: RegExp, to: string }[], filenameReplacements: { from: RegExp, to: string }[]) { + listFilesExcludingGitignored(sourceRoot).forEach(fn => { let sourceContent = fs.readFileSync(path.join(sourceRoot, fn)); // For text files, replace hardcoded values with template tags @@ -102,7 +100,7 @@ function buildYeomanNpmPackage(outputRoot: string) { ]; _.forEach(templates, (templateConfig, templateName) => { const outputDir = path.join(outputTemplatesRoot, templateName); - writeTemplate(templateConfig.dir, outputDir, contentReplacements, filenameReplacements, commonForceInclusionRegex); + writeTemplate(templateConfig.dir, outputDir, contentReplacements, filenameReplacements); }); // Also copy the generator files (that's the compiled .js files, plus all other non-.ts files) @@ -143,7 +141,7 @@ function buildDotNetNewNuGetPackage(packageId: string) { } const templateOutputDir = path.join(outputRoot, 'Content', templateName); - writeTemplate(templateConfig.dir, templateOutputDir, contentReplacements, filenameReplacements, commonForceInclusionRegex); + writeTemplate(templateConfig.dir, templateOutputDir, contentReplacements, filenameReplacements); // Add the .template.config dir and its contents const templateConfigDir = path.join(templateOutputDir, '.template.config'); @@ -235,7 +233,7 @@ function buildDotNetNewNuGetPackage(packageId: string) { { from: /\{version\}/g, to: yeomanPackageVersion }, ], [ { from: /.*\.nuspec$/, to: `${packageId}.nuspec` }, - ], null); + ]); const nugetExe = path.join(process.cwd(), './bin/NuGet.exe'); const nugetStartInfo = { cwd: outputRoot, stdio: 'inherit' }; if (isWindows) { @@ -252,19 +250,6 @@ function buildDotNetNewNuGetPackage(packageId: string) { return glob.sync(path.join(outputRoot, './*.nupkg'))[0]; } -function runAllPrepublishScripts() { - Object.getOwnPropertyNames(templates).forEach(templateKey => { - // To support the "dotnet new" templates, we want to bundle prebuilt dist dev-mode files, because "dotnet new" can't auto-run - // webpack on project creation. Note that these script entries are *not* the same as the project's usual prepublish - // scripts, because here we want dev-mode builds (e.g., to support HMR), not prod-mode builds. - runPrepublishScripts(templates[templateKey].dir, [ - 'npm install', - 'node node_modules/webpack/bin/webpack.js --config webpack.config.vendor.js', - 'node node_modules/webpack/bin/webpack.js' - ]); - }); -} - function runPrepublishScripts(rootDir: string, scripts: string[]) { console.log(`[Prepublish] In directory: ${ rootDir }`); scripts.forEach(script => { @@ -280,7 +265,6 @@ const yeomanOutputRoot = path.join(distDir, 'generator-aspnetcore-spa'); rimraf.sync(distDir); mkdirp.sync(artifactsDir); -runAllPrepublishScripts(); buildYeomanNpmPackage(yeomanOutputRoot); buildDotNetNewNuGetPackages(artifactsDir); From cc859306a3fb383f9fa635b9ae37d6dc945c5ee1 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 25 May 2017 11:19:14 +0100 Subject: [PATCH 097/411] Make template package version numbers more descriptive --- templates/package-builder/src/build/build.ts | 41 ++++++++++++------- ... Microsoft.AspNetCore.SpaTemplates.nuspec} | 4 +- ...oft.DotNet.Web.Spa.ProjectTemplates.nuspec | 17 ++++++++ 3 files changed, 45 insertions(+), 17 deletions(-) rename templates/package-builder/src/dotnetnew/{templatePackages.nuspec => Microsoft.AspNetCore.SpaTemplates.nuspec} (88%) create mode 100644 templates/package-builder/src/dotnetnew/Microsoft.DotNet.Web.Spa.ProjectTemplates.nuspec diff --git a/templates/package-builder/src/build/build.ts b/templates/package-builder/src/build/build.ts index b5c770af..5c036bf3 100644 --- a/templates/package-builder/src/build/build.ts +++ b/templates/package-builder/src/build/build.ts @@ -56,18 +56,20 @@ function listFilesExcludingGitignored(root: string): string[] { .filter(fn => gitignoreEvaluator.accepts(fn)); } +function applyContentReplacements(sourceContent: Buffer, contentReplacements: { from: RegExp, to: string }[]) { + let sourceText = sourceContent.toString('utf8'); + contentReplacements.forEach(replacement => { + sourceText = sourceText.replace(replacement.from, replacement.to); + }); + + return new Buffer(sourceText, 'utf8'); +} + function writeTemplate(sourceRoot: string, destRoot: string, contentReplacements: { from: RegExp, to: string }[], filenameReplacements: { from: RegExp, to: string }[]) { listFilesExcludingGitignored(sourceRoot).forEach(fn => { let sourceContent = fs.readFileSync(path.join(sourceRoot, fn)); - - // For text files, replace hardcoded values with template tags if (isTextFile(fn)) { - let sourceText = sourceContent.toString('utf8'); - contentReplacements.forEach(replacement => { - sourceText = sourceText.replace(replacement.from, replacement.to); - }); - - sourceContent = new Buffer(sourceText, 'utf8'); + sourceContent = applyContentReplacements(sourceContent, contentReplacements); } // Also apply replacements in filenames @@ -87,6 +89,11 @@ function copyRecursive(sourceRoot: string, destRoot: string, matchGlob: string) }); } +function getBuildNumber() { + return process.env.APPVEYOR_BUILD_NUMBER + || ('t-' + Math.floor((new Date().valueOf() - new Date(2017, 0, 1).valueOf()) / (60*1000))); +} + function buildYeomanNpmPackage(outputRoot: string) { const outputTemplatesRoot = path.join(outputRoot, 'app/templates'); rimraf.sync(outputTemplatesRoot); @@ -226,14 +233,18 @@ function buildDotNetNewNuGetPackage(packageId: string) { }, null, 2)); }); - // Invoke NuGet to create the final package + // Create the .nuspec file const yeomanPackageVersion = JSON.parse(fs.readFileSync(path.join(yeomanGeneratorSource, 'package.json'), 'utf8')).version; - writeTemplate('./src/dotnetnew', outputRoot, [ - { from: /\{packageId\}/g, to: packageId }, - { from: /\{version\}/g, to: yeomanPackageVersion }, - ], [ - { from: /.*\.nuspec$/, to: `${packageId}.nuspec` }, - ]); + const nuspecContentTemplate = fs.readFileSync(`./src/dotnetnew/${ packageId }.nuspec`); + writeFileEnsuringDirExists(outputRoot, + `${ packageId }.nuspec`, + applyContentReplacements(nuspecContentTemplate, [ + { from: /\{yeomanversion\}/g, to: yeomanPackageVersion }, + { from: /\{buildnumber\}/g, to: getBuildNumber() }, + ]) + ); + + // Invoke NuGet to create the final package const nugetExe = path.join(process.cwd(), './bin/NuGet.exe'); const nugetStartInfo = { cwd: outputRoot, stdio: 'inherit' }; if (isWindows) { diff --git a/templates/package-builder/src/dotnetnew/templatePackages.nuspec b/templates/package-builder/src/dotnetnew/Microsoft.AspNetCore.SpaTemplates.nuspec similarity index 88% rename from templates/package-builder/src/dotnetnew/templatePackages.nuspec rename to templates/package-builder/src/dotnetnew/Microsoft.AspNetCore.SpaTemplates.nuspec index 032a7c3a..615d8b0b 100644 --- a/templates/package-builder/src/dotnetnew/templatePackages.nuspec +++ b/templates/package-builder/src/dotnetnew/Microsoft.AspNetCore.SpaTemplates.nuspec @@ -1,8 +1,8 @@ - {packageId} - {version} + Microsoft.AspNetCore.SpaTemplates + {yeomanversion} Single Page Application templates for ASP.NET Core Microsoft en-US diff --git a/templates/package-builder/src/dotnetnew/Microsoft.DotNet.Web.Spa.ProjectTemplates.nuspec b/templates/package-builder/src/dotnetnew/Microsoft.DotNet.Web.Spa.ProjectTemplates.nuspec new file mode 100644 index 00000000..234add1c --- /dev/null +++ b/templates/package-builder/src/dotnetnew/Microsoft.DotNet.Web.Spa.ProjectTemplates.nuspec @@ -0,0 +1,17 @@ + + + + Microsoft.DotNet.Web.Spa.ProjectTemplates + 2.0.0-preview2-{buildnumber} + Single Page Application templates for ASP.NET Core + Microsoft + en-US + https://github.com/aspnet/javascriptservices + https://www.microsoft.com/web/webpi/eula/net_library_eula_enu.htm + Copyright © Microsoft Corporation + true + + + + + From bee4c6ff1173287d57980c010a90aedc91bf49a8 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 25 May 2017 12:05:34 +0100 Subject: [PATCH 098/411] Stop "dotnet new" from stripping out important parts of .csproj files --- templates/AngularSpa/AngularSpa.csproj | 4 +++- templates/AureliaSpa/AureliaSpa.csproj | 4 +++- templates/KnockoutSpa/KnockoutSpa.csproj | 4 +++- templates/ReactReduxSpa/ReactReduxSpa.csproj | 4 +++- templates/ReactSpa/ReactSpa.csproj | 4 +++- templates/VueSpa/VueSpa.csproj | 4 +++- 6 files changed, 18 insertions(+), 6 deletions(-) diff --git a/templates/AngularSpa/AngularSpa.csproj b/templates/AngularSpa/AngularSpa.csproj index 5643f98d..96f705d8 100644 --- a/templates/AngularSpa/AngularSpa.csproj +++ b/templates/AngularSpa/AngularSpa.csproj @@ -21,6 +21,7 @@ + @@ -28,7 +29,8 @@ - + + diff --git a/templates/AureliaSpa/AureliaSpa.csproj b/templates/AureliaSpa/AureliaSpa.csproj index 9d339553..4fd79511 100644 --- a/templates/AureliaSpa/AureliaSpa.csproj +++ b/templates/AureliaSpa/AureliaSpa.csproj @@ -16,6 +16,7 @@ + @@ -23,7 +24,8 @@ - + + diff --git a/templates/KnockoutSpa/KnockoutSpa.csproj b/templates/KnockoutSpa/KnockoutSpa.csproj index 9d339553..4fd79511 100644 --- a/templates/KnockoutSpa/KnockoutSpa.csproj +++ b/templates/KnockoutSpa/KnockoutSpa.csproj @@ -16,6 +16,7 @@ + @@ -23,7 +24,8 @@ - + + diff --git a/templates/ReactReduxSpa/ReactReduxSpa.csproj b/templates/ReactReduxSpa/ReactReduxSpa.csproj index 5643f98d..96f705d8 100644 --- a/templates/ReactReduxSpa/ReactReduxSpa.csproj +++ b/templates/ReactReduxSpa/ReactReduxSpa.csproj @@ -21,6 +21,7 @@ + @@ -28,7 +29,8 @@ - + + diff --git a/templates/ReactSpa/ReactSpa.csproj b/templates/ReactSpa/ReactSpa.csproj index 9d339553..4fd79511 100644 --- a/templates/ReactSpa/ReactSpa.csproj +++ b/templates/ReactSpa/ReactSpa.csproj @@ -16,6 +16,7 @@ + @@ -23,7 +24,8 @@ - + + diff --git a/templates/VueSpa/VueSpa.csproj b/templates/VueSpa/VueSpa.csproj index 9d339553..4fd79511 100644 --- a/templates/VueSpa/VueSpa.csproj +++ b/templates/VueSpa/VueSpa.csproj @@ -16,6 +16,7 @@ + @@ -23,7 +24,8 @@ - + + From 38997c3f3f31efb5e9510f1a85dd15a9b267a768 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 25 May 2017 12:22:48 +0100 Subject: [PATCH 099/411] Pad build numbers so that alpha-sort produces correct ordering --- templates/package-builder/src/build/build.ts | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/templates/package-builder/src/build/build.ts b/templates/package-builder/src/build/build.ts index 5c036bf3..99854205 100644 --- a/templates/package-builder/src/build/build.ts +++ b/templates/package-builder/src/build/build.ts @@ -89,9 +89,20 @@ function copyRecursive(sourceRoot: string, destRoot: string, matchGlob: string) }); } -function getBuildNumber() { - return process.env.APPVEYOR_BUILD_NUMBER - || ('t-' + Math.floor((new Date().valueOf() - new Date(2017, 0, 1).valueOf()) / (60*1000))); +function leftPad(str: string, minLength: number, padChar: string) { + while (str.length < minLength) { + str = padChar + str; + } + return str; +} + +function getBuildNumber(): string { + if (process.env.APPVEYOR_BUILD_NUMBER) { + return leftPad(process.env.APPVEYOR_BUILD_NUMBER, 6, '0'); + } + + // For local builds, use timestamp + return 't-' + Math.floor((new Date().valueOf() - new Date(2017, 0, 1).valueOf()) / (60*1000)); } function buildYeomanNpmPackage(outputRoot: string) { From 75fd215b1a781f2a14ee1fd6d9088a5fa379cb6f Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 25 May 2017 13:06:42 +0100 Subject: [PATCH 100/411] Change Microsoft.DotNet.Web.Spa.ProjectTemplates to use 1.0.0-preview-* version numbers since the first release will be 1.0.0 --- .../dotnetnew/Microsoft.DotNet.Web.Spa.ProjectTemplates.nuspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/package-builder/src/dotnetnew/Microsoft.DotNet.Web.Spa.ProjectTemplates.nuspec b/templates/package-builder/src/dotnetnew/Microsoft.DotNet.Web.Spa.ProjectTemplates.nuspec index 234add1c..14066315 100644 --- a/templates/package-builder/src/dotnetnew/Microsoft.DotNet.Web.Spa.ProjectTemplates.nuspec +++ b/templates/package-builder/src/dotnetnew/Microsoft.DotNet.Web.Spa.ProjectTemplates.nuspec @@ -2,7 +2,7 @@ Microsoft.DotNet.Web.Spa.ProjectTemplates - 2.0.0-preview2-{buildnumber} + 1.0.0-preview-{buildnumber} Single Page Application templates for ASP.NET Core Microsoft en-US From 9b131ea7d3f9e1af1cc74d20183ebb7ee58bc5a5 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Sat, 27 May 2017 18:58:17 -0700 Subject: [PATCH 101/411] Remove unused usings --- .../Webpack/WebpackDevMiddleware.cs | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddleware.cs b/src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddleware.cs index fa9be006..8afd7b6f 100644 --- a/src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddleware.cs +++ b/src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddleware.cs @@ -1,14 +1,9 @@ using System; using System.IO; using System.Threading; -using System.Threading.Tasks; using Microsoft.AspNetCore.NodeServices; using Microsoft.AspNetCore.SpaServices.Webpack; -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.PlatformAbstractions; using Newtonsoft.Json; -using Microsoft.AspNetCore.Http; namespace Microsoft.AspNetCore.Builder { @@ -54,7 +49,7 @@ public static void UseWebpackDevMiddleware( // middleware). And since this is a dev-time-only feature, it doesn't matter if the default transport isn't // as fast as some theoretical future alternative. var nodeServicesOptions = new NodeServicesOptions(appBuilder.ApplicationServices); - nodeServicesOptions.WatchFileExtensions = new string[] {}; // Don't watch anything + nodeServicesOptions.WatchFileExtensions = new string[] { }; // Don't watch anything if (!string.IsNullOrEmpty(options.ProjectPath)) { nodeServicesOptions.ProjectPath = options.ProjectPath; From 087183ea18ed563d03d35266af081a5adb24eca1 Mon Sep 17 00:00:00 2001 From: Kiran Challa Date: Fri, 26 May 2017 12:41:34 -0700 Subject: [PATCH 102/411] Updated to use the latest shared runtime --- build/dependencies.props | 1 + 1 file changed, 1 insertion(+) diff --git a/build/dependencies.props b/build/dependencies.props index aab2fe98..43700157 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -6,6 +6,7 @@ 2.1.0-* 10.0.1 $(BundledNETStandardPackageVersion) + 2.0.0-* 4.7.0     From 8a1d64cc7387d988ad036aec17388361079b4eb8 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Wed, 31 May 2017 19:36:47 -0700 Subject: [PATCH 103/411] Branching for rel/2.0.0-preview2 --- NuGet.config | 7 ++++--- build/dependencies.props | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8e656956..c4bc056c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -1,8 +1,9 @@ - + - + + - + \ No newline at end of file diff --git a/build/dependencies.props b/build/dependencies.props index 43700157..378bc933 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,6 +1,6 @@ - 2.0.0-* + 2.0.0-preview2-* 5.0.2 4.3.0 2.1.0-* From dbdc81a06a50a853a6025c975edc584ab9719572 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Wed, 31 May 2017 19:53:23 -0700 Subject: [PATCH 104/411] Updating build scripts to point to 2.0.0-preview2 KoreBuild --- build.ps1 | 2 +- build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.ps1 b/build.ps1 index 5bf0e2c1..3a2476b2 100644 --- a/build.ps1 +++ b/build.ps1 @@ -33,7 +33,7 @@ cd $PSScriptRoot $repoFolder = $PSScriptRoot $env:REPO_FOLDER = $repoFolder -$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/dev.zip" +$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/rel/2.0.0-preview2.zip" if ($env:KOREBUILD_ZIP) { $koreBuildZip=$env:KOREBUILD_ZIP diff --git a/build.sh b/build.sh index b0bcadb5..a40bdb87 100755 --- a/build.sh +++ b/build.sh @@ -2,7 +2,7 @@ repoFolder="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" cd $repoFolder -koreBuildZip="https://github.com/aspnet/KoreBuild/archive/dev.zip" +koreBuildZip="https://github.com/aspnet/KoreBuild/archive/rel/2.0.0-preview2.zip" if [ ! -z $KOREBUILD_ZIP ]; then koreBuildZip=$KOREBUILD_ZIP fi From d9e75c89aeefd81709281e553b7b8d64539fae1f Mon Sep 17 00:00:00 2001 From: Pranav K Date: Thu, 1 Jun 2017 10:47:12 -0700 Subject: [PATCH 105/411] Updating versions to preview3 --- NuGet.config | 3 ++- version.props | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8e656956..4e8a1f6d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -1,6 +1,7 @@ - + + diff --git a/version.props b/version.props index 6af4f81d..193a5999 100644 --- a/version.props +++ b/version.props @@ -2,6 +2,6 @@ 2.0.0 - preview2 + preview3 From 0626bb15946bb2622412e77765fba7545fb0f435 Mon Sep 17 00:00:00 2001 From: Josef Ottosson Date: Wed, 31 May 2017 15:58:21 +0200 Subject: [PATCH 106/411] Update README.md Fixes small typo. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5639485e..8921c495 100644 --- a/README.md +++ b/README.md @@ -94,7 +94,7 @@ If you're interested in contributing to the various packages, samples, and proje * Run `dotnet restore` at the repo root dir * Go to whatever sample or template you want to run (for example, `cd templates/AngularSpa`) * Restore NPM dependencies (run `npm install`) - * If the sample/template you're trying to run has a file called `webpack.config.vendor.js` at its root, run `webpack --config webpack.config.vendor.js`. It it has a file called `webpack.config.js`, run `webpack` (no args). You might need to install webpack first, by running `npm install -g webpack`. + * If the sample/template you're trying to run has a file called `webpack.config.vendor.js` at its root, run `webpack --config webpack.config.vendor.js`. If it has a file called `webpack.config.js`, run `webpack` (no args). You might need to install webpack first, by running `npm install -g webpack`. * Launch it (`dotnet run`) If you're planning to submit a pull request, and if it's more than a trivial fix (for example, for a typo), it's usually a good idea first to file an issue describing what you're proposing to do and how it will work. Then you can find out if it's likely that such a pull request will be accepted, and how it fits into wider ongoing plans. From 1c5bd98d8a4d87a232c9f2545e4896257dbc48c4 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Mon, 5 Jun 2017 13:03:39 +0100 Subject: [PATCH 107/411] Stop doing NPM restores during CI builds, as the result isn't used anyway --- build/repo.targets | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 build/repo.targets diff --git a/build/repo.targets b/build/repo.targets deleted file mode 100644 index 537aa367..00000000 --- a/build/repo.targets +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - From 2aaceaa9f8fc1a46e1079e710acaf97492252927 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 7 Jun 2017 09:47:40 +0100 Subject: [PATCH 108/411] Move core packages to netstandard2.0 --- build/dependencies.props | 2 +- ...osoft.AspNetCore.NodeServices.Sockets.csproj | 10 +--------- .../PhysicalConnections/NamedPipeConnection.cs | 4 ---- .../PhysicalConnections/StreamConnection.cs | 4 ---- .../UnixDomainSocketConnection.cs | 11 ----------- .../UnixDomainSocketEndPoint.cs | 4 ---- .../VirtualConnections/VirtualConnection.cs | 4 ---- .../HostingModels/OutOfProcessNodeInstance.cs | 4 ---- .../Microsoft.AspNetCore.NodeServices.csproj | 7 +------ .../Util/StringAsTempFile.cs | 17 ----------------- .../Microsoft.AspNetCore.SpaServices.csproj | 5 +++-- 11 files changed, 6 insertions(+), 66 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 378bc933..3e338573 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -6,7 +6,7 @@ 2.1.0-* 10.0.1 $(BundledNETStandardPackageVersion) - 2.0.0-* + 2.0.0-* 4.7.0 diff --git a/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj b/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj index 8ebd6a62..91b1a4b4 100644 --- a/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj +++ b/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj @@ -4,7 +4,7 @@ Socket-based RPC for Microsoft.AspNetCore.NodeServices. - netcoreapp2.0 + netstandard2.0 aspnetcore;aspnetcoremvc;nodeservices true @@ -15,14 +15,6 @@ - - - - - - - - diff --git a/src/Microsoft.AspNetCore.NodeServices.Sockets/PhysicalConnections/NamedPipeConnection.cs b/src/Microsoft.AspNetCore.NodeServices.Sockets/PhysicalConnections/NamedPipeConnection.cs index d50d1463..5fcd6679 100644 --- a/src/Microsoft.AspNetCore.NodeServices.Sockets/PhysicalConnections/NamedPipeConnection.cs +++ b/src/Microsoft.AspNetCore.NodeServices.Sockets/PhysicalConnections/NamedPipeConnection.cs @@ -18,11 +18,7 @@ public override async Task Open(string address) PipeDirection.InOut, PipeOptions.Asynchronous); -#if NET451 - _namedPipeClientStream.Connect(); -#else await _namedPipeClientStream.ConnectAsync().ConfigureAwait(false); -#endif return _namedPipeClientStream; } diff --git a/src/Microsoft.AspNetCore.NodeServices.Sockets/PhysicalConnections/StreamConnection.cs b/src/Microsoft.AspNetCore.NodeServices.Sockets/PhysicalConnections/StreamConnection.cs index 535a762d..cbd1f990 100644 --- a/src/Microsoft.AspNetCore.NodeServices.Sockets/PhysicalConnections/StreamConnection.cs +++ b/src/Microsoft.AspNetCore.NodeServices.Sockets/PhysicalConnections/StreamConnection.cs @@ -11,9 +11,6 @@ internal abstract class StreamConnection : IDisposable public static StreamConnection Create() { -#if NET451 - return new NamedPipeConnection(); -#else var useNamedPipes = System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform( System.Runtime.InteropServices.OSPlatform.Windows); if (useNamedPipes) @@ -24,7 +21,6 @@ public static StreamConnection Create() { return new UnixDomainSocketConnection(); } -#endif } } } \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.NodeServices.Sockets/PhysicalConnections/UnixDomainSocketConnection.cs b/src/Microsoft.AspNetCore.NodeServices.Sockets/PhysicalConnections/UnixDomainSocketConnection.cs index 1f12a719..6e7ebace 100644 --- a/src/Microsoft.AspNetCore.NodeServices.Sockets/PhysicalConnections/UnixDomainSocketConnection.cs +++ b/src/Microsoft.AspNetCore.NodeServices.Sockets/PhysicalConnections/UnixDomainSocketConnection.cs @@ -10,16 +10,6 @@ internal class UnixDomainSocketConnection : StreamConnection private NetworkStream _networkStream; private Socket _socket; -#if NET451 - public override Task Open(string address) - { - // The 'null' assignments avoid the compiler warnings about unassigned fields. - // Note that this whole class isn't supported on .NET 4.5.1, since that's not cross-platform. - _networkStream = null; - _socket = null; - throw new System.PlatformNotSupportedException(); - } -#else public override async Task Open(string address) { var endPoint = new UnixDomainSocketEndPoint("/tmp/" + address); @@ -28,7 +18,6 @@ public override async Task Open(string address) _networkStream = new NetworkStream(_socket); return _networkStream; } -#endif public override void Dispose() { diff --git a/src/Microsoft.AspNetCore.NodeServices.Sockets/PhysicalConnections/UnixDomainSocketEndPoint.cs b/src/Microsoft.AspNetCore.NodeServices.Sockets/PhysicalConnections/UnixDomainSocketEndPoint.cs index ff43b01b..b0011632 100644 --- a/src/Microsoft.AspNetCore.NodeServices.Sockets/PhysicalConnections/UnixDomainSocketEndPoint.cs +++ b/src/Microsoft.AspNetCore.NodeServices.Sockets/PhysicalConnections/UnixDomainSocketEndPoint.cs @@ -59,11 +59,7 @@ internal UnixDomainSocketEndPoint(SocketAddress socketAddress) } else { -#if NET451 - _encodedPath = new byte[0]; -#else _encodedPath = Array.Empty(); -#endif _path = string.Empty; } } diff --git a/src/Microsoft.AspNetCore.NodeServices.Sockets/VirtualConnections/VirtualConnection.cs b/src/Microsoft.AspNetCore.NodeServices.Sockets/VirtualConnections/VirtualConnection.cs index 611dff19..391b1f76 100644 --- a/src/Microsoft.AspNetCore.NodeServices.Sockets/VirtualConnections/VirtualConnection.cs +++ b/src/Microsoft.AspNetCore.NodeServices.Sockets/VirtualConnections/VirtualConnection.cs @@ -12,11 +12,7 @@ namespace Microsoft.AspNetCore.NodeServices.Sockets.VirtualConnections /// internal class VirtualConnection : Stream { -#if NET451 - private readonly static Task CompletedTask = Task.FromResult((object)null); -#else private readonly static Task CompletedTask = Task.CompletedTask; -#endif private VirtualConnectionClient _host; private readonly BufferBlock _receivedDataQueue = new BufferBlock(); private ArraySegment _receivedDataNotYetUsed; diff --git a/src/Microsoft.AspNetCore.NodeServices/HostingModels/OutOfProcessNodeInstance.cs b/src/Microsoft.AspNetCore.NodeServices/HostingModels/OutOfProcessNodeInstance.cs index 7f6f172e..6bfa177f 100644 --- a/src/Microsoft.AspNetCore.NodeServices/HostingModels/OutOfProcessNodeInstance.cs +++ b/src/Microsoft.AspNetCore.NodeServices/HostingModels/OutOfProcessNodeInstance.cs @@ -315,11 +315,7 @@ private void EnsureFileSystemWatcherIsDisposed() private static void SetEnvironmentVariable(ProcessStartInfo startInfo, string name, string value) { -#if NET451 - startInfo.EnvironmentVariables[name] = value; -#else startInfo.Environment[name] = value; -#endif } private static Process LaunchNodeProcess(ProcessStartInfo startInfo) diff --git a/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj b/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj index f5be3acb..27d8c62b 100644 --- a/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj +++ b/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj @@ -4,7 +4,7 @@ Invoke Node.js modules at runtime in ASP.NET Core applications. - netcoreapp2.0 + netstandard2.0 aspnetcore;aspnetcoremvc;nodeservices true true @@ -18,11 +18,6 @@ - - - - - diff --git a/src/Microsoft.AspNetCore.NodeServices/Util/StringAsTempFile.cs b/src/Microsoft.AspNetCore.NodeServices/Util/StringAsTempFile.cs index 22f4b018..a798b312 100644 --- a/src/Microsoft.AspNetCore.NodeServices/Util/StringAsTempFile.cs +++ b/src/Microsoft.AspNetCore.NodeServices/Util/StringAsTempFile.cs @@ -23,15 +23,10 @@ public StringAsTempFile(string content) // Because .NET finalizers don't reliably run when the process is terminating, also // add event handlers for other shutdown scenarios. -#if NET451 - AppDomain.CurrentDomain.ProcessExit += HandleProcessExit; - AppDomain.CurrentDomain.DomainUnload += HandleProcessExit; -#else // Note that this still doesn't capture SIGKILL (at least on macOS) - there doesn't // appear to be a way of doing that. So in that case, the temporary file will be // left behind. System.Runtime.Loader.AssemblyLoadContext.Default.Unloading += HandleAssemblyUnloading; -#endif } /// @@ -55,12 +50,7 @@ private void DisposeImpl(bool disposing) if (disposing) { // Dispose managed state -#if NET451 - AppDomain.CurrentDomain.ProcessExit -= HandleProcessExit; - AppDomain.CurrentDomain.DomainUnload -= HandleProcessExit; -#else System.Runtime.Loader.AssemblyLoadContext.Default.Unloading -= HandleAssemblyUnloading; -#endif } EnsureTempFileDeleted(); @@ -81,17 +71,10 @@ private void EnsureTempFileDeleted() } } -#if NET451 - private void HandleProcessExit(object sender, EventArgs args) - { - EnsureTempFileDeleted(); - } -#else private void HandleAssemblyUnloading(System.Runtime.Loader.AssemblyLoadContext context) { EnsureTempFileDeleted(); } -#endif /// /// Implements the finalization part of the IDisposable pattern by calling Dispose(false). diff --git a/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj b/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj index 53d7c7b4..5d905738 100644 --- a/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj +++ b/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj @@ -4,7 +4,7 @@ Helpers for building single-page applications on ASP.NET MVC Core. - netcoreapp2.0 + netstandard2.0 aspnetcore;aspnetcoremvc;nodeservices true true @@ -13,7 +13,8 @@ - + + From b444831c8dc246076d12b35e23a483b9ff1b68b3 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 7 Jun 2017 11:45:14 +0100 Subject: [PATCH 109/411] Remove System.Runtime.Loader dependency to enable net461 support. Use IApplicationLifetime instead of AssemblyLoadContext.Default.Unloading. --- .../SocketNodeInstance.cs | 1 + .../Configuration/NodeServicesOptions.cs | 12 ++++++++ .../HostingModels/HttpNodeInstance.cs | 1 + .../HostingModels/OutOfProcessNodeInstance.cs | 4 ++- .../Microsoft.AspNetCore.NodeServices.csproj | 1 - .../Util/StringAsTempFile.cs | 17 ++++------- .../Prerendering/PrerenderTagHelper.cs | 6 ++++ .../Prerendering/Prerenderer.cs | 30 ++++++++++++------- .../Webpack/WebpackDevMiddleware.cs | 2 +- 9 files changed, 50 insertions(+), 24 deletions(-) diff --git a/src/Microsoft.AspNetCore.NodeServices.Sockets/SocketNodeInstance.cs b/src/Microsoft.AspNetCore.NodeServices.Sockets/SocketNodeInstance.cs index b656978f..1e6afd10 100644 --- a/src/Microsoft.AspNetCore.NodeServices.Sockets/SocketNodeInstance.cs +++ b/src/Microsoft.AspNetCore.NodeServices.Sockets/SocketNodeInstance.cs @@ -49,6 +49,7 @@ public SocketNodeInstance(NodeServicesOptions options, string socketAddress) options.ProjectPath, options.WatchFileExtensions, MakeNewCommandLineOptions(socketAddress), + options.ApplicationStoppingToken, options.NodeInstanceOutputLogger, options.EnvironmentVariables, options.InvocationTimeoutMilliseconds, diff --git a/src/Microsoft.AspNetCore.NodeServices/Configuration/NodeServicesOptions.cs b/src/Microsoft.AspNetCore.NodeServices/Configuration/NodeServicesOptions.cs index 43d703b9..73dd2289 100644 --- a/src/Microsoft.AspNetCore.NodeServices/Configuration/NodeServicesOptions.cs +++ b/src/Microsoft.AspNetCore.NodeServices/Configuration/NodeServicesOptions.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Threading; using Microsoft.AspNetCore.NodeServices.HostingModels; using Microsoft.Extensions.Logging; using Microsoft.Extensions.DependencyInjection; @@ -42,6 +43,12 @@ public NodeServicesOptions(IServiceProvider serviceProvider) EnvironmentVariables["NODE_ENV"] = hostEnv.IsDevelopment() ? "development" : "production"; // De-facto standard values for Node } + var applicationLifetime = serviceProvider.GetService(); + if (applicationLifetime != null) + { + ApplicationStoppingToken = applicationLifetime.ApplicationStopping; + } + // If the DI system gives us a logger, use it. Otherwise, set up a default one. var loggerFactory = serviceProvider.GetService(); NodeInstanceOutputLogger = loggerFactory != null @@ -93,5 +100,10 @@ public NodeServicesOptions(IServiceProvider serviceProvider) /// Specifies the maximum duration, in milliseconds, that your .NET code should wait for Node.js RPC calls to return. /// public int InvocationTimeoutMilliseconds { get; set; } + + /// + /// A token that indicates when the host application is stopping. + /// + public CancellationToken ApplicationStoppingToken { get; set; } } } \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.NodeServices/HostingModels/HttpNodeInstance.cs b/src/Microsoft.AspNetCore.NodeServices/HostingModels/HttpNodeInstance.cs index 8beea51f..b1b0fe96 100644 --- a/src/Microsoft.AspNetCore.NodeServices/HostingModels/HttpNodeInstance.cs +++ b/src/Microsoft.AspNetCore.NodeServices/HostingModels/HttpNodeInstance.cs @@ -42,6 +42,7 @@ public HttpNodeInstance(NodeServicesOptions options, int port = 0) options.ProjectPath, options.WatchFileExtensions, MakeCommandLineOptions(port), + options.ApplicationStoppingToken, options.NodeInstanceOutputLogger, options.EnvironmentVariables, options.InvocationTimeoutMilliseconds, diff --git a/src/Microsoft.AspNetCore.NodeServices/HostingModels/OutOfProcessNodeInstance.cs b/src/Microsoft.AspNetCore.NodeServices/HostingModels/OutOfProcessNodeInstance.cs index 6bfa177f..e3532920 100644 --- a/src/Microsoft.AspNetCore.NodeServices/HostingModels/OutOfProcessNodeInstance.cs +++ b/src/Microsoft.AspNetCore.NodeServices/HostingModels/OutOfProcessNodeInstance.cs @@ -45,6 +45,7 @@ public abstract class OutOfProcessNodeInstance : INodeInstance /// The root path of the current project. This is used when resolving Node.js module paths relative to the project root. /// The filename extensions that should be watched within the project root. The Node instance will automatically shut itself down if any matching file changes. /// Additional command-line arguments to be passed to the Node.js instance. + /// A token that indicates when the host application is stopping. /// The to which the Node.js instance's stdout/stderr (and other log information) should be written. /// Environment variables to be set on the Node.js process. /// The maximum duration, in milliseconds, to wait for RPC calls to complete. @@ -55,6 +56,7 @@ public OutOfProcessNodeInstance( string projectPath, string[] watchFileExtensions, string commandLineArguments, + CancellationToken applicationStoppingToken, ILogger nodeOutputLogger, IDictionary environmentVars, int invocationTimeoutMilliseconds, @@ -67,7 +69,7 @@ public OutOfProcessNodeInstance( } OutputLogger = nodeOutputLogger; - _entryPointScript = new StringAsTempFile(entryPointScript); + _entryPointScript = new StringAsTempFile(entryPointScript, applicationStoppingToken); _invocationTimeoutMilliseconds = invocationTimeoutMilliseconds; _launchWithDebugging = launchWithDebugging; diff --git a/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj b/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj index 27d8c62b..cbf78289 100644 --- a/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj +++ b/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj @@ -18,7 +18,6 @@ - diff --git a/src/Microsoft.AspNetCore.NodeServices/Util/StringAsTempFile.cs b/src/Microsoft.AspNetCore.NodeServices/Util/StringAsTempFile.cs index a798b312..c15bca35 100644 --- a/src/Microsoft.AspNetCore.NodeServices/Util/StringAsTempFile.cs +++ b/src/Microsoft.AspNetCore.NodeServices/Util/StringAsTempFile.cs @@ -1,5 +1,6 @@ using System; using System.IO; +using System.Threading; namespace Microsoft.AspNetCore.NodeServices { @@ -11,22 +12,21 @@ public sealed class StringAsTempFile : IDisposable private bool _disposedValue; private bool _hasDeletedTempFile; private object _fileDeletionLock = new object(); + private IDisposable _applicationLifetimeRegistration; /// /// Create a new instance of . /// /// The contents of the temporary file to be created. - public StringAsTempFile(string content) + /// A token that indicates when the host application is stopping. + public StringAsTempFile(string content, CancellationToken applicationStoppingToken) { FileName = Path.GetTempFileName(); File.WriteAllText(FileName, content); // Because .NET finalizers don't reliably run when the process is terminating, also // add event handlers for other shutdown scenarios. - // Note that this still doesn't capture SIGKILL (at least on macOS) - there doesn't - // appear to be a way of doing that. So in that case, the temporary file will be - // left behind. - System.Runtime.Loader.AssemblyLoadContext.Default.Unloading += HandleAssemblyUnloading; + _applicationLifetimeRegistration = applicationStoppingToken.Register(EnsureTempFileDeleted); } /// @@ -50,7 +50,7 @@ private void DisposeImpl(bool disposing) if (disposing) { // Dispose managed state - System.Runtime.Loader.AssemblyLoadContext.Default.Unloading -= HandleAssemblyUnloading; + _applicationLifetimeRegistration.Dispose(); } EnsureTempFileDeleted(); @@ -71,11 +71,6 @@ private void EnsureTempFileDeleted() } } - private void HandleAssemblyUnloading(System.Runtime.Loader.AssemblyLoadContext context) - { - EnsureTempFileDeleted(); - } - /// /// Implements the finalization part of the IDisposable pattern by calling Dispose(false). /// diff --git a/src/Microsoft.AspNetCore.SpaServices/Prerendering/PrerenderTagHelper.cs b/src/Microsoft.AspNetCore.SpaServices/Prerendering/PrerenderTagHelper.cs index bad274f7..c2c53080 100644 --- a/src/Microsoft.AspNetCore.SpaServices/Prerendering/PrerenderTagHelper.cs +++ b/src/Microsoft.AspNetCore.SpaServices/Prerendering/PrerenderTagHelper.cs @@ -1,5 +1,6 @@ using System; using System.Text; +using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http.Features; @@ -24,6 +25,7 @@ public class PrerenderTagHelper : TagHelper private static INodeServices _fallbackNodeServices; // Used only if no INodeServices was registered with DI private readonly string _applicationBasePath; + private readonly CancellationToken _applicationStoppingToken; private readonly INodeServices _nodeServices; /// @@ -35,6 +37,9 @@ public PrerenderTagHelper(IServiceProvider serviceProvider) var hostEnv = (IHostingEnvironment) serviceProvider.GetService(typeof(IHostingEnvironment)); _nodeServices = (INodeServices) serviceProvider.GetService(typeof(INodeServices)) ?? _fallbackNodeServices; _applicationBasePath = hostEnv.ContentRootPath; + + var applicationLifetime = (IApplicationLifetime) serviceProvider.GetService(typeof(IApplicationLifetime)); + _applicationStoppingToken = applicationLifetime.ApplicationStopping; // Consider removing the following. Having it means you can get away with not putting app.AddNodeServices() // in your startup file, but then again it might be confusing that you don't need to. @@ -101,6 +106,7 @@ public override async Task ProcessAsync(TagHelperContext context, TagHelperOutpu var result = await Prerenderer.RenderToString( _applicationBasePath, _nodeServices, + _applicationStoppingToken, new JavaScriptModuleExport(ModuleName) { ExportName = ExportName diff --git a/src/Microsoft.AspNetCore.SpaServices/Prerendering/Prerenderer.cs b/src/Microsoft.AspNetCore.SpaServices/Prerendering/Prerenderer.cs index 43c2ed0f..e7ce8415 100644 --- a/src/Microsoft.AspNetCore.SpaServices/Prerendering/Prerenderer.cs +++ b/src/Microsoft.AspNetCore.SpaServices/Prerendering/Prerenderer.cs @@ -1,4 +1,5 @@ using System; +using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.NodeServices; @@ -9,22 +10,16 @@ namespace Microsoft.AspNetCore.SpaServices.Prerendering /// public static class Prerenderer { - private static readonly Lazy NodeScript; + private static readonly object CreateNodeScriptLock = new object(); - static Prerenderer() - { - NodeScript = new Lazy(() => - { - var script = EmbeddedResourceReader.Read(typeof(Prerenderer), "/Content/Node/prerenderer.js"); - return new StringAsTempFile(script); // Will be cleaned up on process exit - }); - } + private static StringAsTempFile NodeScript; /// /// Performs server-side prerendering by invoking code in Node.js. /// /// The root path to your application. This is used when resolving project-relative paths. /// The instance of that will be used to invoke JavaScript code. + /// A token that indicates when the host application is stopping. /// The path to the JavaScript file containing the prerendering logic. /// The URL of the currently-executing HTTP request. This is supplied to the prerendering code. /// The path and query part of the URL of the currently-executing HTTP request. This is supplied to the prerendering code. @@ -35,6 +30,7 @@ static Prerenderer() public static Task RenderToString( string applicationBasePath, INodeServices nodeServices, + CancellationToken applicationStoppingToken, JavaScriptModuleExport bootModule, string requestAbsoluteUrl, string requestPathAndQuery, @@ -43,7 +39,7 @@ public static Task RenderToString( string requestPathBase) { return nodeServices.InvokeExportAsync( - NodeScript.Value.FileName, + GetNodeScriptFilename(applicationStoppingToken), "renderToString", applicationBasePath, bootModule, @@ -53,5 +49,19 @@ public static Task RenderToString( timeoutMilliseconds, requestPathBase); } + + private static string GetNodeScriptFilename(CancellationToken applicationStoppingToken) + { + lock(CreateNodeScriptLock) + { + if (NodeScript == null) + { + var script = EmbeddedResourceReader.Read(typeof(Prerenderer), "/Content/Node/prerenderer.js"); + NodeScript = new StringAsTempFile(script, applicationStoppingToken); // Will be cleaned up on process exit + } + } + + return NodeScript.FileName; + } } } \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddleware.cs b/src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddleware.cs index 8afd7b6f..9f022238 100644 --- a/src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddleware.cs +++ b/src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddleware.cs @@ -68,7 +68,7 @@ public static void UseWebpackDevMiddleware( // Get a filename matching the middleware Node script var script = EmbeddedResourceReader.Read(typeof(WebpackDevMiddleware), "/Content/Node/webpack-dev-middleware.js"); - var nodeScript = new StringAsTempFile(script); // Will be cleaned up on process exit + var nodeScript = new StringAsTempFile(script, nodeServicesOptions.ApplicationStoppingToken); // Will be cleaned up on process exit // Ideally, this would be relative to the application's PathBase (so it could work in virtual directories) // but it's not clear that such information exists during application startup, as opposed to within the context From 045c05fc884a990fef8c22a066b93842a4493cff Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 7 Jun 2017 12:02:58 +0100 Subject: [PATCH 110/411] Update samples to target both netcoreapp2.0 and net461 --- build/common.props | 3 ++- build/dependencies.props | 1 + samples/misc/LatencyTest/LatencyTest.csproj | 4 ++-- samples/misc/NodeServicesExamples/NodeServicesExamples.csproj | 4 ++-- samples/misc/Webpack/ActionResults/PrerenderResult.cs | 2 ++ samples/misc/Webpack/Webpack.csproj | 4 ++-- 6 files changed, 11 insertions(+), 7 deletions(-) diff --git a/build/common.props b/build/common.props index 89ade5d9..72ab892a 100644 --- a/build/common.props +++ b/build/common.props @@ -16,7 +16,8 @@ - + + diff --git a/build/dependencies.props b/build/dependencies.props index 3e338573..2174a5d0 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -6,6 +6,7 @@ 2.1.0-* 10.0.1 $(BundledNETStandardPackageVersion) + 2.0.0-* 2.0.0-* 4.7.0 diff --git a/samples/misc/LatencyTest/LatencyTest.csproj b/samples/misc/LatencyTest/LatencyTest.csproj index 8c17cdb5..43d5f17a 100644 --- a/samples/misc/LatencyTest/LatencyTest.csproj +++ b/samples/misc/LatencyTest/LatencyTest.csproj @@ -1,9 +1,9 @@  - + - netcoreapp2.0 + netcoreapp2.0;net461 false exe diff --git a/samples/misc/NodeServicesExamples/NodeServicesExamples.csproj b/samples/misc/NodeServicesExamples/NodeServicesExamples.csproj index 0604193d..4bbb9ec1 100644 --- a/samples/misc/NodeServicesExamples/NodeServicesExamples.csproj +++ b/samples/misc/NodeServicesExamples/NodeServicesExamples.csproj @@ -1,9 +1,9 @@ - + - netcoreapp2.0 + netcoreapp2.0;net461 true false diff --git a/samples/misc/Webpack/ActionResults/PrerenderResult.cs b/samples/misc/Webpack/ActionResults/PrerenderResult.cs index e80b5b12..4f2c8f50 100644 --- a/samples/misc/Webpack/ActionResults/PrerenderResult.cs +++ b/samples/misc/Webpack/ActionResults/PrerenderResult.cs @@ -27,6 +27,7 @@ public override async Task ExecuteResultAsync(ActionContext context) { var nodeServices = context.HttpContext.RequestServices.GetRequiredService(); var hostEnv = context.HttpContext.RequestServices.GetRequiredService(); + var applicationLifetime = context.HttpContext.RequestServices.GetRequiredService(); var applicationBasePath = hostEnv.ContentRootPath; var request = context.HttpContext.Request; var response = context.HttpContext.Response; @@ -34,6 +35,7 @@ public override async Task ExecuteResultAsync(ActionContext context) var prerenderedHtml = await Prerenderer.RenderToString( applicationBasePath, nodeServices, + applicationLifetime.ApplicationStopping, _moduleExport, request.GetEncodedUrl(), request.Path + request.QueryString.Value, diff --git a/samples/misc/Webpack/Webpack.csproj b/samples/misc/Webpack/Webpack.csproj index 9cabae2f..eedacabc 100644 --- a/samples/misc/Webpack/Webpack.csproj +++ b/samples/misc/Webpack/Webpack.csproj @@ -1,9 +1,9 @@ - + - netcoreapp2.0 + netcoreapp2.0;net461 true false From e38399fbf46315af5ad12673609c11d951e9062a Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 7 Jun 2017 12:04:59 +0100 Subject: [PATCH 111/411] Remove redundant explicit SpaServices references from templates now it's on the .All metapackage anyway --- templates/AngularSpa/AngularSpa.csproj | 1 - templates/AureliaSpa/AureliaSpa.csproj | 1 - templates/KnockoutSpa/KnockoutSpa.csproj | 1 - templates/ReactReduxSpa/ReactReduxSpa.csproj | 1 - templates/ReactSpa/ReactSpa.csproj | 1 - templates/VueSpa/VueSpa.csproj | 1 - 6 files changed, 6 deletions(-) diff --git a/templates/AngularSpa/AngularSpa.csproj b/templates/AngularSpa/AngularSpa.csproj index 96f705d8..7ff41003 100644 --- a/templates/AngularSpa/AngularSpa.csproj +++ b/templates/AngularSpa/AngularSpa.csproj @@ -9,7 +9,6 @@ - diff --git a/templates/AureliaSpa/AureliaSpa.csproj b/templates/AureliaSpa/AureliaSpa.csproj index 4fd79511..ff88f56c 100644 --- a/templates/AureliaSpa/AureliaSpa.csproj +++ b/templates/AureliaSpa/AureliaSpa.csproj @@ -9,7 +9,6 @@ - diff --git a/templates/KnockoutSpa/KnockoutSpa.csproj b/templates/KnockoutSpa/KnockoutSpa.csproj index 4fd79511..ff88f56c 100644 --- a/templates/KnockoutSpa/KnockoutSpa.csproj +++ b/templates/KnockoutSpa/KnockoutSpa.csproj @@ -9,7 +9,6 @@ - diff --git a/templates/ReactReduxSpa/ReactReduxSpa.csproj b/templates/ReactReduxSpa/ReactReduxSpa.csproj index 96f705d8..7ff41003 100644 --- a/templates/ReactReduxSpa/ReactReduxSpa.csproj +++ b/templates/ReactReduxSpa/ReactReduxSpa.csproj @@ -9,7 +9,6 @@ - diff --git a/templates/ReactSpa/ReactSpa.csproj b/templates/ReactSpa/ReactSpa.csproj index 4fd79511..ff88f56c 100644 --- a/templates/ReactSpa/ReactSpa.csproj +++ b/templates/ReactSpa/ReactSpa.csproj @@ -9,7 +9,6 @@ - diff --git a/templates/VueSpa/VueSpa.csproj b/templates/VueSpa/VueSpa.csproj index 4fd79511..ff88f56c 100644 --- a/templates/VueSpa/VueSpa.csproj +++ b/templates/VueSpa/VueSpa.csproj @@ -9,7 +9,6 @@ - From 5127a74d3f4acfbd2e8cc9b8141518d004f05728 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 7 Jun 2017 12:19:32 +0100 Subject: [PATCH 112/411] Clean up dependencies.props --- build/dependencies.props | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 2174a5d0..48eb12cd 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -2,12 +2,11 @@ 2.0.0-preview2-* 5.0.2 - 4.3.0 2.1.0-* 10.0.1 $(BundledNETStandardPackageVersion) 2.0.0-* - 2.0.0-* + 2.0.0-* 4.7.0 From c7b7f40d2c9e2ded37c4a7108b74cf8ace71d6f0 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 7 Jun 2017 22:27:43 +0100 Subject: [PATCH 113/411] Update template package to support generating net461 projects as well as netcoreapp2.0 --- templates/AngularSpa/AngularSpa.csproj | 11 +++++++-- templates/AureliaSpa/AureliaSpa.csproj | 11 +++++++-- templates/KnockoutSpa/KnockoutSpa.csproj | 11 +++++++-- templates/ReactReduxSpa/ReactReduxSpa.csproj | 11 +++++++-- templates/ReactSpa/ReactSpa.csproj | 11 +++++++-- templates/VueSpa/VueSpa.csproj | 11 +++++++-- templates/package-builder/src/build/build.ts | 25 +++++++++++++++++--- 7 files changed, 76 insertions(+), 15 deletions(-) diff --git a/templates/AngularSpa/AngularSpa.csproj b/templates/AngularSpa/AngularSpa.csproj index 7ff41003..57ed7d46 100644 --- a/templates/AngularSpa/AngularSpa.csproj +++ b/templates/AngularSpa/AngularSpa.csproj @@ -1,15 +1,22 @@ - netcoreapp2.0 + netcoreapp2.0 + TargetFrameworkOverride true $(PackageTargetFallback);portable-net45+win8+wp8+wpa81; false - + + + + + + + diff --git a/templates/AureliaSpa/AureliaSpa.csproj b/templates/AureliaSpa/AureliaSpa.csproj index ff88f56c..ae09f5b6 100644 --- a/templates/AureliaSpa/AureliaSpa.csproj +++ b/templates/AureliaSpa/AureliaSpa.csproj @@ -1,15 +1,22 @@ - netcoreapp2.0 + netcoreapp2.0 + TargetFrameworkOverride true $(PackageTargetFallback);portable-net45+win8+wp8+wpa81; false - + + + + + + + diff --git a/templates/KnockoutSpa/KnockoutSpa.csproj b/templates/KnockoutSpa/KnockoutSpa.csproj index ff88f56c..ae09f5b6 100644 --- a/templates/KnockoutSpa/KnockoutSpa.csproj +++ b/templates/KnockoutSpa/KnockoutSpa.csproj @@ -1,15 +1,22 @@ - netcoreapp2.0 + netcoreapp2.0 + TargetFrameworkOverride true $(PackageTargetFallback);portable-net45+win8+wp8+wpa81; false - + + + + + + + diff --git a/templates/ReactReduxSpa/ReactReduxSpa.csproj b/templates/ReactReduxSpa/ReactReduxSpa.csproj index 7ff41003..57ed7d46 100644 --- a/templates/ReactReduxSpa/ReactReduxSpa.csproj +++ b/templates/ReactReduxSpa/ReactReduxSpa.csproj @@ -1,15 +1,22 @@ - netcoreapp2.0 + netcoreapp2.0 + TargetFrameworkOverride true $(PackageTargetFallback);portable-net45+win8+wp8+wpa81; false - + + + + + + + diff --git a/templates/ReactSpa/ReactSpa.csproj b/templates/ReactSpa/ReactSpa.csproj index ff88f56c..ae09f5b6 100644 --- a/templates/ReactSpa/ReactSpa.csproj +++ b/templates/ReactSpa/ReactSpa.csproj @@ -1,15 +1,22 @@ - netcoreapp2.0 + netcoreapp2.0 + TargetFrameworkOverride true $(PackageTargetFallback);portable-net45+win8+wp8+wpa81; false - + + + + + + + diff --git a/templates/VueSpa/VueSpa.csproj b/templates/VueSpa/VueSpa.csproj index ff88f56c..ae09f5b6 100644 --- a/templates/VueSpa/VueSpa.csproj +++ b/templates/VueSpa/VueSpa.csproj @@ -1,15 +1,22 @@ - netcoreapp2.0 + netcoreapp2.0 + TargetFrameworkOverride true $(PackageTargetFallback);portable-net45+win8+wp8+wpa81; false - + + + + + + + diff --git a/templates/package-builder/src/build/build.ts b/templates/package-builder/src/build/build.ts index 99854205..b98a4b06 100644 --- a/templates/package-builder/src/build/build.ts +++ b/templates/package-builder/src/build/build.ts @@ -181,6 +181,13 @@ function buildDotNetNewNuGetPackage(packageId: string) { exclude: ['.template.config/**'] }], symbols: { + TargetFrameworkOverride: { + type: 'parameter', + description: 'Overrides the target framework', + replaces: 'TargetFrameworkOverride', + datatype: 'string', + defaultValue: '' + }, Framework: { type: 'parameter', description: 'The target framework for the project.', @@ -191,6 +198,7 @@ function buildDotNetNewNuGetPackage(packageId: string) { description: 'Target netcoreapp2.0' } ], + replaces: 'netcoreapp2.0', defaultValue: 'netcoreapp2.0' }, skipRestore: { @@ -226,7 +234,16 @@ function buildDotNetNewNuGetPackage(packageId: string) { }, null, 2)); fs.writeFileSync(path.join(templateConfigDir, 'dotnetcli.host.json'), JSON.stringify({ + $schema: 'http://json.schemastore.org/dotnetcli.host', symbolInfo: { + TargetFrameworkOverride: { + isHidden: 'true', + longName: 'target-framework-override', + shortName: '' + }, + Framework: { + longName: 'framework' + }, skipRestore: { longName: 'no-restore', shortName: '' @@ -235,12 +252,14 @@ function buildDotNetNewNuGetPackage(packageId: string) { }, null, 2)); fs.writeFileSync(path.join(templateConfigDir, 'vs-2017.3.host.json'), JSON.stringify({ + $schema: 'http://json.schemastore.org/vs-2017.3.host', name: { text: templateConfig.displayName }, - description: { text: `Web application built with MVC ASP.NET Core and ${templateConfig.displayName}` }, - order: 2000, + description: { text: `ASP.NET Core application with MVC and ${templateConfig.displayName}` }, + order: 301, icon: 'icon.png', learnMoreLink: 'https://github.com/aspnet/JavaScriptServices', - uiFilters: [ 'oneaspnet' ] + uiFilters: [ 'oneaspnet' ], + minFullFrameworkVersion: '4.6.1' }, null, 2)); }); From 60c8a3471d5291f2e4dc2d62fceae6529a98e054 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 7 Jun 2017 22:53:55 +0100 Subject: [PATCH 114/411] Enable localisation for template names/descriptions in VS --- templates/package-builder/src/build/build.ts | 21 ++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/templates/package-builder/src/build/build.ts b/templates/package-builder/src/build/build.ts index b98a4b06..3e920fad 100644 --- a/templates/package-builder/src/build/build.ts +++ b/templates/package-builder/src/build/build.ts @@ -11,6 +11,7 @@ import * as targz from 'tar.gz'; const isWindows = /^win/.test(process.platform); const textFileExtensions = ['.gitignore', 'template_gitignore', '.config', '.cs', '.cshtml', '.csproj', '.html', '.js', '.json', '.jsx', '.md', '.nuspec', '.ts', '.tsx']; const yeomanGeneratorSource = './src/yeoman'; +const localizationPackageGuid = '{296D76CB-AD6F-4B46-9072-33CC07E265F8}'; const dotNetPackages = { builtIn: 'Microsoft.DotNet.Web.Spa.ProjectTemplates', @@ -22,15 +23,16 @@ interface TemplateConfig { dotNetNewId: string; dotNetPackageId: string; displayName: string; + localizationIdStart: number; } const templates: { [key: string]: TemplateConfig } = { - 'angular': { dotNetPackageId: dotNetPackages.builtIn, dir: '../../templates/AngularSpa/', dotNetNewId: 'Angular', displayName: 'Angular' }, - 'aurelia': { dotNetPackageId: dotNetPackages.extra, dir: '../../templates/AureliaSpa/', dotNetNewId: 'Aurelia', displayName: 'Aurelia' }, - 'knockout': { dotNetPackageId: dotNetPackages.extra, dir: '../../templates/KnockoutSpa/', dotNetNewId: 'Knockout', displayName: 'Knockout.js' }, - 'react-redux': { dotNetPackageId: dotNetPackages.builtIn, dir: '../../templates/ReactReduxSpa/', dotNetNewId: 'ReactRedux', displayName: 'React.js and Redux' }, - 'react': { dotNetPackageId: dotNetPackages.builtIn, dir: '../../templates/ReactSpa/', dotNetNewId: 'React', displayName: 'React.js' }, - 'vue': { dotNetPackageId: dotNetPackages.extra, dir: '../../templates/VueSpa/', dotNetNewId: 'Vue', displayName: 'Vue.js' } + 'angular': { dotNetPackageId: dotNetPackages.builtIn, dir: '../../templates/AngularSpa/', dotNetNewId: 'Angular', displayName: 'Angular', localizationIdStart: 100 }, + 'aurelia': { dotNetPackageId: dotNetPackages.extra, dir: '../../templates/AureliaSpa/', dotNetNewId: 'Aurelia', displayName: 'Aurelia', localizationIdStart: 200 }, + 'knockout': { dotNetPackageId: dotNetPackages.extra, dir: '../../templates/KnockoutSpa/', dotNetNewId: 'Knockout', displayName: 'Knockout.js', localizationIdStart: 300 }, + 'react-redux': { dotNetPackageId: dotNetPackages.builtIn, dir: '../../templates/ReactReduxSpa/', dotNetNewId: 'ReactRedux', displayName: 'React.js and Redux', localizationIdStart: 400 }, + 'react': { dotNetPackageId: dotNetPackages.builtIn, dir: '../../templates/ReactSpa/', dotNetNewId: 'React', displayName: 'React.js', localizationIdStart: 500 }, + 'vue': { dotNetPackageId: dotNetPackages.extra, dir: '../../templates/VueSpa/', dotNetNewId: 'Vue', displayName: 'Vue.js', localizationIdStart: 600 } }; function isTextFile(filename: string): boolean { @@ -251,10 +253,13 @@ function buildDotNetNewNuGetPackage(packageId: string) { } }, null, 2)); + const localisedNameId = templateConfig.localizationIdStart + 0; + const localisedDescId = templateConfig.localizationIdStart + 1; + fs.writeFileSync(path.join(templateConfigDir, 'vs-2017.3.host.json'), JSON.stringify({ $schema: 'http://json.schemastore.org/vs-2017.3.host', - name: { text: templateConfig.displayName }, - description: { text: `ASP.NET Core application with MVC and ${templateConfig.displayName}` }, + name: { text: templateConfig.displayName, package: localizationPackageGuid, id: localisedNameId.toString() }, + description: { text: `ASP.NET Core application with ${templateConfig.displayName}`, package: localizationPackageGuid, id: localisedDescId.toString() }, order: 301, icon: 'icon.png', learnMoreLink: 'https://github.com/aspnet/JavaScriptServices', From 0526852e05d10f82ea3bbd71f51fb7ffefacbac1 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 8 Jun 2017 10:33:27 +0100 Subject: [PATCH 115/411] Pin templates' .NET reference version numbers on Coherence 25571 in same way as stock Web templates do. This also fixes net461 support. --- templates/AngularSpa/AngularSpa.csproj | 13 +++++++------ templates/AureliaSpa/AureliaSpa.csproj | 11 ++++++----- templates/KnockoutSpa/KnockoutSpa.csproj | 11 ++++++----- templates/ReactReduxSpa/ReactReduxSpa.csproj | 11 ++++++----- templates/ReactSpa/ReactSpa.csproj | 11 ++++++----- templates/VueSpa/VueSpa.csproj | 11 ++++++----- 6 files changed, 37 insertions(+), 31 deletions(-) diff --git a/templates/AngularSpa/AngularSpa.csproj b/templates/AngularSpa/AngularSpa.csproj index 57ed7d46..a5857ed9 100644 --- a/templates/AngularSpa/AngularSpa.csproj +++ b/templates/AngularSpa/AngularSpa.csproj @@ -9,17 +9,18 @@ - + - - - - + + + + + - + diff --git a/templates/AureliaSpa/AureliaSpa.csproj b/templates/AureliaSpa/AureliaSpa.csproj index ae09f5b6..59371ac4 100644 --- a/templates/AureliaSpa/AureliaSpa.csproj +++ b/templates/AureliaSpa/AureliaSpa.csproj @@ -9,13 +9,14 @@ - + - - - - + + + + + diff --git a/templates/KnockoutSpa/KnockoutSpa.csproj b/templates/KnockoutSpa/KnockoutSpa.csproj index ae09f5b6..59371ac4 100644 --- a/templates/KnockoutSpa/KnockoutSpa.csproj +++ b/templates/KnockoutSpa/KnockoutSpa.csproj @@ -9,13 +9,14 @@ - + - - - - + + + + + diff --git a/templates/ReactReduxSpa/ReactReduxSpa.csproj b/templates/ReactReduxSpa/ReactReduxSpa.csproj index 57ed7d46..c0d719c3 100644 --- a/templates/ReactReduxSpa/ReactReduxSpa.csproj +++ b/templates/ReactReduxSpa/ReactReduxSpa.csproj @@ -9,13 +9,14 @@ - + - - - - + + + + + diff --git a/templates/ReactSpa/ReactSpa.csproj b/templates/ReactSpa/ReactSpa.csproj index ae09f5b6..59371ac4 100644 --- a/templates/ReactSpa/ReactSpa.csproj +++ b/templates/ReactSpa/ReactSpa.csproj @@ -9,13 +9,14 @@ - + - - - - + + + + + diff --git a/templates/VueSpa/VueSpa.csproj b/templates/VueSpa/VueSpa.csproj index ae09f5b6..59371ac4 100644 --- a/templates/VueSpa/VueSpa.csproj +++ b/templates/VueSpa/VueSpa.csproj @@ -9,13 +9,14 @@ - + - - - - + + + + + From 0dd24068ca83f3a572b918ad25fdeda04864b4b5 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 8 Jun 2017 10:38:00 +0100 Subject: [PATCH 116/411] Update VS template name localisation IDs and texts as instructed --- templates/package-builder/src/build/build.ts | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/templates/package-builder/src/build/build.ts b/templates/package-builder/src/build/build.ts index 3e920fad..4f302545 100644 --- a/templates/package-builder/src/build/build.ts +++ b/templates/package-builder/src/build/build.ts @@ -11,7 +11,7 @@ import * as targz from 'tar.gz'; const isWindows = /^win/.test(process.platform); const textFileExtensions = ['.gitignore', 'template_gitignore', '.config', '.cs', '.cshtml', '.csproj', '.html', '.js', '.json', '.jsx', '.md', '.nuspec', '.ts', '.tsx']; const yeomanGeneratorSource = './src/yeoman'; -const localizationPackageGuid = '{296D76CB-AD6F-4B46-9072-33CC07E265F8}'; +const webToolsVSPackageGuid = '{0CD94836-1526-4E85-87D3-FB5274C5AFC9}'; const dotNetPackages = { builtIn: 'Microsoft.DotNet.Web.Spa.ProjectTemplates', @@ -27,12 +27,12 @@ interface TemplateConfig { } const templates: { [key: string]: TemplateConfig } = { - 'angular': { dotNetPackageId: dotNetPackages.builtIn, dir: '../../templates/AngularSpa/', dotNetNewId: 'Angular', displayName: 'Angular', localizationIdStart: 100 }, - 'aurelia': { dotNetPackageId: dotNetPackages.extra, dir: '../../templates/AureliaSpa/', dotNetNewId: 'Aurelia', displayName: 'Aurelia', localizationIdStart: 200 }, - 'knockout': { dotNetPackageId: dotNetPackages.extra, dir: '../../templates/KnockoutSpa/', dotNetNewId: 'Knockout', displayName: 'Knockout.js', localizationIdStart: 300 }, - 'react-redux': { dotNetPackageId: dotNetPackages.builtIn, dir: '../../templates/ReactReduxSpa/', dotNetNewId: 'ReactRedux', displayName: 'React.js and Redux', localizationIdStart: 400 }, - 'react': { dotNetPackageId: dotNetPackages.builtIn, dir: '../../templates/ReactSpa/', dotNetNewId: 'React', displayName: 'React.js', localizationIdStart: 500 }, - 'vue': { dotNetPackageId: dotNetPackages.extra, dir: '../../templates/VueSpa/', dotNetNewId: 'Vue', displayName: 'Vue.js', localizationIdStart: 600 } + 'angular': { dotNetPackageId: dotNetPackages.builtIn, dir: '../../templates/AngularSpa/', dotNetNewId: 'Angular', displayName: 'Angular', localizationIdStart: 1100 }, + 'aurelia': { dotNetPackageId: dotNetPackages.extra, dir: '../../templates/AureliaSpa/', dotNetNewId: 'Aurelia', displayName: 'Aurelia', localizationIdStart: 1200 }, + 'knockout': { dotNetPackageId: dotNetPackages.extra, dir: '../../templates/KnockoutSpa/', dotNetNewId: 'Knockout', displayName: 'Knockout.js', localizationIdStart: 1300 }, + 'react-redux': { dotNetPackageId: dotNetPackages.builtIn, dir: '../../templates/ReactReduxSpa/', dotNetNewId: 'ReactRedux', displayName: 'React.js and Redux', localizationIdStart: 1400 }, + 'react': { dotNetPackageId: dotNetPackages.builtIn, dir: '../../templates/ReactSpa/', dotNetNewId: 'React', displayName: 'React.js', localizationIdStart: 1500 }, + 'vue': { dotNetPackageId: dotNetPackages.extra, dir: '../../templates/VueSpa/', dotNetNewId: 'Vue', displayName: 'Vue.js', localizationIdStart: 1600 } }; function isTextFile(filename: string): boolean { @@ -258,8 +258,8 @@ function buildDotNetNewNuGetPackage(packageId: string) { fs.writeFileSync(path.join(templateConfigDir, 'vs-2017.3.host.json'), JSON.stringify({ $schema: 'http://json.schemastore.org/vs-2017.3.host', - name: { text: templateConfig.displayName, package: localizationPackageGuid, id: localisedNameId.toString() }, - description: { text: `ASP.NET Core application with ${templateConfig.displayName}`, package: localizationPackageGuid, id: localisedDescId.toString() }, + name: { text: templateConfig.displayName, package: webToolsVSPackageGuid, id: localisedNameId.toString() }, + description: { text: `A project template for creating an ASP.NET Core application with ${templateConfig.displayName}`, package: webToolsVSPackageGuid, id: localisedDescId.toString() }, order: 301, icon: 'icon.png', learnMoreLink: 'https://github.com/aspnet/JavaScriptServices', From f3b7103c83ef38d787c2e66bc761a1c4c562937a Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 8 Jun 2017 11:08:36 +0100 Subject: [PATCH 117/411] In AngularSpa template, redefine app.module.shared as a real NgModule. Fixes #986. --- .../ClientApp/app/app.module.browser.ts | 17 +++++++++++++++ .../ClientApp/app/app.module.client.ts | 21 ------------------- .../ClientApp/app/app.module.server.ts | 8 +++---- .../ClientApp/app/app.module.shared.ts | 15 +++++++++---- templates/AngularSpa/ClientApp/boot-client.ts | 2 +- 5 files changed, 33 insertions(+), 30 deletions(-) create mode 100644 templates/AngularSpa/ClientApp/app/app.module.browser.ts delete mode 100644 templates/AngularSpa/ClientApp/app/app.module.client.ts diff --git a/templates/AngularSpa/ClientApp/app/app.module.browser.ts b/templates/AngularSpa/ClientApp/app/app.module.browser.ts new file mode 100644 index 00000000..e3393ce9 --- /dev/null +++ b/templates/AngularSpa/ClientApp/app/app.module.browser.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { AppModuleShared } from './app.module.shared'; +import { AppComponent } from './components/app/app.component'; + +@NgModule({ + bootstrap: [ AppComponent ], + imports: [ + BrowserModule, + AppModuleShared + ], + providers: [ + { provide: 'ORIGIN_URL', useValue: location.origin } + ] +}) +export class AppModule { +} diff --git a/templates/AngularSpa/ClientApp/app/app.module.client.ts b/templates/AngularSpa/ClientApp/app/app.module.client.ts deleted file mode 100644 index ee778122..00000000 --- a/templates/AngularSpa/ClientApp/app/app.module.client.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { NgModule } from '@angular/core'; -import { BrowserModule } from '@angular/platform-browser'; -import { FormsModule } from '@angular/forms'; -import { HttpModule } from '@angular/http'; -import { sharedConfig } from './app.module.shared'; - -@NgModule({ - bootstrap: sharedConfig.bootstrap, - declarations: sharedConfig.declarations, - imports: [ - BrowserModule, - FormsModule, - HttpModule, - ...sharedConfig.imports - ], - providers: [ - { provide: 'ORIGIN_URL', useValue: location.origin } - ] -}) -export class AppModule { -} diff --git a/templates/AngularSpa/ClientApp/app/app.module.server.ts b/templates/AngularSpa/ClientApp/app/app.module.server.ts index f2b6eb4b..0608381c 100644 --- a/templates/AngularSpa/ClientApp/app/app.module.server.ts +++ b/templates/AngularSpa/ClientApp/app/app.module.server.ts @@ -1,13 +1,13 @@ import { NgModule } from '@angular/core'; import { ServerModule } from '@angular/platform-server'; -import { sharedConfig } from './app.module.shared'; +import { AppModuleShared } from './app.module.shared'; +import { AppComponent } from './components/app/app.component'; @NgModule({ - bootstrap: sharedConfig.bootstrap, - declarations: sharedConfig.declarations, + bootstrap: [ AppComponent ], imports: [ ServerModule, - ...sharedConfig.imports + AppModuleShared ] }) export class AppModule { diff --git a/templates/AngularSpa/ClientApp/app/app.module.shared.ts b/templates/AngularSpa/ClientApp/app/app.module.shared.ts index 18615017..70d07971 100644 --- a/templates/AngularSpa/ClientApp/app/app.module.shared.ts +++ b/templates/AngularSpa/ClientApp/app/app.module.shared.ts @@ -1,14 +1,16 @@ import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; +import { HttpModule } from '@angular/http'; import { RouterModule } from '@angular/router'; -import { AppComponent } from './components/app/app.component' +import { AppComponent } from './components/app/app.component'; import { NavMenuComponent } from './components/navmenu/navmenu.component'; import { HomeComponent } from './components/home/home.component'; import { FetchDataComponent } from './components/fetchdata/fetchdata.component'; import { CounterComponent } from './components/counter/counter.component'; -export const sharedConfig: NgModule = { - bootstrap: [ AppComponent ], +@NgModule({ declarations: [ AppComponent, NavMenuComponent, @@ -17,6 +19,9 @@ export const sharedConfig: NgModule = { HomeComponent ], imports: [ + CommonModule, + HttpModule, + FormsModule, RouterModule.forRoot([ { path: '', redirectTo: 'home', pathMatch: 'full' }, { path: 'home', component: HomeComponent }, @@ -25,4 +30,6 @@ export const sharedConfig: NgModule = { { path: '**', redirectTo: 'home' } ]) ] -}; +}) +export class AppModuleShared { +} diff --git a/templates/AngularSpa/ClientApp/boot-client.ts b/templates/AngularSpa/ClientApp/boot-client.ts index 45c471c4..f07d936b 100644 --- a/templates/AngularSpa/ClientApp/boot-client.ts +++ b/templates/AngularSpa/ClientApp/boot-client.ts @@ -2,7 +2,7 @@ import 'reflect-metadata'; import 'zone.js'; import { enableProdMode } from '@angular/core'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; -import { AppModule } from './app/app.module.client'; +import { AppModule } from './app/app.module.browser'; if (module['hot']) { module['hot'].accept(); From bcaa3af92ed04ce2309849ea842c0850b75e7384 Mon Sep 17 00:00:00 2001 From: danobri Date: Fri, 26 May 2017 15:34:37 -0500 Subject: [PATCH 118/411] Re-add bootstrap import In the update to Angular 4, the bootstrap import got removed from boot.client.ts, causing the navbar-toggle menu to longer work in the template. Re-adding so navbar-toggle is functional again. --- templates/AngularSpa/ClientApp/boot-client.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/AngularSpa/ClientApp/boot-client.ts b/templates/AngularSpa/ClientApp/boot-client.ts index f07d936b..e1311bdb 100644 --- a/templates/AngularSpa/ClientApp/boot-client.ts +++ b/templates/AngularSpa/ClientApp/boot-client.ts @@ -1,5 +1,6 @@ import 'reflect-metadata'; import 'zone.js'; +import 'bootstrap'; import { enableProdMode } from '@angular/core'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; import { AppModule } from './app/app.module.browser'; From bf6d2227db2f50e621848c8a3c99154bbb944d15 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 8 Jun 2017 11:43:38 +0100 Subject: [PATCH 119/411] In dotnet new templates, display instruction to run "npm install" manually --- templates/package-builder/src/build/build.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/templates/package-builder/src/build/build.ts b/templates/package-builder/src/build/build.ts index 4f302545..d5d246e0 100644 --- a/templates/package-builder/src/build/build.ts +++ b/templates/package-builder/src/build/build.ts @@ -232,6 +232,14 @@ function buildDotNetNewNuGetPackage(packageId: string) { continueOnError: false } */ + { + // For the preview2 release, just display manual instructions instead. + // This is only applicable on the command line, because VS will restore + // NPM packages automatically by default. + actionId: 'AC1156F7-BB77-4DB8-B28F-24EEBCCA1E5C', + description: '\n\n-------------------------------------------------------------------\nIMPORTANT: Before running this project on the command line,\n you must restore NPM packages by running "npm install"\n-------------------------------------------------------------------\n', + manualInstructions: [{ text: 'Run "npm install"' }] + } ], }, null, 2)); From 9a59bccad9716314240b69580199ce48c0a42a74 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Sat, 10 Jun 2017 14:11:20 +0100 Subject: [PATCH 120/411] If Node isn't installed, give clear instructions rather than random build errors --- templates/AngularSpa/AngularSpa.csproj | 6 ++++++ templates/AureliaSpa/AureliaSpa.csproj | 6 ++++++ templates/KnockoutSpa/KnockoutSpa.csproj | 6 ++++++ templates/ReactReduxSpa/ReactReduxSpa.csproj | 6 ++++++ templates/ReactSpa/ReactSpa.csproj | 6 ++++++ templates/VueSpa/VueSpa.csproj | 6 ++++++ 6 files changed, 36 insertions(+) diff --git a/templates/AngularSpa/AngularSpa.csproj b/templates/AngularSpa/AngularSpa.csproj index a5857ed9..8eedd192 100644 --- a/templates/AngularSpa/AngularSpa.csproj +++ b/templates/AngularSpa/AngularSpa.csproj @@ -30,6 +30,12 @@ + + + + + + diff --git a/templates/AureliaSpa/AureliaSpa.csproj b/templates/AureliaSpa/AureliaSpa.csproj index 59371ac4..5c072385 100644 --- a/templates/AureliaSpa/AureliaSpa.csproj +++ b/templates/AureliaSpa/AureliaSpa.csproj @@ -25,6 +25,12 @@ + + + + + + diff --git a/templates/KnockoutSpa/KnockoutSpa.csproj b/templates/KnockoutSpa/KnockoutSpa.csproj index 59371ac4..5c072385 100644 --- a/templates/KnockoutSpa/KnockoutSpa.csproj +++ b/templates/KnockoutSpa/KnockoutSpa.csproj @@ -25,6 +25,12 @@ + + + + + + diff --git a/templates/ReactReduxSpa/ReactReduxSpa.csproj b/templates/ReactReduxSpa/ReactReduxSpa.csproj index c0d719c3..aa058500 100644 --- a/templates/ReactReduxSpa/ReactReduxSpa.csproj +++ b/templates/ReactReduxSpa/ReactReduxSpa.csproj @@ -30,6 +30,12 @@ + + + + + + diff --git a/templates/ReactSpa/ReactSpa.csproj b/templates/ReactSpa/ReactSpa.csproj index 59371ac4..5c072385 100644 --- a/templates/ReactSpa/ReactSpa.csproj +++ b/templates/ReactSpa/ReactSpa.csproj @@ -25,6 +25,12 @@ + + + + + + diff --git a/templates/VueSpa/VueSpa.csproj b/templates/VueSpa/VueSpa.csproj index 59371ac4..5c072385 100644 --- a/templates/VueSpa/VueSpa.csproj +++ b/templates/VueSpa/VueSpa.csproj @@ -25,6 +25,12 @@ + + + + + + From 728b18431dbe731d4cfbbde4c98c1c35d097a667 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Sun, 11 Jun 2017 19:28:51 +0100 Subject: [PATCH 121/411] In dotnet new templates, only show "npm install" instruction when executing in CLI --- templates/package-builder/src/build/build.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/templates/package-builder/src/build/build.ts b/templates/package-builder/src/build/build.ts index d5d246e0..cb549b55 100644 --- a/templates/package-builder/src/build/build.ts +++ b/templates/package-builder/src/build/build.ts @@ -203,6 +203,10 @@ function buildDotNetNewNuGetPackage(packageId: string) { replaces: 'netcoreapp2.0', defaultValue: 'netcoreapp2.0' }, + HostIdentifier: { + type: 'bind', + binding: 'HostIdentifier' + }, skipRestore: { type: 'parameter', datatype: 'bool', @@ -236,6 +240,7 @@ function buildDotNetNewNuGetPackage(packageId: string) { // For the preview2 release, just display manual instructions instead. // This is only applicable on the command line, because VS will restore // NPM packages automatically by default. + condition: '(HostIdentifier == "dotnetcli" || HostIdentifier == "dotnetcli-preview")', actionId: 'AC1156F7-BB77-4DB8-B28F-24EEBCCA1E5C', description: '\n\n-------------------------------------------------------------------\nIMPORTANT: Before running this project on the command line,\n you must restore NPM packages by running "npm install"\n-------------------------------------------------------------------\n', manualInstructions: [{ text: 'Run "npm install"' }] From 8396be24c8779f5b29f77f2c5dbcc20a9418eb58 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Sun, 11 Jun 2017 19:39:46 +0100 Subject: [PATCH 122/411] Fix VS2017.3 warning about not specifying TypeScriptToolsVersion --- templates/AngularSpa/AngularSpa.csproj | 1 + templates/AureliaSpa/AureliaSpa.csproj | 1 + templates/KnockoutSpa/KnockoutSpa.csproj | 1 + templates/ReactReduxSpa/ReactReduxSpa.csproj | 1 + templates/ReactSpa/ReactSpa.csproj | 1 + templates/VueSpa/VueSpa.csproj | 1 + 6 files changed, 6 insertions(+) diff --git a/templates/AngularSpa/AngularSpa.csproj b/templates/AngularSpa/AngularSpa.csproj index 8eedd192..4d076268 100644 --- a/templates/AngularSpa/AngularSpa.csproj +++ b/templates/AngularSpa/AngularSpa.csproj @@ -4,6 +4,7 @@ netcoreapp2.0 TargetFrameworkOverride true + Latest $(PackageTargetFallback);portable-net45+win8+wp8+wpa81; false diff --git a/templates/AureliaSpa/AureliaSpa.csproj b/templates/AureliaSpa/AureliaSpa.csproj index 5c072385..56fde8ce 100644 --- a/templates/AureliaSpa/AureliaSpa.csproj +++ b/templates/AureliaSpa/AureliaSpa.csproj @@ -4,6 +4,7 @@ netcoreapp2.0 TargetFrameworkOverride true + Latest $(PackageTargetFallback);portable-net45+win8+wp8+wpa81; false diff --git a/templates/KnockoutSpa/KnockoutSpa.csproj b/templates/KnockoutSpa/KnockoutSpa.csproj index 5c072385..56fde8ce 100644 --- a/templates/KnockoutSpa/KnockoutSpa.csproj +++ b/templates/KnockoutSpa/KnockoutSpa.csproj @@ -4,6 +4,7 @@ netcoreapp2.0 TargetFrameworkOverride true + Latest $(PackageTargetFallback);portable-net45+win8+wp8+wpa81; false diff --git a/templates/ReactReduxSpa/ReactReduxSpa.csproj b/templates/ReactReduxSpa/ReactReduxSpa.csproj index aa058500..3706db87 100644 --- a/templates/ReactReduxSpa/ReactReduxSpa.csproj +++ b/templates/ReactReduxSpa/ReactReduxSpa.csproj @@ -4,6 +4,7 @@ netcoreapp2.0 TargetFrameworkOverride true + Latest $(PackageTargetFallback);portable-net45+win8+wp8+wpa81; false diff --git a/templates/ReactSpa/ReactSpa.csproj b/templates/ReactSpa/ReactSpa.csproj index 5c072385..56fde8ce 100644 --- a/templates/ReactSpa/ReactSpa.csproj +++ b/templates/ReactSpa/ReactSpa.csproj @@ -4,6 +4,7 @@ netcoreapp2.0 TargetFrameworkOverride true + Latest $(PackageTargetFallback);portable-net45+win8+wp8+wpa81; false diff --git a/templates/VueSpa/VueSpa.csproj b/templates/VueSpa/VueSpa.csproj index 5c072385..56fde8ce 100644 --- a/templates/VueSpa/VueSpa.csproj +++ b/templates/VueSpa/VueSpa.csproj @@ -4,6 +4,7 @@ netcoreapp2.0 TargetFrameworkOverride true + Latest $(PackageTargetFallback);portable-net45+win8+wp8+wpa81; false From 5e7bb0f5c5a12cce07f6d37384f05983d4d16ef8 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Sun, 11 Jun 2017 19:57:26 +0100 Subject: [PATCH 123/411] Don't log OperationCanceledException every time an HMR client disconnects --- .../Webpack/ConditionalProxyMiddleware.cs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/Microsoft.AspNetCore.SpaServices/Webpack/ConditionalProxyMiddleware.cs b/src/Microsoft.AspNetCore.SpaServices/Webpack/ConditionalProxyMiddleware.cs index 118e2640..ba0cf9f9 100644 --- a/src/Microsoft.AspNetCore.SpaServices/Webpack/ConditionalProxyMiddleware.cs +++ b/src/Microsoft.AspNetCore.SpaServices/Webpack/ConditionalProxyMiddleware.cs @@ -98,7 +98,15 @@ private async Task PerformProxyRequest(HttpContext context) using (var responseStream = await responseMessage.Content.ReadAsStreamAsync()) { - await responseStream.CopyToAsync(context.Response.Body, DefaultHttpBufferSize, context.RequestAborted); + try + { + await responseStream.CopyToAsync(context.Response.Body, DefaultHttpBufferSize, context.RequestAborted); + } + catch (OperationCanceledException) + { + // The CopyToAsync task will be canceled if the client disconnects (e.g., user + // closes or refreshes the browser tab). Don't treat this as an error. + } } return true; From a3bcc0d8633f1b615ac82604107ef4b7f7f3b85c Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Sun, 11 Jun 2017 20:28:14 +0100 Subject: [PATCH 124/411] Update debugger detection to support Node v8.1+, and stop aborting if debugger messages are unrecognised. --- .../HostingModels/OutOfProcessNodeInstance.cs | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/Microsoft.AspNetCore.NodeServices/HostingModels/OutOfProcessNodeInstance.cs b/src/Microsoft.AspNetCore.NodeServices/HostingModels/OutOfProcessNodeInstance.cs index e3532920..d02ccf93 100644 --- a/src/Microsoft.AspNetCore.NodeServices/HostingModels/OutOfProcessNodeInstance.cs +++ b/src/Microsoft.AspNetCore.NodeServices/HostingModels/OutOfProcessNodeInstance.cs @@ -381,12 +381,6 @@ private void ConnectToInputOutputStreams() { OutputLogger.LogWarning(evt.Data); } - else if (!initializationIsCompleted) - { - _connectionIsReadySource.SetException( - new InvalidOperationException("The Node.js process failed to initialize: " + evt.Data)); - initializationIsCompleted = true; - } else { OnErrorDataReceived(UnencodeNewlines(evt.Data)); @@ -400,10 +394,11 @@ private void ConnectToInputOutputStreams() private static bool IsDebuggerMessage(string message) { - return message.StartsWith("Debugger attached", StringComparison.OrdinalIgnoreCase) || - message.StartsWith("Debugger listening ", StringComparison.OrdinalIgnoreCase) || - message.StartsWith("To start debugging", StringComparison.OrdinalIgnoreCase) || - message.Equals("Warning: This is an experimental feature and could change at any time.", StringComparison.OrdinalIgnoreCase) || + return message.StartsWith("Debugger attached", StringComparison.Ordinal) || + message.StartsWith("Debugger listening ", StringComparison.Ordinal) || + message.StartsWith("To start debugging", StringComparison.Ordinal) || + message.Equals("Warning: This is an experimental feature and could change at any time.", StringComparison.Ordinal) || + message.Equals("For help see https://nodejs.org/en/docs/inspector", StringComparison.Ordinal) || message.Contains("chrome-devtools:"); } From 8e5f25534646cc6a7ebce20d053ae873098178d9 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Tue, 13 Jun 2017 09:37:40 +0100 Subject: [PATCH 125/411] Update templates to reference preview2-25661 --- templates/AngularSpa/AngularSpa.csproj | 12 ++++++------ templates/AureliaSpa/AureliaSpa.csproj | 10 +++++----- templates/KnockoutSpa/KnockoutSpa.csproj | 10 +++++----- templates/ReactReduxSpa/ReactReduxSpa.csproj | 10 +++++----- templates/ReactSpa/ReactSpa.csproj | 10 +++++----- templates/VueSpa/VueSpa.csproj | 10 +++++----- 6 files changed, 31 insertions(+), 31 deletions(-) diff --git a/templates/AngularSpa/AngularSpa.csproj b/templates/AngularSpa/AngularSpa.csproj index 4d076268..c91f2fc6 100644 --- a/templates/AngularSpa/AngularSpa.csproj +++ b/templates/AngularSpa/AngularSpa.csproj @@ -10,18 +10,18 @@ - + - - - - + + + + - + diff --git a/templates/AureliaSpa/AureliaSpa.csproj b/templates/AureliaSpa/AureliaSpa.csproj index 56fde8ce..a3b0af7d 100644 --- a/templates/AureliaSpa/AureliaSpa.csproj +++ b/templates/AureliaSpa/AureliaSpa.csproj @@ -10,14 +10,14 @@ - + - - - - + + + + diff --git a/templates/KnockoutSpa/KnockoutSpa.csproj b/templates/KnockoutSpa/KnockoutSpa.csproj index 56fde8ce..a3b0af7d 100644 --- a/templates/KnockoutSpa/KnockoutSpa.csproj +++ b/templates/KnockoutSpa/KnockoutSpa.csproj @@ -10,14 +10,14 @@ - + - - - - + + + + diff --git a/templates/ReactReduxSpa/ReactReduxSpa.csproj b/templates/ReactReduxSpa/ReactReduxSpa.csproj index 3706db87..4b6e716e 100644 --- a/templates/ReactReduxSpa/ReactReduxSpa.csproj +++ b/templates/ReactReduxSpa/ReactReduxSpa.csproj @@ -10,14 +10,14 @@ - + - - - - + + + + diff --git a/templates/ReactSpa/ReactSpa.csproj b/templates/ReactSpa/ReactSpa.csproj index 56fde8ce..a3b0af7d 100644 --- a/templates/ReactSpa/ReactSpa.csproj +++ b/templates/ReactSpa/ReactSpa.csproj @@ -10,14 +10,14 @@ - + - - - - + + + + diff --git a/templates/VueSpa/VueSpa.csproj b/templates/VueSpa/VueSpa.csproj index 56fde8ce..a3b0af7d 100644 --- a/templates/VueSpa/VueSpa.csproj +++ b/templates/VueSpa/VueSpa.csproj @@ -10,14 +10,14 @@ - + - - - - + + + + From a38d3bdc4ba3a64a534f98411e3cad6ff1acd31a Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Tue, 13 Jun 2017 09:46:18 +0100 Subject: [PATCH 126/411] Change NETStandard.Library.NETFramework reference to preview2-25405-01 for consistency with stock Web templates --- templates/AngularSpa/AngularSpa.csproj | 2 +- templates/AureliaSpa/AureliaSpa.csproj | 2 +- templates/KnockoutSpa/KnockoutSpa.csproj | 2 +- templates/ReactReduxSpa/ReactReduxSpa.csproj | 2 +- templates/ReactSpa/ReactSpa.csproj | 2 +- templates/VueSpa/VueSpa.csproj | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/AngularSpa/AngularSpa.csproj b/templates/AngularSpa/AngularSpa.csproj index c91f2fc6..a9a0547f 100644 --- a/templates/AngularSpa/AngularSpa.csproj +++ b/templates/AngularSpa/AngularSpa.csproj @@ -13,7 +13,7 @@ - + diff --git a/templates/AureliaSpa/AureliaSpa.csproj b/templates/AureliaSpa/AureliaSpa.csproj index a3b0af7d..d8b5b1ec 100644 --- a/templates/AureliaSpa/AureliaSpa.csproj +++ b/templates/AureliaSpa/AureliaSpa.csproj @@ -13,7 +13,7 @@ - + diff --git a/templates/KnockoutSpa/KnockoutSpa.csproj b/templates/KnockoutSpa/KnockoutSpa.csproj index a3b0af7d..d8b5b1ec 100644 --- a/templates/KnockoutSpa/KnockoutSpa.csproj +++ b/templates/KnockoutSpa/KnockoutSpa.csproj @@ -13,7 +13,7 @@ - + diff --git a/templates/ReactReduxSpa/ReactReduxSpa.csproj b/templates/ReactReduxSpa/ReactReduxSpa.csproj index 4b6e716e..e2e18c55 100644 --- a/templates/ReactReduxSpa/ReactReduxSpa.csproj +++ b/templates/ReactReduxSpa/ReactReduxSpa.csproj @@ -13,7 +13,7 @@ - + diff --git a/templates/ReactSpa/ReactSpa.csproj b/templates/ReactSpa/ReactSpa.csproj index a3b0af7d..d8b5b1ec 100644 --- a/templates/ReactSpa/ReactSpa.csproj +++ b/templates/ReactSpa/ReactSpa.csproj @@ -13,7 +13,7 @@ - + diff --git a/templates/VueSpa/VueSpa.csproj b/templates/VueSpa/VueSpa.csproj index a3b0af7d..d8b5b1ec 100644 --- a/templates/VueSpa/VueSpa.csproj +++ b/templates/VueSpa/VueSpa.csproj @@ -13,7 +13,7 @@ - + From bcb359e3554167a54489d2f00bce1233029f3b29 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 13 Jun 2017 11:37:59 -0700 Subject: [PATCH 127/411] Update System.Threading.Tasks.Dataflow dependency to latest corefx version --- build/dependencies.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/dependencies.props b/build/dependencies.props index 639387b8..f5072381 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -7,6 +7,6 @@ $(BundledNETStandardPackageVersion) 2.0.0-* 2.0.0-* - 4.7.0 + 4.8.0-* From 68e84bac3ffb1321ffcd393a26aace0622a8d0b5 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Tue, 13 Jun 2017 22:05:19 +0100 Subject: [PATCH 128/411] Update templates' ASP.NET dependencies to 2.0.0-preview2-final --- templates/AngularSpa/AngularSpa.csproj | 12 ++++++------ templates/AureliaSpa/AureliaSpa.csproj | 10 +++++----- templates/KnockoutSpa/KnockoutSpa.csproj | 10 +++++----- templates/ReactReduxSpa/ReactReduxSpa.csproj | 10 +++++----- templates/ReactSpa/ReactSpa.csproj | 10 +++++----- templates/VueSpa/VueSpa.csproj | 10 +++++----- 6 files changed, 31 insertions(+), 31 deletions(-) diff --git a/templates/AngularSpa/AngularSpa.csproj b/templates/AngularSpa/AngularSpa.csproj index a9a0547f..713ef3cc 100644 --- a/templates/AngularSpa/AngularSpa.csproj +++ b/templates/AngularSpa/AngularSpa.csproj @@ -10,18 +10,18 @@ - + - - - - + + + + - + diff --git a/templates/AureliaSpa/AureliaSpa.csproj b/templates/AureliaSpa/AureliaSpa.csproj index d8b5b1ec..dd562585 100644 --- a/templates/AureliaSpa/AureliaSpa.csproj +++ b/templates/AureliaSpa/AureliaSpa.csproj @@ -10,14 +10,14 @@ - + - - - - + + + + diff --git a/templates/KnockoutSpa/KnockoutSpa.csproj b/templates/KnockoutSpa/KnockoutSpa.csproj index d8b5b1ec..dd562585 100644 --- a/templates/KnockoutSpa/KnockoutSpa.csproj +++ b/templates/KnockoutSpa/KnockoutSpa.csproj @@ -10,14 +10,14 @@ - + - - - - + + + + diff --git a/templates/ReactReduxSpa/ReactReduxSpa.csproj b/templates/ReactReduxSpa/ReactReduxSpa.csproj index e2e18c55..a41eb894 100644 --- a/templates/ReactReduxSpa/ReactReduxSpa.csproj +++ b/templates/ReactReduxSpa/ReactReduxSpa.csproj @@ -10,14 +10,14 @@ - + - - - - + + + + diff --git a/templates/ReactSpa/ReactSpa.csproj b/templates/ReactSpa/ReactSpa.csproj index d8b5b1ec..dd562585 100644 --- a/templates/ReactSpa/ReactSpa.csproj +++ b/templates/ReactSpa/ReactSpa.csproj @@ -10,14 +10,14 @@ - + - - - - + + + + diff --git a/templates/VueSpa/VueSpa.csproj b/templates/VueSpa/VueSpa.csproj index d8b5b1ec..dd562585 100644 --- a/templates/VueSpa/VueSpa.csproj +++ b/templates/VueSpa/VueSpa.csproj @@ -10,14 +10,14 @@ - + - - - - + + + + From 3ef23ece2349e162a7d7b46b5f36ad1f74b80d8e Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Wed, 14 Jun 2017 15:47:11 -0700 Subject: [PATCH 129/411] Changed all references of PackageTargetFallback to AssetTargetFallback (#1035) --- templates/AngularSpa/AngularSpa.csproj | 2 +- templates/AureliaSpa/AureliaSpa.csproj | 2 +- templates/KnockoutSpa/KnockoutSpa.csproj | 2 +- templates/ReactReduxSpa/ReactReduxSpa.csproj | 2 +- templates/ReactSpa/ReactSpa.csproj | 2 +- templates/VueSpa/VueSpa.csproj | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/AngularSpa/AngularSpa.csproj b/templates/AngularSpa/AngularSpa.csproj index 713ef3cc..09074e68 100644 --- a/templates/AngularSpa/AngularSpa.csproj +++ b/templates/AngularSpa/AngularSpa.csproj @@ -5,7 +5,7 @@ TargetFrameworkOverride true Latest - $(PackageTargetFallback);portable-net45+win8+wp8+wpa81; + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; false diff --git a/templates/AureliaSpa/AureliaSpa.csproj b/templates/AureliaSpa/AureliaSpa.csproj index dd562585..9f038c34 100644 --- a/templates/AureliaSpa/AureliaSpa.csproj +++ b/templates/AureliaSpa/AureliaSpa.csproj @@ -5,7 +5,7 @@ TargetFrameworkOverride true Latest - $(PackageTargetFallback);portable-net45+win8+wp8+wpa81; + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; false diff --git a/templates/KnockoutSpa/KnockoutSpa.csproj b/templates/KnockoutSpa/KnockoutSpa.csproj index dd562585..9f038c34 100644 --- a/templates/KnockoutSpa/KnockoutSpa.csproj +++ b/templates/KnockoutSpa/KnockoutSpa.csproj @@ -5,7 +5,7 @@ TargetFrameworkOverride true Latest - $(PackageTargetFallback);portable-net45+win8+wp8+wpa81; + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; false diff --git a/templates/ReactReduxSpa/ReactReduxSpa.csproj b/templates/ReactReduxSpa/ReactReduxSpa.csproj index a41eb894..f9939aa2 100644 --- a/templates/ReactReduxSpa/ReactReduxSpa.csproj +++ b/templates/ReactReduxSpa/ReactReduxSpa.csproj @@ -5,7 +5,7 @@ TargetFrameworkOverride true Latest - $(PackageTargetFallback);portable-net45+win8+wp8+wpa81; + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; false diff --git a/templates/ReactSpa/ReactSpa.csproj b/templates/ReactSpa/ReactSpa.csproj index dd562585..9f038c34 100644 --- a/templates/ReactSpa/ReactSpa.csproj +++ b/templates/ReactSpa/ReactSpa.csproj @@ -5,7 +5,7 @@ TargetFrameworkOverride true Latest - $(PackageTargetFallback);portable-net45+win8+wp8+wpa81; + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; false diff --git a/templates/VueSpa/VueSpa.csproj b/templates/VueSpa/VueSpa.csproj index dd562585..9f038c34 100644 --- a/templates/VueSpa/VueSpa.csproj +++ b/templates/VueSpa/VueSpa.csproj @@ -5,7 +5,7 @@ TargetFrameworkOverride true Latest - $(PackageTargetFallback);portable-net45+win8+wp8+wpa81; + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; false From ed7e07a05764c4066788b087bf98ead55ab7f1fc Mon Sep 17 00:00:00 2001 From: Kiran Challa Date: Thu, 15 Jun 2017 05:18:56 -0700 Subject: [PATCH 130/411] Updated to use latest netstandard.library --- build/common.props | 2 +- build/dependencies.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/common.props b/build/common.props index 72ab892a..d9584633 100644 --- a/build/common.props +++ b/build/common.props @@ -17,7 +17,7 @@ - + diff --git a/build/dependencies.props b/build/dependencies.props index f5072381..1d945fde 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,7 +4,7 @@ 5.0.2 2.1.0-* 10.0.1 - $(BundledNETStandardPackageVersion) + 2.0.0-* 2.0.0-* 2.0.0-* 4.8.0-* From c128fa6e0656d387055482e024d9769ecfa54c9d Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Fri, 16 Jun 2017 12:57:53 +0200 Subject: [PATCH 131/411] Switch NuGet config to use preview2-final feed. This change needs to be reverted when merged back to dev branch. --- NuGet.config | 1 + 1 file changed, 1 insertion(+) diff --git a/NuGet.config b/NuGet.config index c4bc056c..fa0dd444 100644 --- a/NuGet.config +++ b/NuGet.config @@ -2,6 +2,7 @@ + From aadcfa1fb7b1ed81db51d74377eef6c89a9fa9bc Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Fri, 16 Jun 2017 13:28:00 +0200 Subject: [PATCH 132/411] Revert change that added preview2-final NuGet feed as it's not required in dev branch --- NuGet.config | 1 - 1 file changed, 1 deletion(-) diff --git a/NuGet.config b/NuGet.config index 75baa388..4e8a1f6d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,7 +3,6 @@ - From 48bca777fe7e0c66bcfdef13155cd9a5f961695e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C5=82awomir=20Rosiek?= Date: Sun, 18 Jun 2017 09:38:03 +0200 Subject: [PATCH 133/411] Added "private": true to package.json --- templates/AngularSpa/package.json | 1 + templates/AureliaSpa/package.json | 1 + templates/KnockoutSpa/package.json | 1 + templates/ReactReduxSpa/package.json | 1 + templates/ReactSpa/package.json | 1 + templates/VueSpa/package.json | 1 + 6 files changed, 6 insertions(+) diff --git a/templates/AngularSpa/package.json b/templates/AngularSpa/package.json index b34915bf..9ad4458c 100644 --- a/templates/AngularSpa/package.json +++ b/templates/AngularSpa/package.json @@ -1,5 +1,6 @@ { "name": "WebApplicationBasic", + "private": true, "version": "0.0.0", "scripts": { "test": "karma start ClientApp/test/karma.conf.js" diff --git a/templates/AureliaSpa/package.json b/templates/AureliaSpa/package.json index 86cd0015..99bc02b7 100644 --- a/templates/AureliaSpa/package.json +++ b/templates/AureliaSpa/package.json @@ -1,5 +1,6 @@ { "name": "WebApplicationBasic", + "private": true, "version": "0.0.0", "dependencies": { "aurelia-bootstrapper": "^2.0.1", diff --git a/templates/KnockoutSpa/package.json b/templates/KnockoutSpa/package.json index f4815b58..c4c42fc0 100644 --- a/templates/KnockoutSpa/package.json +++ b/templates/KnockoutSpa/package.json @@ -1,5 +1,6 @@ { "name": "WebApplicationBasic", + "private": true, "version": "0.0.0", "devDependencies": { "@types/core-js": "^0.9.34", diff --git a/templates/ReactReduxSpa/package.json b/templates/ReactReduxSpa/package.json index 56edd57c..f28c5bca 100644 --- a/templates/ReactReduxSpa/package.json +++ b/templates/ReactReduxSpa/package.json @@ -1,5 +1,6 @@ { "name": "WebApplicationBasic", + "private": true, "version": "0.0.0", "dependencies": { "@types/history": "4.5.1", diff --git a/templates/ReactSpa/package.json b/templates/ReactSpa/package.json index 65f2f4dc..541f9988 100644 --- a/templates/ReactSpa/package.json +++ b/templates/ReactSpa/package.json @@ -1,5 +1,6 @@ { "name": "WebApplicationBasic", + "private": true, "version": "0.0.0", "devDependencies": { "@types/history": "4.5.1", diff --git a/templates/VueSpa/package.json b/templates/VueSpa/package.json index e0674ee5..d7b43348 100644 --- a/templates/VueSpa/package.json +++ b/templates/VueSpa/package.json @@ -1,5 +1,6 @@ { "name": "WebApplicationBasic", + "private": true, "version": "0.0.0", "devDependencies": { "@types/requirejs": "^2.1.28", From fcd3cf9dd7474acdf8510071b8c9527ba44b96a1 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Tue, 20 Jun 2017 15:07:11 +0100 Subject: [PATCH 134/411] In aspnet-prerendering, simply type imports/exports by changing PrerenderingInterfaces to a regular module (not a .d.ts file) --- .../npm/aspnet-prerendering/src/Prerendering.ts | 2 +- ...ngInterfaces.d.ts => PrerenderingInterfaces.ts} | 14 +++++++------- .../npm/aspnet-prerendering/src/index.ts | 3 +-- 3 files changed, 9 insertions(+), 10 deletions(-) rename src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/{PrerenderingInterfaces.d.ts => PrerenderingInterfaces.ts} (80%) diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/Prerendering.ts b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/Prerendering.ts index 15969049..80a02591 100644 --- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/Prerendering.ts +++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/Prerendering.ts @@ -1,8 +1,8 @@ -/// import * as url from 'url'; import * as path from 'path'; import * as domain from 'domain'; import { run as domainTaskRun, baseUrl as domainTaskBaseUrl } from 'domain-task/main'; +import { BootFunc, BootFuncParams, BootModuleInfo, RenderToStringCallback, RenderToStringFunc } from './PrerenderingInterfaces'; const defaultTimeoutMilliseconds = 30 * 1000; diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/PrerenderingInterfaces.d.ts b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/PrerenderingInterfaces.ts similarity index 80% rename from src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/PrerenderingInterfaces.d.ts rename to src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/PrerenderingInterfaces.ts index 248c4e8c..ad32bfe3 100644 --- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/PrerenderingInterfaces.d.ts +++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/PrerenderingInterfaces.ts @@ -1,26 +1,26 @@ -interface RenderToStringFunc { +export interface RenderToStringFunc { (callback: RenderToStringCallback, applicationBasePath: string, bootModule: BootModuleInfo, absoluteRequestUrl: string, requestPathAndQuery: string, customDataParameter: any, overrideTimeoutMilliseconds: number, requestPathBase: string): void; } -interface RenderToStringCallback { +export interface RenderToStringCallback { (error: any, result?: RenderToStringResult): void; } -interface RenderToStringResult { +export interface RenderToStringResult { html: string; statusCode?: number; globals?: { [key: string]: any }; } -interface RedirectResult { +export interface RedirectResult { redirectUrl: string; } -interface BootFunc { +export interface BootFunc { (params: BootFuncParams): Promise; } -interface BootFuncParams { +export interface BootFuncParams { location: any; // e.g., Location object containing information '/some/path' origin: string; // e.g., 'https://example.com:1234/' url: string; // e.g., '/some/path' @@ -30,7 +30,7 @@ interface BootFuncParams { data: any; // any custom object passed through from .NET } -interface BootModuleInfo { +export interface BootModuleInfo { moduleName: string; exportName?: string; webpackConfig?: string; diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/index.ts b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/index.ts index 6df3ad2f..9298e1c6 100644 --- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/index.ts +++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/index.ts @@ -1,5 +1,4 @@ -/// - +import { RenderToStringResult, RedirectResult } from './PrerenderingInterfaces'; export * from './Prerendering'; export type RenderResult = RenderToStringResult | RedirectResult; From d007a3fbbaf7d1961da51f0b056f3495deda30e5 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Tue, 20 Jun 2017 15:10:29 +0100 Subject: [PATCH 135/411] In aspnet-prerendering, fix type definitions to satisfy TypeScript 2.4.0. Fixes #1034 --- .../npm/aspnet-prerendering/src/PrerenderingInterfaces.ts | 6 ++++-- .../npm/aspnet-prerendering/src/index.ts | 4 +--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/PrerenderingInterfaces.ts b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/PrerenderingInterfaces.ts index ad32bfe3..ae101bdf 100644 --- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/PrerenderingInterfaces.ts +++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/PrerenderingInterfaces.ts @@ -3,7 +3,7 @@ export interface RenderToStringFunc { } export interface RenderToStringCallback { - (error: any, result?: RenderToStringResult): void; + (error: any, result?: RenderResult): void; } export interface RenderToStringResult { @@ -16,8 +16,10 @@ export interface RedirectResult { redirectUrl: string; } +export type RenderResult = RenderToStringResult | RedirectResult; + export interface BootFunc { - (params: BootFuncParams): Promise; + (params: BootFuncParams): Promise; } export interface BootFuncParams { diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/index.ts b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/index.ts index 9298e1c6..082f07c7 100644 --- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/index.ts +++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/index.ts @@ -1,4 +1,2 @@ -import { RenderToStringResult, RedirectResult } from './PrerenderingInterfaces'; export * from './Prerendering'; - -export type RenderResult = RenderToStringResult | RedirectResult; +export * from './PrerenderingInterfaces'; From 73054559cc8e74781711506eee661765fb10cfb9 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Tue, 20 Jun 2017 15:11:23 +0100 Subject: [PATCH 136/411] Bump aspnet-prerendering version to 2.0.6 for publish --- .../npm/aspnet-prerendering/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/package.json b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/package.json index a162d463..b2813a4c 100644 --- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/package.json +++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/package.json @@ -1,6 +1,6 @@ { "name": "aspnet-prerendering", - "version": "2.0.5", + "version": "2.0.6", "description": "Helpers for server-side rendering of JavaScript applications in ASP.NET Core projects. Works in conjunction with the Microsoft.AspNetCore.SpaServices NuGet package.", "main": "index.js", "scripts": { From 460f202832d2f3aa984a626359d5d9990f33e080 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Tue, 20 Jun 2017 15:17:19 +0100 Subject: [PATCH 137/411] In React templates, update @types/react to 15.0.29 for compatibility with TypeScript 2.4.0+ --- templates/ReactReduxSpa/package.json | 2 +- templates/ReactSpa/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/ReactReduxSpa/package.json b/templates/ReactReduxSpa/package.json index f28c5bca..8e0368d8 100644 --- a/templates/ReactReduxSpa/package.json +++ b/templates/ReactReduxSpa/package.json @@ -4,7 +4,7 @@ "version": "0.0.0", "dependencies": { "@types/history": "4.5.1", - "@types/react": "15.0.24", + "@types/react": "15.0.29", "@types/react-dom": "15.5.0", "@types/react-redux": "4.4.40", "@types/react-router-dom": "4.0.4", diff --git a/templates/ReactSpa/package.json b/templates/ReactSpa/package.json index 541f9988..fd49d9b9 100644 --- a/templates/ReactSpa/package.json +++ b/templates/ReactSpa/package.json @@ -4,7 +4,7 @@ "version": "0.0.0", "devDependencies": { "@types/history": "4.5.1", - "@types/react": "15.0.24", + "@types/react": "15.0.29", "@types/react-dom": "15.5.0", "@types/react-router": "4.0.9", "@types/webpack-env": "1.13.0", From 6d85e752e1fb75ebdf4b68ac1c995e248d1f5fcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C5=82awomir=20Rosiek?= Date: Wed, 31 May 2017 20:06:06 +0200 Subject: [PATCH 138/411] Throwing HttpInvocationException instead of generic Exception --- .../HostingModels/HttpNodeInstance.cs | 37 ++++++++++++++++++- .../TypeScript/HttpNodeInstanceEntryPoint.ts | 5 ++- 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/src/Microsoft.AspNetCore.NodeServices/HostingModels/HttpNodeInstance.cs b/src/Microsoft.AspNetCore.NodeServices/HostingModels/HttpNodeInstance.cs index b1b0fe96..8dd896b0 100644 --- a/src/Microsoft.AspNetCore.NodeServices/HostingModels/HttpNodeInstance.cs +++ b/src/Microsoft.AspNetCore.NodeServices/HostingModels/HttpNodeInstance.cs @@ -21,6 +21,7 @@ namespace Microsoft.AspNetCore.NodeServices.HostingModels /// internal class HttpNodeInstance : OutOfProcessNodeInstance { + private readonly static int streamBufferSize = 16 * 1024; private static readonly Regex PortMessageRegex = new Regex(@"^\[Microsoft.AspNetCore.NodeServices.HttpNodeHost:Listening on port (\d+)\]$"); @@ -67,8 +68,10 @@ protected override async Task InvokeExportAsync( if (!response.IsSuccessStatusCode) { // Unfortunately there's no true way to cancel ReadAsStringAsync calls, hence AbandonIfCancelled - var responseErrorString = await response.Content.ReadAsStringAsync().OrThrowOnCancellation(cancellationToken); - throw new Exception("Call to Node module failed with error: " + responseErrorString); + var responseJson = await response.Content.ReadAsStringAsync().OrThrowOnCancellation(cancellationToken); + var responseError = JsonConvert.DeserializeObject(responseJson, jsonSerializerSettings); + + throw new NodeInvocationException(responseError.ErrorMessage, responseError.ErrorDetails); } var responseContentType = response.Content.Headers.ContentType; @@ -136,5 +139,35 @@ protected override void Dispose(bool disposing) _disposed = true; } } + + private static async Task ReadJsonAsync(Stream stream, CancellationToken cancellationToken) + { + var json = Encoding.UTF8.GetString(await ReadAllBytesAsync(stream, cancellationToken)); + return JsonConvert.DeserializeObject(json, jsonSerializerSettings); + } + + private static async Task ReadAllBytesAsync(Stream input, CancellationToken cancellationToken) + { + byte[] buffer = new byte[streamBufferSize]; + + using (var ms = new MemoryStream()) + { + int read; + while ((read = await input.ReadAsync(buffer, 0, buffer.Length, cancellationToken)) > 0) + { + ms.Write(buffer, 0, read); + } + + return ms.ToArray(); + } + } + +#pragma warning disable 649 // These properties are populated via JSON deserialization + private class RpcJsonResponse + { + public string ErrorMessage { get; set; } + public string ErrorDetails { get; set; } + } +#pragma warning restore 649 } } diff --git a/src/Microsoft.AspNetCore.NodeServices/TypeScript/HttpNodeInstanceEntryPoint.ts b/src/Microsoft.AspNetCore.NodeServices/TypeScript/HttpNodeInstanceEntryPoint.ts index 9b51bf1e..31f6376f 100644 --- a/src/Microsoft.AspNetCore.NodeServices/TypeScript/HttpNodeInstanceEntryPoint.ts +++ b/src/Microsoft.AspNetCore.NodeServices/TypeScript/HttpNodeInstanceEntryPoint.ts @@ -86,5 +86,8 @@ function readRequestBodyAsJson(request, callback) { function respondWithError(res: http.ServerResponse, errorValue: any) { res.statusCode = 500; - res.end(errorValue.stack || errorValue.toString()); + res.end(JSON.stringify({ + errorMessage: errorValue.message || errorValue, + errorDetails: errorValue.stack || null + })); } From 4ceed817a326feac67b715dc531f12394397c9e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C5=82awomir=20Rosiek?= Date: Wed, 31 May 2017 20:10:01 +0200 Subject: [PATCH 139/411] Removed unused methods --- .../HostingModels/HttpNodeInstance.cs | 23 ------------------- 1 file changed, 23 deletions(-) diff --git a/src/Microsoft.AspNetCore.NodeServices/HostingModels/HttpNodeInstance.cs b/src/Microsoft.AspNetCore.NodeServices/HostingModels/HttpNodeInstance.cs index 8dd896b0..a87e3d33 100644 --- a/src/Microsoft.AspNetCore.NodeServices/HostingModels/HttpNodeInstance.cs +++ b/src/Microsoft.AspNetCore.NodeServices/HostingModels/HttpNodeInstance.cs @@ -21,7 +21,6 @@ namespace Microsoft.AspNetCore.NodeServices.HostingModels /// internal class HttpNodeInstance : OutOfProcessNodeInstance { - private readonly static int streamBufferSize = 16 * 1024; private static readonly Regex PortMessageRegex = new Regex(@"^\[Microsoft.AspNetCore.NodeServices.HttpNodeHost:Listening on port (\d+)\]$"); @@ -140,28 +139,6 @@ protected override void Dispose(bool disposing) } } - private static async Task ReadJsonAsync(Stream stream, CancellationToken cancellationToken) - { - var json = Encoding.UTF8.GetString(await ReadAllBytesAsync(stream, cancellationToken)); - return JsonConvert.DeserializeObject(json, jsonSerializerSettings); - } - - private static async Task ReadAllBytesAsync(Stream input, CancellationToken cancellationToken) - { - byte[] buffer = new byte[streamBufferSize]; - - using (var ms = new MemoryStream()) - { - int read; - while ((read = await input.ReadAsync(buffer, 0, buffer.Length, cancellationToken)) > 0) - { - ms.Write(buffer, 0, read); - } - - return ms.ToArray(); - } - } - #pragma warning disable 649 // These properties are populated via JSON deserialization private class RpcJsonResponse { From bc7742148ef331cf7a72674f41512b8527a6b8c9 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 21 Jun 2017 15:06:07 +0100 Subject: [PATCH 140/411] Remove duplicate var definition as in #966 --- templates/VueSpa/webpack.config.js | 1 - 1 file changed, 1 deletion(-) diff --git a/templates/VueSpa/webpack.config.js b/templates/VueSpa/webpack.config.js index d4153779..7aca565f 100644 --- a/templates/VueSpa/webpack.config.js +++ b/templates/VueSpa/webpack.config.js @@ -7,7 +7,6 @@ const bundleOutputDir = './wwwroot/dist'; module.exports = (env) => { const isDevBuild = !(env && env.prod); - const bundleOutputDir = './wwwroot/dist'; return [{ stats: { modules: false }, context: __dirname, From 328eb0451b92d1fa7fea3d0109997d63705b02d4 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 22 Jun 2017 16:39:35 +0100 Subject: [PATCH 141/411] Remove NETStandard.Library.NETFramework from the templates --- templates/AngularSpa/AngularSpa.csproj | 1 - templates/AureliaSpa/AureliaSpa.csproj | 1 - templates/KnockoutSpa/KnockoutSpa.csproj | 1 - templates/ReactReduxSpa/ReactReduxSpa.csproj | 1 - templates/ReactSpa/ReactSpa.csproj | 1 - templates/VueSpa/VueSpa.csproj | 1 - 6 files changed, 6 deletions(-) diff --git a/templates/AngularSpa/AngularSpa.csproj b/templates/AngularSpa/AngularSpa.csproj index 09074e68..f03f36db 100644 --- a/templates/AngularSpa/AngularSpa.csproj +++ b/templates/AngularSpa/AngularSpa.csproj @@ -13,7 +13,6 @@ - diff --git a/templates/AureliaSpa/AureliaSpa.csproj b/templates/AureliaSpa/AureliaSpa.csproj index 9f038c34..cfc16bc2 100644 --- a/templates/AureliaSpa/AureliaSpa.csproj +++ b/templates/AureliaSpa/AureliaSpa.csproj @@ -13,7 +13,6 @@ - diff --git a/templates/KnockoutSpa/KnockoutSpa.csproj b/templates/KnockoutSpa/KnockoutSpa.csproj index 9f038c34..cfc16bc2 100644 --- a/templates/KnockoutSpa/KnockoutSpa.csproj +++ b/templates/KnockoutSpa/KnockoutSpa.csproj @@ -13,7 +13,6 @@ - diff --git a/templates/ReactReduxSpa/ReactReduxSpa.csproj b/templates/ReactReduxSpa/ReactReduxSpa.csproj index f9939aa2..4a1d7ae2 100644 --- a/templates/ReactReduxSpa/ReactReduxSpa.csproj +++ b/templates/ReactReduxSpa/ReactReduxSpa.csproj @@ -13,7 +13,6 @@ - diff --git a/templates/ReactSpa/ReactSpa.csproj b/templates/ReactSpa/ReactSpa.csproj index 9f038c34..cfc16bc2 100644 --- a/templates/ReactSpa/ReactSpa.csproj +++ b/templates/ReactSpa/ReactSpa.csproj @@ -13,7 +13,6 @@ - diff --git a/templates/VueSpa/VueSpa.csproj b/templates/VueSpa/VueSpa.csproj index 9f038c34..cfc16bc2 100644 --- a/templates/VueSpa/VueSpa.csproj +++ b/templates/VueSpa/VueSpa.csproj @@ -13,7 +13,6 @@ - From f9068819be5080394e2700663e591065530672d6 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Fri, 23 Jun 2017 11:52:09 +0100 Subject: [PATCH 142/411] Update AppVeyor builds to use latest .NET Core SDK. Fixes #1058 --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index fa27d46a..8e32c070 100755 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,8 +3,8 @@ init: install: - ps: Install-Product node 6.9.2 x64 # .NET Core SDK binaries - # Download .NET Core 2.0 Preview 1 SDK and add to PATH - - ps: $urlCurrent = "https://download.microsoft.com/download/0/6/5/0656B047-5F2F-4281-A851-F30776F8616D/dotnet-dev-win-x64.2.0.0-preview1-005977.zip" + # Download .NET Core latest prerelease SDK and add to PATH + - ps: $urlCurrent = "https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-win-x64.zip" - ps: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetsdk" - ps: mkdir $env:DOTNET_INSTALL_DIR -Force | Out-Null - ps: $tempFileCurrent = [System.IO.Path]::GetTempFileName() From 55bd0c05cb3d50ecb2003a94df543c1d56a16394 Mon Sep 17 00:00:00 2001 From: Scott Addie Date: Thu, 22 Jun 2017 13:02:52 -0500 Subject: [PATCH 143/411] Update SpaServices NuGet package installation requirement --- src/Microsoft.AspNetCore.SpaServices/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.AspNetCore.SpaServices/README.md b/src/Microsoft.AspNetCore.SpaServices/README.md index fc2ddd2c..aed9639a 100644 --- a/src/Microsoft.AspNetCore.SpaServices/README.md +++ b/src/Microsoft.AspNetCore.SpaServices/README.md @@ -20,7 +20,7 @@ Behind the scenes, it uses the [`Microsoft.AspNetCore.NodeServices`](https://git ### Installation into existing projects - * Add `Microsoft.AspNetCore.SpaServices` to the dependencies list in your `project.json` file + * Install the `Microsoft.AspNetCore.SpaServices` NuGet package * Run `dotnet restore` (or if you use Visual Studio, just wait a moment - it will restore dependencies automatically) * Install supporting NPM packages for the features you'll be using: * For **server-side prerendering**, install `aspnet-prerendering` From 5fd9b933245c0b3896a4f4f4c66bf4c7f4567a8c Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Fri, 23 Jun 2017 11:59:30 +0100 Subject: [PATCH 144/411] Switch to a specific version of .NET Core 2.0 Preview 2, because "latest" is 2.1 and breaks. Fixes #1058 --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 8e32c070..f40e66aa 100755 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,8 +3,8 @@ init: install: - ps: Install-Product node 6.9.2 x64 # .NET Core SDK binaries - # Download .NET Core latest prerelease SDK and add to PATH - - ps: $urlCurrent = "https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-win-x64.zip" + # Download .NET Core 2.0 Preview 2 SDK and add to PATH + - ps: $urlCurrent = "https://dotnetcli.azureedge.net/dotnet/Sdk/2.0.0-preview2-006497/dotnet-sdk-2.0.0-preview2-006497-win-x64.zip" - ps: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetsdk" - ps: mkdir $env:DOTNET_INSTALL_DIR -Force | Out-Null - ps: $tempFileCurrent = [System.IO.Path]::GetTempFileName() From 53f5a7749068f96356819ce317a4769bdb7acefc Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Fri, 23 Jun 2017 12:08:14 +0100 Subject: [PATCH 145/411] Use preview2-final NuGet feed until it ships to NuGet.org --- NuGet.config | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4e8a1f6d..fa0dd444 100644 --- a/NuGet.config +++ b/NuGet.config @@ -2,8 +2,9 @@ - + + - + \ No newline at end of file From 117c1a6cbda3b6bac9ee65acefb1efb298f63ee9 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Mon, 26 Jun 2017 12:51:03 +0100 Subject: [PATCH 146/411] Implement workaround for #1066 --- .../npm/aspnet-webpack-react/package.json | 11 +++- .../scripts/postinstall.js | 55 +++++++++++++++++++ .../npm/aspnet-webpack-react/src/index.ts | 20 +++++++ .../npm/aspnet-webpack-react/tsconfig.json | 2 +- 4 files changed, 84 insertions(+), 4 deletions(-) create mode 100644 src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/scripts/postinstall.js diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/package.json b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/package.json index ab98d2fd..61c37eb1 100644 --- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/package.json +++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/package.json @@ -1,11 +1,12 @@ { "name": "aspnet-webpack-react", - "version": "2.0.0", + "version": "2.0.1", "description": "Helpers for using Webpack with React in ASP.NET Core projects. Works in conjunction with the Microsoft.AspNetCore.SpaServices NuGet package.", "main": "index.js", "scripts": { "prepublish": "rimraf *.d.ts && tsc && echo 'Finished building NPM package \"aspnet-webpack-react\"'", - "test": "echo \"Error: no test specified\" && exit 1" + "test": "echo \"Error: no test specified\" && exit 1", + "postinstall": "node scripts/postinstall.js" }, "author": "Microsoft", "license": "Apache-2.0", @@ -16,8 +17,12 @@ "type": "git", "url": "https://github.com/aspnet/JavaScriptServices.git" }, + "dependencies": { + "@types/webpack": "2.2.15", + "hjson": "2.4.3" + }, "devDependencies": { - "@types/webpack": "^2.2.0", + "@types/react": "15.0.29", "rimraf": "^2.5.4", "typescript": "^2.0.0", "webpack": "^2.2.0" diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/scripts/postinstall.js b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/scripts/postinstall.js new file mode 100644 index 00000000..2992c4c2 --- /dev/null +++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/scripts/postinstall.js @@ -0,0 +1,55 @@ +var fs = require('fs'); +var path = require('path'); +var Hjson = require('hjson'); + +// This logic is a workaround for #1066. +// See the comment in index.ts for details. + +function findInDirOrAncestor(targetFilename, rootDir) { + var candidateFilename = path.join(rootDir, targetFilename); + if (fs.existsSync(candidateFilename)) { + return candidateFilename; + } + + var parentDir = path.join(rootDir, '..'); + return parentDir !== rootDir ? findInDirOrAncestor(targetFilename, parentDir) : null; +} + +function findTsConfigFile() { + var rootDir = path.join(__dirname, '..', '..'); // Start 2 levels up because this package has a tsconfig file of its own + var tsConfigFile = 'tsconfig.json'; + var tsConfigFileName = findInDirOrAncestor(tsConfigFile, rootDir); + if (!tsConfigFileName) { + console.error('Could not locate ' + tsConfigFile + ' in ' + rootDir + ' or any ancestor directory.'); + } + return tsConfigFileName; +} + +function ensureTsConfigContainsTypesEntry(packageName) { + var tsConfigFileName = findTsConfigFile(); + if (tsConfigFileName) { + var parsedTsConfig = Hjson.rt.parse(fs.readFileSync(tsConfigFileName, 'utf8')); + parsedTsConfig.compilerOptions = parsedTsConfig.compilerOptions || {}; + parsedTsConfig.compilerOptions.types = parsedTsConfig.compilerOptions.types || []; + + if (parsedTsConfig.compilerOptions.types.indexOf(packageName) < 0) { + parsedTsConfig.compilerOptions.types.push(packageName); + + var hjsonOptions = { + bracesSameLine: true, + multiline: 'off', + quotes: 'all', + separator: true, + space: 2 + }; + fs.writeFileSync(tsConfigFileName, Hjson.rt.stringify(parsedTsConfig, hjsonOptions), 'utf8'); + } + } +} + +try { + ensureTsConfigContainsTypesEntry('aspnet-webpack-react'); +} catch(ex) { + console.error(ex); + process.exit(0); // Don't break installation +} diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/src/index.ts b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/src/index.ts index c4284f2f..496f0a59 100644 --- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/src/index.ts +++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/src/index.ts @@ -4,3 +4,23 @@ export { addReactHotModuleReplacementConfig } from './HotModuleReplacement'; // compatibility with aspnet-webpack 1.x. In aspnet-webpack 2.0, we can drop the old name (and also deprecate // some other no-longer-supported functionality, such as LoadViaWebpack). export { addReactHotModuleReplacementConfig as addReactHotModuleReplacementBabelTransform } from './HotModuleReplacement'; + +// Workaround for #1066 +// +// The issue is that @types/react-router@4.0.12 is incompatible with @types/react@15.0.29 +// This is a problem because the ReactReduxSpa template that ships in 2.0.0-preview2 is pinned +// to @types/react@15.0.29 but does *not* declare a direct dependency on @types/react-router, +// which means we end up grabbing the latest @types/react-router. +// +// The temporary solution is for aspnet-webpack-react to add the following extra type information +// that patches the compatibility issue. The longer-term solution will be for the templates to +// pin versions of *every* package in the transitive closure, not just their direct dependencies. +// +// Note that for this workaround to work, the developer also needs 'aspnet-webpack-react' to be +// present in the 'types' array in tsconfig.json. We automate the task of adding that in the +// scripts/postinstall.js file in this package. Later, that action can be removed. + +import * as React from 'react'; +declare module 'react' { + interface Component {} +} diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/tsconfig.json b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/tsconfig.json index 2ebeb45d..470c7eee 100644 --- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/tsconfig.json +++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/tsconfig.json @@ -5,7 +5,7 @@ "target": "es5", "declaration": true, "outDir": ".", - "lib": ["es2015"] + "lib": ["dom", "es2015"] }, "files": [ "src/index.ts" From 3da87dd3d33565b1f8a9eca3b5bbff92b6f0c8dd Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Mon, 26 Jun 2017 15:34:30 +0100 Subject: [PATCH 147/411] In aspnet-webpack-react 3.0.0+, remove the workaround for #1066. Templates that use this version of the package need to not have issue #1066 --- .../npm/aspnet-webpack-react/package.json | 11 +--- .../scripts/postinstall.js | 55 ------------------- .../npm/aspnet-webpack-react/src/index.ts | 20 ------- .../npm/aspnet-webpack-react/tsconfig.json | 2 +- 4 files changed, 4 insertions(+), 84 deletions(-) delete mode 100644 src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/scripts/postinstall.js diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/package.json b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/package.json index 61c37eb1..a6f0b0fc 100644 --- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/package.json +++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/package.json @@ -1,12 +1,11 @@ { "name": "aspnet-webpack-react", - "version": "2.0.1", + "version": "3.0.0-beta.1", "description": "Helpers for using Webpack with React in ASP.NET Core projects. Works in conjunction with the Microsoft.AspNetCore.SpaServices NuGet package.", "main": "index.js", "scripts": { "prepublish": "rimraf *.d.ts && tsc && echo 'Finished building NPM package \"aspnet-webpack-react\"'", - "test": "echo \"Error: no test specified\" && exit 1", - "postinstall": "node scripts/postinstall.js" + "test": "echo \"Error: no test specified\" && exit 1" }, "author": "Microsoft", "license": "Apache-2.0", @@ -17,12 +16,8 @@ "type": "git", "url": "https://github.com/aspnet/JavaScriptServices.git" }, - "dependencies": { - "@types/webpack": "2.2.15", - "hjson": "2.4.3" - }, "devDependencies": { - "@types/react": "15.0.29", + "@types/webpack": "^2.2.0", "rimraf": "^2.5.4", "typescript": "^2.0.0", "webpack": "^2.2.0" diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/scripts/postinstall.js b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/scripts/postinstall.js deleted file mode 100644 index 2992c4c2..00000000 --- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/scripts/postinstall.js +++ /dev/null @@ -1,55 +0,0 @@ -var fs = require('fs'); -var path = require('path'); -var Hjson = require('hjson'); - -// This logic is a workaround for #1066. -// See the comment in index.ts for details. - -function findInDirOrAncestor(targetFilename, rootDir) { - var candidateFilename = path.join(rootDir, targetFilename); - if (fs.existsSync(candidateFilename)) { - return candidateFilename; - } - - var parentDir = path.join(rootDir, '..'); - return parentDir !== rootDir ? findInDirOrAncestor(targetFilename, parentDir) : null; -} - -function findTsConfigFile() { - var rootDir = path.join(__dirname, '..', '..'); // Start 2 levels up because this package has a tsconfig file of its own - var tsConfigFile = 'tsconfig.json'; - var tsConfigFileName = findInDirOrAncestor(tsConfigFile, rootDir); - if (!tsConfigFileName) { - console.error('Could not locate ' + tsConfigFile + ' in ' + rootDir + ' or any ancestor directory.'); - } - return tsConfigFileName; -} - -function ensureTsConfigContainsTypesEntry(packageName) { - var tsConfigFileName = findTsConfigFile(); - if (tsConfigFileName) { - var parsedTsConfig = Hjson.rt.parse(fs.readFileSync(tsConfigFileName, 'utf8')); - parsedTsConfig.compilerOptions = parsedTsConfig.compilerOptions || {}; - parsedTsConfig.compilerOptions.types = parsedTsConfig.compilerOptions.types || []; - - if (parsedTsConfig.compilerOptions.types.indexOf(packageName) < 0) { - parsedTsConfig.compilerOptions.types.push(packageName); - - var hjsonOptions = { - bracesSameLine: true, - multiline: 'off', - quotes: 'all', - separator: true, - space: 2 - }; - fs.writeFileSync(tsConfigFileName, Hjson.rt.stringify(parsedTsConfig, hjsonOptions), 'utf8'); - } - } -} - -try { - ensureTsConfigContainsTypesEntry('aspnet-webpack-react'); -} catch(ex) { - console.error(ex); - process.exit(0); // Don't break installation -} diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/src/index.ts b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/src/index.ts index 496f0a59..c4284f2f 100644 --- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/src/index.ts +++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/src/index.ts @@ -4,23 +4,3 @@ export { addReactHotModuleReplacementConfig } from './HotModuleReplacement'; // compatibility with aspnet-webpack 1.x. In aspnet-webpack 2.0, we can drop the old name (and also deprecate // some other no-longer-supported functionality, such as LoadViaWebpack). export { addReactHotModuleReplacementConfig as addReactHotModuleReplacementBabelTransform } from './HotModuleReplacement'; - -// Workaround for #1066 -// -// The issue is that @types/react-router@4.0.12 is incompatible with @types/react@15.0.29 -// This is a problem because the ReactReduxSpa template that ships in 2.0.0-preview2 is pinned -// to @types/react@15.0.29 but does *not* declare a direct dependency on @types/react-router, -// which means we end up grabbing the latest @types/react-router. -// -// The temporary solution is for aspnet-webpack-react to add the following extra type information -// that patches the compatibility issue. The longer-term solution will be for the templates to -// pin versions of *every* package in the transitive closure, not just their direct dependencies. -// -// Note that for this workaround to work, the developer also needs 'aspnet-webpack-react' to be -// present in the 'types' array in tsconfig.json. We automate the task of adding that in the -// scripts/postinstall.js file in this package. Later, that action can be removed. - -import * as React from 'react'; -declare module 'react' { - interface Component {} -} diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/tsconfig.json b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/tsconfig.json index 470c7eee..2ebeb45d 100644 --- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/tsconfig.json +++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/tsconfig.json @@ -5,7 +5,7 @@ "target": "es5", "declaration": true, "outDir": ".", - "lib": ["dom", "es2015"] + "lib": ["es2015"] }, "files": [ "src/index.ts" From bebb82eb695c06353307859224cc0c52916dd652 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Mon, 26 Jun 2017 15:39:19 +0100 Subject: [PATCH 148/411] Implement longer-term fix for #1066 (see description) - declare explict @types/react-router version - update to newer aspnet-webpack-react that doesn't include the hacky workaround since it's not needed if you have the correct @types/react-router version In a subsequent commit, will also shrinkwrap to pin all dependency versions. This isn't strictly required right now, but is the right thing for long-term stability. --- templates/ReactReduxSpa/package.json | 3 ++- templates/ReactSpa/package.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/templates/ReactReduxSpa/package.json b/templates/ReactReduxSpa/package.json index 56edd57c..bde2cb32 100644 --- a/templates/ReactReduxSpa/package.json +++ b/templates/ReactReduxSpa/package.json @@ -6,13 +6,14 @@ "@types/react": "15.0.24", "@types/react-dom": "15.5.0", "@types/react-redux": "4.4.40", + "@types/react-router": "4.0.11", "@types/react-router-dom": "4.0.4", "@types/react-router-redux": "5.0.1", "@types/webpack": "2.2.15", "@types/webpack-env": "1.13.0", "aspnet-prerendering": "^2.0.5", "aspnet-webpack": "^1.0.29", - "aspnet-webpack-react": "^2.0.0", + "aspnet-webpack-react": "^3.0.0-beta", "awesome-typescript-loader": "3.1.3", "bootstrap": "3.3.7", "css-loader": "0.28.1", diff --git a/templates/ReactSpa/package.json b/templates/ReactSpa/package.json index 65f2f4dc..035a3f41 100644 --- a/templates/ReactSpa/package.json +++ b/templates/ReactSpa/package.json @@ -8,7 +8,7 @@ "@types/react-router": "4.0.9", "@types/webpack-env": "1.13.0", "aspnet-webpack": "^1.0.29", - "aspnet-webpack-react": "^2.0.0", + "aspnet-webpack-react": "^3.0.0-beta", "awesome-typescript-loader": "3.1.3", "bootstrap": "3.3.7", "css-loader": "0.28.1", From 8352ec76263b233cbdcb2d314100e23098e564ca Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Mon, 26 Jun 2017 15:48:49 +0100 Subject: [PATCH 149/411] Add npm-shrinkwrap.json files for all templates --- templates/AngularSpa/npm-shrinkwrap.json | 3037 +++++++++++++++++++ templates/AureliaSpa/npm-shrinkwrap.json | 2615 ++++++++++++++++ templates/KnockoutSpa/npm-shrinkwrap.json | 2503 +++++++++++++++ templates/ReactReduxSpa/npm-shrinkwrap.json | 2271 ++++++++++++++ templates/ReactSpa/npm-shrinkwrap.json | 2587 ++++++++++++++++ templates/VueSpa/npm-shrinkwrap.json | 2603 ++++++++++++++++ 6 files changed, 15616 insertions(+) create mode 100644 templates/AngularSpa/npm-shrinkwrap.json create mode 100644 templates/AureliaSpa/npm-shrinkwrap.json create mode 100644 templates/KnockoutSpa/npm-shrinkwrap.json create mode 100644 templates/ReactReduxSpa/npm-shrinkwrap.json create mode 100644 templates/ReactSpa/npm-shrinkwrap.json create mode 100644 templates/VueSpa/npm-shrinkwrap.json diff --git a/templates/AngularSpa/npm-shrinkwrap.json b/templates/AngularSpa/npm-shrinkwrap.json new file mode 100644 index 00000000..af9dda9c --- /dev/null +++ b/templates/AngularSpa/npm-shrinkwrap.json @@ -0,0 +1,3037 @@ +{ + "name": "WebApplicationBasic", + "version": "0.0.0", + "dependencies": { + "@angular/animations": { + "version": "4.1.2", + "from": "@angular/animations@4.1.2", + "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-4.1.2.tgz" + }, + "@angular/common": { + "version": "4.1.2", + "from": "@angular/common@4.1.2", + "resolved": "https://registry.npmjs.org/@angular/common/-/common-4.1.2.tgz" + }, + "@angular/compiler": { + "version": "4.1.2", + "from": "@angular/compiler@4.1.2", + "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-4.1.2.tgz" + }, + "@angular/core": { + "version": "4.1.2", + "from": "@angular/core@4.1.2", + "resolved": "https://registry.npmjs.org/@angular/core/-/core-4.1.2.tgz" + }, + "@angular/forms": { + "version": "4.1.2", + "from": "@angular/forms@4.1.2", + "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-4.1.2.tgz" + }, + "@angular/http": { + "version": "4.1.2", + "from": "@angular/http@4.1.2", + "resolved": "https://registry.npmjs.org/@angular/http/-/http-4.1.2.tgz" + }, + "@angular/platform-browser": { + "version": "4.1.2", + "from": "@angular/platform-browser@4.1.2", + "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-4.1.2.tgz" + }, + "@angular/platform-browser-dynamic": { + "version": "4.1.2", + "from": "@angular/platform-browser-dynamic@4.1.2", + "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-4.1.2.tgz" + }, + "@angular/platform-server": { + "version": "4.1.2", + "from": "@angular/platform-server@4.1.2", + "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-4.1.2.tgz" + }, + "@angular/router": { + "version": "4.1.2", + "from": "@angular/router@4.1.2", + "resolved": "https://registry.npmjs.org/@angular/router/-/router-4.1.2.tgz" + }, + "@types/chai": { + "version": "3.5.2", + "from": "@types/chai@3.5.2", + "resolved": "https://registry.npmjs.org/@types/chai/-/chai-3.5.2.tgz", + "dev": true + }, + "@types/jasmine": { + "version": "2.5.47", + "from": "@types/jasmine@2.5.47", + "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-2.5.47.tgz", + "dev": true + }, + "@types/node": { + "version": "7.0.18", + "from": "@types/node@7.0.18", + "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.18.tgz" + }, + "accepts": { + "version": "1.3.3", + "from": "accepts@1.3.3", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz", + "dev": true + }, + "acorn": { + "version": "5.0.3", + "from": "acorn@>=5.0.0 <6.0.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.0.3.tgz" + }, + "acorn-dynamic-import": { + "version": "2.0.2", + "from": "acorn-dynamic-import@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz", + "dependencies": { + "acorn": { + "version": "4.0.13", + "from": "acorn@>=4.0.3 <5.0.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz" + } + } + }, + "after": { + "version": "0.8.2", + "from": "after@0.8.2", + "resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz", + "dev": true + }, + "ajv": { + "version": "4.11.8", + "from": "ajv@>=4.11.2 <5.0.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz" + }, + "ajv-keywords": { + "version": "1.5.1", + "from": "ajv-keywords@>=1.1.1 <2.0.0", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.1.tgz" + }, + "align-text": { + "version": "0.1.4", + "from": "align-text@>=0.1.3 <0.2.0", + "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz" + }, + "alphanum-sort": { + "version": "1.0.2", + "from": "alphanum-sort@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz" + }, + "amdefine": { + "version": "1.0.1", + "from": "amdefine@>=0.0.4", + "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz" + }, + "angular2-template-loader": { + "version": "0.6.2", + "from": "angular2-template-loader@0.6.2", + "resolved": "https://registry.npmjs.org/angular2-template-loader/-/angular2-template-loader-0.6.2.tgz" + }, + "ansi-html": { + "version": "0.0.7", + "from": "ansi-html@0.0.7", + "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz" + }, + "ansi-regex": { + "version": "2.1.1", + "from": "ansi-regex@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz" + }, + "ansi-styles": { + "version": "2.2.1", + "from": "ansi-styles@>=2.2.1 <3.0.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz" + }, + "anymatch": { + "version": "1.3.0", + "from": "anymatch@>=1.3.0 <2.0.0", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.0.tgz" + }, + "argparse": { + "version": "1.0.9", + "from": "argparse@>=1.0.7 <2.0.0", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz" + }, + "arr-diff": { + "version": "2.0.0", + "from": "arr-diff@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz" + }, + "arr-flatten": { + "version": "1.0.3", + "from": "arr-flatten@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.3.tgz" + }, + "array-slice": { + "version": "0.2.3", + "from": "array-slice@>=0.2.3 <0.3.0", + "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz", + "dev": true + }, + "array-unique": { + "version": "0.2.1", + "from": "array-unique@>=0.2.1 <0.3.0", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz" + }, + "arraybuffer.slice": { + "version": "0.0.6", + "from": "arraybuffer.slice@0.0.6", + "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz", + "dev": true + }, + "arrify": { + "version": "1.0.1", + "from": "arrify@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz" + }, + "asn1.js": { + "version": "4.9.1", + "from": "asn1.js@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.1.tgz" + }, + "aspnet-prerendering": { + "version": "2.0.6", + "from": "aspnet-prerendering@>=2.0.5 <3.0.0", + "resolved": "https://registry.npmjs.org/aspnet-prerendering/-/aspnet-prerendering-2.0.6.tgz" + }, + "aspnet-webpack": { + "version": "1.0.29", + "from": "aspnet-webpack@>=1.0.29 <2.0.0", + "resolved": "https://registry.npmjs.org/aspnet-webpack/-/aspnet-webpack-1.0.29.tgz" + }, + "assert": { + "version": "1.4.1", + "from": "assert@>=1.1.1 <2.0.0", + "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz" + }, + "assertion-error": { + "version": "1.0.2", + "from": "assertion-error@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.0.2.tgz", + "dev": true + }, + "ast-types": { + "version": "0.9.6", + "from": "ast-types@0.9.6", + "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.9.6.tgz" + }, + "async": { + "version": "2.5.0", + "from": "async@>=2.1.2 <3.0.0", + "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz" + }, + "async-each": { + "version": "1.0.1", + "from": "async-each@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz" + }, + "atob": { + "version": "1.1.3", + "from": "atob@>=1.1.0 <1.2.0", + "resolved": "https://registry.npmjs.org/atob/-/atob-1.1.3.tgz" + }, + "autoprefixer": { + "version": "6.7.7", + "from": "autoprefixer@>=6.3.1 <7.0.0", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.7.7.tgz" + }, + "awesome-typescript-loader": { + "version": "3.1.3", + "from": "awesome-typescript-loader@3.1.3", + "resolved": "https://registry.npmjs.org/awesome-typescript-loader/-/awesome-typescript-loader-3.1.3.tgz", + "dependencies": { + "loader-utils": { + "version": "1.1.0", + "from": "loader-utils@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz" + } + } + }, + "babel-code-frame": { + "version": "6.22.0", + "from": "babel-code-frame@>=6.11.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz" + }, + "backo2": { + "version": "1.0.2", + "from": "backo2@1.0.2", + "resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz", + "dev": true + }, + "balanced-match": { + "version": "0.4.2", + "from": "balanced-match@>=0.4.2 <0.5.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz" + }, + "base64-arraybuffer": { + "version": "0.1.5", + "from": "base64-arraybuffer@0.1.5", + "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz", + "dev": true + }, + "base64-js": { + "version": "1.2.1", + "from": "base64-js@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.1.tgz" + }, + "base64id": { + "version": "1.0.0", + "from": "base64id@1.0.0", + "resolved": "https://registry.npmjs.org/base64id/-/base64id-1.0.0.tgz", + "dev": true + }, + "better-assert": { + "version": "1.0.2", + "from": "better-assert@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz", + "dev": true + }, + "big.js": { + "version": "3.1.3", + "from": "big.js@>=3.1.3 <4.0.0", + "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.1.3.tgz" + }, + "binary-extensions": { + "version": "1.8.0", + "from": "binary-extensions@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.8.0.tgz" + }, + "blob": { + "version": "0.0.4", + "from": "blob@0.0.4", + "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.4.tgz", + "dev": true + }, + "bluebird": { + "version": "3.5.0", + "from": "bluebird@>=3.3.0 <4.0.0", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz", + "dev": true + }, + "bn.js": { + "version": "4.11.7", + "from": "bn.js@>=4.1.1 <5.0.0", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.7.tgz" + }, + "body-parser": { + "version": "1.17.2", + "from": "body-parser@>=1.16.1 <2.0.0", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.17.2.tgz", + "dev": true, + "dependencies": { + "iconv-lite": { + "version": "0.4.15", + "from": "iconv-lite@0.4.15", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz", + "dev": true + } + } + }, + "bootstrap": { + "version": "3.3.7", + "from": "bootstrap@3.3.7", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.3.7.tgz" + }, + "brace-expansion": { + "version": "1.1.8", + "from": "brace-expansion@>=1.1.7 <2.0.0", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", + "dependencies": { + "balanced-match": { + "version": "1.0.0", + "from": "balanced-match@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz" + } + } + }, + "braces": { + "version": "1.8.5", + "from": "braces@>=1.8.2 <2.0.0", + "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz" + }, + "brorand": { + "version": "1.1.0", + "from": "brorand@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz" + }, + "browserify-aes": { + "version": "1.0.6", + "from": "browserify-aes@>=1.0.4 <2.0.0", + "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.6.tgz" + }, + "browserify-cipher": { + "version": "1.0.0", + "from": "browserify-cipher@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz" + }, + "browserify-des": { + "version": "1.0.0", + "from": "browserify-des@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz" + }, + "browserify-rsa": { + "version": "4.0.1", + "from": "browserify-rsa@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz" + }, + "browserify-sign": { + "version": "4.0.4", + "from": "browserify-sign@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz" + }, + "browserify-zlib": { + "version": "0.1.4", + "from": "browserify-zlib@>=0.1.4 <0.2.0", + "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz" + }, + "browserslist": { + "version": "1.7.7", + "from": "browserslist@>=1.7.6 <2.0.0", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz" + }, + "buffer": { + "version": "4.9.1", + "from": "buffer@>=4.3.0 <5.0.0", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz" + }, + "buffer-xor": { + "version": "1.0.3", + "from": "buffer-xor@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz" + }, + "builtin-modules": { + "version": "1.1.1", + "from": "builtin-modules@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz" + }, + "builtin-status-codes": { + "version": "3.0.0", + "from": "builtin-status-codes@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz" + }, + "bytes": { + "version": "2.4.0", + "from": "bytes@2.4.0", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.4.0.tgz", + "dev": true + }, + "callsite": { + "version": "1.0.0", + "from": "callsite@1.0.0", + "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz", + "dev": true + }, + "camel-case": { + "version": "3.0.0", + "from": "camel-case@>=3.0.0 <3.1.0", + "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz" + }, + "camelcase": { + "version": "1.2.1", + "from": "camelcase@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz" + }, + "caniuse-api": { + "version": "1.6.1", + "from": "caniuse-api@>=1.5.2 <2.0.0", + "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-1.6.1.tgz" + }, + "caniuse-db": { + "version": "1.0.30000694", + "from": "caniuse-db@>=1.0.30000634 <2.0.0", + "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000694.tgz" + }, + "center-align": { + "version": "0.1.3", + "from": "center-align@>=0.1.1 <0.2.0", + "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz" + }, + "chai": { + "version": "3.5.0", + "from": "chai@3.5.0", + "resolved": "https://registry.npmjs.org/chai/-/chai-3.5.0.tgz", + "dev": true + }, + "chalk": { + "version": "1.1.3", + "from": "chalk@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz" + }, + "chokidar": { + "version": "1.7.0", + "from": "chokidar@>=1.4.3 <2.0.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz" + }, + "cipher-base": { + "version": "1.0.3", + "from": "cipher-base@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.3.tgz" + }, + "clap": { + "version": "1.2.0", + "from": "clap@>=1.0.9 <2.0.0", + "resolved": "https://registry.npmjs.org/clap/-/clap-1.2.0.tgz" + }, + "clean-css": { + "version": "4.1.4", + "from": "clean-css@>=4.1.0 <4.2.0", + "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.1.4.tgz" + }, + "cliui": { + "version": "2.1.0", + "from": "cliui@>=2.1.0 <3.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz" + }, + "clone": { + "version": "1.0.2", + "from": "clone@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz" + }, + "co": { + "version": "4.6.0", + "from": "co@>=4.6.0 <5.0.0", + "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz" + }, + "coa": { + "version": "1.0.3", + "from": "coa@>=1.0.1 <1.1.0", + "resolved": "https://registry.npmjs.org/coa/-/coa-1.0.3.tgz" + }, + "code-point-at": { + "version": "1.1.0", + "from": "code-point-at@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz" + }, + "color": { + "version": "0.11.4", + "from": "color@>=0.11.0 <0.12.0", + "resolved": "https://registry.npmjs.org/color/-/color-0.11.4.tgz" + }, + "color-convert": { + "version": "1.9.0", + "from": "color-convert@>=1.3.0 <2.0.0", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz" + }, + "color-name": { + "version": "1.1.2", + "from": "color-name@>=1.1.1 <2.0.0", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.2.tgz" + }, + "color-string": { + "version": "0.3.0", + "from": "color-string@>=0.3.0 <0.4.0", + "resolved": "https://registry.npmjs.org/color-string/-/color-string-0.3.0.tgz" + }, + "colormin": { + "version": "1.1.2", + "from": "colormin@>=1.0.5 <2.0.0", + "resolved": "https://registry.npmjs.org/colormin/-/colormin-1.1.2.tgz" + }, + "colors": { + "version": "1.1.2", + "from": "colors@>=1.1.2 <2.0.0", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz" + }, + "combine-lists": { + "version": "1.0.1", + "from": "combine-lists@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/combine-lists/-/combine-lists-1.0.1.tgz", + "dev": true + }, + "commander": { + "version": "2.9.0", + "from": "commander@>=2.9.0 <2.10.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz" + }, + "component-bind": { + "version": "1.0.0", + "from": "component-bind@1.0.0", + "resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz", + "dev": true + }, + "component-emitter": { + "version": "1.1.2", + "from": "component-emitter@1.1.2", + "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz", + "dev": true + }, + "component-inherit": { + "version": "0.0.3", + "from": "component-inherit@0.0.3", + "resolved": "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz", + "dev": true + }, + "concat-map": { + "version": "0.0.1", + "from": "concat-map@0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz" + }, + "connect": { + "version": "3.6.2", + "from": "connect@>=3.4.1 <4.0.0", + "resolved": "https://registry.npmjs.org/connect/-/connect-3.6.2.tgz" + }, + "console-browserify": { + "version": "1.1.0", + "from": "console-browserify@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz" + }, + "constants-browserify": { + "version": "1.0.0", + "from": "constants-browserify@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz" + }, + "content-type": { + "version": "1.0.2", + "from": "content-type@>=1.0.2 <1.1.0", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.2.tgz", + "dev": true + }, + "cookie": { + "version": "0.3.1", + "from": "cookie@0.3.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz", + "dev": true + }, + "core-js": { + "version": "2.4.1", + "from": "core-js@>=2.2.0 <3.0.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz", + "dev": true + }, + "core-util-is": { + "version": "1.0.2", + "from": "core-util-is@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz" + }, + "create-ecdh": { + "version": "4.0.0", + "from": "create-ecdh@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz" + }, + "create-hash": { + "version": "1.1.3", + "from": "create-hash@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz" + }, + "create-hmac": { + "version": "1.1.6", + "from": "create-hmac@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.6.tgz" + }, + "crypto-browserify": { + "version": "3.11.0", + "from": "crypto-browserify@>=3.11.0 <4.0.0", + "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.0.tgz" + }, + "css": { + "version": "2.2.1", + "from": "css@2.2.1", + "resolved": "https://registry.npmjs.org/css/-/css-2.2.1.tgz", + "dependencies": { + "source-map": { + "version": "0.1.43", + "from": "source-map@>=0.1.38 <0.2.0", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz" + } + } + }, + "css-color-names": { + "version": "0.0.4", + "from": "css-color-names@0.0.4", + "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz" + }, + "css-loader": { + "version": "0.28.1", + "from": "css-loader@0.28.1", + "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.28.1.tgz", + "dependencies": { + "loader-utils": { + "version": "1.1.0", + "from": "loader-utils@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz" + } + } + }, + "css-selector-tokenizer": { + "version": "0.7.0", + "from": "css-selector-tokenizer@>=0.7.0 <0.8.0", + "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz" + }, + "cssesc": { + "version": "0.1.0", + "from": "cssesc@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-0.1.0.tgz" + }, + "cssnano": { + "version": "3.10.0", + "from": "cssnano@>=2.6.1 <4.0.0", + "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-3.10.0.tgz" + }, + "csso": { + "version": "2.3.2", + "from": "csso@>=2.3.1 <2.4.0", + "resolved": "https://registry.npmjs.org/csso/-/csso-2.3.2.tgz" + }, + "custom-event": { + "version": "1.0.1", + "from": "custom-event@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz", + "dev": true + }, + "date-now": { + "version": "0.1.4", + "from": "date-now@>=0.1.4 <0.2.0", + "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz" + }, + "debug": { + "version": "2.6.7", + "from": "debug@2.6.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz" + }, + "decamelize": { + "version": "1.2.0", + "from": "decamelize@>=1.1.2 <2.0.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz" + }, + "deep-eql": { + "version": "0.1.3", + "from": "deep-eql@>=0.1.3 <0.2.0", + "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-0.1.3.tgz", + "dev": true, + "dependencies": { + "type-detect": { + "version": "0.1.1", + "from": "type-detect@0.1.1", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-0.1.1.tgz", + "dev": true + } + } + }, + "defined": { + "version": "1.0.0", + "from": "defined@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz" + }, + "depd": { + "version": "1.1.0", + "from": "depd@>=1.1.0 <1.2.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz", + "dev": true + }, + "des.js": { + "version": "1.0.0", + "from": "des.js@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz" + }, + "di": { + "version": "0.0.1", + "from": "di@>=0.0.1 <0.0.2", + "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz", + "dev": true + }, + "diffie-hellman": { + "version": "5.0.2", + "from": "diffie-hellman@>=5.0.0 <6.0.0", + "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.2.tgz" + }, + "dom-serialize": { + "version": "2.2.1", + "from": "dom-serialize@>=2.2.0 <3.0.0", + "resolved": "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz", + "dev": true + }, + "domain-browser": { + "version": "1.1.7", + "from": "domain-browser@>=1.1.1 <2.0.0", + "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.7.tgz" + }, + "domain-context": { + "version": "0.5.1", + "from": "domain-context@>=0.5.1 <0.6.0", + "resolved": "https://registry.npmjs.org/domain-context/-/domain-context-0.5.1.tgz" + }, + "domain-task": { + "version": "2.0.3", + "from": "domain-task@>=2.0.2 <3.0.0", + "resolved": "https://registry.npmjs.org/domain-task/-/domain-task-2.0.3.tgz" + }, + "ee-first": { + "version": "1.1.1", + "from": "ee-first@1.1.1", + "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz" + }, + "electron-to-chromium": { + "version": "1.3.14", + "from": "electron-to-chromium@>=1.2.7 <2.0.0", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.14.tgz" + }, + "elliptic": { + "version": "6.4.0", + "from": "elliptic@>=6.0.0 <7.0.0", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz" + }, + "emojis-list": { + "version": "2.1.0", + "from": "emojis-list@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz" + }, + "encodeurl": { + "version": "1.0.1", + "from": "encodeurl@>=1.0.1 <1.1.0", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.1.tgz" + }, + "encoding": { + "version": "0.1.12", + "from": "encoding@>=0.1.11 <0.2.0", + "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz" + }, + "engine.io": { + "version": "1.8.3", + "from": "engine.io@1.8.3", + "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-1.8.3.tgz", + "dev": true, + "dependencies": { + "debug": { + "version": "2.3.3", + "from": "debug@2.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz", + "dev": true + }, + "ms": { + "version": "0.7.2", + "from": "ms@0.7.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz", + "dev": true + } + } + }, + "engine.io-client": { + "version": "1.8.3", + "from": "engine.io-client@1.8.3", + "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.3.tgz", + "dev": true, + "dependencies": { + "component-emitter": { + "version": "1.2.1", + "from": "component-emitter@1.2.1", + "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", + "dev": true + }, + "debug": { + "version": "2.3.3", + "from": "debug@2.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz", + "dev": true + }, + "ms": { + "version": "0.7.2", + "from": "ms@0.7.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz", + "dev": true + } + } + }, + "engine.io-parser": { + "version": "1.3.2", + "from": "engine.io-parser@1.3.2", + "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.2.tgz", + "dev": true + }, + "enhanced-resolve": { + "version": "3.1.0", + "from": "enhanced-resolve@>=3.1.0 <4.0.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.1.0.tgz", + "dependencies": { + "memory-fs": { + "version": "0.4.1", + "from": "memory-fs@>=0.4.0 <0.5.0", + "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz" + } + } + }, + "ent": { + "version": "2.2.0", + "from": "ent@>=2.2.0 <2.3.0", + "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz", + "dev": true + }, + "errno": { + "version": "0.1.4", + "from": "errno@>=0.1.3 <0.2.0", + "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.4.tgz" + }, + "error-ex": { + "version": "1.3.1", + "from": "error-ex@>=1.2.0 <2.0.0", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz" + }, + "es6-promise": { + "version": "3.3.1", + "from": "es6-promise@>=3.1.2 <4.0.0", + "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz" + }, + "es6-shim": { + "version": "0.35.3", + "from": "es6-shim@0.35.3", + "resolved": "https://registry.npmjs.org/es6-shim/-/es6-shim-0.35.3.tgz" + }, + "es6-templates": { + "version": "0.2.3", + "from": "es6-templates@>=0.2.2 <0.3.0", + "resolved": "https://registry.npmjs.org/es6-templates/-/es6-templates-0.2.3.tgz" + }, + "escape-html": { + "version": "1.0.3", + "from": "escape-html@>=1.0.3 <1.1.0", + "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz" + }, + "escape-string-regexp": { + "version": "1.0.5", + "from": "escape-string-regexp@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz" + }, + "esprima": { + "version": "2.7.3", + "from": "esprima@>=2.6.0 <3.0.0", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz" + }, + "esutils": { + "version": "2.0.2", + "from": "esutils@>=2.0.2 <3.0.0", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz" + }, + "event-source-polyfill": { + "version": "0.0.9", + "from": "event-source-polyfill@0.0.9", + "resolved": "https://registry.npmjs.org/event-source-polyfill/-/event-source-polyfill-0.0.9.tgz" + }, + "eventemitter3": { + "version": "1.2.0", + "from": "eventemitter3@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz", + "dev": true + }, + "events": { + "version": "1.1.1", + "from": "events@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz" + }, + "evp_bytestokey": { + "version": "1.0.0", + "from": "evp_bytestokey@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz" + }, + "expand-braces": { + "version": "0.1.2", + "from": "expand-braces@>=0.1.1 <0.2.0", + "resolved": "https://registry.npmjs.org/expand-braces/-/expand-braces-0.1.2.tgz", + "dev": true, + "dependencies": { + "braces": { + "version": "0.1.5", + "from": "braces@>=0.1.2 <0.2.0", + "resolved": "https://registry.npmjs.org/braces/-/braces-0.1.5.tgz", + "dev": true + }, + "expand-range": { + "version": "0.1.1", + "from": "expand-range@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-0.1.1.tgz", + "dev": true + }, + "is-number": { + "version": "0.1.1", + "from": "is-number@>=0.1.1 <0.2.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-0.1.1.tgz", + "dev": true + }, + "repeat-string": { + "version": "0.2.2", + "from": "repeat-string@>=0.2.2 <0.3.0", + "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-0.2.2.tgz", + "dev": true + } + } + }, + "expand-brackets": { + "version": "0.1.5", + "from": "expand-brackets@>=0.1.4 <0.2.0", + "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz" + }, + "expand-range": { + "version": "1.8.2", + "from": "expand-range@>=1.8.1 <2.0.0", + "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz" + }, + "expose-loader": { + "version": "0.7.3", + "from": "expose-loader@0.7.3", + "resolved": "https://registry.npmjs.org/expose-loader/-/expose-loader-0.7.3.tgz" + }, + "extend": { + "version": "3.0.1", + "from": "extend@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz", + "dev": true + }, + "extglob": { + "version": "0.3.2", + "from": "extglob@>=0.3.1 <0.4.0", + "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz" + }, + "extract-text-webpack-plugin": { + "version": "2.1.0", + "from": "extract-text-webpack-plugin@2.1.0", + "resolved": "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-2.1.0.tgz", + "dependencies": { + "loader-utils": { + "version": "1.1.0", + "from": "loader-utils@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz" + } + } + }, + "fastparse": { + "version": "1.1.1", + "from": "fastparse@>=1.1.1 <2.0.0", + "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.1.tgz" + }, + "file-loader": { + "version": "0.11.1", + "from": "file-loader@0.11.1", + "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-0.11.1.tgz", + "dependencies": { + "loader-utils": { + "version": "1.1.0", + "from": "loader-utils@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz" + } + } + }, + "filename-regex": { + "version": "2.0.1", + "from": "filename-regex@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz" + }, + "fill-range": { + "version": "2.2.3", + "from": "fill-range@>=2.1.0 <3.0.0", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz" + }, + "finalhandler": { + "version": "1.0.3", + "from": "finalhandler@1.0.3", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.3.tgz" + }, + "find-up": { + "version": "1.1.2", + "from": "find-up@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz" + }, + "flatten": { + "version": "1.0.2", + "from": "flatten@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz" + }, + "for-in": { + "version": "1.0.2", + "from": "for-in@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz" + }, + "for-own": { + "version": "0.1.5", + "from": "for-own@>=0.1.4 <0.2.0", + "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz" + }, + "fs-access": { + "version": "1.0.1", + "from": "fs-access@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz", + "dev": true + }, + "fs.realpath": { + "version": "1.0.0", + "from": "fs.realpath@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "dev": true + }, + "function-bind": { + "version": "1.1.0", + "from": "function-bind@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.0.tgz" + }, + "get-caller-file": { + "version": "1.0.2", + "from": "get-caller-file@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz" + }, + "glob": { + "version": "7.1.2", + "from": "glob@>=7.1.1 <8.0.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "dev": true + }, + "glob-base": { + "version": "0.3.0", + "from": "glob-base@>=0.3.0 <0.4.0", + "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz" + }, + "glob-parent": { + "version": "2.0.0", + "from": "glob-parent@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz" + }, + "graceful-fs": { + "version": "4.1.11", + "from": "graceful-fs@>=4.1.2 <5.0.0", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz" + }, + "graceful-readlink": { + "version": "1.0.1", + "from": "graceful-readlink@>=1.0.0", + "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz" + }, + "has": { + "version": "1.0.1", + "from": "has@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz" + }, + "has-ansi": { + "version": "2.0.0", + "from": "has-ansi@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz" + }, + "has-binary": { + "version": "0.1.7", + "from": "has-binary@0.1.7", + "resolved": "https://registry.npmjs.org/has-binary/-/has-binary-0.1.7.tgz", + "dev": true, + "dependencies": { + "isarray": { + "version": "0.0.1", + "from": "isarray@0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "dev": true + } + } + }, + "has-cors": { + "version": "1.1.0", + "from": "has-cors@1.1.0", + "resolved": "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz", + "dev": true + }, + "has-flag": { + "version": "1.0.0", + "from": "has-flag@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz" + }, + "hash-base": { + "version": "2.0.2", + "from": "hash-base@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz" + }, + "hash.js": { + "version": "1.1.1", + "from": "hash.js@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.1.tgz" + }, + "he": { + "version": "1.1.1", + "from": "he@>=1.1.0 <1.2.0", + "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz" + }, + "hmac-drbg": { + "version": "1.0.1", + "from": "hmac-drbg@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz" + }, + "hosted-git-info": { + "version": "2.4.2", + "from": "hosted-git-info@>=2.1.4 <3.0.0", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.4.2.tgz" + }, + "html-comment-regex": { + "version": "1.1.1", + "from": "html-comment-regex@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.1.tgz" + }, + "html-entities": { + "version": "1.2.1", + "from": "html-entities@>=1.2.0 <2.0.0", + "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz" + }, + "html-loader": { + "version": "0.4.5", + "from": "html-loader@0.4.5", + "resolved": "https://registry.npmjs.org/html-loader/-/html-loader-0.4.5.tgz", + "dependencies": { + "loader-utils": { + "version": "1.1.0", + "from": "loader-utils@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz" + } + } + }, + "html-minifier": { + "version": "3.5.2", + "from": "html-minifier@>=3.0.1 <4.0.0", + "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.2.tgz" + }, + "http-errors": { + "version": "1.6.1", + "from": "http-errors@>=1.6.1 <1.7.0", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.1.tgz", + "dev": true + }, + "http-proxy": { + "version": "1.16.2", + "from": "http-proxy@>=1.13.0 <2.0.0", + "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.16.2.tgz", + "dev": true + }, + "https-browserify": { + "version": "0.0.1", + "from": "https-browserify@0.0.1", + "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz" + }, + "iconv-lite": { + "version": "0.4.18", + "from": "iconv-lite@>=0.4.13 <0.5.0", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.18.tgz" + }, + "icss-replace-symbols": { + "version": "1.1.0", + "from": "icss-replace-symbols@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz" + }, + "ieee754": { + "version": "1.1.8", + "from": "ieee754@>=1.1.4 <2.0.0", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz" + }, + "indexes-of": { + "version": "1.0.1", + "from": "indexes-of@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz" + }, + "indexof": { + "version": "0.0.1", + "from": "indexof@0.0.1", + "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz" + }, + "inflight": { + "version": "1.0.6", + "from": "inflight@>=1.0.4 <2.0.0", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "dev": true + }, + "inherits": { + "version": "2.0.3", + "from": "inherits@>=2.0.3 <2.1.0", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz" + }, + "interpret": { + "version": "1.0.3", + "from": "interpret@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.3.tgz" + }, + "invert-kv": { + "version": "1.0.0", + "from": "invert-kv@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz" + }, + "is-absolute-url": { + "version": "2.1.0", + "from": "is-absolute-url@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz" + }, + "is-arrayish": { + "version": "0.2.1", + "from": "is-arrayish@>=0.2.1 <0.3.0", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz" + }, + "is-binary-path": { + "version": "1.0.1", + "from": "is-binary-path@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz" + }, + "is-buffer": { + "version": "1.1.5", + "from": "is-buffer@>=1.1.5 <2.0.0", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz" + }, + "is-builtin-module": { + "version": "1.0.0", + "from": "is-builtin-module@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz" + }, + "is-dotfile": { + "version": "1.0.3", + "from": "is-dotfile@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz" + }, + "is-equal-shallow": { + "version": "0.1.3", + "from": "is-equal-shallow@>=0.1.3 <0.2.0", + "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz" + }, + "is-extendable": { + "version": "0.1.1", + "from": "is-extendable@>=0.1.1 <0.2.0", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz" + }, + "is-extglob": { + "version": "1.0.0", + "from": "is-extglob@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz" + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "from": "is-fullwidth-code-point@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz" + }, + "is-glob": { + "version": "2.0.1", + "from": "is-glob@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz" + }, + "is-number": { + "version": "2.1.0", + "from": "is-number@>=2.1.0 <3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz" + }, + "is-plain-obj": { + "version": "1.1.0", + "from": "is-plain-obj@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz" + }, + "is-posix-bracket": { + "version": "0.1.1", + "from": "is-posix-bracket@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz" + }, + "is-primitive": { + "version": "2.0.0", + "from": "is-primitive@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz" + }, + "is-stream": { + "version": "1.1.0", + "from": "is-stream@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz" + }, + "is-svg": { + "version": "2.1.0", + "from": "is-svg@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-2.1.0.tgz" + }, + "is-utf8": { + "version": "0.2.1", + "from": "is-utf8@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz" + }, + "isarray": { + "version": "1.0.0", + "from": "isarray@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz" + }, + "isbinaryfile": { + "version": "3.0.2", + "from": "isbinaryfile@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.2.tgz", + "dev": true + }, + "isexe": { + "version": "2.0.0", + "from": "isexe@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "dev": true + }, + "isobject": { + "version": "2.1.0", + "from": "isobject@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz" + }, + "isomorphic-fetch": { + "version": "2.2.1", + "from": "isomorphic-fetch@2.2.1", + "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz" + }, + "jasmine-core": { + "version": "2.6.1", + "from": "jasmine-core@2.6.1", + "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.6.1.tgz", + "dev": true + }, + "jquery": { + "version": "3.2.1", + "from": "jquery@3.2.1", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.2.1.tgz" + }, + "js-base64": { + "version": "2.1.9", + "from": "js-base64@>=2.1.9 <3.0.0", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.1.9.tgz" + }, + "js-tokens": { + "version": "3.0.1", + "from": "js-tokens@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.1.tgz" + }, + "js-yaml": { + "version": "3.7.0", + "from": "js-yaml@>=3.7.0 <3.8.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz" + }, + "jsesc": { + "version": "0.5.0", + "from": "jsesc@>=0.5.0 <0.6.0", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz" + }, + "json-loader": { + "version": "0.5.4", + "from": "json-loader@0.5.4", + "resolved": "https://registry.npmjs.org/json-loader/-/json-loader-0.5.4.tgz" + }, + "json-stable-stringify": { + "version": "1.0.1", + "from": "json-stable-stringify@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz" + }, + "json3": { + "version": "3.3.2", + "from": "json3@3.3.2", + "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz", + "dev": true + }, + "json5": { + "version": "0.5.1", + "from": "json5@>=0.5.0 <0.6.0", + "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz" + }, + "jsonify": { + "version": "0.0.0", + "from": "jsonify@>=0.0.0 <0.1.0", + "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz" + }, + "karma": { + "version": "1.7.0", + "from": "karma@1.7.0", + "resolved": "https://registry.npmjs.org/karma/-/karma-1.7.0.tgz", + "dev": true, + "dependencies": { + "lodash": { + "version": "3.10.1", + "from": "lodash@>=3.8.0 <4.0.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", + "dev": true + } + } + }, + "karma-chai": { + "version": "0.1.0", + "from": "karma-chai@0.1.0", + "resolved": "https://registry.npmjs.org/karma-chai/-/karma-chai-0.1.0.tgz", + "dev": true + }, + "karma-chrome-launcher": { + "version": "2.1.1", + "from": "karma-chrome-launcher@2.1.1", + "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-2.1.1.tgz", + "dev": true + }, + "karma-cli": { + "version": "1.0.1", + "from": "karma-cli@1.0.1", + "resolved": "https://registry.npmjs.org/karma-cli/-/karma-cli-1.0.1.tgz", + "dev": true + }, + "karma-jasmine": { + "version": "1.1.0", + "from": "karma-jasmine@1.1.0", + "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-1.1.0.tgz", + "dev": true + }, + "karma-webpack": { + "version": "2.0.3", + "from": "karma-webpack@2.0.3", + "resolved": "https://registry.npmjs.org/karma-webpack/-/karma-webpack-2.0.3.tgz", + "dev": true, + "dependencies": { + "async": { + "version": "0.9.2", + "from": "async@>=0.9.0 <0.10.0", + "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz", + "dev": true + }, + "lodash": { + "version": "3.10.1", + "from": "lodash@>=3.8.0 <4.0.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", + "dev": true + }, + "source-map": { + "version": "0.1.43", + "from": "source-map@>=0.1.41 <0.2.0", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz", + "dev": true + } + } + }, + "kind-of": { + "version": "3.2.2", + "from": "kind-of@>=3.0.2 <4.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz" + }, + "lazy-cache": { + "version": "1.0.4", + "from": "lazy-cache@>=1.0.3 <2.0.0", + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz" + }, + "lcid": { + "version": "1.0.0", + "from": "lcid@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz" + }, + "load-json-file": { + "version": "1.1.0", + "from": "load-json-file@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz" + }, + "loader-runner": { + "version": "2.3.0", + "from": "loader-runner@>=2.3.0 <3.0.0", + "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.0.tgz" + }, + "loader-utils": { + "version": "0.2.17", + "from": "loader-utils@>=0.2.15 <0.3.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz" + }, + "lodash": { + "version": "4.17.4", + "from": "lodash@>=4.17.4 <5.0.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz" + }, + "lodash.camelcase": { + "version": "4.3.0", + "from": "lodash.camelcase@>=4.3.0 <5.0.0", + "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz" + }, + "lodash.memoize": { + "version": "4.1.2", + "from": "lodash.memoize@>=4.1.2 <5.0.0", + "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz" + }, + "lodash.uniq": { + "version": "4.5.0", + "from": "lodash.uniq@>=4.5.0 <5.0.0", + "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz" + }, + "log4js": { + "version": "0.6.38", + "from": "log4js@>=0.6.31 <0.7.0", + "resolved": "https://registry.npmjs.org/log4js/-/log4js-0.6.38.tgz", + "dev": true, + "dependencies": { + "isarray": { + "version": "0.0.1", + "from": "isarray@0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "dev": true + }, + "readable-stream": { + "version": "1.0.34", + "from": "readable-stream@>=1.0.2 <1.1.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "dev": true + }, + "semver": { + "version": "4.3.6", + "from": "semver@>=4.3.3 <4.4.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz", + "dev": true + }, + "string_decoder": { + "version": "0.10.31", + "from": "string_decoder@>=0.10.0 <0.11.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "dev": true + } + } + }, + "longest": { + "version": "1.0.1", + "from": "longest@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz" + }, + "lower-case": { + "version": "1.1.4", + "from": "lower-case@>=1.1.1 <2.0.0", + "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz" + }, + "lru-cache": { + "version": "2.2.4", + "from": "lru-cache@>=2.2.0 <2.3.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz", + "dev": true + }, + "macaddress": { + "version": "0.2.8", + "from": "macaddress@>=0.2.8 <0.3.0", + "resolved": "https://registry.npmjs.org/macaddress/-/macaddress-0.2.8.tgz" + }, + "math-expression-evaluator": { + "version": "1.2.17", + "from": "math-expression-evaluator@>=1.2.14 <2.0.0", + "resolved": "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz" + }, + "media-typer": { + "version": "0.3.0", + "from": "media-typer@0.3.0", + "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", + "dev": true + }, + "memory-fs": { + "version": "0.3.0", + "from": "memory-fs@>=0.3.0 <0.4.0", + "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.3.0.tgz" + }, + "micromatch": { + "version": "2.3.11", + "from": "micromatch@>=2.1.5 <3.0.0", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz" + }, + "miller-rabin": { + "version": "4.0.0", + "from": "miller-rabin@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.0.tgz" + }, + "mime": { + "version": "1.3.6", + "from": "mime@>=1.3.4 <2.0.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.6.tgz" + }, + "mime-db": { + "version": "1.27.0", + "from": "mime-db@>=1.27.0 <1.28.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz", + "dev": true + }, + "mime-types": { + "version": "2.1.15", + "from": "mime-types@>=2.1.15 <2.2.0", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz", + "dev": true + }, + "minimalistic-assert": { + "version": "1.0.0", + "from": "minimalistic-assert@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz" + }, + "minimalistic-crypto-utils": { + "version": "1.0.1", + "from": "minimalistic-crypto-utils@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz" + }, + "minimatch": { + "version": "3.0.4", + "from": "minimatch@>=3.0.2 <4.0.0", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz" + }, + "minimist": { + "version": "0.0.8", + "from": "minimist@0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz" + }, + "mkdirp": { + "version": "0.5.1", + "from": "mkdirp@>=0.5.1 <0.6.0", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz" + }, + "ms": { + "version": "2.0.0", + "from": "ms@2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz" + }, + "ncname": { + "version": "1.0.0", + "from": "ncname@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/ncname/-/ncname-1.0.0.tgz" + }, + "negotiator": { + "version": "0.6.1", + "from": "negotiator@0.6.1", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz", + "dev": true + }, + "no-case": { + "version": "2.3.1", + "from": "no-case@>=2.2.0 <3.0.0", + "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.1.tgz" + }, + "node-fetch": { + "version": "1.7.1", + "from": "node-fetch@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.1.tgz" + }, + "node-libs-browser": { + "version": "2.0.0", + "from": "node-libs-browser@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.0.0.tgz", + "dependencies": { + "string_decoder": { + "version": "0.10.31", + "from": "string_decoder@>=0.10.25 <0.11.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" + } + } + }, + "normalize-package-data": { + "version": "2.3.8", + "from": "normalize-package-data@>=2.3.2 <3.0.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.8.tgz" + }, + "normalize-path": { + "version": "2.1.1", + "from": "normalize-path@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz" + }, + "normalize-range": { + "version": "0.1.2", + "from": "normalize-range@>=0.1.2 <0.2.0", + "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz" + }, + "normalize-url": { + "version": "1.9.1", + "from": "normalize-url@>=1.4.0 <2.0.0", + "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz" + }, + "null-check": { + "version": "1.0.0", + "from": "null-check@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/null-check/-/null-check-1.0.0.tgz", + "dev": true + }, + "num2fraction": { + "version": "1.2.2", + "from": "num2fraction@>=1.2.2 <2.0.0", + "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz" + }, + "number-is-nan": { + "version": "1.0.1", + "from": "number-is-nan@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz" + }, + "object-assign": { + "version": "4.1.1", + "from": "object-assign@>=4.0.1 <5.0.0", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz" + }, + "object-component": { + "version": "0.0.3", + "from": "object-component@0.0.3", + "resolved": "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz", + "dev": true + }, + "object.omit": { + "version": "2.0.1", + "from": "object.omit@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz" + }, + "on-finished": { + "version": "2.3.0", + "from": "on-finished@>=2.3.0 <2.4.0", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz" + }, + "once": { + "version": "1.4.0", + "from": "once@>=1.3.0 <2.0.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "dev": true + }, + "optimist": { + "version": "0.6.1", + "from": "optimist@>=0.6.1 <0.7.0", + "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", + "dev": true + }, + "options": { + "version": "0.0.6", + "from": "options@>=0.0.5", + "resolved": "https://registry.npmjs.org/options/-/options-0.0.6.tgz", + "dev": true + }, + "os-browserify": { + "version": "0.2.1", + "from": "os-browserify@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.2.1.tgz" + }, + "os-locale": { + "version": "1.4.0", + "from": "os-locale@>=1.4.0 <2.0.0", + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz" + }, + "os-tmpdir": { + "version": "1.0.2", + "from": "os-tmpdir@>=1.0.1 <1.1.0", + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "dev": true + }, + "pako": { + "version": "0.2.9", + "from": "pako@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz" + }, + "param-case": { + "version": "2.1.1", + "from": "param-case@>=2.1.0 <2.2.0", + "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz" + }, + "parse-asn1": { + "version": "5.1.0", + "from": "parse-asn1@>=5.0.0 <6.0.0", + "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz" + }, + "parse-glob": { + "version": "3.0.4", + "from": "parse-glob@>=3.0.4 <4.0.0", + "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz" + }, + "parse-json": { + "version": "2.2.0", + "from": "parse-json@>=2.2.0 <3.0.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz" + }, + "parse5": { + "version": "3.0.2", + "from": "parse5@>=3.0.1 <4.0.0", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-3.0.2.tgz", + "dependencies": { + "@types/node": { + "version": "6.0.78", + "from": "@types/node@>=6.0.46 <7.0.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.78.tgz" + } + } + }, + "parsejson": { + "version": "0.0.3", + "from": "parsejson@0.0.3", + "resolved": "https://registry.npmjs.org/parsejson/-/parsejson-0.0.3.tgz", + "dev": true + }, + "parseqs": { + "version": "0.0.5", + "from": "parseqs@0.0.5", + "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz", + "dev": true + }, + "parseuri": { + "version": "0.0.5", + "from": "parseuri@0.0.5", + "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz", + "dev": true + }, + "parseurl": { + "version": "1.3.1", + "from": "parseurl@>=1.3.1 <1.4.0", + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz" + }, + "path-browserify": { + "version": "0.0.0", + "from": "path-browserify@0.0.0", + "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz" + }, + "path-exists": { + "version": "2.1.0", + "from": "path-exists@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz" + }, + "path-is-absolute": { + "version": "1.0.1", + "from": "path-is-absolute@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz" + }, + "path-parse": { + "version": "1.0.5", + "from": "path-parse@>=1.0.5 <2.0.0", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz", + "dev": true + }, + "path-type": { + "version": "1.1.0", + "from": "path-type@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz" + }, + "pbkdf2": { + "version": "3.0.12", + "from": "pbkdf2@>=3.0.3 <4.0.0", + "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.12.tgz" + }, + "pify": { + "version": "2.3.0", + "from": "pify@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz" + }, + "pinkie": { + "version": "2.0.4", + "from": "pinkie@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz" + }, + "pinkie-promise": { + "version": "2.0.1", + "from": "pinkie-promise@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz" + }, + "postcss": { + "version": "5.2.17", + "from": "postcss@>=5.0.6 <6.0.0", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", + "dependencies": { + "supports-color": { + "version": "3.2.3", + "from": "supports-color@>=3.2.3 <4.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz" + } + } + }, + "postcss-calc": { + "version": "5.3.1", + "from": "postcss-calc@>=5.2.0 <6.0.0", + "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-5.3.1.tgz" + }, + "postcss-colormin": { + "version": "2.2.2", + "from": "postcss-colormin@>=2.1.8 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-2.2.2.tgz" + }, + "postcss-convert-values": { + "version": "2.6.1", + "from": "postcss-convert-values@>=2.3.4 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-2.6.1.tgz" + }, + "postcss-discard-comments": { + "version": "2.0.4", + "from": "postcss-discard-comments@>=2.0.4 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz" + }, + "postcss-discard-duplicates": { + "version": "2.1.0", + "from": "postcss-discard-duplicates@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-2.1.0.tgz" + }, + "postcss-discard-empty": { + "version": "2.1.0", + "from": "postcss-discard-empty@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-2.1.0.tgz" + }, + "postcss-discard-overridden": { + "version": "0.1.1", + "from": "postcss-discard-overridden@>=0.1.1 <0.2.0", + "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz" + }, + "postcss-discard-unused": { + "version": "2.2.3", + "from": "postcss-discard-unused@>=2.2.1 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-discard-unused/-/postcss-discard-unused-2.2.3.tgz" + }, + "postcss-filter-plugins": { + "version": "2.0.2", + "from": "postcss-filter-plugins@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-filter-plugins/-/postcss-filter-plugins-2.0.2.tgz" + }, + "postcss-merge-idents": { + "version": "2.1.7", + "from": "postcss-merge-idents@>=2.1.5 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz" + }, + "postcss-merge-longhand": { + "version": "2.0.2", + "from": "postcss-merge-longhand@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-2.0.2.tgz" + }, + "postcss-merge-rules": { + "version": "2.1.2", + "from": "postcss-merge-rules@>=2.0.3 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-2.1.2.tgz" + }, + "postcss-message-helpers": { + "version": "2.0.0", + "from": "postcss-message-helpers@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz" + }, + "postcss-minify-font-values": { + "version": "1.0.5", + "from": "postcss-minify-font-values@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-1.0.5.tgz" + }, + "postcss-minify-gradients": { + "version": "1.0.5", + "from": "postcss-minify-gradients@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-1.0.5.tgz" + }, + "postcss-minify-params": { + "version": "1.2.2", + "from": "postcss-minify-params@>=1.0.4 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-1.2.2.tgz" + }, + "postcss-minify-selectors": { + "version": "2.1.1", + "from": "postcss-minify-selectors@>=2.0.4 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-2.1.1.tgz" + }, + "postcss-modules-extract-imports": { + "version": "1.1.0", + "from": "postcss-modules-extract-imports@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.1.0.tgz", + "dependencies": { + "has-flag": { + "version": "2.0.0", + "from": "has-flag@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz" + }, + "postcss": { + "version": "6.0.3", + "from": "postcss@>=6.0.1 <7.0.0", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.3.tgz" + }, + "supports-color": { + "version": "4.0.0", + "from": "supports-color@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.0.0.tgz" + } + } + }, + "postcss-modules-local-by-default": { + "version": "1.2.0", + "from": "postcss-modules-local-by-default@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz", + "dependencies": { + "has-flag": { + "version": "2.0.0", + "from": "has-flag@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz" + }, + "postcss": { + "version": "6.0.3", + "from": "postcss@>=6.0.1 <7.0.0", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.3.tgz" + }, + "supports-color": { + "version": "4.0.0", + "from": "supports-color@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.0.0.tgz" + } + } + }, + "postcss-modules-scope": { + "version": "1.1.0", + "from": "postcss-modules-scope@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz", + "dependencies": { + "has-flag": { + "version": "2.0.0", + "from": "has-flag@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz" + }, + "postcss": { + "version": "6.0.3", + "from": "postcss@>=6.0.1 <7.0.0", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.3.tgz" + }, + "supports-color": { + "version": "4.0.0", + "from": "supports-color@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.0.0.tgz" + } + } + }, + "postcss-modules-values": { + "version": "1.3.0", + "from": "postcss-modules-values@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz", + "dependencies": { + "has-flag": { + "version": "2.0.0", + "from": "has-flag@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz" + }, + "postcss": { + "version": "6.0.3", + "from": "postcss@>=6.0.1 <7.0.0", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.3.tgz" + }, + "supports-color": { + "version": "4.0.0", + "from": "supports-color@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.0.0.tgz" + } + } + }, + "postcss-normalize-charset": { + "version": "1.1.1", + "from": "postcss-normalize-charset@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz" + }, + "postcss-normalize-url": { + "version": "3.0.8", + "from": "postcss-normalize-url@>=3.0.7 <4.0.0", + "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-3.0.8.tgz" + }, + "postcss-ordered-values": { + "version": "2.2.3", + "from": "postcss-ordered-values@>=2.1.0 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-2.2.3.tgz" + }, + "postcss-reduce-idents": { + "version": "2.4.0", + "from": "postcss-reduce-idents@>=2.2.2 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz" + }, + "postcss-reduce-initial": { + "version": "1.0.1", + "from": "postcss-reduce-initial@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-1.0.1.tgz" + }, + "postcss-reduce-transforms": { + "version": "1.0.4", + "from": "postcss-reduce-transforms@>=1.0.3 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.4.tgz" + }, + "postcss-selector-parser": { + "version": "2.2.3", + "from": "postcss-selector-parser@>=2.2.2 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz" + }, + "postcss-svgo": { + "version": "2.1.6", + "from": "postcss-svgo@>=2.1.1 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-2.1.6.tgz" + }, + "postcss-unique-selectors": { + "version": "2.0.2", + "from": "postcss-unique-selectors@>=2.0.2 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-2.0.2.tgz" + }, + "postcss-value-parser": { + "version": "3.3.0", + "from": "postcss-value-parser@>=3.3.0 <4.0.0", + "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz" + }, + "postcss-zindex": { + "version": "2.2.0", + "from": "postcss-zindex@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-zindex/-/postcss-zindex-2.2.0.tgz" + }, + "preboot": { + "version": "4.5.2", + "from": "preboot@4.5.2", + "resolved": "https://registry.npmjs.org/preboot/-/preboot-4.5.2.tgz" + }, + "prepend-http": { + "version": "1.0.4", + "from": "prepend-http@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz" + }, + "preserve": { + "version": "0.2.0", + "from": "preserve@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz" + }, + "private": { + "version": "0.1.7", + "from": "private@>=0.1.5 <0.2.0", + "resolved": "https://registry.npmjs.org/private/-/private-0.1.7.tgz" + }, + "process": { + "version": "0.11.10", + "from": "process@>=0.11.0 <0.12.0", + "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz" + }, + "process-nextick-args": { + "version": "1.0.7", + "from": "process-nextick-args@>=1.0.6 <1.1.0", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz" + }, + "prr": { + "version": "0.0.0", + "from": "prr@>=0.0.0 <0.1.0", + "resolved": "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz" + }, + "public-encrypt": { + "version": "4.0.0", + "from": "public-encrypt@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz" + }, + "punycode": { + "version": "1.4.1", + "from": "punycode@>=1.2.4 <2.0.0", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz" + }, + "q": { + "version": "1.5.0", + "from": "q@>=1.1.2 <2.0.0", + "resolved": "https://registry.npmjs.org/q/-/q-1.5.0.tgz" + }, + "qjobs": { + "version": "1.1.5", + "from": "qjobs@>=1.1.4 <2.0.0", + "resolved": "https://registry.npmjs.org/qjobs/-/qjobs-1.1.5.tgz", + "dev": true + }, + "qs": { + "version": "6.4.0", + "from": "qs@6.4.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz", + "dev": true + }, + "query-string": { + "version": "4.3.4", + "from": "query-string@>=4.1.0 <5.0.0", + "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz" + }, + "querystring": { + "version": "0.2.0", + "from": "querystring@0.2.0", + "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz" + }, + "querystring-es3": { + "version": "0.2.1", + "from": "querystring-es3@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz" + }, + "randomatic": { + "version": "1.1.7", + "from": "randomatic@>=1.1.3 <2.0.0", + "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz", + "dependencies": { + "is-number": { + "version": "3.0.0", + "from": "is-number@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "dependencies": { + "kind-of": { + "version": "3.2.2", + "from": "kind-of@^3.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz" + } + } + }, + "kind-of": { + "version": "4.0.0", + "from": "kind-of@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz" + } + } + }, + "randombytes": { + "version": "2.0.5", + "from": "randombytes@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.5.tgz" + }, + "range-parser": { + "version": "1.2.0", + "from": "range-parser@>=1.0.3 <2.0.0", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz" + }, + "raw-body": { + "version": "2.2.0", + "from": "raw-body@>=2.2.0 <2.3.0", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.2.0.tgz", + "dev": true, + "dependencies": { + "iconv-lite": { + "version": "0.4.15", + "from": "iconv-lite@0.4.15", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz", + "dev": true + } + } + }, + "raw-loader": { + "version": "0.5.1", + "from": "raw-loader@0.5.1", + "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-0.5.1.tgz" + }, + "read-pkg": { + "version": "1.1.0", + "from": "read-pkg@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz" + }, + "read-pkg-up": { + "version": "1.0.1", + "from": "read-pkg-up@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz" + }, + "readable-stream": { + "version": "2.3.2", + "from": "readable-stream@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.2.tgz" + }, + "readdirp": { + "version": "2.1.0", + "from": "readdirp@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz" + }, + "recast": { + "version": "0.11.23", + "from": "recast@>=0.11.12 <0.12.0", + "resolved": "https://registry.npmjs.org/recast/-/recast-0.11.23.tgz", + "dependencies": { + "esprima": { + "version": "3.1.3", + "from": "esprima@>=3.1.0 <3.2.0", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz" + } + } + }, + "reduce-css-calc": { + "version": "1.3.0", + "from": "reduce-css-calc@>=1.2.6 <2.0.0", + "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz" + }, + "reduce-function-call": { + "version": "1.0.2", + "from": "reduce-function-call@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/reduce-function-call/-/reduce-function-call-1.0.2.tgz" + }, + "reflect-metadata": { + "version": "0.1.10", + "from": "reflect-metadata@0.1.10", + "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.10.tgz" + }, + "regenerate": { + "version": "1.3.2", + "from": "regenerate@>=1.2.1 <2.0.0", + "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.2.tgz" + }, + "regex-cache": { + "version": "0.4.3", + "from": "regex-cache@>=0.4.2 <0.5.0", + "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz" + }, + "regexpu-core": { + "version": "1.0.0", + "from": "regexpu-core@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz" + }, + "regjsgen": { + "version": "0.2.0", + "from": "regjsgen@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz" + }, + "regjsparser": { + "version": "0.1.5", + "from": "regjsparser@>=0.1.4 <0.2.0", + "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz" + }, + "relateurl": { + "version": "0.2.7", + "from": "relateurl@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz" + }, + "remove-trailing-separator": { + "version": "1.0.2", + "from": "remove-trailing-separator@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.0.2.tgz" + }, + "repeat-element": { + "version": "1.1.2", + "from": "repeat-element@>=1.1.2 <2.0.0", + "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz" + }, + "repeat-string": { + "version": "1.6.1", + "from": "repeat-string@>=1.5.2 <2.0.0", + "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz" + }, + "require-directory": { + "version": "2.1.1", + "from": "require-directory@>=2.1.1 <3.0.0", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz" + }, + "require-from-string": { + "version": "1.2.1", + "from": "require-from-string@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-1.2.1.tgz" + }, + "require-main-filename": { + "version": "1.0.1", + "from": "require-main-filename@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz" + }, + "requires-port": { + "version": "1.0.0", + "from": "requires-port@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", + "dev": true + }, + "resolve": { + "version": "1.3.3", + "from": "resolve@>=1.1.6 <2.0.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.3.3.tgz", + "dev": true + }, + "resolve-url": { + "version": "0.2.1", + "from": "resolve-url@>=0.2.1 <0.3.0", + "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz" + }, + "right-align": { + "version": "0.1.3", + "from": "right-align@>=0.1.1 <0.2.0", + "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz" + }, + "rimraf": { + "version": "2.6.1", + "from": "rimraf@>=2.6.0 <3.0.0", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz", + "dev": true + }, + "ripemd160": { + "version": "2.0.1", + "from": "ripemd160@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz" + }, + "rxjs": { + "version": "5.4.0", + "from": "rxjs@5.4.0", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.4.0.tgz" + }, + "safe-buffer": { + "version": "5.1.1", + "from": "safe-buffer@>=5.1.0 <5.2.0", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz" + }, + "sax": { + "version": "1.2.4", + "from": "sax@>=1.2.1 <1.3.0", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz" + }, + "semver": { + "version": "5.3.0", + "from": "semver@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0||>=4.0.0 <5.0.0||>=5.0.0 <6.0.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz" + }, + "set-blocking": { + "version": "2.0.0", + "from": "set-blocking@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz" + }, + "set-immediate-shim": { + "version": "1.0.1", + "from": "set-immediate-shim@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz" + }, + "setimmediate": { + "version": "1.0.5", + "from": "setimmediate@>=1.0.4 <2.0.0", + "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz" + }, + "setprototypeof": { + "version": "1.0.3", + "from": "setprototypeof@1.0.3", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz", + "dev": true + }, + "sha.js": { + "version": "2.4.8", + "from": "sha.js@>=2.4.0 <3.0.0", + "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.8.tgz" + }, + "socket.io": { + "version": "1.7.3", + "from": "socket.io@1.7.3", + "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-1.7.3.tgz", + "dev": true, + "dependencies": { + "debug": { + "version": "2.3.3", + "from": "debug@2.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz", + "dev": true + }, + "ms": { + "version": "0.7.2", + "from": "ms@0.7.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz", + "dev": true + }, + "object-assign": { + "version": "4.1.0", + "from": "object-assign@4.1.0", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz", + "dev": true + } + } + }, + "socket.io-adapter": { + "version": "0.5.0", + "from": "socket.io-adapter@0.5.0", + "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz", + "dev": true, + "dependencies": { + "debug": { + "version": "2.3.3", + "from": "debug@2.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz", + "dev": true + }, + "ms": { + "version": "0.7.2", + "from": "ms@0.7.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz", + "dev": true + } + } + }, + "socket.io-client": { + "version": "1.7.3", + "from": "socket.io-client@1.7.3", + "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.7.3.tgz", + "dev": true, + "dependencies": { + "component-emitter": { + "version": "1.2.1", + "from": "component-emitter@1.2.1", + "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", + "dev": true + }, + "debug": { + "version": "2.3.3", + "from": "debug@2.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz", + "dev": true + }, + "ms": { + "version": "0.7.2", + "from": "ms@0.7.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz", + "dev": true + } + } + }, + "socket.io-parser": { + "version": "2.3.1", + "from": "socket.io-parser@2.3.1", + "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.3.1.tgz", + "dev": true, + "dependencies": { + "debug": { + "version": "2.2.0", + "from": "debug@2.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", + "dev": true + }, + "isarray": { + "version": "0.0.1", + "from": "isarray@0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "dev": true + }, + "ms": { + "version": "0.7.1", + "from": "ms@0.7.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", + "dev": true + } + } + }, + "sort-keys": { + "version": "1.1.2", + "from": "sort-keys@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz" + }, + "source-list-map": { + "version": "0.1.8", + "from": "source-list-map@>=0.1.7 <0.2.0", + "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz" + }, + "source-map": { + "version": "0.5.6", + "from": "source-map@>=0.5.6 <0.6.0", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz" + }, + "source-map-resolve": { + "version": "0.3.1", + "from": "source-map-resolve@>=0.3.0 <0.4.0", + "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.3.1.tgz" + }, + "source-map-support": { + "version": "0.4.15", + "from": "source-map-support@>=0.4.15 <0.5.0", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.15.tgz" + }, + "source-map-url": { + "version": "0.3.0", + "from": "source-map-url@>=0.3.0 <0.4.0", + "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.3.0.tgz" + }, + "spdx-correct": { + "version": "1.0.2", + "from": "spdx-correct@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz" + }, + "spdx-expression-parse": { + "version": "1.0.4", + "from": "spdx-expression-parse@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz" + }, + "spdx-license-ids": { + "version": "1.2.2", + "from": "spdx-license-ids@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz" + }, + "sprintf-js": { + "version": "1.0.3", + "from": "sprintf-js@>=1.0.2 <1.1.0", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz" + }, + "statuses": { + "version": "1.3.1", + "from": "statuses@>=1.3.1 <1.4.0", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz" + }, + "stream-browserify": { + "version": "2.0.1", + "from": "stream-browserify@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz" + }, + "stream-http": { + "version": "2.7.2", + "from": "stream-http@>=2.3.1 <3.0.0", + "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.7.2.tgz" + }, + "strict-uri-encode": { + "version": "1.1.0", + "from": "strict-uri-encode@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz" + }, + "string_decoder": { + "version": "1.0.3", + "from": "string_decoder@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz" + }, + "string-width": { + "version": "1.0.2", + "from": "string-width@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz" + }, + "strip-ansi": { + "version": "3.0.1", + "from": "strip-ansi@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz" + }, + "strip-bom": { + "version": "2.0.0", + "from": "strip-bom@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz" + }, + "style-loader": { + "version": "0.17.0", + "from": "style-loader@0.17.0", + "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.17.0.tgz", + "dependencies": { + "loader-utils": { + "version": "1.1.0", + "from": "loader-utils@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz" + } + } + }, + "supports-color": { + "version": "2.0.0", + "from": "supports-color@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz" + }, + "svgo": { + "version": "0.7.2", + "from": "svgo@>=0.7.0 <0.8.0", + "resolved": "https://registry.npmjs.org/svgo/-/svgo-0.7.2.tgz" + }, + "symbol-observable": { + "version": "1.0.4", + "from": "symbol-observable@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.4.tgz" + }, + "tapable": { + "version": "0.2.6", + "from": "tapable@>=0.2.5 <0.3.0", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.2.6.tgz" + }, + "through": { + "version": "2.3.8", + "from": "through@>=2.3.6 <2.4.0", + "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz" + }, + "timers-browserify": { + "version": "2.0.2", + "from": "timers-browserify@>=2.0.2 <3.0.0", + "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.2.tgz" + }, + "tmp": { + "version": "0.0.31", + "from": "tmp@0.0.31", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz", + "dev": true + }, + "to-array": { + "version": "0.1.4", + "from": "to-array@0.1.4", + "resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz", + "dev": true + }, + "to-arraybuffer": { + "version": "1.0.1", + "from": "to-arraybuffer@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz" + }, + "to-string-loader": { + "version": "1.1.5", + "from": "to-string-loader@1.1.5", + "resolved": "https://registry.npmjs.org/to-string-loader/-/to-string-loader-1.1.5.tgz" + }, + "tty-browserify": { + "version": "0.0.0", + "from": "tty-browserify@0.0.0", + "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz" + }, + "type-detect": { + "version": "1.0.0", + "from": "type-detect@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-1.0.0.tgz", + "dev": true + }, + "type-is": { + "version": "1.6.15", + "from": "type-is@>=1.6.15 <1.7.0", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.15.tgz", + "dev": true + }, + "typescript": { + "version": "2.3.2", + "from": "typescript@2.3.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.3.2.tgz" + }, + "uglify-js": { + "version": "3.0.20", + "from": "uglify-js@>=3.0.0 <3.1.0", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.20.tgz" + }, + "uglify-to-browserify": { + "version": "1.0.2", + "from": "uglify-to-browserify@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz", + "optional": true + }, + "ultron": { + "version": "1.0.2", + "from": "ultron@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz", + "dev": true + }, + "uniq": { + "version": "1.0.1", + "from": "uniq@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz" + }, + "uniqid": { + "version": "4.1.1", + "from": "uniqid@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/uniqid/-/uniqid-4.1.1.tgz" + }, + "uniqs": { + "version": "2.0.0", + "from": "uniqs@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz" + }, + "unpipe": { + "version": "1.0.0", + "from": "unpipe@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz" + }, + "upper-case": { + "version": "1.1.3", + "from": "upper-case@>=1.1.1 <2.0.0", + "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz" + }, + "urix": { + "version": "0.1.0", + "from": "urix@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz" + }, + "url": { + "version": "0.11.0", + "from": "url@>=0.11.0 <0.12.0", + "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", + "dependencies": { + "punycode": { + "version": "1.3.2", + "from": "punycode@1.3.2", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz" + } + } + }, + "url-loader": { + "version": "0.5.8", + "from": "url-loader@0.5.8", + "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-0.5.8.tgz", + "dependencies": { + "loader-utils": { + "version": "1.1.0", + "from": "loader-utils@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz" + } + } + }, + "useragent": { + "version": "2.1.13", + "from": "useragent@>=2.1.12 <3.0.0", + "resolved": "https://registry.npmjs.org/useragent/-/useragent-2.1.13.tgz", + "dev": true + }, + "util": { + "version": "0.10.3", + "from": "util@>=0.10.3 <0.11.0", + "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", + "dependencies": { + "inherits": { + "version": "2.0.1", + "from": "inherits@2.0.1", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + } + } + }, + "util-deprecate": { + "version": "1.0.2", + "from": "util-deprecate@>=1.0.1 <1.1.0", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz" + }, + "utils-merge": { + "version": "1.0.0", + "from": "utils-merge@1.0.0", + "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz" + }, + "validate-npm-package-license": { + "version": "3.0.1", + "from": "validate-npm-package-license@>=3.0.1 <4.0.0", + "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz" + }, + "vendors": { + "version": "1.0.1", + "from": "vendors@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.1.tgz" + }, + "vm-browserify": { + "version": "0.0.4", + "from": "vm-browserify@0.0.4", + "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz" + }, + "void-elements": { + "version": "2.0.1", + "from": "void-elements@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz", + "dev": true + }, + "watchpack": { + "version": "1.3.1", + "from": "watchpack@>=1.3.1 <2.0.0", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.3.1.tgz" + }, + "webpack": { + "version": "2.5.1", + "from": "webpack@2.5.1", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-2.5.1.tgz", + "dependencies": { + "memory-fs": { + "version": "0.4.1", + "from": "memory-fs@>=0.4.1 <0.5.0", + "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz" + }, + "source-list-map": { + "version": "1.1.2", + "from": "source-list-map@>=1.1.1 <2.0.0", + "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-1.1.2.tgz" + }, + "supports-color": { + "version": "3.2.3", + "from": "supports-color@>=3.1.0 <4.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz" + }, + "uglify-js": { + "version": "2.8.29", + "from": "uglify-js@>=2.8.5 <3.0.0", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz", + "dependencies": { + "yargs": { + "version": "3.10.0", + "from": "yargs@>=3.10.0 <3.11.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz" + } + } + }, + "webpack-sources": { + "version": "0.2.3", + "from": "webpack-sources@>=0.2.3 <0.3.0", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.2.3.tgz" + } + } + }, + "webpack-dev-middleware": { + "version": "1.11.0", + "from": "webpack-dev-middleware@>=1.8.4 <2.0.0", + "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-1.11.0.tgz", + "dependencies": { + "memory-fs": { + "version": "0.4.1", + "from": "memory-fs@>=0.4.1 <0.5.0", + "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz" + } + } + }, + "webpack-hot-middleware": { + "version": "2.18.0", + "from": "webpack-hot-middleware@2.18.0", + "resolved": "https://registry.npmjs.org/webpack-hot-middleware/-/webpack-hot-middleware-2.18.0.tgz" + }, + "webpack-merge": { + "version": "4.1.0", + "from": "webpack-merge@4.1.0", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.0.tgz" + }, + "webpack-node-externals": { + "version": "1.6.0", + "from": "webpack-node-externals@>=1.4.3 <2.0.0", + "resolved": "https://registry.npmjs.org/webpack-node-externals/-/webpack-node-externals-1.6.0.tgz" + }, + "webpack-sources": { + "version": "0.1.5", + "from": "webpack-sources@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.1.5.tgz" + }, + "whatwg-fetch": { + "version": "2.0.3", + "from": "whatwg-fetch@>=0.10.0", + "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz" + }, + "whet.extend": { + "version": "0.9.9", + "from": "whet.extend@>=0.9.9 <0.10.0", + "resolved": "https://registry.npmjs.org/whet.extend/-/whet.extend-0.9.9.tgz" + }, + "which": { + "version": "1.2.14", + "from": "which@>=1.2.1 <2.0.0", + "resolved": "https://registry.npmjs.org/which/-/which-1.2.14.tgz", + "dev": true + }, + "which-module": { + "version": "1.0.0", + "from": "which-module@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz" + }, + "window-size": { + "version": "0.1.0", + "from": "window-size@0.1.0", + "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz" + }, + "wordwrap": { + "version": "0.0.2", + "from": "wordwrap@0.0.2", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz" + }, + "wrap-ansi": { + "version": "2.1.0", + "from": "wrap-ansi@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz" + }, + "wrappy": { + "version": "1.0.2", + "from": "wrappy@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "dev": true + }, + "ws": { + "version": "1.1.2", + "from": "ws@1.1.2", + "resolved": "https://registry.npmjs.org/ws/-/ws-1.1.2.tgz", + "dev": true + }, + "wtf-8": { + "version": "1.0.0", + "from": "wtf-8@1.0.0", + "resolved": "https://registry.npmjs.org/wtf-8/-/wtf-8-1.0.0.tgz", + "dev": true + }, + "xhr2": { + "version": "0.1.4", + "from": "xhr2@>=0.1.4 <0.2.0", + "resolved": "https://registry.npmjs.org/xhr2/-/xhr2-0.1.4.tgz" + }, + "xml-char-classes": { + "version": "1.0.0", + "from": "xml-char-classes@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/xml-char-classes/-/xml-char-classes-1.0.0.tgz" + }, + "xmlhttprequest-ssl": { + "version": "1.5.3", + "from": "xmlhttprequest-ssl@1.5.3", + "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz", + "dev": true + }, + "xtend": { + "version": "4.0.1", + "from": "xtend@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz" + }, + "y18n": { + "version": "3.2.1", + "from": "y18n@>=3.2.1 <4.0.0", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz" + }, + "yargs": { + "version": "6.6.0", + "from": "yargs@>=6.0.0 <7.0.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz", + "dependencies": { + "camelcase": { + "version": "3.0.0", + "from": "camelcase@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz" + }, + "cliui": { + "version": "3.2.0", + "from": "cliui@>=3.2.0 <4.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz" + } + } + }, + "yargs-parser": { + "version": "4.2.1", + "from": "yargs-parser@>=4.2.0 <5.0.0", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz", + "dependencies": { + "camelcase": { + "version": "3.0.0", + "from": "camelcase@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz" + } + } + }, + "yeast": { + "version": "0.1.2", + "from": "yeast@0.1.2", + "resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz", + "dev": true + }, + "zone.js": { + "version": "0.8.10", + "from": "zone.js@0.8.10", + "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.8.10.tgz" + } + } +} diff --git a/templates/AureliaSpa/npm-shrinkwrap.json b/templates/AureliaSpa/npm-shrinkwrap.json new file mode 100644 index 00000000..611e8b67 --- /dev/null +++ b/templates/AureliaSpa/npm-shrinkwrap.json @@ -0,0 +1,2615 @@ +{ + "name": "WebApplicationBasic", + "version": "0.0.0", + "dependencies": { + "@types/node": { + "version": "7.0.32", + "from": "@types/node@>=7.0.12 <8.0.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.32.tgz", + "dev": true + }, + "acorn": { + "version": "5.0.3", + "from": "acorn@>=5.0.0 <6.0.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.0.3.tgz", + "dev": true + }, + "acorn-dynamic-import": { + "version": "2.0.2", + "from": "acorn-dynamic-import@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz", + "dev": true, + "dependencies": { + "acorn": { + "version": "4.0.13", + "from": "acorn@>=4.0.3 <5.0.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz", + "dev": true + } + } + }, + "ajv": { + "version": "5.2.0", + "from": "ajv@>=5.0.0 <6.0.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.0.tgz", + "dev": true + }, + "ajv-keywords": { + "version": "1.5.1", + "from": "ajv-keywords@>=1.1.1 <2.0.0", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.1.tgz", + "dev": true + }, + "align-text": { + "version": "0.1.4", + "from": "align-text@>=0.1.3 <0.2.0", + "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", + "dev": true + }, + "alphanum-sort": { + "version": "1.0.2", + "from": "alphanum-sort@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz", + "dev": true + }, + "ansi-html": { + "version": "0.0.7", + "from": "ansi-html@0.0.7", + "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz", + "dev": true + }, + "ansi-regex": { + "version": "2.1.1", + "from": "ansi-regex@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "dev": true + }, + "ansi-styles": { + "version": "2.2.1", + "from": "ansi-styles@>=2.2.1 <3.0.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", + "dev": true + }, + "anymatch": { + "version": "1.3.0", + "from": "anymatch@>=1.3.0 <2.0.0", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.0.tgz", + "dev": true + }, + "argparse": { + "version": "1.0.9", + "from": "argparse@>=1.0.7 <2.0.0", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz", + "dev": true + }, + "arr-diff": { + "version": "2.0.0", + "from": "arr-diff@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz", + "dev": true + }, + "arr-flatten": { + "version": "1.0.3", + "from": "arr-flatten@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.3.tgz", + "dev": true + }, + "array-unique": { + "version": "0.2.1", + "from": "array-unique@>=0.2.1 <0.3.0", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz", + "dev": true + }, + "arrify": { + "version": "1.0.1", + "from": "arrify@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", + "dev": true + }, + "asn1.js": { + "version": "4.9.1", + "from": "asn1.js@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.1.tgz", + "dev": true + }, + "aspnet-webpack": { + "version": "1.0.29", + "from": "aspnet-webpack@>=1.0.28 <2.0.0", + "resolved": "https://registry.npmjs.org/aspnet-webpack/-/aspnet-webpack-1.0.29.tgz", + "dev": true + }, + "assert": { + "version": "1.4.1", + "from": "assert@>=1.1.1 <2.0.0", + "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz", + "dev": true + }, + "ast-types": { + "version": "0.9.6", + "from": "ast-types@0.9.6", + "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.9.6.tgz", + "dev": true + }, + "async": { + "version": "2.5.0", + "from": "async@>=2.1.2 <3.0.0", + "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz", + "dev": true + }, + "async-each": { + "version": "1.0.1", + "from": "async-each@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz", + "dev": true + }, + "aurelia-binding": { + "version": "1.2.1", + "from": "aurelia-binding@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/aurelia-binding/-/aurelia-binding-1.2.1.tgz" + }, + "aurelia-bootstrapper": { + "version": "2.1.1", + "from": "aurelia-bootstrapper@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/aurelia-bootstrapper/-/aurelia-bootstrapper-2.1.1.tgz" + }, + "aurelia-dependency-injection": { + "version": "1.3.1", + "from": "aurelia-dependency-injection@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/aurelia-dependency-injection/-/aurelia-dependency-injection-1.3.1.tgz" + }, + "aurelia-event-aggregator": { + "version": "1.0.1", + "from": "aurelia-event-aggregator@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/aurelia-event-aggregator/-/aurelia-event-aggregator-1.0.1.tgz" + }, + "aurelia-fetch-client": { + "version": "1.1.2", + "from": "aurelia-fetch-client@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/aurelia-fetch-client/-/aurelia-fetch-client-1.1.2.tgz" + }, + "aurelia-framework": { + "version": "1.1.2", + "from": "aurelia-framework@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/aurelia-framework/-/aurelia-framework-1.1.2.tgz" + }, + "aurelia-history": { + "version": "1.0.0", + "from": "aurelia-history@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/aurelia-history/-/aurelia-history-1.0.0.tgz" + }, + "aurelia-history-browser": { + "version": "1.0.0", + "from": "aurelia-history-browser@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/aurelia-history-browser/-/aurelia-history-browser-1.0.0.tgz" + }, + "aurelia-hot-module-reload": { + "version": "0.1.0", + "from": "aurelia-hot-module-reload@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/aurelia-hot-module-reload/-/aurelia-hot-module-reload-0.1.0.tgz" + }, + "aurelia-loader": { + "version": "1.0.0", + "from": "aurelia-loader@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/aurelia-loader/-/aurelia-loader-1.0.0.tgz" + }, + "aurelia-loader-default": { + "version": "1.0.2", + "from": "aurelia-loader-default@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/aurelia-loader-default/-/aurelia-loader-default-1.0.2.tgz" + }, + "aurelia-loader-webpack": { + "version": "2.1.0", + "from": "aurelia-loader-webpack@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/aurelia-loader-webpack/-/aurelia-loader-webpack-2.1.0.tgz" + }, + "aurelia-logging": { + "version": "1.3.1", + "from": "aurelia-logging@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/aurelia-logging/-/aurelia-logging-1.3.1.tgz" + }, + "aurelia-logging-console": { + "version": "1.0.0", + "from": "aurelia-logging-console@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/aurelia-logging-console/-/aurelia-logging-console-1.0.0.tgz" + }, + "aurelia-metadata": { + "version": "1.0.3", + "from": "aurelia-metadata@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/aurelia-metadata/-/aurelia-metadata-1.0.3.tgz" + }, + "aurelia-pal": { + "version": "1.3.0", + "from": "aurelia-pal@>=1.3.0 <2.0.0", + "resolved": "https://registry.npmjs.org/aurelia-pal/-/aurelia-pal-1.3.0.tgz" + }, + "aurelia-pal-browser": { + "version": "1.2.1", + "from": "aurelia-pal-browser@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/aurelia-pal-browser/-/aurelia-pal-browser-1.2.1.tgz" + }, + "aurelia-path": { + "version": "1.1.1", + "from": "aurelia-path@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/aurelia-path/-/aurelia-path-1.1.1.tgz" + }, + "aurelia-polyfills": { + "version": "1.2.1", + "from": "aurelia-polyfills@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/aurelia-polyfills/-/aurelia-polyfills-1.2.1.tgz" + }, + "aurelia-route-recognizer": { + "version": "1.1.0", + "from": "aurelia-route-recognizer@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/aurelia-route-recognizer/-/aurelia-route-recognizer-1.1.0.tgz" + }, + "aurelia-router": { + "version": "1.3.0", + "from": "aurelia-router@>=1.2.1 <2.0.0", + "resolved": "https://registry.npmjs.org/aurelia-router/-/aurelia-router-1.3.0.tgz" + }, + "aurelia-task-queue": { + "version": "1.2.0", + "from": "aurelia-task-queue@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/aurelia-task-queue/-/aurelia-task-queue-1.2.0.tgz" + }, + "aurelia-templating": { + "version": "1.4.2", + "from": "aurelia-templating@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/aurelia-templating/-/aurelia-templating-1.4.2.tgz" + }, + "aurelia-templating-binding": { + "version": "1.3.0", + "from": "aurelia-templating-binding@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/aurelia-templating-binding/-/aurelia-templating-binding-1.3.0.tgz" + }, + "aurelia-templating-resources": { + "version": "1.4.0", + "from": "aurelia-templating-resources@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/aurelia-templating-resources/-/aurelia-templating-resources-1.4.0.tgz" + }, + "aurelia-templating-router": { + "version": "1.1.0", + "from": "aurelia-templating-router@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/aurelia-templating-router/-/aurelia-templating-router-1.1.0.tgz" + }, + "aurelia-webpack-plugin": { + "version": "2.0.0-rc.2", + "from": "aurelia-webpack-plugin@>=2.0.0-rc.2 <3.0.0", + "resolved": "https://registry.npmjs.org/aurelia-webpack-plugin/-/aurelia-webpack-plugin-2.0.0-rc.2.tgz", + "dev": true + }, + "autoprefixer": { + "version": "6.7.7", + "from": "autoprefixer@>=6.3.1 <7.0.0", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.7.7.tgz", + "dev": true + }, + "babel-code-frame": { + "version": "6.22.0", + "from": "babel-code-frame@>=6.11.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz", + "dev": true + }, + "balanced-match": { + "version": "1.0.0", + "from": "balanced-match@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "dev": true + }, + "base64-js": { + "version": "1.2.1", + "from": "base64-js@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.1.tgz", + "dev": true + }, + "big.js": { + "version": "3.1.3", + "from": "big.js@>=3.1.3 <4.0.0", + "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.1.3.tgz", + "dev": true + }, + "binary-extensions": { + "version": "1.8.0", + "from": "binary-extensions@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.8.0.tgz", + "dev": true + }, + "bn.js": { + "version": "4.11.7", + "from": "bn.js@>=4.1.1 <5.0.0", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.7.tgz", + "dev": true + }, + "bootstrap": { + "version": "3.3.7", + "from": "bootstrap@>=3.3.7 <4.0.0", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.3.7.tgz" + }, + "brace-expansion": { + "version": "1.1.8", + "from": "brace-expansion@>=1.1.7 <2.0.0", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", + "dev": true + }, + "braces": { + "version": "1.8.5", + "from": "braces@>=1.8.2 <2.0.0", + "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz", + "dev": true + }, + "brorand": { + "version": "1.1.0", + "from": "brorand@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", + "dev": true + }, + "browserify-aes": { + "version": "1.0.6", + "from": "browserify-aes@>=1.0.4 <2.0.0", + "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.6.tgz", + "dev": true + }, + "browserify-cipher": { + "version": "1.0.0", + "from": "browserify-cipher@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz", + "dev": true + }, + "browserify-des": { + "version": "1.0.0", + "from": "browserify-des@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz", + "dev": true + }, + "browserify-rsa": { + "version": "4.0.1", + "from": "browserify-rsa@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", + "dev": true + }, + "browserify-sign": { + "version": "4.0.4", + "from": "browserify-sign@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz", + "dev": true + }, + "browserify-zlib": { + "version": "0.1.4", + "from": "browserify-zlib@>=0.1.4 <0.2.0", + "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz", + "dev": true + }, + "browserslist": { + "version": "1.7.7", + "from": "browserslist@>=1.7.6 <2.0.0", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz", + "dev": true + }, + "buffer": { + "version": "4.9.1", + "from": "buffer@>=4.3.0 <5.0.0", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz", + "dev": true + }, + "buffer-xor": { + "version": "1.0.3", + "from": "buffer-xor@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz", + "dev": true + }, + "builtin-modules": { + "version": "1.1.1", + "from": "builtin-modules@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", + "dev": true + }, + "builtin-status-codes": { + "version": "3.0.0", + "from": "builtin-status-codes@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz", + "dev": true + }, + "bundle-loader": { + "version": "0.5.5", + "from": "bundle-loader@>=0.5.4 <0.6.0", + "resolved": "https://registry.npmjs.org/bundle-loader/-/bundle-loader-0.5.5.tgz", + "dev": true + }, + "camel-case": { + "version": "3.0.0", + "from": "camel-case@>=3.0.0 <3.1.0", + "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz", + "dev": true + }, + "camelcase": { + "version": "1.2.1", + "from": "camelcase@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", + "dev": true + }, + "caniuse-api": { + "version": "1.6.1", + "from": "caniuse-api@>=1.5.2 <2.0.0", + "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-1.6.1.tgz", + "dev": true + }, + "caniuse-db": { + "version": "1.0.30000694", + "from": "caniuse-db@>=1.0.30000634 <2.0.0", + "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000694.tgz", + "dev": true + }, + "center-align": { + "version": "0.1.3", + "from": "center-align@>=0.1.1 <0.2.0", + "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz", + "dev": true + }, + "chalk": { + "version": "1.1.3", + "from": "chalk@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "dev": true + }, + "chokidar": { + "version": "1.7.0", + "from": "chokidar@>=1.4.3 <2.0.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz", + "dev": true + }, + "cipher-base": { + "version": "1.0.3", + "from": "cipher-base@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.3.tgz", + "dev": true + }, + "clap": { + "version": "1.2.0", + "from": "clap@>=1.0.9 <2.0.0", + "resolved": "https://registry.npmjs.org/clap/-/clap-1.2.0.tgz", + "dev": true + }, + "clean-css": { + "version": "4.1.4", + "from": "clean-css@>=4.1.0 <4.2.0", + "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.1.4.tgz", + "dev": true + }, + "cliui": { + "version": "2.1.0", + "from": "cliui@>=2.1.0 <3.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", + "dev": true + }, + "clone": { + "version": "1.0.2", + "from": "clone@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz", + "dev": true + }, + "co": { + "version": "4.6.0", + "from": "co@>=4.6.0 <5.0.0", + "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", + "dev": true + }, + "coa": { + "version": "1.0.3", + "from": "coa@>=1.0.1 <1.1.0", + "resolved": "https://registry.npmjs.org/coa/-/coa-1.0.3.tgz", + "dev": true + }, + "code-point-at": { + "version": "1.1.0", + "from": "code-point-at@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", + "dev": true + }, + "color": { + "version": "0.11.4", + "from": "color@>=0.11.0 <0.12.0", + "resolved": "https://registry.npmjs.org/color/-/color-0.11.4.tgz", + "dev": true + }, + "color-convert": { + "version": "1.9.0", + "from": "color-convert@>=1.3.0 <2.0.0", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz", + "dev": true + }, + "color-name": { + "version": "1.1.2", + "from": "color-name@>=1.1.1 <2.0.0", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.2.tgz", + "dev": true + }, + "color-string": { + "version": "0.3.0", + "from": "color-string@>=0.3.0 <0.4.0", + "resolved": "https://registry.npmjs.org/color-string/-/color-string-0.3.0.tgz", + "dev": true + }, + "colormin": { + "version": "1.1.2", + "from": "colormin@>=1.0.5 <2.0.0", + "resolved": "https://registry.npmjs.org/colormin/-/colormin-1.1.2.tgz", + "dev": true + }, + "colors": { + "version": "1.1.2", + "from": "colors@>=1.1.2 <1.2.0", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz", + "dev": true + }, + "commander": { + "version": "2.9.0", + "from": "commander@>=2.9.0 <2.10.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz", + "dev": true + }, + "concat-map": { + "version": "0.0.1", + "from": "concat-map@0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "dev": true + }, + "connect": { + "version": "3.6.2", + "from": "connect@>=3.4.1 <4.0.0", + "resolved": "https://registry.npmjs.org/connect/-/connect-3.6.2.tgz", + "dev": true + }, + "console-browserify": { + "version": "1.1.0", + "from": "console-browserify@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz", + "dev": true + }, + "constants-browserify": { + "version": "1.0.0", + "from": "constants-browserify@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz", + "dev": true + }, + "core-util-is": { + "version": "1.0.2", + "from": "core-util-is@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "dev": true + }, + "create-ecdh": { + "version": "4.0.0", + "from": "create-ecdh@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz", + "dev": true + }, + "create-hash": { + "version": "1.1.3", + "from": "create-hash@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz", + "dev": true + }, + "create-hmac": { + "version": "1.1.6", + "from": "create-hmac@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.6.tgz", + "dev": true + }, + "crypto-browserify": { + "version": "3.11.0", + "from": "crypto-browserify@>=3.11.0 <4.0.0", + "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.0.tgz", + "dev": true + }, + "css-color-names": { + "version": "0.0.4", + "from": "css-color-names@0.0.4", + "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz", + "dev": true + }, + "css-loader": { + "version": "0.28.4", + "from": "css-loader@>=0.28.0 <0.29.0", + "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.28.4.tgz", + "dev": true + }, + "css-selector-tokenizer": { + "version": "0.7.0", + "from": "css-selector-tokenizer@>=0.7.0 <0.8.0", + "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz", + "dev": true + }, + "cssesc": { + "version": "0.1.0", + "from": "cssesc@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-0.1.0.tgz", + "dev": true + }, + "cssnano": { + "version": "3.10.0", + "from": "cssnano@>=2.6.1 <4.0.0", + "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-3.10.0.tgz", + "dev": true + }, + "csso": { + "version": "2.3.2", + "from": "csso@>=2.3.1 <2.4.0", + "resolved": "https://registry.npmjs.org/csso/-/csso-2.3.2.tgz", + "dev": true + }, + "date-now": { + "version": "0.1.4", + "from": "date-now@>=0.1.4 <0.2.0", + "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz", + "dev": true + }, + "debug": { + "version": "2.6.7", + "from": "debug@2.6.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz", + "dev": true + }, + "decamelize": { + "version": "1.2.0", + "from": "decamelize@>=1.1.2 <2.0.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", + "dev": true + }, + "defined": { + "version": "1.0.0", + "from": "defined@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz", + "dev": true + }, + "des.js": { + "version": "1.0.0", + "from": "des.js@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz", + "dev": true + }, + "diffie-hellman": { + "version": "5.0.2", + "from": "diffie-hellman@>=5.0.0 <6.0.0", + "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.2.tgz", + "dev": true + }, + "domain-browser": { + "version": "1.1.7", + "from": "domain-browser@>=1.1.1 <2.0.0", + "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.7.tgz", + "dev": true + }, + "ee-first": { + "version": "1.1.1", + "from": "ee-first@1.1.1", + "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", + "dev": true + }, + "electron-to-chromium": { + "version": "1.3.14", + "from": "electron-to-chromium@>=1.2.7 <2.0.0", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.14.tgz", + "dev": true + }, + "elliptic": { + "version": "6.4.0", + "from": "elliptic@>=6.0.0 <7.0.0", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz", + "dev": true + }, + "emojis-list": { + "version": "2.1.0", + "from": "emojis-list@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz", + "dev": true + }, + "encodeurl": { + "version": "1.0.1", + "from": "encodeurl@>=1.0.1 <1.1.0", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.1.tgz", + "dev": true + }, + "encoding": { + "version": "0.1.12", + "from": "encoding@>=0.1.11 <0.2.0", + "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz" + }, + "enhanced-resolve": { + "version": "3.1.0", + "from": "enhanced-resolve@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.1.0.tgz", + "dev": true, + "dependencies": { + "memory-fs": { + "version": "0.4.1", + "from": "memory-fs@>=0.4.0 <0.5.0", + "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz", + "dev": true + } + } + }, + "errno": { + "version": "0.1.4", + "from": "errno@>=0.1.3 <0.2.0", + "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.4.tgz", + "dev": true + }, + "error-ex": { + "version": "1.3.1", + "from": "error-ex@>=1.2.0 <2.0.0", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz", + "dev": true + }, + "es6-promise": { + "version": "3.3.1", + "from": "es6-promise@>=3.1.2 <4.0.0", + "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz", + "dev": true + }, + "es6-templates": { + "version": "0.2.3", + "from": "es6-templates@>=0.2.2 <0.3.0", + "resolved": "https://registry.npmjs.org/es6-templates/-/es6-templates-0.2.3.tgz", + "dev": true + }, + "escape-html": { + "version": "1.0.3", + "from": "escape-html@>=1.0.3 <1.1.0", + "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", + "dev": true + }, + "escape-string-regexp": { + "version": "1.0.5", + "from": "escape-string-regexp@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "dev": true + }, + "esprima": { + "version": "3.1.3", + "from": "esprima@>=3.1.0 <3.2.0", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz", + "dev": true + }, + "esutils": { + "version": "2.0.2", + "from": "esutils@>=2.0.2 <3.0.0", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", + "dev": true + }, + "events": { + "version": "1.1.1", + "from": "events@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz", + "dev": true + }, + "evp_bytestokey": { + "version": "1.0.0", + "from": "evp_bytestokey@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz", + "dev": true + }, + "expand-brackets": { + "version": "0.1.5", + "from": "expand-brackets@>=0.1.4 <0.2.0", + "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz", + "dev": true + }, + "expand-range": { + "version": "1.8.2", + "from": "expand-range@>=1.8.1 <2.0.0", + "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz", + "dev": true + }, + "extglob": { + "version": "0.3.2", + "from": "extglob@>=0.3.1 <0.4.0", + "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz", + "dev": true + }, + "extract-text-webpack-plugin": { + "version": "2.1.2", + "from": "extract-text-webpack-plugin@>=2.1.0 <3.0.0", + "resolved": "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-2.1.2.tgz", + "dev": true + }, + "fast-deep-equal": { + "version": "0.1.0", + "from": "fast-deep-equal@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-0.1.0.tgz", + "dev": true + }, + "fastparse": { + "version": "1.1.1", + "from": "fastparse@>=1.1.1 <2.0.0", + "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.1.tgz", + "dev": true + }, + "file-loader": { + "version": "0.11.2", + "from": "file-loader@>=0.11.1 <0.12.0", + "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-0.11.2.tgz", + "dev": true + }, + "filename-regex": { + "version": "2.0.1", + "from": "filename-regex@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz", + "dev": true + }, + "fill-range": { + "version": "2.2.3", + "from": "fill-range@>=2.1.0 <3.0.0", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz", + "dev": true + }, + "finalhandler": { + "version": "1.0.3", + "from": "finalhandler@1.0.3", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.3.tgz", + "dev": true + }, + "find-up": { + "version": "1.1.2", + "from": "find-up@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", + "dev": true + }, + "flatten": { + "version": "1.0.2", + "from": "flatten@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz", + "dev": true + }, + "for-in": { + "version": "1.0.2", + "from": "for-in@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", + "dev": true + }, + "for-own": { + "version": "0.1.5", + "from": "for-own@>=0.1.4 <0.2.0", + "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz", + "dev": true + }, + "function-bind": { + "version": "1.1.0", + "from": "function-bind@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.0.tgz", + "dev": true + }, + "get-caller-file": { + "version": "1.0.2", + "from": "get-caller-file@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz", + "dev": true + }, + "glob-base": { + "version": "0.3.0", + "from": "glob-base@>=0.3.0 <0.4.0", + "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz", + "dev": true + }, + "glob-parent": { + "version": "2.0.0", + "from": "glob-parent@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz", + "dev": true + }, + "graceful-fs": { + "version": "4.1.11", + "from": "graceful-fs@>=4.1.2 <5.0.0", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", + "dev": true + }, + "graceful-readlink": { + "version": "1.0.1", + "from": "graceful-readlink@>=1.0.0", + "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz", + "dev": true + }, + "has": { + "version": "1.0.1", + "from": "has@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz", + "dev": true + }, + "has-ansi": { + "version": "2.0.0", + "from": "has-ansi@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", + "dev": true + }, + "has-flag": { + "version": "1.0.0", + "from": "has-flag@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "dev": true + }, + "hash-base": { + "version": "2.0.2", + "from": "hash-base@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz", + "dev": true + }, + "hash.js": { + "version": "1.1.1", + "from": "hash.js@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.1.tgz", + "dev": true + }, + "he": { + "version": "1.1.1", + "from": "he@>=1.1.0 <1.2.0", + "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz", + "dev": true + }, + "hmac-drbg": { + "version": "1.0.1", + "from": "hmac-drbg@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", + "dev": true + }, + "hosted-git-info": { + "version": "2.4.2", + "from": "hosted-git-info@>=2.1.4 <3.0.0", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.4.2.tgz", + "dev": true + }, + "html-comment-regex": { + "version": "1.1.1", + "from": "html-comment-regex@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.1.tgz", + "dev": true + }, + "html-entities": { + "version": "1.2.1", + "from": "html-entities@>=1.2.0 <2.0.0", + "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz", + "dev": true + }, + "html-loader": { + "version": "0.4.5", + "from": "html-loader@>=0.4.5 <0.5.0", + "resolved": "https://registry.npmjs.org/html-loader/-/html-loader-0.4.5.tgz", + "dev": true + }, + "html-minifier": { + "version": "3.5.2", + "from": "html-minifier@>=3.0.1 <4.0.0", + "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.2.tgz", + "dev": true + }, + "https-browserify": { + "version": "0.0.1", + "from": "https-browserify@0.0.1", + "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz", + "dev": true + }, + "iconv-lite": { + "version": "0.4.18", + "from": "iconv-lite@>=0.4.13 <0.5.0", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.18.tgz" + }, + "icss-replace-symbols": { + "version": "1.1.0", + "from": "icss-replace-symbols@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz", + "dev": true + }, + "icss-utils": { + "version": "2.1.0", + "from": "icss-utils@>=2.1.0 <3.0.0", + "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-2.1.0.tgz", + "dev": true, + "dependencies": { + "has-flag": { + "version": "2.0.0", + "from": "has-flag@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", + "dev": true + }, + "postcss": { + "version": "6.0.3", + "from": "postcss@>=6.0.1 <7.0.0", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.3.tgz", + "dev": true + }, + "supports-color": { + "version": "4.0.0", + "from": "supports-color@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.0.0.tgz", + "dev": true + } + } + }, + "ieee754": { + "version": "1.1.8", + "from": "ieee754@>=1.1.4 <2.0.0", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz", + "dev": true + }, + "indexes-of": { + "version": "1.0.1", + "from": "indexes-of@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz", + "dev": true + }, + "indexof": { + "version": "0.0.1", + "from": "indexof@0.0.1", + "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz", + "dev": true + }, + "inherits": { + "version": "2.0.3", + "from": "inherits@>=2.0.3 <2.1.0", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "dev": true + }, + "interpret": { + "version": "1.0.3", + "from": "interpret@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.3.tgz", + "dev": true + }, + "invert-kv": { + "version": "1.0.0", + "from": "invert-kv@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", + "dev": true + }, + "is-absolute-url": { + "version": "2.1.0", + "from": "is-absolute-url@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz", + "dev": true + }, + "is-arrayish": { + "version": "0.2.1", + "from": "is-arrayish@>=0.2.1 <0.3.0", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "dev": true + }, + "is-binary-path": { + "version": "1.0.1", + "from": "is-binary-path@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", + "dev": true + }, + "is-buffer": { + "version": "1.1.5", + "from": "is-buffer@>=1.1.5 <2.0.0", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz", + "dev": true + }, + "is-builtin-module": { + "version": "1.0.0", + "from": "is-builtin-module@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", + "dev": true + }, + "is-dotfile": { + "version": "1.0.3", + "from": "is-dotfile@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz", + "dev": true + }, + "is-equal-shallow": { + "version": "0.1.3", + "from": "is-equal-shallow@>=0.1.3 <0.2.0", + "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz", + "dev": true + }, + "is-extendable": { + "version": "0.1.1", + "from": "is-extendable@>=0.1.1 <0.2.0", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", + "dev": true + }, + "is-extglob": { + "version": "1.0.0", + "from": "is-extglob@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "from": "is-fullwidth-code-point@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "dev": true + }, + "is-glob": { + "version": "2.0.1", + "from": "is-glob@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", + "dev": true + }, + "is-number": { + "version": "2.1.0", + "from": "is-number@>=2.1.0 <3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz", + "dev": true + }, + "is-plain-obj": { + "version": "1.1.0", + "from": "is-plain-obj@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", + "dev": true + }, + "is-posix-bracket": { + "version": "0.1.1", + "from": "is-posix-bracket@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz", + "dev": true + }, + "is-primitive": { + "version": "2.0.0", + "from": "is-primitive@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz", + "dev": true + }, + "is-stream": { + "version": "1.1.0", + "from": "is-stream@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz" + }, + "is-svg": { + "version": "2.1.0", + "from": "is-svg@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-2.1.0.tgz", + "dev": true + }, + "is-utf8": { + "version": "0.2.1", + "from": "is-utf8@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", + "dev": true + }, + "isarray": { + "version": "1.0.0", + "from": "isarray@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "dev": true + }, + "isobject": { + "version": "2.1.0", + "from": "isobject@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", + "dev": true + }, + "isomorphic-fetch": { + "version": "2.2.1", + "from": "isomorphic-fetch@>=2.2.1 <3.0.0", + "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz" + }, + "jquery": { + "version": "3.2.1", + "from": "jquery@>=3.2.1 <4.0.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.2.1.tgz" + }, + "js-base64": { + "version": "2.1.9", + "from": "js-base64@>=2.1.9 <3.0.0", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.1.9.tgz", + "dev": true + }, + "js-tokens": { + "version": "3.0.1", + "from": "js-tokens@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.1.tgz", + "dev": true + }, + "js-yaml": { + "version": "3.7.0", + "from": "js-yaml@>=3.7.0 <3.8.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz", + "dev": true, + "dependencies": { + "esprima": { + "version": "2.7.3", + "from": "esprima@>=2.6.0 <3.0.0", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", + "dev": true + } + } + }, + "jsesc": { + "version": "0.5.0", + "from": "jsesc@>=0.5.0 <0.6.0", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", + "dev": true + }, + "json-loader": { + "version": "0.5.4", + "from": "json-loader@>=0.5.4 <0.6.0", + "resolved": "https://registry.npmjs.org/json-loader/-/json-loader-0.5.4.tgz", + "dev": true + }, + "json-schema-traverse": { + "version": "0.3.1", + "from": "json-schema-traverse@>=0.3.0 <0.4.0", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz", + "dev": true + }, + "json-stable-stringify": { + "version": "1.0.1", + "from": "json-stable-stringify@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz", + "dev": true + }, + "json5": { + "version": "0.5.1", + "from": "json5@>=0.5.0 <0.6.0", + "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz", + "dev": true + }, + "jsonify": { + "version": "0.0.0", + "from": "jsonify@>=0.0.0 <0.1.0", + "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz", + "dev": true + }, + "kind-of": { + "version": "3.2.2", + "from": "kind-of@>=3.0.2 <4.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "dev": true + }, + "lazy-cache": { + "version": "1.0.4", + "from": "lazy-cache@>=1.0.3 <2.0.0", + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", + "dev": true + }, + "lcid": { + "version": "1.0.0", + "from": "lcid@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", + "dev": true + }, + "load-json-file": { + "version": "1.1.0", + "from": "load-json-file@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", + "dev": true + }, + "loader-runner": { + "version": "2.3.0", + "from": "loader-runner@>=2.3.0 <3.0.0", + "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.0.tgz", + "dev": true + }, + "loader-utils": { + "version": "1.1.0", + "from": "loader-utils@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz", + "dev": true + }, + "lodash": { + "version": "4.17.4", + "from": "lodash@>=4.14.0 <5.0.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", + "dev": true + }, + "lodash.camelcase": { + "version": "4.3.0", + "from": "lodash.camelcase@>=4.3.0 <5.0.0", + "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", + "dev": true + }, + "lodash.memoize": { + "version": "4.1.2", + "from": "lodash.memoize@>=4.1.2 <5.0.0", + "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", + "dev": true + }, + "lodash.uniq": { + "version": "4.5.0", + "from": "lodash.uniq@>=4.5.0 <5.0.0", + "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", + "dev": true + }, + "longest": { + "version": "1.0.1", + "from": "longest@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", + "dev": true + }, + "lower-case": { + "version": "1.1.4", + "from": "lower-case@>=1.1.1 <2.0.0", + "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz", + "dev": true + }, + "macaddress": { + "version": "0.2.8", + "from": "macaddress@>=0.2.8 <0.3.0", + "resolved": "https://registry.npmjs.org/macaddress/-/macaddress-0.2.8.tgz", + "dev": true + }, + "math-expression-evaluator": { + "version": "1.2.17", + "from": "math-expression-evaluator@>=1.2.14 <2.0.0", + "resolved": "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz", + "dev": true + }, + "memory-fs": { + "version": "0.3.0", + "from": "memory-fs@>=0.3.0 <0.4.0", + "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.3.0.tgz", + "dev": true + }, + "micromatch": { + "version": "2.3.11", + "from": "micromatch@>=2.1.5 <3.0.0", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", + "dev": true + }, + "miller-rabin": { + "version": "4.0.0", + "from": "miller-rabin@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.0.tgz", + "dev": true + }, + "mime": { + "version": "1.3.6", + "from": "mime@>=1.3.4 <2.0.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.6.tgz", + "dev": true + }, + "minimalistic-assert": { + "version": "1.0.0", + "from": "minimalistic-assert@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz", + "dev": true + }, + "minimalistic-crypto-utils": { + "version": "1.0.1", + "from": "minimalistic-crypto-utils@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz", + "dev": true + }, + "minimatch": { + "version": "3.0.4", + "from": "minimatch@>=3.0.3 <4.0.0", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "dev": true + }, + "minimist": { + "version": "0.0.8", + "from": "minimist@0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "dev": true + }, + "mkdirp": { + "version": "0.5.1", + "from": "mkdirp@>=0.5.1 <0.6.0", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "dev": true + }, + "ms": { + "version": "2.0.0", + "from": "ms@2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "dev": true + }, + "ncname": { + "version": "1.0.0", + "from": "ncname@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/ncname/-/ncname-1.0.0.tgz", + "dev": true + }, + "no-case": { + "version": "2.3.1", + "from": "no-case@>=2.2.0 <3.0.0", + "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.1.tgz", + "dev": true + }, + "node-fetch": { + "version": "1.7.1", + "from": "node-fetch@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.1.tgz" + }, + "node-libs-browser": { + "version": "2.0.0", + "from": "node-libs-browser@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.0.0.tgz", + "dev": true, + "dependencies": { + "string_decoder": { + "version": "0.10.31", + "from": "string_decoder@>=0.10.25 <0.11.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "dev": true + } + } + }, + "normalize-package-data": { + "version": "2.3.8", + "from": "normalize-package-data@>=2.3.2 <3.0.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.8.tgz", + "dev": true + }, + "normalize-path": { + "version": "2.1.1", + "from": "normalize-path@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", + "dev": true + }, + "normalize-range": { + "version": "0.1.2", + "from": "normalize-range@>=0.1.2 <0.2.0", + "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz", + "dev": true + }, + "normalize-url": { + "version": "1.9.1", + "from": "normalize-url@>=1.4.0 <2.0.0", + "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz", + "dev": true + }, + "num2fraction": { + "version": "1.2.2", + "from": "num2fraction@>=1.2.2 <2.0.0", + "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz", + "dev": true + }, + "number-is-nan": { + "version": "1.0.1", + "from": "number-is-nan@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", + "dev": true + }, + "object-assign": { + "version": "4.1.1", + "from": "object-assign@>=4.1.0 <5.0.0", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "dev": true + }, + "object.omit": { + "version": "2.0.1", + "from": "object.omit@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz", + "dev": true + }, + "on-finished": { + "version": "2.3.0", + "from": "on-finished@>=2.3.0 <2.4.0", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", + "dev": true + }, + "os-browserify": { + "version": "0.2.1", + "from": "os-browserify@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.2.1.tgz", + "dev": true + }, + "os-locale": { + "version": "1.4.0", + "from": "os-locale@>=1.4.0 <2.0.0", + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", + "dev": true + }, + "pako": { + "version": "0.2.9", + "from": "pako@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz", + "dev": true + }, + "param-case": { + "version": "2.1.1", + "from": "param-case@>=2.1.0 <2.2.0", + "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz", + "dev": true + }, + "parse-asn1": { + "version": "5.1.0", + "from": "parse-asn1@>=5.0.0 <6.0.0", + "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz", + "dev": true + }, + "parse-glob": { + "version": "3.0.4", + "from": "parse-glob@>=3.0.4 <4.0.0", + "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz", + "dev": true + }, + "parse-json": { + "version": "2.2.0", + "from": "parse-json@>=2.2.0 <3.0.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", + "dev": true + }, + "parseurl": { + "version": "1.3.1", + "from": "parseurl@>=1.3.1 <1.4.0", + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz", + "dev": true + }, + "path-browserify": { + "version": "0.0.0", + "from": "path-browserify@0.0.0", + "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz", + "dev": true + }, + "path-exists": { + "version": "2.1.0", + "from": "path-exists@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", + "dev": true + }, + "path-is-absolute": { + "version": "1.0.1", + "from": "path-is-absolute@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "dev": true + }, + "path-type": { + "version": "1.1.0", + "from": "path-type@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", + "dev": true + }, + "pbkdf2": { + "version": "3.0.12", + "from": "pbkdf2@>=3.0.3 <4.0.0", + "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.12.tgz", + "dev": true + }, + "pify": { + "version": "2.3.0", + "from": "pify@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "dev": true + }, + "pinkie": { + "version": "2.0.4", + "from": "pinkie@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", + "dev": true + }, + "pinkie-promise": { + "version": "2.0.1", + "from": "pinkie-promise@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", + "dev": true + }, + "postcss": { + "version": "5.2.17", + "from": "postcss@>=5.0.6 <6.0.0", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", + "dev": true, + "dependencies": { + "supports-color": { + "version": "3.2.3", + "from": "supports-color@>=3.2.3 <4.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "dev": true + } + } + }, + "postcss-calc": { + "version": "5.3.1", + "from": "postcss-calc@>=5.2.0 <6.0.0", + "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-5.3.1.tgz", + "dev": true + }, + "postcss-colormin": { + "version": "2.2.2", + "from": "postcss-colormin@>=2.1.8 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-2.2.2.tgz", + "dev": true + }, + "postcss-convert-values": { + "version": "2.6.1", + "from": "postcss-convert-values@>=2.3.4 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-2.6.1.tgz", + "dev": true + }, + "postcss-discard-comments": { + "version": "2.0.4", + "from": "postcss-discard-comments@>=2.0.4 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz", + "dev": true + }, + "postcss-discard-duplicates": { + "version": "2.1.0", + "from": "postcss-discard-duplicates@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-2.1.0.tgz", + "dev": true + }, + "postcss-discard-empty": { + "version": "2.1.0", + "from": "postcss-discard-empty@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-2.1.0.tgz", + "dev": true + }, + "postcss-discard-overridden": { + "version": "0.1.1", + "from": "postcss-discard-overridden@>=0.1.1 <0.2.0", + "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz", + "dev": true + }, + "postcss-discard-unused": { + "version": "2.2.3", + "from": "postcss-discard-unused@>=2.2.1 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-discard-unused/-/postcss-discard-unused-2.2.3.tgz", + "dev": true + }, + "postcss-filter-plugins": { + "version": "2.0.2", + "from": "postcss-filter-plugins@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-filter-plugins/-/postcss-filter-plugins-2.0.2.tgz", + "dev": true + }, + "postcss-merge-idents": { + "version": "2.1.7", + "from": "postcss-merge-idents@>=2.1.5 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz", + "dev": true + }, + "postcss-merge-longhand": { + "version": "2.0.2", + "from": "postcss-merge-longhand@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-2.0.2.tgz", + "dev": true + }, + "postcss-merge-rules": { + "version": "2.1.2", + "from": "postcss-merge-rules@>=2.0.3 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-2.1.2.tgz", + "dev": true + }, + "postcss-message-helpers": { + "version": "2.0.0", + "from": "postcss-message-helpers@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz", + "dev": true + }, + "postcss-minify-font-values": { + "version": "1.0.5", + "from": "postcss-minify-font-values@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-1.0.5.tgz", + "dev": true + }, + "postcss-minify-gradients": { + "version": "1.0.5", + "from": "postcss-minify-gradients@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-1.0.5.tgz", + "dev": true + }, + "postcss-minify-params": { + "version": "1.2.2", + "from": "postcss-minify-params@>=1.0.4 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-1.2.2.tgz", + "dev": true + }, + "postcss-minify-selectors": { + "version": "2.1.1", + "from": "postcss-minify-selectors@>=2.0.4 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-2.1.1.tgz", + "dev": true + }, + "postcss-modules-extract-imports": { + "version": "1.1.0", + "from": "postcss-modules-extract-imports@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.1.0.tgz", + "dev": true, + "dependencies": { + "has-flag": { + "version": "2.0.0", + "from": "has-flag@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", + "dev": true + }, + "postcss": { + "version": "6.0.3", + "from": "postcss@>=6.0.1 <7.0.0", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.3.tgz", + "dev": true + }, + "supports-color": { + "version": "4.0.0", + "from": "supports-color@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.0.0.tgz", + "dev": true + } + } + }, + "postcss-modules-local-by-default": { + "version": "1.2.0", + "from": "postcss-modules-local-by-default@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz", + "dev": true, + "dependencies": { + "has-flag": { + "version": "2.0.0", + "from": "has-flag@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", + "dev": true + }, + "postcss": { + "version": "6.0.3", + "from": "postcss@>=6.0.1 <7.0.0", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.3.tgz", + "dev": true + }, + "supports-color": { + "version": "4.0.0", + "from": "supports-color@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.0.0.tgz", + "dev": true + } + } + }, + "postcss-modules-scope": { + "version": "1.1.0", + "from": "postcss-modules-scope@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz", + "dev": true, + "dependencies": { + "has-flag": { + "version": "2.0.0", + "from": "has-flag@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", + "dev": true + }, + "postcss": { + "version": "6.0.3", + "from": "postcss@>=6.0.1 <7.0.0", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.3.tgz", + "dev": true + }, + "supports-color": { + "version": "4.0.0", + "from": "supports-color@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.0.0.tgz", + "dev": true + } + } + }, + "postcss-modules-values": { + "version": "1.3.0", + "from": "postcss-modules-values@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz", + "dev": true, + "dependencies": { + "has-flag": { + "version": "2.0.0", + "from": "has-flag@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", + "dev": true + }, + "postcss": { + "version": "6.0.3", + "from": "postcss@>=6.0.1 <7.0.0", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.3.tgz", + "dev": true + }, + "supports-color": { + "version": "4.0.0", + "from": "supports-color@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.0.0.tgz", + "dev": true + } + } + }, + "postcss-normalize-charset": { + "version": "1.1.1", + "from": "postcss-normalize-charset@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz", + "dev": true + }, + "postcss-normalize-url": { + "version": "3.0.8", + "from": "postcss-normalize-url@>=3.0.7 <4.0.0", + "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-3.0.8.tgz", + "dev": true + }, + "postcss-ordered-values": { + "version": "2.2.3", + "from": "postcss-ordered-values@>=2.1.0 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-2.2.3.tgz", + "dev": true + }, + "postcss-reduce-idents": { + "version": "2.4.0", + "from": "postcss-reduce-idents@>=2.2.2 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz", + "dev": true + }, + "postcss-reduce-initial": { + "version": "1.0.1", + "from": "postcss-reduce-initial@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-1.0.1.tgz", + "dev": true + }, + "postcss-reduce-transforms": { + "version": "1.0.4", + "from": "postcss-reduce-transforms@>=1.0.3 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.4.tgz", + "dev": true + }, + "postcss-selector-parser": { + "version": "2.2.3", + "from": "postcss-selector-parser@>=2.2.2 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz", + "dev": true + }, + "postcss-svgo": { + "version": "2.1.6", + "from": "postcss-svgo@>=2.1.1 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-2.1.6.tgz", + "dev": true + }, + "postcss-unique-selectors": { + "version": "2.0.2", + "from": "postcss-unique-selectors@>=2.0.2 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-2.0.2.tgz", + "dev": true + }, + "postcss-value-parser": { + "version": "3.3.0", + "from": "postcss-value-parser@>=3.3.0 <4.0.0", + "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz", + "dev": true + }, + "postcss-zindex": { + "version": "2.2.0", + "from": "postcss-zindex@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-zindex/-/postcss-zindex-2.2.0.tgz", + "dev": true + }, + "prepend-http": { + "version": "1.0.4", + "from": "prepend-http@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz", + "dev": true + }, + "preserve": { + "version": "0.2.0", + "from": "preserve@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz", + "dev": true + }, + "private": { + "version": "0.1.7", + "from": "private@>=0.1.5 <0.2.0", + "resolved": "https://registry.npmjs.org/private/-/private-0.1.7.tgz", + "dev": true + }, + "process": { + "version": "0.11.10", + "from": "process@>=0.11.0 <0.12.0", + "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", + "dev": true + }, + "process-nextick-args": { + "version": "1.0.7", + "from": "process-nextick-args@>=1.0.6 <1.1.0", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", + "dev": true + }, + "prr": { + "version": "0.0.0", + "from": "prr@>=0.0.0 <0.1.0", + "resolved": "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz", + "dev": true + }, + "public-encrypt": { + "version": "4.0.0", + "from": "public-encrypt@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz", + "dev": true + }, + "punycode": { + "version": "1.4.1", + "from": "punycode@>=1.2.4 <2.0.0", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", + "dev": true + }, + "q": { + "version": "1.5.0", + "from": "q@>=1.1.2 <2.0.0", + "resolved": "https://registry.npmjs.org/q/-/q-1.5.0.tgz", + "dev": true + }, + "query-string": { + "version": "4.3.4", + "from": "query-string@>=4.1.0 <5.0.0", + "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz", + "dev": true + }, + "querystring": { + "version": "0.2.0", + "from": "querystring@0.2.0", + "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", + "dev": true + }, + "querystring-es3": { + "version": "0.2.1", + "from": "querystring-es3@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz", + "dev": true + }, + "randomatic": { + "version": "1.1.7", + "from": "randomatic@>=1.1.3 <2.0.0", + "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz", + "dev": true, + "dependencies": { + "is-number": { + "version": "3.0.0", + "from": "is-number@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "dev": true, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "from": "kind-of@^3.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "dev": true + } + } + }, + "kind-of": { + "version": "4.0.0", + "from": "kind-of@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", + "dev": true + } + } + }, + "randombytes": { + "version": "2.0.5", + "from": "randombytes@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.5.tgz", + "dev": true + }, + "range-parser": { + "version": "1.2.0", + "from": "range-parser@>=1.0.3 <2.0.0", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz", + "dev": true + }, + "read-pkg": { + "version": "1.1.0", + "from": "read-pkg@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", + "dev": true + }, + "read-pkg-up": { + "version": "1.0.1", + "from": "read-pkg-up@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", + "dev": true + }, + "readable-stream": { + "version": "2.3.2", + "from": "readable-stream@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.2.tgz", + "dev": true + }, + "readdirp": { + "version": "2.1.0", + "from": "readdirp@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz", + "dev": true + }, + "recast": { + "version": "0.11.23", + "from": "recast@>=0.11.12 <0.12.0", + "resolved": "https://registry.npmjs.org/recast/-/recast-0.11.23.tgz", + "dev": true + }, + "reduce-css-calc": { + "version": "1.3.0", + "from": "reduce-css-calc@>=1.2.6 <2.0.0", + "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz", + "dev": true, + "dependencies": { + "balanced-match": { + "version": "0.4.2", + "from": "balanced-match@>=0.4.2 <0.5.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz", + "dev": true + } + } + }, + "reduce-function-call": { + "version": "1.0.2", + "from": "reduce-function-call@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/reduce-function-call/-/reduce-function-call-1.0.2.tgz", + "dev": true, + "dependencies": { + "balanced-match": { + "version": "0.4.2", + "from": "balanced-match@>=0.4.2 <0.5.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz", + "dev": true + } + } + }, + "regenerate": { + "version": "1.3.2", + "from": "regenerate@>=1.2.1 <2.0.0", + "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.2.tgz", + "dev": true + }, + "regex-cache": { + "version": "0.4.3", + "from": "regex-cache@>=0.4.2 <0.5.0", + "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz", + "dev": true + }, + "regexpu-core": { + "version": "1.0.0", + "from": "regexpu-core@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz", + "dev": true + }, + "regjsgen": { + "version": "0.2.0", + "from": "regjsgen@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz", + "dev": true + }, + "regjsparser": { + "version": "0.1.5", + "from": "regjsparser@>=0.1.4 <0.2.0", + "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz", + "dev": true + }, + "relateurl": { + "version": "0.2.7", + "from": "relateurl@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz", + "dev": true + }, + "remove-trailing-separator": { + "version": "1.0.2", + "from": "remove-trailing-separator@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.0.2.tgz", + "dev": true + }, + "repeat-element": { + "version": "1.1.2", + "from": "repeat-element@>=1.1.2 <2.0.0", + "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz", + "dev": true + }, + "repeat-string": { + "version": "1.6.1", + "from": "repeat-string@>=1.5.2 <2.0.0", + "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", + "dev": true + }, + "require-directory": { + "version": "2.1.1", + "from": "require-directory@>=2.1.1 <3.0.0", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "dev": true + }, + "require-from-string": { + "version": "1.2.1", + "from": "require-from-string@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-1.2.1.tgz", + "dev": true + }, + "require-main-filename": { + "version": "1.0.1", + "from": "require-main-filename@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", + "dev": true + }, + "right-align": { + "version": "0.1.3", + "from": "right-align@>=0.1.1 <0.2.0", + "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz", + "dev": true + }, + "ripemd160": { + "version": "2.0.1", + "from": "ripemd160@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz", + "dev": true + }, + "safe-buffer": { + "version": "5.1.1", + "from": "safe-buffer@>=5.1.0 <5.2.0", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", + "dev": true + }, + "sax": { + "version": "1.2.4", + "from": "sax@>=1.2.1 <1.3.0", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", + "dev": true + }, + "schema-utils": { + "version": "0.3.0", + "from": "schema-utils@>=0.3.0 <0.4.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz", + "dev": true + }, + "semver": { + "version": "5.3.0", + "from": "semver@>=5.0.1 <6.0.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", + "dev": true + }, + "set-blocking": { + "version": "2.0.0", + "from": "set-blocking@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "dev": true + }, + "set-immediate-shim": { + "version": "1.0.1", + "from": "set-immediate-shim@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz", + "dev": true + }, + "setimmediate": { + "version": "1.0.5", + "from": "setimmediate@>=1.0.4 <2.0.0", + "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", + "dev": true + }, + "sha.js": { + "version": "2.4.8", + "from": "sha.js@>=2.4.0 <3.0.0", + "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.8.tgz", + "dev": true + }, + "sort-keys": { + "version": "1.1.2", + "from": "sort-keys@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz", + "dev": true + }, + "source-list-map": { + "version": "0.1.8", + "from": "source-list-map@>=0.1.7 <0.2.0", + "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz", + "dev": true + }, + "source-map": { + "version": "0.5.6", + "from": "source-map@>=0.5.0 <0.6.0", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz", + "dev": true + }, + "spdx-correct": { + "version": "1.0.2", + "from": "spdx-correct@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz", + "dev": true + }, + "spdx-expression-parse": { + "version": "1.0.4", + "from": "spdx-expression-parse@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz", + "dev": true + }, + "spdx-license-ids": { + "version": "1.2.2", + "from": "spdx-license-ids@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz", + "dev": true + }, + "sprintf-js": { + "version": "1.0.3", + "from": "sprintf-js@>=1.0.2 <1.1.0", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "dev": true + }, + "statuses": { + "version": "1.3.1", + "from": "statuses@>=1.3.1 <1.4.0", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz", + "dev": true + }, + "stream-browserify": { + "version": "2.0.1", + "from": "stream-browserify@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz", + "dev": true + }, + "stream-http": { + "version": "2.7.2", + "from": "stream-http@>=2.3.1 <3.0.0", + "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.7.2.tgz", + "dev": true + }, + "strict-uri-encode": { + "version": "1.1.0", + "from": "strict-uri-encode@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz", + "dev": true + }, + "string_decoder": { + "version": "1.0.3", + "from": "string_decoder@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "dev": true + }, + "string-width": { + "version": "1.0.2", + "from": "string-width@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "dev": true + }, + "strip-ansi": { + "version": "3.0.1", + "from": "strip-ansi@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "dev": true + }, + "strip-bom": { + "version": "2.0.0", + "from": "strip-bom@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", + "dev": true + }, + "style-loader": { + "version": "0.16.1", + "from": "style-loader@>=0.16.1 <0.17.0", + "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.16.1.tgz", + "dev": true + }, + "supports-color": { + "version": "2.0.0", + "from": "supports-color@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "dev": true + }, + "svgo": { + "version": "0.7.2", + "from": "svgo@>=0.7.0 <0.8.0", + "resolved": "https://registry.npmjs.org/svgo/-/svgo-0.7.2.tgz", + "dev": true + }, + "tapable": { + "version": "0.2.6", + "from": "tapable@>=0.2.5 <0.3.0", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.2.6.tgz", + "dev": true + }, + "through": { + "version": "2.3.8", + "from": "through@>=2.3.6 <2.4.0", + "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", + "dev": true + }, + "timers-browserify": { + "version": "2.0.2", + "from": "timers-browserify@>=2.0.2 <3.0.0", + "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.2.tgz", + "dev": true + }, + "to-arraybuffer": { + "version": "1.0.1", + "from": "to-arraybuffer@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz", + "dev": true + }, + "ts-loader": { + "version": "2.2.0", + "from": "ts-loader@>=2.0.3 <3.0.0", + "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-2.2.0.tgz", + "dev": true + }, + "tty-browserify": { + "version": "0.0.0", + "from": "tty-browserify@0.0.0", + "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz", + "dev": true + }, + "typescript": { + "version": "2.3.4", + "from": "typescript@>=2.2.2 <3.0.0", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.3.4.tgz", + "dev": true + }, + "uglify-js": { + "version": "3.0.20", + "from": "uglify-js@>=3.0.0 <3.1.0", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.20.tgz", + "dev": true + }, + "uglify-to-browserify": { + "version": "1.0.2", + "from": "uglify-to-browserify@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz", + "dev": true, + "optional": true + }, + "uniq": { + "version": "1.0.1", + "from": "uniq@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz", + "dev": true + }, + "uniqid": { + "version": "4.1.1", + "from": "uniqid@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/uniqid/-/uniqid-4.1.1.tgz", + "dev": true + }, + "uniqs": { + "version": "2.0.0", + "from": "uniqs@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz", + "dev": true + }, + "unpipe": { + "version": "1.0.0", + "from": "unpipe@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", + "dev": true + }, + "upper-case": { + "version": "1.1.3", + "from": "upper-case@>=1.1.1 <2.0.0", + "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz", + "dev": true + }, + "url": { + "version": "0.11.0", + "from": "url@>=0.11.0 <0.12.0", + "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", + "dev": true, + "dependencies": { + "punycode": { + "version": "1.3.2", + "from": "punycode@1.3.2", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", + "dev": true + } + } + }, + "url-loader": { + "version": "0.5.9", + "from": "url-loader@>=0.5.8 <0.6.0", + "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-0.5.9.tgz", + "dev": true + }, + "util": { + "version": "0.10.3", + "from": "util@>=0.10.3 <0.11.0", + "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", + "dev": true, + "dependencies": { + "inherits": { + "version": "2.0.1", + "from": "inherits@2.0.1", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", + "dev": true + } + } + }, + "util-deprecate": { + "version": "1.0.2", + "from": "util-deprecate@>=1.0.1 <1.1.0", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "dev": true + }, + "utils-merge": { + "version": "1.0.0", + "from": "utils-merge@1.0.0", + "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz", + "dev": true + }, + "validate-npm-package-license": { + "version": "3.0.1", + "from": "validate-npm-package-license@>=3.0.1 <4.0.0", + "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz", + "dev": true + }, + "vendors": { + "version": "1.0.1", + "from": "vendors@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.1.tgz", + "dev": true + }, + "vm-browserify": { + "version": "0.0.4", + "from": "vm-browserify@0.0.4", + "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz", + "dev": true + }, + "watchpack": { + "version": "1.3.1", + "from": "watchpack@>=1.3.1 <2.0.0", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.3.1.tgz", + "dev": true + }, + "webpack": { + "version": "2.6.1", + "from": "webpack@>=2.3.3 <3.0.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-2.6.1.tgz", + "dev": true, + "dependencies": { + "ajv": { + "version": "4.11.8", + "from": "ajv@>=4.7.0 <5.0.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz", + "dev": true + }, + "loader-utils": { + "version": "0.2.17", + "from": "loader-utils@>=0.2.16 <0.3.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz", + "dev": true + }, + "memory-fs": { + "version": "0.4.1", + "from": "memory-fs@>=0.4.1 <0.5.0", + "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz", + "dev": true + }, + "source-list-map": { + "version": "1.1.2", + "from": "source-list-map@>=1.1.1 <2.0.0", + "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-1.1.2.tgz", + "dev": true + }, + "supports-color": { + "version": "3.2.3", + "from": "supports-color@>=3.1.0 <4.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "dev": true + }, + "uglify-js": { + "version": "2.8.29", + "from": "uglify-js@>=2.8.27 <3.0.0", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz", + "dev": true, + "dependencies": { + "yargs": { + "version": "3.10.0", + "from": "yargs@>=3.10.0 <3.11.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", + "dev": true + } + } + }, + "webpack-sources": { + "version": "0.2.3", + "from": "webpack-sources@>=0.2.3 <0.3.0", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.2.3.tgz", + "dev": true + } + } + }, + "webpack-dev-middleware": { + "version": "1.11.0", + "from": "webpack-dev-middleware@>=1.8.4 <2.0.0", + "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-1.11.0.tgz", + "dev": true, + "dependencies": { + "memory-fs": { + "version": "0.4.1", + "from": "memory-fs@>=0.4.1 <0.5.0", + "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz", + "dev": true + } + } + }, + "webpack-hot-middleware": { + "version": "2.18.0", + "from": "webpack-hot-middleware@>=2.18.0 <3.0.0", + "resolved": "https://registry.npmjs.org/webpack-hot-middleware/-/webpack-hot-middleware-2.18.0.tgz", + "dev": true + }, + "webpack-node-externals": { + "version": "1.6.0", + "from": "webpack-node-externals@>=1.4.3 <2.0.0", + "resolved": "https://registry.npmjs.org/webpack-node-externals/-/webpack-node-externals-1.6.0.tgz", + "dev": true + }, + "webpack-sources": { + "version": "1.0.1", + "from": "webpack-sources@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.0.1.tgz", + "dev": true, + "dependencies": { + "source-list-map": { + "version": "2.0.0", + "from": "source-list-map@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz", + "dev": true + } + } + }, + "whatwg-fetch": { + "version": "2.0.3", + "from": "whatwg-fetch@>=0.10.0", + "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz" + }, + "whet.extend": { + "version": "0.9.9", + "from": "whet.extend@>=0.9.9 <0.10.0", + "resolved": "https://registry.npmjs.org/whet.extend/-/whet.extend-0.9.9.tgz", + "dev": true + }, + "which-module": { + "version": "1.0.0", + "from": "which-module@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz", + "dev": true + }, + "window-size": { + "version": "0.1.0", + "from": "window-size@0.1.0", + "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz", + "dev": true + }, + "wordwrap": { + "version": "0.0.2", + "from": "wordwrap@0.0.2", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz", + "dev": true + }, + "wrap-ansi": { + "version": "2.1.0", + "from": "wrap-ansi@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", + "dev": true + }, + "xml-char-classes": { + "version": "1.0.0", + "from": "xml-char-classes@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/xml-char-classes/-/xml-char-classes-1.0.0.tgz", + "dev": true + }, + "xtend": { + "version": "4.0.1", + "from": "xtend@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", + "dev": true + }, + "y18n": { + "version": "3.2.1", + "from": "y18n@>=3.2.1 <4.0.0", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", + "dev": true + }, + "yargs": { + "version": "6.6.0", + "from": "yargs@>=6.0.0 <7.0.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz", + "dev": true, + "dependencies": { + "camelcase": { + "version": "3.0.0", + "from": "camelcase@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", + "dev": true + }, + "cliui": { + "version": "3.2.0", + "from": "cliui@>=3.2.0 <4.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", + "dev": true + } + } + }, + "yargs-parser": { + "version": "4.2.1", + "from": "yargs-parser@>=4.2.0 <5.0.0", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz", + "dev": true, + "dependencies": { + "camelcase": { + "version": "3.0.0", + "from": "camelcase@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", + "dev": true + } + } + } + } +} diff --git a/templates/KnockoutSpa/npm-shrinkwrap.json b/templates/KnockoutSpa/npm-shrinkwrap.json new file mode 100644 index 00000000..665c0a76 --- /dev/null +++ b/templates/KnockoutSpa/npm-shrinkwrap.json @@ -0,0 +1,2503 @@ +{ + "name": "WebApplicationBasic", + "version": "0.0.0", + "dependencies": { + "@types/core-js": { + "version": "0.9.41", + "from": "@types/core-js@>=0.9.34 <0.10.0", + "resolved": "https://registry.npmjs.org/@types/core-js/-/core-js-0.9.41.tgz", + "dev": true + }, + "@types/crossroads": { + "version": "0.0.29", + "from": "@types/crossroads@0.0.29", + "resolved": "https://registry.npmjs.org/@types/crossroads/-/crossroads-0.0.29.tgz", + "dev": true + }, + "@types/es6-promise": { + "version": "0.0.32", + "from": "@types/es6-promise@0.0.32", + "resolved": "https://registry.npmjs.org/@types/es6-promise/-/es6-promise-0.0.32.tgz", + "dev": true + }, + "@types/history": { + "version": "2.0.48", + "from": "@types/history@>=2.0.38 <3.0.0", + "resolved": "https://registry.npmjs.org/@types/history/-/history-2.0.48.tgz", + "dev": true + }, + "@types/jquery": { + "version": "2.0.47", + "from": "@types/jquery@>=2.0.32 <3.0.0", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-2.0.47.tgz", + "dev": true + }, + "@types/knockout": { + "version": "3.4.41", + "from": "@types/knockout@>=3.4.35 <4.0.0", + "resolved": "https://registry.npmjs.org/@types/knockout/-/knockout-3.4.41.tgz", + "dev": true + }, + "@types/react": { + "version": "15.0.31", + "from": "@types/react@*", + "resolved": "https://registry.npmjs.org/@types/react/-/react-15.0.31.tgz", + "dev": true + }, + "@types/react-router": { + "version": "2.0.50", + "from": "@types/react-router@>=2.0.37 <3.0.0", + "resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-2.0.50.tgz", + "dev": true + }, + "@types/requirejs": { + "version": "2.1.29", + "from": "@types/requirejs@>=2.1.26 <3.0.0", + "resolved": "https://registry.npmjs.org/@types/requirejs/-/requirejs-2.1.29.tgz", + "dev": true + }, + "@types/signals": { + "version": "0.0.16", + "from": "@types/signals@0.0.16", + "resolved": "https://registry.npmjs.org/@types/signals/-/signals-0.0.16.tgz", + "dev": true + }, + "acorn": { + "version": "5.0.3", + "from": "acorn@>=5.0.0 <6.0.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.0.3.tgz", + "dev": true + }, + "acorn-dynamic-import": { + "version": "2.0.2", + "from": "acorn-dynamic-import@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz", + "dev": true, + "dependencies": { + "acorn": { + "version": "4.0.13", + "from": "acorn@>=4.0.3 <5.0.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz", + "dev": true + } + } + }, + "ajv": { + "version": "5.2.0", + "from": "ajv@>=5.0.0 <6.0.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.0.tgz", + "dev": true + }, + "ajv-keywords": { + "version": "1.5.1", + "from": "ajv-keywords@>=1.1.1 <2.0.0", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.1.tgz", + "dev": true + }, + "align-text": { + "version": "0.1.4", + "from": "align-text@>=0.1.3 <0.2.0", + "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", + "dev": true + }, + "alphanum-sort": { + "version": "1.0.2", + "from": "alphanum-sort@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz", + "dev": true + }, + "ansi-html": { + "version": "0.0.7", + "from": "ansi-html@0.0.7", + "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz", + "dev": true + }, + "ansi-regex": { + "version": "2.1.1", + "from": "ansi-regex@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "dev": true + }, + "ansi-styles": { + "version": "2.2.1", + "from": "ansi-styles@>=2.2.1 <3.0.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", + "dev": true + }, + "anymatch": { + "version": "1.3.0", + "from": "anymatch@>=1.3.0 <2.0.0", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.0.tgz", + "dev": true + }, + "argparse": { + "version": "1.0.9", + "from": "argparse@>=1.0.7 <2.0.0", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz", + "dev": true + }, + "arr-diff": { + "version": "2.0.0", + "from": "arr-diff@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz", + "dev": true + }, + "arr-flatten": { + "version": "1.0.3", + "from": "arr-flatten@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.3.tgz", + "dev": true + }, + "array-unique": { + "version": "0.2.1", + "from": "array-unique@>=0.2.1 <0.3.0", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz", + "dev": true + }, + "arrify": { + "version": "1.0.1", + "from": "arrify@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", + "dev": true + }, + "asn1.js": { + "version": "4.9.1", + "from": "asn1.js@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.1.tgz", + "dev": true + }, + "aspnet-webpack": { + "version": "1.0.29", + "from": "aspnet-webpack@>=1.0.27 <2.0.0", + "resolved": "https://registry.npmjs.org/aspnet-webpack/-/aspnet-webpack-1.0.29.tgz", + "dev": true + }, + "assert": { + "version": "1.4.1", + "from": "assert@>=1.1.1 <2.0.0", + "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz", + "dev": true + }, + "async": { + "version": "2.5.0", + "from": "async@>=2.1.2 <3.0.0", + "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz", + "dev": true + }, + "async-each": { + "version": "1.0.1", + "from": "async-each@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz", + "dev": true + }, + "autoprefixer": { + "version": "6.7.7", + "from": "autoprefixer@>=6.3.1 <7.0.0", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.7.7.tgz", + "dev": true + }, + "awesome-typescript-loader": { + "version": "3.1.3", + "from": "awesome-typescript-loader@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/awesome-typescript-loader/-/awesome-typescript-loader-3.1.3.tgz", + "dev": true + }, + "babel-code-frame": { + "version": "6.22.0", + "from": "babel-code-frame@>=6.11.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz", + "dev": true + }, + "balanced-match": { + "version": "0.4.2", + "from": "balanced-match@>=0.4.2 <0.5.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz", + "dev": true + }, + "base64-js": { + "version": "1.2.1", + "from": "base64-js@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.1.tgz", + "dev": true + }, + "big.js": { + "version": "3.1.3", + "from": "big.js@>=3.1.3 <4.0.0", + "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.1.3.tgz", + "dev": true + }, + "binary-extensions": { + "version": "1.8.0", + "from": "binary-extensions@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.8.0.tgz", + "dev": true + }, + "bn.js": { + "version": "4.11.7", + "from": "bn.js@>=4.1.1 <5.0.0", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.7.tgz", + "dev": true + }, + "bootstrap": { + "version": "3.3.7", + "from": "bootstrap@>=3.3.6 <4.0.0", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.3.7.tgz", + "dev": true + }, + "brace-expansion": { + "version": "1.1.8", + "from": "brace-expansion@>=1.1.7 <2.0.0", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", + "dev": true, + "dependencies": { + "balanced-match": { + "version": "1.0.0", + "from": "balanced-match@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "dev": true + } + } + }, + "braces": { + "version": "1.8.5", + "from": "braces@>=1.8.2 <2.0.0", + "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz", + "dev": true + }, + "brorand": { + "version": "1.1.0", + "from": "brorand@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", + "dev": true + }, + "browserify-aes": { + "version": "1.0.6", + "from": "browserify-aes@>=1.0.4 <2.0.0", + "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.6.tgz", + "dev": true + }, + "browserify-cipher": { + "version": "1.0.0", + "from": "browserify-cipher@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz", + "dev": true + }, + "browserify-des": { + "version": "1.0.0", + "from": "browserify-des@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz", + "dev": true + }, + "browserify-rsa": { + "version": "4.0.1", + "from": "browserify-rsa@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", + "dev": true + }, + "browserify-sign": { + "version": "4.0.4", + "from": "browserify-sign@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz", + "dev": true + }, + "browserify-zlib": { + "version": "0.1.4", + "from": "browserify-zlib@>=0.1.4 <0.2.0", + "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz", + "dev": true + }, + "browserslist": { + "version": "1.7.7", + "from": "browserslist@>=1.7.6 <2.0.0", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz", + "dev": true + }, + "buffer": { + "version": "4.9.1", + "from": "buffer@>=4.3.0 <5.0.0", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz", + "dev": true + }, + "buffer-xor": { + "version": "1.0.3", + "from": "buffer-xor@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz", + "dev": true + }, + "builtin-modules": { + "version": "1.1.1", + "from": "builtin-modules@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", + "dev": true + }, + "builtin-status-codes": { + "version": "3.0.0", + "from": "builtin-status-codes@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz", + "dev": true + }, + "bundle-loader": { + "version": "0.5.5", + "from": "bundle-loader@>=0.5.4 <0.6.0", + "resolved": "https://registry.npmjs.org/bundle-loader/-/bundle-loader-0.5.5.tgz", + "dev": true + }, + "camelcase": { + "version": "1.2.1", + "from": "camelcase@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", + "dev": true + }, + "caniuse-api": { + "version": "1.6.1", + "from": "caniuse-api@>=1.5.2 <2.0.0", + "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-1.6.1.tgz", + "dev": true + }, + "caniuse-db": { + "version": "1.0.30000694", + "from": "caniuse-db@>=1.0.30000634 <2.0.0", + "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000694.tgz", + "dev": true + }, + "center-align": { + "version": "0.1.3", + "from": "center-align@>=0.1.1 <0.2.0", + "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz", + "dev": true + }, + "chalk": { + "version": "1.1.3", + "from": "chalk@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "dev": true + }, + "chokidar": { + "version": "1.7.0", + "from": "chokidar@>=1.4.3 <2.0.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz", + "dev": true + }, + "cipher-base": { + "version": "1.0.3", + "from": "cipher-base@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.3.tgz", + "dev": true + }, + "clap": { + "version": "1.2.0", + "from": "clap@>=1.0.9 <2.0.0", + "resolved": "https://registry.npmjs.org/clap/-/clap-1.2.0.tgz", + "dev": true + }, + "cliui": { + "version": "2.1.0", + "from": "cliui@>=2.1.0 <3.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", + "dev": true + }, + "clone": { + "version": "1.0.2", + "from": "clone@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz", + "dev": true + }, + "co": { + "version": "4.6.0", + "from": "co@>=4.6.0 <5.0.0", + "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", + "dev": true + }, + "coa": { + "version": "1.0.3", + "from": "coa@>=1.0.1 <1.1.0", + "resolved": "https://registry.npmjs.org/coa/-/coa-1.0.3.tgz", + "dev": true + }, + "code-point-at": { + "version": "1.1.0", + "from": "code-point-at@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", + "dev": true + }, + "color": { + "version": "0.11.4", + "from": "color@>=0.11.0 <0.12.0", + "resolved": "https://registry.npmjs.org/color/-/color-0.11.4.tgz", + "dev": true + }, + "color-convert": { + "version": "1.9.0", + "from": "color-convert@>=1.3.0 <2.0.0", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz", + "dev": true + }, + "color-name": { + "version": "1.1.2", + "from": "color-name@>=1.1.1 <2.0.0", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.2.tgz", + "dev": true + }, + "color-string": { + "version": "0.3.0", + "from": "color-string@>=0.3.0 <0.4.0", + "resolved": "https://registry.npmjs.org/color-string/-/color-string-0.3.0.tgz", + "dev": true + }, + "colormin": { + "version": "1.1.2", + "from": "colormin@>=1.0.5 <2.0.0", + "resolved": "https://registry.npmjs.org/colormin/-/colormin-1.1.2.tgz", + "dev": true + }, + "colors": { + "version": "1.1.2", + "from": "colors@>=1.1.2 <2.0.0", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz", + "dev": true + }, + "concat-map": { + "version": "0.0.1", + "from": "concat-map@0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "dev": true + }, + "connect": { + "version": "3.6.2", + "from": "connect@>=3.4.1 <4.0.0", + "resolved": "https://registry.npmjs.org/connect/-/connect-3.6.2.tgz", + "dev": true + }, + "console-browserify": { + "version": "1.1.0", + "from": "console-browserify@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz", + "dev": true + }, + "constants-browserify": { + "version": "1.0.0", + "from": "constants-browserify@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz", + "dev": true + }, + "core-util-is": { + "version": "1.0.2", + "from": "core-util-is@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "dev": true + }, + "create-ecdh": { + "version": "4.0.0", + "from": "create-ecdh@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz", + "dev": true + }, + "create-hash": { + "version": "1.1.3", + "from": "create-hash@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz", + "dev": true + }, + "create-hmac": { + "version": "1.1.6", + "from": "create-hmac@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.6.tgz", + "dev": true + }, + "crossroads": { + "version": "0.12.2", + "from": "crossroads@>=0.12.2 <0.13.0", + "resolved": "https://registry.npmjs.org/crossroads/-/crossroads-0.12.2.tgz", + "dev": true + }, + "crypto-browserify": { + "version": "3.11.0", + "from": "crypto-browserify@>=3.11.0 <4.0.0", + "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.0.tgz", + "dev": true + }, + "css-color-names": { + "version": "0.0.4", + "from": "css-color-names@0.0.4", + "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz", + "dev": true + }, + "css-loader": { + "version": "0.25.0", + "from": "css-loader@>=0.25.0 <0.26.0", + "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.25.0.tgz", + "dev": true, + "dependencies": { + "loader-utils": { + "version": "0.2.17", + "from": "loader-utils@>=0.2.2 <0.3.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz", + "dev": true + } + } + }, + "css-selector-tokenizer": { + "version": "0.6.0", + "from": "css-selector-tokenizer@>=0.6.0 <0.7.0", + "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.6.0.tgz", + "dev": true + }, + "cssesc": { + "version": "0.1.0", + "from": "cssesc@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-0.1.0.tgz", + "dev": true + }, + "cssnano": { + "version": "3.10.0", + "from": "cssnano@>=2.6.1 <4.0.0", + "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-3.10.0.tgz", + "dev": true + }, + "csso": { + "version": "2.3.2", + "from": "csso@>=2.3.1 <2.4.0", + "resolved": "https://registry.npmjs.org/csso/-/csso-2.3.2.tgz", + "dev": true + }, + "date-now": { + "version": "0.1.4", + "from": "date-now@>=0.1.4 <0.2.0", + "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz", + "dev": true + }, + "debug": { + "version": "2.6.7", + "from": "debug@2.6.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz", + "dev": true + }, + "decamelize": { + "version": "1.2.0", + "from": "decamelize@>=1.1.2 <2.0.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", + "dev": true + }, + "defined": { + "version": "1.0.0", + "from": "defined@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz", + "dev": true + }, + "des.js": { + "version": "1.0.0", + "from": "des.js@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz", + "dev": true + }, + "diffie-hellman": { + "version": "5.0.2", + "from": "diffie-hellman@>=5.0.0 <6.0.0", + "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.2.tgz", + "dev": true + }, + "domain-browser": { + "version": "1.1.7", + "from": "domain-browser@>=1.1.1 <2.0.0", + "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.7.tgz", + "dev": true + }, + "ee-first": { + "version": "1.1.1", + "from": "ee-first@1.1.1", + "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", + "dev": true + }, + "electron-to-chromium": { + "version": "1.3.14", + "from": "electron-to-chromium@>=1.2.7 <2.0.0", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.14.tgz", + "dev": true + }, + "elliptic": { + "version": "6.4.0", + "from": "elliptic@>=6.0.0 <7.0.0", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz", + "dev": true + }, + "emojis-list": { + "version": "2.1.0", + "from": "emojis-list@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz", + "dev": true + }, + "encodeurl": { + "version": "1.0.1", + "from": "encodeurl@>=1.0.1 <1.1.0", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.1.tgz", + "dev": true + }, + "encoding": { + "version": "0.1.12", + "from": "encoding@>=0.1.11 <0.2.0", + "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz", + "dev": true + }, + "enhanced-resolve": { + "version": "3.1.0", + "from": "enhanced-resolve@>=3.1.0 <4.0.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.1.0.tgz", + "dev": true, + "dependencies": { + "memory-fs": { + "version": "0.4.1", + "from": "memory-fs@>=0.4.0 <0.5.0", + "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz", + "dev": true + } + } + }, + "errno": { + "version": "0.1.4", + "from": "errno@>=0.1.3 <0.2.0", + "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.4.tgz", + "dev": true + }, + "error-ex": { + "version": "1.3.1", + "from": "error-ex@>=1.2.0 <2.0.0", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz", + "dev": true + }, + "es6-promise": { + "version": "3.3.1", + "from": "es6-promise@>=3.1.2 <4.0.0", + "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz", + "dev": true + }, + "escape-html": { + "version": "1.0.3", + "from": "escape-html@>=1.0.3 <1.1.0", + "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", + "dev": true + }, + "escape-string-regexp": { + "version": "1.0.5", + "from": "escape-string-regexp@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "dev": true + }, + "esprima": { + "version": "2.7.3", + "from": "esprima@>=2.6.0 <3.0.0", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", + "dev": true + }, + "esutils": { + "version": "2.0.2", + "from": "esutils@>=2.0.2 <3.0.0", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", + "dev": true + }, + "event-source-polyfill": { + "version": "0.0.7", + "from": "event-source-polyfill@>=0.0.7 <0.0.8", + "resolved": "https://registry.npmjs.org/event-source-polyfill/-/event-source-polyfill-0.0.7.tgz", + "dev": true + }, + "events": { + "version": "1.1.1", + "from": "events@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz", + "dev": true + }, + "evp_bytestokey": { + "version": "1.0.0", + "from": "evp_bytestokey@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz", + "dev": true + }, + "expand-brackets": { + "version": "0.1.5", + "from": "expand-brackets@>=0.1.4 <0.2.0", + "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz", + "dev": true + }, + "expand-range": { + "version": "1.8.2", + "from": "expand-range@>=1.8.1 <2.0.0", + "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz", + "dev": true + }, + "extglob": { + "version": "0.3.2", + "from": "extglob@>=0.3.1 <0.4.0", + "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz", + "dev": true + }, + "extract-text-webpack-plugin": { + "version": "2.1.2", + "from": "extract-text-webpack-plugin@>=2.0.0-rc <3.0.0", + "resolved": "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-2.1.2.tgz", + "dev": true + }, + "fast-deep-equal": { + "version": "0.1.0", + "from": "fast-deep-equal@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-0.1.0.tgz", + "dev": true + }, + "fastparse": { + "version": "1.1.1", + "from": "fastparse@>=1.1.1 <2.0.0", + "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.1.tgz", + "dev": true + }, + "file-loader": { + "version": "0.9.0", + "from": "file-loader@>=0.9.0 <0.10.0", + "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-0.9.0.tgz", + "dev": true, + "dependencies": { + "loader-utils": { + "version": "0.2.17", + "from": "loader-utils@>=0.2.5 <0.3.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz", + "dev": true + } + } + }, + "filename-regex": { + "version": "2.0.1", + "from": "filename-regex@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz", + "dev": true + }, + "fill-range": { + "version": "2.2.3", + "from": "fill-range@>=2.1.0 <3.0.0", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz", + "dev": true + }, + "finalhandler": { + "version": "1.0.3", + "from": "finalhandler@1.0.3", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.3.tgz", + "dev": true + }, + "find-up": { + "version": "1.1.2", + "from": "find-up@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", + "dev": true + }, + "flatten": { + "version": "1.0.2", + "from": "flatten@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz", + "dev": true + }, + "for-in": { + "version": "1.0.2", + "from": "for-in@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", + "dev": true + }, + "for-own": { + "version": "0.1.5", + "from": "for-own@>=0.1.4 <0.2.0", + "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz", + "dev": true + }, + "function-bind": { + "version": "1.1.0", + "from": "function-bind@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.0.tgz", + "dev": true + }, + "get-caller-file": { + "version": "1.0.2", + "from": "get-caller-file@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz", + "dev": true + }, + "glob-base": { + "version": "0.3.0", + "from": "glob-base@>=0.3.0 <0.4.0", + "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz", + "dev": true + }, + "glob-parent": { + "version": "2.0.0", + "from": "glob-parent@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz", + "dev": true + }, + "graceful-fs": { + "version": "4.1.11", + "from": "graceful-fs@>=4.1.2 <5.0.0", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", + "dev": true + }, + "has": { + "version": "1.0.1", + "from": "has@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz", + "dev": true + }, + "has-ansi": { + "version": "2.0.0", + "from": "has-ansi@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", + "dev": true + }, + "has-flag": { + "version": "1.0.0", + "from": "has-flag@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "dev": true + }, + "hash-base": { + "version": "2.0.2", + "from": "hash-base@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz", + "dev": true + }, + "hash.js": { + "version": "1.1.1", + "from": "hash.js@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.1.tgz", + "dev": true + }, + "history": { + "version": "4.6.3", + "from": "history@>=4.3.0 <5.0.0", + "resolved": "https://registry.npmjs.org/history/-/history-4.6.3.tgz", + "dev": true + }, + "hmac-drbg": { + "version": "1.0.1", + "from": "hmac-drbg@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", + "dev": true + }, + "hosted-git-info": { + "version": "2.4.2", + "from": "hosted-git-info@>=2.1.4 <3.0.0", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.4.2.tgz", + "dev": true + }, + "html-comment-regex": { + "version": "1.1.1", + "from": "html-comment-regex@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.1.tgz", + "dev": true + }, + "html-entities": { + "version": "1.2.1", + "from": "html-entities@>=1.2.0 <2.0.0", + "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz", + "dev": true + }, + "https-browserify": { + "version": "0.0.1", + "from": "https-browserify@0.0.1", + "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz", + "dev": true + }, + "iconv-lite": { + "version": "0.4.18", + "from": "iconv-lite@>=0.4.13 <0.5.0", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.18.tgz", + "dev": true + }, + "icss-replace-symbols": { + "version": "1.1.0", + "from": "icss-replace-symbols@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz", + "dev": true + }, + "ieee754": { + "version": "1.1.8", + "from": "ieee754@>=1.1.4 <2.0.0", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz", + "dev": true + }, + "indexes-of": { + "version": "1.0.1", + "from": "indexes-of@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz", + "dev": true + }, + "indexof": { + "version": "0.0.1", + "from": "indexof@0.0.1", + "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz", + "dev": true + }, + "inherits": { + "version": "2.0.3", + "from": "inherits@>=2.0.3 <2.1.0", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "dev": true + }, + "interpret": { + "version": "1.0.3", + "from": "interpret@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.3.tgz", + "dev": true + }, + "invariant": { + "version": "2.2.2", + "from": "invariant@>=2.2.1 <3.0.0", + "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz", + "dev": true + }, + "invert-kv": { + "version": "1.0.0", + "from": "invert-kv@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", + "dev": true + }, + "is-absolute-url": { + "version": "2.1.0", + "from": "is-absolute-url@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz", + "dev": true + }, + "is-arrayish": { + "version": "0.2.1", + "from": "is-arrayish@>=0.2.1 <0.3.0", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "dev": true + }, + "is-binary-path": { + "version": "1.0.1", + "from": "is-binary-path@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", + "dev": true + }, + "is-buffer": { + "version": "1.1.5", + "from": "is-buffer@>=1.1.5 <2.0.0", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz", + "dev": true + }, + "is-builtin-module": { + "version": "1.0.0", + "from": "is-builtin-module@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", + "dev": true + }, + "is-dotfile": { + "version": "1.0.3", + "from": "is-dotfile@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz", + "dev": true + }, + "is-equal-shallow": { + "version": "0.1.3", + "from": "is-equal-shallow@>=0.1.3 <0.2.0", + "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz", + "dev": true + }, + "is-extendable": { + "version": "0.1.1", + "from": "is-extendable@>=0.1.1 <0.2.0", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", + "dev": true + }, + "is-extglob": { + "version": "1.0.0", + "from": "is-extglob@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "from": "is-fullwidth-code-point@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "dev": true + }, + "is-glob": { + "version": "2.0.1", + "from": "is-glob@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", + "dev": true + }, + "is-number": { + "version": "2.1.0", + "from": "is-number@>=2.1.0 <3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz", + "dev": true + }, + "is-plain-obj": { + "version": "1.1.0", + "from": "is-plain-obj@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", + "dev": true + }, + "is-posix-bracket": { + "version": "0.1.1", + "from": "is-posix-bracket@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz", + "dev": true + }, + "is-primitive": { + "version": "2.0.0", + "from": "is-primitive@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz", + "dev": true + }, + "is-stream": { + "version": "1.1.0", + "from": "is-stream@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", + "dev": true + }, + "is-svg": { + "version": "2.1.0", + "from": "is-svg@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-2.1.0.tgz", + "dev": true + }, + "is-utf8": { + "version": "0.2.1", + "from": "is-utf8@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", + "dev": true + }, + "isarray": { + "version": "1.0.0", + "from": "isarray@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "dev": true + }, + "isobject": { + "version": "2.1.0", + "from": "isobject@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", + "dev": true + }, + "isomorphic-fetch": { + "version": "2.2.1", + "from": "isomorphic-fetch@>=2.2.1 <3.0.0", + "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz", + "dev": true + }, + "jquery": { + "version": "2.2.4", + "from": "jquery@>=2.2.1 <3.0.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-2.2.4.tgz", + "dev": true + }, + "js-base64": { + "version": "2.1.9", + "from": "js-base64@>=2.1.9 <3.0.0", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.1.9.tgz", + "dev": true + }, + "js-tokens": { + "version": "3.0.1", + "from": "js-tokens@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.1.tgz", + "dev": true + }, + "js-yaml": { + "version": "3.7.0", + "from": "js-yaml@>=3.7.0 <3.8.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz", + "dev": true + }, + "jsesc": { + "version": "0.5.0", + "from": "jsesc@>=0.5.0 <0.6.0", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", + "dev": true + }, + "json-loader": { + "version": "0.5.4", + "from": "json-loader@>=0.5.4 <0.6.0", + "resolved": "https://registry.npmjs.org/json-loader/-/json-loader-0.5.4.tgz", + "dev": true + }, + "json-schema-traverse": { + "version": "0.3.1", + "from": "json-schema-traverse@>=0.3.0 <0.4.0", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz", + "dev": true + }, + "json-stable-stringify": { + "version": "1.0.1", + "from": "json-stable-stringify@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz", + "dev": true + }, + "json5": { + "version": "0.5.1", + "from": "json5@>=0.5.0 <0.6.0", + "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz", + "dev": true + }, + "jsonify": { + "version": "0.0.0", + "from": "jsonify@>=0.0.0 <0.1.0", + "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz", + "dev": true + }, + "kind-of": { + "version": "3.2.2", + "from": "kind-of@>=3.0.2 <4.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "dev": true + }, + "knockout": { + "version": "3.4.2", + "from": "knockout@>=3.4.0 <4.0.0", + "resolved": "https://registry.npmjs.org/knockout/-/knockout-3.4.2.tgz", + "dev": true + }, + "lazy-cache": { + "version": "1.0.4", + "from": "lazy-cache@>=1.0.3 <2.0.0", + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", + "dev": true + }, + "lcid": { + "version": "1.0.0", + "from": "lcid@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", + "dev": true + }, + "load-json-file": { + "version": "1.1.0", + "from": "load-json-file@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", + "dev": true + }, + "loader-runner": { + "version": "2.3.0", + "from": "loader-runner@>=2.3.0 <3.0.0", + "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.0.tgz", + "dev": true + }, + "loader-utils": { + "version": "1.1.0", + "from": "loader-utils@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz", + "dev": true + }, + "lodash": { + "version": "4.17.4", + "from": "lodash@>=4.17.4 <5.0.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", + "dev": true + }, + "lodash._createcompounder": { + "version": "3.0.0", + "from": "lodash._createcompounder@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/lodash._createcompounder/-/lodash._createcompounder-3.0.0.tgz", + "dev": true + }, + "lodash._root": { + "version": "3.0.1", + "from": "lodash._root@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz", + "dev": true + }, + "lodash.camelcase": { + "version": "3.0.1", + "from": "lodash.camelcase@>=3.0.1 <4.0.0", + "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-3.0.1.tgz", + "dev": true + }, + "lodash.deburr": { + "version": "3.2.0", + "from": "lodash.deburr@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/lodash.deburr/-/lodash.deburr-3.2.0.tgz", + "dev": true + }, + "lodash.memoize": { + "version": "4.1.2", + "from": "lodash.memoize@>=4.1.2 <5.0.0", + "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", + "dev": true + }, + "lodash.uniq": { + "version": "4.5.0", + "from": "lodash.uniq@>=4.5.0 <5.0.0", + "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", + "dev": true + }, + "lodash.words": { + "version": "3.2.0", + "from": "lodash.words@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/lodash.words/-/lodash.words-3.2.0.tgz", + "dev": true + }, + "longest": { + "version": "1.0.1", + "from": "longest@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", + "dev": true + }, + "loose-envify": { + "version": "1.3.1", + "from": "loose-envify@>=1.2.0 <2.0.0", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz", + "dev": true + }, + "macaddress": { + "version": "0.2.8", + "from": "macaddress@>=0.2.8 <0.3.0", + "resolved": "https://registry.npmjs.org/macaddress/-/macaddress-0.2.8.tgz", + "dev": true + }, + "math-expression-evaluator": { + "version": "1.2.17", + "from": "math-expression-evaluator@>=1.2.14 <2.0.0", + "resolved": "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz", + "dev": true + }, + "memory-fs": { + "version": "0.3.0", + "from": "memory-fs@>=0.3.0 <0.4.0", + "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.3.0.tgz", + "dev": true + }, + "micromatch": { + "version": "2.3.11", + "from": "micromatch@>=2.1.5 <3.0.0", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", + "dev": true + }, + "miller-rabin": { + "version": "4.0.0", + "from": "miller-rabin@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.0.tgz", + "dev": true + }, + "mime": { + "version": "1.3.6", + "from": "mime@>=1.3.4 <2.0.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.6.tgz", + "dev": true + }, + "minimalistic-assert": { + "version": "1.0.0", + "from": "minimalistic-assert@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz", + "dev": true + }, + "minimalistic-crypto-utils": { + "version": "1.0.1", + "from": "minimalistic-crypto-utils@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz", + "dev": true + }, + "minimatch": { + "version": "3.0.4", + "from": "minimatch@>=3.0.2 <4.0.0", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "dev": true + }, + "minimist": { + "version": "0.0.8", + "from": "minimist@0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "dev": true + }, + "mkdirp": { + "version": "0.5.1", + "from": "mkdirp@>=0.5.1 <0.6.0", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "dev": true + }, + "ms": { + "version": "2.0.0", + "from": "ms@2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "dev": true + }, + "node-fetch": { + "version": "1.7.1", + "from": "node-fetch@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.1.tgz", + "dev": true + }, + "node-libs-browser": { + "version": "2.0.0", + "from": "node-libs-browser@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.0.0.tgz", + "dev": true, + "dependencies": { + "string_decoder": { + "version": "0.10.31", + "from": "string_decoder@>=0.10.25 <0.11.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "dev": true + } + } + }, + "normalize-package-data": { + "version": "2.3.8", + "from": "normalize-package-data@>=2.3.2 <3.0.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.8.tgz", + "dev": true + }, + "normalize-path": { + "version": "2.1.1", + "from": "normalize-path@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", + "dev": true + }, + "normalize-range": { + "version": "0.1.2", + "from": "normalize-range@>=0.1.2 <0.2.0", + "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz", + "dev": true + }, + "normalize-url": { + "version": "1.9.1", + "from": "normalize-url@>=1.4.0 <2.0.0", + "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz", + "dev": true + }, + "num2fraction": { + "version": "1.2.2", + "from": "num2fraction@>=1.2.2 <2.0.0", + "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz", + "dev": true + }, + "number-is-nan": { + "version": "1.0.1", + "from": "number-is-nan@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", + "dev": true + }, + "object-assign": { + "version": "4.1.1", + "from": "object-assign@>=4.1.1 <5.0.0", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "dev": true + }, + "object.omit": { + "version": "2.0.1", + "from": "object.omit@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz", + "dev": true + }, + "on-finished": { + "version": "2.3.0", + "from": "on-finished@>=2.3.0 <2.4.0", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", + "dev": true + }, + "os-browserify": { + "version": "0.2.1", + "from": "os-browserify@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.2.1.tgz", + "dev": true + }, + "os-locale": { + "version": "1.4.0", + "from": "os-locale@>=1.4.0 <2.0.0", + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", + "dev": true + }, + "pako": { + "version": "0.2.9", + "from": "pako@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz", + "dev": true + }, + "parse-asn1": { + "version": "5.1.0", + "from": "parse-asn1@>=5.0.0 <6.0.0", + "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz", + "dev": true + }, + "parse-glob": { + "version": "3.0.4", + "from": "parse-glob@>=3.0.4 <4.0.0", + "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz", + "dev": true + }, + "parse-json": { + "version": "2.2.0", + "from": "parse-json@>=2.2.0 <3.0.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", + "dev": true + }, + "parseurl": { + "version": "1.3.1", + "from": "parseurl@>=1.3.1 <1.4.0", + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz", + "dev": true + }, + "path-browserify": { + "version": "0.0.0", + "from": "path-browserify@0.0.0", + "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz", + "dev": true + }, + "path-exists": { + "version": "2.1.0", + "from": "path-exists@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", + "dev": true + }, + "path-is-absolute": { + "version": "1.0.1", + "from": "path-is-absolute@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "dev": true + }, + "path-type": { + "version": "1.1.0", + "from": "path-type@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", + "dev": true + }, + "pbkdf2": { + "version": "3.0.12", + "from": "pbkdf2@>=3.0.3 <4.0.0", + "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.12.tgz", + "dev": true + }, + "pify": { + "version": "2.3.0", + "from": "pify@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "dev": true + }, + "pinkie": { + "version": "2.0.4", + "from": "pinkie@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", + "dev": true + }, + "pinkie-promise": { + "version": "2.0.1", + "from": "pinkie-promise@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", + "dev": true + }, + "postcss": { + "version": "5.2.17", + "from": "postcss@>=5.0.6 <6.0.0", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", + "dev": true, + "dependencies": { + "supports-color": { + "version": "3.2.3", + "from": "supports-color@>=3.2.3 <4.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "dev": true + } + } + }, + "postcss-calc": { + "version": "5.3.1", + "from": "postcss-calc@>=5.2.0 <6.0.0", + "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-5.3.1.tgz", + "dev": true + }, + "postcss-colormin": { + "version": "2.2.2", + "from": "postcss-colormin@>=2.1.8 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-2.2.2.tgz", + "dev": true + }, + "postcss-convert-values": { + "version": "2.6.1", + "from": "postcss-convert-values@>=2.3.4 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-2.6.1.tgz", + "dev": true + }, + "postcss-discard-comments": { + "version": "2.0.4", + "from": "postcss-discard-comments@>=2.0.4 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz", + "dev": true + }, + "postcss-discard-duplicates": { + "version": "2.1.0", + "from": "postcss-discard-duplicates@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-2.1.0.tgz", + "dev": true + }, + "postcss-discard-empty": { + "version": "2.1.0", + "from": "postcss-discard-empty@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-2.1.0.tgz", + "dev": true + }, + "postcss-discard-overridden": { + "version": "0.1.1", + "from": "postcss-discard-overridden@>=0.1.1 <0.2.0", + "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz", + "dev": true + }, + "postcss-discard-unused": { + "version": "2.2.3", + "from": "postcss-discard-unused@>=2.2.1 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-discard-unused/-/postcss-discard-unused-2.2.3.tgz", + "dev": true + }, + "postcss-filter-plugins": { + "version": "2.0.2", + "from": "postcss-filter-plugins@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-filter-plugins/-/postcss-filter-plugins-2.0.2.tgz", + "dev": true + }, + "postcss-merge-idents": { + "version": "2.1.7", + "from": "postcss-merge-idents@>=2.1.5 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz", + "dev": true + }, + "postcss-merge-longhand": { + "version": "2.0.2", + "from": "postcss-merge-longhand@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-2.0.2.tgz", + "dev": true + }, + "postcss-merge-rules": { + "version": "2.1.2", + "from": "postcss-merge-rules@>=2.0.3 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-2.1.2.tgz", + "dev": true + }, + "postcss-message-helpers": { + "version": "2.0.0", + "from": "postcss-message-helpers@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz", + "dev": true + }, + "postcss-minify-font-values": { + "version": "1.0.5", + "from": "postcss-minify-font-values@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-1.0.5.tgz", + "dev": true + }, + "postcss-minify-gradients": { + "version": "1.0.5", + "from": "postcss-minify-gradients@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-1.0.5.tgz", + "dev": true + }, + "postcss-minify-params": { + "version": "1.2.2", + "from": "postcss-minify-params@>=1.0.4 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-1.2.2.tgz", + "dev": true + }, + "postcss-minify-selectors": { + "version": "2.1.1", + "from": "postcss-minify-selectors@>=2.0.4 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-2.1.1.tgz", + "dev": true + }, + "postcss-modules-extract-imports": { + "version": "1.1.0", + "from": "postcss-modules-extract-imports@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.1.0.tgz", + "dev": true, + "dependencies": { + "has-flag": { + "version": "2.0.0", + "from": "has-flag@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", + "dev": true + }, + "postcss": { + "version": "6.0.3", + "from": "postcss@>=6.0.1 <7.0.0", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.3.tgz", + "dev": true + }, + "supports-color": { + "version": "4.0.0", + "from": "supports-color@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.0.0.tgz", + "dev": true + } + } + }, + "postcss-modules-local-by-default": { + "version": "1.2.0", + "from": "postcss-modules-local-by-default@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz", + "dev": true, + "dependencies": { + "css-selector-tokenizer": { + "version": "0.7.0", + "from": "css-selector-tokenizer@>=0.7.0 <0.8.0", + "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz", + "dev": true + }, + "has-flag": { + "version": "2.0.0", + "from": "has-flag@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", + "dev": true + }, + "postcss": { + "version": "6.0.3", + "from": "postcss@>=6.0.1 <7.0.0", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.3.tgz", + "dev": true + }, + "supports-color": { + "version": "4.0.0", + "from": "supports-color@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.0.0.tgz", + "dev": true + } + } + }, + "postcss-modules-scope": { + "version": "1.1.0", + "from": "postcss-modules-scope@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz", + "dev": true, + "dependencies": { + "css-selector-tokenizer": { + "version": "0.7.0", + "from": "css-selector-tokenizer@>=0.7.0 <0.8.0", + "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz", + "dev": true + }, + "has-flag": { + "version": "2.0.0", + "from": "has-flag@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", + "dev": true + }, + "postcss": { + "version": "6.0.3", + "from": "postcss@>=6.0.1 <7.0.0", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.3.tgz", + "dev": true + }, + "supports-color": { + "version": "4.0.0", + "from": "supports-color@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.0.0.tgz", + "dev": true + } + } + }, + "postcss-modules-values": { + "version": "1.3.0", + "from": "postcss-modules-values@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz", + "dev": true, + "dependencies": { + "has-flag": { + "version": "2.0.0", + "from": "has-flag@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", + "dev": true + }, + "postcss": { + "version": "6.0.3", + "from": "postcss@>=6.0.1 <7.0.0", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.3.tgz", + "dev": true + }, + "supports-color": { + "version": "4.0.0", + "from": "supports-color@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.0.0.tgz", + "dev": true + } + } + }, + "postcss-normalize-charset": { + "version": "1.1.1", + "from": "postcss-normalize-charset@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz", + "dev": true + }, + "postcss-normalize-url": { + "version": "3.0.8", + "from": "postcss-normalize-url@>=3.0.7 <4.0.0", + "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-3.0.8.tgz", + "dev": true + }, + "postcss-ordered-values": { + "version": "2.2.3", + "from": "postcss-ordered-values@>=2.1.0 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-2.2.3.tgz", + "dev": true + }, + "postcss-reduce-idents": { + "version": "2.4.0", + "from": "postcss-reduce-idents@>=2.2.2 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz", + "dev": true + }, + "postcss-reduce-initial": { + "version": "1.0.1", + "from": "postcss-reduce-initial@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-1.0.1.tgz", + "dev": true + }, + "postcss-reduce-transforms": { + "version": "1.0.4", + "from": "postcss-reduce-transforms@>=1.0.3 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.4.tgz", + "dev": true + }, + "postcss-selector-parser": { + "version": "2.2.3", + "from": "postcss-selector-parser@>=2.2.2 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz", + "dev": true + }, + "postcss-svgo": { + "version": "2.1.6", + "from": "postcss-svgo@>=2.1.1 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-2.1.6.tgz", + "dev": true + }, + "postcss-unique-selectors": { + "version": "2.0.2", + "from": "postcss-unique-selectors@>=2.0.2 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-2.0.2.tgz", + "dev": true + }, + "postcss-value-parser": { + "version": "3.3.0", + "from": "postcss-value-parser@>=3.2.3 <4.0.0", + "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz", + "dev": true + }, + "postcss-zindex": { + "version": "2.2.0", + "from": "postcss-zindex@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-zindex/-/postcss-zindex-2.2.0.tgz", + "dev": true + }, + "prepend-http": { + "version": "1.0.4", + "from": "prepend-http@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz", + "dev": true + }, + "preserve": { + "version": "0.2.0", + "from": "preserve@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz", + "dev": true + }, + "process": { + "version": "0.11.10", + "from": "process@>=0.11.0 <0.12.0", + "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", + "dev": true + }, + "process-nextick-args": { + "version": "1.0.7", + "from": "process-nextick-args@>=1.0.6 <1.1.0", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", + "dev": true + }, + "prr": { + "version": "0.0.0", + "from": "prr@>=0.0.0 <0.1.0", + "resolved": "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz", + "dev": true + }, + "public-encrypt": { + "version": "4.0.0", + "from": "public-encrypt@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz", + "dev": true + }, + "punycode": { + "version": "1.4.1", + "from": "punycode@>=1.2.4 <2.0.0", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", + "dev": true + }, + "q": { + "version": "1.5.0", + "from": "q@>=1.1.2 <2.0.0", + "resolved": "https://registry.npmjs.org/q/-/q-1.5.0.tgz", + "dev": true + }, + "query-string": { + "version": "4.3.4", + "from": "query-string@>=4.1.0 <5.0.0", + "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz", + "dev": true + }, + "querystring": { + "version": "0.2.0", + "from": "querystring@0.2.0", + "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", + "dev": true + }, + "querystring-es3": { + "version": "0.2.1", + "from": "querystring-es3@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz", + "dev": true + }, + "randomatic": { + "version": "1.1.7", + "from": "randomatic@>=1.1.3 <2.0.0", + "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz", + "dev": true, + "dependencies": { + "is-number": { + "version": "3.0.0", + "from": "is-number@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "dev": true, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "from": "kind-of@^3.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "dev": true + } + } + }, + "kind-of": { + "version": "4.0.0", + "from": "kind-of@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", + "dev": true + } + } + }, + "randombytes": { + "version": "2.0.5", + "from": "randombytes@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.5.tgz", + "dev": true + }, + "range-parser": { + "version": "1.2.0", + "from": "range-parser@>=1.0.3 <2.0.0", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz", + "dev": true + }, + "raw-loader": { + "version": "0.5.1", + "from": "raw-loader@>=0.5.1 <0.6.0", + "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-0.5.1.tgz", + "dev": true + }, + "read-pkg": { + "version": "1.1.0", + "from": "read-pkg@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", + "dev": true + }, + "read-pkg-up": { + "version": "1.0.1", + "from": "read-pkg-up@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", + "dev": true + }, + "readable-stream": { + "version": "2.3.2", + "from": "readable-stream@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.2.tgz", + "dev": true + }, + "readdirp": { + "version": "2.1.0", + "from": "readdirp@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz", + "dev": true + }, + "reduce-css-calc": { + "version": "1.3.0", + "from": "reduce-css-calc@>=1.2.6 <2.0.0", + "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz", + "dev": true + }, + "reduce-function-call": { + "version": "1.0.2", + "from": "reduce-function-call@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/reduce-function-call/-/reduce-function-call-1.0.2.tgz", + "dev": true + }, + "regenerate": { + "version": "1.3.2", + "from": "regenerate@>=1.2.1 <2.0.0", + "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.2.tgz", + "dev": true + }, + "regex-cache": { + "version": "0.4.3", + "from": "regex-cache@>=0.4.2 <0.5.0", + "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz", + "dev": true + }, + "regexpu-core": { + "version": "1.0.0", + "from": "regexpu-core@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz", + "dev": true + }, + "regjsgen": { + "version": "0.2.0", + "from": "regjsgen@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz", + "dev": true + }, + "regjsparser": { + "version": "0.1.5", + "from": "regjsparser@>=0.1.4 <0.2.0", + "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz", + "dev": true + }, + "remove-trailing-separator": { + "version": "1.0.2", + "from": "remove-trailing-separator@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.0.2.tgz", + "dev": true + }, + "repeat-element": { + "version": "1.1.2", + "from": "repeat-element@>=1.1.2 <2.0.0", + "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz", + "dev": true + }, + "repeat-string": { + "version": "1.6.1", + "from": "repeat-string@>=1.5.2 <2.0.0", + "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", + "dev": true + }, + "require-directory": { + "version": "2.1.1", + "from": "require-directory@>=2.1.1 <3.0.0", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "dev": true + }, + "require-from-string": { + "version": "1.2.1", + "from": "require-from-string@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-1.2.1.tgz", + "dev": true + }, + "require-main-filename": { + "version": "1.0.1", + "from": "require-main-filename@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", + "dev": true + }, + "resolve-pathname": { + "version": "2.1.0", + "from": "resolve-pathname@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/resolve-pathname/-/resolve-pathname-2.1.0.tgz", + "dev": true + }, + "right-align": { + "version": "0.1.3", + "from": "right-align@>=0.1.1 <0.2.0", + "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz", + "dev": true + }, + "ripemd160": { + "version": "2.0.1", + "from": "ripemd160@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz", + "dev": true + }, + "safe-buffer": { + "version": "5.1.1", + "from": "safe-buffer@>=5.1.0 <5.2.0", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", + "dev": true + }, + "sax": { + "version": "1.2.4", + "from": "sax@>=1.2.1 <1.3.0", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", + "dev": true + }, + "schema-utils": { + "version": "0.3.0", + "from": "schema-utils@>=0.3.0 <0.4.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz", + "dev": true + }, + "semver": { + "version": "5.3.0", + "from": "semver@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0||>=4.0.0 <5.0.0||>=5.0.0 <6.0.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", + "dev": true + }, + "set-blocking": { + "version": "2.0.0", + "from": "set-blocking@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "dev": true + }, + "set-immediate-shim": { + "version": "1.0.1", + "from": "set-immediate-shim@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz", + "dev": true + }, + "setimmediate": { + "version": "1.0.5", + "from": "setimmediate@>=1.0.4 <2.0.0", + "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", + "dev": true + }, + "sha.js": { + "version": "2.4.8", + "from": "sha.js@>=2.4.0 <3.0.0", + "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.8.tgz", + "dev": true + }, + "signals": { + "version": "1.0.0", + "from": "signals@<2.0.0", + "resolved": "https://registry.npmjs.org/signals/-/signals-1.0.0.tgz", + "dev": true + }, + "sort-keys": { + "version": "1.1.2", + "from": "sort-keys@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz", + "dev": true + }, + "source-list-map": { + "version": "0.1.8", + "from": "source-list-map@>=0.1.4 <0.2.0", + "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz", + "dev": true + }, + "source-map": { + "version": "0.5.6", + "from": "source-map@>=0.5.6 <0.6.0", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz", + "dev": true + }, + "source-map-support": { + "version": "0.4.15", + "from": "source-map-support@>=0.4.15 <0.5.0", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.15.tgz", + "dev": true + }, + "spdx-correct": { + "version": "1.0.2", + "from": "spdx-correct@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz", + "dev": true + }, + "spdx-expression-parse": { + "version": "1.0.4", + "from": "spdx-expression-parse@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz", + "dev": true + }, + "spdx-license-ids": { + "version": "1.2.2", + "from": "spdx-license-ids@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz", + "dev": true + }, + "sprintf-js": { + "version": "1.0.3", + "from": "sprintf-js@>=1.0.2 <1.1.0", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "dev": true + }, + "statuses": { + "version": "1.3.1", + "from": "statuses@>=1.3.1 <1.4.0", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz", + "dev": true + }, + "stream-browserify": { + "version": "2.0.1", + "from": "stream-browserify@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz", + "dev": true + }, + "stream-http": { + "version": "2.7.2", + "from": "stream-http@>=2.3.1 <3.0.0", + "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.7.2.tgz", + "dev": true + }, + "strict-uri-encode": { + "version": "1.1.0", + "from": "strict-uri-encode@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz", + "dev": true + }, + "string_decoder": { + "version": "1.0.3", + "from": "string_decoder@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "dev": true + }, + "string-width": { + "version": "1.0.2", + "from": "string-width@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "dev": true + }, + "strip-ansi": { + "version": "3.0.1", + "from": "strip-ansi@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "dev": true + }, + "strip-bom": { + "version": "2.0.0", + "from": "strip-bom@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", + "dev": true + }, + "style-loader": { + "version": "0.13.2", + "from": "style-loader@>=0.13.1 <0.14.0", + "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.13.2.tgz", + "dev": true + }, + "supports-color": { + "version": "2.0.0", + "from": "supports-color@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "dev": true + }, + "svgo": { + "version": "0.7.2", + "from": "svgo@>=0.7.0 <0.8.0", + "resolved": "https://registry.npmjs.org/svgo/-/svgo-0.7.2.tgz", + "dev": true + }, + "tapable": { + "version": "0.2.6", + "from": "tapable@>=0.2.5 <0.3.0", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.2.6.tgz", + "dev": true + }, + "timers-browserify": { + "version": "2.0.2", + "from": "timers-browserify@>=2.0.2 <3.0.0", + "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.2.tgz", + "dev": true + }, + "to-arraybuffer": { + "version": "1.0.1", + "from": "to-arraybuffer@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz", + "dev": true + }, + "tty-browserify": { + "version": "0.0.0", + "from": "tty-browserify@0.0.0", + "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz", + "dev": true + }, + "typescript": { + "version": "2.3.4", + "from": "typescript@>=2.2.1 <3.0.0", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.3.4.tgz", + "dev": true + }, + "uglify-js": { + "version": "2.8.29", + "from": "uglify-js@>=2.8.27 <3.0.0", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz", + "dev": true, + "dependencies": { + "yargs": { + "version": "3.10.0", + "from": "yargs@>=3.10.0 <3.11.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", + "dev": true + } + } + }, + "uglify-to-browserify": { + "version": "1.0.2", + "from": "uglify-to-browserify@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz", + "dev": true, + "optional": true + }, + "uniq": { + "version": "1.0.1", + "from": "uniq@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz", + "dev": true + }, + "uniqid": { + "version": "4.1.1", + "from": "uniqid@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/uniqid/-/uniqid-4.1.1.tgz", + "dev": true + }, + "uniqs": { + "version": "2.0.0", + "from": "uniqs@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz", + "dev": true + }, + "unpipe": { + "version": "1.0.0", + "from": "unpipe@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", + "dev": true + }, + "url": { + "version": "0.11.0", + "from": "url@>=0.11.0 <0.12.0", + "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", + "dev": true, + "dependencies": { + "punycode": { + "version": "1.3.2", + "from": "punycode@1.3.2", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", + "dev": true + } + } + }, + "url-loader": { + "version": "0.5.9", + "from": "url-loader@>=0.5.7 <0.6.0", + "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-0.5.9.tgz", + "dev": true + }, + "util": { + "version": "0.10.3", + "from": "util@>=0.10.3 <0.11.0", + "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", + "dev": true, + "dependencies": { + "inherits": { + "version": "2.0.1", + "from": "inherits@2.0.1", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", + "dev": true + } + } + }, + "util-deprecate": { + "version": "1.0.2", + "from": "util-deprecate@>=1.0.1 <1.1.0", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "dev": true + }, + "utils-merge": { + "version": "1.0.0", + "from": "utils-merge@1.0.0", + "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz", + "dev": true + }, + "validate-npm-package-license": { + "version": "3.0.1", + "from": "validate-npm-package-license@>=3.0.1 <4.0.0", + "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz", + "dev": true + }, + "value-equal": { + "version": "0.2.1", + "from": "value-equal@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/value-equal/-/value-equal-0.2.1.tgz", + "dev": true + }, + "vendors": { + "version": "1.0.1", + "from": "vendors@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.1.tgz", + "dev": true + }, + "vm-browserify": { + "version": "0.0.4", + "from": "vm-browserify@0.0.4", + "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz", + "dev": true + }, + "warning": { + "version": "3.0.0", + "from": "warning@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz", + "dev": true + }, + "watchpack": { + "version": "1.3.1", + "from": "watchpack@>=1.3.1 <2.0.0", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.3.1.tgz", + "dev": true + }, + "webpack": { + "version": "2.6.1", + "from": "webpack@>=2.2.0 <3.0.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-2.6.1.tgz", + "dev": true, + "dependencies": { + "ajv": { + "version": "4.11.8", + "from": "ajv@>=4.7.0 <5.0.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz", + "dev": true + }, + "loader-utils": { + "version": "0.2.17", + "from": "loader-utils@>=0.2.16 <0.3.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz", + "dev": true + }, + "memory-fs": { + "version": "0.4.1", + "from": "memory-fs@>=0.4.1 <0.5.0", + "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz", + "dev": true + }, + "source-list-map": { + "version": "1.1.2", + "from": "source-list-map@>=1.1.1 <2.0.0", + "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-1.1.2.tgz", + "dev": true + }, + "supports-color": { + "version": "3.2.3", + "from": "supports-color@>=3.1.0 <4.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "dev": true + }, + "webpack-sources": { + "version": "0.2.3", + "from": "webpack-sources@>=0.2.3 <0.3.0", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.2.3.tgz", + "dev": true + } + } + }, + "webpack-dev-middleware": { + "version": "1.11.0", + "from": "webpack-dev-middleware@>=1.8.4 <2.0.0", + "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-1.11.0.tgz", + "dev": true, + "dependencies": { + "memory-fs": { + "version": "0.4.1", + "from": "memory-fs@>=0.4.1 <0.5.0", + "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz", + "dev": true + } + } + }, + "webpack-hot-middleware": { + "version": "2.18.0", + "from": "webpack-hot-middleware@>=2.12.2 <3.0.0", + "resolved": "https://registry.npmjs.org/webpack-hot-middleware/-/webpack-hot-middleware-2.18.0.tgz", + "dev": true + }, + "webpack-node-externals": { + "version": "1.6.0", + "from": "webpack-node-externals@>=1.4.3 <2.0.0", + "resolved": "https://registry.npmjs.org/webpack-node-externals/-/webpack-node-externals-1.6.0.tgz", + "dev": true + }, + "webpack-sources": { + "version": "1.0.1", + "from": "webpack-sources@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.0.1.tgz", + "dev": true, + "dependencies": { + "source-list-map": { + "version": "2.0.0", + "from": "source-list-map@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz", + "dev": true + } + } + }, + "whatwg-fetch": { + "version": "2.0.3", + "from": "whatwg-fetch@>=0.10.0", + "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz", + "dev": true + }, + "whet.extend": { + "version": "0.9.9", + "from": "whet.extend@>=0.9.9 <0.10.0", + "resolved": "https://registry.npmjs.org/whet.extend/-/whet.extend-0.9.9.tgz", + "dev": true + }, + "which-module": { + "version": "1.0.0", + "from": "which-module@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz", + "dev": true + }, + "window-size": { + "version": "0.1.0", + "from": "window-size@0.1.0", + "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz", + "dev": true + }, + "wordwrap": { + "version": "0.0.2", + "from": "wordwrap@0.0.2", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz", + "dev": true + }, + "wrap-ansi": { + "version": "2.1.0", + "from": "wrap-ansi@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", + "dev": true + }, + "xtend": { + "version": "4.0.1", + "from": "xtend@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", + "dev": true + }, + "y18n": { + "version": "3.2.1", + "from": "y18n@>=3.2.1 <4.0.0", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", + "dev": true + }, + "yargs": { + "version": "6.6.0", + "from": "yargs@>=6.0.0 <7.0.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz", + "dev": true, + "dependencies": { + "camelcase": { + "version": "3.0.0", + "from": "camelcase@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", + "dev": true + }, + "cliui": { + "version": "3.2.0", + "from": "cliui@>=3.2.0 <4.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", + "dev": true + } + } + }, + "yargs-parser": { + "version": "4.2.1", + "from": "yargs-parser@>=4.2.0 <5.0.0", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz", + "dev": true, + "dependencies": { + "camelcase": { + "version": "3.0.0", + "from": "camelcase@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", + "dev": true + } + } + } + } +} diff --git a/templates/ReactReduxSpa/npm-shrinkwrap.json b/templates/ReactReduxSpa/npm-shrinkwrap.json new file mode 100644 index 00000000..59278599 --- /dev/null +++ b/templates/ReactReduxSpa/npm-shrinkwrap.json @@ -0,0 +1,2271 @@ +{ + "name": "WebApplicationBasic", + "version": "0.0.0", + "dependencies": { + "@types/history": { + "version": "4.5.1", + "from": "@types/history@4.5.1", + "resolved": "https://registry.npmjs.org/@types/history/-/history-4.5.1.tgz" + }, + "@types/node": { + "version": "8.0.3", + "from": "@types/node@*", + "resolved": "https://registry.npmjs.org/@types/node/-/node-8.0.3.tgz" + }, + "@types/react": { + "version": "15.0.24", + "from": "@types/react@15.0.24", + "resolved": "https://registry.npmjs.org/@types/react/-/react-15.0.24.tgz" + }, + "@types/react-dom": { + "version": "15.5.0", + "from": "@types/react-dom@15.5.0", + "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-15.5.0.tgz" + }, + "@types/react-redux": { + "version": "4.4.40", + "from": "@types/react-redux@4.4.40", + "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-4.4.40.tgz" + }, + "@types/react-router": { + "version": "4.0.11", + "from": "@types/react-router@4.0.11", + "resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-4.0.11.tgz" + }, + "@types/react-router-dom": { + "version": "4.0.4", + "from": "@types/react-router-dom@4.0.4", + "resolved": "https://registry.npmjs.org/@types/react-router-dom/-/react-router-dom-4.0.4.tgz" + }, + "@types/react-router-redux": { + "version": "5.0.1", + "from": "@types/react-router-redux@5.0.1", + "resolved": "https://registry.npmjs.org/@types/react-router-redux/-/react-router-redux-5.0.1.tgz" + }, + "@types/source-map": { + "version": "0.5.0", + "from": "@types/source-map@*", + "resolved": "https://registry.npmjs.org/@types/source-map/-/source-map-0.5.0.tgz" + }, + "@types/tapable": { + "version": "0.2.3", + "from": "@types/tapable@*", + "resolved": "https://registry.npmjs.org/@types/tapable/-/tapable-0.2.3.tgz" + }, + "@types/uglify-js": { + "version": "2.6.29", + "from": "@types/uglify-js@*", + "resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-2.6.29.tgz" + }, + "@types/webpack": { + "version": "2.2.15", + "from": "@types/webpack@2.2.15", + "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-2.2.15.tgz" + }, + "@types/webpack-env": { + "version": "1.13.0", + "from": "@types/webpack-env@1.13.0", + "resolved": "https://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.13.0.tgz" + }, + "acorn": { + "version": "5.0.3", + "from": "acorn@>=5.0.0 <6.0.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.0.3.tgz" + }, + "acorn-dynamic-import": { + "version": "2.0.2", + "from": "acorn-dynamic-import@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz", + "dependencies": { + "acorn": { + "version": "4.0.13", + "from": "acorn@>=4.0.3 <5.0.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz" + } + } + }, + "ajv": { + "version": "4.11.8", + "from": "ajv@>=4.11.2 <5.0.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz" + }, + "ajv-keywords": { + "version": "1.5.1", + "from": "ajv-keywords@>=1.1.1 <2.0.0", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.1.tgz" + }, + "align-text": { + "version": "0.1.4", + "from": "align-text@>=0.1.3 <0.2.0", + "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz" + }, + "alphanum-sort": { + "version": "1.0.2", + "from": "alphanum-sort@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz" + }, + "amdefine": { + "version": "1.0.1", + "from": "amdefine@>=0.0.4", + "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz" + }, + "ansi-html": { + "version": "0.0.7", + "from": "ansi-html@0.0.7", + "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz" + }, + "ansi-regex": { + "version": "2.1.1", + "from": "ansi-regex@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz" + }, + "ansi-styles": { + "version": "2.2.1", + "from": "ansi-styles@>=2.2.1 <3.0.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz" + }, + "anymatch": { + "version": "1.3.0", + "from": "anymatch@>=1.3.0 <2.0.0", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.0.tgz" + }, + "argparse": { + "version": "1.0.9", + "from": "argparse@>=1.0.7 <2.0.0", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz" + }, + "arr-diff": { + "version": "2.0.0", + "from": "arr-diff@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz" + }, + "arr-flatten": { + "version": "1.0.3", + "from": "arr-flatten@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.3.tgz" + }, + "array-unique": { + "version": "0.2.1", + "from": "array-unique@>=0.2.1 <0.3.0", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz" + }, + "arrify": { + "version": "1.0.1", + "from": "arrify@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz" + }, + "asap": { + "version": "2.0.5", + "from": "asap@>=2.0.3 <2.1.0", + "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.5.tgz" + }, + "asn1.js": { + "version": "4.9.1", + "from": "asn1.js@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.1.tgz" + }, + "aspnet-prerendering": { + "version": "2.0.6", + "from": "aspnet-prerendering@>=2.0.5 <3.0.0", + "resolved": "https://registry.npmjs.org/aspnet-prerendering/-/aspnet-prerendering-2.0.6.tgz", + "dependencies": { + "domain-task": { + "version": "2.0.3", + "from": "domain-task@>=2.0.2 <3.0.0", + "resolved": "https://registry.npmjs.org/domain-task/-/domain-task-2.0.3.tgz" + } + } + }, + "aspnet-webpack": { + "version": "1.0.29", + "from": "aspnet-webpack@>=1.0.29 <2.0.0", + "resolved": "https://registry.npmjs.org/aspnet-webpack/-/aspnet-webpack-1.0.29.tgz" + }, + "aspnet-webpack-react": { + "version": "3.0.0-beta.1", + "from": "aspnet-webpack-react@>=3.0.0-beta <4.0.0", + "resolved": "https://registry.npmjs.org/aspnet-webpack-react/-/aspnet-webpack-react-3.0.0-beta.1.tgz" + }, + "assert": { + "version": "1.4.1", + "from": "assert@>=1.1.1 <2.0.0", + "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz" + }, + "async": { + "version": "2.5.0", + "from": "async@>=2.1.2 <3.0.0", + "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz" + }, + "async-each": { + "version": "1.0.1", + "from": "async-each@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz" + }, + "autoprefixer": { + "version": "6.7.7", + "from": "autoprefixer@>=6.3.1 <7.0.0", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.7.7.tgz" + }, + "awesome-typescript-loader": { + "version": "3.1.3", + "from": "awesome-typescript-loader@3.1.3", + "resolved": "https://registry.npmjs.org/awesome-typescript-loader/-/awesome-typescript-loader-3.1.3.tgz" + }, + "babel-code-frame": { + "version": "6.22.0", + "from": "babel-code-frame@>=6.11.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz" + }, + "babel-messages": { + "version": "6.23.0", + "from": "babel-messages@>=6.23.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz" + }, + "babel-runtime": { + "version": "6.23.0", + "from": "babel-runtime@>=6.22.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz", + "dependencies": { + "core-js": { + "version": "2.4.1", + "from": "core-js@>=2.4.0 <3.0.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz" + } + } + }, + "babel-template": { + "version": "6.25.0", + "from": "babel-template@>=6.7.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.25.0.tgz" + }, + "babel-traverse": { + "version": "6.25.0", + "from": "babel-traverse@>=6.25.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.25.0.tgz" + }, + "babel-types": { + "version": "6.25.0", + "from": "babel-types@>=6.25.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.25.0.tgz" + }, + "babylon": { + "version": "6.17.4", + "from": "babylon@>=6.17.2 <7.0.0", + "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.17.4.tgz" + }, + "balanced-match": { + "version": "0.4.2", + "from": "balanced-match@>=0.4.2 <0.5.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz" + }, + "base64-js": { + "version": "1.2.1", + "from": "base64-js@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.1.tgz" + }, + "big.js": { + "version": "3.1.3", + "from": "big.js@>=3.1.3 <4.0.0", + "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.1.3.tgz" + }, + "binary-extensions": { + "version": "1.8.0", + "from": "binary-extensions@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.8.0.tgz" + }, + "bn.js": { + "version": "4.11.7", + "from": "bn.js@>=4.1.1 <5.0.0", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.7.tgz" + }, + "bootstrap": { + "version": "3.3.7", + "from": "bootstrap@3.3.7", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.3.7.tgz" + }, + "brace-expansion": { + "version": "1.1.8", + "from": "brace-expansion@>=1.1.7 <2.0.0", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", + "dependencies": { + "balanced-match": { + "version": "1.0.0", + "from": "balanced-match@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz" + } + } + }, + "braces": { + "version": "1.8.5", + "from": "braces@>=1.8.2 <2.0.0", + "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz" + }, + "brorand": { + "version": "1.1.0", + "from": "brorand@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz" + }, + "browserify-aes": { + "version": "1.0.6", + "from": "browserify-aes@>=1.0.4 <2.0.0", + "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.6.tgz" + }, + "browserify-cipher": { + "version": "1.0.0", + "from": "browserify-cipher@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz" + }, + "browserify-des": { + "version": "1.0.0", + "from": "browserify-des@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz" + }, + "browserify-rsa": { + "version": "4.0.1", + "from": "browserify-rsa@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz" + }, + "browserify-sign": { + "version": "4.0.4", + "from": "browserify-sign@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz" + }, + "browserify-zlib": { + "version": "0.1.4", + "from": "browserify-zlib@>=0.1.4 <0.2.0", + "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz" + }, + "browserslist": { + "version": "1.7.7", + "from": "browserslist@>=1.7.6 <2.0.0", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz" + }, + "buffer": { + "version": "4.9.1", + "from": "buffer@>=4.3.0 <5.0.0", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz" + }, + "buffer-xor": { + "version": "1.0.3", + "from": "buffer-xor@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz" + }, + "builtin-modules": { + "version": "1.1.1", + "from": "builtin-modules@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz" + }, + "builtin-status-codes": { + "version": "3.0.0", + "from": "builtin-status-codes@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz" + }, + "camelcase": { + "version": "1.2.1", + "from": "camelcase@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz" + }, + "caniuse-api": { + "version": "1.6.1", + "from": "caniuse-api@>=1.5.2 <2.0.0", + "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-1.6.1.tgz" + }, + "caniuse-db": { + "version": "1.0.30000694", + "from": "caniuse-db@>=1.0.30000634 <2.0.0", + "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000694.tgz" + }, + "center-align": { + "version": "0.1.3", + "from": "center-align@>=0.1.1 <0.2.0", + "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz" + }, + "chalk": { + "version": "1.1.3", + "from": "chalk@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz" + }, + "chokidar": { + "version": "1.7.0", + "from": "chokidar@>=1.4.3 <2.0.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz" + }, + "cipher-base": { + "version": "1.0.3", + "from": "cipher-base@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.3.tgz" + }, + "clap": { + "version": "1.2.0", + "from": "clap@>=1.0.9 <2.0.0", + "resolved": "https://registry.npmjs.org/clap/-/clap-1.2.0.tgz" + }, + "cliui": { + "version": "2.1.0", + "from": "cliui@>=2.1.0 <3.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz" + }, + "clone": { + "version": "1.0.2", + "from": "clone@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz" + }, + "co": { + "version": "4.6.0", + "from": "co@>=4.6.0 <5.0.0", + "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz" + }, + "coa": { + "version": "1.0.3", + "from": "coa@>=1.0.1 <1.1.0", + "resolved": "https://registry.npmjs.org/coa/-/coa-1.0.3.tgz" + }, + "code-point-at": { + "version": "1.1.0", + "from": "code-point-at@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz" + }, + "color": { + "version": "0.11.4", + "from": "color@>=0.11.0 <0.12.0", + "resolved": "https://registry.npmjs.org/color/-/color-0.11.4.tgz" + }, + "color-convert": { + "version": "1.9.0", + "from": "color-convert@>=1.3.0 <2.0.0", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz" + }, + "color-name": { + "version": "1.1.2", + "from": "color-name@>=1.1.1 <2.0.0", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.2.tgz" + }, + "color-string": { + "version": "0.3.0", + "from": "color-string@>=0.3.0 <0.4.0", + "resolved": "https://registry.npmjs.org/color-string/-/color-string-0.3.0.tgz" + }, + "colormin": { + "version": "1.1.2", + "from": "colormin@>=1.0.5 <2.0.0", + "resolved": "https://registry.npmjs.org/colormin/-/colormin-1.1.2.tgz" + }, + "colors": { + "version": "1.1.2", + "from": "colors@>=1.1.2 <2.0.0", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz" + }, + "concat-map": { + "version": "0.0.1", + "from": "concat-map@0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz" + }, + "connect": { + "version": "3.6.2", + "from": "connect@>=3.4.1 <4.0.0", + "resolved": "https://registry.npmjs.org/connect/-/connect-3.6.2.tgz" + }, + "console-browserify": { + "version": "1.1.0", + "from": "console-browserify@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz" + }, + "constants-browserify": { + "version": "1.0.0", + "from": "constants-browserify@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz" + }, + "core-js": { + "version": "1.2.7", + "from": "core-js@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz" + }, + "core-util-is": { + "version": "1.0.2", + "from": "core-util-is@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz" + }, + "create-ecdh": { + "version": "4.0.0", + "from": "create-ecdh@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz" + }, + "create-hash": { + "version": "1.1.3", + "from": "create-hash@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz" + }, + "create-hmac": { + "version": "1.1.6", + "from": "create-hmac@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.6.tgz" + }, + "create-react-class": { + "version": "15.6.0", + "from": "create-react-class@>=15.5.1 <16.0.0", + "resolved": "https://registry.npmjs.org/create-react-class/-/create-react-class-15.6.0.tgz" + }, + "crypto-browserify": { + "version": "3.11.0", + "from": "crypto-browserify@>=3.11.0 <4.0.0", + "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.0.tgz" + }, + "css-color-names": { + "version": "0.0.4", + "from": "css-color-names@0.0.4", + "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz" + }, + "css-loader": { + "version": "0.28.1", + "from": "css-loader@0.28.1", + "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.28.1.tgz" + }, + "css-selector-tokenizer": { + "version": "0.7.0", + "from": "css-selector-tokenizer@>=0.7.0 <0.8.0", + "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz" + }, + "cssesc": { + "version": "0.1.0", + "from": "cssesc@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-0.1.0.tgz" + }, + "cssnano": { + "version": "3.10.0", + "from": "cssnano@>=2.6.1 <4.0.0", + "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-3.10.0.tgz" + }, + "csso": { + "version": "2.3.2", + "from": "csso@>=2.3.1 <2.4.0", + "resolved": "https://registry.npmjs.org/csso/-/csso-2.3.2.tgz" + }, + "date-now": { + "version": "0.1.4", + "from": "date-now@>=0.1.4 <0.2.0", + "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz" + }, + "debug": { + "version": "2.6.7", + "from": "debug@2.6.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz" + }, + "decamelize": { + "version": "1.2.0", + "from": "decamelize@>=1.1.2 <2.0.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz" + }, + "defined": { + "version": "1.0.0", + "from": "defined@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz" + }, + "des.js": { + "version": "1.0.0", + "from": "des.js@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz" + }, + "diffie-hellman": { + "version": "5.0.2", + "from": "diffie-hellman@>=5.0.0 <6.0.0", + "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.2.tgz" + }, + "dom-walk": { + "version": "0.1.1", + "from": "dom-walk@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.1.tgz" + }, + "domain-browser": { + "version": "1.1.7", + "from": "domain-browser@>=1.1.1 <2.0.0", + "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.7.tgz" + }, + "domain-context": { + "version": "0.5.1", + "from": "domain-context@>=0.5.1 <0.6.0", + "resolved": "https://registry.npmjs.org/domain-context/-/domain-context-0.5.1.tgz" + }, + "domain-task": { + "version": "3.0.0", + "from": "domain-task@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/domain-task/-/domain-task-3.0.0.tgz" + }, + "ee-first": { + "version": "1.1.1", + "from": "ee-first@1.1.1", + "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz" + }, + "electron-to-chromium": { + "version": "1.3.14", + "from": "electron-to-chromium@>=1.2.7 <2.0.0", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.14.tgz" + }, + "elliptic": { + "version": "6.4.0", + "from": "elliptic@>=6.0.0 <7.0.0", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz" + }, + "emojis-list": { + "version": "2.1.0", + "from": "emojis-list@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz" + }, + "encodeurl": { + "version": "1.0.1", + "from": "encodeurl@>=1.0.1 <1.1.0", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.1.tgz" + }, + "encoding": { + "version": "0.1.12", + "from": "encoding@>=0.1.11 <0.2.0", + "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz" + }, + "enhanced-resolve": { + "version": "3.1.0", + "from": "enhanced-resolve@>=3.1.0 <4.0.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.1.0.tgz", + "dependencies": { + "memory-fs": { + "version": "0.4.1", + "from": "memory-fs@>=0.4.0 <0.5.0", + "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz" + } + } + }, + "errno": { + "version": "0.1.4", + "from": "errno@>=0.1.3 <0.2.0", + "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.4.tgz" + }, + "error-ex": { + "version": "1.3.1", + "from": "error-ex@>=1.2.0 <2.0.0", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz" + }, + "error-stack-parser": { + "version": "1.3.6", + "from": "error-stack-parser@>=1.3.6 <2.0.0", + "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-1.3.6.tgz" + }, + "es6-promise": { + "version": "3.3.1", + "from": "es6-promise@>=3.1.2 <4.0.0", + "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz" + }, + "escape-html": { + "version": "1.0.3", + "from": "escape-html@>=1.0.3 <1.1.0", + "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz" + }, + "escape-string-regexp": { + "version": "1.0.5", + "from": "escape-string-regexp@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz" + }, + "esprima": { + "version": "2.7.3", + "from": "esprima@>=2.6.0 <3.0.0", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz" + }, + "esutils": { + "version": "2.0.2", + "from": "esutils@>=2.0.2 <3.0.0", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz" + }, + "event-source-polyfill": { + "version": "0.0.9", + "from": "event-source-polyfill@0.0.9", + "resolved": "https://registry.npmjs.org/event-source-polyfill/-/event-source-polyfill-0.0.9.tgz" + }, + "events": { + "version": "1.1.1", + "from": "events@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz" + }, + "evp_bytestokey": { + "version": "1.0.0", + "from": "evp_bytestokey@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz" + }, + "expand-brackets": { + "version": "0.1.5", + "from": "expand-brackets@>=0.1.4 <0.2.0", + "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz" + }, + "expand-range": { + "version": "1.8.2", + "from": "expand-range@>=1.8.1 <2.0.0", + "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz" + }, + "extglob": { + "version": "0.3.2", + "from": "extglob@>=0.3.1 <0.4.0", + "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz" + }, + "extract-text-webpack-plugin": { + "version": "2.1.0", + "from": "extract-text-webpack-plugin@2.1.0", + "resolved": "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-2.1.0.tgz" + }, + "fastparse": { + "version": "1.1.1", + "from": "fastparse@>=1.1.1 <2.0.0", + "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.1.tgz" + }, + "fbjs": { + "version": "0.8.12", + "from": "fbjs@>=0.8.9 <0.9.0", + "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.12.tgz" + }, + "file-loader": { + "version": "0.11.1", + "from": "file-loader@0.11.1", + "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-0.11.1.tgz" + }, + "filename-regex": { + "version": "2.0.1", + "from": "filename-regex@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz" + }, + "fill-range": { + "version": "2.2.3", + "from": "fill-range@>=2.1.0 <3.0.0", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz" + }, + "finalhandler": { + "version": "1.0.3", + "from": "finalhandler@1.0.3", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.3.tgz" + }, + "find-up": { + "version": "1.1.2", + "from": "find-up@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz" + }, + "flatten": { + "version": "1.0.2", + "from": "flatten@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz" + }, + "for-in": { + "version": "1.0.2", + "from": "for-in@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz" + }, + "for-own": { + "version": "0.1.5", + "from": "for-own@>=0.1.4 <0.2.0", + "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz" + }, + "function-bind": { + "version": "1.1.0", + "from": "function-bind@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.0.tgz" + }, + "get-caller-file": { + "version": "1.0.2", + "from": "get-caller-file@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz" + }, + "glob-base": { + "version": "0.3.0", + "from": "glob-base@>=0.3.0 <0.4.0", + "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz" + }, + "glob-parent": { + "version": "2.0.0", + "from": "glob-parent@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz" + }, + "global": { + "version": "4.3.2", + "from": "global@>=4.3.0 <5.0.0", + "resolved": "https://registry.npmjs.org/global/-/global-4.3.2.tgz" + }, + "globals": { + "version": "9.18.0", + "from": "globals@>=9.0.0 <10.0.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz" + }, + "graceful-fs": { + "version": "4.1.11", + "from": "graceful-fs@>=4.1.2 <5.0.0", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz" + }, + "has": { + "version": "1.0.1", + "from": "has@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz" + }, + "has-ansi": { + "version": "2.0.0", + "from": "has-ansi@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz" + }, + "has-flag": { + "version": "1.0.0", + "from": "has-flag@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz" + }, + "hash-base": { + "version": "2.0.2", + "from": "hash-base@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz" + }, + "hash.js": { + "version": "1.1.1", + "from": "hash.js@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.1.tgz" + }, + "history": { + "version": "4.6.1", + "from": "history@4.6.1", + "resolved": "https://registry.npmjs.org/history/-/history-4.6.1.tgz" + }, + "hmac-drbg": { + "version": "1.0.1", + "from": "hmac-drbg@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz" + }, + "hoist-non-react-statics": { + "version": "1.2.0", + "from": "hoist-non-react-statics@>=1.0.3 <2.0.0", + "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz" + }, + "hosted-git-info": { + "version": "2.4.2", + "from": "hosted-git-info@>=2.1.4 <3.0.0", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.4.2.tgz" + }, + "html-comment-regex": { + "version": "1.1.1", + "from": "html-comment-regex@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.1.tgz" + }, + "html-entities": { + "version": "1.2.1", + "from": "html-entities@>=1.2.0 <2.0.0", + "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz" + }, + "https-browserify": { + "version": "0.0.1", + "from": "https-browserify@0.0.1", + "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz" + }, + "iconv-lite": { + "version": "0.4.18", + "from": "iconv-lite@>=0.4.13 <0.5.0", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.18.tgz" + }, + "icss-replace-symbols": { + "version": "1.1.0", + "from": "icss-replace-symbols@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz" + }, + "ieee754": { + "version": "1.1.8", + "from": "ieee754@>=1.1.4 <2.0.0", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz" + }, + "indexes-of": { + "version": "1.0.1", + "from": "indexes-of@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz" + }, + "indexof": { + "version": "0.0.1", + "from": "indexof@0.0.1", + "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz" + }, + "inherits": { + "version": "2.0.3", + "from": "inherits@>=2.0.3 <2.1.0", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz" + }, + "interpret": { + "version": "1.0.3", + "from": "interpret@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.3.tgz" + }, + "invariant": { + "version": "2.2.2", + "from": "invariant@>=2.2.1 <3.0.0", + "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz" + }, + "invert-kv": { + "version": "1.0.0", + "from": "invert-kv@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz" + }, + "is-absolute-url": { + "version": "2.1.0", + "from": "is-absolute-url@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz" + }, + "is-arrayish": { + "version": "0.2.1", + "from": "is-arrayish@>=0.2.1 <0.3.0", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz" + }, + "is-binary-path": { + "version": "1.0.1", + "from": "is-binary-path@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz" + }, + "is-buffer": { + "version": "1.1.5", + "from": "is-buffer@>=1.1.5 <2.0.0", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz" + }, + "is-builtin-module": { + "version": "1.0.0", + "from": "is-builtin-module@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz" + }, + "is-dotfile": { + "version": "1.0.3", + "from": "is-dotfile@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz" + }, + "is-equal-shallow": { + "version": "0.1.3", + "from": "is-equal-shallow@>=0.1.3 <0.2.0", + "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz" + }, + "is-extendable": { + "version": "0.1.1", + "from": "is-extendable@>=0.1.1 <0.2.0", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz" + }, + "is-extglob": { + "version": "1.0.0", + "from": "is-extglob@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz" + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "from": "is-fullwidth-code-point@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz" + }, + "is-glob": { + "version": "2.0.1", + "from": "is-glob@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz" + }, + "is-number": { + "version": "2.1.0", + "from": "is-number@>=2.1.0 <3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz" + }, + "is-plain-obj": { + "version": "1.1.0", + "from": "is-plain-obj@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz" + }, + "is-posix-bracket": { + "version": "0.1.1", + "from": "is-posix-bracket@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz" + }, + "is-primitive": { + "version": "2.0.0", + "from": "is-primitive@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz" + }, + "is-stream": { + "version": "1.1.0", + "from": "is-stream@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz" + }, + "is-svg": { + "version": "2.1.0", + "from": "is-svg@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-2.1.0.tgz" + }, + "is-utf8": { + "version": "0.2.1", + "from": "is-utf8@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz" + }, + "isarray": { + "version": "1.0.0", + "from": "isarray@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz" + }, + "isobject": { + "version": "2.1.0", + "from": "isobject@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz" + }, + "isomorphic-fetch": { + "version": "2.2.1", + "from": "isomorphic-fetch@>=2.2.1 <3.0.0", + "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz" + }, + "jquery": { + "version": "3.2.1", + "from": "jquery@3.2.1", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.2.1.tgz" + }, + "js-base64": { + "version": "2.1.9", + "from": "js-base64@>=2.1.9 <3.0.0", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.1.9.tgz" + }, + "js-tokens": { + "version": "3.0.1", + "from": "js-tokens@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.1.tgz" + }, + "js-yaml": { + "version": "3.7.0", + "from": "js-yaml@>=3.7.0 <3.8.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz" + }, + "jsesc": { + "version": "0.5.0", + "from": "jsesc@>=0.5.0 <0.6.0", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz" + }, + "json-loader": { + "version": "0.5.4", + "from": "json-loader@0.5.4", + "resolved": "https://registry.npmjs.org/json-loader/-/json-loader-0.5.4.tgz" + }, + "json-stable-stringify": { + "version": "1.0.1", + "from": "json-stable-stringify@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz" + }, + "json5": { + "version": "0.5.1", + "from": "json5@>=0.5.0 <0.6.0", + "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz" + }, + "jsonify": { + "version": "0.0.0", + "from": "jsonify@>=0.0.0 <0.1.0", + "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz" + }, + "kind-of": { + "version": "3.2.2", + "from": "kind-of@>=3.0.2 <4.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz" + }, + "lazy-cache": { + "version": "1.0.4", + "from": "lazy-cache@>=1.0.3 <2.0.0", + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz" + }, + "lcid": { + "version": "1.0.0", + "from": "lcid@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz" + }, + "load-json-file": { + "version": "1.1.0", + "from": "load-json-file@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz" + }, + "loader-runner": { + "version": "2.3.0", + "from": "loader-runner@>=2.3.0 <3.0.0", + "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.0.tgz" + }, + "loader-utils": { + "version": "1.1.0", + "from": "loader-utils@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz" + }, + "lodash": { + "version": "4.17.4", + "from": "lodash@>=4.2.1 <5.0.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz" + }, + "lodash-es": { + "version": "4.17.4", + "from": "lodash-es@>=4.2.1 <5.0.0", + "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.4.tgz" + }, + "lodash.camelcase": { + "version": "4.3.0", + "from": "lodash.camelcase@>=4.3.0 <5.0.0", + "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz" + }, + "lodash.memoize": { + "version": "4.1.2", + "from": "lodash.memoize@>=4.1.2 <5.0.0", + "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz" + }, + "lodash.uniq": { + "version": "4.5.0", + "from": "lodash.uniq@>=4.5.0 <5.0.0", + "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz" + }, + "longest": { + "version": "1.0.1", + "from": "longest@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz" + }, + "loose-envify": { + "version": "1.3.1", + "from": "loose-envify@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz" + }, + "macaddress": { + "version": "0.2.8", + "from": "macaddress@>=0.2.8 <0.3.0", + "resolved": "https://registry.npmjs.org/macaddress/-/macaddress-0.2.8.tgz" + }, + "math-expression-evaluator": { + "version": "1.2.17", + "from": "math-expression-evaluator@>=1.2.14 <2.0.0", + "resolved": "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz" + }, + "memory-fs": { + "version": "0.3.0", + "from": "memory-fs@>=0.3.0 <0.4.0", + "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.3.0.tgz" + }, + "micromatch": { + "version": "2.3.11", + "from": "micromatch@>=2.1.5 <3.0.0", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz" + }, + "miller-rabin": { + "version": "4.0.0", + "from": "miller-rabin@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.0.tgz" + }, + "mime": { + "version": "1.3.6", + "from": "mime@>=1.3.4 <2.0.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.6.tgz" + }, + "min-document": { + "version": "2.19.0", + "from": "min-document@>=2.19.0 <3.0.0", + "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz" + }, + "minimalistic-assert": { + "version": "1.0.0", + "from": "minimalistic-assert@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz" + }, + "minimalistic-crypto-utils": { + "version": "1.0.1", + "from": "minimalistic-crypto-utils@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz" + }, + "minimatch": { + "version": "3.0.4", + "from": "minimatch@>=3.0.2 <4.0.0", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz" + }, + "minimist": { + "version": "0.0.8", + "from": "minimist@0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz" + }, + "mkdirp": { + "version": "0.5.1", + "from": "mkdirp@>=0.5.1 <0.6.0", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz" + }, + "ms": { + "version": "2.0.0", + "from": "ms@2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz" + }, + "node-fetch": { + "version": "1.7.1", + "from": "node-fetch@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.1.tgz" + }, + "node-libs-browser": { + "version": "2.0.0", + "from": "node-libs-browser@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.0.0.tgz", + "dependencies": { + "process": { + "version": "0.11.10", + "from": "process@>=0.11.0 <0.12.0", + "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz" + }, + "string_decoder": { + "version": "0.10.31", + "from": "string_decoder@>=0.10.25 <0.11.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" + } + } + }, + "node-noop": { + "version": "1.0.0", + "from": "node-noop@1.0.0", + "resolved": "https://registry.npmjs.org/node-noop/-/node-noop-1.0.0.tgz" + }, + "normalize-package-data": { + "version": "2.3.8", + "from": "normalize-package-data@>=2.3.2 <3.0.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.8.tgz" + }, + "normalize-path": { + "version": "2.1.1", + "from": "normalize-path@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz" + }, + "normalize-range": { + "version": "0.1.2", + "from": "normalize-range@>=0.1.2 <0.2.0", + "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz" + }, + "normalize-url": { + "version": "1.9.1", + "from": "normalize-url@>=1.4.0 <2.0.0", + "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz" + }, + "num2fraction": { + "version": "1.2.2", + "from": "num2fraction@>=1.2.2 <2.0.0", + "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz" + }, + "number-is-nan": { + "version": "1.0.1", + "from": "number-is-nan@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz" + }, + "object-assign": { + "version": "4.1.1", + "from": "object-assign@>=4.1.1 <5.0.0", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz" + }, + "object.omit": { + "version": "2.0.1", + "from": "object.omit@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz" + }, + "on-finished": { + "version": "2.3.0", + "from": "on-finished@>=2.3.0 <2.4.0", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz" + }, + "os-browserify": { + "version": "0.2.1", + "from": "os-browserify@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.2.1.tgz" + }, + "os-locale": { + "version": "1.4.0", + "from": "os-locale@>=1.4.0 <2.0.0", + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz" + }, + "pako": { + "version": "0.2.9", + "from": "pako@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz" + }, + "parse-asn1": { + "version": "5.1.0", + "from": "parse-asn1@>=5.0.0 <6.0.0", + "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz" + }, + "parse-glob": { + "version": "3.0.4", + "from": "parse-glob@>=3.0.4 <4.0.0", + "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz" + }, + "parse-json": { + "version": "2.2.0", + "from": "parse-json@>=2.2.0 <3.0.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz" + }, + "parseurl": { + "version": "1.3.1", + "from": "parseurl@>=1.3.1 <1.4.0", + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz" + }, + "path-browserify": { + "version": "0.0.0", + "from": "path-browserify@0.0.0", + "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz" + }, + "path-exists": { + "version": "2.1.0", + "from": "path-exists@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz" + }, + "path-is-absolute": { + "version": "1.0.1", + "from": "path-is-absolute@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz" + }, + "path-to-regexp": { + "version": "1.7.0", + "from": "path-to-regexp@>=1.5.3 <2.0.0", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz", + "dependencies": { + "isarray": { + "version": "0.0.1", + "from": "isarray@0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" + } + } + }, + "path-type": { + "version": "1.1.0", + "from": "path-type@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz" + }, + "pbkdf2": { + "version": "3.0.12", + "from": "pbkdf2@>=3.0.3 <4.0.0", + "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.12.tgz" + }, + "pify": { + "version": "2.3.0", + "from": "pify@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz" + }, + "pinkie": { + "version": "2.0.4", + "from": "pinkie@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz" + }, + "pinkie-promise": { + "version": "2.0.1", + "from": "pinkie-promise@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz" + }, + "postcss": { + "version": "5.2.17", + "from": "postcss@>=5.0.6 <6.0.0", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", + "dependencies": { + "supports-color": { + "version": "3.2.3", + "from": "supports-color@>=3.2.3 <4.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz" + } + } + }, + "postcss-calc": { + "version": "5.3.1", + "from": "postcss-calc@>=5.2.0 <6.0.0", + "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-5.3.1.tgz" + }, + "postcss-colormin": { + "version": "2.2.2", + "from": "postcss-colormin@>=2.1.8 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-2.2.2.tgz" + }, + "postcss-convert-values": { + "version": "2.6.1", + "from": "postcss-convert-values@>=2.3.4 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-2.6.1.tgz" + }, + "postcss-discard-comments": { + "version": "2.0.4", + "from": "postcss-discard-comments@>=2.0.4 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz" + }, + "postcss-discard-duplicates": { + "version": "2.1.0", + "from": "postcss-discard-duplicates@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-2.1.0.tgz" + }, + "postcss-discard-empty": { + "version": "2.1.0", + "from": "postcss-discard-empty@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-2.1.0.tgz" + }, + "postcss-discard-overridden": { + "version": "0.1.1", + "from": "postcss-discard-overridden@>=0.1.1 <0.2.0", + "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz" + }, + "postcss-discard-unused": { + "version": "2.2.3", + "from": "postcss-discard-unused@>=2.2.1 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-discard-unused/-/postcss-discard-unused-2.2.3.tgz" + }, + "postcss-filter-plugins": { + "version": "2.0.2", + "from": "postcss-filter-plugins@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-filter-plugins/-/postcss-filter-plugins-2.0.2.tgz" + }, + "postcss-merge-idents": { + "version": "2.1.7", + "from": "postcss-merge-idents@>=2.1.5 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz" + }, + "postcss-merge-longhand": { + "version": "2.0.2", + "from": "postcss-merge-longhand@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-2.0.2.tgz" + }, + "postcss-merge-rules": { + "version": "2.1.2", + "from": "postcss-merge-rules@>=2.0.3 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-2.1.2.tgz" + }, + "postcss-message-helpers": { + "version": "2.0.0", + "from": "postcss-message-helpers@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz" + }, + "postcss-minify-font-values": { + "version": "1.0.5", + "from": "postcss-minify-font-values@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-1.0.5.tgz" + }, + "postcss-minify-gradients": { + "version": "1.0.5", + "from": "postcss-minify-gradients@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-1.0.5.tgz" + }, + "postcss-minify-params": { + "version": "1.2.2", + "from": "postcss-minify-params@>=1.0.4 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-1.2.2.tgz" + }, + "postcss-minify-selectors": { + "version": "2.1.1", + "from": "postcss-minify-selectors@>=2.0.4 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-2.1.1.tgz" + }, + "postcss-modules-extract-imports": { + "version": "1.1.0", + "from": "postcss-modules-extract-imports@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.1.0.tgz", + "dependencies": { + "has-flag": { + "version": "2.0.0", + "from": "has-flag@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz" + }, + "postcss": { + "version": "6.0.3", + "from": "postcss@>=6.0.1 <7.0.0", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.3.tgz" + }, + "supports-color": { + "version": "4.0.0", + "from": "supports-color@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.0.0.tgz" + } + } + }, + "postcss-modules-local-by-default": { + "version": "1.2.0", + "from": "postcss-modules-local-by-default@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz", + "dependencies": { + "has-flag": { + "version": "2.0.0", + "from": "has-flag@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz" + }, + "postcss": { + "version": "6.0.3", + "from": "postcss@>=6.0.1 <7.0.0", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.3.tgz" + }, + "supports-color": { + "version": "4.0.0", + "from": "supports-color@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.0.0.tgz" + } + } + }, + "postcss-modules-scope": { + "version": "1.1.0", + "from": "postcss-modules-scope@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz", + "dependencies": { + "has-flag": { + "version": "2.0.0", + "from": "has-flag@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz" + }, + "postcss": { + "version": "6.0.3", + "from": "postcss@>=6.0.1 <7.0.0", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.3.tgz" + }, + "supports-color": { + "version": "4.0.0", + "from": "supports-color@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.0.0.tgz" + } + } + }, + "postcss-modules-values": { + "version": "1.3.0", + "from": "postcss-modules-values@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz", + "dependencies": { + "has-flag": { + "version": "2.0.0", + "from": "has-flag@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz" + }, + "postcss": { + "version": "6.0.3", + "from": "postcss@>=6.0.1 <7.0.0", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.3.tgz" + }, + "supports-color": { + "version": "4.0.0", + "from": "supports-color@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.0.0.tgz" + } + } + }, + "postcss-normalize-charset": { + "version": "1.1.1", + "from": "postcss-normalize-charset@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz" + }, + "postcss-normalize-url": { + "version": "3.0.8", + "from": "postcss-normalize-url@>=3.0.7 <4.0.0", + "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-3.0.8.tgz" + }, + "postcss-ordered-values": { + "version": "2.2.3", + "from": "postcss-ordered-values@>=2.1.0 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-2.2.3.tgz" + }, + "postcss-reduce-idents": { + "version": "2.4.0", + "from": "postcss-reduce-idents@>=2.2.2 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz" + }, + "postcss-reduce-initial": { + "version": "1.0.1", + "from": "postcss-reduce-initial@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-1.0.1.tgz" + }, + "postcss-reduce-transforms": { + "version": "1.0.4", + "from": "postcss-reduce-transforms@>=1.0.3 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.4.tgz" + }, + "postcss-selector-parser": { + "version": "2.2.3", + "from": "postcss-selector-parser@>=2.2.2 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz" + }, + "postcss-svgo": { + "version": "2.1.6", + "from": "postcss-svgo@>=2.1.1 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-2.1.6.tgz" + }, + "postcss-unique-selectors": { + "version": "2.0.2", + "from": "postcss-unique-selectors@>=2.0.2 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-2.0.2.tgz" + }, + "postcss-value-parser": { + "version": "3.3.0", + "from": "postcss-value-parser@>=3.3.0 <4.0.0", + "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz" + }, + "postcss-zindex": { + "version": "2.2.0", + "from": "postcss-zindex@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-zindex/-/postcss-zindex-2.2.0.tgz" + }, + "prepend-http": { + "version": "1.0.4", + "from": "prepend-http@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz" + }, + "preserve": { + "version": "0.2.0", + "from": "preserve@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz" + }, + "process": { + "version": "0.5.2", + "from": "process@>=0.5.1 <0.6.0", + "resolved": "https://registry.npmjs.org/process/-/process-0.5.2.tgz" + }, + "process-nextick-args": { + "version": "1.0.7", + "from": "process-nextick-args@>=1.0.6 <1.1.0", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz" + }, + "promise": { + "version": "7.3.1", + "from": "promise@>=7.1.1 <8.0.0", + "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz" + }, + "prop-types": { + "version": "15.5.10", + "from": "prop-types@>=15.5.7 <16.0.0", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.5.10.tgz" + }, + "prr": { + "version": "0.0.0", + "from": "prr@>=0.0.0 <0.1.0", + "resolved": "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz" + }, + "public-encrypt": { + "version": "4.0.0", + "from": "public-encrypt@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz" + }, + "punycode": { + "version": "1.4.1", + "from": "punycode@>=1.2.4 <2.0.0", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz" + }, + "q": { + "version": "1.5.0", + "from": "q@>=1.1.2 <2.0.0", + "resolved": "https://registry.npmjs.org/q/-/q-1.5.0.tgz" + }, + "query-string": { + "version": "4.3.4", + "from": "query-string@>=4.1.0 <5.0.0", + "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz" + }, + "querystring": { + "version": "0.2.0", + "from": "querystring@0.2.0", + "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz" + }, + "querystring-es3": { + "version": "0.2.1", + "from": "querystring-es3@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz" + }, + "randomatic": { + "version": "1.1.7", + "from": "randomatic@>=1.1.3 <2.0.0", + "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz", + "dependencies": { + "is-number": { + "version": "3.0.0", + "from": "is-number@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "dependencies": { + "kind-of": { + "version": "3.2.2", + "from": "kind-of@^3.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz" + } + } + }, + "kind-of": { + "version": "4.0.0", + "from": "kind-of@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz" + } + } + }, + "randombytes": { + "version": "2.0.5", + "from": "randombytes@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.5.tgz" + }, + "range-parser": { + "version": "1.2.0", + "from": "range-parser@>=1.0.3 <2.0.0", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz" + }, + "react": { + "version": "15.5.4", + "from": "react@15.5.4", + "resolved": "https://registry.npmjs.org/react/-/react-15.5.4.tgz" + }, + "react-deep-force-update": { + "version": "2.0.1", + "from": "react-deep-force-update@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/react-deep-force-update/-/react-deep-force-update-2.0.1.tgz" + }, + "react-dom": { + "version": "15.5.4", + "from": "react-dom@15.5.4", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-15.5.4.tgz" + }, + "react-hot-loader": { + "version": "3.0.0-beta.7", + "from": "react-hot-loader@3.0.0-beta.7", + "resolved": "https://registry.npmjs.org/react-hot-loader/-/react-hot-loader-3.0.0-beta.7.tgz", + "dependencies": { + "source-map": { + "version": "0.4.4", + "from": "source-map@>=0.4.4 <0.5.0", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz" + } + } + }, + "react-proxy": { + "version": "3.0.0-alpha.1", + "from": "react-proxy@>=3.0.0-alpha.0 <4.0.0", + "resolved": "https://registry.npmjs.org/react-proxy/-/react-proxy-3.0.0-alpha.1.tgz" + }, + "react-redux": { + "version": "5.0.4", + "from": "react-redux@5.0.4", + "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-5.0.4.tgz" + }, + "react-router": { + "version": "4.1.1", + "from": "react-router@>=4.1.1 <5.0.0", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-4.1.1.tgz" + }, + "react-router-dom": { + "version": "4.1.1", + "from": "react-router-dom@4.1.1", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-4.1.1.tgz" + }, + "react-router-redux": { + "version": "5.0.0-alpha.6", + "from": "react-router-redux@5.0.0-alpha.6", + "resolved": "https://registry.npmjs.org/react-router-redux/-/react-router-redux-5.0.0-alpha.6.tgz" + }, + "read-pkg": { + "version": "1.1.0", + "from": "read-pkg@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz" + }, + "read-pkg-up": { + "version": "1.0.1", + "from": "read-pkg-up@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz" + }, + "readable-stream": { + "version": "2.3.2", + "from": "readable-stream@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.2.tgz" + }, + "readdirp": { + "version": "2.1.0", + "from": "readdirp@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz" + }, + "redbox-react": { + "version": "1.4.2", + "from": "redbox-react@>=1.3.6 <2.0.0", + "resolved": "https://registry.npmjs.org/redbox-react/-/redbox-react-1.4.2.tgz" + }, + "reduce-css-calc": { + "version": "1.3.0", + "from": "reduce-css-calc@>=1.2.6 <2.0.0", + "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz" + }, + "reduce-function-call": { + "version": "1.0.2", + "from": "reduce-function-call@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/reduce-function-call/-/reduce-function-call-1.0.2.tgz" + }, + "redux": { + "version": "3.6.0", + "from": "redux@3.6.0", + "resolved": "https://registry.npmjs.org/redux/-/redux-3.6.0.tgz" + }, + "redux-thunk": { + "version": "2.2.0", + "from": "redux-thunk@2.2.0", + "resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-2.2.0.tgz" + }, + "regenerate": { + "version": "1.3.2", + "from": "regenerate@>=1.2.1 <2.0.0", + "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.2.tgz" + }, + "regenerator-runtime": { + "version": "0.10.5", + "from": "regenerator-runtime@>=0.10.0 <0.11.0", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz" + }, + "regex-cache": { + "version": "0.4.3", + "from": "regex-cache@>=0.4.2 <0.5.0", + "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz" + }, + "regexpu-core": { + "version": "1.0.0", + "from": "regexpu-core@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz" + }, + "regjsgen": { + "version": "0.2.0", + "from": "regjsgen@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz" + }, + "regjsparser": { + "version": "0.1.5", + "from": "regjsparser@>=0.1.4 <0.2.0", + "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz" + }, + "remove-trailing-separator": { + "version": "1.0.2", + "from": "remove-trailing-separator@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.0.2.tgz" + }, + "repeat-element": { + "version": "1.1.2", + "from": "repeat-element@>=1.1.2 <2.0.0", + "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz" + }, + "repeat-string": { + "version": "1.6.1", + "from": "repeat-string@>=1.5.2 <2.0.0", + "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz" + }, + "require-directory": { + "version": "2.1.1", + "from": "require-directory@>=2.1.1 <3.0.0", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz" + }, + "require-from-string": { + "version": "1.2.1", + "from": "require-from-string@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-1.2.1.tgz" + }, + "require-main-filename": { + "version": "1.0.1", + "from": "require-main-filename@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz" + }, + "resolve-pathname": { + "version": "2.1.0", + "from": "resolve-pathname@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/resolve-pathname/-/resolve-pathname-2.1.0.tgz" + }, + "right-align": { + "version": "0.1.3", + "from": "right-align@>=0.1.1 <0.2.0", + "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz" + }, + "ripemd160": { + "version": "2.0.1", + "from": "ripemd160@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz" + }, + "safe-buffer": { + "version": "5.1.1", + "from": "safe-buffer@>=5.1.0 <5.2.0", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz" + }, + "sax": { + "version": "1.2.4", + "from": "sax@>=1.2.1 <1.3.0", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz" + }, + "semver": { + "version": "5.3.0", + "from": "semver@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0||>=4.0.0 <5.0.0||>=5.0.0 <6.0.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz" + }, + "set-blocking": { + "version": "2.0.0", + "from": "set-blocking@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz" + }, + "set-immediate-shim": { + "version": "1.0.1", + "from": "set-immediate-shim@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz" + }, + "setimmediate": { + "version": "1.0.5", + "from": "setimmediate@>=1.0.5 <2.0.0", + "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz" + }, + "sha.js": { + "version": "2.4.8", + "from": "sha.js@>=2.4.0 <3.0.0", + "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.8.tgz" + }, + "sort-keys": { + "version": "1.1.2", + "from": "sort-keys@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz" + }, + "source-list-map": { + "version": "0.1.8", + "from": "source-list-map@>=0.1.7 <0.2.0", + "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz" + }, + "source-map": { + "version": "0.5.6", + "from": "source-map@>=0.5.6 <0.6.0", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz" + }, + "source-map-support": { + "version": "0.4.15", + "from": "source-map-support@>=0.4.15 <0.5.0", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.15.tgz" + }, + "sourcemapped-stacktrace": { + "version": "1.1.6", + "from": "sourcemapped-stacktrace@>=1.1.6 <2.0.0", + "resolved": "https://registry.npmjs.org/sourcemapped-stacktrace/-/sourcemapped-stacktrace-1.1.6.tgz" + }, + "spdx-correct": { + "version": "1.0.2", + "from": "spdx-correct@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz" + }, + "spdx-expression-parse": { + "version": "1.0.4", + "from": "spdx-expression-parse@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz" + }, + "spdx-license-ids": { + "version": "1.2.2", + "from": "spdx-license-ids@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz" + }, + "sprintf-js": { + "version": "1.0.3", + "from": "sprintf-js@>=1.0.2 <1.1.0", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz" + }, + "stackframe": { + "version": "0.3.1", + "from": "stackframe@>=0.3.1 <0.4.0", + "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-0.3.1.tgz" + }, + "statuses": { + "version": "1.3.1", + "from": "statuses@>=1.3.1 <1.4.0", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz" + }, + "stream-browserify": { + "version": "2.0.1", + "from": "stream-browserify@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz" + }, + "stream-http": { + "version": "2.7.2", + "from": "stream-http@>=2.3.1 <3.0.0", + "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.7.2.tgz" + }, + "strict-uri-encode": { + "version": "1.1.0", + "from": "strict-uri-encode@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz" + }, + "string_decoder": { + "version": "1.0.3", + "from": "string_decoder@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz" + }, + "string-width": { + "version": "1.0.2", + "from": "string-width@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz" + }, + "strip-ansi": { + "version": "3.0.1", + "from": "strip-ansi@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz" + }, + "strip-bom": { + "version": "2.0.0", + "from": "strip-bom@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz" + }, + "style-loader": { + "version": "0.17.0", + "from": "style-loader@0.17.0", + "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.17.0.tgz" + }, + "supports-color": { + "version": "2.0.0", + "from": "supports-color@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz" + }, + "svgo": { + "version": "0.7.2", + "from": "svgo@>=0.7.0 <0.8.0", + "resolved": "https://registry.npmjs.org/svgo/-/svgo-0.7.2.tgz" + }, + "symbol-observable": { + "version": "1.0.4", + "from": "symbol-observable@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.4.tgz" + }, + "tapable": { + "version": "0.2.6", + "from": "tapable@>=0.2.5 <0.3.0", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.2.6.tgz" + }, + "timers-browserify": { + "version": "2.0.2", + "from": "timers-browserify@>=2.0.2 <3.0.0", + "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.2.tgz" + }, + "to-arraybuffer": { + "version": "1.0.1", + "from": "to-arraybuffer@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz" + }, + "to-fast-properties": { + "version": "1.0.3", + "from": "to-fast-properties@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz" + }, + "tty-browserify": { + "version": "0.0.0", + "from": "tty-browserify@0.0.0", + "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz" + }, + "typescript": { + "version": "2.3.2", + "from": "typescript@2.3.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.3.2.tgz" + }, + "ua-parser-js": { + "version": "0.7.13", + "from": "ua-parser-js@>=0.7.9 <0.8.0", + "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.13.tgz" + }, + "uglify-js": { + "version": "2.8.29", + "from": "uglify-js@>=2.8.5 <3.0.0", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz", + "dependencies": { + "yargs": { + "version": "3.10.0", + "from": "yargs@>=3.10.0 <3.11.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz" + } + } + }, + "uglify-to-browserify": { + "version": "1.0.2", + "from": "uglify-to-browserify@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz", + "optional": true + }, + "uniq": { + "version": "1.0.1", + "from": "uniq@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz" + }, + "uniqid": { + "version": "4.1.1", + "from": "uniqid@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/uniqid/-/uniqid-4.1.1.tgz" + }, + "uniqs": { + "version": "2.0.0", + "from": "uniqs@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz" + }, + "unpipe": { + "version": "1.0.0", + "from": "unpipe@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz" + }, + "url": { + "version": "0.11.0", + "from": "url@>=0.11.0 <0.12.0", + "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", + "dependencies": { + "punycode": { + "version": "1.3.2", + "from": "punycode@1.3.2", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz" + } + } + }, + "url-loader": { + "version": "0.5.8", + "from": "url-loader@0.5.8", + "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-0.5.8.tgz" + }, + "util": { + "version": "0.10.3", + "from": "util@>=0.10.3 <0.11.0", + "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", + "dependencies": { + "inherits": { + "version": "2.0.1", + "from": "inherits@2.0.1", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + } + } + }, + "util-deprecate": { + "version": "1.0.2", + "from": "util-deprecate@>=1.0.1 <1.1.0", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz" + }, + "utils-merge": { + "version": "1.0.0", + "from": "utils-merge@1.0.0", + "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz" + }, + "validate-npm-package-license": { + "version": "3.0.1", + "from": "validate-npm-package-license@>=3.0.1 <4.0.0", + "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz" + }, + "value-equal": { + "version": "0.2.1", + "from": "value-equal@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/value-equal/-/value-equal-0.2.1.tgz" + }, + "vendors": { + "version": "1.0.1", + "from": "vendors@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.1.tgz" + }, + "vm-browserify": { + "version": "0.0.4", + "from": "vm-browserify@0.0.4", + "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz" + }, + "warning": { + "version": "3.0.0", + "from": "warning@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz" + }, + "watchpack": { + "version": "1.3.1", + "from": "watchpack@>=1.3.1 <2.0.0", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.3.1.tgz" + }, + "webpack": { + "version": "2.5.1", + "from": "webpack@2.5.1", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-2.5.1.tgz", + "dependencies": { + "loader-utils": { + "version": "0.2.17", + "from": "loader-utils@>=0.2.16 <0.3.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz" + }, + "memory-fs": { + "version": "0.4.1", + "from": "memory-fs@>=0.4.1 <0.5.0", + "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz" + }, + "source-list-map": { + "version": "1.1.2", + "from": "source-list-map@>=1.1.1 <2.0.0", + "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-1.1.2.tgz" + }, + "supports-color": { + "version": "3.2.3", + "from": "supports-color@>=3.1.0 <4.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz" + }, + "webpack-sources": { + "version": "0.2.3", + "from": "webpack-sources@>=0.2.3 <0.3.0", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.2.3.tgz" + } + } + }, + "webpack-dev-middleware": { + "version": "1.11.0", + "from": "webpack-dev-middleware@>=1.8.4 <2.0.0", + "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-1.11.0.tgz", + "dependencies": { + "memory-fs": { + "version": "0.4.1", + "from": "memory-fs@>=0.4.1 <0.5.0", + "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz" + } + } + }, + "webpack-hot-middleware": { + "version": "2.18.0", + "from": "webpack-hot-middleware@2.18.0", + "resolved": "https://registry.npmjs.org/webpack-hot-middleware/-/webpack-hot-middleware-2.18.0.tgz" + }, + "webpack-merge": { + "version": "4.1.0", + "from": "webpack-merge@4.1.0", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.0.tgz" + }, + "webpack-node-externals": { + "version": "1.6.0", + "from": "webpack-node-externals@>=1.4.3 <2.0.0", + "resolved": "https://registry.npmjs.org/webpack-node-externals/-/webpack-node-externals-1.6.0.tgz" + }, + "webpack-sources": { + "version": "0.1.5", + "from": "webpack-sources@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.1.5.tgz" + }, + "whatwg-fetch": { + "version": "2.0.3", + "from": "whatwg-fetch@>=0.10.0", + "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz" + }, + "whet.extend": { + "version": "0.9.9", + "from": "whet.extend@>=0.9.9 <0.10.0", + "resolved": "https://registry.npmjs.org/whet.extend/-/whet.extend-0.9.9.tgz" + }, + "which-module": { + "version": "1.0.0", + "from": "which-module@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz" + }, + "window-size": { + "version": "0.1.0", + "from": "window-size@0.1.0", + "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz" + }, + "wordwrap": { + "version": "0.0.2", + "from": "wordwrap@0.0.2", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz" + }, + "wrap-ansi": { + "version": "2.1.0", + "from": "wrap-ansi@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz" + }, + "xtend": { + "version": "4.0.1", + "from": "xtend@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz" + }, + "y18n": { + "version": "3.2.1", + "from": "y18n@>=3.2.1 <4.0.0", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz" + }, + "yargs": { + "version": "6.6.0", + "from": "yargs@>=6.0.0 <7.0.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz", + "dependencies": { + "camelcase": { + "version": "3.0.0", + "from": "camelcase@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz" + }, + "cliui": { + "version": "3.2.0", + "from": "cliui@>=3.2.0 <4.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz" + } + } + }, + "yargs-parser": { + "version": "4.2.1", + "from": "yargs-parser@>=4.2.0 <5.0.0", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz", + "dependencies": { + "camelcase": { + "version": "3.0.0", + "from": "camelcase@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz" + } + } + } + } +} diff --git a/templates/ReactSpa/npm-shrinkwrap.json b/templates/ReactSpa/npm-shrinkwrap.json new file mode 100644 index 00000000..7ccf4bf8 --- /dev/null +++ b/templates/ReactSpa/npm-shrinkwrap.json @@ -0,0 +1,2587 @@ +{ + "name": "WebApplicationBasic", + "version": "0.0.0", + "dependencies": { + "@types/history": { + "version": "4.5.1", + "from": "@types/history@4.5.1", + "resolved": "https://registry.npmjs.org/@types/history/-/history-4.5.1.tgz", + "dev": true + }, + "@types/react": { + "version": "15.0.24", + "from": "@types/react@15.0.24", + "resolved": "https://registry.npmjs.org/@types/react/-/react-15.0.24.tgz", + "dev": true + }, + "@types/react-dom": { + "version": "15.5.0", + "from": "@types/react-dom@15.5.0", + "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-15.5.0.tgz", + "dev": true + }, + "@types/react-router": { + "version": "4.0.9", + "from": "@types/react-router@4.0.9", + "resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-4.0.9.tgz", + "dev": true + }, + "@types/webpack-env": { + "version": "1.13.0", + "from": "@types/webpack-env@1.13.0", + "resolved": "https://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.13.0.tgz", + "dev": true + }, + "acorn": { + "version": "5.0.3", + "from": "acorn@>=5.0.0 <6.0.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.0.3.tgz", + "dev": true + }, + "acorn-dynamic-import": { + "version": "2.0.2", + "from": "acorn-dynamic-import@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz", + "dev": true, + "dependencies": { + "acorn": { + "version": "4.0.13", + "from": "acorn@>=4.0.3 <5.0.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz", + "dev": true + } + } + }, + "ajv": { + "version": "4.11.8", + "from": "ajv@>=4.11.2 <5.0.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz", + "dev": true + }, + "ajv-keywords": { + "version": "1.5.1", + "from": "ajv-keywords@>=1.1.1 <2.0.0", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.1.tgz", + "dev": true + }, + "align-text": { + "version": "0.1.4", + "from": "align-text@>=0.1.3 <0.2.0", + "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", + "dev": true + }, + "alphanum-sort": { + "version": "1.0.2", + "from": "alphanum-sort@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz", + "dev": true + }, + "amdefine": { + "version": "1.0.1", + "from": "amdefine@>=0.0.4", + "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", + "dev": true + }, + "ansi-html": { + "version": "0.0.7", + "from": "ansi-html@0.0.7", + "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz", + "dev": true + }, + "ansi-regex": { + "version": "2.1.1", + "from": "ansi-regex@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "dev": true + }, + "ansi-styles": { + "version": "2.2.1", + "from": "ansi-styles@>=2.2.1 <3.0.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", + "dev": true + }, + "anymatch": { + "version": "1.3.0", + "from": "anymatch@>=1.3.0 <2.0.0", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.0.tgz", + "dev": true + }, + "argparse": { + "version": "1.0.9", + "from": "argparse@>=1.0.7 <2.0.0", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz", + "dev": true + }, + "arr-diff": { + "version": "2.0.0", + "from": "arr-diff@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz", + "dev": true + }, + "arr-flatten": { + "version": "1.0.3", + "from": "arr-flatten@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.3.tgz", + "dev": true + }, + "array-unique": { + "version": "0.2.1", + "from": "array-unique@>=0.2.1 <0.3.0", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz", + "dev": true + }, + "arrify": { + "version": "1.0.1", + "from": "arrify@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", + "dev": true + }, + "asap": { + "version": "2.0.5", + "from": "asap@>=2.0.3 <2.1.0", + "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.5.tgz", + "dev": true + }, + "asn1.js": { + "version": "4.9.1", + "from": "asn1.js@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.1.tgz", + "dev": true + }, + "aspnet-webpack": { + "version": "1.0.29", + "from": "aspnet-webpack@>=1.0.29 <2.0.0", + "resolved": "https://registry.npmjs.org/aspnet-webpack/-/aspnet-webpack-1.0.29.tgz", + "dev": true + }, + "aspnet-webpack-react": { + "version": "3.0.0-beta.1", + "from": "aspnet-webpack-react@>=3.0.0-beta <4.0.0", + "resolved": "https://registry.npmjs.org/aspnet-webpack-react/-/aspnet-webpack-react-3.0.0-beta.1.tgz", + "dev": true + }, + "assert": { + "version": "1.4.1", + "from": "assert@>=1.1.1 <2.0.0", + "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz", + "dev": true + }, + "async": { + "version": "2.5.0", + "from": "async@>=2.1.2 <3.0.0", + "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz", + "dev": true + }, + "async-each": { + "version": "1.0.1", + "from": "async-each@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz", + "dev": true + }, + "autoprefixer": { + "version": "6.7.7", + "from": "autoprefixer@>=6.3.1 <7.0.0", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.7.7.tgz", + "dev": true + }, + "awesome-typescript-loader": { + "version": "3.1.3", + "from": "awesome-typescript-loader@3.1.3", + "resolved": "https://registry.npmjs.org/awesome-typescript-loader/-/awesome-typescript-loader-3.1.3.tgz", + "dev": true + }, + "babel-code-frame": { + "version": "6.22.0", + "from": "babel-code-frame@>=6.11.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz", + "dev": true + }, + "babel-messages": { + "version": "6.23.0", + "from": "babel-messages@>=6.23.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz", + "dev": true + }, + "babel-runtime": { + "version": "6.23.0", + "from": "babel-runtime@>=6.22.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz", + "dev": true, + "dependencies": { + "core-js": { + "version": "2.4.1", + "from": "core-js@>=2.4.0 <3.0.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz", + "dev": true + } + } + }, + "babel-template": { + "version": "6.25.0", + "from": "babel-template@>=6.7.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.25.0.tgz", + "dev": true + }, + "babel-traverse": { + "version": "6.25.0", + "from": "babel-traverse@>=6.25.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.25.0.tgz", + "dev": true + }, + "babel-types": { + "version": "6.25.0", + "from": "babel-types@>=6.25.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.25.0.tgz", + "dev": true + }, + "babylon": { + "version": "6.17.4", + "from": "babylon@>=6.17.2 <7.0.0", + "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.17.4.tgz", + "dev": true + }, + "balanced-match": { + "version": "0.4.2", + "from": "balanced-match@>=0.4.2 <0.5.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz", + "dev": true + }, + "base64-js": { + "version": "1.2.1", + "from": "base64-js@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.1.tgz", + "dev": true + }, + "big.js": { + "version": "3.1.3", + "from": "big.js@>=3.1.3 <4.0.0", + "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.1.3.tgz", + "dev": true + }, + "binary-extensions": { + "version": "1.8.0", + "from": "binary-extensions@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.8.0.tgz", + "dev": true + }, + "bn.js": { + "version": "4.11.7", + "from": "bn.js@>=4.1.1 <5.0.0", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.7.tgz", + "dev": true + }, + "bootstrap": { + "version": "3.3.7", + "from": "bootstrap@3.3.7", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.3.7.tgz", + "dev": true + }, + "brace-expansion": { + "version": "1.1.8", + "from": "brace-expansion@>=1.1.7 <2.0.0", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", + "dev": true, + "dependencies": { + "balanced-match": { + "version": "1.0.0", + "from": "balanced-match@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "dev": true + } + } + }, + "braces": { + "version": "1.8.5", + "from": "braces@>=1.8.2 <2.0.0", + "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz", + "dev": true + }, + "brorand": { + "version": "1.1.0", + "from": "brorand@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", + "dev": true + }, + "browserify-aes": { + "version": "1.0.6", + "from": "browserify-aes@>=1.0.4 <2.0.0", + "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.6.tgz", + "dev": true + }, + "browserify-cipher": { + "version": "1.0.0", + "from": "browserify-cipher@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz", + "dev": true + }, + "browserify-des": { + "version": "1.0.0", + "from": "browserify-des@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz", + "dev": true + }, + "browserify-rsa": { + "version": "4.0.1", + "from": "browserify-rsa@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", + "dev": true + }, + "browserify-sign": { + "version": "4.0.4", + "from": "browserify-sign@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz", + "dev": true + }, + "browserify-zlib": { + "version": "0.1.4", + "from": "browserify-zlib@>=0.1.4 <0.2.0", + "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz", + "dev": true + }, + "browserslist": { + "version": "1.7.7", + "from": "browserslist@>=1.7.6 <2.0.0", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz", + "dev": true + }, + "buffer": { + "version": "4.9.1", + "from": "buffer@>=4.3.0 <5.0.0", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz", + "dev": true + }, + "buffer-xor": { + "version": "1.0.3", + "from": "buffer-xor@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz", + "dev": true + }, + "builtin-modules": { + "version": "1.1.1", + "from": "builtin-modules@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", + "dev": true + }, + "builtin-status-codes": { + "version": "3.0.0", + "from": "builtin-status-codes@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz", + "dev": true + }, + "camelcase": { + "version": "1.2.1", + "from": "camelcase@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", + "dev": true + }, + "caniuse-api": { + "version": "1.6.1", + "from": "caniuse-api@>=1.5.2 <2.0.0", + "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-1.6.1.tgz", + "dev": true + }, + "caniuse-db": { + "version": "1.0.30000694", + "from": "caniuse-db@>=1.0.30000634 <2.0.0", + "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000694.tgz", + "dev": true + }, + "center-align": { + "version": "0.1.3", + "from": "center-align@>=0.1.1 <0.2.0", + "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz", + "dev": true + }, + "chalk": { + "version": "1.1.3", + "from": "chalk@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "dev": true + }, + "chokidar": { + "version": "1.7.0", + "from": "chokidar@>=1.4.3 <2.0.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz", + "dev": true + }, + "cipher-base": { + "version": "1.0.3", + "from": "cipher-base@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.3.tgz", + "dev": true + }, + "clap": { + "version": "1.2.0", + "from": "clap@>=1.0.9 <2.0.0", + "resolved": "https://registry.npmjs.org/clap/-/clap-1.2.0.tgz", + "dev": true + }, + "cliui": { + "version": "2.1.0", + "from": "cliui@>=2.1.0 <3.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", + "dev": true + }, + "clone": { + "version": "1.0.2", + "from": "clone@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz", + "dev": true + }, + "co": { + "version": "4.6.0", + "from": "co@>=4.6.0 <5.0.0", + "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", + "dev": true + }, + "coa": { + "version": "1.0.3", + "from": "coa@>=1.0.1 <1.1.0", + "resolved": "https://registry.npmjs.org/coa/-/coa-1.0.3.tgz", + "dev": true + }, + "code-point-at": { + "version": "1.1.0", + "from": "code-point-at@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", + "dev": true + }, + "color": { + "version": "0.11.4", + "from": "color@>=0.11.0 <0.12.0", + "resolved": "https://registry.npmjs.org/color/-/color-0.11.4.tgz", + "dev": true + }, + "color-convert": { + "version": "1.9.0", + "from": "color-convert@>=1.3.0 <2.0.0", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz", + "dev": true + }, + "color-name": { + "version": "1.1.2", + "from": "color-name@>=1.1.1 <2.0.0", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.2.tgz", + "dev": true + }, + "color-string": { + "version": "0.3.0", + "from": "color-string@>=0.3.0 <0.4.0", + "resolved": "https://registry.npmjs.org/color-string/-/color-string-0.3.0.tgz", + "dev": true + }, + "colormin": { + "version": "1.1.2", + "from": "colormin@>=1.0.5 <2.0.0", + "resolved": "https://registry.npmjs.org/colormin/-/colormin-1.1.2.tgz", + "dev": true + }, + "colors": { + "version": "1.1.2", + "from": "colors@>=1.1.2 <2.0.0", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz", + "dev": true + }, + "concat-map": { + "version": "0.0.1", + "from": "concat-map@0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "dev": true + }, + "connect": { + "version": "3.6.2", + "from": "connect@>=3.4.1 <4.0.0", + "resolved": "https://registry.npmjs.org/connect/-/connect-3.6.2.tgz", + "dev": true + }, + "console-browserify": { + "version": "1.1.0", + "from": "console-browserify@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz", + "dev": true + }, + "constants-browserify": { + "version": "1.0.0", + "from": "constants-browserify@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz", + "dev": true + }, + "core-js": { + "version": "1.2.7", + "from": "core-js@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz", + "dev": true + }, + "core-util-is": { + "version": "1.0.2", + "from": "core-util-is@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "dev": true + }, + "create-ecdh": { + "version": "4.0.0", + "from": "create-ecdh@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz", + "dev": true + }, + "create-hash": { + "version": "1.1.3", + "from": "create-hash@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz", + "dev": true + }, + "create-hmac": { + "version": "1.1.6", + "from": "create-hmac@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.6.tgz", + "dev": true + }, + "crypto-browserify": { + "version": "3.11.0", + "from": "crypto-browserify@>=3.11.0 <4.0.0", + "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.0.tgz", + "dev": true + }, + "css-color-names": { + "version": "0.0.4", + "from": "css-color-names@0.0.4", + "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz", + "dev": true + }, + "css-loader": { + "version": "0.28.1", + "from": "css-loader@0.28.1", + "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.28.1.tgz", + "dev": true + }, + "css-selector-tokenizer": { + "version": "0.7.0", + "from": "css-selector-tokenizer@>=0.7.0 <0.8.0", + "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz", + "dev": true + }, + "cssesc": { + "version": "0.1.0", + "from": "cssesc@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-0.1.0.tgz", + "dev": true + }, + "cssnano": { + "version": "3.10.0", + "from": "cssnano@>=2.6.1 <4.0.0", + "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-3.10.0.tgz", + "dev": true + }, + "csso": { + "version": "2.3.2", + "from": "csso@>=2.3.1 <2.4.0", + "resolved": "https://registry.npmjs.org/csso/-/csso-2.3.2.tgz", + "dev": true + }, + "date-now": { + "version": "0.1.4", + "from": "date-now@>=0.1.4 <0.2.0", + "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz", + "dev": true + }, + "debug": { + "version": "2.6.7", + "from": "debug@2.6.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz", + "dev": true + }, + "decamelize": { + "version": "1.2.0", + "from": "decamelize@>=1.1.2 <2.0.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", + "dev": true + }, + "defined": { + "version": "1.0.0", + "from": "defined@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz", + "dev": true + }, + "des.js": { + "version": "1.0.0", + "from": "des.js@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz", + "dev": true + }, + "diffie-hellman": { + "version": "5.0.2", + "from": "diffie-hellman@>=5.0.0 <6.0.0", + "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.2.tgz", + "dev": true + }, + "dom-walk": { + "version": "0.1.1", + "from": "dom-walk@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.1.tgz", + "dev": true + }, + "domain-browser": { + "version": "1.1.7", + "from": "domain-browser@>=1.1.1 <2.0.0", + "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.7.tgz", + "dev": true + }, + "ee-first": { + "version": "1.1.1", + "from": "ee-first@1.1.1", + "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", + "dev": true + }, + "electron-to-chromium": { + "version": "1.3.14", + "from": "electron-to-chromium@>=1.2.7 <2.0.0", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.14.tgz", + "dev": true + }, + "elliptic": { + "version": "6.4.0", + "from": "elliptic@>=6.0.0 <7.0.0", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz", + "dev": true + }, + "emojis-list": { + "version": "2.1.0", + "from": "emojis-list@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz", + "dev": true + }, + "encodeurl": { + "version": "1.0.1", + "from": "encodeurl@>=1.0.1 <1.1.0", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.1.tgz", + "dev": true + }, + "encoding": { + "version": "0.1.12", + "from": "encoding@>=0.1.11 <0.2.0", + "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz", + "dev": true + }, + "enhanced-resolve": { + "version": "3.1.0", + "from": "enhanced-resolve@>=3.1.0 <4.0.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.1.0.tgz", + "dev": true, + "dependencies": { + "memory-fs": { + "version": "0.4.1", + "from": "memory-fs@>=0.4.0 <0.5.0", + "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz", + "dev": true + } + } + }, + "errno": { + "version": "0.1.4", + "from": "errno@>=0.1.3 <0.2.0", + "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.4.tgz", + "dev": true + }, + "error-ex": { + "version": "1.3.1", + "from": "error-ex@>=1.2.0 <2.0.0", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz", + "dev": true + }, + "error-stack-parser": { + "version": "1.3.6", + "from": "error-stack-parser@>=1.3.6 <2.0.0", + "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-1.3.6.tgz", + "dev": true + }, + "es6-promise": { + "version": "3.3.1", + "from": "es6-promise@>=3.1.2 <4.0.0", + "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz", + "dev": true + }, + "escape-html": { + "version": "1.0.3", + "from": "escape-html@>=1.0.3 <1.1.0", + "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", + "dev": true + }, + "escape-string-regexp": { + "version": "1.0.5", + "from": "escape-string-regexp@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "dev": true + }, + "esprima": { + "version": "2.7.3", + "from": "esprima@>=2.6.0 <3.0.0", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", + "dev": true + }, + "esutils": { + "version": "2.0.2", + "from": "esutils@>=2.0.2 <3.0.0", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", + "dev": true + }, + "event-source-polyfill": { + "version": "0.0.9", + "from": "event-source-polyfill@0.0.9", + "resolved": "https://registry.npmjs.org/event-source-polyfill/-/event-source-polyfill-0.0.9.tgz", + "dev": true + }, + "events": { + "version": "1.1.1", + "from": "events@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz", + "dev": true + }, + "evp_bytestokey": { + "version": "1.0.0", + "from": "evp_bytestokey@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz", + "dev": true + }, + "expand-brackets": { + "version": "0.1.5", + "from": "expand-brackets@>=0.1.4 <0.2.0", + "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz", + "dev": true + }, + "expand-range": { + "version": "1.8.2", + "from": "expand-range@>=1.8.1 <2.0.0", + "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz", + "dev": true + }, + "extglob": { + "version": "0.3.2", + "from": "extglob@>=0.3.1 <0.4.0", + "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz", + "dev": true + }, + "extract-text-webpack-plugin": { + "version": "2.1.0", + "from": "extract-text-webpack-plugin@2.1.0", + "resolved": "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-2.1.0.tgz", + "dev": true + }, + "fastparse": { + "version": "1.1.1", + "from": "fastparse@>=1.1.1 <2.0.0", + "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.1.tgz", + "dev": true + }, + "fbjs": { + "version": "0.8.12", + "from": "fbjs@>=0.8.9 <0.9.0", + "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.12.tgz", + "dev": true + }, + "file-loader": { + "version": "0.11.1", + "from": "file-loader@0.11.1", + "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-0.11.1.tgz", + "dev": true + }, + "filename-regex": { + "version": "2.0.1", + "from": "filename-regex@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz", + "dev": true + }, + "fill-range": { + "version": "2.2.3", + "from": "fill-range@>=2.1.0 <3.0.0", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz", + "dev": true + }, + "finalhandler": { + "version": "1.0.3", + "from": "finalhandler@1.0.3", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.3.tgz", + "dev": true + }, + "find-up": { + "version": "1.1.2", + "from": "find-up@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", + "dev": true + }, + "flatten": { + "version": "1.0.2", + "from": "flatten@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz", + "dev": true + }, + "for-in": { + "version": "1.0.2", + "from": "for-in@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", + "dev": true + }, + "for-own": { + "version": "0.1.5", + "from": "for-own@>=0.1.4 <0.2.0", + "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz", + "dev": true + }, + "function-bind": { + "version": "1.1.0", + "from": "function-bind@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.0.tgz", + "dev": true + }, + "get-caller-file": { + "version": "1.0.2", + "from": "get-caller-file@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz", + "dev": true + }, + "glob-base": { + "version": "0.3.0", + "from": "glob-base@>=0.3.0 <0.4.0", + "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz", + "dev": true + }, + "glob-parent": { + "version": "2.0.0", + "from": "glob-parent@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz", + "dev": true + }, + "global": { + "version": "4.3.2", + "from": "global@>=4.3.0 <5.0.0", + "resolved": "https://registry.npmjs.org/global/-/global-4.3.2.tgz", + "dev": true + }, + "globals": { + "version": "9.18.0", + "from": "globals@>=9.0.0 <10.0.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz", + "dev": true + }, + "graceful-fs": { + "version": "4.1.11", + "from": "graceful-fs@>=4.1.2 <5.0.0", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", + "dev": true + }, + "has": { + "version": "1.0.1", + "from": "has@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz", + "dev": true + }, + "has-ansi": { + "version": "2.0.0", + "from": "has-ansi@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", + "dev": true + }, + "has-flag": { + "version": "1.0.0", + "from": "has-flag@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "dev": true + }, + "hash-base": { + "version": "2.0.2", + "from": "hash-base@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz", + "dev": true + }, + "hash.js": { + "version": "1.1.1", + "from": "hash.js@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.1.tgz", + "dev": true + }, + "history": { + "version": "4.6.3", + "from": "history@>=4.5.1 <5.0.0", + "resolved": "https://registry.npmjs.org/history/-/history-4.6.3.tgz", + "dev": true + }, + "hmac-drbg": { + "version": "1.0.1", + "from": "hmac-drbg@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", + "dev": true + }, + "hoist-non-react-statics": { + "version": "1.2.0", + "from": "hoist-non-react-statics@>=1.2.0 <2.0.0", + "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz", + "dev": true + }, + "hosted-git-info": { + "version": "2.4.2", + "from": "hosted-git-info@>=2.1.4 <3.0.0", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.4.2.tgz", + "dev": true + }, + "html-comment-regex": { + "version": "1.1.1", + "from": "html-comment-regex@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.1.tgz", + "dev": true + }, + "html-entities": { + "version": "1.2.1", + "from": "html-entities@>=1.2.0 <2.0.0", + "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz", + "dev": true + }, + "https-browserify": { + "version": "0.0.1", + "from": "https-browserify@0.0.1", + "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz", + "dev": true + }, + "iconv-lite": { + "version": "0.4.18", + "from": "iconv-lite@>=0.4.13 <0.5.0", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.18.tgz", + "dev": true + }, + "icss-replace-symbols": { + "version": "1.1.0", + "from": "icss-replace-symbols@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz", + "dev": true + }, + "ieee754": { + "version": "1.1.8", + "from": "ieee754@>=1.1.4 <2.0.0", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz", + "dev": true + }, + "indexes-of": { + "version": "1.0.1", + "from": "indexes-of@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz", + "dev": true + }, + "indexof": { + "version": "0.0.1", + "from": "indexof@0.0.1", + "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz", + "dev": true + }, + "inherits": { + "version": "2.0.3", + "from": "inherits@>=2.0.3 <2.1.0", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "dev": true + }, + "interpret": { + "version": "1.0.3", + "from": "interpret@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.3.tgz", + "dev": true + }, + "invariant": { + "version": "2.2.2", + "from": "invariant@>=2.2.0 <3.0.0", + "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz", + "dev": true + }, + "invert-kv": { + "version": "1.0.0", + "from": "invert-kv@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", + "dev": true + }, + "is-absolute-url": { + "version": "2.1.0", + "from": "is-absolute-url@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz", + "dev": true + }, + "is-arrayish": { + "version": "0.2.1", + "from": "is-arrayish@>=0.2.1 <0.3.0", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "dev": true + }, + "is-binary-path": { + "version": "1.0.1", + "from": "is-binary-path@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", + "dev": true + }, + "is-buffer": { + "version": "1.1.5", + "from": "is-buffer@>=1.1.5 <2.0.0", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz", + "dev": true + }, + "is-builtin-module": { + "version": "1.0.0", + "from": "is-builtin-module@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", + "dev": true + }, + "is-dotfile": { + "version": "1.0.3", + "from": "is-dotfile@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz", + "dev": true + }, + "is-equal-shallow": { + "version": "0.1.3", + "from": "is-equal-shallow@>=0.1.3 <0.2.0", + "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz", + "dev": true + }, + "is-extendable": { + "version": "0.1.1", + "from": "is-extendable@>=0.1.1 <0.2.0", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", + "dev": true + }, + "is-extglob": { + "version": "1.0.0", + "from": "is-extglob@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "from": "is-fullwidth-code-point@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "dev": true + }, + "is-glob": { + "version": "2.0.1", + "from": "is-glob@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", + "dev": true + }, + "is-number": { + "version": "2.1.0", + "from": "is-number@>=2.1.0 <3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz", + "dev": true + }, + "is-plain-obj": { + "version": "1.1.0", + "from": "is-plain-obj@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", + "dev": true + }, + "is-posix-bracket": { + "version": "0.1.1", + "from": "is-posix-bracket@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz", + "dev": true + }, + "is-primitive": { + "version": "2.0.0", + "from": "is-primitive@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz", + "dev": true + }, + "is-stream": { + "version": "1.1.0", + "from": "is-stream@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", + "dev": true + }, + "is-svg": { + "version": "2.1.0", + "from": "is-svg@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-2.1.0.tgz", + "dev": true + }, + "is-utf8": { + "version": "0.2.1", + "from": "is-utf8@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", + "dev": true + }, + "isarray": { + "version": "1.0.0", + "from": "isarray@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "dev": true + }, + "isobject": { + "version": "2.1.0", + "from": "isobject@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", + "dev": true + }, + "isomorphic-fetch": { + "version": "2.2.1", + "from": "isomorphic-fetch@2.2.1", + "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz", + "dev": true + }, + "jquery": { + "version": "3.2.1", + "from": "jquery@3.2.1", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.2.1.tgz", + "dev": true + }, + "js-base64": { + "version": "2.1.9", + "from": "js-base64@>=2.1.9 <3.0.0", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.1.9.tgz", + "dev": true + }, + "js-tokens": { + "version": "3.0.1", + "from": "js-tokens@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.1.tgz", + "dev": true + }, + "js-yaml": { + "version": "3.7.0", + "from": "js-yaml@>=3.7.0 <3.8.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz", + "dev": true + }, + "jsesc": { + "version": "0.5.0", + "from": "jsesc@>=0.5.0 <0.6.0", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", + "dev": true + }, + "json-loader": { + "version": "0.5.4", + "from": "json-loader@0.5.4", + "resolved": "https://registry.npmjs.org/json-loader/-/json-loader-0.5.4.tgz", + "dev": true + }, + "json-stable-stringify": { + "version": "1.0.1", + "from": "json-stable-stringify@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz", + "dev": true + }, + "json5": { + "version": "0.5.1", + "from": "json5@>=0.5.0 <0.6.0", + "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz", + "dev": true + }, + "jsonify": { + "version": "0.0.0", + "from": "jsonify@>=0.0.0 <0.1.0", + "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz", + "dev": true + }, + "kind-of": { + "version": "3.2.2", + "from": "kind-of@>=3.0.2 <4.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "dev": true + }, + "lazy-cache": { + "version": "1.0.4", + "from": "lazy-cache@>=1.0.3 <2.0.0", + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", + "dev": true + }, + "lcid": { + "version": "1.0.0", + "from": "lcid@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", + "dev": true + }, + "load-json-file": { + "version": "1.1.0", + "from": "load-json-file@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", + "dev": true + }, + "loader-runner": { + "version": "2.3.0", + "from": "loader-runner@>=2.3.0 <3.0.0", + "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.0.tgz", + "dev": true + }, + "loader-utils": { + "version": "1.1.0", + "from": "loader-utils@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz", + "dev": true + }, + "lodash": { + "version": "4.17.4", + "from": "lodash@>=4.17.4 <5.0.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", + "dev": true + }, + "lodash.camelcase": { + "version": "4.3.0", + "from": "lodash.camelcase@>=4.3.0 <5.0.0", + "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", + "dev": true + }, + "lodash.memoize": { + "version": "4.1.2", + "from": "lodash.memoize@>=4.1.2 <5.0.0", + "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", + "dev": true + }, + "lodash.uniq": { + "version": "4.5.0", + "from": "lodash.uniq@>=4.5.0 <5.0.0", + "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", + "dev": true + }, + "longest": { + "version": "1.0.1", + "from": "longest@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", + "dev": true + }, + "loose-envify": { + "version": "1.3.1", + "from": "loose-envify@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz", + "dev": true + }, + "macaddress": { + "version": "0.2.8", + "from": "macaddress@>=0.2.8 <0.3.0", + "resolved": "https://registry.npmjs.org/macaddress/-/macaddress-0.2.8.tgz", + "dev": true + }, + "math-expression-evaluator": { + "version": "1.2.17", + "from": "math-expression-evaluator@>=1.2.14 <2.0.0", + "resolved": "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz", + "dev": true + }, + "memory-fs": { + "version": "0.3.0", + "from": "memory-fs@>=0.3.0 <0.4.0", + "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.3.0.tgz", + "dev": true + }, + "micromatch": { + "version": "2.3.11", + "from": "micromatch@>=2.1.5 <3.0.0", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", + "dev": true + }, + "miller-rabin": { + "version": "4.0.0", + "from": "miller-rabin@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.0.tgz", + "dev": true + }, + "mime": { + "version": "1.3.6", + "from": "mime@>=1.3.4 <2.0.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.6.tgz", + "dev": true + }, + "min-document": { + "version": "2.19.0", + "from": "min-document@>=2.19.0 <3.0.0", + "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz", + "dev": true + }, + "minimalistic-assert": { + "version": "1.0.0", + "from": "minimalistic-assert@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz", + "dev": true + }, + "minimalistic-crypto-utils": { + "version": "1.0.1", + "from": "minimalistic-crypto-utils@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz", + "dev": true + }, + "minimatch": { + "version": "3.0.4", + "from": "minimatch@>=3.0.2 <4.0.0", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "dev": true + }, + "minimist": { + "version": "0.0.8", + "from": "minimist@0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "dev": true + }, + "mkdirp": { + "version": "0.5.1", + "from": "mkdirp@>=0.5.1 <0.6.0", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "dev": true + }, + "ms": { + "version": "2.0.0", + "from": "ms@2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "dev": true + }, + "node-fetch": { + "version": "1.7.1", + "from": "node-fetch@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.1.tgz", + "dev": true + }, + "node-libs-browser": { + "version": "2.0.0", + "from": "node-libs-browser@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.0.0.tgz", + "dev": true, + "dependencies": { + "process": { + "version": "0.11.10", + "from": "process@>=0.11.0 <0.12.0", + "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", + "dev": true + }, + "string_decoder": { + "version": "0.10.31", + "from": "string_decoder@>=0.10.25 <0.11.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "dev": true + } + } + }, + "normalize-package-data": { + "version": "2.3.8", + "from": "normalize-package-data@>=2.3.2 <3.0.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.8.tgz", + "dev": true + }, + "normalize-path": { + "version": "2.1.1", + "from": "normalize-path@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", + "dev": true + }, + "normalize-range": { + "version": "0.1.2", + "from": "normalize-range@>=0.1.2 <0.2.0", + "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz", + "dev": true + }, + "normalize-url": { + "version": "1.9.1", + "from": "normalize-url@>=1.4.0 <2.0.0", + "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz", + "dev": true + }, + "num2fraction": { + "version": "1.2.2", + "from": "num2fraction@>=1.2.2 <2.0.0", + "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz", + "dev": true + }, + "number-is-nan": { + "version": "1.0.1", + "from": "number-is-nan@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", + "dev": true + }, + "object-assign": { + "version": "4.1.1", + "from": "object-assign@>=4.1.1 <5.0.0", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "dev": true + }, + "object.omit": { + "version": "2.0.1", + "from": "object.omit@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz", + "dev": true + }, + "on-finished": { + "version": "2.3.0", + "from": "on-finished@>=2.3.0 <2.4.0", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", + "dev": true + }, + "os-browserify": { + "version": "0.2.1", + "from": "os-browserify@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.2.1.tgz", + "dev": true + }, + "os-locale": { + "version": "1.4.0", + "from": "os-locale@>=1.4.0 <2.0.0", + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", + "dev": true + }, + "pako": { + "version": "0.2.9", + "from": "pako@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz", + "dev": true + }, + "parse-asn1": { + "version": "5.1.0", + "from": "parse-asn1@>=5.0.0 <6.0.0", + "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz", + "dev": true + }, + "parse-glob": { + "version": "3.0.4", + "from": "parse-glob@>=3.0.4 <4.0.0", + "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz", + "dev": true + }, + "parse-json": { + "version": "2.2.0", + "from": "parse-json@>=2.2.0 <3.0.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", + "dev": true + }, + "parseurl": { + "version": "1.3.1", + "from": "parseurl@>=1.3.1 <1.4.0", + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz", + "dev": true + }, + "path-browserify": { + "version": "0.0.0", + "from": "path-browserify@0.0.0", + "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz", + "dev": true + }, + "path-exists": { + "version": "2.1.0", + "from": "path-exists@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", + "dev": true + }, + "path-is-absolute": { + "version": "1.0.1", + "from": "path-is-absolute@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "dev": true + }, + "path-to-regexp": { + "version": "1.7.0", + "from": "path-to-regexp@>=1.5.3 <2.0.0", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz", + "dev": true, + "dependencies": { + "isarray": { + "version": "0.0.1", + "from": "isarray@0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "dev": true + } + } + }, + "path-type": { + "version": "1.1.0", + "from": "path-type@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", + "dev": true + }, + "pbkdf2": { + "version": "3.0.12", + "from": "pbkdf2@>=3.0.3 <4.0.0", + "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.12.tgz", + "dev": true + }, + "pify": { + "version": "2.3.0", + "from": "pify@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "dev": true + }, + "pinkie": { + "version": "2.0.4", + "from": "pinkie@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", + "dev": true + }, + "pinkie-promise": { + "version": "2.0.1", + "from": "pinkie-promise@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", + "dev": true + }, + "postcss": { + "version": "5.2.17", + "from": "postcss@>=5.0.6 <6.0.0", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", + "dev": true, + "dependencies": { + "supports-color": { + "version": "3.2.3", + "from": "supports-color@>=3.2.3 <4.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "dev": true + } + } + }, + "postcss-calc": { + "version": "5.3.1", + "from": "postcss-calc@>=5.2.0 <6.0.0", + "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-5.3.1.tgz", + "dev": true + }, + "postcss-colormin": { + "version": "2.2.2", + "from": "postcss-colormin@>=2.1.8 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-2.2.2.tgz", + "dev": true + }, + "postcss-convert-values": { + "version": "2.6.1", + "from": "postcss-convert-values@>=2.3.4 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-2.6.1.tgz", + "dev": true + }, + "postcss-discard-comments": { + "version": "2.0.4", + "from": "postcss-discard-comments@>=2.0.4 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz", + "dev": true + }, + "postcss-discard-duplicates": { + "version": "2.1.0", + "from": "postcss-discard-duplicates@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-2.1.0.tgz", + "dev": true + }, + "postcss-discard-empty": { + "version": "2.1.0", + "from": "postcss-discard-empty@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-2.1.0.tgz", + "dev": true + }, + "postcss-discard-overridden": { + "version": "0.1.1", + "from": "postcss-discard-overridden@>=0.1.1 <0.2.0", + "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz", + "dev": true + }, + "postcss-discard-unused": { + "version": "2.2.3", + "from": "postcss-discard-unused@>=2.2.1 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-discard-unused/-/postcss-discard-unused-2.2.3.tgz", + "dev": true + }, + "postcss-filter-plugins": { + "version": "2.0.2", + "from": "postcss-filter-plugins@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-filter-plugins/-/postcss-filter-plugins-2.0.2.tgz", + "dev": true + }, + "postcss-merge-idents": { + "version": "2.1.7", + "from": "postcss-merge-idents@>=2.1.5 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz", + "dev": true + }, + "postcss-merge-longhand": { + "version": "2.0.2", + "from": "postcss-merge-longhand@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-2.0.2.tgz", + "dev": true + }, + "postcss-merge-rules": { + "version": "2.1.2", + "from": "postcss-merge-rules@>=2.0.3 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-2.1.2.tgz", + "dev": true + }, + "postcss-message-helpers": { + "version": "2.0.0", + "from": "postcss-message-helpers@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz", + "dev": true + }, + "postcss-minify-font-values": { + "version": "1.0.5", + "from": "postcss-minify-font-values@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-1.0.5.tgz", + "dev": true + }, + "postcss-minify-gradients": { + "version": "1.0.5", + "from": "postcss-minify-gradients@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-1.0.5.tgz", + "dev": true + }, + "postcss-minify-params": { + "version": "1.2.2", + "from": "postcss-minify-params@>=1.0.4 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-1.2.2.tgz", + "dev": true + }, + "postcss-minify-selectors": { + "version": "2.1.1", + "from": "postcss-minify-selectors@>=2.0.4 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-2.1.1.tgz", + "dev": true + }, + "postcss-modules-extract-imports": { + "version": "1.1.0", + "from": "postcss-modules-extract-imports@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.1.0.tgz", + "dev": true, + "dependencies": { + "has-flag": { + "version": "2.0.0", + "from": "has-flag@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", + "dev": true + }, + "postcss": { + "version": "6.0.3", + "from": "postcss@>=6.0.1 <7.0.0", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.3.tgz", + "dev": true + }, + "supports-color": { + "version": "4.0.0", + "from": "supports-color@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.0.0.tgz", + "dev": true + } + } + }, + "postcss-modules-local-by-default": { + "version": "1.2.0", + "from": "postcss-modules-local-by-default@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz", + "dev": true, + "dependencies": { + "has-flag": { + "version": "2.0.0", + "from": "has-flag@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", + "dev": true + }, + "postcss": { + "version": "6.0.3", + "from": "postcss@>=6.0.1 <7.0.0", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.3.tgz", + "dev": true + }, + "supports-color": { + "version": "4.0.0", + "from": "supports-color@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.0.0.tgz", + "dev": true + } + } + }, + "postcss-modules-scope": { + "version": "1.1.0", + "from": "postcss-modules-scope@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz", + "dev": true, + "dependencies": { + "has-flag": { + "version": "2.0.0", + "from": "has-flag@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", + "dev": true + }, + "postcss": { + "version": "6.0.3", + "from": "postcss@>=6.0.1 <7.0.0", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.3.tgz", + "dev": true + }, + "supports-color": { + "version": "4.0.0", + "from": "supports-color@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.0.0.tgz", + "dev": true + } + } + }, + "postcss-modules-values": { + "version": "1.3.0", + "from": "postcss-modules-values@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz", + "dev": true, + "dependencies": { + "has-flag": { + "version": "2.0.0", + "from": "has-flag@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", + "dev": true + }, + "postcss": { + "version": "6.0.3", + "from": "postcss@>=6.0.1 <7.0.0", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.3.tgz", + "dev": true + }, + "supports-color": { + "version": "4.0.0", + "from": "supports-color@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.0.0.tgz", + "dev": true + } + } + }, + "postcss-normalize-charset": { + "version": "1.1.1", + "from": "postcss-normalize-charset@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz", + "dev": true + }, + "postcss-normalize-url": { + "version": "3.0.8", + "from": "postcss-normalize-url@>=3.0.7 <4.0.0", + "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-3.0.8.tgz", + "dev": true + }, + "postcss-ordered-values": { + "version": "2.2.3", + "from": "postcss-ordered-values@>=2.1.0 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-2.2.3.tgz", + "dev": true + }, + "postcss-reduce-idents": { + "version": "2.4.0", + "from": "postcss-reduce-idents@>=2.2.2 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz", + "dev": true + }, + "postcss-reduce-initial": { + "version": "1.0.1", + "from": "postcss-reduce-initial@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-1.0.1.tgz", + "dev": true + }, + "postcss-reduce-transforms": { + "version": "1.0.4", + "from": "postcss-reduce-transforms@>=1.0.3 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.4.tgz", + "dev": true + }, + "postcss-selector-parser": { + "version": "2.2.3", + "from": "postcss-selector-parser@>=2.2.2 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz", + "dev": true + }, + "postcss-svgo": { + "version": "2.1.6", + "from": "postcss-svgo@>=2.1.1 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-2.1.6.tgz", + "dev": true + }, + "postcss-unique-selectors": { + "version": "2.0.2", + "from": "postcss-unique-selectors@>=2.0.2 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-2.0.2.tgz", + "dev": true + }, + "postcss-value-parser": { + "version": "3.3.0", + "from": "postcss-value-parser@>=3.3.0 <4.0.0", + "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz", + "dev": true + }, + "postcss-zindex": { + "version": "2.2.0", + "from": "postcss-zindex@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-zindex/-/postcss-zindex-2.2.0.tgz", + "dev": true + }, + "prepend-http": { + "version": "1.0.4", + "from": "prepend-http@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz", + "dev": true + }, + "preserve": { + "version": "0.2.0", + "from": "preserve@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz", + "dev": true + }, + "process": { + "version": "0.5.2", + "from": "process@>=0.5.1 <0.6.0", + "resolved": "https://registry.npmjs.org/process/-/process-0.5.2.tgz", + "dev": true + }, + "process-nextick-args": { + "version": "1.0.7", + "from": "process-nextick-args@>=1.0.6 <1.1.0", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", + "dev": true + }, + "promise": { + "version": "7.3.1", + "from": "promise@>=7.1.1 <8.0.0", + "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz", + "dev": true + }, + "prop-types": { + "version": "15.5.10", + "from": "prop-types@>=15.5.7 <16.0.0", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.5.10.tgz", + "dev": true + }, + "prr": { + "version": "0.0.0", + "from": "prr@>=0.0.0 <0.1.0", + "resolved": "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz", + "dev": true + }, + "public-encrypt": { + "version": "4.0.0", + "from": "public-encrypt@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz", + "dev": true + }, + "punycode": { + "version": "1.4.1", + "from": "punycode@>=1.2.4 <2.0.0", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", + "dev": true + }, + "q": { + "version": "1.5.0", + "from": "q@>=1.1.2 <2.0.0", + "resolved": "https://registry.npmjs.org/q/-/q-1.5.0.tgz", + "dev": true + }, + "query-string": { + "version": "4.3.4", + "from": "query-string@>=4.1.0 <5.0.0", + "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz", + "dev": true + }, + "querystring": { + "version": "0.2.0", + "from": "querystring@0.2.0", + "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", + "dev": true + }, + "querystring-es3": { + "version": "0.2.1", + "from": "querystring-es3@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz", + "dev": true + }, + "randomatic": { + "version": "1.1.7", + "from": "randomatic@>=1.1.3 <2.0.0", + "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz", + "dev": true, + "dependencies": { + "is-number": { + "version": "3.0.0", + "from": "is-number@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "dev": true, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "from": "kind-of@^3.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "dev": true + } + } + }, + "kind-of": { + "version": "4.0.0", + "from": "kind-of@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", + "dev": true + } + } + }, + "randombytes": { + "version": "2.0.5", + "from": "randombytes@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.5.tgz", + "dev": true + }, + "range-parser": { + "version": "1.2.0", + "from": "range-parser@>=1.0.3 <2.0.0", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz", + "dev": true + }, + "react": { + "version": "15.5.4", + "from": "react@15.5.4", + "resolved": "https://registry.npmjs.org/react/-/react-15.5.4.tgz", + "dev": true + }, + "react-deep-force-update": { + "version": "2.0.1", + "from": "react-deep-force-update@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/react-deep-force-update/-/react-deep-force-update-2.0.1.tgz", + "dev": true + }, + "react-dom": { + "version": "15.5.4", + "from": "react-dom@15.5.4", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-15.5.4.tgz", + "dev": true + }, + "react-hot-loader": { + "version": "3.0.0-beta.7", + "from": "react-hot-loader@3.0.0-beta.7", + "resolved": "https://registry.npmjs.org/react-hot-loader/-/react-hot-loader-3.0.0-beta.7.tgz", + "dev": true, + "dependencies": { + "source-map": { + "version": "0.4.4", + "from": "source-map@>=0.4.4 <0.5.0", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", + "dev": true + } + } + }, + "react-proxy": { + "version": "3.0.0-alpha.1", + "from": "react-proxy@>=3.0.0-alpha.0 <4.0.0", + "resolved": "https://registry.npmjs.org/react-proxy/-/react-proxy-3.0.0-alpha.1.tgz", + "dev": true + }, + "react-router": { + "version": "4.1.1", + "from": "react-router@>=4.1.1 <5.0.0", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-4.1.1.tgz", + "dev": true + }, + "react-router-dom": { + "version": "4.1.1", + "from": "react-router-dom@4.1.1", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-4.1.1.tgz", + "dev": true + }, + "read-pkg": { + "version": "1.1.0", + "from": "read-pkg@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", + "dev": true + }, + "read-pkg-up": { + "version": "1.0.1", + "from": "read-pkg-up@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", + "dev": true + }, + "readable-stream": { + "version": "2.3.2", + "from": "readable-stream@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.2.tgz", + "dev": true + }, + "readdirp": { + "version": "2.1.0", + "from": "readdirp@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz", + "dev": true + }, + "redbox-react": { + "version": "1.4.2", + "from": "redbox-react@>=1.3.6 <2.0.0", + "resolved": "https://registry.npmjs.org/redbox-react/-/redbox-react-1.4.2.tgz", + "dev": true + }, + "reduce-css-calc": { + "version": "1.3.0", + "from": "reduce-css-calc@>=1.2.6 <2.0.0", + "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz", + "dev": true + }, + "reduce-function-call": { + "version": "1.0.2", + "from": "reduce-function-call@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/reduce-function-call/-/reduce-function-call-1.0.2.tgz", + "dev": true + }, + "regenerate": { + "version": "1.3.2", + "from": "regenerate@>=1.2.1 <2.0.0", + "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.2.tgz", + "dev": true + }, + "regenerator-runtime": { + "version": "0.10.5", + "from": "regenerator-runtime@>=0.10.0 <0.11.0", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz", + "dev": true + }, + "regex-cache": { + "version": "0.4.3", + "from": "regex-cache@>=0.4.2 <0.5.0", + "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz", + "dev": true + }, + "regexpu-core": { + "version": "1.0.0", + "from": "regexpu-core@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz", + "dev": true + }, + "regjsgen": { + "version": "0.2.0", + "from": "regjsgen@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz", + "dev": true + }, + "regjsparser": { + "version": "0.1.5", + "from": "regjsparser@>=0.1.4 <0.2.0", + "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz", + "dev": true + }, + "remove-trailing-separator": { + "version": "1.0.2", + "from": "remove-trailing-separator@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.0.2.tgz", + "dev": true + }, + "repeat-element": { + "version": "1.1.2", + "from": "repeat-element@>=1.1.2 <2.0.0", + "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz", + "dev": true + }, + "repeat-string": { + "version": "1.6.1", + "from": "repeat-string@>=1.5.2 <2.0.0", + "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", + "dev": true + }, + "require-directory": { + "version": "2.1.1", + "from": "require-directory@>=2.1.1 <3.0.0", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "dev": true + }, + "require-from-string": { + "version": "1.2.1", + "from": "require-from-string@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-1.2.1.tgz", + "dev": true + }, + "require-main-filename": { + "version": "1.0.1", + "from": "require-main-filename@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", + "dev": true + }, + "resolve-pathname": { + "version": "2.1.0", + "from": "resolve-pathname@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/resolve-pathname/-/resolve-pathname-2.1.0.tgz", + "dev": true + }, + "right-align": { + "version": "0.1.3", + "from": "right-align@>=0.1.1 <0.2.0", + "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz", + "dev": true + }, + "ripemd160": { + "version": "2.0.1", + "from": "ripemd160@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz", + "dev": true + }, + "safe-buffer": { + "version": "5.1.1", + "from": "safe-buffer@>=5.1.0 <5.2.0", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", + "dev": true + }, + "sax": { + "version": "1.2.4", + "from": "sax@>=1.2.1 <1.3.0", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", + "dev": true + }, + "semver": { + "version": "5.3.0", + "from": "semver@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0||>=4.0.0 <5.0.0||>=5.0.0 <6.0.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", + "dev": true + }, + "set-blocking": { + "version": "2.0.0", + "from": "set-blocking@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "dev": true + }, + "set-immediate-shim": { + "version": "1.0.1", + "from": "set-immediate-shim@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz", + "dev": true + }, + "setimmediate": { + "version": "1.0.5", + "from": "setimmediate@>=1.0.5 <2.0.0", + "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", + "dev": true + }, + "sha.js": { + "version": "2.4.8", + "from": "sha.js@>=2.4.0 <3.0.0", + "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.8.tgz", + "dev": true + }, + "sort-keys": { + "version": "1.1.2", + "from": "sort-keys@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz", + "dev": true + }, + "source-list-map": { + "version": "0.1.8", + "from": "source-list-map@>=0.1.7 <0.2.0", + "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz", + "dev": true + }, + "source-map": { + "version": "0.5.6", + "from": "source-map@>=0.5.6 <0.6.0", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz", + "dev": true + }, + "source-map-support": { + "version": "0.4.15", + "from": "source-map-support@>=0.4.15 <0.5.0", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.15.tgz", + "dev": true + }, + "sourcemapped-stacktrace": { + "version": "1.1.6", + "from": "sourcemapped-stacktrace@>=1.1.6 <2.0.0", + "resolved": "https://registry.npmjs.org/sourcemapped-stacktrace/-/sourcemapped-stacktrace-1.1.6.tgz", + "dev": true + }, + "spdx-correct": { + "version": "1.0.2", + "from": "spdx-correct@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz", + "dev": true + }, + "spdx-expression-parse": { + "version": "1.0.4", + "from": "spdx-expression-parse@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz", + "dev": true + }, + "spdx-license-ids": { + "version": "1.2.2", + "from": "spdx-license-ids@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz", + "dev": true + }, + "sprintf-js": { + "version": "1.0.3", + "from": "sprintf-js@>=1.0.2 <1.1.0", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "dev": true + }, + "stackframe": { + "version": "0.3.1", + "from": "stackframe@>=0.3.1 <0.4.0", + "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-0.3.1.tgz", + "dev": true + }, + "statuses": { + "version": "1.3.1", + "from": "statuses@>=1.3.1 <1.4.0", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz", + "dev": true + }, + "stream-browserify": { + "version": "2.0.1", + "from": "stream-browserify@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz", + "dev": true + }, + "stream-http": { + "version": "2.7.2", + "from": "stream-http@>=2.3.1 <3.0.0", + "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.7.2.tgz", + "dev": true + }, + "strict-uri-encode": { + "version": "1.1.0", + "from": "strict-uri-encode@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz", + "dev": true + }, + "string_decoder": { + "version": "1.0.3", + "from": "string_decoder@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "dev": true + }, + "string-width": { + "version": "1.0.2", + "from": "string-width@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "dev": true + }, + "strip-ansi": { + "version": "3.0.1", + "from": "strip-ansi@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "dev": true + }, + "strip-bom": { + "version": "2.0.0", + "from": "strip-bom@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", + "dev": true + }, + "style-loader": { + "version": "0.17.0", + "from": "style-loader@0.17.0", + "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.17.0.tgz", + "dev": true + }, + "supports-color": { + "version": "2.0.0", + "from": "supports-color@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "dev": true + }, + "svgo": { + "version": "0.7.2", + "from": "svgo@>=0.7.0 <0.8.0", + "resolved": "https://registry.npmjs.org/svgo/-/svgo-0.7.2.tgz", + "dev": true + }, + "tapable": { + "version": "0.2.6", + "from": "tapable@>=0.2.5 <0.3.0", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.2.6.tgz", + "dev": true + }, + "timers-browserify": { + "version": "2.0.2", + "from": "timers-browserify@>=2.0.2 <3.0.0", + "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.2.tgz", + "dev": true + }, + "to-arraybuffer": { + "version": "1.0.1", + "from": "to-arraybuffer@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz", + "dev": true + }, + "to-fast-properties": { + "version": "1.0.3", + "from": "to-fast-properties@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz", + "dev": true + }, + "tty-browserify": { + "version": "0.0.0", + "from": "tty-browserify@0.0.0", + "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz", + "dev": true + }, + "typescript": { + "version": "2.3.2", + "from": "typescript@2.3.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.3.2.tgz", + "dev": true + }, + "ua-parser-js": { + "version": "0.7.13", + "from": "ua-parser-js@>=0.7.9 <0.8.0", + "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.13.tgz", + "dev": true + }, + "uglify-js": { + "version": "2.8.29", + "from": "uglify-js@>=2.8.5 <3.0.0", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz", + "dev": true, + "dependencies": { + "yargs": { + "version": "3.10.0", + "from": "yargs@>=3.10.0 <3.11.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", + "dev": true + } + } + }, + "uglify-to-browserify": { + "version": "1.0.2", + "from": "uglify-to-browserify@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz", + "dev": true, + "optional": true + }, + "uniq": { + "version": "1.0.1", + "from": "uniq@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz", + "dev": true + }, + "uniqid": { + "version": "4.1.1", + "from": "uniqid@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/uniqid/-/uniqid-4.1.1.tgz", + "dev": true + }, + "uniqs": { + "version": "2.0.0", + "from": "uniqs@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz", + "dev": true + }, + "unpipe": { + "version": "1.0.0", + "from": "unpipe@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", + "dev": true + }, + "url": { + "version": "0.11.0", + "from": "url@>=0.11.0 <0.12.0", + "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", + "dev": true, + "dependencies": { + "punycode": { + "version": "1.3.2", + "from": "punycode@1.3.2", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", + "dev": true + } + } + }, + "url-loader": { + "version": "0.5.8", + "from": "url-loader@0.5.8", + "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-0.5.8.tgz", + "dev": true + }, + "util": { + "version": "0.10.3", + "from": "util@>=0.10.3 <0.11.0", + "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", + "dev": true, + "dependencies": { + "inherits": { + "version": "2.0.1", + "from": "inherits@2.0.1", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", + "dev": true + } + } + }, + "util-deprecate": { + "version": "1.0.2", + "from": "util-deprecate@>=1.0.1 <1.1.0", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "dev": true + }, + "utils-merge": { + "version": "1.0.0", + "from": "utils-merge@1.0.0", + "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz", + "dev": true + }, + "validate-npm-package-license": { + "version": "3.0.1", + "from": "validate-npm-package-license@>=3.0.1 <4.0.0", + "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz", + "dev": true + }, + "value-equal": { + "version": "0.2.1", + "from": "value-equal@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/value-equal/-/value-equal-0.2.1.tgz", + "dev": true + }, + "vendors": { + "version": "1.0.1", + "from": "vendors@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.1.tgz", + "dev": true + }, + "vm-browserify": { + "version": "0.0.4", + "from": "vm-browserify@0.0.4", + "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz", + "dev": true + }, + "warning": { + "version": "3.0.0", + "from": "warning@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz", + "dev": true + }, + "watchpack": { + "version": "1.3.1", + "from": "watchpack@>=1.3.1 <2.0.0", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.3.1.tgz", + "dev": true + }, + "webpack": { + "version": "2.5.1", + "from": "webpack@2.5.1", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-2.5.1.tgz", + "dev": true, + "dependencies": { + "loader-utils": { + "version": "0.2.17", + "from": "loader-utils@>=0.2.16 <0.3.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz", + "dev": true + }, + "memory-fs": { + "version": "0.4.1", + "from": "memory-fs@>=0.4.1 <0.5.0", + "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz", + "dev": true + }, + "source-list-map": { + "version": "1.1.2", + "from": "source-list-map@>=1.1.1 <2.0.0", + "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-1.1.2.tgz", + "dev": true + }, + "supports-color": { + "version": "3.2.3", + "from": "supports-color@>=3.1.0 <4.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "dev": true + }, + "webpack-sources": { + "version": "0.2.3", + "from": "webpack-sources@>=0.2.3 <0.3.0", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.2.3.tgz", + "dev": true + } + } + }, + "webpack-dev-middleware": { + "version": "1.11.0", + "from": "webpack-dev-middleware@>=1.8.4 <2.0.0", + "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-1.11.0.tgz", + "dev": true, + "dependencies": { + "memory-fs": { + "version": "0.4.1", + "from": "memory-fs@>=0.4.1 <0.5.0", + "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz", + "dev": true + } + } + }, + "webpack-hot-middleware": { + "version": "2.18.0", + "from": "webpack-hot-middleware@2.18.0", + "resolved": "https://registry.npmjs.org/webpack-hot-middleware/-/webpack-hot-middleware-2.18.0.tgz", + "dev": true + }, + "webpack-node-externals": { + "version": "1.6.0", + "from": "webpack-node-externals@>=1.4.3 <2.0.0", + "resolved": "https://registry.npmjs.org/webpack-node-externals/-/webpack-node-externals-1.6.0.tgz", + "dev": true + }, + "webpack-sources": { + "version": "0.1.5", + "from": "webpack-sources@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.1.5.tgz", + "dev": true + }, + "whatwg-fetch": { + "version": "2.0.3", + "from": "whatwg-fetch@>=0.10.0", + "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz", + "dev": true + }, + "whet.extend": { + "version": "0.9.9", + "from": "whet.extend@>=0.9.9 <0.10.0", + "resolved": "https://registry.npmjs.org/whet.extend/-/whet.extend-0.9.9.tgz", + "dev": true + }, + "which-module": { + "version": "1.0.0", + "from": "which-module@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz", + "dev": true + }, + "window-size": { + "version": "0.1.0", + "from": "window-size@0.1.0", + "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz", + "dev": true + }, + "wordwrap": { + "version": "0.0.2", + "from": "wordwrap@0.0.2", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz", + "dev": true + }, + "wrap-ansi": { + "version": "2.1.0", + "from": "wrap-ansi@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", + "dev": true + }, + "xtend": { + "version": "4.0.1", + "from": "xtend@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", + "dev": true + }, + "y18n": { + "version": "3.2.1", + "from": "y18n@>=3.2.1 <4.0.0", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", + "dev": true + }, + "yargs": { + "version": "6.6.0", + "from": "yargs@>=6.0.0 <7.0.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz", + "dev": true, + "dependencies": { + "camelcase": { + "version": "3.0.0", + "from": "camelcase@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", + "dev": true + }, + "cliui": { + "version": "3.2.0", + "from": "cliui@>=3.2.0 <4.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", + "dev": true + } + } + }, + "yargs-parser": { + "version": "4.2.1", + "from": "yargs-parser@>=4.2.0 <5.0.0", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz", + "dev": true, + "dependencies": { + "camelcase": { + "version": "3.0.0", + "from": "camelcase@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", + "dev": true + } + } + } + } +} diff --git a/templates/VueSpa/npm-shrinkwrap.json b/templates/VueSpa/npm-shrinkwrap.json new file mode 100644 index 00000000..55b74518 --- /dev/null +++ b/templates/VueSpa/npm-shrinkwrap.json @@ -0,0 +1,2603 @@ +{ + "name": "WebApplicationBasic", + "version": "0.0.0", + "dependencies": { + "@types/requirejs": { + "version": "2.1.29", + "from": "@types/requirejs@>=2.1.28 <3.0.0", + "resolved": "https://registry.npmjs.org/@types/requirejs/-/requirejs-2.1.29.tgz", + "dev": true + }, + "abbrev": { + "version": "1.1.0", + "from": "abbrev@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz", + "dev": true + }, + "acorn": { + "version": "5.0.3", + "from": "acorn@>=5.0.0 <6.0.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.0.3.tgz", + "dev": true + }, + "acorn-dynamic-import": { + "version": "2.0.2", + "from": "acorn-dynamic-import@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz", + "dev": true, + "dependencies": { + "acorn": { + "version": "4.0.13", + "from": "acorn@>=4.0.3 <5.0.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz", + "dev": true + } + } + }, + "ajv": { + "version": "5.2.0", + "from": "ajv@>=5.0.0 <6.0.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.0.tgz", + "dev": true + }, + "ajv-keywords": { + "version": "1.5.1", + "from": "ajv-keywords@>=1.1.1 <2.0.0", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.1.tgz", + "dev": true + }, + "align-text": { + "version": "0.1.4", + "from": "align-text@>=0.1.3 <0.2.0", + "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", + "dev": true + }, + "alphanum-sort": { + "version": "1.0.2", + "from": "alphanum-sort@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz", + "dev": true + }, + "ansi-html": { + "version": "0.0.7", + "from": "ansi-html@0.0.7", + "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz", + "dev": true + }, + "ansi-regex": { + "version": "2.1.1", + "from": "ansi-regex@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "dev": true + }, + "ansi-styles": { + "version": "2.2.1", + "from": "ansi-styles@>=2.2.1 <3.0.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", + "dev": true + }, + "anymatch": { + "version": "1.3.0", + "from": "anymatch@>=1.3.0 <2.0.0", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.0.tgz", + "dev": true + }, + "argparse": { + "version": "1.0.9", + "from": "argparse@>=1.0.7 <2.0.0", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz", + "dev": true + }, + "arr-diff": { + "version": "2.0.0", + "from": "arr-diff@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz", + "dev": true + }, + "arr-flatten": { + "version": "1.0.3", + "from": "arr-flatten@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.3.tgz", + "dev": true + }, + "array-unique": { + "version": "0.2.1", + "from": "array-unique@>=0.2.1 <0.3.0", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz", + "dev": true + }, + "arrify": { + "version": "1.0.1", + "from": "arrify@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", + "dev": true + }, + "asn1.js": { + "version": "4.9.1", + "from": "asn1.js@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.1.tgz", + "dev": true + }, + "aspnet-webpack": { + "version": "1.0.29", + "from": "aspnet-webpack@>=1.0.27 <2.0.0", + "resolved": "https://registry.npmjs.org/aspnet-webpack/-/aspnet-webpack-1.0.29.tgz", + "dev": true + }, + "assert": { + "version": "1.4.1", + "from": "assert@>=1.1.1 <2.0.0", + "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz", + "dev": true + }, + "async": { + "version": "2.5.0", + "from": "async@>=2.1.2 <3.0.0", + "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz", + "dev": true + }, + "async-each": { + "version": "1.0.1", + "from": "async-each@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz", + "dev": true + }, + "autoprefixer": { + "version": "6.7.7", + "from": "autoprefixer@>=6.3.1 <7.0.0", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.7.7.tgz", + "dev": true + }, + "awesome-typescript-loader": { + "version": "3.1.3", + "from": "awesome-typescript-loader@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/awesome-typescript-loader/-/awesome-typescript-loader-3.1.3.tgz", + "dev": true + }, + "babel-code-frame": { + "version": "6.22.0", + "from": "babel-code-frame@>=6.11.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz", + "dev": true + }, + "balanced-match": { + "version": "0.4.2", + "from": "balanced-match@>=0.4.2 <0.5.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz", + "dev": true + }, + "base64-js": { + "version": "1.2.1", + "from": "base64-js@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.1.tgz", + "dev": true + }, + "big.js": { + "version": "3.1.3", + "from": "big.js@>=3.1.3 <4.0.0", + "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.1.3.tgz", + "dev": true + }, + "binary-extensions": { + "version": "1.8.0", + "from": "binary-extensions@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.8.0.tgz", + "dev": true + }, + "bluebird": { + "version": "3.5.0", + "from": "bluebird@>=3.1.1 <4.0.0", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz", + "dev": true + }, + "bn.js": { + "version": "4.11.7", + "from": "bn.js@>=4.1.1 <5.0.0", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.7.tgz", + "dev": true + }, + "bootstrap": { + "version": "3.3.7", + "from": "bootstrap@>=3.3.6 <4.0.0", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.3.7.tgz", + "dev": true + }, + "brace-expansion": { + "version": "1.1.8", + "from": "brace-expansion@>=1.1.7 <2.0.0", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", + "dev": true, + "dependencies": { + "balanced-match": { + "version": "1.0.0", + "from": "balanced-match@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "dev": true + } + } + }, + "braces": { + "version": "1.8.5", + "from": "braces@>=1.8.2 <2.0.0", + "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz", + "dev": true + }, + "brorand": { + "version": "1.1.0", + "from": "brorand@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", + "dev": true + }, + "browserify-aes": { + "version": "1.0.6", + "from": "browserify-aes@>=1.0.4 <2.0.0", + "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.6.tgz", + "dev": true + }, + "browserify-cipher": { + "version": "1.0.0", + "from": "browserify-cipher@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz", + "dev": true + }, + "browserify-des": { + "version": "1.0.0", + "from": "browserify-des@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz", + "dev": true + }, + "browserify-rsa": { + "version": "4.0.1", + "from": "browserify-rsa@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", + "dev": true + }, + "browserify-sign": { + "version": "4.0.4", + "from": "browserify-sign@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz", + "dev": true + }, + "browserify-zlib": { + "version": "0.1.4", + "from": "browserify-zlib@>=0.1.4 <0.2.0", + "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz", + "dev": true + }, + "browserslist": { + "version": "1.7.7", + "from": "browserslist@>=1.7.6 <2.0.0", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz", + "dev": true + }, + "buffer": { + "version": "4.9.1", + "from": "buffer@>=4.3.0 <5.0.0", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz", + "dev": true + }, + "buffer-xor": { + "version": "1.0.3", + "from": "buffer-xor@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz", + "dev": true + }, + "builtin-modules": { + "version": "1.1.1", + "from": "builtin-modules@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", + "dev": true + }, + "builtin-status-codes": { + "version": "3.0.0", + "from": "builtin-status-codes@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz", + "dev": true + }, + "camelcase": { + "version": "1.2.1", + "from": "camelcase@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", + "dev": true + }, + "caniuse-api": { + "version": "1.6.1", + "from": "caniuse-api@>=1.5.2 <2.0.0", + "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-1.6.1.tgz", + "dev": true + }, + "caniuse-db": { + "version": "1.0.30000694", + "from": "caniuse-db@>=1.0.30000634 <2.0.0", + "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000694.tgz", + "dev": true + }, + "center-align": { + "version": "0.1.3", + "from": "center-align@>=0.1.1 <0.2.0", + "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz", + "dev": true + }, + "chalk": { + "version": "1.1.3", + "from": "chalk@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "dev": true + }, + "chokidar": { + "version": "1.7.0", + "from": "chokidar@>=1.4.3 <2.0.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz", + "dev": true + }, + "cipher-base": { + "version": "1.0.3", + "from": "cipher-base@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.3.tgz", + "dev": true + }, + "clap": { + "version": "1.2.0", + "from": "clap@>=1.0.9 <2.0.0", + "resolved": "https://registry.npmjs.org/clap/-/clap-1.2.0.tgz", + "dev": true + }, + "cliui": { + "version": "2.1.0", + "from": "cliui@>=2.1.0 <3.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", + "dev": true + }, + "clone": { + "version": "1.0.2", + "from": "clone@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz", + "dev": true + }, + "co": { + "version": "4.6.0", + "from": "co@>=4.6.0 <5.0.0", + "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", + "dev": true + }, + "coa": { + "version": "1.0.3", + "from": "coa@>=1.0.1 <1.1.0", + "resolved": "https://registry.npmjs.org/coa/-/coa-1.0.3.tgz", + "dev": true + }, + "code-point-at": { + "version": "1.1.0", + "from": "code-point-at@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", + "dev": true + }, + "color": { + "version": "0.11.4", + "from": "color@>=0.11.0 <0.12.0", + "resolved": "https://registry.npmjs.org/color/-/color-0.11.4.tgz", + "dev": true + }, + "color-convert": { + "version": "1.9.0", + "from": "color-convert@>=1.3.0 <2.0.0", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz", + "dev": true + }, + "color-name": { + "version": "1.1.2", + "from": "color-name@>=1.1.1 <2.0.0", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.2.tgz", + "dev": true + }, + "color-string": { + "version": "0.3.0", + "from": "color-string@>=0.3.0 <0.4.0", + "resolved": "https://registry.npmjs.org/color-string/-/color-string-0.3.0.tgz", + "dev": true + }, + "colormin": { + "version": "1.1.2", + "from": "colormin@>=1.0.5 <2.0.0", + "resolved": "https://registry.npmjs.org/colormin/-/colormin-1.1.2.tgz", + "dev": true + }, + "colors": { + "version": "1.1.2", + "from": "colors@>=1.1.2 <2.0.0", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz", + "dev": true + }, + "commander": { + "version": "2.10.0", + "from": "commander@>=2.9.0 <3.0.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.10.0.tgz", + "dev": true + }, + "concat-map": { + "version": "0.0.1", + "from": "concat-map@0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "dev": true + }, + "config-chain": { + "version": "1.1.11", + "from": "config-chain@>=1.1.5 <1.2.0", + "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.11.tgz", + "dev": true + }, + "connect": { + "version": "3.6.2", + "from": "connect@>=3.4.1 <4.0.0", + "resolved": "https://registry.npmjs.org/connect/-/connect-3.6.2.tgz", + "dev": true + }, + "console-browserify": { + "version": "1.1.0", + "from": "console-browserify@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz", + "dev": true + }, + "consolidate": { + "version": "0.14.5", + "from": "consolidate@>=0.14.0 <0.15.0", + "resolved": "https://registry.npmjs.org/consolidate/-/consolidate-0.14.5.tgz", + "dev": true + }, + "constants-browserify": { + "version": "1.0.0", + "from": "constants-browserify@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz", + "dev": true + }, + "core-util-is": { + "version": "1.0.2", + "from": "core-util-is@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "dev": true + }, + "cosmiconfig": { + "version": "2.1.3", + "from": "cosmiconfig@>=2.1.0 <3.0.0", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-2.1.3.tgz", + "dev": true, + "dependencies": { + "minimist": { + "version": "1.2.0", + "from": "minimist@>=1.2.0 <2.0.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "dev": true + } + } + }, + "create-ecdh": { + "version": "4.0.0", + "from": "create-ecdh@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz", + "dev": true + }, + "create-hash": { + "version": "1.1.3", + "from": "create-hash@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz", + "dev": true + }, + "create-hmac": { + "version": "1.1.6", + "from": "create-hmac@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.6.tgz", + "dev": true + }, + "crypto-browserify": { + "version": "3.11.0", + "from": "crypto-browserify@>=3.11.0 <4.0.0", + "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.0.tgz", + "dev": true + }, + "css-color-names": { + "version": "0.0.4", + "from": "css-color-names@0.0.4", + "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz", + "dev": true + }, + "css-loader": { + "version": "0.25.0", + "from": "css-loader@>=0.25.0 <0.26.0", + "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.25.0.tgz", + "dev": true, + "dependencies": { + "loader-utils": { + "version": "0.2.17", + "from": "loader-utils@>=0.2.2 <0.3.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz", + "dev": true + } + } + }, + "css-selector-tokenizer": { + "version": "0.6.0", + "from": "css-selector-tokenizer@>=0.6.0 <0.7.0", + "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.6.0.tgz", + "dev": true + }, + "cssesc": { + "version": "0.1.0", + "from": "cssesc@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-0.1.0.tgz", + "dev": true + }, + "cssnano": { + "version": "3.10.0", + "from": "cssnano@>=2.6.1 <4.0.0", + "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-3.10.0.tgz", + "dev": true + }, + "csso": { + "version": "2.3.2", + "from": "csso@>=2.3.1 <2.4.0", + "resolved": "https://registry.npmjs.org/csso/-/csso-2.3.2.tgz", + "dev": true + }, + "date-now": { + "version": "0.1.4", + "from": "date-now@>=0.1.4 <0.2.0", + "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz", + "dev": true + }, + "de-indent": { + "version": "1.0.2", + "from": "de-indent@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz", + "dev": true + }, + "debug": { + "version": "2.6.7", + "from": "debug@2.6.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz", + "dev": true + }, + "decamelize": { + "version": "1.2.0", + "from": "decamelize@>=1.1.2 <2.0.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", + "dev": true + }, + "defined": { + "version": "1.0.0", + "from": "defined@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz", + "dev": true + }, + "des.js": { + "version": "1.0.0", + "from": "des.js@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz", + "dev": true + }, + "diffie-hellman": { + "version": "5.0.2", + "from": "diffie-hellman@>=5.0.0 <6.0.0", + "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.2.tgz", + "dev": true + }, + "domain-browser": { + "version": "1.1.7", + "from": "domain-browser@>=1.1.1 <2.0.0", + "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.7.tgz", + "dev": true + }, + "editorconfig": { + "version": "0.13.2", + "from": "editorconfig@>=0.13.2 <0.14.0", + "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-0.13.2.tgz", + "dev": true, + "dependencies": { + "lru-cache": { + "version": "3.2.0", + "from": "lru-cache@>=3.2.0 <4.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-3.2.0.tgz", + "dev": true + } + } + }, + "ee-first": { + "version": "1.1.1", + "from": "ee-first@1.1.1", + "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", + "dev": true + }, + "electron-to-chromium": { + "version": "1.3.14", + "from": "electron-to-chromium@>=1.2.7 <2.0.0", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.14.tgz", + "dev": true + }, + "elliptic": { + "version": "6.4.0", + "from": "elliptic@>=6.0.0 <7.0.0", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz", + "dev": true + }, + "emojis-list": { + "version": "2.1.0", + "from": "emojis-list@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz", + "dev": true + }, + "encodeurl": { + "version": "1.0.1", + "from": "encodeurl@>=1.0.1 <1.1.0", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.1.tgz", + "dev": true + }, + "encoding": { + "version": "0.1.12", + "from": "encoding@>=0.1.11 <0.2.0", + "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz", + "dev": true + }, + "enhanced-resolve": { + "version": "3.1.0", + "from": "enhanced-resolve@>=3.1.0 <4.0.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.1.0.tgz", + "dev": true, + "dependencies": { + "memory-fs": { + "version": "0.4.1", + "from": "memory-fs@>=0.4.0 <0.5.0", + "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz", + "dev": true + } + } + }, + "errno": { + "version": "0.1.4", + "from": "errno@>=0.1.3 <0.2.0", + "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.4.tgz", + "dev": true + }, + "error-ex": { + "version": "1.3.1", + "from": "error-ex@>=1.2.0 <2.0.0", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz", + "dev": true + }, + "es6-promise": { + "version": "3.3.1", + "from": "es6-promise@>=3.1.2 <4.0.0", + "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz", + "dev": true + }, + "escape-html": { + "version": "1.0.3", + "from": "escape-html@>=1.0.3 <1.1.0", + "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", + "dev": true + }, + "escape-string-regexp": { + "version": "1.0.5", + "from": "escape-string-regexp@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "dev": true + }, + "esprima": { + "version": "2.7.3", + "from": "esprima@>=2.6.0 <3.0.0", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", + "dev": true + }, + "esutils": { + "version": "2.0.2", + "from": "esutils@>=2.0.2 <3.0.0", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", + "dev": true + }, + "event-source-polyfill": { + "version": "0.0.7", + "from": "event-source-polyfill@>=0.0.7 <0.0.8", + "resolved": "https://registry.npmjs.org/event-source-polyfill/-/event-source-polyfill-0.0.7.tgz", + "dev": true + }, + "events": { + "version": "1.1.1", + "from": "events@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz", + "dev": true + }, + "evp_bytestokey": { + "version": "1.0.0", + "from": "evp_bytestokey@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz", + "dev": true + }, + "expand-brackets": { + "version": "0.1.5", + "from": "expand-brackets@>=0.1.4 <0.2.0", + "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz", + "dev": true + }, + "expand-range": { + "version": "1.8.2", + "from": "expand-range@>=1.8.1 <2.0.0", + "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz", + "dev": true + }, + "extglob": { + "version": "0.3.2", + "from": "extglob@>=0.3.1 <0.4.0", + "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz", + "dev": true + }, + "extract-text-webpack-plugin": { + "version": "2.1.2", + "from": "extract-text-webpack-plugin@>=2.0.0-rc <3.0.0", + "resolved": "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-2.1.2.tgz", + "dev": true + }, + "fast-deep-equal": { + "version": "0.1.0", + "from": "fast-deep-equal@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-0.1.0.tgz", + "dev": true + }, + "fastparse": { + "version": "1.1.1", + "from": "fastparse@>=1.1.1 <2.0.0", + "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.1.tgz", + "dev": true + }, + "file-loader": { + "version": "0.9.0", + "from": "file-loader@>=0.9.0 <0.10.0", + "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-0.9.0.tgz", + "dev": true, + "dependencies": { + "loader-utils": { + "version": "0.2.17", + "from": "loader-utils@>=0.2.5 <0.3.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz", + "dev": true + } + } + }, + "filename-regex": { + "version": "2.0.1", + "from": "filename-regex@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz", + "dev": true + }, + "fill-range": { + "version": "2.2.3", + "from": "fill-range@>=2.1.0 <3.0.0", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz", + "dev": true + }, + "finalhandler": { + "version": "1.0.3", + "from": "finalhandler@1.0.3", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.3.tgz", + "dev": true + }, + "find-up": { + "version": "1.1.2", + "from": "find-up@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", + "dev": true + }, + "flatten": { + "version": "1.0.2", + "from": "flatten@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz", + "dev": true + }, + "for-in": { + "version": "1.0.2", + "from": "for-in@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", + "dev": true + }, + "for-own": { + "version": "0.1.5", + "from": "for-own@>=0.1.4 <0.2.0", + "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz", + "dev": true + }, + "function-bind": { + "version": "1.1.0", + "from": "function-bind@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.0.tgz", + "dev": true + }, + "get-caller-file": { + "version": "1.0.2", + "from": "get-caller-file@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz", + "dev": true + }, + "glob-base": { + "version": "0.3.0", + "from": "glob-base@>=0.3.0 <0.4.0", + "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz", + "dev": true + }, + "glob-parent": { + "version": "2.0.0", + "from": "glob-parent@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz", + "dev": true + }, + "graceful-fs": { + "version": "4.1.11", + "from": "graceful-fs@>=4.1.2 <5.0.0", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", + "dev": true + }, + "graceful-readlink": { + "version": "1.0.1", + "from": "graceful-readlink@>=1.0.0", + "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz", + "dev": true + }, + "has": { + "version": "1.0.1", + "from": "has@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz", + "dev": true + }, + "has-ansi": { + "version": "2.0.0", + "from": "has-ansi@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", + "dev": true + }, + "has-flag": { + "version": "1.0.0", + "from": "has-flag@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "dev": true + }, + "hash-base": { + "version": "2.0.2", + "from": "hash-base@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz", + "dev": true + }, + "hash-sum": { + "version": "1.0.2", + "from": "hash-sum@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz", + "dev": true + }, + "hash.js": { + "version": "1.1.1", + "from": "hash.js@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.1.tgz", + "dev": true + }, + "he": { + "version": "1.1.1", + "from": "he@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz", + "dev": true + }, + "hmac-drbg": { + "version": "1.0.1", + "from": "hmac-drbg@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", + "dev": true + }, + "hosted-git-info": { + "version": "2.4.2", + "from": "hosted-git-info@>=2.1.4 <3.0.0", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.4.2.tgz", + "dev": true + }, + "html-comment-regex": { + "version": "1.1.1", + "from": "html-comment-regex@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.1.tgz", + "dev": true + }, + "html-entities": { + "version": "1.2.1", + "from": "html-entities@>=1.2.0 <2.0.0", + "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz", + "dev": true + }, + "https-browserify": { + "version": "0.0.1", + "from": "https-browserify@0.0.1", + "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz", + "dev": true + }, + "iconv-lite": { + "version": "0.4.18", + "from": "iconv-lite@>=0.4.13 <0.5.0", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.18.tgz", + "dev": true + }, + "icss-replace-symbols": { + "version": "1.1.0", + "from": "icss-replace-symbols@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz", + "dev": true + }, + "ieee754": { + "version": "1.1.8", + "from": "ieee754@>=1.1.4 <2.0.0", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz", + "dev": true + }, + "indexes-of": { + "version": "1.0.1", + "from": "indexes-of@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz", + "dev": true + }, + "indexof": { + "version": "0.0.1", + "from": "indexof@0.0.1", + "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz", + "dev": true + }, + "inherits": { + "version": "2.0.3", + "from": "inherits@>=2.0.3 <2.1.0", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "dev": true + }, + "ini": { + "version": "1.3.4", + "from": "ini@>=1.3.4 <2.0.0", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz", + "dev": true + }, + "interpret": { + "version": "1.0.3", + "from": "interpret@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.3.tgz", + "dev": true + }, + "invert-kv": { + "version": "1.0.0", + "from": "invert-kv@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", + "dev": true + }, + "is-absolute-url": { + "version": "2.1.0", + "from": "is-absolute-url@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz", + "dev": true + }, + "is-arrayish": { + "version": "0.2.1", + "from": "is-arrayish@>=0.2.1 <0.3.0", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "dev": true + }, + "is-binary-path": { + "version": "1.0.1", + "from": "is-binary-path@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", + "dev": true + }, + "is-buffer": { + "version": "1.1.5", + "from": "is-buffer@>=1.1.5 <2.0.0", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz", + "dev": true + }, + "is-builtin-module": { + "version": "1.0.0", + "from": "is-builtin-module@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", + "dev": true + }, + "is-directory": { + "version": "0.3.1", + "from": "is-directory@>=0.3.1 <0.4.0", + "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz", + "dev": true + }, + "is-dotfile": { + "version": "1.0.3", + "from": "is-dotfile@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz", + "dev": true + }, + "is-equal-shallow": { + "version": "0.1.3", + "from": "is-equal-shallow@>=0.1.3 <0.2.0", + "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz", + "dev": true + }, + "is-extendable": { + "version": "0.1.1", + "from": "is-extendable@>=0.1.1 <0.2.0", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", + "dev": true + }, + "is-extglob": { + "version": "1.0.0", + "from": "is-extglob@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "from": "is-fullwidth-code-point@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "dev": true + }, + "is-glob": { + "version": "2.0.1", + "from": "is-glob@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", + "dev": true + }, + "is-number": { + "version": "2.1.0", + "from": "is-number@>=2.1.0 <3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz", + "dev": true + }, + "is-plain-obj": { + "version": "1.1.0", + "from": "is-plain-obj@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", + "dev": true + }, + "is-posix-bracket": { + "version": "0.1.1", + "from": "is-posix-bracket@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz", + "dev": true + }, + "is-primitive": { + "version": "2.0.0", + "from": "is-primitive@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz", + "dev": true + }, + "is-stream": { + "version": "1.1.0", + "from": "is-stream@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", + "dev": true + }, + "is-svg": { + "version": "2.1.0", + "from": "is-svg@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-2.1.0.tgz", + "dev": true + }, + "is-utf8": { + "version": "0.2.1", + "from": "is-utf8@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", + "dev": true + }, + "isarray": { + "version": "1.0.0", + "from": "isarray@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "dev": true + }, + "isobject": { + "version": "2.1.0", + "from": "isobject@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", + "dev": true + }, + "isomorphic-fetch": { + "version": "2.2.1", + "from": "isomorphic-fetch@>=2.2.1 <3.0.0", + "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz", + "dev": true + }, + "jquery": { + "version": "3.2.1", + "from": "jquery@>=3.1.1 <4.0.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.2.1.tgz", + "dev": true + }, + "js-base64": { + "version": "2.1.9", + "from": "js-base64@>=2.1.9 <3.0.0", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.1.9.tgz", + "dev": true + }, + "js-beautify": { + "version": "1.6.14", + "from": "js-beautify@>=1.6.3 <2.0.0", + "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.6.14.tgz", + "dev": true + }, + "js-tokens": { + "version": "3.0.1", + "from": "js-tokens@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.1.tgz", + "dev": true + }, + "js-yaml": { + "version": "3.7.0", + "from": "js-yaml@>=3.7.0 <3.8.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz", + "dev": true + }, + "jsesc": { + "version": "0.5.0", + "from": "jsesc@>=0.5.0 <0.6.0", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", + "dev": true + }, + "json-loader": { + "version": "0.5.4", + "from": "json-loader@>=0.5.4 <0.6.0", + "resolved": "https://registry.npmjs.org/json-loader/-/json-loader-0.5.4.tgz", + "dev": true + }, + "json-schema-traverse": { + "version": "0.3.1", + "from": "json-schema-traverse@>=0.3.0 <0.4.0", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz", + "dev": true + }, + "json-stable-stringify": { + "version": "1.0.1", + "from": "json-stable-stringify@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz", + "dev": true + }, + "json5": { + "version": "0.5.1", + "from": "json5@>=0.5.0 <0.6.0", + "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz", + "dev": true + }, + "jsonify": { + "version": "0.0.0", + "from": "jsonify@>=0.0.0 <0.1.0", + "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz", + "dev": true + }, + "kind-of": { + "version": "3.2.2", + "from": "kind-of@>=3.0.2 <4.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "dev": true + }, + "lazy-cache": { + "version": "1.0.4", + "from": "lazy-cache@>=1.0.3 <2.0.0", + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", + "dev": true + }, + "lcid": { + "version": "1.0.0", + "from": "lcid@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", + "dev": true + }, + "load-json-file": { + "version": "1.1.0", + "from": "load-json-file@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", + "dev": true + }, + "loader-runner": { + "version": "2.3.0", + "from": "loader-runner@>=2.3.0 <3.0.0", + "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.0.tgz", + "dev": true + }, + "loader-utils": { + "version": "1.1.0", + "from": "loader-utils@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz", + "dev": true + }, + "lodash": { + "version": "4.17.4", + "from": "lodash@>=4.17.4 <5.0.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", + "dev": true + }, + "lodash._createcompounder": { + "version": "3.0.0", + "from": "lodash._createcompounder@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/lodash._createcompounder/-/lodash._createcompounder-3.0.0.tgz", + "dev": true + }, + "lodash._root": { + "version": "3.0.1", + "from": "lodash._root@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz", + "dev": true + }, + "lodash.camelcase": { + "version": "3.0.1", + "from": "lodash.camelcase@>=3.0.1 <4.0.0", + "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-3.0.1.tgz", + "dev": true + }, + "lodash.deburr": { + "version": "3.2.0", + "from": "lodash.deburr@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/lodash.deburr/-/lodash.deburr-3.2.0.tgz", + "dev": true + }, + "lodash.memoize": { + "version": "4.1.2", + "from": "lodash.memoize@>=4.1.2 <5.0.0", + "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", + "dev": true + }, + "lodash.uniq": { + "version": "4.5.0", + "from": "lodash.uniq@>=4.5.0 <5.0.0", + "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", + "dev": true + }, + "lodash.words": { + "version": "3.2.0", + "from": "lodash.words@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/lodash.words/-/lodash.words-3.2.0.tgz", + "dev": true + }, + "longest": { + "version": "1.0.1", + "from": "longest@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", + "dev": true + }, + "lru-cache": { + "version": "4.1.1", + "from": "lru-cache@>=4.0.1 <5.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz", + "dev": true + }, + "macaddress": { + "version": "0.2.8", + "from": "macaddress@>=0.2.8 <0.3.0", + "resolved": "https://registry.npmjs.org/macaddress/-/macaddress-0.2.8.tgz", + "dev": true + }, + "math-expression-evaluator": { + "version": "1.2.17", + "from": "math-expression-evaluator@>=1.2.14 <2.0.0", + "resolved": "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz", + "dev": true + }, + "memory-fs": { + "version": "0.3.0", + "from": "memory-fs@>=0.3.0 <0.4.0", + "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.3.0.tgz", + "dev": true + }, + "micromatch": { + "version": "2.3.11", + "from": "micromatch@>=2.1.5 <3.0.0", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", + "dev": true + }, + "miller-rabin": { + "version": "4.0.0", + "from": "miller-rabin@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.0.tgz", + "dev": true + }, + "mime": { + "version": "1.3.6", + "from": "mime@>=1.3.4 <2.0.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.6.tgz", + "dev": true + }, + "minimalistic-assert": { + "version": "1.0.0", + "from": "minimalistic-assert@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz", + "dev": true + }, + "minimalistic-crypto-utils": { + "version": "1.0.1", + "from": "minimalistic-crypto-utils@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz", + "dev": true + }, + "minimatch": { + "version": "3.0.4", + "from": "minimatch@>=3.0.2 <4.0.0", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "dev": true + }, + "minimist": { + "version": "0.0.8", + "from": "minimist@0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "dev": true + }, + "mkdirp": { + "version": "0.5.1", + "from": "mkdirp@>=0.5.1 <0.6.0", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "dev": true + }, + "ms": { + "version": "2.0.0", + "from": "ms@2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "dev": true + }, + "node-fetch": { + "version": "1.7.1", + "from": "node-fetch@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.1.tgz", + "dev": true + }, + "node-libs-browser": { + "version": "2.0.0", + "from": "node-libs-browser@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.0.0.tgz", + "dev": true, + "dependencies": { + "string_decoder": { + "version": "0.10.31", + "from": "string_decoder@>=0.10.25 <0.11.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "dev": true + } + } + }, + "nopt": { + "version": "3.0.6", + "from": "nopt@>=3.0.1 <3.1.0", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", + "dev": true + }, + "normalize-package-data": { + "version": "2.3.8", + "from": "normalize-package-data@>=2.3.2 <3.0.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.8.tgz", + "dev": true + }, + "normalize-path": { + "version": "2.1.1", + "from": "normalize-path@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", + "dev": true + }, + "normalize-range": { + "version": "0.1.2", + "from": "normalize-range@>=0.1.2 <0.2.0", + "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz", + "dev": true + }, + "normalize-url": { + "version": "1.9.1", + "from": "normalize-url@>=1.4.0 <2.0.0", + "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz", + "dev": true + }, + "num2fraction": { + "version": "1.2.2", + "from": "num2fraction@>=1.2.2 <2.0.0", + "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz", + "dev": true + }, + "number-is-nan": { + "version": "1.0.1", + "from": "number-is-nan@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", + "dev": true + }, + "object-assign": { + "version": "4.1.1", + "from": "object-assign@>=4.1.1 <5.0.0", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "dev": true + }, + "object.omit": { + "version": "2.0.1", + "from": "object.omit@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz", + "dev": true + }, + "on-finished": { + "version": "2.3.0", + "from": "on-finished@>=2.3.0 <2.4.0", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", + "dev": true + }, + "os-browserify": { + "version": "0.2.1", + "from": "os-browserify@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.2.1.tgz", + "dev": true + }, + "os-homedir": { + "version": "1.0.2", + "from": "os-homedir@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", + "dev": true + }, + "os-locale": { + "version": "1.4.0", + "from": "os-locale@>=1.4.0 <2.0.0", + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", + "dev": true + }, + "pako": { + "version": "0.2.9", + "from": "pako@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz", + "dev": true + }, + "parse-asn1": { + "version": "5.1.0", + "from": "parse-asn1@>=5.0.0 <6.0.0", + "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz", + "dev": true + }, + "parse-glob": { + "version": "3.0.4", + "from": "parse-glob@>=3.0.4 <4.0.0", + "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz", + "dev": true + }, + "parse-json": { + "version": "2.2.0", + "from": "parse-json@>=2.2.0 <3.0.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", + "dev": true + }, + "parseurl": { + "version": "1.3.1", + "from": "parseurl@>=1.3.1 <1.4.0", + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz", + "dev": true + }, + "path-browserify": { + "version": "0.0.0", + "from": "path-browserify@0.0.0", + "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz", + "dev": true + }, + "path-exists": { + "version": "2.1.0", + "from": "path-exists@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", + "dev": true + }, + "path-is-absolute": { + "version": "1.0.1", + "from": "path-is-absolute@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "dev": true + }, + "path-type": { + "version": "1.1.0", + "from": "path-type@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", + "dev": true + }, + "pbkdf2": { + "version": "3.0.12", + "from": "pbkdf2@>=3.0.3 <4.0.0", + "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.12.tgz", + "dev": true + }, + "pify": { + "version": "2.3.0", + "from": "pify@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "dev": true + }, + "pinkie": { + "version": "2.0.4", + "from": "pinkie@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", + "dev": true + }, + "pinkie-promise": { + "version": "2.0.1", + "from": "pinkie-promise@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", + "dev": true + }, + "postcss": { + "version": "5.2.17", + "from": "postcss@>=5.0.6 <6.0.0", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", + "dev": true, + "dependencies": { + "supports-color": { + "version": "3.2.3", + "from": "supports-color@>=3.2.3 <4.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "dev": true + } + } + }, + "postcss-calc": { + "version": "5.3.1", + "from": "postcss-calc@>=5.2.0 <6.0.0", + "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-5.3.1.tgz", + "dev": true + }, + "postcss-colormin": { + "version": "2.2.2", + "from": "postcss-colormin@>=2.1.8 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-2.2.2.tgz", + "dev": true + }, + "postcss-convert-values": { + "version": "2.6.1", + "from": "postcss-convert-values@>=2.3.4 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-2.6.1.tgz", + "dev": true + }, + "postcss-discard-comments": { + "version": "2.0.4", + "from": "postcss-discard-comments@>=2.0.4 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz", + "dev": true + }, + "postcss-discard-duplicates": { + "version": "2.1.0", + "from": "postcss-discard-duplicates@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-2.1.0.tgz", + "dev": true + }, + "postcss-discard-empty": { + "version": "2.1.0", + "from": "postcss-discard-empty@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-2.1.0.tgz", + "dev": true + }, + "postcss-discard-overridden": { + "version": "0.1.1", + "from": "postcss-discard-overridden@>=0.1.1 <0.2.0", + "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz", + "dev": true + }, + "postcss-discard-unused": { + "version": "2.2.3", + "from": "postcss-discard-unused@>=2.2.1 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-discard-unused/-/postcss-discard-unused-2.2.3.tgz", + "dev": true + }, + "postcss-filter-plugins": { + "version": "2.0.2", + "from": "postcss-filter-plugins@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-filter-plugins/-/postcss-filter-plugins-2.0.2.tgz", + "dev": true + }, + "postcss-load-config": { + "version": "1.2.0", + "from": "postcss-load-config@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-1.2.0.tgz", + "dev": true + }, + "postcss-load-options": { + "version": "1.2.0", + "from": "postcss-load-options@>=1.2.0 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-load-options/-/postcss-load-options-1.2.0.tgz", + "dev": true + }, + "postcss-load-plugins": { + "version": "2.3.0", + "from": "postcss-load-plugins@>=2.3.0 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-load-plugins/-/postcss-load-plugins-2.3.0.tgz", + "dev": true + }, + "postcss-merge-idents": { + "version": "2.1.7", + "from": "postcss-merge-idents@>=2.1.5 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz", + "dev": true + }, + "postcss-merge-longhand": { + "version": "2.0.2", + "from": "postcss-merge-longhand@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-2.0.2.tgz", + "dev": true + }, + "postcss-merge-rules": { + "version": "2.1.2", + "from": "postcss-merge-rules@>=2.0.3 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-2.1.2.tgz", + "dev": true + }, + "postcss-message-helpers": { + "version": "2.0.0", + "from": "postcss-message-helpers@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz", + "dev": true + }, + "postcss-minify-font-values": { + "version": "1.0.5", + "from": "postcss-minify-font-values@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-1.0.5.tgz", + "dev": true + }, + "postcss-minify-gradients": { + "version": "1.0.5", + "from": "postcss-minify-gradients@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-1.0.5.tgz", + "dev": true + }, + "postcss-minify-params": { + "version": "1.2.2", + "from": "postcss-minify-params@>=1.0.4 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-1.2.2.tgz", + "dev": true + }, + "postcss-minify-selectors": { + "version": "2.1.1", + "from": "postcss-minify-selectors@>=2.0.4 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-2.1.1.tgz", + "dev": true + }, + "postcss-modules-extract-imports": { + "version": "1.1.0", + "from": "postcss-modules-extract-imports@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.1.0.tgz", + "dev": true, + "dependencies": { + "has-flag": { + "version": "2.0.0", + "from": "has-flag@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", + "dev": true + }, + "postcss": { + "version": "6.0.3", + "from": "postcss@>=6.0.1 <7.0.0", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.3.tgz", + "dev": true + }, + "supports-color": { + "version": "4.0.0", + "from": "supports-color@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.0.0.tgz", + "dev": true + } + } + }, + "postcss-modules-local-by-default": { + "version": "1.2.0", + "from": "postcss-modules-local-by-default@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz", + "dev": true, + "dependencies": { + "css-selector-tokenizer": { + "version": "0.7.0", + "from": "css-selector-tokenizer@>=0.7.0 <0.8.0", + "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz", + "dev": true + }, + "has-flag": { + "version": "2.0.0", + "from": "has-flag@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", + "dev": true + }, + "postcss": { + "version": "6.0.3", + "from": "postcss@>=6.0.1 <7.0.0", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.3.tgz", + "dev": true + }, + "supports-color": { + "version": "4.0.0", + "from": "supports-color@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.0.0.tgz", + "dev": true + } + } + }, + "postcss-modules-scope": { + "version": "1.1.0", + "from": "postcss-modules-scope@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz", + "dev": true, + "dependencies": { + "css-selector-tokenizer": { + "version": "0.7.0", + "from": "css-selector-tokenizer@>=0.7.0 <0.8.0", + "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz", + "dev": true + }, + "has-flag": { + "version": "2.0.0", + "from": "has-flag@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", + "dev": true + }, + "postcss": { + "version": "6.0.3", + "from": "postcss@>=6.0.1 <7.0.0", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.3.tgz", + "dev": true + }, + "supports-color": { + "version": "4.0.0", + "from": "supports-color@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.0.0.tgz", + "dev": true + } + } + }, + "postcss-modules-values": { + "version": "1.3.0", + "from": "postcss-modules-values@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz", + "dev": true, + "dependencies": { + "has-flag": { + "version": "2.0.0", + "from": "has-flag@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", + "dev": true + }, + "postcss": { + "version": "6.0.3", + "from": "postcss@>=6.0.1 <7.0.0", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.3.tgz", + "dev": true + }, + "supports-color": { + "version": "4.0.0", + "from": "supports-color@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.0.0.tgz", + "dev": true + } + } + }, + "postcss-normalize-charset": { + "version": "1.1.1", + "from": "postcss-normalize-charset@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz", + "dev": true + }, + "postcss-normalize-url": { + "version": "3.0.8", + "from": "postcss-normalize-url@>=3.0.7 <4.0.0", + "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-3.0.8.tgz", + "dev": true + }, + "postcss-ordered-values": { + "version": "2.2.3", + "from": "postcss-ordered-values@>=2.1.0 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-2.2.3.tgz", + "dev": true + }, + "postcss-reduce-idents": { + "version": "2.4.0", + "from": "postcss-reduce-idents@>=2.2.2 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz", + "dev": true + }, + "postcss-reduce-initial": { + "version": "1.0.1", + "from": "postcss-reduce-initial@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-1.0.1.tgz", + "dev": true + }, + "postcss-reduce-transforms": { + "version": "1.0.4", + "from": "postcss-reduce-transforms@>=1.0.3 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.4.tgz", + "dev": true + }, + "postcss-selector-parser": { + "version": "2.2.3", + "from": "postcss-selector-parser@>=2.2.2 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz", + "dev": true + }, + "postcss-svgo": { + "version": "2.1.6", + "from": "postcss-svgo@>=2.1.1 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-2.1.6.tgz", + "dev": true + }, + "postcss-unique-selectors": { + "version": "2.0.2", + "from": "postcss-unique-selectors@>=2.0.2 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-2.0.2.tgz", + "dev": true + }, + "postcss-value-parser": { + "version": "3.3.0", + "from": "postcss-value-parser@>=3.2.3 <4.0.0", + "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz", + "dev": true + }, + "postcss-zindex": { + "version": "2.2.0", + "from": "postcss-zindex@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-zindex/-/postcss-zindex-2.2.0.tgz", + "dev": true + }, + "prepend-http": { + "version": "1.0.4", + "from": "prepend-http@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz", + "dev": true + }, + "preserve": { + "version": "0.2.0", + "from": "preserve@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz", + "dev": true + }, + "process": { + "version": "0.11.10", + "from": "process@>=0.11.0 <0.12.0", + "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", + "dev": true + }, + "process-nextick-args": { + "version": "1.0.7", + "from": "process-nextick-args@>=1.0.6 <1.1.0", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", + "dev": true + }, + "proto-list": { + "version": "1.2.4", + "from": "proto-list@>=1.2.1 <1.3.0", + "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", + "dev": true + }, + "prr": { + "version": "0.0.0", + "from": "prr@>=0.0.0 <0.1.0", + "resolved": "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz", + "dev": true + }, + "pseudomap": { + "version": "1.0.2", + "from": "pseudomap@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", + "dev": true + }, + "public-encrypt": { + "version": "4.0.0", + "from": "public-encrypt@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz", + "dev": true + }, + "punycode": { + "version": "1.4.1", + "from": "punycode@>=1.2.4 <2.0.0", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", + "dev": true + }, + "q": { + "version": "1.5.0", + "from": "q@>=1.1.2 <2.0.0", + "resolved": "https://registry.npmjs.org/q/-/q-1.5.0.tgz", + "dev": true + }, + "query-string": { + "version": "4.3.4", + "from": "query-string@>=4.1.0 <5.0.0", + "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz", + "dev": true + }, + "querystring": { + "version": "0.2.0", + "from": "querystring@0.2.0", + "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", + "dev": true + }, + "querystring-es3": { + "version": "0.2.1", + "from": "querystring-es3@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz", + "dev": true + }, + "randomatic": { + "version": "1.1.7", + "from": "randomatic@>=1.1.3 <2.0.0", + "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz", + "dev": true, + "dependencies": { + "is-number": { + "version": "3.0.0", + "from": "is-number@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "dev": true, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "from": "kind-of@^3.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "dev": true + } + } + }, + "kind-of": { + "version": "4.0.0", + "from": "kind-of@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", + "dev": true + } + } + }, + "randombytes": { + "version": "2.0.5", + "from": "randombytes@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.5.tgz", + "dev": true + }, + "range-parser": { + "version": "1.2.0", + "from": "range-parser@>=1.0.3 <2.0.0", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz", + "dev": true + }, + "read-pkg": { + "version": "1.1.0", + "from": "read-pkg@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", + "dev": true + }, + "read-pkg-up": { + "version": "1.0.1", + "from": "read-pkg-up@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", + "dev": true + }, + "readable-stream": { + "version": "2.3.2", + "from": "readable-stream@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.2.tgz", + "dev": true + }, + "readdirp": { + "version": "2.1.0", + "from": "readdirp@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz", + "dev": true + }, + "reduce-css-calc": { + "version": "1.3.0", + "from": "reduce-css-calc@>=1.2.6 <2.0.0", + "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz", + "dev": true + }, + "reduce-function-call": { + "version": "1.0.2", + "from": "reduce-function-call@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/reduce-function-call/-/reduce-function-call-1.0.2.tgz", + "dev": true + }, + "reflect-metadata": { + "version": "0.1.10", + "from": "reflect-metadata@>=0.1.9 <0.2.0", + "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.10.tgz", + "dev": true + }, + "regenerate": { + "version": "1.3.2", + "from": "regenerate@>=1.2.1 <2.0.0", + "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.2.tgz", + "dev": true + }, + "regex-cache": { + "version": "0.4.3", + "from": "regex-cache@>=0.4.2 <0.5.0", + "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz", + "dev": true + }, + "regexpu-core": { + "version": "1.0.0", + "from": "regexpu-core@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz", + "dev": true + }, + "regjsgen": { + "version": "0.2.0", + "from": "regjsgen@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz", + "dev": true + }, + "regjsparser": { + "version": "0.1.5", + "from": "regjsparser@>=0.1.4 <0.2.0", + "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz", + "dev": true + }, + "remove-trailing-separator": { + "version": "1.0.2", + "from": "remove-trailing-separator@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.0.2.tgz", + "dev": true + }, + "repeat-element": { + "version": "1.1.2", + "from": "repeat-element@>=1.1.2 <2.0.0", + "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz", + "dev": true + }, + "repeat-string": { + "version": "1.6.1", + "from": "repeat-string@>=1.5.2 <2.0.0", + "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", + "dev": true + }, + "require-directory": { + "version": "2.1.1", + "from": "require-directory@>=2.1.1 <3.0.0", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "dev": true + }, + "require-from-string": { + "version": "1.2.1", + "from": "require-from-string@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-1.2.1.tgz", + "dev": true + }, + "require-main-filename": { + "version": "1.0.1", + "from": "require-main-filename@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", + "dev": true + }, + "right-align": { + "version": "0.1.3", + "from": "right-align@>=0.1.1 <0.2.0", + "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz", + "dev": true + }, + "ripemd160": { + "version": "2.0.1", + "from": "ripemd160@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz", + "dev": true + }, + "safe-buffer": { + "version": "5.1.1", + "from": "safe-buffer@>=5.1.0 <5.2.0", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", + "dev": true + }, + "sax": { + "version": "1.2.4", + "from": "sax@>=1.2.1 <1.3.0", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", + "dev": true + }, + "schema-utils": { + "version": "0.3.0", + "from": "schema-utils@>=0.3.0 <0.4.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz", + "dev": true + }, + "semver": { + "version": "5.3.0", + "from": "semver@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0||>=4.0.0 <5.0.0||>=5.0.0 <6.0.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", + "dev": true + }, + "set-blocking": { + "version": "2.0.0", + "from": "set-blocking@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "dev": true + }, + "set-immediate-shim": { + "version": "1.0.1", + "from": "set-immediate-shim@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz", + "dev": true + }, + "setimmediate": { + "version": "1.0.5", + "from": "setimmediate@>=1.0.4 <2.0.0", + "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", + "dev": true + }, + "sha.js": { + "version": "2.4.8", + "from": "sha.js@>=2.4.0 <3.0.0", + "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.8.tgz", + "dev": true + }, + "sigmund": { + "version": "1.0.1", + "from": "sigmund@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz", + "dev": true + }, + "sort-keys": { + "version": "1.1.2", + "from": "sort-keys@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz", + "dev": true + }, + "source-list-map": { + "version": "0.1.8", + "from": "source-list-map@>=0.1.4 <0.2.0", + "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz", + "dev": true + }, + "source-map": { + "version": "0.5.6", + "from": "source-map@>=0.5.6 <0.6.0", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz", + "dev": true + }, + "source-map-support": { + "version": "0.4.15", + "from": "source-map-support@>=0.4.15 <0.5.0", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.15.tgz", + "dev": true + }, + "spdx-correct": { + "version": "1.0.2", + "from": "spdx-correct@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz", + "dev": true + }, + "spdx-expression-parse": { + "version": "1.0.4", + "from": "spdx-expression-parse@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz", + "dev": true + }, + "spdx-license-ids": { + "version": "1.2.2", + "from": "spdx-license-ids@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz", + "dev": true + }, + "sprintf-js": { + "version": "1.0.3", + "from": "sprintf-js@>=1.0.2 <1.1.0", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "dev": true + }, + "statuses": { + "version": "1.3.1", + "from": "statuses@>=1.3.1 <1.4.0", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz", + "dev": true + }, + "stream-browserify": { + "version": "2.0.1", + "from": "stream-browserify@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz", + "dev": true + }, + "stream-http": { + "version": "2.7.2", + "from": "stream-http@>=2.3.1 <3.0.0", + "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.7.2.tgz", + "dev": true + }, + "strict-uri-encode": { + "version": "1.1.0", + "from": "strict-uri-encode@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz", + "dev": true + }, + "string_decoder": { + "version": "1.0.3", + "from": "string_decoder@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "dev": true + }, + "string-width": { + "version": "1.0.2", + "from": "string-width@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "dev": true + }, + "strip-ansi": { + "version": "3.0.1", + "from": "strip-ansi@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "dev": true + }, + "strip-bom": { + "version": "2.0.0", + "from": "strip-bom@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", + "dev": true + }, + "style-loader": { + "version": "0.13.2", + "from": "style-loader@>=0.13.1 <0.14.0", + "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.13.2.tgz", + "dev": true + }, + "supports-color": { + "version": "2.0.0", + "from": "supports-color@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "dev": true + }, + "svgo": { + "version": "0.7.2", + "from": "svgo@>=0.7.0 <0.8.0", + "resolved": "https://registry.npmjs.org/svgo/-/svgo-0.7.2.tgz", + "dev": true + }, + "tapable": { + "version": "0.2.6", + "from": "tapable@>=0.2.5 <0.3.0", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.2.6.tgz", + "dev": true + }, + "timers-browserify": { + "version": "2.0.2", + "from": "timers-browserify@>=2.0.2 <3.0.0", + "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.2.tgz", + "dev": true + }, + "to-arraybuffer": { + "version": "1.0.1", + "from": "to-arraybuffer@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz", + "dev": true + }, + "tty-browserify": { + "version": "0.0.0", + "from": "tty-browserify@0.0.0", + "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz", + "dev": true + }, + "typescript": { + "version": "2.3.4", + "from": "typescript@>=2.2.1 <3.0.0", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.3.4.tgz", + "dev": true + }, + "uglify-js": { + "version": "2.8.29", + "from": "uglify-js@>=2.8.27 <3.0.0", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz", + "dev": true, + "dependencies": { + "yargs": { + "version": "3.10.0", + "from": "yargs@>=3.10.0 <3.11.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", + "dev": true + } + } + }, + "uglify-to-browserify": { + "version": "1.0.2", + "from": "uglify-to-browserify@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz", + "dev": true, + "optional": true + }, + "uniq": { + "version": "1.0.1", + "from": "uniq@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz", + "dev": true + }, + "uniqid": { + "version": "4.1.1", + "from": "uniqid@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/uniqid/-/uniqid-4.1.1.tgz", + "dev": true + }, + "uniqs": { + "version": "2.0.0", + "from": "uniqs@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz", + "dev": true + }, + "unpipe": { + "version": "1.0.0", + "from": "unpipe@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", + "dev": true + }, + "url": { + "version": "0.11.0", + "from": "url@>=0.11.0 <0.12.0", + "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", + "dev": true, + "dependencies": { + "punycode": { + "version": "1.3.2", + "from": "punycode@1.3.2", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", + "dev": true + } + } + }, + "url-loader": { + "version": "0.5.9", + "from": "url-loader@>=0.5.7 <0.6.0", + "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-0.5.9.tgz", + "dev": true + }, + "util": { + "version": "0.10.3", + "from": "util@>=0.10.3 <0.11.0", + "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", + "dev": true, + "dependencies": { + "inherits": { + "version": "2.0.1", + "from": "inherits@2.0.1", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", + "dev": true + } + } + }, + "util-deprecate": { + "version": "1.0.2", + "from": "util-deprecate@>=1.0.1 <1.1.0", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "dev": true + }, + "utils-merge": { + "version": "1.0.0", + "from": "utils-merge@1.0.0", + "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz", + "dev": true + }, + "validate-npm-package-license": { + "version": "3.0.1", + "from": "validate-npm-package-license@>=3.0.1 <4.0.0", + "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz", + "dev": true + }, + "vendors": { + "version": "1.0.1", + "from": "vendors@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.1.tgz", + "dev": true + }, + "vm-browserify": { + "version": "0.0.4", + "from": "vm-browserify@0.0.4", + "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz", + "dev": true + }, + "vue": { + "version": "2.3.4", + "from": "vue@>=2.2.2 <3.0.0", + "resolved": "https://registry.npmjs.org/vue/-/vue-2.3.4.tgz", + "dev": true + }, + "vue-class-component": { + "version": "5.0.1", + "from": "vue-class-component@>=5.0.0 <6.0.0", + "resolved": "https://registry.npmjs.org/vue-class-component/-/vue-class-component-5.0.1.tgz", + "dev": true + }, + "vue-hot-reload-api": { + "version": "2.1.0", + "from": "vue-hot-reload-api@>=2.0.11 <3.0.0", + "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.1.0.tgz", + "dev": true + }, + "vue-loader": { + "version": "11.3.4", + "from": "vue-loader@>=11.1.4 <12.0.0", + "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-11.3.4.tgz", + "dev": true + }, + "vue-property-decorator": { + "version": "5.1.0", + "from": "vue-property-decorator@>=5.0.1 <6.0.0", + "resolved": "https://registry.npmjs.org/vue-property-decorator/-/vue-property-decorator-5.1.0.tgz", + "dev": true + }, + "vue-router": { + "version": "2.6.0", + "from": "vue-router@>=2.3.0 <3.0.0", + "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-2.6.0.tgz", + "dev": true + }, + "vue-style-loader": { + "version": "2.0.5", + "from": "vue-style-loader@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-2.0.5.tgz", + "dev": true + }, + "vue-template-compiler": { + "version": "2.3.4", + "from": "vue-template-compiler@>=2.2.2 <3.0.0", + "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.3.4.tgz", + "dev": true + }, + "vue-template-es2015-compiler": { + "version": "1.5.2", + "from": "vue-template-es2015-compiler@>=1.2.2 <2.0.0", + "resolved": "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.5.2.tgz", + "dev": true + }, + "watchpack": { + "version": "1.3.1", + "from": "watchpack@>=1.3.1 <2.0.0", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.3.1.tgz", + "dev": true + }, + "webpack": { + "version": "2.6.1", + "from": "webpack@>=2.2.0 <3.0.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-2.6.1.tgz", + "dev": true, + "dependencies": { + "ajv": { + "version": "4.11.8", + "from": "ajv@>=4.7.0 <5.0.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz", + "dev": true + }, + "loader-utils": { + "version": "0.2.17", + "from": "loader-utils@>=0.2.16 <0.3.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz", + "dev": true + }, + "memory-fs": { + "version": "0.4.1", + "from": "memory-fs@>=0.4.1 <0.5.0", + "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz", + "dev": true + }, + "source-list-map": { + "version": "1.1.2", + "from": "source-list-map@>=1.1.1 <2.0.0", + "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-1.1.2.tgz", + "dev": true + }, + "supports-color": { + "version": "3.2.3", + "from": "supports-color@>=3.1.0 <4.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "dev": true + }, + "webpack-sources": { + "version": "0.2.3", + "from": "webpack-sources@>=0.2.3 <0.3.0", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.2.3.tgz", + "dev": true + } + } + }, + "webpack-dev-middleware": { + "version": "1.11.0", + "from": "webpack-dev-middleware@>=1.8.4 <2.0.0", + "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-1.11.0.tgz", + "dev": true, + "dependencies": { + "memory-fs": { + "version": "0.4.1", + "from": "memory-fs@>=0.4.1 <0.5.0", + "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz", + "dev": true + } + } + }, + "webpack-hot-middleware": { + "version": "2.18.0", + "from": "webpack-hot-middleware@>=2.12.2 <3.0.0", + "resolved": "https://registry.npmjs.org/webpack-hot-middleware/-/webpack-hot-middleware-2.18.0.tgz", + "dev": true + }, + "webpack-node-externals": { + "version": "1.6.0", + "from": "webpack-node-externals@>=1.4.3 <2.0.0", + "resolved": "https://registry.npmjs.org/webpack-node-externals/-/webpack-node-externals-1.6.0.tgz", + "dev": true + }, + "webpack-sources": { + "version": "1.0.1", + "from": "webpack-sources@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.0.1.tgz", + "dev": true, + "dependencies": { + "source-list-map": { + "version": "2.0.0", + "from": "source-list-map@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz", + "dev": true + } + } + }, + "whatwg-fetch": { + "version": "2.0.3", + "from": "whatwg-fetch@>=0.10.0", + "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz", + "dev": true + }, + "whet.extend": { + "version": "0.9.9", + "from": "whet.extend@>=0.9.9 <0.10.0", + "resolved": "https://registry.npmjs.org/whet.extend/-/whet.extend-0.9.9.tgz", + "dev": true + }, + "which-module": { + "version": "1.0.0", + "from": "which-module@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz", + "dev": true + }, + "window-size": { + "version": "0.1.0", + "from": "window-size@0.1.0", + "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz", + "dev": true + }, + "wordwrap": { + "version": "0.0.2", + "from": "wordwrap@0.0.2", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz", + "dev": true + }, + "wrap-ansi": { + "version": "2.1.0", + "from": "wrap-ansi@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", + "dev": true + }, + "xtend": { + "version": "4.0.1", + "from": "xtend@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", + "dev": true + }, + "y18n": { + "version": "3.2.1", + "from": "y18n@>=3.2.1 <4.0.0", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", + "dev": true + }, + "yallist": { + "version": "2.1.2", + "from": "yallist@>=2.1.2 <3.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", + "dev": true + }, + "yargs": { + "version": "6.6.0", + "from": "yargs@>=6.0.0 <7.0.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz", + "dev": true, + "dependencies": { + "camelcase": { + "version": "3.0.0", + "from": "camelcase@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", + "dev": true + }, + "cliui": { + "version": "3.2.0", + "from": "cliui@>=3.2.0 <4.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", + "dev": true + } + } + }, + "yargs-parser": { + "version": "4.2.1", + "from": "yargs-parser@>=4.2.0 <5.0.0", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz", + "dev": true, + "dependencies": { + "camelcase": { + "version": "3.0.0", + "from": "camelcase@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", + "dev": true + } + } + } + } +} From 76928bcbaaa8da901ecb59ebd89fb4b7b6a54203 Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Thu, 29 Jun 2017 17:06:58 -0700 Subject: [PATCH 150/411] Remove AssetTargetFramework --- templates/AngularSpa/AngularSpa.csproj | 1 - templates/AureliaSpa/AureliaSpa.csproj | 1 - templates/KnockoutSpa/KnockoutSpa.csproj | 1 - templates/ReactReduxSpa/ReactReduxSpa.csproj | 1 - templates/ReactSpa/ReactSpa.csproj | 1 - templates/VueSpa/VueSpa.csproj | 1 - 6 files changed, 6 deletions(-) diff --git a/templates/AngularSpa/AngularSpa.csproj b/templates/AngularSpa/AngularSpa.csproj index f03f36db..2f30a284 100644 --- a/templates/AngularSpa/AngularSpa.csproj +++ b/templates/AngularSpa/AngularSpa.csproj @@ -5,7 +5,6 @@ TargetFrameworkOverride true Latest - $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; false diff --git a/templates/AureliaSpa/AureliaSpa.csproj b/templates/AureliaSpa/AureliaSpa.csproj index cfc16bc2..3277a6c8 100644 --- a/templates/AureliaSpa/AureliaSpa.csproj +++ b/templates/AureliaSpa/AureliaSpa.csproj @@ -5,7 +5,6 @@ TargetFrameworkOverride true Latest - $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; false diff --git a/templates/KnockoutSpa/KnockoutSpa.csproj b/templates/KnockoutSpa/KnockoutSpa.csproj index cfc16bc2..3277a6c8 100644 --- a/templates/KnockoutSpa/KnockoutSpa.csproj +++ b/templates/KnockoutSpa/KnockoutSpa.csproj @@ -5,7 +5,6 @@ TargetFrameworkOverride true Latest - $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; false diff --git a/templates/ReactReduxSpa/ReactReduxSpa.csproj b/templates/ReactReduxSpa/ReactReduxSpa.csproj index 4a1d7ae2..d055861e 100644 --- a/templates/ReactReduxSpa/ReactReduxSpa.csproj +++ b/templates/ReactReduxSpa/ReactReduxSpa.csproj @@ -5,7 +5,6 @@ TargetFrameworkOverride true Latest - $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; false diff --git a/templates/ReactSpa/ReactSpa.csproj b/templates/ReactSpa/ReactSpa.csproj index cfc16bc2..3277a6c8 100644 --- a/templates/ReactSpa/ReactSpa.csproj +++ b/templates/ReactSpa/ReactSpa.csproj @@ -5,7 +5,6 @@ TargetFrameworkOverride true Latest - $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; false diff --git a/templates/VueSpa/VueSpa.csproj b/templates/VueSpa/VueSpa.csproj index cfc16bc2..3277a6c8 100644 --- a/templates/VueSpa/VueSpa.csproj +++ b/templates/VueSpa/VueSpa.csproj @@ -5,7 +5,6 @@ TargetFrameworkOverride true Latest - $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; false From 429a432dd3af5781d8947881df455ce08add6429 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Mon, 3 Jul 2017 10:09:03 +0100 Subject: [PATCH 151/411] Check for null during node process disposal. Fixes #1061 --- .../HostingModels/OutOfProcessNodeInstance.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.AspNetCore.NodeServices/HostingModels/OutOfProcessNodeInstance.cs b/src/Microsoft.AspNetCore.NodeServices/HostingModels/OutOfProcessNodeInstance.cs index d02ccf93..b75827c4 100644 --- a/src/Microsoft.AspNetCore.NodeServices/HostingModels/OutOfProcessNodeInstance.cs +++ b/src/Microsoft.AspNetCore.NodeServices/HostingModels/OutOfProcessNodeInstance.cs @@ -297,7 +297,7 @@ protected virtual void Dispose(bool disposing) // Make sure the Node process is finished // TODO: Is there a more graceful way to end it? Or does this still let it perform any cleanup? - if (!_nodeProcess.HasExited) + if (_nodeProcess != null && !_nodeProcess.HasExited) { _nodeProcess.Kill(); } From 513d288a5d0d71e36b19e9f7c49816f1aea57d58 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Mon, 3 Jul 2017 10:15:53 +0100 Subject: [PATCH 152/411] Use GetRandomFileName instead of GetTempFileName. Fixes #1060 --- appveyor.yml | 2 +- src/Microsoft.AspNetCore.NodeServices/Util/StringAsTempFile.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index f40e66aa..7de4d7cd 100755 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,7 +7,7 @@ install: - ps: $urlCurrent = "https://dotnetcli.azureedge.net/dotnet/Sdk/2.0.0-preview2-006497/dotnet-sdk-2.0.0-preview2-006497-win-x64.zip" - ps: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetsdk" - ps: mkdir $env:DOTNET_INSTALL_DIR -Force | Out-Null - - ps: $tempFileCurrent = [System.IO.Path]::GetTempFileName() + - ps: $tempFileCurrent = [System.IO.Path]::Combine([System.IO.Path]::GetTempPath(), [System.IO.Path]::GetRandomFileName()) - ps: (New-Object System.Net.WebClient).DownloadFile($urlCurrent, $tempFileCurrent) - ps: Add-Type -AssemblyName System.IO.Compression.FileSystem; [System.IO.Compression.ZipFile]::ExtractToDirectory($tempFileCurrent, $env:DOTNET_INSTALL_DIR) - ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path" diff --git a/src/Microsoft.AspNetCore.NodeServices/Util/StringAsTempFile.cs b/src/Microsoft.AspNetCore.NodeServices/Util/StringAsTempFile.cs index c15bca35..c4aea7ff 100644 --- a/src/Microsoft.AspNetCore.NodeServices/Util/StringAsTempFile.cs +++ b/src/Microsoft.AspNetCore.NodeServices/Util/StringAsTempFile.cs @@ -21,7 +21,7 @@ public sealed class StringAsTempFile : IDisposable /// A token that indicates when the host application is stopping. public StringAsTempFile(string content, CancellationToken applicationStoppingToken) { - FileName = Path.GetTempFileName(); + FileName = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName()); File.WriteAllText(FileName, content); // Because .NET finalizers don't reliably run when the process is terminating, also From 9cce26ebd8f194e9db7ddd4efa88d1f2e8ca25ac Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Mon, 3 Jul 2017 13:47:14 +0100 Subject: [PATCH 153/411] Fix error formatting by rebuilding entrypoint-http.js --- .../Content/Node/entrypoint-http.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Microsoft.AspNetCore.NodeServices/Content/Node/entrypoint-http.js b/src/Microsoft.AspNetCore.NodeServices/Content/Node/entrypoint-http.js index a80d8a06..c32d9f1c 100644 --- a/src/Microsoft.AspNetCore.NodeServices/Content/Node/entrypoint-http.js +++ b/src/Microsoft.AspNetCore.NodeServices/Content/Node/entrypoint-http.js @@ -133,7 +133,10 @@ } function respondWithError(res, errorValue) { res.statusCode = 500; - res.end(errorValue.stack || errorValue.toString()); + res.end(JSON.stringify({ + errorMessage: errorValue.message || errorValue, + errorDetails: errorValue.stack || null + })); } From 94fc84a9b457839802831544daab1a0da88fbec1 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Mon, 3 Jul 2017 14:07:28 +0100 Subject: [PATCH 154/411] Add simpler prerendering API. Fixes #607 --- .../Controllers/HomeController.cs | 15 ++++++ .../Node/prerenderPage.js | 14 ++++++ .../NodeServicesExamples.csproj | 2 +- samples/misc/NodeServicesExamples/Startup.cs | 1 + .../Views/Home/Index.cshtml | 1 + .../Views/Home/Prerendering.cshtml | 21 ++++++++ .../misc/NodeServicesExamples/package.json | 1 + .../Prerendering/DefaultSpaPrerenderer.cs | 49 +++++++++++++++++++ .../Prerendering/ISpaPrerenderer.cs | 28 +++++++++++ .../Prerendering/PrerenderTagHelper.cs | 37 ++------------ .../Prerendering/Prerenderer.cs | 36 ++++++++++++++ ...PrerenderingServiceCollectionExtensions.cs | 27 ++++++++++ .../Prerendering/RenderToStringResult.cs | 26 ++++++++++ 13 files changed, 225 insertions(+), 33 deletions(-) create mode 100644 samples/misc/NodeServicesExamples/Node/prerenderPage.js create mode 100644 samples/misc/NodeServicesExamples/Views/Home/Prerendering.cshtml create mode 100644 src/Microsoft.AspNetCore.SpaServices/Prerendering/DefaultSpaPrerenderer.cs create mode 100644 src/Microsoft.AspNetCore.SpaServices/Prerendering/ISpaPrerenderer.cs create mode 100644 src/Microsoft.AspNetCore.SpaServices/Prerendering/PrerenderingServiceCollectionExtensions.cs diff --git a/samples/misc/NodeServicesExamples/Controllers/HomeController.cs b/samples/misc/NodeServicesExamples/Controllers/HomeController.cs index 7a4f8044..d9f32410 100755 --- a/samples/misc/NodeServicesExamples/Controllers/HomeController.cs +++ b/samples/misc/NodeServicesExamples/Controllers/HomeController.cs @@ -1,6 +1,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.NodeServices; +using Microsoft.AspNetCore.SpaServices.Prerendering; namespace NodeServicesExamples.Controllers { @@ -34,6 +35,20 @@ public async Task Chart([FromServices] INodeServices nodeServices return View(); } + public async Task Prerendering([FromServices] ISpaPrerenderer prerenderer) + { + var result = await prerenderer.RenderToString("./Node/prerenderPage"); + + if (!string.IsNullOrEmpty(result.RedirectUrl)) + { + return Redirect(result.RedirectUrl); + } + + ViewData["PrerenderedHtml"] = result.Html; + ViewData["PrerenderedGlobals"] = result.CreateGlobalsAssignmentScript(); + return View(); + } + public IActionResult Error() { return View("~/Views/Shared/Error.cshtml"); diff --git a/samples/misc/NodeServicesExamples/Node/prerenderPage.js b/samples/misc/NodeServicesExamples/Node/prerenderPage.js new file mode 100644 index 00000000..7912a6f3 --- /dev/null +++ b/samples/misc/NodeServicesExamples/Node/prerenderPage.js @@ -0,0 +1,14 @@ +var createServerRenderer = require('aspnet-prerendering').createServerRenderer; + +module.exports = createServerRenderer(function(params) { + return new Promise(function (resolve, reject) { + var message = 'The HTML was returned by the prerendering boot function. ' + + 'The boot function received the following params:' + + '
    ' + JSON.stringify(params, null, 4) + '
    '; + + resolve({ + html: '

    Hello, world!

    ' + message, + globals: { sampleData: { nodeVersion: process.version } } + }); + }); +}); diff --git a/samples/misc/NodeServicesExamples/NodeServicesExamples.csproj b/samples/misc/NodeServicesExamples/NodeServicesExamples.csproj index 4bbb9ec1..eedacabc 100644 --- a/samples/misc/NodeServicesExamples/NodeServicesExamples.csproj +++ b/samples/misc/NodeServicesExamples/NodeServicesExamples.csproj @@ -9,7 +9,7 @@ - + diff --git a/samples/misc/NodeServicesExamples/Startup.cs b/samples/misc/NodeServicesExamples/Startup.cs index 4ef4802a..26f2ae86 100755 --- a/samples/misc/NodeServicesExamples/Startup.cs +++ b/samples/misc/NodeServicesExamples/Startup.cs @@ -17,6 +17,7 @@ public void ConfigureServices(IServiceCollection services) // Enable Node Services services.AddNodeServices(); + services.AddSpaPrerenderer(); } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. diff --git a/samples/misc/NodeServicesExamples/Views/Home/Index.cshtml b/samples/misc/NodeServicesExamples/Views/Home/Index.cshtml index 0b138445..bbdc5631 100644 --- a/samples/misc/NodeServicesExamples/Views/Home/Index.cshtml +++ b/samples/misc/NodeServicesExamples/Views/Home/Index.cshtml @@ -9,4 +9,5 @@ diff --git a/samples/misc/NodeServicesExamples/Views/Home/Prerendering.cshtml b/samples/misc/NodeServicesExamples/Views/Home/Prerendering.cshtml new file mode 100644 index 00000000..bd5fff9d --- /dev/null +++ b/samples/misc/NodeServicesExamples/Views/Home/Prerendering.cshtml @@ -0,0 +1,21 @@ +

    Server-side prerendering

    + +

    + This sample demonstrates how you can invoke a JavaScript module that contains + prerendering logic for a Single-Page Application framework. +

    +

    + Your prerendering boot function will receive parameters that describe the page + being rendered and any data supplied by the .NET code. The return value should be + a promise that resolves with data to be injected into the page, such as the + rendered HTML and any global data that should be made available to client-side code. +

    + +@Html.Raw(ViewData["PrerenderedHtml"]) + + + + diff --git a/samples/misc/NodeServicesExamples/package.json b/samples/misc/NodeServicesExamples/package.json index 58b8a32e..9787758b 100644 --- a/samples/misc/NodeServicesExamples/package.json +++ b/samples/misc/NodeServicesExamples/package.json @@ -2,6 +2,7 @@ "name": "nodeservicesexamples", "version": "0.0.0", "dependencies": { + "aspnet-prerendering": "^2.0.6", "babel-core": "^6.7.4", "babel-preset-es2015": "^6.6.0", "node-chartist": "^1.0.2" diff --git a/src/Microsoft.AspNetCore.SpaServices/Prerendering/DefaultSpaPrerenderer.cs b/src/Microsoft.AspNetCore.SpaServices/Prerendering/DefaultSpaPrerenderer.cs new file mode 100644 index 00000000..946f96d3 --- /dev/null +++ b/src/Microsoft.AspNetCore.SpaServices/Prerendering/DefaultSpaPrerenderer.cs @@ -0,0 +1,49 @@ +using System.Threading; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.NodeServices; +using System.Threading.Tasks; + +namespace Microsoft.AspNetCore.SpaServices.Prerendering +{ + /// + /// Default implementation of a DI service that provides convenient access to + /// server-side prerendering APIs. This is an alternative to prerendering via + /// the asp-prerender-module tag helper. + /// + internal class DefaultSpaPrerenderer : ISpaPrerenderer + { + private readonly string _applicationBasePath; + private readonly CancellationToken _applicationStoppingToken; + private readonly IHttpContextAccessor _httpContextAccessor; + private readonly INodeServices _nodeServices; + + public DefaultSpaPrerenderer( + INodeServices nodeServices, + IApplicationLifetime applicationLifetime, + IHostingEnvironment hostingEnvironment, + IHttpContextAccessor httpContextAccessor) + { + _applicationBasePath = hostingEnvironment.ContentRootPath; + _applicationStoppingToken = applicationLifetime.ApplicationStopping; + _httpContextAccessor = httpContextAccessor; + _nodeServices = nodeServices; + } + + public Task RenderToString( + string moduleName, + string exportName = null, + object customDataParameter = null, + int timeoutMilliseconds = default(int)) + { + return Prerenderer.RenderToString( + _applicationBasePath, + _nodeServices, + _applicationStoppingToken, + new JavaScriptModuleExport(moduleName) { ExportName = exportName }, + _httpContextAccessor.HttpContext, + customDataParameter, + timeoutMilliseconds); + } + } +} diff --git a/src/Microsoft.AspNetCore.SpaServices/Prerendering/ISpaPrerenderer.cs b/src/Microsoft.AspNetCore.SpaServices/Prerendering/ISpaPrerenderer.cs new file mode 100644 index 00000000..183d4ae6 --- /dev/null +++ b/src/Microsoft.AspNetCore.SpaServices/Prerendering/ISpaPrerenderer.cs @@ -0,0 +1,28 @@ +using System.Threading.Tasks; + +namespace Microsoft.AspNetCore.SpaServices.Prerendering +{ + /// + /// Represents a service that can perform server-side prerendering for + /// JavaScript-based Single Page Applications. This is an alternative + /// to using the 'asp-prerender-module' tag helper. + /// + public interface ISpaPrerenderer + { + /// + /// Invokes JavaScript code to perform server-side prerendering for a + /// Single-Page Application. This is an alternative to using the + /// 'asp-prerender-module' tag helper. + /// + /// The JavaScript module that exports a prerendering function. + /// The name of the export from the JavaScript module, if it is not the default export. + /// An optional JSON-serializable object to pass to the JavaScript prerendering function. + /// If specified, the prerendering task will time out after this duration if not already completed. + /// + Task RenderToString( + string moduleName, + string exportName = null, + object customDataParameter = null, + int timeoutMilliseconds = default(int)); + } +} diff --git a/src/Microsoft.AspNetCore.SpaServices/Prerendering/PrerenderTagHelper.cs b/src/Microsoft.AspNetCore.SpaServices/Prerendering/PrerenderTagHelper.cs index c2c53080..ffa982e0 100644 --- a/src/Microsoft.AspNetCore.SpaServices/Prerendering/PrerenderTagHelper.cs +++ b/src/Microsoft.AspNetCore.SpaServices/Prerendering/PrerenderTagHelper.cs @@ -1,14 +1,11 @@ using System; -using System.Text; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Mvc.ViewFeatures; using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.AspNetCore.NodeServices; using Microsoft.AspNetCore.Razor.TagHelpers; -using Newtonsoft.Json; namespace Microsoft.AspNetCore.SpaServices.Prerendering { @@ -90,19 +87,6 @@ public PrerenderTagHelper(IServiceProvider serviceProvider) /// A representing the operation. public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output) { - // We want to pass the original, unencoded incoming URL data through to Node, so that - // server-side code has the same view of the URL as client-side code (on the client, - // location.pathname returns an unencoded string). - // The following logic handles special characters in URL paths in the same way that - // Node and client-side JS does. For example, the path "/a=b%20c" gets passed through - // unchanged (whereas other .NET APIs do change it - Path.Value will return it as - // "/a=b c" and Path.ToString() will return it as "/a%3db%20c") - var requestFeature = ViewContext.HttpContext.Features.Get(); - var unencodedPathAndQuery = requestFeature.RawTarget; - - var request = ViewContext.HttpContext.Request; - var unencodedAbsoluteUrl = $"{request.Scheme}://{request.Host}{unencodedPathAndQuery}"; - var result = await Prerenderer.RenderToString( _applicationBasePath, _nodeServices, @@ -111,11 +95,9 @@ public override async Task ProcessAsync(TagHelperContext context, TagHelperOutpu { ExportName = ExportName }, - unencodedAbsoluteUrl, - unencodedPathAndQuery, + ViewContext.HttpContext, CustomDataParameter, - TimeoutMillisecondsParameter, - request.PathBase.ToString()); + TimeoutMillisecondsParameter); if (!string.IsNullOrEmpty(result.RedirectUrl)) { @@ -134,19 +116,10 @@ public override async Task ProcessAsync(TagHelperContext context, TagHelperOutpu // Also attach any specified globals to the 'window' object. This is useful for transferring // general state between server and client. - if (result.Globals != null) + var globalsScript = result.CreateGlobalsAssignmentScript(); + if (!string.IsNullOrEmpty(globalsScript)) { - var stringBuilder = new StringBuilder(); - foreach (var property in result.Globals.Properties()) - { - stringBuilder.AppendFormat("window.{0} = {1};", - property.Name, - property.Value.ToString(Formatting.None)); - } - if (stringBuilder.Length > 0) - { - output.PostElement.SetHtmlContent($""); - } + output.PostElement.SetHtmlContent($""); } } } diff --git a/src/Microsoft.AspNetCore.SpaServices/Prerendering/Prerenderer.cs b/src/Microsoft.AspNetCore.SpaServices/Prerendering/Prerenderer.cs index e7ce8415..4e2fb16a 100644 --- a/src/Microsoft.AspNetCore.SpaServices/Prerendering/Prerenderer.cs +++ b/src/Microsoft.AspNetCore.SpaServices/Prerendering/Prerenderer.cs @@ -2,6 +2,8 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.NodeServices; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.Features; namespace Microsoft.AspNetCore.SpaServices.Prerendering { @@ -14,6 +16,40 @@ public static class Prerenderer private static StringAsTempFile NodeScript; + internal static Task RenderToString( + string applicationBasePath, + INodeServices nodeServices, + CancellationToken applicationStoppingToken, + JavaScriptModuleExport bootModule, + HttpContext httpContext, + object customDataParameter, + int timeoutMilliseconds) + { + // We want to pass the original, unencoded incoming URL data through to Node, so that + // server-side code has the same view of the URL as client-side code (on the client, + // location.pathname returns an unencoded string). + // The following logic handles special characters in URL paths in the same way that + // Node and client-side JS does. For example, the path "/a=b%20c" gets passed through + // unchanged (whereas other .NET APIs do change it - Path.Value will return it as + // "/a=b c" and Path.ToString() will return it as "/a%3db%20c") + var requestFeature = httpContext.Features.Get(); + var unencodedPathAndQuery = requestFeature.RawTarget; + + var request = httpContext.Request; + var unencodedAbsoluteUrl = $"{request.Scheme}://{request.Host}{unencodedPathAndQuery}"; + + return RenderToString( + applicationBasePath, + nodeServices, + applicationStoppingToken, + bootModule, + unencodedAbsoluteUrl, + unencodedPathAndQuery, + customDataParameter, + timeoutMilliseconds, + request.PathBase.ToString()); + } + /// /// Performs server-side prerendering by invoking code in Node.js. /// diff --git a/src/Microsoft.AspNetCore.SpaServices/Prerendering/PrerenderingServiceCollectionExtensions.cs b/src/Microsoft.AspNetCore.SpaServices/Prerendering/PrerenderingServiceCollectionExtensions.cs new file mode 100644 index 00000000..2a6eb0b9 --- /dev/null +++ b/src/Microsoft.AspNetCore.SpaServices/Prerendering/PrerenderingServiceCollectionExtensions.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Text; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.NodeServices; +using Microsoft.AspNetCore.SpaServices.Prerendering; +using Microsoft.Extensions.DependencyInjection.Extensions; + +namespace Microsoft.Extensions.DependencyInjection +{ + /// + /// Extension methods for setting up prerendering features in an . + /// + public static class PrerenderingServiceCollectionExtensions + { + /// + /// Configures the dependency injection system to supply an implementation + /// of . + /// + /// The . + public static void AddSpaPrerenderer(this IServiceCollection serviceCollection) + { + serviceCollection.TryAddSingleton(); + serviceCollection.AddSingleton(); + } + } +} diff --git a/src/Microsoft.AspNetCore.SpaServices/Prerendering/RenderToStringResult.cs b/src/Microsoft.AspNetCore.SpaServices/Prerendering/RenderToStringResult.cs index a213baf0..1a2e1563 100644 --- a/src/Microsoft.AspNetCore.SpaServices/Prerendering/RenderToStringResult.cs +++ b/src/Microsoft.AspNetCore.SpaServices/Prerendering/RenderToStringResult.cs @@ -1,4 +1,6 @@ +using Newtonsoft.Json; using Newtonsoft.Json.Linq; +using System.Text; namespace Microsoft.AspNetCore.SpaServices.Prerendering { @@ -30,5 +32,29 @@ public class RenderToStringResult /// If set, specifies the HTTP status code that should be sent back with the server response. ///     public int? StatusCode { get; set; } + + /// + /// Constructs a block of JavaScript code that assigns data from the + /// property to the global namespace. + /// + /// A block of JavaScript code. + public string CreateGlobalsAssignmentScript() + { + if (Globals == null) + { + return string.Empty; + } + + var stringBuilder = new StringBuilder(); + + foreach (var property in Globals.Properties()) + { + stringBuilder.AppendFormat("window.{0} = {1};", + property.Name, + property.Value.ToString(Formatting.None)); + } + + return stringBuilder.ToString(); + } } } \ No newline at end of file From 076b5304e0dc69b5499530c48e0465c121c6de03 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Mon, 3 Jul 2017 14:32:29 +0100 Subject: [PATCH 155/411] Update templates to reference latest preview3 packages --- templates/AngularSpa/AngularSpa.csproj | 12 ++++++------ templates/AureliaSpa/AureliaSpa.csproj | 10 +++++----- templates/KnockoutSpa/KnockoutSpa.csproj | 10 +++++----- templates/ReactReduxSpa/ReactReduxSpa.csproj | 10 +++++----- templates/ReactSpa/ReactSpa.csproj | 10 +++++----- templates/VueSpa/VueSpa.csproj | 10 +++++----- 6 files changed, 31 insertions(+), 31 deletions(-) diff --git a/templates/AngularSpa/AngularSpa.csproj b/templates/AngularSpa/AngularSpa.csproj index 2f30a284..e3b3ad82 100644 --- a/templates/AngularSpa/AngularSpa.csproj +++ b/templates/AngularSpa/AngularSpa.csproj @@ -9,17 +9,17 @@ - + - - - - + + + + - + diff --git a/templates/AureliaSpa/AureliaSpa.csproj b/templates/AureliaSpa/AureliaSpa.csproj index 3277a6c8..3321046b 100644 --- a/templates/AureliaSpa/AureliaSpa.csproj +++ b/templates/AureliaSpa/AureliaSpa.csproj @@ -9,13 +9,13 @@ - + - - - - + + + + diff --git a/templates/KnockoutSpa/KnockoutSpa.csproj b/templates/KnockoutSpa/KnockoutSpa.csproj index 3277a6c8..3321046b 100644 --- a/templates/KnockoutSpa/KnockoutSpa.csproj +++ b/templates/KnockoutSpa/KnockoutSpa.csproj @@ -9,13 +9,13 @@ - + - - - - + + + + diff --git a/templates/ReactReduxSpa/ReactReduxSpa.csproj b/templates/ReactReduxSpa/ReactReduxSpa.csproj index d055861e..0968b417 100644 --- a/templates/ReactReduxSpa/ReactReduxSpa.csproj +++ b/templates/ReactReduxSpa/ReactReduxSpa.csproj @@ -9,13 +9,13 @@ - + - - - - + + + + diff --git a/templates/ReactSpa/ReactSpa.csproj b/templates/ReactSpa/ReactSpa.csproj index 3277a6c8..3321046b 100644 --- a/templates/ReactSpa/ReactSpa.csproj +++ b/templates/ReactSpa/ReactSpa.csproj @@ -9,13 +9,13 @@ - + - - - - + + + + diff --git a/templates/VueSpa/VueSpa.csproj b/templates/VueSpa/VueSpa.csproj index 3277a6c8..3321046b 100644 --- a/templates/VueSpa/VueSpa.csproj +++ b/templates/VueSpa/VueSpa.csproj @@ -9,13 +9,13 @@ - + - - - - + + + + From 391ceec559cf9e4c568cbe6a792d32c0f3a8ca0a Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Mon, 3 Jul 2017 14:32:43 +0100 Subject: [PATCH 156/411] Update AppVeyor build to use .NET Core 2.0 Preview 3 --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 7de4d7cd..8d5ed193 100755 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,8 +3,8 @@ init: install: - ps: Install-Product node 6.9.2 x64 # .NET Core SDK binaries - # Download .NET Core 2.0 Preview 2 SDK and add to PATH - - ps: $urlCurrent = "https://dotnetcli.azureedge.net/dotnet/Sdk/2.0.0-preview2-006497/dotnet-sdk-2.0.0-preview2-006497-win-x64.zip" + # Download .NET Core 2.0 Preview 3 SDK and add to PATH + - ps: $urlCurrent = "https://dotnetcli.azureedge.net/dotnet/Sdk/2.0.0-preview3-006638/dotnet-sdk-2.0.0-preview3-006638-win-x64.zip" - ps: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetsdk" - ps: mkdir $env:DOTNET_INSTALL_DIR -Force | Out-Null - ps: $tempFileCurrent = [System.IO.Path]::Combine([System.IO.Path]::GetTempPath(), [System.IO.Path]::GetRandomFileName()) From f72ebbd66ec14746810dbc1fc03865fc827a0fb5 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Mon, 3 Jul 2017 14:33:44 +0100 Subject: [PATCH 157/411] Remove redundant preview2 NuGet feed reference --- NuGet.config | 1 - 1 file changed, 1 deletion(-) diff --git a/NuGet.config b/NuGet.config index fa0dd444..c4bc056c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -2,7 +2,6 @@ - From 6e1fa2b2c3fea5d3d53c1ec5299b9a9593f91160 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Mon, 3 Jul 2017 14:44:40 +0100 Subject: [PATCH 158/411] Use ASP.NET Core CI NuGet feed to enable access to preview3 packages --- NuGet.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NuGet.config b/NuGet.config index c4bc056c..f4952688 100644 --- a/NuGet.config +++ b/NuGet.config @@ -2,7 +2,7 @@ - + From 5b634ee33c02239e9b320a51cb236054d243bff2 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Mon, 3 Jul 2017 15:50:16 +0100 Subject: [PATCH 159/411] Remove "dotnet restore" post-action from templates for consistency with stock Web templates --- templates/package-builder/src/build/build.ts | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/templates/package-builder/src/build/build.ts b/templates/package-builder/src/build/build.ts index cb549b55..a7aa3828 100644 --- a/templates/package-builder/src/build/build.ts +++ b/templates/package-builder/src/build/build.ts @@ -206,23 +206,10 @@ function buildDotNetNewNuGetPackage(packageId: string) { HostIdentifier: { type: 'bind', binding: 'HostIdentifier' - }, - skipRestore: { - type: 'parameter', - datatype: 'bool', - description: 'If specified, skips the automatic restore of packages on project creation.', - defaultValue: 'false' } }, tags: { language: 'C#', type: 'project' }, postActions: [ - { - condition: '(!skipRestore)', - description: 'Restores NuGet packages required by this project.', - manualInstructions: [{ text: 'Run \'dotnet restore\'' }], - actionId: '210D431B-A78B-4D2F-B762-4ED3E3EA9025', - continueOnError: true - }, /* // Currently it doesn't appear to be possible to run `npm install` from a // postAction, due to https://github.com/dotnet/templating/issues/849 @@ -258,10 +245,6 @@ function buildDotNetNewNuGetPackage(packageId: string) { }, Framework: { longName: 'framework' - }, - skipRestore: { - longName: 'no-restore', - shortName: '' } } }, null, 2)); From 2c4bc302decd887dcbcaeceff832a38bc6119863 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Mon, 3 Jul 2017 14:06:26 -0700 Subject: [PATCH 160/411] Update LICENSE.txt text --- LICENSE.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index 0bdc1962..7b2956ec 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,10 +1,12 @@ -Copyright (c) .NET Foundation. All rights reserved. +Copyright (c) .NET Foundation and Contributors + +All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use -these files except in compliance with the License. You may obtain a copy of the +this file except in compliance with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR From 943fb2f482074e918ebfc64ae71f0c0120da02fd Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 6 Jul 2017 11:13:24 +0100 Subject: [PATCH 161/411] In core packages, set otherwise builds are super slow --- .../Microsoft.AspNetCore.NodeServices.Sockets.csproj | 1 + .../Microsoft.AspNetCore.NodeServices.csproj | 1 + .../Microsoft.AspNetCore.SpaServices.csproj | 1 + 3 files changed, 3 insertions(+) diff --git a/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj b/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj index 91b1a4b4..1e3e542b 100644 --- a/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj +++ b/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj @@ -10,6 +10,7 @@ + diff --git a/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj b/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj index cbf78289..7f7822e2 100644 --- a/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj +++ b/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj @@ -11,6 +11,7 @@ + diff --git a/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj b/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj index 5d905738..730c9444 100644 --- a/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj +++ b/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj @@ -11,6 +11,7 @@ + From 27f59c69715f5161a81e0224ab57d6a22cd1c257 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 5 Jul 2017 11:26:35 +0100 Subject: [PATCH 162/411] Make domain-task/fetch disable HTTPS cert validation when making relative requests to own server as workaround for #1089 --- .../npm/domain-task/package.json | 3 +- .../npm/domain-task/src/fetch.ts | 38 +++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/domain-task/package.json b/src/Microsoft.AspNetCore.SpaServices/npm/domain-task/package.json index 349bc986..7a53414f 100644 --- a/src/Microsoft.AspNetCore.SpaServices/npm/domain-task/package.json +++ b/src/Microsoft.AspNetCore.SpaServices/npm/domain-task/package.json @@ -1,6 +1,6 @@ { "name": "domain-task", - "version": "3.0.0", + "version": "3.0.2", "description": "Tracks outstanding operations for a logical thread of execution", "main": "index.js", "scripts": { @@ -18,6 +18,7 @@ }, "dependencies": { "domain-context": "^0.5.1", + "is-absolute-url": "^2.1.0", "isomorphic-fetch": "^2.2.1" }, "devDependencies": { diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/domain-task/src/fetch.ts b/src/Microsoft.AspNetCore.SpaServices/npm/domain-task/src/fetch.ts index acca594d..3bd76ca5 100644 --- a/src/Microsoft.AspNetCore.SpaServices/npm/domain-task/src/fetch.ts +++ b/src/Microsoft.AspNetCore.SpaServices/npm/domain-task/src/fetch.ts @@ -1,11 +1,16 @@ import * as url from 'url'; import * as domain from 'domain'; import * as domainContext from 'domain-context'; +import * as isAbsoluteUrl from 'is-absolute-url'; import { baseUrl } from './main'; const isomorphicFetch = require('isomorphic-fetch'); const isNode = typeof process === 'object' && process.versions && !!process.versions.node; +const nodeHttps = isNode && require('https'); function issueRequest(baseUrl: string, req: string | Request, init?: RequestInit): Promise { + const reqUrl = (req instanceof Request) ? req.url : req; + const isRelativeUrl = reqUrl && !isAbsoluteUrl(reqUrl); + // Resolve relative URLs if (baseUrl) { if (req instanceof Request) { @@ -25,9 +30,42 @@ function issueRequest(baseUrl: string, req: string | Request, init?: RequestInit `); } + init = applyHttpsAgentPolicy(init, isRelativeUrl); return isomorphicFetch(req, init); } +function applyHttpsAgentPolicy(init: RequestInit, isRelativeUrl: boolean): RequestInit { + // HTTPS is awkward in Node because it uses a built-in list of CAs, rather than recognizing + // the OS's system-level CA list. There are dozens of issues filed against Node about this, + // but still (as of v8.0.0) no resolution besides manually duplicating your CA config. + // + // The biggest problem for typical isomorphic-SPA development this causes is that if you're + // using a self-signed localhost cert in development, Node won't be able to make API calls + // to it (e.g., https://github.com/aspnet/JavaScriptServices/issues/1089). Developers could + // fix this by either manually configuring the cert in Node (which is extremely inconvenient, + // especially if multiple devs on a team have different self-signed localhost certs), or by + // disabling cert verification on their API requests. + // + // Fortunately, 'domain-task/fetch' knows when you're making a relative-URL request to your + // own web server (as opposed to an arbitrary request to anywhere else). In this specific case, + // there's no real point in cert verification, since the request never even leaves the machine + // so a MitM attack isn't meaningful. So by default, when your code is running in Node and + // is making a relative-URL request, *and* if you haven't explicitly configured any option + // for 'agent' (which would let you set up other HTTPS-handling policies), then we automatically + // disable cert verification for that request. + if (isNode && isRelativeUrl) { + const hasAgentConfig = init && ('agent' in init); + if (!hasAgentConfig) { + const agentForRequest = new (nodeHttps.Agent)({ rejectUnauthorized: false }); + + init = init || {}; + (init as any).agent = agentForRequest; + } + } + + return init; +} + export function fetch(url: string | Request, init?: RequestInit): Promise { // As of domain-task 2.0.0, we no longer auto-add the 'fetch' promise to the current domain task list. // This is because it's misleading to do so, and can result in race-condition bugs, e.g., From 721e3c45fd8e7e4657e4c6d5d0ed03a435f71b9e Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 6 Jul 2017 14:50:34 +0100 Subject: [PATCH 163/411] Update ReactReduxSpa NPM shrinkwrap file --- templates/ReactReduxSpa/npm-shrinkwrap.json | 140 +++++++++++++------- templates/ReactReduxSpa/package.json | 2 +- 2 files changed, 91 insertions(+), 51 deletions(-) diff --git a/templates/ReactReduxSpa/npm-shrinkwrap.json b/templates/ReactReduxSpa/npm-shrinkwrap.json index 59278599..cd862448 100644 --- a/templates/ReactReduxSpa/npm-shrinkwrap.json +++ b/templates/ReactReduxSpa/npm-shrinkwrap.json @@ -8,14 +8,14 @@ "resolved": "https://registry.npmjs.org/@types/history/-/history-4.5.1.tgz" }, "@types/node": { - "version": "8.0.3", + "version": "8.0.7", "from": "@types/node@*", - "resolved": "https://registry.npmjs.org/@types/node/-/node-8.0.3.tgz" + "resolved": "https://registry.npmjs.org/@types/node/-/node-8.0.7.tgz" }, "@types/react": { - "version": "15.0.24", - "from": "@types/react@15.0.24", - "resolved": "https://registry.npmjs.org/@types/react/-/react-15.0.24.tgz" + "version": "15.0.29", + "from": "@types/react@15.0.29", + "resolved": "https://registry.npmjs.org/@types/react/-/react-15.0.29.tgz" }, "@types/react-dom": { "version": "15.5.0", @@ -68,9 +68,9 @@ "resolved": "https://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.13.0.tgz" }, "acorn": { - "version": "5.0.3", + "version": "5.1.1", "from": "acorn@>=5.0.0 <6.0.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.0.3.tgz" + "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.1.1.tgz" }, "acorn-dynamic-import": { "version": "2.0.2", @@ -140,9 +140,9 @@ "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz" }, "arr-flatten": { - "version": "1.0.3", + "version": "1.1.0", "from": "arr-flatten@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.3.tgz" + "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz" }, "array-unique": { "version": "0.2.1", @@ -371,9 +371,9 @@ "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-1.6.1.tgz" }, "caniuse-db": { - "version": "1.0.30000694", + "version": "1.0.30000697", "from": "caniuse-db@>=1.0.30000634 <2.0.0", - "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000694.tgz" + "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000697.tgz" }, "center-align": { "version": "0.1.3", @@ -586,9 +586,9 @@ "resolved": "https://registry.npmjs.org/domain-context/-/domain-context-0.5.1.tgz" }, "domain-task": { - "version": "3.0.0", - "from": "domain-task@>=3.0.0 <4.0.0", - "resolved": "https://registry.npmjs.org/domain-task/-/domain-task-3.0.0.tgz" + "version": "3.0.2", + "from": "domain-task@3.0.2", + "resolved": "https://registry.npmjs.org/domain-task/-/domain-task-3.0.2.tgz" }, "ee-first": { "version": "1.1.1", @@ -596,9 +596,9 @@ "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz" }, "electron-to-chromium": { - "version": "1.3.14", + "version": "1.3.15", "from": "electron-to-chromium@>=1.2.7 <2.0.0", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.14.tgz" + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.15.tgz" }, "elliptic": { "version": "6.4.0", @@ -621,9 +621,9 @@ "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz" }, "enhanced-resolve": { - "version": "3.1.0", + "version": "3.3.0", "from": "enhanced-resolve@>=3.1.0 <4.0.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.1.0.tgz", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.3.0.tgz", "dependencies": { "memory-fs": { "version": "0.4.1", @@ -813,9 +813,9 @@ "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz" }, "hash.js": { - "version": "1.1.1", + "version": "1.1.3", "from": "hash.js@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.1.tgz" + "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz" }, "history": { "version": "4.6.1", @@ -833,9 +833,9 @@ "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz" }, "hosted-git-info": { - "version": "2.4.2", + "version": "2.5.0", "from": "hosted-git-info@>=2.1.4 <3.0.0", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.4.2.tgz" + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz" }, "html-comment-regex": { "version": "1.1.1", @@ -1013,9 +1013,9 @@ "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.1.9.tgz" }, "js-tokens": { - "version": "3.0.1", + "version": "3.0.2", "from": "js-tokens@>=3.0.0 <4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.1.tgz" + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz" }, "js-yaml": { "version": "3.7.0", @@ -1205,9 +1205,9 @@ "resolved": "https://registry.npmjs.org/node-noop/-/node-noop-1.0.0.tgz" }, "normalize-package-data": { - "version": "2.3.8", + "version": "2.4.0", "from": "normalize-package-data@>=2.3.2 <3.0.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.8.tgz" + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz" }, "normalize-path": { "version": "2.1.1", @@ -1438,20 +1438,30 @@ "from": "postcss-modules-extract-imports@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.1.0.tgz", "dependencies": { + "ansi-styles": { + "version": "3.1.0", + "from": "ansi-styles@>=3.1.0 <4.0.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.1.0.tgz" + }, + "chalk": { + "version": "2.0.1", + "from": "chalk@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz" + }, "has-flag": { "version": "2.0.0", "from": "has-flag@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz" }, "postcss": { - "version": "6.0.3", + "version": "6.0.6", "from": "postcss@>=6.0.1 <7.0.0", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.3.tgz" + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.6.tgz" }, "supports-color": { - "version": "4.0.0", - "from": "supports-color@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.0.0.tgz" + "version": "4.1.0", + "from": "supports-color@>=4.1.0 <5.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.1.0.tgz" } } }, @@ -1460,20 +1470,30 @@ "from": "postcss-modules-local-by-default@>=1.0.1 <2.0.0", "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz", "dependencies": { + "ansi-styles": { + "version": "3.1.0", + "from": "ansi-styles@>=3.1.0 <4.0.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.1.0.tgz" + }, + "chalk": { + "version": "2.0.1", + "from": "chalk@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz" + }, "has-flag": { "version": "2.0.0", "from": "has-flag@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz" }, "postcss": { - "version": "6.0.3", + "version": "6.0.6", "from": "postcss@>=6.0.1 <7.0.0", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.3.tgz" + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.6.tgz" }, "supports-color": { - "version": "4.0.0", - "from": "supports-color@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.0.0.tgz" + "version": "4.1.0", + "from": "supports-color@>=4.1.0 <5.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.1.0.tgz" } } }, @@ -1482,20 +1502,30 @@ "from": "postcss-modules-scope@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz", "dependencies": { + "ansi-styles": { + "version": "3.1.0", + "from": "ansi-styles@>=3.1.0 <4.0.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.1.0.tgz" + }, + "chalk": { + "version": "2.0.1", + "from": "chalk@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz" + }, "has-flag": { "version": "2.0.0", "from": "has-flag@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz" }, "postcss": { - "version": "6.0.3", + "version": "6.0.6", "from": "postcss@>=6.0.1 <7.0.0", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.3.tgz" + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.6.tgz" }, "supports-color": { - "version": "4.0.0", - "from": "supports-color@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.0.0.tgz" + "version": "4.1.0", + "from": "supports-color@>=4.1.0 <5.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.1.0.tgz" } } }, @@ -1504,20 +1534,30 @@ "from": "postcss-modules-values@>=1.1.0 <2.0.0", "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz", "dependencies": { + "ansi-styles": { + "version": "3.1.0", + "from": "ansi-styles@>=3.1.0 <4.0.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.1.0.tgz" + }, + "chalk": { + "version": "2.0.1", + "from": "chalk@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz" + }, "has-flag": { "version": "2.0.0", "from": "has-flag@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz" }, "postcss": { - "version": "6.0.3", + "version": "6.0.6", "from": "postcss@>=6.0.1 <7.0.0", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.3.tgz" + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.6.tgz" }, "supports-color": { - "version": "4.0.0", - "from": "supports-color@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.0.0.tgz" + "version": "4.1.0", + "from": "supports-color@>=4.1.0 <5.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.1.0.tgz" } } }, @@ -1738,9 +1778,9 @@ "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz" }, "readable-stream": { - "version": "2.3.2", + "version": "2.3.3", "from": "readable-stream@>=2.0.1 <3.0.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.2.tgz" + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz" }, "readdirp": { "version": "2.1.0", @@ -1849,7 +1889,7 @@ }, "safe-buffer": { "version": "5.1.1", - "from": "safe-buffer@>=5.1.0 <5.2.0", + "from": "safe-buffer@>=5.1.1 <5.2.0", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz" }, "sax": { @@ -1954,7 +1994,7 @@ }, "string_decoder": { "version": "1.0.3", - "from": "string_decoder@>=1.0.0 <1.1.0", + "from": "string_decoder@>=1.0.3 <1.1.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz" }, "string-width": { diff --git a/templates/ReactReduxSpa/package.json b/templates/ReactReduxSpa/package.json index 47c4a44d..bb2d240f 100644 --- a/templates/ReactReduxSpa/package.json +++ b/templates/ReactReduxSpa/package.json @@ -18,7 +18,7 @@ "awesome-typescript-loader": "3.1.3", "bootstrap": "3.3.7", "css-loader": "0.28.1", - "domain-task": "^3.0.0", + "domain-task": "^3.0.2", "event-source-polyfill": "0.0.9", "extract-text-webpack-plugin": "2.1.0", "file-loader": "0.11.1", From 4ba03589879dd40c082f0e7ed9ad104f789d779c Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 6 Jul 2017 14:57:07 +0100 Subject: [PATCH 164/411] In AngularSpa template, log any FetchData errors but don't stop prerendering completely --- .../ClientApp/app/components/fetchdata/fetchdata.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/AngularSpa/ClientApp/app/components/fetchdata/fetchdata.component.ts b/templates/AngularSpa/ClientApp/app/components/fetchdata/fetchdata.component.ts index 9c98b76e..6296925e 100644 --- a/templates/AngularSpa/ClientApp/app/components/fetchdata/fetchdata.component.ts +++ b/templates/AngularSpa/ClientApp/app/components/fetchdata/fetchdata.component.ts @@ -11,7 +11,7 @@ export class FetchDataComponent { constructor(http: Http, @Inject('ORIGIN_URL') originUrl: string) { http.get(originUrl + '/api/SampleData/WeatherForecasts').subscribe(result => { this.forecasts = result.json() as WeatherForecast[]; - }); + }, error => console.error(error)); } } From 0993f46c9efbcc431ceb2cb692f84e52f4b7a0ad Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 6 Jul 2017 10:38:00 -0700 Subject: [PATCH 165/411] React to aspnet/BuildTools#293 [ci skip] --- build/dependencies.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/dependencies.props b/build/dependencies.props index 1d945fde..fdda160f 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -2,7 +2,7 @@ 2.0.0-* 5.0.2 - 2.1.0-* + 2.0.1-* 10.0.1 2.0.0-* 2.0.0-* From 056b955f52cd93eb66f1a485dae61fd26beb58ea Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Thu, 6 Jul 2017 12:15:49 -0700 Subject: [PATCH 166/411] Set "TreatWarningsAsErrors" before NuGet restore * Ensures our build stays clean of NuGet warnings --- build/common.props | 1 + 1 file changed, 1 insertion(+) diff --git a/build/common.props b/build/common.props index d9584633..605718f7 100644 --- a/build/common.props +++ b/build/common.props @@ -10,6 +10,7 @@ true true $(VersionSuffix)-$(BuildNumber) + true From 7a56f643f7ee0d4c664f2212eb6e99906b23dc11 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Thu, 6 Jul 2017 15:08:26 -0700 Subject: [PATCH 167/411] Update version suffix for 2.0.0 RTM release --- version.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.props b/version.props index 193a5999..eba6b167 100644 --- a/version.props +++ b/version.props @@ -2,6 +2,6 @@ 2.0.0 - preview3 + rtm From e632d2bb692a22fe2d8f9b6e26105f2e3a0689e4 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Fri, 7 Jul 2017 12:05:07 +0100 Subject: [PATCH 168/411] In domain-task/fetch, only apply HTTPS cert validation workaround for HTTPS requests (not HTTP) --- .../npm/domain-task/package.json | 2 +- .../npm/domain-task/src/fetch.ts | 18 +++++++++++------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/domain-task/package.json b/src/Microsoft.AspNetCore.SpaServices/npm/domain-task/package.json index 7a53414f..b22be854 100644 --- a/src/Microsoft.AspNetCore.SpaServices/npm/domain-task/package.json +++ b/src/Microsoft.AspNetCore.SpaServices/npm/domain-task/package.json @@ -1,6 +1,6 @@ { "name": "domain-task", - "version": "3.0.2", + "version": "3.0.3", "description": "Tracks outstanding operations for a logical thread of execution", "main": "index.js", "scripts": { diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/domain-task/src/fetch.ts b/src/Microsoft.AspNetCore.SpaServices/npm/domain-task/src/fetch.ts index 3bd76ca5..fa576cf6 100644 --- a/src/Microsoft.AspNetCore.SpaServices/npm/domain-task/src/fetch.ts +++ b/src/Microsoft.AspNetCore.SpaServices/npm/domain-task/src/fetch.ts @@ -6,6 +6,7 @@ import { baseUrl } from './main'; const isomorphicFetch = require('isomorphic-fetch'); const isNode = typeof process === 'object' && process.versions && !!process.versions.node; const nodeHttps = isNode && require('https'); +const isHttpsRegex = /^https\:/; function issueRequest(baseUrl: string, req: string | Request, init?: RequestInit): Promise { const reqUrl = (req instanceof Request) ? req.url : req; @@ -30,11 +31,11 @@ function issueRequest(baseUrl: string, req: string | Request, init?: RequestInit `); } - init = applyHttpsAgentPolicy(init, isRelativeUrl); + init = applyHttpsAgentPolicy(init, isRelativeUrl, baseUrl); return isomorphicFetch(req, init); } -function applyHttpsAgentPolicy(init: RequestInit, isRelativeUrl: boolean): RequestInit { +function applyHttpsAgentPolicy(init: RequestInit, isRelativeUrl: boolean, baseUrl: string): RequestInit { // HTTPS is awkward in Node because it uses a built-in list of CAs, rather than recognizing // the OS's system-level CA list. There are dozens of issues filed against Node about this, // but still (as of v8.0.0) no resolution besides manually duplicating your CA config. @@ -54,12 +55,15 @@ function applyHttpsAgentPolicy(init: RequestInit, isRelativeUrl: boolean): Reque // for 'agent' (which would let you set up other HTTPS-handling policies), then we automatically // disable cert verification for that request. if (isNode && isRelativeUrl) { - const hasAgentConfig = init && ('agent' in init); - if (!hasAgentConfig) { - const agentForRequest = new (nodeHttps.Agent)({ rejectUnauthorized: false }); + const isHttps = baseUrl && isHttpsRegex.test(baseUrl); + if (isHttps) { + const hasAgentConfig = init && ('agent' in init); + if (!hasAgentConfig) { + const agentForRequest = new (nodeHttps.Agent)({ rejectUnauthorized: false }); - init = init || {}; - (init as any).agent = agentForRequest; + init = init || {}; + (init as any).agent = agentForRequest; + } } } From 03018f32b7fb5e1eb64998da43eefe88154e955a Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 6 Jul 2017 16:03:33 +0100 Subject: [PATCH 169/411] Update Angular template dependencies --- templates/AngularSpa/npm-shrinkwrap.json | 1110 +++++++++++++++++----- templates/AngularSpa/package.json | 52 +- 2 files changed, 902 insertions(+), 260 deletions(-) diff --git a/templates/AngularSpa/npm-shrinkwrap.json b/templates/AngularSpa/npm-shrinkwrap.json index af9dda9c..6b2c2364 100644 --- a/templates/AngularSpa/npm-shrinkwrap.json +++ b/templates/AngularSpa/npm-shrinkwrap.json @@ -3,71 +3,71 @@ "version": "0.0.0", "dependencies": { "@angular/animations": { - "version": "4.1.2", - "from": "@angular/animations@4.1.2", - "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-4.1.2.tgz" + "version": "4.2.5", + "from": "@angular/animations@4.2.5", + "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-4.2.5.tgz" }, "@angular/common": { - "version": "4.1.2", - "from": "@angular/common@4.1.2", - "resolved": "https://registry.npmjs.org/@angular/common/-/common-4.1.2.tgz" + "version": "4.2.5", + "from": "@angular/common@4.2.5", + "resolved": "https://registry.npmjs.org/@angular/common/-/common-4.2.5.tgz" }, "@angular/compiler": { - "version": "4.1.2", - "from": "@angular/compiler@4.1.2", - "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-4.1.2.tgz" + "version": "4.2.5", + "from": "@angular/compiler@4.2.5", + "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-4.2.5.tgz" }, "@angular/core": { - "version": "4.1.2", - "from": "@angular/core@4.1.2", - "resolved": "https://registry.npmjs.org/@angular/core/-/core-4.1.2.tgz" + "version": "4.2.5", + "from": "@angular/core@4.2.5", + "resolved": "https://registry.npmjs.org/@angular/core/-/core-4.2.5.tgz" }, "@angular/forms": { - "version": "4.1.2", - "from": "@angular/forms@4.1.2", - "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-4.1.2.tgz" + "version": "4.2.5", + "from": "@angular/forms@4.2.5", + "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-4.2.5.tgz" }, "@angular/http": { - "version": "4.1.2", - "from": "@angular/http@4.1.2", - "resolved": "https://registry.npmjs.org/@angular/http/-/http-4.1.2.tgz" + "version": "4.2.5", + "from": "@angular/http@4.2.5", + "resolved": "https://registry.npmjs.org/@angular/http/-/http-4.2.5.tgz" }, "@angular/platform-browser": { - "version": "4.1.2", - "from": "@angular/platform-browser@4.1.2", - "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-4.1.2.tgz" + "version": "4.2.5", + "from": "@angular/platform-browser@4.2.5", + "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-4.2.5.tgz" }, "@angular/platform-browser-dynamic": { - "version": "4.1.2", - "from": "@angular/platform-browser-dynamic@4.1.2", - "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-4.1.2.tgz" + "version": "4.2.5", + "from": "@angular/platform-browser-dynamic@4.2.5", + "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-4.2.5.tgz" }, "@angular/platform-server": { - "version": "4.1.2", - "from": "@angular/platform-server@4.1.2", - "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-4.1.2.tgz" + "version": "4.2.5", + "from": "@angular/platform-server@4.2.5", + "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-4.2.5.tgz" }, "@angular/router": { - "version": "4.1.2", - "from": "@angular/router@4.1.2", - "resolved": "https://registry.npmjs.org/@angular/router/-/router-4.1.2.tgz" + "version": "4.2.5", + "from": "@angular/router@4.2.5", + "resolved": "https://registry.npmjs.org/@angular/router/-/router-4.2.5.tgz" }, "@types/chai": { - "version": "3.5.2", - "from": "@types/chai@3.5.2", - "resolved": "https://registry.npmjs.org/@types/chai/-/chai-3.5.2.tgz", + "version": "4.0.1", + "from": "@types/chai@4.0.1", + "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.0.1.tgz", "dev": true }, "@types/jasmine": { - "version": "2.5.47", - "from": "@types/jasmine@2.5.47", - "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-2.5.47.tgz", + "version": "2.5.53", + "from": "@types/jasmine@2.5.53", + "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-2.5.53.tgz", "dev": true }, "@types/node": { - "version": "7.0.18", - "from": "@types/node@7.0.18", - "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.18.tgz" + "version": "8.0.8", + "from": "@types/node@8.0.8", + "resolved": "https://registry.npmjs.org/@types/node/-/node-8.0.8.tgz" }, "accepts": { "version": "1.3.3", @@ -76,9 +76,9 @@ "dev": true }, "acorn": { - "version": "5.0.3", + "version": "5.1.1", "from": "acorn@>=5.0.0 <6.0.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.0.3.tgz" + "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.1.1.tgz" }, "acorn-dynamic-import": { "version": "2.0.2", @@ -99,9 +99,9 @@ "dev": true }, "ajv": { - "version": "4.11.8", - "from": "ajv@>=4.11.2 <5.0.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz" + "version": "5.2.0", + "from": "ajv@>=5.0.0 <6.0.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.0.tgz" }, "ajv-keywords": { "version": "1.5.1", @@ -111,7 +111,14 @@ "align-text": { "version": "0.1.4", "from": "align-text@>=0.1.3 <0.2.0", - "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz" + "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", + "dependencies": { + "kind-of": { + "version": "3.2.2", + "from": "kind-of@>=3.0.2 <4.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz" + } + } }, "alphanum-sort": { "version": "1.0.2", @@ -146,7 +153,49 @@ "anymatch": { "version": "1.3.0", "from": "anymatch@>=1.3.0 <2.0.0", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.0.tgz" + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.0.tgz", + "dependencies": { + "arr-diff": { + "version": "2.0.0", + "from": "arr-diff@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz" + }, + "array-unique": { + "version": "0.2.1", + "from": "array-unique@>=0.2.1 <0.3.0", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz" + }, + "braces": { + "version": "1.8.5", + "from": "braces@>=1.8.2 <2.0.0", + "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz" + }, + "expand-brackets": { + "version": "0.1.5", + "from": "expand-brackets@>=0.1.4 <0.2.0", + "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz" + }, + "extglob": { + "version": "0.3.2", + "from": "extglob@>=0.3.1 <0.4.0", + "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz" + }, + "is-extglob": { + "version": "1.0.0", + "from": "is-extglob@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz" + }, + "kind-of": { + "version": "3.2.2", + "from": "kind-of@>=3.0.2 <4.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz" + }, + "micromatch": { + "version": "2.3.11", + "from": "micromatch@>=2.1.5 <3.0.0", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz" + } + } }, "argparse": { "version": "1.0.9", @@ -154,14 +203,19 @@ "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz" }, "arr-diff": { - "version": "2.0.0", - "from": "arr-diff@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz" + "version": "4.0.0", + "from": "arr-diff@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz" }, "arr-flatten": { - "version": "1.0.3", - "from": "arr-flatten@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.3.tgz" + "version": "1.1.0", + "from": "arr-flatten@>=1.0.3 <2.0.0", + "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz" + }, + "arr-union": { + "version": "3.1.0", + "from": "arr-union@>=3.1.0 <4.0.0", + "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz" }, "array-slice": { "version": "0.2.3", @@ -170,9 +224,9 @@ "dev": true }, "array-unique": { - "version": "0.2.1", - "from": "array-unique@>=0.2.1 <0.3.0", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz" + "version": "0.3.2", + "from": "array-unique@>=0.3.2 <0.4.0", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz" }, "arraybuffer.slice": { "version": "0.0.6", @@ -227,9 +281,9 @@ "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz" }, "atob": { - "version": "1.1.3", - "from": "atob@>=1.1.0 <1.2.0", - "resolved": "https://registry.npmjs.org/atob/-/atob-1.1.3.tgz" + "version": "2.0.3", + "from": "atob@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/atob/-/atob-2.0.3.tgz" }, "autoprefixer": { "version": "6.7.7", @@ -237,9 +291,9 @@ "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.7.7.tgz" }, "awesome-typescript-loader": { - "version": "3.1.3", - "from": "awesome-typescript-loader@3.1.3", - "resolved": "https://registry.npmjs.org/awesome-typescript-loader/-/awesome-typescript-loader-3.1.3.tgz", + "version": "3.2.1", + "from": "awesome-typescript-loader@3.2.1", + "resolved": "https://registry.npmjs.org/awesome-typescript-loader/-/awesome-typescript-loader-3.2.1.tgz", "dependencies": { "loader-utils": { "version": "1.1.0", @@ -264,6 +318,33 @@ "from": "balanced-match@>=0.4.2 <0.5.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz" }, + "base": { + "version": "0.11.1", + "from": "base@>=0.11.1 <0.12.0", + "resolved": "https://registry.npmjs.org/base/-/base-0.11.1.tgz", + "dependencies": { + "define-property": { + "version": "0.2.5", + "from": "define-property@>=0.2.5 <0.3.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz" + }, + "is-descriptor": { + "version": "0.1.5", + "from": "is-descriptor@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.5.tgz" + }, + "isobject": { + "version": "2.1.0", + "from": "isobject@>=2.1.0 <3.0.0", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz" + }, + "kind-of": { + "version": "3.2.2", + "from": "kind-of@>=3.0.2 <4.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz" + } + } + }, "base64-arraybuffer": { "version": "0.1.5", "from": "base64-arraybuffer@0.1.5", @@ -346,9 +427,9 @@ } }, "braces": { - "version": "1.8.5", - "from": "braces@>=1.8.2 <2.0.0", - "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz" + "version": "2.2.2", + "from": "braces@>=2.2.2 <3.0.0", + "resolved": "https://registry.npmjs.org/braces/-/braces-2.2.2.tgz" }, "brorand": { "version": "1.1.0", @@ -416,6 +497,11 @@ "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.4.0.tgz", "dev": true }, + "cache-base": { + "version": "0.8.5", + "from": "cache-base@>=0.8.4 <0.9.0", + "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-0.8.5.tgz" + }, "callsite": { "version": "1.0.0", "from": "callsite@1.0.0", @@ -438,19 +524,26 @@ "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-1.6.1.tgz" }, "caniuse-db": { - "version": "1.0.30000694", + "version": "1.0.30000697", "from": "caniuse-db@>=1.0.30000634 <2.0.0", - "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000694.tgz" + "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000697.tgz" }, "center-align": { "version": "0.1.3", "from": "center-align@>=0.1.1 <0.2.0", - "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz" + "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz", + "dependencies": { + "lazy-cache": { + "version": "1.0.4", + "from": "lazy-cache@>=1.0.3 <2.0.0", + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz" + } + } }, "chai": { - "version": "3.5.0", - "from": "chai@3.5.0", - "resolved": "https://registry.npmjs.org/chai/-/chai-3.5.0.tgz", + "version": "4.0.2", + "from": "chai@4.0.2", + "resolved": "https://registry.npmjs.org/chai/-/chai-4.0.2.tgz", "dev": true }, "chalk": { @@ -458,6 +551,12 @@ "from": "chalk@>=1.1.0 <2.0.0", "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz" }, + "check-error": { + "version": "1.0.2", + "from": "check-error@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz", + "dev": true + }, "chokidar": { "version": "1.7.0", "from": "chokidar@>=1.4.3 <2.0.0", @@ -473,10 +572,32 @@ "from": "clap@>=1.0.9 <2.0.0", "resolved": "https://registry.npmjs.org/clap/-/clap-1.2.0.tgz" }, + "class-utils": { + "version": "0.3.5", + "from": "class-utils@>=0.3.4 <0.4.0", + "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.5.tgz", + "dependencies": { + "define-property": { + "version": "0.2.5", + "from": "define-property@>=0.2.5 <0.3.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz" + }, + "is-descriptor": { + "version": "0.1.5", + "from": "is-descriptor@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.5.tgz" + }, + "kind-of": { + "version": "3.2.2", + "from": "kind-of@>=3.0.2 <4.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz" + } + } + }, "clean-css": { - "version": "4.1.4", + "version": "4.1.5", "from": "clean-css@>=4.1.0 <4.2.0", - "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.1.4.tgz" + "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.1.5.tgz" }, "cliui": { "version": "2.1.0", @@ -503,6 +624,11 @@ "from": "code-point-at@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz" }, + "collection-visit": { + "version": "0.2.3", + "from": "collection-visit@>=0.2.1 <0.3.0", + "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-0.2.3.tgz" + }, "color": { "version": "0.11.4", "from": "color@>=0.11.0 <0.12.0", @@ -551,10 +677,9 @@ "dev": true }, "component-emitter": { - "version": "1.1.2", - "from": "component-emitter@1.1.2", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz", - "dev": true + "version": "1.2.1", + "from": "component-emitter@>=1.2.1 <2.0.0", + "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz" }, "component-inherit": { "version": "0.0.3", @@ -594,6 +719,11 @@ "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz", "dev": true }, + "copy-descriptor": { + "version": "0.1.1", + "from": "copy-descriptor@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz" + }, "core-js": { "version": "2.4.1", "from": "core-js@>=2.2.0 <3.0.0", @@ -630,10 +760,25 @@ "from": "css@2.2.1", "resolved": "https://registry.npmjs.org/css/-/css-2.2.1.tgz", "dependencies": { + "atob": { + "version": "1.1.3", + "from": "atob@>=1.1.0 <1.2.0", + "resolved": "https://registry.npmjs.org/atob/-/atob-1.1.3.tgz" + }, "source-map": { "version": "0.1.43", "from": "source-map@>=0.1.38 <0.2.0", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz" + }, + "source-map-resolve": { + "version": "0.3.1", + "from": "source-map-resolve@>=0.3.0 <0.4.0", + "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.3.1.tgz" + }, + "source-map-url": { + "version": "0.3.0", + "from": "source-map-url@>=0.3.0 <0.4.0", + "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.3.0.tgz" } } }, @@ -643,9 +788,9 @@ "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz" }, "css-loader": { - "version": "0.28.1", - "from": "css-loader@0.28.1", - "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.28.1.tgz", + "version": "0.28.4", + "from": "css-loader@0.28.4", + "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.28.4.tgz", "dependencies": { "loader-utils": { "version": "1.1.0", @@ -696,19 +841,24 @@ "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz" }, "deep-eql": { - "version": "0.1.3", - "from": "deep-eql@>=0.1.3 <0.2.0", - "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-0.1.3.tgz", + "version": "2.0.2", + "from": "deep-eql@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-2.0.2.tgz", "dev": true, "dependencies": { "type-detect": { - "version": "0.1.1", - "from": "type-detect@0.1.1", - "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-0.1.1.tgz", + "version": "3.0.0", + "from": "type-detect@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-3.0.0.tgz", "dev": true } } }, + "define-property": { + "version": "1.0.0", + "from": "define-property@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz" + }, "defined": { "version": "1.0.0", "from": "defined@>=1.0.0 <2.0.0", @@ -763,9 +913,9 @@ "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz" }, "electron-to-chromium": { - "version": "1.3.14", + "version": "1.3.15", "from": "electron-to-chromium@>=1.2.7 <2.0.0", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.14.tgz" + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.15.tgz" }, "elliptic": { "version": "6.4.0", @@ -813,12 +963,6 @@ "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.3.tgz", "dev": true, "dependencies": { - "component-emitter": { - "version": "1.2.1", - "from": "component-emitter@1.2.1", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", - "dev": true - }, "debug": { "version": "2.3.3", "from": "debug@2.3.3", @@ -840,9 +984,9 @@ "dev": true }, "enhanced-resolve": { - "version": "3.1.0", + "version": "3.3.0", "from": "enhanced-resolve@>=3.1.0 <4.0.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.1.0.tgz", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.3.0.tgz", "dependencies": { "memory-fs": { "version": "0.4.1", @@ -929,6 +1073,12 @@ "resolved": "https://registry.npmjs.org/expand-braces/-/expand-braces-0.1.2.tgz", "dev": true, "dependencies": { + "array-unique": { + "version": "0.2.1", + "from": "array-unique@>=0.2.1 <0.3.0", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz", + "dev": true + }, "braces": { "version": "0.1.5", "from": "braces@>=0.1.2 <0.2.0", @@ -956,14 +1106,53 @@ } }, "expand-brackets": { - "version": "0.1.5", - "from": "expand-brackets@>=0.1.4 <0.2.0", - "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz" + "version": "2.1.4", + "from": "expand-brackets@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", + "dependencies": { + "define-property": { + "version": "0.2.5", + "from": "define-property@>=0.2.5 <0.3.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz" + }, + "is-descriptor": { + "version": "0.1.5", + "from": "is-descriptor@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.5.tgz" + }, + "kind-of": { + "version": "3.2.2", + "from": "kind-of@>=3.0.2 <4.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz" + } + } }, "expand-range": { "version": "1.8.2", "from": "expand-range@>=1.8.1 <2.0.0", - "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz" + "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz", + "dependencies": { + "fill-range": { + "version": "2.2.3", + "from": "fill-range@>=2.1.0 <3.0.0", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz" + }, + "is-number": { + "version": "2.1.0", + "from": "is-number@>=2.1.0 <3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz" + }, + "isobject": { + "version": "2.1.0", + "from": "isobject@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz" + }, + "kind-of": { + "version": "3.2.2", + "from": "kind-of@>=3.0.2 <4.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz" + } + } }, "expose-loader": { "version": "0.7.3", @@ -976,15 +1165,49 @@ "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz", "dev": true }, + "extend-shallow": { + "version": "2.0.1", + "from": "extend-shallow@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz" + }, "extglob": { - "version": "0.3.2", - "from": "extglob@>=0.3.1 <0.4.0", - "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz" + "version": "1.1.0", + "from": "extglob@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/extglob/-/extglob-1.1.0.tgz", + "dependencies": { + "define-property": { + "version": "0.2.5", + "from": "define-property@>=0.2.5 <0.3.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz" + }, + "is-descriptor": { + "version": "0.1.5", + "from": "is-descriptor@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.5.tgz" + }, + "kind-of": { + "version": "3.2.2", + "from": "kind-of@>=3.0.2 <4.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz" + }, + "to-regex": { + "version": "2.1.0", + "from": "to-regex@>=2.1.0 <3.0.0", + "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-2.1.0.tgz", + "dependencies": { + "regex-not": { + "version": "0.1.2", + "from": "regex-not@>=0.1.1 <0.2.0", + "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-0.1.2.tgz" + } + } + } + } }, "extract-text-webpack-plugin": { - "version": "2.1.0", - "from": "extract-text-webpack-plugin@2.1.0", - "resolved": "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-2.1.0.tgz", + "version": "2.1.2", + "from": "extract-text-webpack-plugin@2.1.2", + "resolved": "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-2.1.2.tgz", "dependencies": { "loader-utils": { "version": "1.1.0", @@ -993,15 +1216,20 @@ } } }, + "fast-deep-equal": { + "version": "0.1.0", + "from": "fast-deep-equal@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-0.1.0.tgz" + }, "fastparse": { "version": "1.1.1", "from": "fastparse@>=1.1.1 <2.0.0", "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.1.tgz" }, "file-loader": { - "version": "0.11.1", - "from": "file-loader@0.11.1", - "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-0.11.1.tgz", + "version": "0.11.2", + "from": "file-loader@0.11.2", + "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-0.11.2.tgz", "dependencies": { "loader-utils": { "version": "1.1.0", @@ -1016,9 +1244,9 @@ "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz" }, "fill-range": { - "version": "2.2.3", - "from": "fill-range@>=2.1.0 <3.0.0", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz" + "version": "4.0.0", + "from": "fill-range@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz" }, "finalhandler": { "version": "1.0.3", @@ -1037,7 +1265,7 @@ }, "for-in": { "version": "1.0.2", - "from": "for-in@>=1.0.1 <2.0.0", + "from": "for-in@>=1.0.2 <2.0.0", "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz" }, "for-own": { @@ -1045,6 +1273,11 @@ "from": "for-own@>=0.1.4 <0.2.0", "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz" }, + "fragment-cache": { + "version": "0.2.1", + "from": "fragment-cache@>=0.2.1 <0.3.0", + "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz" + }, "fs-access": { "version": "1.0.1", "from": "fs-access@>=1.0.0 <2.0.0", @@ -1067,6 +1300,17 @@ "from": "get-caller-file@>=1.0.1 <2.0.0", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz" }, + "get-func-name": { + "version": "2.0.0", + "from": "get-func-name@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz", + "dev": true + }, + "get-value": { + "version": "2.0.6", + "from": "get-value@>=2.0.5 <3.0.0", + "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz" + }, "glob": { "version": "7.1.2", "from": "glob@>=7.1.1 <8.0.0", @@ -1128,15 +1372,32 @@ "from": "has-flag@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz" }, + "has-value": { + "version": "0.3.1", + "from": "has-value@>=0.3.1 <0.4.0", + "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz", + "dependencies": { + "isobject": { + "version": "2.1.0", + "from": "isobject@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz" + } + } + }, + "has-values": { + "version": "0.1.4", + "from": "has-values@>=0.1.4 <0.2.0", + "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz" + }, "hash-base": { "version": "2.0.2", "from": "hash-base@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz" }, "hash.js": { - "version": "1.1.1", + "version": "1.1.3", "from": "hash.js@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.1.tgz" + "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz" }, "he": { "version": "1.1.1", @@ -1149,9 +1410,9 @@ "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz" }, "hosted-git-info": { - "version": "2.4.2", + "version": "2.5.0", "from": "hosted-git-info@>=2.1.4 <3.0.0", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.4.2.tgz" + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz" }, "html-comment-regex": { "version": "1.1.1", @@ -1207,6 +1468,38 @@ "from": "icss-replace-symbols@>=1.1.0 <2.0.0", "resolved": "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz" }, + "icss-utils": { + "version": "2.1.0", + "from": "icss-utils@>=2.1.0 <3.0.0", + "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-2.1.0.tgz", + "dependencies": { + "ansi-styles": { + "version": "3.1.0", + "from": "ansi-styles@>=3.1.0 <4.0.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.1.0.tgz" + }, + "chalk": { + "version": "2.0.1", + "from": "chalk@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz" + }, + "has-flag": { + "version": "2.0.0", + "from": "has-flag@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz" + }, + "postcss": { + "version": "6.0.6", + "from": "postcss@>=6.0.1 <7.0.0", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.6.tgz" + }, + "supports-color": { + "version": "4.1.0", + "from": "supports-color@>=4.1.0 <5.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.1.0.tgz" + } + } + }, "ieee754": { "version": "1.1.8", "from": "ieee754@>=1.1.4 <2.0.0", @@ -1248,6 +1541,18 @@ "from": "is-absolute-url@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz" }, + "is-accessor-descriptor": { + "version": "0.1.6", + "from": "is-accessor-descriptor@>=0.1.6 <0.2.0", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "dependencies": { + "kind-of": { + "version": "3.2.2", + "from": "kind-of@>=3.0.2 <4.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz" + } + } + }, "is-arrayish": { "version": "0.2.1", "from": "is-arrayish@>=0.2.1 <0.3.0", @@ -1268,6 +1573,30 @@ "from": "is-builtin-module@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz" }, + "is-data-descriptor": { + "version": "0.1.4", + "from": "is-data-descriptor@>=0.1.4 <0.2.0", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", + "dependencies": { + "kind-of": { + "version": "3.2.2", + "from": "kind-of@>=3.0.2 <4.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz" + } + } + }, + "is-descriptor": { + "version": "1.0.0", + "from": "is-descriptor@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.0.tgz", + "dependencies": { + "kind-of": { + "version": "3.2.2", + "from": "kind-of@>=3.0.2 <4.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz" + } + } + }, "is-dotfile": { "version": "1.0.3", "from": "is-dotfile@>=1.0.0 <2.0.0", @@ -1280,13 +1609,13 @@ }, "is-extendable": { "version": "0.1.1", - "from": "is-extendable@>=0.1.1 <0.2.0", + "from": "is-extendable@>=0.1.0 <0.2.0", "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz" }, "is-extglob": { - "version": "1.0.0", - "from": "is-extglob@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz" + "version": "2.1.1", + "from": "is-extglob@>=2.1.1 <3.0.0", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz" }, "is-fullwidth-code-point": { "version": "1.0.0", @@ -1296,18 +1625,42 @@ "is-glob": { "version": "2.0.1", "from": "is-glob@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz" + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", + "dependencies": { + "is-extglob": { + "version": "1.0.0", + "from": "is-extglob@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz" + } + } }, "is-number": { - "version": "2.1.0", - "from": "is-number@>=2.1.0 <3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz" + "version": "3.0.0", + "from": "is-number@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "dependencies": { + "kind-of": { + "version": "3.2.2", + "from": "kind-of@>=3.0.2 <4.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz" + } + } + }, + "is-odd": { + "version": "1.0.0", + "from": "is-odd@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-odd/-/is-odd-1.0.0.tgz" }, "is-plain-obj": { "version": "1.1.0", "from": "is-plain-obj@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz" }, + "is-plain-object": { + "version": "2.0.3", + "from": "is-plain-object@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.3.tgz" + }, "is-posix-bracket": { "version": "0.1.1", "from": "is-posix-bracket@>=0.1.0 <0.2.0", @@ -1351,9 +1704,9 @@ "dev": true }, "isobject": { - "version": "2.1.0", - "from": "isobject@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz" + "version": "3.0.1", + "from": "isobject@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz" }, "isomorphic-fetch": { "version": "2.2.1", @@ -1361,9 +1714,9 @@ "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz" }, "jasmine-core": { - "version": "2.6.1", - "from": "jasmine-core@2.6.1", - "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.6.1.tgz", + "version": "2.6.4", + "from": "jasmine-core@2.6.4", + "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.6.4.tgz", "dev": true }, "jquery": { @@ -1377,9 +1730,9 @@ "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.1.9.tgz" }, "js-tokens": { - "version": "3.0.1", + "version": "3.0.2", "from": "js-tokens@>=3.0.0 <4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.1.tgz" + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz" }, "js-yaml": { "version": "3.7.0", @@ -1396,6 +1749,11 @@ "from": "json-loader@0.5.4", "resolved": "https://registry.npmjs.org/json-loader/-/json-loader-0.5.4.tgz" }, + "json-schema-traverse": { + "version": "0.3.1", + "from": "json-schema-traverse@>=0.3.0 <0.4.0", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz" + }, "json-stable-stringify": { "version": "1.0.1", "from": "json-stable-stringify@>=1.0.1 <2.0.0", @@ -1438,9 +1796,9 @@ "dev": true }, "karma-chrome-launcher": { - "version": "2.1.1", - "from": "karma-chrome-launcher@2.1.1", - "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-2.1.1.tgz", + "version": "2.2.0", + "from": "karma-chrome-launcher@2.2.0", + "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-2.2.0.tgz", "dev": true }, "karma-cli": { @@ -1482,14 +1840,14 @@ } }, "kind-of": { - "version": "3.2.2", - "from": "kind-of@>=3.0.2 <4.0.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz" + "version": "4.0.0", + "from": "kind-of@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz" }, "lazy-cache": { - "version": "1.0.4", - "from": "lazy-cache@>=1.0.3 <2.0.0", - "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz" + "version": "2.0.2", + "from": "lazy-cache@>=2.0.2 <3.0.0", + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-2.0.2.tgz" }, "lcid": { "version": "1.0.0", @@ -1584,6 +1942,16 @@ "from": "macaddress@>=0.2.8 <0.3.0", "resolved": "https://registry.npmjs.org/macaddress/-/macaddress-0.2.8.tgz" }, + "map-cache": { + "version": "0.2.2", + "from": "map-cache@>=0.2.2 <0.3.0", + "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz" + }, + "map-visit": { + "version": "0.1.5", + "from": "map-visit@>=0.1.5 <0.2.0", + "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-0.1.5.tgz" + }, "math-expression-evaluator": { "version": "1.2.17", "from": "math-expression-evaluator@>=1.2.14 <2.0.0", @@ -1601,9 +1969,9 @@ "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.3.0.tgz" }, "micromatch": { - "version": "2.3.11", - "from": "micromatch@>=2.1.5 <3.0.0", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz" + "version": "3.0.3", + "from": "micromatch@>=3.0.3 <4.0.0", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.0.3.tgz" }, "miller-rabin": { "version": "4.0.0", @@ -1647,6 +2015,11 @@ "from": "minimist@0.0.8", "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz" }, + "mixin-deep": { + "version": "1.2.0", + "from": "mixin-deep@>=1.1.3 <2.0.0", + "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.2.0.tgz" + }, "mkdirp": { "version": "0.5.1", "from": "mkdirp@>=0.5.1 <0.6.0", @@ -1657,6 +2030,11 @@ "from": "ms@2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz" }, + "nanomatch": { + "version": "1.2.0", + "from": "nanomatch@>=1.2.0 <2.0.0", + "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.0.tgz" + }, "ncname": { "version": "1.0.0", "from": "ncname@>=1.0.0 <1.1.0", @@ -1691,9 +2069,9 @@ } }, "normalize-package-data": { - "version": "2.3.8", + "version": "2.4.0", "from": "normalize-package-data@>=2.3.2 <3.0.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.8.tgz" + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz" }, "normalize-path": { "version": "2.1.1", @@ -1737,11 +2115,57 @@ "resolved": "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz", "dev": true }, + "object-copy": { + "version": "0.1.0", + "from": "object-copy@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz", + "dependencies": { + "define-property": { + "version": "0.2.5", + "from": "define-property@>=0.2.5 <0.3.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz" + }, + "is-descriptor": { + "version": "0.1.5", + "from": "is-descriptor@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.5.tgz" + }, + "kind-of": { + "version": "3.2.2", + "from": "kind-of@>=3.0.3 <4.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz" + } + } + }, + "object-visit": { + "version": "0.3.4", + "from": "object-visit@>=0.3.4 <0.4.0", + "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-0.3.4.tgz", + "dependencies": { + "isobject": { + "version": "2.1.0", + "from": "isobject@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz" + } + } + }, "object.omit": { "version": "2.0.1", "from": "object.omit@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz" }, + "object.pick": { + "version": "1.2.0", + "from": "object.pick@>=1.2.0 <2.0.0", + "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.2.0.tgz", + "dependencies": { + "isobject": { + "version": "2.1.0", + "from": "isobject@>=2.1.0 <3.0.0", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz" + } + } + }, "on-finished": { "version": "2.3.0", "from": "on-finished@>=2.3.0 <2.4.0", @@ -1799,7 +2223,14 @@ "parse-glob": { "version": "3.0.4", "from": "parse-glob@>=3.0.4 <4.0.0", - "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz" + "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz", + "dependencies": { + "is-extglob": { + "version": "1.0.0", + "from": "is-extglob@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz" + } + } }, "parse-json": { "version": "2.2.0", @@ -1812,9 +2243,9 @@ "resolved": "https://registry.npmjs.org/parse5/-/parse5-3.0.2.tgz", "dependencies": { "@types/node": { - "version": "6.0.78", + "version": "6.0.79", "from": "@types/node@>=6.0.46 <7.0.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.78.tgz" + "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.79.tgz" } } }, @@ -1841,6 +2272,11 @@ "from": "parseurl@>=1.3.1 <1.4.0", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz" }, + "pascalcase": { + "version": "0.1.1", + "from": "pascalcase@>=0.1.1 <0.2.0", + "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz" + }, "path-browserify": { "version": "0.0.0", "from": "path-browserify@0.0.0", @@ -1867,6 +2303,12 @@ "from": "path-type@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz" }, + "pathval": { + "version": "1.1.0", + "from": "pathval@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz", + "dev": true + }, "pbkdf2": { "version": "3.0.12", "from": "pbkdf2@>=3.0.3 <4.0.0", @@ -1887,6 +2329,11 @@ "from": "pinkie-promise@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz" }, + "posix-character-classes": { + "version": "0.1.1", + "from": "posix-character-classes@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz" + }, "postcss": { "version": "5.2.17", "from": "postcss@>=5.0.6 <6.0.0", @@ -1989,20 +2436,30 @@ "from": "postcss-modules-extract-imports@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.1.0.tgz", "dependencies": { + "ansi-styles": { + "version": "3.1.0", + "from": "ansi-styles@>=3.1.0 <4.0.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.1.0.tgz" + }, + "chalk": { + "version": "2.0.1", + "from": "chalk@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz" + }, "has-flag": { "version": "2.0.0", "from": "has-flag@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz" }, "postcss": { - "version": "6.0.3", + "version": "6.0.6", "from": "postcss@>=6.0.1 <7.0.0", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.3.tgz" + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.6.tgz" }, "supports-color": { - "version": "4.0.0", - "from": "supports-color@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.0.0.tgz" + "version": "4.1.0", + "from": "supports-color@>=4.1.0 <5.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.1.0.tgz" } } }, @@ -2011,20 +2468,30 @@ "from": "postcss-modules-local-by-default@>=1.0.1 <2.0.0", "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz", "dependencies": { + "ansi-styles": { + "version": "3.1.0", + "from": "ansi-styles@>=3.1.0 <4.0.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.1.0.tgz" + }, + "chalk": { + "version": "2.0.1", + "from": "chalk@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz" + }, "has-flag": { "version": "2.0.0", "from": "has-flag@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz" }, "postcss": { - "version": "6.0.3", + "version": "6.0.6", "from": "postcss@>=6.0.1 <7.0.0", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.3.tgz" + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.6.tgz" }, "supports-color": { - "version": "4.0.0", - "from": "supports-color@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.0.0.tgz" + "version": "4.1.0", + "from": "supports-color@>=4.1.0 <5.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.1.0.tgz" } } }, @@ -2033,20 +2500,30 @@ "from": "postcss-modules-scope@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz", "dependencies": { + "ansi-styles": { + "version": "3.1.0", + "from": "ansi-styles@>=3.1.0 <4.0.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.1.0.tgz" + }, + "chalk": { + "version": "2.0.1", + "from": "chalk@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz" + }, "has-flag": { "version": "2.0.0", "from": "has-flag@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz" }, "postcss": { - "version": "6.0.3", + "version": "6.0.6", "from": "postcss@>=6.0.1 <7.0.0", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.3.tgz" + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.6.tgz" }, "supports-color": { - "version": "4.0.0", - "from": "supports-color@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.0.0.tgz" + "version": "4.1.0", + "from": "supports-color@>=4.1.0 <5.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.1.0.tgz" } } }, @@ -2055,20 +2532,30 @@ "from": "postcss-modules-values@>=1.1.0 <2.0.0", "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz", "dependencies": { + "ansi-styles": { + "version": "3.1.0", + "from": "ansi-styles@>=3.1.0 <4.0.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.1.0.tgz" + }, + "chalk": { + "version": "2.0.1", + "from": "chalk@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz" + }, "has-flag": { "version": "2.0.0", "from": "has-flag@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz" }, "postcss": { - "version": "6.0.3", + "version": "6.0.6", "from": "postcss@>=6.0.1 <7.0.0", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.3.tgz" + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.6.tgz" }, "supports-color": { - "version": "4.0.0", - "from": "supports-color@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.0.0.tgz" + "version": "4.1.0", + "from": "supports-color@>=4.1.0 <5.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.1.0.tgz" } } }, @@ -2207,26 +2694,7 @@ "randomatic": { "version": "1.1.7", "from": "randomatic@>=1.1.3 <2.0.0", - "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz", - "dependencies": { - "is-number": { - "version": "3.0.0", - "from": "is-number@>=3.0.0 <4.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "dependencies": { - "kind-of": { - "version": "3.2.2", - "from": "kind-of@^3.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz" - } - } - }, - "kind-of": { - "version": "4.0.0", - "from": "kind-of@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz" - } - } + "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz" }, "randombytes": { "version": "2.0.5", @@ -2268,9 +2736,9 @@ "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz" }, "readable-stream": { - "version": "2.3.2", + "version": "2.3.3", "from": "readable-stream@>=2.0.1 <3.0.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.2.tgz" + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz" }, "readdirp": { "version": "2.1.0", @@ -2314,6 +2782,11 @@ "from": "regex-cache@>=0.4.2 <0.5.0", "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz" }, + "regex-not": { + "version": "1.0.0", + "from": "regex-not@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.0.tgz" + }, "regexpu-core": { "version": "1.0.0", "from": "regexpu-core@>=1.0.0 <2.0.0", @@ -2346,7 +2819,7 @@ }, "repeat-string": { "version": "1.6.1", - "from": "repeat-string@>=1.5.2 <2.0.0", + "from": "repeat-string@>=1.6.1 <2.0.0", "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz" }, "require-directory": { @@ -2398,13 +2871,13 @@ "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz" }, "rxjs": { - "version": "5.4.0", - "from": "rxjs@5.4.0", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.4.0.tgz" + "version": "5.4.2", + "from": "rxjs@5.4.2", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.4.2.tgz" }, "safe-buffer": { "version": "5.1.1", - "from": "safe-buffer@>=5.1.0 <5.2.0", + "from": "safe-buffer@>=5.1.1 <5.2.0", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz" }, "sax": { @@ -2412,6 +2885,11 @@ "from": "sax@>=1.2.1 <1.3.0", "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz" }, + "schema-utils": { + "version": "0.3.0", + "from": "schema-utils@>=0.3.0 <0.4.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz" + }, "semver": { "version": "5.3.0", "from": "semver@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0||>=4.0.0 <5.0.0||>=5.0.0 <6.0.0", @@ -2422,11 +2900,21 @@ "from": "set-blocking@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz" }, + "set-getter": { + "version": "0.1.0", + "from": "set-getter@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/set-getter/-/set-getter-0.1.0.tgz" + }, "set-immediate-shim": { "version": "1.0.1", "from": "set-immediate-shim@>=1.0.1 <2.0.0", "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz" }, + "set-value": { + "version": "0.4.3", + "from": "set-value@>=0.4.2 <0.5.0", + "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz" + }, "setimmediate": { "version": "1.0.5", "from": "setimmediate@>=1.0.4 <2.0.0", @@ -2443,6 +2931,45 @@ "from": "sha.js@>=2.4.0 <3.0.0", "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.8.tgz" }, + "snapdragon": { + "version": "0.8.1", + "from": "snapdragon@>=0.8.1 <0.9.0", + "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.1.tgz", + "dependencies": { + "define-property": { + "version": "0.2.5", + "from": "define-property@>=0.2.5 <0.3.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz" + }, + "is-descriptor": { + "version": "0.1.5", + "from": "is-descriptor@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.5.tgz" + }, + "kind-of": { + "version": "3.2.2", + "from": "kind-of@>=3.0.2 <4.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz" + } + } + }, + "snapdragon-node": { + "version": "2.1.1", + "from": "snapdragon-node@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz" + }, + "snapdragon-util": { + "version": "3.0.1", + "from": "snapdragon-util@>=3.0.1 <4.0.0", + "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz", + "dependencies": { + "kind-of": { + "version": "3.2.2", + "from": "kind-of@>=3.2.0 <4.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz" + } + } + }, "socket.io": { "version": "1.7.3", "from": "socket.io@1.7.3", @@ -2495,12 +3022,6 @@ "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.7.3.tgz", "dev": true, "dependencies": { - "component-emitter": { - "version": "1.2.1", - "from": "component-emitter@1.2.1", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", - "dev": true - }, "debug": { "version": "2.3.3", "from": "debug@2.3.3", @@ -2521,6 +3042,12 @@ "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.3.1.tgz", "dev": true, "dependencies": { + "component-emitter": { + "version": "1.1.2", + "from": "component-emitter@1.1.2", + "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz", + "dev": true + }, "debug": { "version": "2.2.0", "from": "debug@2.2.0", @@ -2557,9 +3084,9 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz" }, "source-map-resolve": { - "version": "0.3.1", - "from": "source-map-resolve@>=0.3.0 <0.4.0", - "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.3.1.tgz" + "version": "0.5.0", + "from": "source-map-resolve@>=0.5.0 <0.6.0", + "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.0.tgz" }, "source-map-support": { "version": "0.4.15", @@ -2567,9 +3094,9 @@ "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.15.tgz" }, "source-map-url": { - "version": "0.3.0", - "from": "source-map-url@>=0.3.0 <0.4.0", - "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.3.0.tgz" + "version": "0.4.0", + "from": "source-map-url@>=0.4.0 <0.5.0", + "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz" }, "spdx-correct": { "version": "1.0.2", @@ -2586,11 +3113,38 @@ "from": "spdx-license-ids@>=1.0.2 <2.0.0", "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz" }, + "split-string": { + "version": "2.1.1", + "from": "split-string@>=2.1.0 <3.0.0", + "resolved": "https://registry.npmjs.org/split-string/-/split-string-2.1.1.tgz" + }, "sprintf-js": { "version": "1.0.3", "from": "sprintf-js@>=1.0.2 <1.1.0", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz" }, + "static-extend": { + "version": "0.1.2", + "from": "static-extend@>=0.1.1 <0.2.0", + "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz", + "dependencies": { + "define-property": { + "version": "0.2.5", + "from": "define-property@>=0.2.5 <0.3.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz" + }, + "is-descriptor": { + "version": "0.1.5", + "from": "is-descriptor@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.5.tgz" + }, + "kind-of": { + "version": "3.2.2", + "from": "kind-of@>=3.0.2 <4.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz" + } + } + }, "statuses": { "version": "1.3.1", "from": "statuses@>=1.3.1 <1.4.0", @@ -2613,7 +3167,7 @@ }, "string_decoder": { "version": "1.0.3", - "from": "string_decoder@>=1.0.0 <1.1.0", + "from": "string_decoder@>=1.0.3 <1.1.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz" }, "string-width": { @@ -2632,9 +3186,9 @@ "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz" }, "style-loader": { - "version": "0.17.0", - "from": "style-loader@0.17.0", - "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.17.0.tgz", + "version": "0.18.2", + "from": "style-loader@0.18.2", + "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.18.2.tgz", "dependencies": { "loader-utils": { "version": "1.1.0", @@ -2690,20 +3244,64 @@ "from": "to-arraybuffer@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz" }, + "to-object-path": { + "version": "0.3.0", + "from": "to-object-path@>=0.3.0 <0.4.0", + "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz", + "dependencies": { + "kind-of": { + "version": "3.2.2", + "from": "kind-of@>=3.0.2 <4.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz" + } + } + }, + "to-regex": { + "version": "3.0.1", + "from": "to-regex@>=3.0.1 <4.0.0", + "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.1.tgz", + "dependencies": { + "define-property": { + "version": "0.2.5", + "from": "define-property@>=0.2.5 <0.3.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz" + }, + "is-descriptor": { + "version": "0.1.5", + "from": "is-descriptor@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.5.tgz" + }, + "kind-of": { + "version": "3.2.2", + "from": "kind-of@>=3.0.2 <4.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz" + } + } + }, + "to-regex-range": { + "version": "2.1.1", + "from": "to-regex-range@>=2.1.0 <3.0.0", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz" + }, "to-string-loader": { "version": "1.1.5", "from": "to-string-loader@1.1.5", "resolved": "https://registry.npmjs.org/to-string-loader/-/to-string-loader-1.1.5.tgz" }, + "tslib": { + "version": "1.7.1", + "from": "tslib@>=1.7.1 <2.0.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.7.1.tgz" + }, "tty-browserify": { "version": "0.0.0", "from": "tty-browserify@0.0.0", "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz" }, "type-detect": { - "version": "1.0.0", - "from": "type-detect@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-1.0.0.tgz", + "version": "4.0.3", + "from": "type-detect@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.3.tgz", "dev": true }, "type-is": { @@ -2713,14 +3311,14 @@ "dev": true }, "typescript": { - "version": "2.3.2", - "from": "typescript@2.3.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.3.2.tgz" + "version": "2.4.1", + "from": "typescript@2.4.1", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.4.1.tgz" }, "uglify-js": { - "version": "3.0.20", + "version": "3.0.23", "from": "uglify-js@>=3.0.0 <3.1.0", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.20.tgz" + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.23.tgz" }, "uglify-to-browserify": { "version": "1.0.2", @@ -2734,6 +3332,11 @@ "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz", "dev": true }, + "union-value": { + "version": "0.2.4", + "from": "union-value@>=0.2.3 <0.3.0", + "resolved": "https://registry.npmjs.org/union-value/-/union-value-0.2.4.tgz" + }, "uniq": { "version": "1.0.1", "from": "uniq@>=1.0.1 <2.0.0", @@ -2754,6 +3357,11 @@ "from": "unpipe@>=1.0.0 <1.1.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz" }, + "unset-value": { + "version": "0.1.2", + "from": "unset-value@>=0.1.1 <0.2.0", + "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-0.1.2.tgz" + }, "upper-case": { "version": "1.1.3", "from": "upper-case@>=1.1.1 <2.0.0", @@ -2777,9 +3385,9 @@ } }, "url-loader": { - "version": "0.5.8", - "from": "url-loader@0.5.8", - "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-0.5.8.tgz", + "version": "0.5.9", + "from": "url-loader@0.5.9", + "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-0.5.9.tgz", "dependencies": { "loader-utils": { "version": "1.1.0", @@ -2788,10 +3396,32 @@ } } }, + "use": { + "version": "2.0.2", + "from": "use@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/use/-/use-2.0.2.tgz", + "dependencies": { + "define-property": { + "version": "0.2.5", + "from": "define-property@>=0.2.5 <0.3.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz" + }, + "is-descriptor": { + "version": "0.1.5", + "from": "is-descriptor@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.5.tgz" + }, + "kind-of": { + "version": "3.2.2", + "from": "kind-of@>=3.0.2 <4.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz" + } + } + }, "useragent": { - "version": "2.1.13", + "version": "2.2.0", "from": "useragent@>=2.1.12 <3.0.0", - "resolved": "https://registry.npmjs.org/useragent/-/useragent-2.1.13.tgz", + "resolved": "https://registry.npmjs.org/useragent/-/useragent-2.2.0.tgz", "dev": true }, "util": { @@ -2847,6 +3477,11 @@ "from": "webpack@2.5.1", "resolved": "https://registry.npmjs.org/webpack/-/webpack-2.5.1.tgz", "dependencies": { + "ajv": { + "version": "4.11.8", + "from": "ajv@>=4.7.0 <5.0.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz" + }, "memory-fs": { "version": "0.4.1", "from": "memory-fs@>=0.4.1 <0.5.0", @@ -2894,9 +3529,9 @@ } }, "webpack-hot-middleware": { - "version": "2.18.0", - "from": "webpack-hot-middleware@2.18.0", - "resolved": "https://registry.npmjs.org/webpack-hot-middleware/-/webpack-hot-middleware-2.18.0.tgz" + "version": "2.18.2", + "from": "webpack-hot-middleware@2.18.2", + "resolved": "https://registry.npmjs.org/webpack-hot-middleware/-/webpack-hot-middleware-2.18.2.tgz" }, "webpack-merge": { "version": "4.1.0", @@ -2909,9 +3544,16 @@ "resolved": "https://registry.npmjs.org/webpack-node-externals/-/webpack-node-externals-1.6.0.tgz" }, "webpack-sources": { - "version": "0.1.5", - "from": "webpack-sources@>=0.1.0 <0.2.0", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.1.5.tgz" + "version": "1.0.1", + "from": "webpack-sources@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.0.1.tgz", + "dependencies": { + "source-list-map": { + "version": "2.0.0", + "from": "source-list-map@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz" + } + } }, "whatwg-fetch": { "version": "2.0.3", @@ -3029,9 +3671,9 @@ "dev": true }, "zone.js": { - "version": "0.8.10", - "from": "zone.js@0.8.10", - "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.8.10.tgz" + "version": "0.8.12", + "from": "zone.js@0.8.12", + "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.8.12.tgz" } } } diff --git a/templates/AngularSpa/package.json b/templates/AngularSpa/package.json index 9ad4458c..9452382f 100644 --- a/templates/AngularSpa/package.json +++ b/templates/AngularSpa/package.json @@ -6,29 +6,29 @@ "test": "karma start ClientApp/test/karma.conf.js" }, "dependencies": { - "@angular/animations": "4.1.2", - "@angular/common": "4.1.2", - "@angular/compiler": "4.1.2", - "@angular/core": "4.1.2", - "@angular/forms": "4.1.2", - "@angular/http": "4.1.2", - "@angular/platform-browser": "4.1.2", - "@angular/platform-browser-dynamic": "4.1.2", - "@angular/platform-server": "4.1.2", - "@angular/router": "4.1.2", - "@types/node": "7.0.18", + "@angular/animations": "4.2.5", + "@angular/common": "4.2.5", + "@angular/compiler": "4.2.5", + "@angular/core": "4.2.5", + "@angular/forms": "4.2.5", + "@angular/http": "4.2.5", + "@angular/platform-browser": "4.2.5", + "@angular/platform-browser-dynamic": "4.2.5", + "@angular/platform-server": "4.2.5", + "@angular/router": "4.2.5", + "@types/node": "8.0.8", "angular2-template-loader": "0.6.2", "aspnet-prerendering": "^2.0.5", "aspnet-webpack": "^1.0.29", - "awesome-typescript-loader": "3.1.3", + "awesome-typescript-loader": "3.2.1", "bootstrap": "3.3.7", "css": "2.2.1", - "css-loader": "0.28.1", + "css-loader": "0.28.4", "es6-shim": "0.35.3", "event-source-polyfill": "0.0.9", "expose-loader": "0.7.3", - "extract-text-webpack-plugin": "2.1.0", - "file-loader": "0.11.1", + "extract-text-webpack-plugin": "2.1.2", + "file-loader": "0.11.2", "html-loader": "0.4.5", "isomorphic-fetch": "2.2.1", "jquery": "3.2.1", @@ -36,24 +36,24 @@ "preboot": "4.5.2", "raw-loader": "0.5.1", "reflect-metadata": "0.1.10", - "rxjs": "5.4.0", - "style-loader": "0.17.0", + "rxjs": "5.4.2", + "style-loader": "0.18.2", "to-string-loader": "1.1.5", - "typescript": "2.3.2", - "url-loader": "0.5.8", + "typescript": "2.4.1", + "url-loader": "0.5.9", "webpack": "2.5.1", - "webpack-hot-middleware": "2.18.0", + "webpack-hot-middleware": "2.18.2", "webpack-merge": "4.1.0", - "zone.js": "0.8.10" + "zone.js": "0.8.12" }, "devDependencies": { - "@types/chai": "3.5.2", - "@types/jasmine": "2.5.47", - "chai": "3.5.0", - "jasmine-core": "2.6.1", + "@types/chai": "4.0.1", + "@types/jasmine": "2.5.53", + "chai": "4.0.2", + "jasmine-core": "2.6.4", "karma": "1.7.0", "karma-chai": "0.1.0", - "karma-chrome-launcher": "2.1.1", + "karma-chrome-launcher": "2.2.0", "karma-cli": "1.0.1", "karma-jasmine": "1.1.0", "karma-webpack": "2.0.3" From 51915318135e3da7b5c9c45144aa3c69084c4594 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Fri, 7 Jul 2017 11:02:50 +0100 Subject: [PATCH 170/411] Add AoT compilation to Angular template --- .../ClientApp/app/app.module.browser.ts | 6 ++- .../{boot-client.ts => boot.client.ts} | 0 .../{boot-server.ts => boot.server.ts} | 0 templates/AngularSpa/npm-shrinkwrap.json | 51 +++++++++++++++++++ templates/AngularSpa/package.json | 2 + templates/AngularSpa/webpack.config.js | 23 +++++++-- templates/AngularSpa/webpack.config.vendor.js | 48 +++++++++-------- 7 files changed, 103 insertions(+), 27 deletions(-) rename templates/AngularSpa/ClientApp/{boot-client.ts => boot.client.ts} (100%) rename templates/AngularSpa/ClientApp/{boot-server.ts => boot.server.ts} (100%) diff --git a/templates/AngularSpa/ClientApp/app/app.module.browser.ts b/templates/AngularSpa/ClientApp/app/app.module.browser.ts index e3393ce9..7e71ca97 100644 --- a/templates/AngularSpa/ClientApp/app/app.module.browser.ts +++ b/templates/AngularSpa/ClientApp/app/app.module.browser.ts @@ -10,8 +10,12 @@ import { AppComponent } from './components/app/app.component'; AppModuleShared ], providers: [ - { provide: 'ORIGIN_URL', useValue: location.origin } + { provide: 'ORIGIN_URL', useFactory: getOriginUrl } ] }) export class AppModule { } + +export function getOriginUrl() { + return location.origin; +} diff --git a/templates/AngularSpa/ClientApp/boot-client.ts b/templates/AngularSpa/ClientApp/boot.client.ts similarity index 100% rename from templates/AngularSpa/ClientApp/boot-client.ts rename to templates/AngularSpa/ClientApp/boot.client.ts diff --git a/templates/AngularSpa/ClientApp/boot-server.ts b/templates/AngularSpa/ClientApp/boot.server.ts similarity index 100% rename from templates/AngularSpa/ClientApp/boot-server.ts rename to templates/AngularSpa/ClientApp/boot.server.ts diff --git a/templates/AngularSpa/npm-shrinkwrap.json b/templates/AngularSpa/npm-shrinkwrap.json index 6b2c2364..f4f3ada1 100644 --- a/templates/AngularSpa/npm-shrinkwrap.json +++ b/templates/AngularSpa/npm-shrinkwrap.json @@ -17,6 +17,18 @@ "from": "@angular/compiler@4.2.5", "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-4.2.5.tgz" }, + "@angular/compiler-cli": { + "version": "4.2.5", + "from": "@angular/compiler-cli@latest", + "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-4.2.5.tgz", + "dependencies": { + "minimist": { + "version": "1.2.0", + "from": "minimist@>=1.2.0 <2.0.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz" + } + } + }, "@angular/core": { "version": "4.2.5", "from": "@angular/core@4.2.5", @@ -52,6 +64,23 @@ "from": "@angular/router@4.2.5", "resolved": "https://registry.npmjs.org/@angular/router/-/router-4.2.5.tgz" }, + "@angular/tsc-wrapped": { + "version": "4.2.5", + "from": "@angular/tsc-wrapped@4.2.5", + "resolved": "https://registry.npmjs.org/@angular/tsc-wrapped/-/tsc-wrapped-4.2.5.tgz" + }, + "@ngtools/webpack": { + "version": "1.5.0", + "from": "@ngtools/webpack@latest", + "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-1.5.0.tgz", + "dependencies": { + "loader-utils": { + "version": "1.1.0", + "from": "loader-utils@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz" + } + } + }, "@types/chai": { "version": "4.0.1", "from": "@types/chai@4.0.1", @@ -1942,6 +1971,11 @@ "from": "macaddress@>=0.2.8 <0.3.0", "resolved": "https://registry.npmjs.org/macaddress/-/macaddress-0.2.8.tgz" }, + "magic-string": { + "version": "0.19.1", + "from": "magic-string@>=0.19.0 <0.20.0", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.19.1.tgz" + }, "map-cache": { "version": "0.2.2", "from": "map-cache@>=0.2.2 <0.3.0", @@ -3288,6 +3322,18 @@ "from": "to-string-loader@1.1.5", "resolved": "https://registry.npmjs.org/to-string-loader/-/to-string-loader-1.1.5.tgz" }, + "tsickle": { + "version": "0.21.6", + "from": "tsickle@>=0.21.0 <0.22.0", + "resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.21.6.tgz", + "dependencies": { + "minimist": { + "version": "1.2.0", + "from": "minimist@^1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz" + } + } + }, "tslib": { "version": "1.7.1", "from": "tslib@>=1.7.1 <2.0.0", @@ -3456,6 +3502,11 @@ "from": "vendors@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.1.tgz" }, + "vlq": { + "version": "0.2.2", + "from": "vlq@>=0.2.1 <0.3.0", + "resolved": "https://registry.npmjs.org/vlq/-/vlq-0.2.2.tgz" + }, "vm-browserify": { "version": "0.0.4", "from": "vm-browserify@0.0.4", diff --git a/templates/AngularSpa/package.json b/templates/AngularSpa/package.json index 9452382f..58494ec3 100644 --- a/templates/AngularSpa/package.json +++ b/templates/AngularSpa/package.json @@ -9,6 +9,7 @@ "@angular/animations": "4.2.5", "@angular/common": "4.2.5", "@angular/compiler": "4.2.5", + "@angular/compiler-cli": "4.2.5", "@angular/core": "4.2.5", "@angular/forms": "4.2.5", "@angular/http": "4.2.5", @@ -16,6 +17,7 @@ "@angular/platform-browser-dynamic": "4.2.5", "@angular/platform-server": "4.2.5", "@angular/router": "4.2.5", + "@ngtools/webpack": "1.5.0", "@types/node": "8.0.8", "angular2-template-loader": "0.6.2", "aspnet-prerendering": "^2.0.5", diff --git a/templates/AngularSpa/webpack.config.js b/templates/AngularSpa/webpack.config.js index 8c1969d3..69a2e303 100644 --- a/templates/AngularSpa/webpack.config.js +++ b/templates/AngularSpa/webpack.config.js @@ -1,6 +1,7 @@ const path = require('path'); const webpack = require('webpack'); const merge = require('webpack-merge'); +const AotPlugin = require('@ngtools/webpack').AotPlugin; const CheckerPlugin = require('awesome-typescript-loader').CheckerPlugin; module.exports = (env) => { @@ -16,7 +17,7 @@ module.exports = (env) => { }, module: { rules: [ - { test: /\.ts$/, include: /ClientApp/, use: ['awesome-typescript-loader?silent=true', 'angular2-template-loader'] }, + { test: /\.ts$/, include: /ClientApp/, use: isDevBuild ? ['awesome-typescript-loader?silent=true', 'angular2-template-loader'] : '@ngtools/webpack' }, { test: /\.html$/, use: 'html-loader?minimize=false' }, { test: /\.css$/, use: [ 'to-string-loader', isDevBuild ? 'css-loader' : 'css-loader?minimize' ] }, { test: /\.(png|jpg|jpeg|gif|svg)$/, use: 'url-loader?limit=25000' } @@ -28,7 +29,7 @@ module.exports = (env) => { // Configuration for client-side bundle suitable for running in browsers const clientBundleOutputDir = './wwwroot/dist'; const clientBundleConfig = merge(sharedConfig, { - entry: { 'main-client': './ClientApp/boot-client.ts' }, + entry: { 'main-client': './ClientApp/boot.client.ts' }, output: { path: path.join(__dirname, clientBundleOutputDir) }, plugins: [ new webpack.DllReferencePlugin({ @@ -43,14 +44,19 @@ module.exports = (env) => { }) ] : [ // Plugins that apply in production builds only - new webpack.optimize.UglifyJsPlugin() + new webpack.optimize.UglifyJsPlugin(), + new AotPlugin({ + tsConfigPath: './tsconfig.json', + entryModule: path.join(__dirname, 'ClientApp/app/app.module.browser#AppModule'), + exclude: ['./**/*.server.ts'] + }) ]) }); // Configuration for server-side (prerendering) bundle suitable for running in Node const serverBundleConfig = merge(sharedConfig, { resolve: { mainFields: ['main'] }, - entry: { 'main-server': './ClientApp/boot-server.ts' }, + entry: { 'main-server': './ClientApp/boot.server.ts' }, plugins: [ new webpack.DllReferencePlugin({ context: __dirname, @@ -58,7 +64,14 @@ module.exports = (env) => { sourceType: 'commonjs2', name: './vendor' }) - ], + ].concat(isDevBuild ? [] : [ + // Plugins that apply in production builds only + new AotPlugin({ + tsConfigPath: './tsconfig.json', + entryModule: path.join(__dirname, 'ClientApp/app/app.module.server#AppModule'), + exclude: ['./**/*.client.ts'] + }) + ]), output: { libraryTarget: 'commonjs', path: path.join(__dirname, './ClientApp/dist') diff --git a/templates/AngularSpa/webpack.config.vendor.js b/templates/AngularSpa/webpack.config.vendor.js index 7b0c3017..ed7fa931 100644 --- a/templates/AngularSpa/webpack.config.vendor.js +++ b/templates/AngularSpa/webpack.config.vendor.js @@ -2,6 +2,27 @@ const path = require('path'); const webpack = require('webpack'); const ExtractTextPlugin = require('extract-text-webpack-plugin'); const merge = require('webpack-merge'); +const treeShakableModules = [ + '@angular/animations', + '@angular/common', + '@angular/compiler', + '@angular/core', + '@angular/forms', + '@angular/http', + '@angular/platform-browser', + '@angular/platform-browser-dynamic', + '@angular/router', + 'zone.js', +]; +const nonTreeShakableModules = [ + 'bootstrap', + 'bootstrap/dist/css/bootstrap.css', + 'es6-promise', + 'es6-shim', + 'event-source-polyfill', + 'jquery', +]; +const allModules = treeShakableModules.concat(nonTreeShakableModules); module.exports = (env) => { const extractCSS = new ExtractTextPlugin('vendor.css'); @@ -14,26 +35,6 @@ module.exports = (env) => { { test: /\.(png|woff|woff2|eot|ttf|svg)(\?|$)/, use: 'url-loader?limit=100000' } ] }, - entry: { - vendor: [ - '@angular/animations', - '@angular/common', - '@angular/compiler', - '@angular/core', - '@angular/forms', - '@angular/http', - '@angular/platform-browser', - '@angular/platform-browser-dynamic', - '@angular/router', - 'bootstrap', - 'bootstrap/dist/css/bootstrap.css', - 'es6-shim', - 'es6-promise', - 'event-source-polyfill', - 'jquery', - 'zone.js', - ] - }, output: { publicPath: '/dist/', filename: '[name].js', @@ -48,6 +49,11 @@ module.exports = (env) => { }; const clientBundleConfig = merge(sharedConfig, { + entry: { + // To keep development builds fast, include all vendor dependencies in the vendor bundle. + // But for production builds, leave the tree-shakable ones out so the AOT compiler can produce a smaller bundle. + vendor: isDevBuild ? allModules : nonTreeShakableModules + }, output: { path: path.join(__dirname, 'wwwroot', 'dist') }, module: { rules: [ @@ -68,6 +74,7 @@ module.exports = (env) => { const serverBundleConfig = merge(sharedConfig, { target: 'node', resolve: { mainFields: ['main'] }, + entry: { vendor: allModules.concat(['aspnet-prerendering']) }, output: { path: path.join(__dirname, 'ClientApp', 'dist'), libraryTarget: 'commonjs2', @@ -75,7 +82,6 @@ module.exports = (env) => { module: { rules: [ { test: /\.css(\?|$)/, use: ['to-string-loader', isDevBuild ? 'css-loader' : 'css-loader?minimize' ] } ] }, - entry: { vendor: ['aspnet-prerendering'] }, plugins: [ new webpack.DllPlugin({ path: path.join(__dirname, 'ClientApp', 'dist', '[name]-manifest.json'), From 2135c30d6674569d5d19633a0ea84e1ed183cb94 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Fri, 7 Jul 2017 11:40:59 +0100 Subject: [PATCH 171/411] Update React template dependencies --- templates/ReactSpa/npm-shrinkwrap.json | 920 +++++++++++++++++++++++-- templates/ReactSpa/package.json | 28 +- 2 files changed, 863 insertions(+), 85 deletions(-) diff --git a/templates/ReactSpa/npm-shrinkwrap.json b/templates/ReactSpa/npm-shrinkwrap.json index 7ccf4bf8..694cbc95 100644 --- a/templates/ReactSpa/npm-shrinkwrap.json +++ b/templates/ReactSpa/npm-shrinkwrap.json @@ -3,27 +3,27 @@ "version": "0.0.0", "dependencies": { "@types/history": { - "version": "4.5.1", - "from": "@types/history@4.5.1", - "resolved": "https://registry.npmjs.org/@types/history/-/history-4.5.1.tgz", + "version": "4.6.0", + "from": "@types/history@4.6.0", + "resolved": "https://registry.npmjs.org/@types/history/-/history-4.6.0.tgz", "dev": true }, "@types/react": { - "version": "15.0.24", - "from": "@types/react@15.0.24", - "resolved": "https://registry.npmjs.org/@types/react/-/react-15.0.24.tgz", + "version": "15.0.35", + "from": "@types/react@15.0.35", + "resolved": "https://registry.npmjs.org/@types/react/-/react-15.0.35.tgz", "dev": true }, "@types/react-dom": { - "version": "15.5.0", - "from": "@types/react-dom@15.5.0", - "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-15.5.0.tgz", + "version": "15.5.1", + "from": "@types/react-dom@15.5.1", + "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-15.5.1.tgz", "dev": true }, "@types/react-router": { - "version": "4.0.9", - "from": "@types/react-router@4.0.9", - "resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-4.0.9.tgz", + "version": "4.0.12", + "from": "@types/react-router@4.0.12", + "resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-4.0.12.tgz", "dev": true }, "@types/webpack-env": { @@ -124,6 +124,12 @@ "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.3.tgz", "dev": true }, + "arr-union": { + "version": "3.1.0", + "from": "arr-union@>=3.1.0 <4.0.0", + "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz", + "dev": true + }, "array-unique": { "version": "0.2.1", "from": "array-unique@>=0.2.1 <0.3.0", @@ -178,6 +184,12 @@ "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz", "dev": true }, + "atob": { + "version": "2.0.3", + "from": "atob@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/atob/-/atob-2.0.3.tgz", + "dev": true + }, "autoprefixer": { "version": "6.7.7", "from": "autoprefixer@>=6.3.1 <7.0.0", @@ -185,10 +197,130 @@ "dev": true }, "awesome-typescript-loader": { - "version": "3.1.3", - "from": "awesome-typescript-loader@3.1.3", - "resolved": "https://registry.npmjs.org/awesome-typescript-loader/-/awesome-typescript-loader-3.1.3.tgz", - "dev": true + "version": "3.2.1", + "from": "awesome-typescript-loader@3.2.1", + "resolved": "https://registry.npmjs.org/awesome-typescript-loader/-/awesome-typescript-loader-3.2.1.tgz", + "dev": true, + "dependencies": { + "arr-diff": { + "version": "4.0.0", + "from": "arr-diff@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", + "dev": true + }, + "array-unique": { + "version": "0.3.2", + "from": "array-unique@>=0.3.2 <0.4.0", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", + "dev": true + }, + "braces": { + "version": "2.2.2", + "from": "braces@>=2.2.2 <3.0.0", + "resolved": "https://registry.npmjs.org/braces/-/braces-2.2.2.tgz", + "dev": true + }, + "expand-brackets": { + "version": "2.1.4", + "from": "expand-brackets@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", + "dev": true, + "dependencies": { + "define-property": { + "version": "0.2.5", + "from": "define-property@>=0.2.5 <0.3.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "dev": true + } + } + }, + "extglob": { + "version": "1.1.0", + "from": "extglob@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/extglob/-/extglob-1.1.0.tgz", + "dev": true, + "dependencies": { + "define-property": { + "version": "0.2.5", + "from": "define-property@>=0.2.5 <0.3.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "dev": true + }, + "to-regex": { + "version": "2.1.0", + "from": "to-regex@>=2.1.0 <3.0.0", + "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-2.1.0.tgz", + "dev": true, + "dependencies": { + "regex-not": { + "version": "0.1.2", + "from": "regex-not@>=0.1.1 <0.2.0", + "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-0.1.2.tgz", + "dev": true + } + } + } + } + }, + "fill-range": { + "version": "4.0.0", + "from": "fill-range@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", + "dev": true + }, + "is-descriptor": { + "version": "0.1.5", + "from": "is-descriptor@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.5.tgz", + "dev": true, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "from": "kind-of@>=3.0.2 <4.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "dev": true + } + } + }, + "is-number": { + "version": "3.0.0", + "from": "is-number@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "dev": true, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "from": "kind-of@>=3.0.2 <4.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "dev": true + } + } + }, + "isobject": { + "version": "3.0.1", + "from": "isobject@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "dev": true + }, + "kind-of": { + "version": "4.0.0", + "from": "kind-of@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", + "dev": true + }, + "lazy-cache": { + "version": "2.0.2", + "from": "lazy-cache@^2.0.2", + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-2.0.2.tgz", + "dev": true + }, + "micromatch": { + "version": "3.0.3", + "from": "micromatch@>=3.0.3 <4.0.0", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.0.3.tgz", + "dev": true + } + } }, "babel-code-frame": { "version": "6.22.0", @@ -246,6 +378,32 @@ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz", "dev": true }, + "base": { + "version": "0.11.1", + "from": "base@>=0.11.1 <0.12.0", + "resolved": "https://registry.npmjs.org/base/-/base-0.11.1.tgz", + "dev": true, + "dependencies": { + "define-property": { + "version": "0.2.5", + "from": "define-property@>=0.2.5 <0.3.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "dev": true + }, + "is-descriptor": { + "version": "0.1.5", + "from": "is-descriptor@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.5.tgz", + "dev": true + }, + "lazy-cache": { + "version": "2.0.2", + "from": "lazy-cache@^2.0.1", + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-2.0.2.tgz", + "dev": true + } + } + }, "base64-js": { "version": "1.2.1", "from": "base64-js@>=1.0.2 <2.0.0", @@ -368,6 +526,26 @@ "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz", "dev": true }, + "cache-base": { + "version": "0.8.5", + "from": "cache-base@>=0.8.4 <0.9.0", + "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-0.8.5.tgz", + "dev": true, + "dependencies": { + "isobject": { + "version": "3.0.1", + "from": "isobject@^3.0.0", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "dev": true + }, + "lazy-cache": { + "version": "2.0.2", + "from": "lazy-cache@^2.0.1", + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-2.0.2.tgz", + "dev": true + } + } + }, "camelcase": { "version": "1.2.1", "from": "camelcase@>=1.0.2 <2.0.0", @@ -381,9 +559,9 @@ "dev": true }, "caniuse-db": { - "version": "1.0.30000694", + "version": "1.0.30000697", "from": "caniuse-db@>=1.0.30000634 <2.0.0", - "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000694.tgz", + "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000697.tgz", "dev": true }, "center-align": { @@ -416,6 +594,38 @@ "resolved": "https://registry.npmjs.org/clap/-/clap-1.2.0.tgz", "dev": true }, + "class-utils": { + "version": "0.3.5", + "from": "class-utils@>=0.3.4 <0.4.0", + "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.5.tgz", + "dev": true, + "dependencies": { + "define-property": { + "version": "0.2.5", + "from": "define-property@>=0.2.5 <0.3.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "dev": true + }, + "is-descriptor": { + "version": "0.1.5", + "from": "is-descriptor@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.5.tgz", + "dev": true + }, + "isobject": { + "version": "3.0.1", + "from": "isobject@^3.0.0", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "dev": true + }, + "lazy-cache": { + "version": "2.0.2", + "from": "lazy-cache@^2.0.2", + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-2.0.2.tgz", + "dev": true + } + } + }, "cliui": { "version": "2.1.0", "from": "cliui@>=2.1.0 <3.0.0", @@ -446,6 +656,20 @@ "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", "dev": true }, + "collection-visit": { + "version": "0.2.3", + "from": "collection-visit@>=0.2.1 <0.3.0", + "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-0.2.3.tgz", + "dev": true, + "dependencies": { + "lazy-cache": { + "version": "2.0.2", + "from": "lazy-cache@^2.0.1", + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-2.0.2.tgz", + "dev": true + } + } + }, "color": { "version": "0.11.4", "from": "color@>=0.11.0 <0.12.0", @@ -482,6 +706,12 @@ "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz", "dev": true }, + "component-emitter": { + "version": "1.2.1", + "from": "component-emitter@>=1.2.1 <2.0.0", + "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", + "dev": true + }, "concat-map": { "version": "0.0.1", "from": "concat-map@0.0.1", @@ -506,6 +736,12 @@ "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz", "dev": true }, + "copy-descriptor": { + "version": "0.1.1", + "from": "copy-descriptor@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz", + "dev": true + }, "core-js": { "version": "1.2.7", "from": "core-js@>=1.0.0 <2.0.0", @@ -536,6 +772,12 @@ "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.6.tgz", "dev": true }, + "create-react-class": { + "version": "15.6.0", + "from": "create-react-class@>=15.6.0 <16.0.0", + "resolved": "https://registry.npmjs.org/create-react-class/-/create-react-class-15.6.0.tgz", + "dev": true + }, "crypto-browserify": { "version": "3.11.0", "from": "crypto-browserify@>=3.11.0 <4.0.0", @@ -549,9 +791,9 @@ "dev": true }, "css-loader": { - "version": "0.28.1", - "from": "css-loader@0.28.1", - "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.28.1.tgz", + "version": "0.28.4", + "from": "css-loader@0.28.4", + "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.28.4.tgz", "dev": true }, "css-selector-tokenizer": { @@ -596,6 +838,12 @@ "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", "dev": true }, + "define-property": { + "version": "1.0.0", + "from": "define-property@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", + "dev": true + }, "defined": { "version": "1.0.0", "from": "defined@>=1.0.0 <2.0.0", @@ -633,9 +881,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.14", + "version": "1.3.15", "from": "electron-to-chromium@>=1.2.7 <2.0.0", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.14.tgz", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.15.tgz", "dev": true }, "elliptic": { @@ -754,6 +1002,12 @@ "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz", "dev": true }, + "extend-shallow": { + "version": "2.0.1", + "from": "extend-shallow@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "dev": true + }, "extglob": { "version": "0.3.2", "from": "extglob@>=0.3.1 <0.4.0", @@ -761,9 +1015,15 @@ "dev": true }, "extract-text-webpack-plugin": { - "version": "2.1.0", - "from": "extract-text-webpack-plugin@2.1.0", - "resolved": "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-2.1.0.tgz", + "version": "2.1.2", + "from": "extract-text-webpack-plugin@2.1.2", + "resolved": "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-2.1.2.tgz", + "dev": true + }, + "fast-deep-equal": { + "version": "1.0.0", + "from": "fast-deep-equal@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz", "dev": true }, "fastparse": { @@ -779,9 +1039,9 @@ "dev": true }, "file-loader": { - "version": "0.11.1", - "from": "file-loader@0.11.1", - "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-0.11.1.tgz", + "version": "0.11.2", + "from": "file-loader@0.11.2", + "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-0.11.2.tgz", "dev": true }, "filename-regex": { @@ -826,6 +1086,12 @@ "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz", "dev": true }, + "fragment-cache": { + "version": "0.2.1", + "from": "fragment-cache@>=0.2.1 <0.3.0", + "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz", + "dev": true + }, "function-bind": { "version": "1.1.0", "from": "function-bind@>=1.0.2 <2.0.0", @@ -838,6 +1104,12 @@ "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz", "dev": true }, + "get-value": { + "version": "2.0.6", + "from": "get-value@>=2.0.5 <3.0.0", + "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz", + "dev": true + }, "glob-base": { "version": "0.3.0", "from": "glob-base@>=0.3.0 <0.4.0", @@ -886,6 +1158,18 @@ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", "dev": true }, + "has-value": { + "version": "0.3.1", + "from": "has-value@>=0.3.1 <0.4.0", + "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz", + "dev": true + }, + "has-values": { + "version": "0.1.4", + "from": "has-values@>=0.1.4 <0.2.0", + "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz", + "dev": true + }, "hash-base": { "version": "2.0.2", "from": "hash-base@>=2.0.0 <3.0.0", @@ -952,6 +1236,44 @@ "resolved": "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz", "dev": true }, + "icss-utils": { + "version": "2.1.0", + "from": "icss-utils@>=2.1.0 <3.0.0", + "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-2.1.0.tgz", + "dev": true, + "dependencies": { + "ansi-styles": { + "version": "3.1.0", + "from": "ansi-styles@>=3.1.0 <4.0.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.1.0.tgz", + "dev": true + }, + "chalk": { + "version": "2.0.1", + "from": "chalk@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz", + "dev": true + }, + "has-flag": { + "version": "2.0.0", + "from": "has-flag@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", + "dev": true + }, + "postcss": { + "version": "6.0.6", + "from": "postcss@>=6.0.1 <7.0.0", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.6.tgz", + "dev": true + }, + "supports-color": { + "version": "4.2.0", + "from": "supports-color@>=4.1.0 <5.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.2.0.tgz", + "dev": true + } + } + }, "ieee754": { "version": "1.1.8", "from": "ieee754@>=1.1.4 <2.0.0", @@ -1000,6 +1322,12 @@ "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz", "dev": true }, + "is-accessor-descriptor": { + "version": "0.1.6", + "from": "is-accessor-descriptor@>=0.1.6 <0.2.0", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "dev": true + }, "is-arrayish": { "version": "0.2.1", "from": "is-arrayish@>=0.2.1 <0.3.0", @@ -1024,6 +1352,26 @@ "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", "dev": true }, + "is-data-descriptor": { + "version": "0.1.4", + "from": "is-data-descriptor@>=0.1.4 <0.2.0", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", + "dev": true + }, + "is-descriptor": { + "version": "1.0.0", + "from": "is-descriptor@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.0.tgz", + "dev": true, + "dependencies": { + "lazy-cache": { + "version": "2.0.2", + "from": "lazy-cache@>=2.0.2 <3.0.0", + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-2.0.2.tgz", + "dev": true + } + } + }, "is-dotfile": { "version": "1.0.3", "from": "is-dotfile@>=1.0.0 <2.0.0", @@ -1066,12 +1414,40 @@ "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz", "dev": true }, + "is-odd": { + "version": "1.0.0", + "from": "is-odd@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-odd/-/is-odd-1.0.0.tgz", + "dev": true, + "dependencies": { + "is-number": { + "version": "3.0.0", + "from": "is-number@^3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "dev": true + } + } + }, "is-plain-obj": { "version": "1.1.0", "from": "is-plain-obj@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", "dev": true }, + "is-plain-object": { + "version": "2.0.3", + "from": "is-plain-object@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.3.tgz", + "dev": true, + "dependencies": { + "isobject": { + "version": "3.0.1", + "from": "isobject@^3.0.0", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "dev": true + } + } + }, "is-posix-bracket": { "version": "0.1.1", "from": "is-posix-bracket@>=0.1.0 <0.2.0", @@ -1156,6 +1532,12 @@ "resolved": "https://registry.npmjs.org/json-loader/-/json-loader-0.5.4.tgz", "dev": true }, + "json-schema-traverse": { + "version": "0.3.1", + "from": "json-schema-traverse@>=0.3.0 <0.4.0", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz", + "dev": true + }, "json-stable-stringify": { "version": "1.0.1", "from": "json-stable-stringify@>=1.0.1 <2.0.0", @@ -1252,6 +1634,26 @@ "resolved": "https://registry.npmjs.org/macaddress/-/macaddress-0.2.8.tgz", "dev": true }, + "map-cache": { + "version": "0.2.2", + "from": "map-cache@>=0.2.2 <0.3.0", + "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", + "dev": true + }, + "map-visit": { + "version": "0.1.5", + "from": "map-visit@>=0.1.5 <0.2.0", + "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-0.1.5.tgz", + "dev": true, + "dependencies": { + "lazy-cache": { + "version": "2.0.2", + "from": "lazy-cache@^2.0.1", + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-2.0.2.tgz", + "dev": true + } + } + }, "math-expression-evaluator": { "version": "1.2.17", "from": "math-expression-evaluator@>=1.2.14 <2.0.0", @@ -1312,6 +1714,12 @@ "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", "dev": true }, + "mixin-deep": { + "version": "1.2.0", + "from": "mixin-deep@>=1.1.3 <2.0.0", + "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.2.0.tgz", + "dev": true + }, "mkdirp": { "version": "0.5.1", "from": "mkdirp@>=0.5.1 <0.6.0", @@ -1324,6 +1732,38 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "dev": true }, + "nanomatch": { + "version": "1.2.0", + "from": "nanomatch@>=1.2.0 <2.0.0", + "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.0.tgz", + "dev": true, + "dependencies": { + "arr-diff": { + "version": "4.0.0", + "from": "arr-diff@^4.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", + "dev": true + }, + "array-unique": { + "version": "0.3.2", + "from": "array-unique@^0.3.2", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", + "dev": true + }, + "is-extglob": { + "version": "2.1.1", + "from": "is-extglob@>=2.1.1 <3.0.0", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "dev": true + }, + "kind-of": { + "version": "4.0.0", + "from": "kind-of@^4.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", + "dev": true + } + } + }, "node-fetch": { "version": "1.7.1", "from": "node-fetch@>=1.0.1 <2.0.0", @@ -1392,12 +1832,50 @@ "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", "dev": true }, + "object-copy": { + "version": "0.1.0", + "from": "object-copy@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz", + "dev": true, + "dependencies": { + "define-property": { + "version": "0.2.5", + "from": "define-property@>=0.2.5 <0.3.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "dev": true + }, + "is-descriptor": { + "version": "0.1.5", + "from": "is-descriptor@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.5.tgz", + "dev": true + }, + "lazy-cache": { + "version": "2.0.2", + "from": "lazy-cache@^2.0.2", + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-2.0.2.tgz", + "dev": true + } + } + }, + "object-visit": { + "version": "0.3.4", + "from": "object-visit@>=0.3.4 <0.4.0", + "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-0.3.4.tgz", + "dev": true + }, "object.omit": { "version": "2.0.1", "from": "object.omit@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz", "dev": true }, + "object.pick": { + "version": "1.2.0", + "from": "object.pick@>=1.2.0 <2.0.0", + "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.2.0.tgz", + "dev": true + }, "on-finished": { "version": "2.3.0", "from": "on-finished@>=2.3.0 <2.4.0", @@ -1446,6 +1924,12 @@ "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz", "dev": true }, + "pascalcase": { + "version": "0.1.1", + "from": "pascalcase@>=0.1.1 <0.2.0", + "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz", + "dev": true + }, "path-browserify": { "version": "0.0.0", "from": "path-browserify@0.0.0", @@ -1508,6 +1992,12 @@ "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", "dev": true }, + "posix-character-classes": { + "version": "0.1.1", + "from": "posix-character-classes@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz", + "dev": true + }, "postcss": { "version": "5.2.17", "from": "postcss@>=5.0.6 <6.0.0", @@ -1630,6 +2120,18 @@ "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.1.0.tgz", "dev": true, "dependencies": { + "ansi-styles": { + "version": "3.1.0", + "from": "ansi-styles@^3.1.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.1.0.tgz", + "dev": true + }, + "chalk": { + "version": "2.0.1", + "from": "chalk@^2.0.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz", + "dev": true + }, "has-flag": { "version": "2.0.0", "from": "has-flag@>=2.0.0 <3.0.0", @@ -1637,15 +2139,15 @@ "dev": true }, "postcss": { - "version": "6.0.3", + "version": "6.0.6", "from": "postcss@>=6.0.1 <7.0.0", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.3.tgz", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.6.tgz", "dev": true }, "supports-color": { - "version": "4.0.0", - "from": "supports-color@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.0.0.tgz", + "version": "4.2.0", + "from": "supports-color@>=4.1.0 <5.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.2.0.tgz", "dev": true } } @@ -1656,6 +2158,18 @@ "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz", "dev": true, "dependencies": { + "ansi-styles": { + "version": "3.1.0", + "from": "ansi-styles@^3.1.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.1.0.tgz", + "dev": true + }, + "chalk": { + "version": "2.0.1", + "from": "chalk@^2.0.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz", + "dev": true + }, "has-flag": { "version": "2.0.0", "from": "has-flag@>=2.0.0 <3.0.0", @@ -1663,15 +2177,15 @@ "dev": true }, "postcss": { - "version": "6.0.3", + "version": "6.0.6", "from": "postcss@>=6.0.1 <7.0.0", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.3.tgz", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.6.tgz", "dev": true }, "supports-color": { - "version": "4.0.0", - "from": "supports-color@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.0.0.tgz", + "version": "4.2.0", + "from": "supports-color@>=4.1.0 <5.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.2.0.tgz", "dev": true } } @@ -1682,6 +2196,18 @@ "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz", "dev": true, "dependencies": { + "ansi-styles": { + "version": "3.1.0", + "from": "ansi-styles@^3.1.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.1.0.tgz", + "dev": true + }, + "chalk": { + "version": "2.0.1", + "from": "chalk@^2.0.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz", + "dev": true + }, "has-flag": { "version": "2.0.0", "from": "has-flag@>=2.0.0 <3.0.0", @@ -1689,15 +2215,15 @@ "dev": true }, "postcss": { - "version": "6.0.3", + "version": "6.0.6", "from": "postcss@>=6.0.1 <7.0.0", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.3.tgz", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.6.tgz", "dev": true }, "supports-color": { - "version": "4.0.0", - "from": "supports-color@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.0.0.tgz", + "version": "4.2.0", + "from": "supports-color@>=4.1.0 <5.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.2.0.tgz", "dev": true } } @@ -1708,6 +2234,18 @@ "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz", "dev": true, "dependencies": { + "ansi-styles": { + "version": "3.1.0", + "from": "ansi-styles@^3.1.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.1.0.tgz", + "dev": true + }, + "chalk": { + "version": "2.0.1", + "from": "chalk@^2.0.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz", + "dev": true + }, "has-flag": { "version": "2.0.0", "from": "has-flag@>=2.0.0 <3.0.0", @@ -1715,15 +2253,15 @@ "dev": true }, "postcss": { - "version": "6.0.3", + "version": "6.0.6", "from": "postcss@>=6.0.1 <7.0.0", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.3.tgz", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.6.tgz", "dev": true }, "supports-color": { - "version": "4.0.0", - "from": "supports-color@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.0.0.tgz", + "version": "4.2.0", + "from": "supports-color@>=4.1.0 <5.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.2.0.tgz", "dev": true } } @@ -1913,9 +2451,9 @@ "dev": true }, "react": { - "version": "15.5.4", - "from": "react@15.5.4", - "resolved": "https://registry.npmjs.org/react/-/react-15.5.4.tgz", + "version": "15.6.1", + "from": "react@15.6.1", + "resolved": "https://registry.npmjs.org/react/-/react-15.6.1.tgz", "dev": true }, "react-deep-force-update": { @@ -1925,9 +2463,9 @@ "dev": true }, "react-dom": { - "version": "15.5.4", - "from": "react-dom@15.5.4", - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-15.5.4.tgz", + "version": "15.6.1", + "from": "react-dom@15.6.1", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-15.6.1.tgz", "dev": true }, "react-hot-loader": { @@ -2022,6 +2560,12 @@ "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz", "dev": true }, + "regex-not": { + "version": "1.0.0", + "from": "regex-not@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.0.tgz", + "dev": true + }, "regexpu-core": { "version": "1.0.0", "from": "regexpu-core@>=1.0.0 <2.0.0", @@ -2082,6 +2626,12 @@ "resolved": "https://registry.npmjs.org/resolve-pathname/-/resolve-pathname-2.1.0.tgz", "dev": true }, + "resolve-url": { + "version": "0.2.1", + "from": "resolve-url@>=0.2.1 <0.3.0", + "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz", + "dev": true + }, "right-align": { "version": "0.1.3", "from": "right-align@>=0.1.1 <0.2.0", @@ -2106,6 +2656,20 @@ "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", "dev": true }, + "schema-utils": { + "version": "0.3.0", + "from": "schema-utils@>=0.3.0 <0.4.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz", + "dev": true, + "dependencies": { + "ajv": { + "version": "5.2.1", + "from": "ajv@>=5.0.0 <6.0.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.1.tgz", + "dev": true + } + } + }, "semver": { "version": "5.3.0", "from": "semver@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0||>=4.0.0 <5.0.0||>=5.0.0 <6.0.0", @@ -2118,12 +2682,24 @@ "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", "dev": true }, + "set-getter": { + "version": "0.1.0", + "from": "set-getter@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/set-getter/-/set-getter-0.1.0.tgz", + "dev": true + }, "set-immediate-shim": { "version": "1.0.1", "from": "set-immediate-shim@>=1.0.1 <2.0.0", "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz", "dev": true }, + "set-value": { + "version": "0.4.3", + "from": "set-value@>=0.4.2 <0.5.0", + "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz", + "dev": true + }, "setimmediate": { "version": "1.0.5", "from": "setimmediate@>=1.0.5 <2.0.0", @@ -2136,6 +2712,52 @@ "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.8.tgz", "dev": true }, + "snapdragon": { + "version": "0.8.1", + "from": "snapdragon@>=0.8.1 <0.9.0", + "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.1.tgz", + "dev": true, + "dependencies": { + "define-property": { + "version": "0.2.5", + "from": "define-property@>=0.2.5 <0.3.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "dev": true + }, + "is-descriptor": { + "version": "0.1.5", + "from": "is-descriptor@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.5.tgz", + "dev": true + }, + "lazy-cache": { + "version": "2.0.2", + "from": "lazy-cache@^2.0.2", + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-2.0.2.tgz", + "dev": true + } + } + }, + "snapdragon-node": { + "version": "2.1.1", + "from": "snapdragon-node@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz", + "dev": true, + "dependencies": { + "isobject": { + "version": "3.0.1", + "from": "isobject@^3.0.0", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "dev": true + } + } + }, + "snapdragon-util": { + "version": "3.0.1", + "from": "snapdragon-util@>=3.0.1 <4.0.0", + "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz", + "dev": true + }, "sort-keys": { "version": "1.1.2", "from": "sort-keys@>=1.0.0 <2.0.0", @@ -2154,12 +2776,24 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz", "dev": true }, + "source-map-resolve": { + "version": "0.5.0", + "from": "source-map-resolve@>=0.5.0 <0.6.0", + "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.0.tgz", + "dev": true + }, "source-map-support": { "version": "0.4.15", "from": "source-map-support@>=0.4.15 <0.5.0", "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.15.tgz", "dev": true }, + "source-map-url": { + "version": "0.4.0", + "from": "source-map-url@>=0.4.0 <0.5.0", + "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", + "dev": true + }, "sourcemapped-stacktrace": { "version": "1.1.6", "from": "sourcemapped-stacktrace@>=1.1.6 <2.0.0", @@ -2184,6 +2818,12 @@ "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz", "dev": true }, + "split-string": { + "version": "2.1.1", + "from": "split-string@>=2.1.0 <3.0.0", + "resolved": "https://registry.npmjs.org/split-string/-/split-string-2.1.1.tgz", + "dev": true + }, "sprintf-js": { "version": "1.0.3", "from": "sprintf-js@>=1.0.2 <1.1.0", @@ -2196,6 +2836,32 @@ "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-0.3.1.tgz", "dev": true }, + "static-extend": { + "version": "0.1.2", + "from": "static-extend@>=0.1.1 <0.2.0", + "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz", + "dev": true, + "dependencies": { + "define-property": { + "version": "0.2.5", + "from": "define-property@>=0.2.5 <0.3.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "dev": true + }, + "is-descriptor": { + "version": "0.1.5", + "from": "is-descriptor@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.5.tgz", + "dev": true + }, + "lazy-cache": { + "version": "2.0.2", + "from": "lazy-cache@^2.0.2", + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-2.0.2.tgz", + "dev": true + } + } + }, "statuses": { "version": "1.3.1", "from": "statuses@>=1.3.1 <1.4.0", @@ -2245,9 +2911,9 @@ "dev": true }, "style-loader": { - "version": "0.17.0", - "from": "style-loader@0.17.0", - "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.17.0.tgz", + "version": "0.18.2", + "from": "style-loader@0.18.2", + "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.18.2.tgz", "dev": true }, "supports-color": { @@ -2286,6 +2952,52 @@ "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz", "dev": true }, + "to-object-path": { + "version": "0.3.0", + "from": "to-object-path@>=0.3.0 <0.4.0", + "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz", + "dev": true + }, + "to-regex": { + "version": "3.0.1", + "from": "to-regex@>=3.0.1 <4.0.0", + "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.1.tgz", + "dev": true, + "dependencies": { + "define-property": { + "version": "0.2.5", + "from": "define-property@>=0.2.5 <0.3.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "dev": true + }, + "is-descriptor": { + "version": "0.1.5", + "from": "is-descriptor@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.5.tgz", + "dev": true + }, + "lazy-cache": { + "version": "2.0.2", + "from": "lazy-cache@^2.0.2", + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-2.0.2.tgz", + "dev": true + } + } + }, + "to-regex-range": { + "version": "2.1.1", + "from": "to-regex-range@>=2.1.0 <3.0.0", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", + "dev": true, + "dependencies": { + "is-number": { + "version": "3.0.0", + "from": "is-number@^3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "dev": true + } + } + }, "tty-browserify": { "version": "0.0.0", "from": "tty-browserify@0.0.0", @@ -2293,9 +3005,9 @@ "dev": true }, "typescript": { - "version": "2.3.2", - "from": "typescript@2.3.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.3.2.tgz", + "version": "2.4.1", + "from": "typescript@2.4.1", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.4.1.tgz", "dev": true }, "ua-parser-js": { @@ -2325,6 +3037,12 @@ "dev": true, "optional": true }, + "union-value": { + "version": "0.2.4", + "from": "union-value@>=0.2.3 <0.3.0", + "resolved": "https://registry.npmjs.org/union-value/-/union-value-0.2.4.tgz", + "dev": true + }, "uniq": { "version": "1.0.1", "from": "uniq@>=1.0.1 <2.0.0", @@ -2349,6 +3067,26 @@ "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", "dev": true }, + "unset-value": { + "version": "0.1.2", + "from": "unset-value@>=0.1.1 <0.2.0", + "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-0.1.2.tgz", + "dev": true, + "dependencies": { + "isobject": { + "version": "3.0.1", + "from": "isobject@^3.0.0", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "dev": true + } + } + }, + "urix": { + "version": "0.1.0", + "from": "urix@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz", + "dev": true + }, "url": { "version": "0.11.0", "from": "url@>=0.11.0 <0.12.0", @@ -2364,11 +3102,43 @@ } }, "url-loader": { - "version": "0.5.8", - "from": "url-loader@0.5.8", - "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-0.5.8.tgz", + "version": "0.5.9", + "from": "url-loader@0.5.9", + "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-0.5.9.tgz", "dev": true }, + "use": { + "version": "2.0.2", + "from": "use@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/use/-/use-2.0.2.tgz", + "dev": true, + "dependencies": { + "define-property": { + "version": "0.2.5", + "from": "define-property@>=0.2.5 <0.3.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "dev": true + }, + "is-descriptor": { + "version": "0.1.5", + "from": "is-descriptor@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.5.tgz", + "dev": true + }, + "isobject": { + "version": "3.0.1", + "from": "isobject@^3.0.0", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "dev": true + }, + "lazy-cache": { + "version": "2.0.2", + "from": "lazy-cache@^2.0.2", + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-2.0.2.tgz", + "dev": true + } + } + }, "util": { "version": "0.10.3", "from": "util@>=0.10.3 <0.11.0", @@ -2484,9 +3254,9 @@ } }, "webpack-hot-middleware": { - "version": "2.18.0", - "from": "webpack-hot-middleware@2.18.0", - "resolved": "https://registry.npmjs.org/webpack-hot-middleware/-/webpack-hot-middleware-2.18.0.tgz", + "version": "2.18.2", + "from": "webpack-hot-middleware@2.18.2", + "resolved": "https://registry.npmjs.org/webpack-hot-middleware/-/webpack-hot-middleware-2.18.2.tgz", "dev": true }, "webpack-node-externals": { @@ -2496,10 +3266,18 @@ "dev": true }, "webpack-sources": { - "version": "0.1.5", - "from": "webpack-sources@>=0.1.0 <0.2.0", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.1.5.tgz", - "dev": true + "version": "1.0.1", + "from": "webpack-sources@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.0.1.tgz", + "dev": true, + "dependencies": { + "source-list-map": { + "version": "2.0.0", + "from": "source-list-map@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz", + "dev": true + } + } }, "whatwg-fetch": { "version": "2.0.3", diff --git a/templates/ReactSpa/package.json b/templates/ReactSpa/package.json index 86968da5..980d9797 100644 --- a/templates/ReactSpa/package.json +++ b/templates/ReactSpa/package.json @@ -3,30 +3,30 @@ "private": true, "version": "0.0.0", "devDependencies": { - "@types/history": "4.5.1", - "@types/react": "15.0.29", - "@types/react-dom": "15.5.0", - "@types/react-router": "4.0.9", + "@types/history": "4.6.0", + "@types/react": "15.0.35", + "@types/react-dom": "15.5.1", + "@types/react-router": "4.0.12", "@types/webpack-env": "1.13.0", "aspnet-webpack": "^1.0.29", "aspnet-webpack-react": "^3.0.0-beta", - "awesome-typescript-loader": "3.1.3", + "awesome-typescript-loader": "3.2.1", "bootstrap": "3.3.7", - "css-loader": "0.28.1", + "css-loader": "0.28.4", "event-source-polyfill": "0.0.9", - "extract-text-webpack-plugin": "2.1.0", - "file-loader": "0.11.1", + "extract-text-webpack-plugin": "2.1.2", + "file-loader": "0.11.2", "isomorphic-fetch": "2.2.1", "jquery": "3.2.1", "json-loader": "0.5.4", - "react": "15.5.4", - "react-dom": "15.5.4", + "react": "15.6.1", + "react-dom": "15.6.1", "react-hot-loader": "3.0.0-beta.7", "react-router-dom": "4.1.1", - "style-loader": "0.17.0", - "typescript": "2.3.2", - "url-loader": "0.5.8", + "style-loader": "0.18.2", + "typescript": "2.4.1", + "url-loader": "0.5.9", "webpack": "2.5.1", - "webpack-hot-middleware": "2.18.0" + "webpack-hot-middleware": "2.18.2" } } From 58145d33e375bcd64c5ec09124381c4cd9ddf19c Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Fri, 7 Jul 2017 12:08:01 +0100 Subject: [PATCH 172/411] Update ReactRedux template dependencies --- .../ClientApp/store/WeatherForecasts.ts | 3 +- templates/ReactReduxSpa/npm-shrinkwrap.json | 760 ++++++++++++++++-- templates/ReactReduxSpa/package.json | 42 +- 3 files changed, 709 insertions(+), 96 deletions(-) diff --git a/templates/ReactReduxSpa/ClientApp/store/WeatherForecasts.ts b/templates/ReactReduxSpa/ClientApp/store/WeatherForecasts.ts index 1f7bdfdd..87828de3 100644 --- a/templates/ReactReduxSpa/ClientApp/store/WeatherForecasts.ts +++ b/templates/ReactReduxSpa/ClientApp/store/WeatherForecasts.ts @@ -62,7 +62,8 @@ export const actionCreators = { const unloadedState: WeatherForecastsState = { startDateIndex: null, forecasts: [], isLoading: false }; -export const reducer: Reducer = (state: WeatherForecastsState, action: KnownAction) => { +export const reducer: Reducer = (state: WeatherForecastsState, incomingAction: Action) => { + const action = incomingAction as KnownAction; switch (action.type) { case 'REQUEST_WEATHER_FORECASTS': return { diff --git a/templates/ReactReduxSpa/npm-shrinkwrap.json b/templates/ReactReduxSpa/npm-shrinkwrap.json index cd862448..9dc18a0d 100644 --- a/templates/ReactReduxSpa/npm-shrinkwrap.json +++ b/templates/ReactReduxSpa/npm-shrinkwrap.json @@ -3,9 +3,9 @@ "version": "0.0.0", "dependencies": { "@types/history": { - "version": "4.5.1", - "from": "@types/history@4.5.1", - "resolved": "https://registry.npmjs.org/@types/history/-/history-4.5.1.tgz" + "version": "4.6.0", + "from": "@types/history@4.6.0", + "resolved": "https://registry.npmjs.org/@types/history/-/history-4.6.0.tgz" }, "@types/node": { "version": "8.0.7", @@ -13,34 +13,34 @@ "resolved": "https://registry.npmjs.org/@types/node/-/node-8.0.7.tgz" }, "@types/react": { - "version": "15.0.29", - "from": "@types/react@15.0.29", - "resolved": "https://registry.npmjs.org/@types/react/-/react-15.0.29.tgz" + "version": "15.0.35", + "from": "@types/react@15.0.35", + "resolved": "https://registry.npmjs.org/@types/react/-/react-15.0.35.tgz" }, "@types/react-dom": { - "version": "15.5.0", - "from": "@types/react-dom@15.5.0", - "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-15.5.0.tgz" + "version": "15.5.1", + "from": "@types/react-dom@15.5.1", + "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-15.5.1.tgz" }, "@types/react-redux": { - "version": "4.4.40", - "from": "@types/react-redux@4.4.40", - "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-4.4.40.tgz" + "version": "4.4.45", + "from": "@types/react-redux@4.4.45", + "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-4.4.45.tgz" }, "@types/react-router": { - "version": "4.0.11", - "from": "@types/react-router@4.0.11", - "resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-4.0.11.tgz" + "version": "4.0.12", + "from": "@types/react-router@4.0.12", + "resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-4.0.12.tgz" }, "@types/react-router-dom": { - "version": "4.0.4", - "from": "@types/react-router-dom@4.0.4", - "resolved": "https://registry.npmjs.org/@types/react-router-dom/-/react-router-dom-4.0.4.tgz" + "version": "4.0.5", + "from": "@types/react-router-dom@4.0.5", + "resolved": "https://registry.npmjs.org/@types/react-router-dom/-/react-router-dom-4.0.5.tgz" }, "@types/react-router-redux": { - "version": "5.0.1", - "from": "@types/react-router-redux@5.0.1", - "resolved": "https://registry.npmjs.org/@types/react-router-redux/-/react-router-redux-5.0.1.tgz" + "version": "5.0.3", + "from": "@types/react-router-redux@5.0.3", + "resolved": "https://registry.npmjs.org/@types/react-router-redux/-/react-router-redux-5.0.3.tgz" }, "@types/source-map": { "version": "0.5.0", @@ -144,6 +144,11 @@ "from": "arr-flatten@>=1.0.1 <2.0.0", "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz" }, + "arr-union": { + "version": "3.1.0", + "from": "arr-union@>=3.1.0 <4.0.0", + "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz" + }, "array-unique": { "version": "0.2.1", "from": "array-unique@>=0.2.1 <0.3.0", @@ -201,15 +206,122 @@ "from": "async-each@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz" }, + "atob": { + "version": "2.0.3", + "from": "atob@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/atob/-/atob-2.0.3.tgz" + }, "autoprefixer": { "version": "6.7.7", "from": "autoprefixer@>=6.3.1 <7.0.0", "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.7.7.tgz" }, "awesome-typescript-loader": { - "version": "3.1.3", - "from": "awesome-typescript-loader@3.1.3", - "resolved": "https://registry.npmjs.org/awesome-typescript-loader/-/awesome-typescript-loader-3.1.3.tgz" + "version": "3.2.1", + "from": "awesome-typescript-loader@3.2.1", + "resolved": "https://registry.npmjs.org/awesome-typescript-loader/-/awesome-typescript-loader-3.2.1.tgz", + "dependencies": { + "arr-diff": { + "version": "4.0.0", + "from": "arr-diff@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz" + }, + "array-unique": { + "version": "0.3.2", + "from": "array-unique@>=0.3.2 <0.4.0", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz" + }, + "braces": { + "version": "2.2.2", + "from": "braces@>=2.2.2 <3.0.0", + "resolved": "https://registry.npmjs.org/braces/-/braces-2.2.2.tgz" + }, + "expand-brackets": { + "version": "2.1.4", + "from": "expand-brackets@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", + "dependencies": { + "define-property": { + "version": "0.2.5", + "from": "define-property@>=0.2.5 <0.3.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz" + } + } + }, + "extglob": { + "version": "1.1.0", + "from": "extglob@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/extglob/-/extglob-1.1.0.tgz", + "dependencies": { + "define-property": { + "version": "0.2.5", + "from": "define-property@>=0.2.5 <0.3.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz" + }, + "to-regex": { + "version": "2.1.0", + "from": "to-regex@>=2.1.0 <3.0.0", + "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-2.1.0.tgz", + "dependencies": { + "regex-not": { + "version": "0.1.2", + "from": "regex-not@>=0.1.1 <0.2.0", + "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-0.1.2.tgz" + } + } + } + } + }, + "fill-range": { + "version": "4.0.0", + "from": "fill-range@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz" + }, + "is-descriptor": { + "version": "0.1.5", + "from": "is-descriptor@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.5.tgz", + "dependencies": { + "kind-of": { + "version": "3.2.2", + "from": "kind-of@>=3.0.2 <4.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz" + } + } + }, + "is-number": { + "version": "3.0.0", + "from": "is-number@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "dependencies": { + "kind-of": { + "version": "3.2.2", + "from": "kind-of@>=3.0.2 <4.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz" + } + } + }, + "isobject": { + "version": "3.0.1", + "from": "isobject@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz" + }, + "kind-of": { + "version": "4.0.0", + "from": "kind-of@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz" + }, + "lazy-cache": { + "version": "2.0.2", + "from": "lazy-cache@^2.0.2", + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-2.0.2.tgz" + }, + "micromatch": { + "version": "3.0.3", + "from": "micromatch@>=3.0.3 <4.0.0", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.0.3.tgz" + } + } }, "babel-code-frame": { "version": "6.22.0", @@ -258,6 +370,28 @@ "from": "balanced-match@>=0.4.2 <0.5.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz" }, + "base": { + "version": "0.11.1", + "from": "base@>=0.11.1 <0.12.0", + "resolved": "https://registry.npmjs.org/base/-/base-0.11.1.tgz", + "dependencies": { + "define-property": { + "version": "0.2.5", + "from": "define-property@>=0.2.5 <0.3.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz" + }, + "is-descriptor": { + "version": "0.1.5", + "from": "is-descriptor@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.5.tgz" + }, + "lazy-cache": { + "version": "2.0.2", + "from": "lazy-cache@^2.0.1", + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-2.0.2.tgz" + } + } + }, "base64-js": { "version": "1.2.1", "from": "base64-js@>=1.0.2 <2.0.0", @@ -360,6 +494,23 @@ "from": "builtin-status-codes@>=3.0.0 <4.0.0", "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz" }, + "cache-base": { + "version": "0.8.5", + "from": "cache-base@>=0.8.4 <0.9.0", + "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-0.8.5.tgz", + "dependencies": { + "isobject": { + "version": "3.0.1", + "from": "isobject@^3.0.0", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz" + }, + "lazy-cache": { + "version": "2.0.2", + "from": "lazy-cache@^2.0.1", + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-2.0.2.tgz" + } + } + }, "camelcase": { "version": "1.2.1", "from": "camelcase@>=1.0.2 <2.0.0", @@ -400,6 +551,33 @@ "from": "clap@>=1.0.9 <2.0.0", "resolved": "https://registry.npmjs.org/clap/-/clap-1.2.0.tgz" }, + "class-utils": { + "version": "0.3.5", + "from": "class-utils@>=0.3.4 <0.4.0", + "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.5.tgz", + "dependencies": { + "define-property": { + "version": "0.2.5", + "from": "define-property@>=0.2.5 <0.3.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz" + }, + "is-descriptor": { + "version": "0.1.5", + "from": "is-descriptor@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.5.tgz" + }, + "isobject": { + "version": "3.0.1", + "from": "isobject@^3.0.0", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz" + }, + "lazy-cache": { + "version": "2.0.2", + "from": "lazy-cache@^2.0.2", + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-2.0.2.tgz" + } + } + }, "cliui": { "version": "2.1.0", "from": "cliui@>=2.1.0 <3.0.0", @@ -425,6 +603,18 @@ "from": "code-point-at@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz" }, + "collection-visit": { + "version": "0.2.3", + "from": "collection-visit@>=0.2.1 <0.3.0", + "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-0.2.3.tgz", + "dependencies": { + "lazy-cache": { + "version": "2.0.2", + "from": "lazy-cache@^2.0.1", + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-2.0.2.tgz" + } + } + }, "color": { "version": "0.11.4", "from": "color@>=0.11.0 <0.12.0", @@ -455,6 +645,11 @@ "from": "colors@>=1.1.2 <2.0.0", "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz" }, + "component-emitter": { + "version": "1.2.1", + "from": "component-emitter@>=1.2.1 <2.0.0", + "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz" + }, "concat-map": { "version": "0.0.1", "from": "concat-map@0.0.1", @@ -475,6 +670,11 @@ "from": "constants-browserify@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz" }, + "copy-descriptor": { + "version": "0.1.1", + "from": "copy-descriptor@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz" + }, "core-js": { "version": "1.2.7", "from": "core-js@>=1.0.0 <2.0.0", @@ -516,9 +716,9 @@ "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz" }, "css-loader": { - "version": "0.28.1", - "from": "css-loader@0.28.1", - "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.28.1.tgz" + "version": "0.28.4", + "from": "css-loader@0.28.4", + "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.28.4.tgz" }, "css-selector-tokenizer": { "version": "0.7.0", @@ -555,6 +755,11 @@ "from": "decamelize@>=1.1.2 <2.0.0", "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz" }, + "define-property": { + "version": "1.0.0", + "from": "define-property@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz" + }, "defined": { "version": "1.0.0", "from": "defined@>=1.0.0 <2.0.0", @@ -586,9 +791,9 @@ "resolved": "https://registry.npmjs.org/domain-context/-/domain-context-0.5.1.tgz" }, "domain-task": { - "version": "3.0.2", - "from": "domain-task@3.0.2", - "resolved": "https://registry.npmjs.org/domain-task/-/domain-task-3.0.2.tgz" + "version": "3.0.3", + "from": "domain-task@3.0.3", + "resolved": "https://registry.npmjs.org/domain-task/-/domain-task-3.0.3.tgz" }, "ee-first": { "version": "1.1.1", @@ -697,15 +902,25 @@ "from": "expand-range@>=1.8.1 <2.0.0", "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz" }, + "extend-shallow": { + "version": "2.0.1", + "from": "extend-shallow@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz" + }, "extglob": { "version": "0.3.2", "from": "extglob@>=0.3.1 <0.4.0", "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz" }, "extract-text-webpack-plugin": { - "version": "2.1.0", - "from": "extract-text-webpack-plugin@2.1.0", - "resolved": "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-2.1.0.tgz" + "version": "2.1.2", + "from": "extract-text-webpack-plugin@2.1.2", + "resolved": "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-2.1.2.tgz" + }, + "fast-deep-equal": { + "version": "1.0.0", + "from": "fast-deep-equal@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz" }, "fastparse": { "version": "1.1.1", @@ -718,9 +933,9 @@ "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.12.tgz" }, "file-loader": { - "version": "0.11.1", - "from": "file-loader@0.11.1", - "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-0.11.1.tgz" + "version": "0.11.2", + "from": "file-loader@0.11.2", + "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-0.11.2.tgz" }, "filename-regex": { "version": "2.0.1", @@ -757,6 +972,11 @@ "from": "for-own@>=0.1.4 <0.2.0", "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz" }, + "fragment-cache": { + "version": "0.2.1", + "from": "fragment-cache@>=0.2.1 <0.3.0", + "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz" + }, "function-bind": { "version": "1.1.0", "from": "function-bind@>=1.0.2 <2.0.0", @@ -767,6 +987,11 @@ "from": "get-caller-file@>=1.0.1 <2.0.0", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz" }, + "get-value": { + "version": "2.0.6", + "from": "get-value@>=2.0.5 <3.0.0", + "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz" + }, "glob-base": { "version": "0.3.0", "from": "glob-base@>=0.3.0 <0.4.0", @@ -807,6 +1032,16 @@ "from": "has-flag@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz" }, + "has-value": { + "version": "0.3.1", + "from": "has-value@>=0.3.1 <0.4.0", + "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz" + }, + "has-values": { + "version": "0.1.4", + "from": "has-values@>=0.1.4 <0.2.0", + "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz" + }, "hash-base": { "version": "2.0.2", "from": "hash-base@>=2.0.0 <3.0.0", @@ -818,9 +1053,9 @@ "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz" }, "history": { - "version": "4.6.1", - "from": "history@4.6.1", - "resolved": "https://registry.npmjs.org/history/-/history-4.6.1.tgz" + "version": "4.6.3", + "from": "history@4.6.3", + "resolved": "https://registry.npmjs.org/history/-/history-4.6.3.tgz" }, "hmac-drbg": { "version": "1.0.1", @@ -862,6 +1097,38 @@ "from": "icss-replace-symbols@>=1.1.0 <2.0.0", "resolved": "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz" }, + "icss-utils": { + "version": "2.1.0", + "from": "icss-utils@>=2.1.0 <3.0.0", + "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-2.1.0.tgz", + "dependencies": { + "ansi-styles": { + "version": "3.1.0", + "from": "ansi-styles@>=3.1.0 <4.0.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.1.0.tgz" + }, + "chalk": { + "version": "2.0.1", + "from": "chalk@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz" + }, + "has-flag": { + "version": "2.0.0", + "from": "has-flag@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz" + }, + "postcss": { + "version": "6.0.6", + "from": "postcss@>=6.0.1 <7.0.0", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.6.tgz" + }, + "supports-color": { + "version": "4.2.0", + "from": "supports-color@>=4.1.0 <5.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.2.0.tgz" + } + } + }, "ieee754": { "version": "1.1.8", "from": "ieee754@>=1.1.4 <2.0.0", @@ -902,6 +1169,11 @@ "from": "is-absolute-url@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz" }, + "is-accessor-descriptor": { + "version": "0.1.6", + "from": "is-accessor-descriptor@>=0.1.6 <0.2.0", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz" + }, "is-arrayish": { "version": "0.2.1", "from": "is-arrayish@>=0.2.1 <0.3.0", @@ -922,6 +1194,23 @@ "from": "is-builtin-module@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz" }, + "is-data-descriptor": { + "version": "0.1.4", + "from": "is-data-descriptor@>=0.1.4 <0.2.0", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz" + }, + "is-descriptor": { + "version": "1.0.0", + "from": "is-descriptor@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.0.tgz", + "dependencies": { + "lazy-cache": { + "version": "2.0.2", + "from": "lazy-cache@>=2.0.2 <3.0.0", + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-2.0.2.tgz" + } + } + }, "is-dotfile": { "version": "1.0.3", "from": "is-dotfile@>=1.0.0 <2.0.0", @@ -957,11 +1246,35 @@ "from": "is-number@>=2.1.0 <3.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz" }, + "is-odd": { + "version": "1.0.0", + "from": "is-odd@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-odd/-/is-odd-1.0.0.tgz", + "dependencies": { + "is-number": { + "version": "3.0.0", + "from": "is-number@^3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz" + } + } + }, "is-plain-obj": { "version": "1.1.0", "from": "is-plain-obj@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz" }, + "is-plain-object": { + "version": "2.0.3", + "from": "is-plain-object@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.3.tgz", + "dependencies": { + "isobject": { + "version": "3.0.1", + "from": "isobject@^3.0.0", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz" + } + } + }, "is-posix-bracket": { "version": "0.1.1", "from": "is-posix-bracket@>=0.1.0 <0.2.0", @@ -1032,6 +1345,11 @@ "from": "json-loader@0.5.4", "resolved": "https://registry.npmjs.org/json-loader/-/json-loader-0.5.4.tgz" }, + "json-schema-traverse": { + "version": "0.3.1", + "from": "json-schema-traverse@>=0.3.0 <0.4.0", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz" + }, "json-stable-stringify": { "version": "1.0.1", "from": "json-stable-stringify@>=1.0.1 <2.0.0", @@ -1117,6 +1435,23 @@ "from": "macaddress@>=0.2.8 <0.3.0", "resolved": "https://registry.npmjs.org/macaddress/-/macaddress-0.2.8.tgz" }, + "map-cache": { + "version": "0.2.2", + "from": "map-cache@>=0.2.2 <0.3.0", + "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz" + }, + "map-visit": { + "version": "0.1.5", + "from": "map-visit@>=0.1.5 <0.2.0", + "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-0.1.5.tgz", + "dependencies": { + "lazy-cache": { + "version": "2.0.2", + "from": "lazy-cache@^2.0.1", + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-2.0.2.tgz" + } + } + }, "math-expression-evaluator": { "version": "1.2.17", "from": "math-expression-evaluator@>=1.2.14 <2.0.0", @@ -1167,6 +1502,11 @@ "from": "minimist@0.0.8", "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz" }, + "mixin-deep": { + "version": "1.2.0", + "from": "mixin-deep@>=1.1.3 <2.0.0", + "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.2.0.tgz" + }, "mkdirp": { "version": "0.5.1", "from": "mkdirp@>=0.5.1 <0.6.0", @@ -1177,6 +1517,33 @@ "from": "ms@2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz" }, + "nanomatch": { + "version": "1.2.0", + "from": "nanomatch@>=1.2.0 <2.0.0", + "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.0.tgz", + "dependencies": { + "arr-diff": { + "version": "4.0.0", + "from": "arr-diff@^4.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz" + }, + "array-unique": { + "version": "0.3.2", + "from": "array-unique@^0.3.2", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz" + }, + "is-extglob": { + "version": "2.1.1", + "from": "is-extglob@>=2.1.1 <3.0.0", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz" + }, + "kind-of": { + "version": "4.0.0", + "from": "kind-of@^4.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz" + } + } + }, "node-fetch": { "version": "1.7.1", "from": "node-fetch@>=1.0.1 <2.0.0", @@ -1239,11 +1606,43 @@ "from": "object-assign@>=4.1.1 <5.0.0", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz" }, + "object-copy": { + "version": "0.1.0", + "from": "object-copy@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz", + "dependencies": { + "define-property": { + "version": "0.2.5", + "from": "define-property@>=0.2.5 <0.3.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz" + }, + "is-descriptor": { + "version": "0.1.5", + "from": "is-descriptor@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.5.tgz" + }, + "lazy-cache": { + "version": "2.0.2", + "from": "lazy-cache@^2.0.2", + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-2.0.2.tgz" + } + } + }, + "object-visit": { + "version": "0.3.4", + "from": "object-visit@>=0.3.4 <0.4.0", + "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-0.3.4.tgz" + }, "object.omit": { "version": "2.0.1", "from": "object.omit@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz" }, + "object.pick": { + "version": "1.2.0", + "from": "object.pick@>=1.2.0 <2.0.0", + "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.2.0.tgz" + }, "on-finished": { "version": "2.3.0", "from": "on-finished@>=2.3.0 <2.4.0", @@ -1284,6 +1683,11 @@ "from": "parseurl@>=1.3.1 <1.4.0", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz" }, + "pascalcase": { + "version": "0.1.1", + "from": "pascalcase@>=0.1.1 <0.2.0", + "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz" + }, "path-browserify": { "version": "0.0.0", "from": "path-browserify@0.0.0", @@ -1336,6 +1740,11 @@ "from": "pinkie-promise@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz" }, + "posix-character-classes": { + "version": "0.1.1", + "from": "posix-character-classes@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz" + }, "postcss": { "version": "5.2.17", "from": "postcss@>=5.0.6 <6.0.0", @@ -1459,9 +1868,9 @@ "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.6.tgz" }, "supports-color": { - "version": "4.1.0", + "version": "4.2.0", "from": "supports-color@>=4.1.0 <5.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.1.0.tgz" + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.2.0.tgz" } } }, @@ -1491,9 +1900,9 @@ "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.6.tgz" }, "supports-color": { - "version": "4.1.0", + "version": "4.2.0", "from": "supports-color@>=4.1.0 <5.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.1.0.tgz" + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.2.0.tgz" } } }, @@ -1523,9 +1932,9 @@ "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.6.tgz" }, "supports-color": { - "version": "4.1.0", + "version": "4.2.0", "from": "supports-color@>=4.1.0 <5.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.1.0.tgz" + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.2.0.tgz" } } }, @@ -1555,9 +1964,9 @@ "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.6.tgz" }, "supports-color": { - "version": "4.1.0", + "version": "4.2.0", "from": "supports-color@>=4.1.0 <5.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.1.0.tgz" + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.2.0.tgz" } } }, @@ -1716,9 +2125,9 @@ "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz" }, "react": { - "version": "15.5.4", - "from": "react@15.5.4", - "resolved": "https://registry.npmjs.org/react/-/react-15.5.4.tgz" + "version": "15.6.1", + "from": "react@15.6.1", + "resolved": "https://registry.npmjs.org/react/-/react-15.6.1.tgz" }, "react-deep-force-update": { "version": "2.0.1", @@ -1726,9 +2135,9 @@ "resolved": "https://registry.npmjs.org/react-deep-force-update/-/react-deep-force-update-2.0.1.tgz" }, "react-dom": { - "version": "15.5.4", - "from": "react-dom@15.5.4", - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-15.5.4.tgz" + "version": "15.6.1", + "from": "react-dom@15.6.1", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-15.6.1.tgz" }, "react-hot-loader": { "version": "3.0.0-beta.7", @@ -1748,9 +2157,9 @@ "resolved": "https://registry.npmjs.org/react-proxy/-/react-proxy-3.0.0-alpha.1.tgz" }, "react-redux": { - "version": "5.0.4", - "from": "react-redux@5.0.4", - "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-5.0.4.tgz" + "version": "5.0.5", + "from": "react-redux@5.0.5", + "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-5.0.5.tgz" }, "react-router": { "version": "4.1.1", @@ -1803,9 +2212,9 @@ "resolved": "https://registry.npmjs.org/reduce-function-call/-/reduce-function-call-1.0.2.tgz" }, "redux": { - "version": "3.6.0", - "from": "redux@3.6.0", - "resolved": "https://registry.npmjs.org/redux/-/redux-3.6.0.tgz" + "version": "3.7.1", + "from": "redux@3.7.1", + "resolved": "https://registry.npmjs.org/redux/-/redux-3.7.1.tgz" }, "redux-thunk": { "version": "2.2.0", @@ -1827,6 +2236,11 @@ "from": "regex-cache@>=0.4.2 <0.5.0", "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz" }, + "regex-not": { + "version": "1.0.0", + "from": "regex-not@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.0.tgz" + }, "regexpu-core": { "version": "1.0.0", "from": "regexpu-core@>=1.0.0 <2.0.0", @@ -1877,6 +2291,11 @@ "from": "resolve-pathname@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/resolve-pathname/-/resolve-pathname-2.1.0.tgz" }, + "resolve-url": { + "version": "0.2.1", + "from": "resolve-url@>=0.2.1 <0.3.0", + "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz" + }, "right-align": { "version": "0.1.3", "from": "right-align@>=0.1.1 <0.2.0", @@ -1897,6 +2316,18 @@ "from": "sax@>=1.2.1 <1.3.0", "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz" }, + "schema-utils": { + "version": "0.3.0", + "from": "schema-utils@>=0.3.0 <0.4.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz", + "dependencies": { + "ajv": { + "version": "5.2.1", + "from": "ajv@>=5.0.0 <6.0.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.1.tgz" + } + } + }, "semver": { "version": "5.3.0", "from": "semver@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0||>=4.0.0 <5.0.0||>=5.0.0 <6.0.0", @@ -1907,11 +2338,21 @@ "from": "set-blocking@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz" }, + "set-getter": { + "version": "0.1.0", + "from": "set-getter@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/set-getter/-/set-getter-0.1.0.tgz" + }, "set-immediate-shim": { "version": "1.0.1", "from": "set-immediate-shim@>=1.0.1 <2.0.0", "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz" }, + "set-value": { + "version": "0.4.3", + "from": "set-value@>=0.4.2 <0.5.0", + "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz" + }, "setimmediate": { "version": "1.0.5", "from": "setimmediate@>=1.0.5 <2.0.0", @@ -1922,6 +2363,45 @@ "from": "sha.js@>=2.4.0 <3.0.0", "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.8.tgz" }, + "snapdragon": { + "version": "0.8.1", + "from": "snapdragon@>=0.8.1 <0.9.0", + "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.1.tgz", + "dependencies": { + "define-property": { + "version": "0.2.5", + "from": "define-property@>=0.2.5 <0.3.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz" + }, + "is-descriptor": { + "version": "0.1.5", + "from": "is-descriptor@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.5.tgz" + }, + "lazy-cache": { + "version": "2.0.2", + "from": "lazy-cache@^2.0.2", + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-2.0.2.tgz" + } + } + }, + "snapdragon-node": { + "version": "2.1.1", + "from": "snapdragon-node@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz", + "dependencies": { + "isobject": { + "version": "3.0.1", + "from": "isobject@^3.0.0", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz" + } + } + }, + "snapdragon-util": { + "version": "3.0.1", + "from": "snapdragon-util@>=3.0.1 <4.0.0", + "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz" + }, "sort-keys": { "version": "1.1.2", "from": "sort-keys@>=1.0.0 <2.0.0", @@ -1937,11 +2417,21 @@ "from": "source-map@>=0.5.6 <0.6.0", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz" }, + "source-map-resolve": { + "version": "0.5.0", + "from": "source-map-resolve@>=0.5.0 <0.6.0", + "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.0.tgz" + }, "source-map-support": { "version": "0.4.15", "from": "source-map-support@>=0.4.15 <0.5.0", "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.15.tgz" }, + "source-map-url": { + "version": "0.4.0", + "from": "source-map-url@>=0.4.0 <0.5.0", + "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz" + }, "sourcemapped-stacktrace": { "version": "1.1.6", "from": "sourcemapped-stacktrace@>=1.1.6 <2.0.0", @@ -1962,6 +2452,11 @@ "from": "spdx-license-ids@>=1.0.2 <2.0.0", "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz" }, + "split-string": { + "version": "2.1.1", + "from": "split-string@>=2.1.0 <3.0.0", + "resolved": "https://registry.npmjs.org/split-string/-/split-string-2.1.1.tgz" + }, "sprintf-js": { "version": "1.0.3", "from": "sprintf-js@>=1.0.2 <1.1.0", @@ -1972,6 +2467,28 @@ "from": "stackframe@>=0.3.1 <0.4.0", "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-0.3.1.tgz" }, + "static-extend": { + "version": "0.1.2", + "from": "static-extend@>=0.1.1 <0.2.0", + "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz", + "dependencies": { + "define-property": { + "version": "0.2.5", + "from": "define-property@>=0.2.5 <0.3.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz" + }, + "is-descriptor": { + "version": "0.1.5", + "from": "is-descriptor@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.5.tgz" + }, + "lazy-cache": { + "version": "2.0.2", + "from": "lazy-cache@^2.0.2", + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-2.0.2.tgz" + } + } + }, "statuses": { "version": "1.3.1", "from": "statuses@>=1.3.1 <1.4.0", @@ -2013,9 +2530,9 @@ "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz" }, "style-loader": { - "version": "0.17.0", - "from": "style-loader@0.17.0", - "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.17.0.tgz" + "version": "0.18.2", + "from": "style-loader@0.18.2", + "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.18.2.tgz" }, "supports-color": { "version": "2.0.0", @@ -2052,15 +2569,54 @@ "from": "to-fast-properties@>=1.0.1 <2.0.0", "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz" }, + "to-object-path": { + "version": "0.3.0", + "from": "to-object-path@>=0.3.0 <0.4.0", + "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz" + }, + "to-regex": { + "version": "3.0.1", + "from": "to-regex@>=3.0.1 <4.0.0", + "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.1.tgz", + "dependencies": { + "define-property": { + "version": "0.2.5", + "from": "define-property@>=0.2.5 <0.3.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz" + }, + "is-descriptor": { + "version": "0.1.5", + "from": "is-descriptor@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.5.tgz" + }, + "lazy-cache": { + "version": "2.0.2", + "from": "lazy-cache@^2.0.2", + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-2.0.2.tgz" + } + } + }, + "to-regex-range": { + "version": "2.1.1", + "from": "to-regex-range@>=2.1.0 <3.0.0", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", + "dependencies": { + "is-number": { + "version": "3.0.0", + "from": "is-number@^3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz" + } + } + }, "tty-browserify": { "version": "0.0.0", "from": "tty-browserify@0.0.0", "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz" }, "typescript": { - "version": "2.3.2", - "from": "typescript@2.3.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.3.2.tgz" + "version": "2.4.1", + "from": "typescript@2.4.1", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.4.1.tgz" }, "ua-parser-js": { "version": "0.7.13", @@ -2085,6 +2641,11 @@ "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz", "optional": true }, + "union-value": { + "version": "0.2.4", + "from": "union-value@>=0.2.3 <0.3.0", + "resolved": "https://registry.npmjs.org/union-value/-/union-value-0.2.4.tgz" + }, "uniq": { "version": "1.0.1", "from": "uniq@>=1.0.1 <2.0.0", @@ -2105,6 +2666,23 @@ "from": "unpipe@>=1.0.0 <1.1.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz" }, + "unset-value": { + "version": "0.1.2", + "from": "unset-value@>=0.1.1 <0.2.0", + "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-0.1.2.tgz", + "dependencies": { + "isobject": { + "version": "3.0.1", + "from": "isobject@^3.0.0", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz" + } + } + }, + "urix": { + "version": "0.1.0", + "from": "urix@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz" + }, "url": { "version": "0.11.0", "from": "url@>=0.11.0 <0.12.0", @@ -2118,9 +2696,36 @@ } }, "url-loader": { - "version": "0.5.8", - "from": "url-loader@0.5.8", - "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-0.5.8.tgz" + "version": "0.5.9", + "from": "url-loader@0.5.9", + "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-0.5.9.tgz" + }, + "use": { + "version": "2.0.2", + "from": "use@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/use/-/use-2.0.2.tgz", + "dependencies": { + "define-property": { + "version": "0.2.5", + "from": "define-property@>=0.2.5 <0.3.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz" + }, + "is-descriptor": { + "version": "0.1.5", + "from": "is-descriptor@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.5.tgz" + }, + "isobject": { + "version": "3.0.1", + "from": "isobject@^3.0.0", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz" + }, + "lazy-cache": { + "version": "2.0.2", + "from": "lazy-cache@^2.0.2", + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-2.0.2.tgz" + } + } }, "util": { "version": "0.10.3", @@ -2219,9 +2824,9 @@ } }, "webpack-hot-middleware": { - "version": "2.18.0", - "from": "webpack-hot-middleware@2.18.0", - "resolved": "https://registry.npmjs.org/webpack-hot-middleware/-/webpack-hot-middleware-2.18.0.tgz" + "version": "2.18.2", + "from": "webpack-hot-middleware@2.18.2", + "resolved": "https://registry.npmjs.org/webpack-hot-middleware/-/webpack-hot-middleware-2.18.2.tgz" }, "webpack-merge": { "version": "4.1.0", @@ -2234,9 +2839,16 @@ "resolved": "https://registry.npmjs.org/webpack-node-externals/-/webpack-node-externals-1.6.0.tgz" }, "webpack-sources": { - "version": "0.1.5", - "from": "webpack-sources@>=0.1.0 <0.2.0", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.1.5.tgz" + "version": "1.0.1", + "from": "webpack-sources@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.0.1.tgz", + "dependencies": { + "source-list-map": { + "version": "2.0.0", + "from": "source-list-map@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz" + } + } }, "whatwg-fetch": { "version": "2.0.3", diff --git a/templates/ReactReduxSpa/package.json b/templates/ReactReduxSpa/package.json index bb2d240f..9d3ab76d 100644 --- a/templates/ReactReduxSpa/package.json +++ b/templates/ReactReduxSpa/package.json @@ -3,42 +3,42 @@ "private": true, "version": "0.0.0", "dependencies": { - "@types/history": "4.5.1", - "@types/react": "15.0.29", - "@types/react-dom": "15.5.0", - "@types/react-redux": "4.4.40", - "@types/react-router": "4.0.11", - "@types/react-router-dom": "4.0.4", - "@types/react-router-redux": "5.0.1", + "@types/history": "4.6.0", + "@types/react": "15.0.35", + "@types/react-dom": "15.5.1", + "@types/react-redux": "4.4.45", + "@types/react-router": "4.0.12", + "@types/react-router-dom": "4.0.5", + "@types/react-router-redux": "5.0.3", "@types/webpack": "2.2.15", "@types/webpack-env": "1.13.0", "aspnet-prerendering": "^2.0.5", "aspnet-webpack": "^1.0.29", "aspnet-webpack-react": "^3.0.0-beta", - "awesome-typescript-loader": "3.1.3", + "awesome-typescript-loader": "3.2.1", "bootstrap": "3.3.7", - "css-loader": "0.28.1", - "domain-task": "^3.0.2", + "css-loader": "0.28.4", + "domain-task": "^3.0.3", "event-source-polyfill": "0.0.9", - "extract-text-webpack-plugin": "2.1.0", - "file-loader": "0.11.1", - "history": "4.6.1", + "extract-text-webpack-plugin": "2.1.2", + "file-loader": "0.11.2", + "history": "4.6.3", "jquery": "3.2.1", "json-loader": "0.5.4", "node-noop": "1.0.0", - "react": "15.5.4", - "react-dom": "15.5.4", + "react": "15.6.1", + "react-dom": "15.6.1", "react-hot-loader": "3.0.0-beta.7", - "react-redux": "5.0.4", + "react-redux": "5.0.5", "react-router-dom": "4.1.1", "react-router-redux": "5.0.0-alpha.6", - "redux": "3.6.0", + "redux": "3.7.1", "redux-thunk": "2.2.0", - "style-loader": "0.17.0", - "typescript": "2.3.2", - "url-loader": "0.5.8", + "style-loader": "0.18.2", + "typescript": "2.4.1", + "url-loader": "0.5.9", "webpack": "2.5.1", - "webpack-hot-middleware": "2.18.0", + "webpack-hot-middleware": "2.18.2", "webpack-merge": "4.1.0" } } From fd90301b1cf8191362dd71be76abea3536cb7f02 Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Thu, 6 Jul 2017 15:46:51 -0700 Subject: [PATCH 173/411] Remove NETStandard.Library.NETFramework --- build/common.props | 1 - 1 file changed, 1 deletion(-) diff --git a/build/common.props b/build/common.props index 605718f7..34b88643 100644 --- a/build/common.props +++ b/build/common.props @@ -19,6 +19,5 @@ - From a1942edbfe5ca88cc724059a5af8a114e10f71b5 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Fri, 7 Jul 2017 12:31:52 +0100 Subject: [PATCH 174/411] Update AppVeyor build to use .NET Core SDK 2.0.0-preview3-006670 --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 8d5ed193..9ba65bb2 100755 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,7 +4,7 @@ install: - ps: Install-Product node 6.9.2 x64 # .NET Core SDK binaries # Download .NET Core 2.0 Preview 3 SDK and add to PATH - - ps: $urlCurrent = "https://dotnetcli.azureedge.net/dotnet/Sdk/2.0.0-preview3-006638/dotnet-sdk-2.0.0-preview3-006638-win-x64.zip" + - ps: $urlCurrent = "https://dotnetcli.azureedge.net/dotnet/Sdk/2.0.0-preview3-006670/dotnet-sdk-2.0.0-preview3-006670-win-x64.zip" - ps: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetsdk" - ps: mkdir $env:DOTNET_INSTALL_DIR -Force | Out-Null - ps: $tempFileCurrent = [System.IO.Path]::Combine([System.IO.Path]::GetTempPath(), [System.IO.Path]::GetRandomFileName()) From 70a4a68e7c4621efc4f0aa23621f9f1e2afd060a Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Fri, 7 Jul 2017 12:40:41 +0100 Subject: [PATCH 175/411] Update templates to ASP.NET Core 2.0.0-preview3-26071 --- templates/AngularSpa/AngularSpa.csproj | 12 ++++++------ templates/AureliaSpa/AureliaSpa.csproj | 10 +++++----- templates/KnockoutSpa/KnockoutSpa.csproj | 10 +++++----- templates/ReactReduxSpa/ReactReduxSpa.csproj | 10 +++++----- templates/ReactSpa/ReactSpa.csproj | 10 +++++----- templates/VueSpa/VueSpa.csproj | 10 +++++----- 6 files changed, 31 insertions(+), 31 deletions(-) diff --git a/templates/AngularSpa/AngularSpa.csproj b/templates/AngularSpa/AngularSpa.csproj index e3b3ad82..b8598980 100644 --- a/templates/AngularSpa/AngularSpa.csproj +++ b/templates/AngularSpa/AngularSpa.csproj @@ -9,17 +9,17 @@ - + - - - - + + + + - + diff --git a/templates/AureliaSpa/AureliaSpa.csproj b/templates/AureliaSpa/AureliaSpa.csproj index 3321046b..2c4d1a46 100644 --- a/templates/AureliaSpa/AureliaSpa.csproj +++ b/templates/AureliaSpa/AureliaSpa.csproj @@ -9,13 +9,13 @@ - + - - - - + + + + diff --git a/templates/KnockoutSpa/KnockoutSpa.csproj b/templates/KnockoutSpa/KnockoutSpa.csproj index 3321046b..2c4d1a46 100644 --- a/templates/KnockoutSpa/KnockoutSpa.csproj +++ b/templates/KnockoutSpa/KnockoutSpa.csproj @@ -9,13 +9,13 @@ - + - - - - + + + + diff --git a/templates/ReactReduxSpa/ReactReduxSpa.csproj b/templates/ReactReduxSpa/ReactReduxSpa.csproj index 0968b417..4d8f78e5 100644 --- a/templates/ReactReduxSpa/ReactReduxSpa.csproj +++ b/templates/ReactReduxSpa/ReactReduxSpa.csproj @@ -9,13 +9,13 @@ - + - - - - + + + + diff --git a/templates/ReactSpa/ReactSpa.csproj b/templates/ReactSpa/ReactSpa.csproj index 3321046b..2c4d1a46 100644 --- a/templates/ReactSpa/ReactSpa.csproj +++ b/templates/ReactSpa/ReactSpa.csproj @@ -9,13 +9,13 @@ - + - - - - + + + + diff --git a/templates/VueSpa/VueSpa.csproj b/templates/VueSpa/VueSpa.csproj index 3321046b..2c4d1a46 100644 --- a/templates/VueSpa/VueSpa.csproj +++ b/templates/VueSpa/VueSpa.csproj @@ -9,13 +9,13 @@ - + - - - - + + + + From 6f2e4080836f5174954654fa13a1534c05777e01 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Fri, 7 Jul 2017 15:13:51 +0100 Subject: [PATCH 176/411] Update templates to ASP.NET Core 2.0.0-preview3-26096 --- templates/AngularSpa/AngularSpa.csproj | 12 ++++++------ templates/AureliaSpa/AureliaSpa.csproj | 10 +++++----- templates/KnockoutSpa/KnockoutSpa.csproj | 10 +++++----- templates/ReactReduxSpa/ReactReduxSpa.csproj | 10 +++++----- templates/ReactSpa/ReactSpa.csproj | 10 +++++----- templates/VueSpa/VueSpa.csproj | 10 +++++----- 6 files changed, 31 insertions(+), 31 deletions(-) diff --git a/templates/AngularSpa/AngularSpa.csproj b/templates/AngularSpa/AngularSpa.csproj index b8598980..4ef4c76f 100644 --- a/templates/AngularSpa/AngularSpa.csproj +++ b/templates/AngularSpa/AngularSpa.csproj @@ -9,17 +9,17 @@ - + - - - - + + + + - + diff --git a/templates/AureliaSpa/AureliaSpa.csproj b/templates/AureliaSpa/AureliaSpa.csproj index 2c4d1a46..f99ade16 100644 --- a/templates/AureliaSpa/AureliaSpa.csproj +++ b/templates/AureliaSpa/AureliaSpa.csproj @@ -9,13 +9,13 @@ - + - - - - + + + + diff --git a/templates/KnockoutSpa/KnockoutSpa.csproj b/templates/KnockoutSpa/KnockoutSpa.csproj index 2c4d1a46..f99ade16 100644 --- a/templates/KnockoutSpa/KnockoutSpa.csproj +++ b/templates/KnockoutSpa/KnockoutSpa.csproj @@ -9,13 +9,13 @@ - + - - - - + + + + diff --git a/templates/ReactReduxSpa/ReactReduxSpa.csproj b/templates/ReactReduxSpa/ReactReduxSpa.csproj index 4d8f78e5..5e060c0f 100644 --- a/templates/ReactReduxSpa/ReactReduxSpa.csproj +++ b/templates/ReactReduxSpa/ReactReduxSpa.csproj @@ -9,13 +9,13 @@ - + - - - - + + + + diff --git a/templates/ReactSpa/ReactSpa.csproj b/templates/ReactSpa/ReactSpa.csproj index 2c4d1a46..f99ade16 100644 --- a/templates/ReactSpa/ReactSpa.csproj +++ b/templates/ReactSpa/ReactSpa.csproj @@ -9,13 +9,13 @@ - + - - - - + + + + diff --git a/templates/VueSpa/VueSpa.csproj b/templates/VueSpa/VueSpa.csproj index 2c4d1a46..f99ade16 100644 --- a/templates/VueSpa/VueSpa.csproj +++ b/templates/VueSpa/VueSpa.csproj @@ -9,13 +9,13 @@ - + - - - - + + + + From efdfbf5dbbea7a730396dc9e55bae92b470c131a Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Fri, 7 Jul 2017 15:27:50 +0100 Subject: [PATCH 177/411] In Yeoman templates, stop restoring using Yarn, since it doesn't respect npm-shrinkwrap.json --- .../package-builder/src/yeoman/app/index.ts | 18 ------------------ .../package-builder/src/yeoman/package.json | 3 +-- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/templates/package-builder/src/yeoman/app/index.ts b/templates/package-builder/src/yeoman/app/index.ts index fadda587..709af7ab 100644 --- a/templates/package-builder/src/yeoman/app/index.ts +++ b/templates/package-builder/src/yeoman/app/index.ts @@ -6,7 +6,6 @@ import * as glob from 'glob'; import * as semver from 'semver'; import * as chalk from 'chalk'; import { execSync } from 'child_process'; -import npmWhich = require('npm-which'); const yosay = require('yosay'); const toPascalCase = require('to-pascal-case'); const isWindows = /^win/.test(process.platform); @@ -165,15 +164,6 @@ class MyGenerator extends yeoman.Base { } installingDeps() { - // If available, restore dependencies using Yarn instead of NPM - const yarnPath = getPathToExecutable('yarn'); - if (!!yarnPath) { - this.log('Will restore NPM dependencies using \'yarn\' installed at ' + yarnPath); - this.npmInstall = (pkgs, options, cb) => { - return (this as any).runInstall(yarnPath, pkgs, options, cb); - }; - } - this.installDependencies({ npm: true, bower: false, @@ -186,14 +176,6 @@ class MyGenerator extends yeoman.Base { } } -function getPathToExecutable(executableName: string) { - try { - return npmWhich(__dirname).sync(executableName); - } catch(ex) { - return null; - } -} - function assertNpmVersionIsAtLeast(minVersion: string) { const runningVersion = execSync('npm -v').toString(); if (!semver.gte(runningVersion, minVersion, /* loose */ true)) { diff --git a/templates/package-builder/src/yeoman/package.json b/templates/package-builder/src/yeoman/package.json index efa503f7..289adfd9 100644 --- a/templates/package-builder/src/yeoman/package.json +++ b/templates/package-builder/src/yeoman/package.json @@ -1,6 +1,6 @@ { "name": "generator-aspnetcore-spa", - "version": "0.9.3", + "version": "0.9.4", "description": "Single-Page App templates for ASP.NET Core", "author": "Microsoft", "license": "Apache-2.0", @@ -21,7 +21,6 @@ "chalk": "^1.1.3", "glob": "^7.0.3", "node-uuid": "^1.4.7", - "npm-which": "^3.0.1", "to-pascal-case": "^1.0.0", "yeoman-generator": "^0.20.2", "yeoman-option-or-prompt": "^1.0.2", From 4492d3eab7a503f6444a36656a79e42bd059ea50 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Fri, 7 Jul 2017 17:16:47 +0100 Subject: [PATCH 178/411] In Angular template, rename boot.client.ts to boot.browser.ts for consistency --- .../AngularSpa/ClientApp/{boot.client.ts => boot.browser.ts} | 0 templates/AngularSpa/webpack.config.js | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename templates/AngularSpa/ClientApp/{boot.client.ts => boot.browser.ts} (100%) diff --git a/templates/AngularSpa/ClientApp/boot.client.ts b/templates/AngularSpa/ClientApp/boot.browser.ts similarity index 100% rename from templates/AngularSpa/ClientApp/boot.client.ts rename to templates/AngularSpa/ClientApp/boot.browser.ts diff --git a/templates/AngularSpa/webpack.config.js b/templates/AngularSpa/webpack.config.js index 69a2e303..fd1ff6e7 100644 --- a/templates/AngularSpa/webpack.config.js +++ b/templates/AngularSpa/webpack.config.js @@ -29,7 +29,7 @@ module.exports = (env) => { // Configuration for client-side bundle suitable for running in browsers const clientBundleOutputDir = './wwwroot/dist'; const clientBundleConfig = merge(sharedConfig, { - entry: { 'main-client': './ClientApp/boot.client.ts' }, + entry: { 'main-client': './ClientApp/boot.browser.ts' }, output: { path: path.join(__dirname, clientBundleOutputDir) }, plugins: [ new webpack.DllReferencePlugin({ @@ -69,7 +69,7 @@ module.exports = (env) => { new AotPlugin({ tsConfigPath: './tsconfig.json', entryModule: path.join(__dirname, 'ClientApp/app/app.module.server#AppModule'), - exclude: ['./**/*.client.ts'] + exclude: ['./**/*.browser.ts'] }) ]), output: { From 814df07034ec45b41627f78be10d655d8ed3119c Mon Sep 17 00:00:00 2001 From: Pranav K Date: Mon, 10 Jul 2017 11:43:36 -0700 Subject: [PATCH 179/411] Branching for 2.0.0 rtm --- NuGet.config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index f4952688..37f0d27e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -2,8 +2,8 @@ - + - \ No newline at end of file + From c94563c70019bbaec0ebffe939926189d0ff563a Mon Sep 17 00:00:00 2001 From: Pranav K Date: Mon, 10 Jul 2017 11:57:58 -0700 Subject: [PATCH 180/411] Updating KoreBuild branch --- build.ps1 | 2 +- build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.ps1 b/build.ps1 index 5bf0e2c1..17853343 100644 --- a/build.ps1 +++ b/build.ps1 @@ -33,7 +33,7 @@ cd $PSScriptRoot $repoFolder = $PSScriptRoot $env:REPO_FOLDER = $repoFolder -$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/dev.zip" +$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/rel/2.0.0.zip" if ($env:KOREBUILD_ZIP) { $koreBuildZip=$env:KOREBUILD_ZIP diff --git a/build.sh b/build.sh index b0bcadb5..5e27ed8e 100755 --- a/build.sh +++ b/build.sh @@ -2,7 +2,7 @@ repoFolder="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" cd $repoFolder -koreBuildZip="https://github.com/aspnet/KoreBuild/archive/dev.zip" +koreBuildZip="https://github.com/aspnet/KoreBuild/archive/rel/2.0.0.zip" if [ ! -z $KOREBUILD_ZIP ]; then koreBuildZip=$KOREBUILD_ZIP fi From 72b1e627b0f804441db2977bd8a44ef0777a26df Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Fri, 7 Jul 2017 14:56:10 -0700 Subject: [PATCH 181/411] Skip first time experience on Appveyor --- appveyor.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 9ba65bb2..570bca58 100755 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -init: +init: - git config --global core.autocrlf true install: - ps: Install-Product node 6.9.2 x64 @@ -25,6 +25,10 @@ artifacts: type: NuGetPackage # - ps: .\build.ps1 clone_depth: 1 +environment: + global: + DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true + DOTNET_CLI_TELEMETRY_OPTOUT: 1 test_script: - dotnet restore - ps: Push-Location From 70d89b9ad39cd1c8de49512502f7b288cc8b19e2 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Tue, 11 Jul 2017 10:07:05 +0100 Subject: [PATCH 182/411] Update templates to ASP.NET Core 2.0.0-rtm-26190 and SDK 2.0.0-preview3-006729 --- appveyor.yml | 2 +- templates/AngularSpa/AngularSpa.csproj | 12 ++++++------ templates/AureliaSpa/AureliaSpa.csproj | 10 +++++----- templates/KnockoutSpa/KnockoutSpa.csproj | 10 +++++----- templates/ReactReduxSpa/ReactReduxSpa.csproj | 10 +++++----- templates/ReactSpa/ReactSpa.csproj | 10 +++++----- templates/VueSpa/VueSpa.csproj | 10 +++++----- 7 files changed, 32 insertions(+), 32 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 9ba65bb2..9f382f96 100755 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,7 +4,7 @@ install: - ps: Install-Product node 6.9.2 x64 # .NET Core SDK binaries # Download .NET Core 2.0 Preview 3 SDK and add to PATH - - ps: $urlCurrent = "https://dotnetcli.azureedge.net/dotnet/Sdk/2.0.0-preview3-006670/dotnet-sdk-2.0.0-preview3-006670-win-x64.zip" + - ps: $urlCurrent = "https://dotnetcli.azureedge.net/dotnet/Sdk/2.0.0-preview3-006729/dotnet-sdk-2.0.0-preview3-006729-win-x64.zip" - ps: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetsdk" - ps: mkdir $env:DOTNET_INSTALL_DIR -Force | Out-Null - ps: $tempFileCurrent = [System.IO.Path]::Combine([System.IO.Path]::GetTempPath(), [System.IO.Path]::GetRandomFileName()) diff --git a/templates/AngularSpa/AngularSpa.csproj b/templates/AngularSpa/AngularSpa.csproj index 4ef4c76f..c8f88edd 100644 --- a/templates/AngularSpa/AngularSpa.csproj +++ b/templates/AngularSpa/AngularSpa.csproj @@ -9,17 +9,17 @@ - + - - - - + + + + - + diff --git a/templates/AureliaSpa/AureliaSpa.csproj b/templates/AureliaSpa/AureliaSpa.csproj index f99ade16..e36a892e 100644 --- a/templates/AureliaSpa/AureliaSpa.csproj +++ b/templates/AureliaSpa/AureliaSpa.csproj @@ -9,13 +9,13 @@ - + - - - - + + + + diff --git a/templates/KnockoutSpa/KnockoutSpa.csproj b/templates/KnockoutSpa/KnockoutSpa.csproj index f99ade16..e36a892e 100644 --- a/templates/KnockoutSpa/KnockoutSpa.csproj +++ b/templates/KnockoutSpa/KnockoutSpa.csproj @@ -9,13 +9,13 @@ - + - - - - + + + + diff --git a/templates/ReactReduxSpa/ReactReduxSpa.csproj b/templates/ReactReduxSpa/ReactReduxSpa.csproj index 5e060c0f..4708b1f8 100644 --- a/templates/ReactReduxSpa/ReactReduxSpa.csproj +++ b/templates/ReactReduxSpa/ReactReduxSpa.csproj @@ -9,13 +9,13 @@ - + - - - - + + + + diff --git a/templates/ReactSpa/ReactSpa.csproj b/templates/ReactSpa/ReactSpa.csproj index f99ade16..e36a892e 100644 --- a/templates/ReactSpa/ReactSpa.csproj +++ b/templates/ReactSpa/ReactSpa.csproj @@ -9,13 +9,13 @@ - + - - - - + + + + diff --git a/templates/VueSpa/VueSpa.csproj b/templates/VueSpa/VueSpa.csproj index f99ade16..e36a892e 100644 --- a/templates/VueSpa/VueSpa.csproj +++ b/templates/VueSpa/VueSpa.csproj @@ -9,13 +9,13 @@ - + - - - - + + + + From 22ff88ab79bfe17468ba183750b2b07d60df7771 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Tue, 11 Jul 2017 09:51:40 +0100 Subject: [PATCH 183/411] On Windows, patch Node's lstat to work around permissions error. Fixes #1101 --- .../Content/Node/entrypoint-http.js | 79 ++++++++++++++++--- .../TypeScript/HttpNodeInstanceEntryPoint.ts | 1 + .../Util/PatchModuleResolutionLStat.ts | 48 +++++++++++ 3 files changed, 115 insertions(+), 13 deletions(-) create mode 100644 src/Microsoft.AspNetCore.NodeServices/TypeScript/Util/PatchModuleResolutionLStat.ts diff --git a/src/Microsoft.AspNetCore.NodeServices/Content/Node/entrypoint-http.js b/src/Microsoft.AspNetCore.NodeServices/Content/Node/entrypoint-http.js index c32d9f1c..7524fb06 100644 --- a/src/Microsoft.AspNetCore.NodeServices/Content/Node/entrypoint-http.js +++ b/src/Microsoft.AspNetCore.NodeServices/Content/Node/entrypoint-http.js @@ -55,10 +55,11 @@ // Limit dependencies to core Node modules. This means the code in this file has to be very low-level and unattractive, // but simplifies things for the consumer of this module. __webpack_require__(2); - var http = __webpack_require__(3); - var path = __webpack_require__(4); - var ArgsUtil_1 = __webpack_require__(5); - var ExitWhenParentExits_1 = __webpack_require__(6); + __webpack_require__(4); + var http = __webpack_require__(5); + var path = __webpack_require__(3); + var ArgsUtil_1 = __webpack_require__(6); + var ExitWhenParentExits_1 = __webpack_require__(7); // Webpack doesn't support dynamic requires for files not present at compile time, so grab a direct // reference to Node's runtime 'require' function. var dynamicRequire = eval('require'); @@ -142,6 +143,64 @@ /***/ }, /* 2 */ +/***/ function(module, exports, __webpack_require__) { + + "use strict"; + var path = __webpack_require__(3); + var startsWith = function (str, prefix) { return str.substring(0, prefix.length) === prefix; }; + var appRootDir = process.cwd(); + function patchedLStat(pathToStatLong) { + try { + // If the lstat completes without errors, we don't modify its behavior at all + return origLStat.apply(this, arguments); + } + catch (ex) { + var shouldOverrideError = startsWith(ex.message, 'EPERM') // It's a permissions error + && typeof appRootDirLong === 'string' + && startsWith(appRootDirLong, pathToStatLong) // ... for an ancestor directory + && ex.stack.indexOf('Object.realpathSync ') >= 0; // ... during symlink resolution + if (shouldOverrideError) { + // Fake the result to give the same result as an 'lstat' on the app root dir. + // This stops Node failing to load modules just because it doesn't know whether + // ancestor directories are symlinks or not. If there's a genuine file + // permissions issue, it will still surface later when Node actually + // tries to read the file. + return origLStat.call(this, appRootDir); + } + else { + // In any other case, preserve the original error + throw ex; + } + } + } + ; + // It's only necessary to apply this workaround on Windows + var appRootDirLong = null; + var origLStat = null; + if (/^win/.test(process.platform)) { + try { + // Get the app's root dir in Node's internal "long" format (e.g., \\?\C:\dir\subdir) + appRootDirLong = path._makeLong(appRootDir); + // Actually apply the patch, being as defensive as possible + var bindingFs = process.binding('fs'); + origLStat = bindingFs.lstat; + if (typeof origLStat === 'function') { + bindingFs.lstat = patchedLStat; + } + } + catch (ex) { + } + } + + +/***/ }, +/* 3 */ +/***/ function(module, exports) { + + module.exports = require("path"); + +/***/ }, +/* 4 */ /***/ function(module, exports) { // When Node writes to stdout/strerr, we capture that and convert the lines into calls on the @@ -182,19 +241,13 @@ /***/ }, -/* 3 */ +/* 5 */ /***/ function(module, exports) { module.exports = require("http"); /***/ }, -/* 4 */ -/***/ function(module, exports) { - - module.exports = require("path"); - -/***/ }, -/* 5 */ +/* 6 */ /***/ function(module, exports) { "use strict"; @@ -220,7 +273,7 @@ /***/ }, -/* 6 */ +/* 7 */ /***/ function(module, exports) { /* diff --git a/src/Microsoft.AspNetCore.NodeServices/TypeScript/HttpNodeInstanceEntryPoint.ts b/src/Microsoft.AspNetCore.NodeServices/TypeScript/HttpNodeInstanceEntryPoint.ts index 31f6376f..b9a83296 100644 --- a/src/Microsoft.AspNetCore.NodeServices/TypeScript/HttpNodeInstanceEntryPoint.ts +++ b/src/Microsoft.AspNetCore.NodeServices/TypeScript/HttpNodeInstanceEntryPoint.ts @@ -1,5 +1,6 @@ // Limit dependencies to core Node modules. This means the code in this file has to be very low-level and unattractive, // but simplifies things for the consumer of this module. +import './Util/PatchModuleResolutionLStat'; import './Util/OverrideStdOutputs'; import * as http from 'http'; import * as path from 'path'; diff --git a/src/Microsoft.AspNetCore.NodeServices/TypeScript/Util/PatchModuleResolutionLStat.ts b/src/Microsoft.AspNetCore.NodeServices/TypeScript/Util/PatchModuleResolutionLStat.ts new file mode 100644 index 00000000..71dccbab --- /dev/null +++ b/src/Microsoft.AspNetCore.NodeServices/TypeScript/Util/PatchModuleResolutionLStat.ts @@ -0,0 +1,48 @@ +import * as path from 'path'; +const startsWith = (str: string, prefix: string) => str.substring(0, prefix.length) === prefix; +const appRootDir = process.cwd(); + +function patchedLStat(pathToStatLong: string) { + try { + // If the lstat completes without errors, we don't modify its behavior at all + return origLStat.apply(this, arguments); + } catch(ex) { + const shouldOverrideError = + startsWith(ex.message, 'EPERM') // It's a permissions error + && typeof appRootDirLong === 'string' + && startsWith(appRootDirLong, pathToStatLong) // ... for an ancestor directory + && ex.stack.indexOf('Object.realpathSync ') >= 0; // ... during symlink resolution + + if (shouldOverrideError) { + // Fake the result to give the same result as an 'lstat' on the app root dir. + // This stops Node failing to load modules just because it doesn't know whether + // ancestor directories are symlinks or not. If there's a genuine file + // permissions issue, it will still surface later when Node actually + // tries to read the file. + return origLStat.call(this, appRootDir); + } else { + // In any other case, preserve the original error + throw ex; + } + } +}; + +// It's only necessary to apply this workaround on Windows +let appRootDirLong: string = null; +let origLStat: Function = null; +if (/^win/.test(process.platform)) { + try { + // Get the app's root dir in Node's internal "long" format (e.g., \\?\C:\dir\subdir) + appRootDirLong = (path as any)._makeLong(appRootDir); + + // Actually apply the patch, being as defensive as possible + const bindingFs = (process as any).binding('fs'); + origLStat = bindingFs.lstat; + if (typeof origLStat === 'function') { + bindingFs.lstat = patchedLStat; + } + } catch(ex) { + // If some future version of Node throws (e.g., to prevent use of process.binding()), + // don't apply the patch, but still let the application run. + } +} From 44f86eb8a111b91ef0600ea035362634eb3c26f0 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Tue, 11 Jul 2017 16:27:31 +0100 Subject: [PATCH 184/411] Fix webpack HMR proxying logic for apps running on non-root URLs (e.g., full IIS virtual directories) --- .../Webpack/ConditionalProxyMiddleware.cs | 7 ++++++- .../Webpack/WebpackDevMiddleware.cs | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/Microsoft.AspNetCore.SpaServices/Webpack/ConditionalProxyMiddleware.cs b/src/Microsoft.AspNetCore.SpaServices/Webpack/ConditionalProxyMiddleware.cs index ba0cf9f9..1b36cd58 100644 --- a/src/Microsoft.AspNetCore.SpaServices/Webpack/ConditionalProxyMiddleware.cs +++ b/src/Microsoft.AspNetCore.SpaServices/Webpack/ConditionalProxyMiddleware.cs @@ -28,6 +28,11 @@ public ConditionalProxyMiddleware( string pathPrefix, ConditionalProxyMiddlewareOptions options) { + if (!pathPrefix.StartsWith("/")) + { + pathPrefix = "/" + pathPrefix; + } + _next = next; _pathPrefix = pathPrefix; _options = options; @@ -65,7 +70,7 @@ private async Task PerformProxyRequest(HttpContext context) requestMessage.Headers.Host = _options.Host + ":" + _options.Port; var uriString = - $"{_options.Scheme}://{_options.Host}:{_options.Port}{context.Request.PathBase}{context.Request.Path}{context.Request.QueryString}"; + $"{_options.Scheme}://{_options.Host}:{_options.Port}{context.Request.Path}{context.Request.QueryString}"; requestMessage.RequestUri = new Uri(uriString); requestMessage.Method = new HttpMethod(context.Request.Method); diff --git a/src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddleware.cs b/src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddleware.cs index 9f022238..cfcbb7ce 100644 --- a/src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddleware.cs +++ b/src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddleware.cs @@ -101,9 +101,9 @@ public static void UseWebpackDevMiddleware( // plus /__webpack_hmr is proxied with infinite timeout, because it's an EventSource (long-lived request). foreach (var publicPath in devServerInfo.PublicPaths) { + appBuilder.UseProxyToLocalWebpackDevMiddleware(publicPath + hmrEndpoint, devServerInfo.Port, Timeout.InfiniteTimeSpan); appBuilder.UseProxyToLocalWebpackDevMiddleware(publicPath, devServerInfo.Port, TimeSpan.FromSeconds(100)); } - appBuilder.UseProxyToLocalWebpackDevMiddleware(hmrEndpoint, devServerInfo.Port, Timeout.InfiniteTimeSpan); } private static void UseProxyToLocalWebpackDevMiddleware(this IApplicationBuilder appBuilder, string publicPath, int proxyToPort, TimeSpan requestTimeout) From 8acba881602e0d8cf94bca04d353e5040ffa1506 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Tue, 11 Jul 2017 16:23:15 +0100 Subject: [PATCH 185/411] Update aspnet-webpack to 2.0.0, now supporting HMR when apps are running in virtual directories --- .../npm/aspnet-webpack/package.json | 2 +- .../src/WebpackDevMiddleware.ts | 50 ++++++++++++++----- 2 files changed, 39 insertions(+), 13 deletions(-) diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/package.json b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/package.json index 010d2264..47b33818 100644 --- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/package.json +++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/package.json @@ -1,6 +1,6 @@ { "name": "aspnet-webpack", - "version": "1.0.29", + "version": "2.0.0", "description": "Helpers for using Webpack in ASP.NET Core projects. Works in conjunction with the Microsoft.AspNetCore.SpaServices NuGet package.", "main": "index.js", "scripts": { diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/WebpackDevMiddleware.ts b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/WebpackDevMiddleware.ts index bf31d822..7fba9de0 100644 --- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/WebpackDevMiddleware.ts +++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/WebpackDevMiddleware.ts @@ -108,7 +108,7 @@ function attachWebpackDevMiddleware(app: any, webpackConfig: webpack.Configurati const compiler = webpack(webpackConfig); app.use(require('webpack-dev-middleware')(compiler, { noInfo: true, - publicPath: webpackConfig.output.publicPath, + publicPath: ensureLeadingSlash(webpackConfig.output.publicPath), watchOptions: webpackConfig.watchOptions })); @@ -195,6 +195,14 @@ function copyRecursiveToRealFsSync(from: typeof fs, rootDir: string, exclude: Re }); } +function ensureLeadingSlash(value: string) { + if (value !== null && value.substring(0, 1) !== '/') { + value = '/' + value; + } + + return value; +} + function pathJoinSafe(rootPath: string, filePath: string) { // On Windows, MemoryFileSystem's readdirSync output produces directory entries like 'C:' // which then trigger errors if you call statSync for them. Avoid this by detecting drive @@ -257,22 +265,32 @@ export function createWebpackDevServer(callback: CreateDevServerCallback, option if (!publicPath) { throw new Error('To use the Webpack dev server, you must specify a value for \'publicPath\' on the \'output\' section of your webpack config (for any configuration that targets browsers)'); } - normalizedPublicPaths.push(removeTrailingSlash(publicPath)); - - // Newer versions of Microsoft.AspNetCore.SpaServices will explicitly pass an HMR endpoint URL - // (because it's relative to the app's URL space root, which the client doesn't otherwise know). - // For back-compatibility, fall back on connecting directly to the underlying HMR server (though - // that won't work if the app is hosted on HTTPS because of the mixed-content rule, and we can't - // run the HMR server itself on HTTPS because in general it has no valid cert). - const hmrClientEndpoint = options.hotModuleReplacementEndpointUrl // The URL that we'll proxy (e.g., /__asp_webpack_hmr) - || `http://localhost:${listener.address().port}/__webpack_hmr`; // Fall back on absolute URL to bypass proxying - const hmrServerEndpoint = options.hotModuleReplacementEndpointUrl - || '/__webpack_hmr'; // URL is relative to webpack dev server root + const publicPathNoTrailingSlash = removeTrailingSlash(publicPath); + normalizedPublicPaths.push(publicPathNoTrailingSlash); + + // This is the URL the client will connect to, except that since it's a relative URL + // (no leading slash), Webpack will resolve it against the runtime URL + // plus it also adds the publicPath + const hmrClientEndpoint = removeLeadingSlash(options.hotModuleReplacementEndpointUrl); + + // This is the URL inside the Webpack middleware Node server that we'll proxy to. + // We have to prefix with the public path because Webpack will add the publicPath + // when it resolves hmrClientEndpoint as a relative URL. + const hmrServerEndpoint = ensureLeadingSlash(publicPathNoTrailingSlash + options.hotModuleReplacementEndpointUrl); // We always overwrite the 'path' option as it needs to match what the .NET side is expecting const hmrClientOptions = options.suppliedOptions.HotModuleReplacementClientOptions || >{}; hmrClientOptions['path'] = hmrClientEndpoint; + const dynamicPublicPathKey = 'dynamicPublicPath'; + if (!(dynamicPublicPathKey in hmrClientOptions)) { + // dynamicPublicPath default to true, so we can work with nonempty pathbases (virtual directories) + hmrClientOptions[dynamicPublicPathKey] = true; + } else { + // ... but you can set it to any other value explicitly if you want (e.g., false) + hmrClientOptions[dynamicPublicPathKey] = JSON.parse(hmrClientOptions[dynamicPublicPathKey]); + } + attachWebpackDevMiddleware(app, webpackConfig, enableHotModuleReplacement, enableReactHotModuleReplacement, hmrClientOptions, hmrServerEndpoint); } }); @@ -292,6 +310,14 @@ export function createWebpackDevServer(callback: CreateDevServerCallback, option }); } +function removeLeadingSlash(str: string) { + if (str.indexOf('/') === 0) { + str = str.substring(1); + } + + return str; +} + function removeTrailingSlash(str: string) { if (str.lastIndexOf('/') === str.length - 1) { str = str.substring(0, str.length - 1); From 56c806b34e6c9ebc90b725741556a01fe93c6501 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Tue, 11 Jul 2017 22:37:09 +0100 Subject: [PATCH 186/411] Update aspnet-prerendering to 3.0.1, fixing the default "fetch" base URL to match the real application root URL --- .../npm/aspnet-prerendering/package.json | 4 ++-- .../npm/aspnet-prerendering/src/Prerendering.ts | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/package.json b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/package.json index b2813a4c..e239460f 100644 --- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/package.json +++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/package.json @@ -1,6 +1,6 @@ { "name": "aspnet-prerendering", - "version": "2.0.6", + "version": "3.0.1", "description": "Helpers for server-side rendering of JavaScript applications in ASP.NET Core projects. Works in conjunction with the Microsoft.AspNetCore.SpaServices NuGet package.", "main": "index.js", "scripts": { @@ -17,7 +17,7 @@ "url": "https://github.com/aspnet/JavaScriptServices.git" }, "dependencies": { - "domain-task": "^2.0.2" + "domain-task": "^3.0.0" }, "devDependencies": { "@types/node": "^6.0.42", diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/Prerendering.ts b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/Prerendering.ts index 80a02591..a313cbad 100644 --- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/Prerendering.ts +++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/Prerendering.ts @@ -26,6 +26,7 @@ export function createServerRenderer(bootFunc: BootFunc): RenderToStringFunc { domainTasks: domainTaskCompletionPromise, data: customDataParameter }; + const absoluteBaseUrl = params.origin + params.baseUrl; // Should be same value as page's // Open a new domain that can track all the async tasks involved in the app's execution domainTaskRun(/* code to run */ () => { @@ -35,7 +36,7 @@ export function createServerRenderer(bootFunc: BootFunc): RenderToStringFunc { bindPromiseContinuationsToDomain(domainTaskCompletionPromise, domain['active']); // Make the base URL available to the 'domain-tasks/fetch' helper within this execution context - domainTaskBaseUrl(absoluteRequestUrl); + domainTaskBaseUrl(absoluteBaseUrl); // Begin rendering, and apply a timeout const bootFuncPromise = bootFunc(params); From 4903e123731cca060b32f7d141a487393985ed7e Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Tue, 11 Jul 2017 22:38:08 +0100 Subject: [PATCH 187/411] Publish aspnet-webpack-react as 3.0.0 since it's no longer beta --- .../npm/aspnet-webpack-react/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/package.json b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/package.json index a6f0b0fc..19a2a1b7 100644 --- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/package.json +++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/package.json @@ -1,6 +1,6 @@ { "name": "aspnet-webpack-react", - "version": "3.0.0-beta.1", + "version": "3.0.0", "description": "Helpers for using Webpack with React in ASP.NET Core projects. Works in conjunction with the Microsoft.AspNetCore.SpaServices NuGet package.", "main": "index.js", "scripts": { From bb0727c34c201c4b8e08c65470023577f44b9f6a Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Tue, 11 Jul 2017 16:47:57 +0100 Subject: [PATCH 188/411] Update templates to newer aspnet NPM dependencies --- templates/AngularSpa/npm-shrinkwrap.json | 18 +++++++-------- templates/AngularSpa/package.json | 4 ++-- templates/AureliaSpa/npm-shrinkwrap.json | 6 ++--- templates/AureliaSpa/package.json | 2 +- templates/KnockoutSpa/npm-shrinkwrap.json | 6 ++--- templates/KnockoutSpa/package.json | 2 +- templates/ReactReduxSpa/npm-shrinkwrap.json | 25 ++++++++------------- templates/ReactReduxSpa/package.json | 6 ++--- templates/ReactSpa/npm-shrinkwrap.json | 12 +++++----- templates/ReactSpa/package.json | 4 ++-- templates/VueSpa/npm-shrinkwrap.json | 6 ++--- templates/VueSpa/package.json | 2 +- 12 files changed, 43 insertions(+), 50 deletions(-) diff --git a/templates/AngularSpa/npm-shrinkwrap.json b/templates/AngularSpa/npm-shrinkwrap.json index f4f3ada1..e87dcf5b 100644 --- a/templates/AngularSpa/npm-shrinkwrap.json +++ b/templates/AngularSpa/npm-shrinkwrap.json @@ -274,14 +274,14 @@ "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.1.tgz" }, "aspnet-prerendering": { - "version": "2.0.6", - "from": "aspnet-prerendering@>=2.0.5 <3.0.0", - "resolved": "https://registry.npmjs.org/aspnet-prerendering/-/aspnet-prerendering-2.0.6.tgz" + "version": "3.0.1", + "from": "aspnet-prerendering@3.0.1", + "resolved": "https://registry.npmjs.org/aspnet-prerendering/-/aspnet-prerendering-3.0.1.tgz" }, "aspnet-webpack": { - "version": "1.0.29", - "from": "aspnet-webpack@>=1.0.29 <2.0.0", - "resolved": "https://registry.npmjs.org/aspnet-webpack/-/aspnet-webpack-1.0.29.tgz" + "version": "2.0.0", + "from": "aspnet-webpack@2.0.0", + "resolved": "https://registry.npmjs.org/aspnet-webpack/-/aspnet-webpack-2.0.0.tgz" }, "assert": { "version": "1.4.1", @@ -932,9 +932,9 @@ "resolved": "https://registry.npmjs.org/domain-context/-/domain-context-0.5.1.tgz" }, "domain-task": { - "version": "2.0.3", - "from": "domain-task@>=2.0.2 <3.0.0", - "resolved": "https://registry.npmjs.org/domain-task/-/domain-task-2.0.3.tgz" + "version": "3.0.3", + "from": "domain-task@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/domain-task/-/domain-task-3.0.3.tgz" }, "ee-first": { "version": "1.1.1", diff --git a/templates/AngularSpa/package.json b/templates/AngularSpa/package.json index 58494ec3..65f753f0 100644 --- a/templates/AngularSpa/package.json +++ b/templates/AngularSpa/package.json @@ -20,8 +20,8 @@ "@ngtools/webpack": "1.5.0", "@types/node": "8.0.8", "angular2-template-loader": "0.6.2", - "aspnet-prerendering": "^2.0.5", - "aspnet-webpack": "^1.0.29", + "aspnet-prerendering": "^3.0.1", + "aspnet-webpack": "^2.0.0", "awesome-typescript-loader": "3.2.1", "bootstrap": "3.3.7", "css": "2.2.1", diff --git a/templates/AureliaSpa/npm-shrinkwrap.json b/templates/AureliaSpa/npm-shrinkwrap.json index 611e8b67..5a52826b 100644 --- a/templates/AureliaSpa/npm-shrinkwrap.json +++ b/templates/AureliaSpa/npm-shrinkwrap.json @@ -113,9 +113,9 @@ "dev": true }, "aspnet-webpack": { - "version": "1.0.29", - "from": "aspnet-webpack@>=1.0.28 <2.0.0", - "resolved": "https://registry.npmjs.org/aspnet-webpack/-/aspnet-webpack-1.0.29.tgz", + "version": "2.0.0", + "from": "aspnet-webpack@2.0.0", + "resolved": "https://registry.npmjs.org/aspnet-webpack/-/aspnet-webpack-2.0.0.tgz", "dev": true }, "assert": { diff --git a/templates/AureliaSpa/package.json b/templates/AureliaSpa/package.json index 99bc02b7..7e92b5a3 100644 --- a/templates/AureliaSpa/package.json +++ b/templates/AureliaSpa/package.json @@ -15,7 +15,7 @@ }, "devDependencies": { "@types/node": "^7.0.12", - "aspnet-webpack": "^1.0.28", + "aspnet-webpack": "^2.0.0", "aurelia-webpack-plugin": "^2.0.0-rc.2", "css-loader": "^0.28.0", "extract-text-webpack-plugin": "^2.1.0", diff --git a/templates/KnockoutSpa/npm-shrinkwrap.json b/templates/KnockoutSpa/npm-shrinkwrap.json index 665c0a76..75ccbab8 100644 --- a/templates/KnockoutSpa/npm-shrinkwrap.json +++ b/templates/KnockoutSpa/npm-shrinkwrap.json @@ -167,9 +167,9 @@ "dev": true }, "aspnet-webpack": { - "version": "1.0.29", - "from": "aspnet-webpack@>=1.0.27 <2.0.0", - "resolved": "https://registry.npmjs.org/aspnet-webpack/-/aspnet-webpack-1.0.29.tgz", + "version": "2.0.0", + "from": "aspnet-webpack@2.0.0", + "resolved": "https://registry.npmjs.org/aspnet-webpack/-/aspnet-webpack-2.0.0.tgz", "dev": true }, "assert": { diff --git a/templates/KnockoutSpa/package.json b/templates/KnockoutSpa/package.json index c4c42fc0..385775a6 100644 --- a/templates/KnockoutSpa/package.json +++ b/templates/KnockoutSpa/package.json @@ -12,7 +12,7 @@ "@types/react-router": "^2.0.37", "@types/requirejs": "^2.1.26", "@types/signals": "0.0.16", - "aspnet-webpack": "^1.0.27", + "aspnet-webpack": "^2.0.0", "awesome-typescript-loader": "^3.0.0", "bootstrap": "^3.3.6", "bundle-loader": "^0.5.4", diff --git a/templates/ReactReduxSpa/npm-shrinkwrap.json b/templates/ReactReduxSpa/npm-shrinkwrap.json index 9dc18a0d..5e4df914 100644 --- a/templates/ReactReduxSpa/npm-shrinkwrap.json +++ b/templates/ReactReduxSpa/npm-shrinkwrap.json @@ -170,26 +170,19 @@ "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.1.tgz" }, "aspnet-prerendering": { - "version": "2.0.6", - "from": "aspnet-prerendering@>=2.0.5 <3.0.0", - "resolved": "https://registry.npmjs.org/aspnet-prerendering/-/aspnet-prerendering-2.0.6.tgz", - "dependencies": { - "domain-task": { - "version": "2.0.3", - "from": "domain-task@>=2.0.2 <3.0.0", - "resolved": "https://registry.npmjs.org/domain-task/-/domain-task-2.0.3.tgz" - } - } + "version": "3.0.1", + "from": "aspnet-prerendering@3.0.1", + "resolved": "https://registry.npmjs.org/aspnet-prerendering/-/aspnet-prerendering-3.0.1.tgz" }, "aspnet-webpack": { - "version": "1.0.29", - "from": "aspnet-webpack@>=1.0.29 <2.0.0", - "resolved": "https://registry.npmjs.org/aspnet-webpack/-/aspnet-webpack-1.0.29.tgz" + "version": "2.0.0", + "from": "aspnet-webpack@2.0.0", + "resolved": "https://registry.npmjs.org/aspnet-webpack/-/aspnet-webpack-2.0.0.tgz" }, "aspnet-webpack-react": { - "version": "3.0.0-beta.1", - "from": "aspnet-webpack-react@>=3.0.0-beta <4.0.0", - "resolved": "https://registry.npmjs.org/aspnet-webpack-react/-/aspnet-webpack-react-3.0.0-beta.1.tgz" + "version": "3.0.0", + "from": "aspnet-webpack-react@3.0.0", + "resolved": "https://registry.npmjs.org/aspnet-webpack-react/-/aspnet-webpack-react-3.0.0.tgz" }, "assert": { "version": "1.4.1", diff --git a/templates/ReactReduxSpa/package.json b/templates/ReactReduxSpa/package.json index 9d3ab76d..b8c308a9 100644 --- a/templates/ReactReduxSpa/package.json +++ b/templates/ReactReduxSpa/package.json @@ -12,9 +12,9 @@ "@types/react-router-redux": "5.0.3", "@types/webpack": "2.2.15", "@types/webpack-env": "1.13.0", - "aspnet-prerendering": "^2.0.5", - "aspnet-webpack": "^1.0.29", - "aspnet-webpack-react": "^3.0.0-beta", + "aspnet-prerendering": "^3.0.1", + "aspnet-webpack": "^2.0.0", + "aspnet-webpack-react": "^3.0.0", "awesome-typescript-loader": "3.2.1", "bootstrap": "3.3.7", "css-loader": "0.28.4", diff --git a/templates/ReactSpa/npm-shrinkwrap.json b/templates/ReactSpa/npm-shrinkwrap.json index 694cbc95..4069cea9 100644 --- a/templates/ReactSpa/npm-shrinkwrap.json +++ b/templates/ReactSpa/npm-shrinkwrap.json @@ -155,15 +155,15 @@ "dev": true }, "aspnet-webpack": { - "version": "1.0.29", - "from": "aspnet-webpack@>=1.0.29 <2.0.0", - "resolved": "https://registry.npmjs.org/aspnet-webpack/-/aspnet-webpack-1.0.29.tgz", + "version": "2.0.0", + "from": "aspnet-webpack@2.0.0", + "resolved": "https://registry.npmjs.org/aspnet-webpack/-/aspnet-webpack-2.0.0.tgz", "dev": true }, "aspnet-webpack-react": { - "version": "3.0.0-beta.1", - "from": "aspnet-webpack-react@>=3.0.0-beta <4.0.0", - "resolved": "https://registry.npmjs.org/aspnet-webpack-react/-/aspnet-webpack-react-3.0.0-beta.1.tgz", + "version": "3.0.0", + "from": "aspnet-webpack-react@3.0.0", + "resolved": "https://registry.npmjs.org/aspnet-webpack-react/-/aspnet-webpack-react-3.0.0.tgz", "dev": true }, "assert": { diff --git a/templates/ReactSpa/package.json b/templates/ReactSpa/package.json index 980d9797..913de25f 100644 --- a/templates/ReactSpa/package.json +++ b/templates/ReactSpa/package.json @@ -8,8 +8,8 @@ "@types/react-dom": "15.5.1", "@types/react-router": "4.0.12", "@types/webpack-env": "1.13.0", - "aspnet-webpack": "^1.0.29", - "aspnet-webpack-react": "^3.0.0-beta", + "aspnet-webpack": "^2.0.0", + "aspnet-webpack-react": "^3.0.0", "awesome-typescript-loader": "3.2.1", "bootstrap": "3.3.7", "css-loader": "0.28.4", diff --git a/templates/VueSpa/npm-shrinkwrap.json b/templates/VueSpa/npm-shrinkwrap.json index 55b74518..ab6bf012 100644 --- a/templates/VueSpa/npm-shrinkwrap.json +++ b/templates/VueSpa/npm-shrinkwrap.json @@ -119,9 +119,9 @@ "dev": true }, "aspnet-webpack": { - "version": "1.0.29", - "from": "aspnet-webpack@>=1.0.27 <2.0.0", - "resolved": "https://registry.npmjs.org/aspnet-webpack/-/aspnet-webpack-1.0.29.tgz", + "version": "2.0.0", + "from": "aspnet-webpack@2.0.0", + "resolved": "https://registry.npmjs.org/aspnet-webpack/-/aspnet-webpack-2.0.0.tgz", "dev": true }, "assert": { diff --git a/templates/VueSpa/package.json b/templates/VueSpa/package.json index d7b43348..eac756d3 100644 --- a/templates/VueSpa/package.json +++ b/templates/VueSpa/package.json @@ -4,7 +4,7 @@ "version": "0.0.0", "devDependencies": { "@types/requirejs": "^2.1.28", - "aspnet-webpack": "^1.0.27", + "aspnet-webpack": "^2.0.0", "awesome-typescript-loader": "^3.0.0", "bootstrap": "^3.3.6", "css-loader": "^0.25.0", From e65ecebac6f3c3c9abd815d25fd3b898a54e4453 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Tue, 11 Jul 2017 23:45:25 +0100 Subject: [PATCH 189/411] Make templates work with nonempty baseUrls (e.g., IIS virtual directories) --- .../AngularSpa/ClientApp/app/app.module.browser.ts | 6 +++--- .../app/components/fetchdata/fetchdata.component.ts | 4 ++-- templates/AngularSpa/ClientApp/boot.server.ts | 4 +++- templates/AngularSpa/webpack.config.js | 2 +- templates/AngularSpa/webpack.config.vendor.js | 2 +- .../ClientApp/app/components/fetchdata/fetchdata.ts | 2 +- templates/AureliaSpa/ClientApp/boot.ts | 6 ++++++ templates/AureliaSpa/webpack.config.js | 2 +- templates/AureliaSpa/webpack.config.vendor.js | 2 +- templates/KnockoutSpa/ClientApp/boot.ts | 4 +++- .../ClientApp/components/app-root/app-root.html | 2 +- .../ClientApp/components/app-root/app-root.ts | 10 +++++----- .../ClientApp/components/fetch-data/fetch-data.ts | 2 +- .../ClientApp/components/nav-menu/nav-menu.html | 6 +++--- .../ClientApp/components/nav-menu/nav-menu.ts | 8 +++++--- templates/KnockoutSpa/ClientApp/router.ts | 11 ++++++++--- templates/KnockoutSpa/Views/Home/Index.cshtml | 2 +- templates/KnockoutSpa/webpack.config.js | 2 +- templates/KnockoutSpa/webpack.config.vendor.js | 2 +- templates/ReactReduxSpa/ClientApp/boot-client.tsx | 3 ++- templates/ReactReduxSpa/ClientApp/boot-server.tsx | 6 ++++-- .../ReactReduxSpa/ClientApp/store/WeatherForecasts.ts | 2 +- templates/ReactReduxSpa/webpack.config.js | 2 +- templates/ReactReduxSpa/webpack.config.vendor.js | 2 +- templates/ReactSpa/ClientApp/boot.tsx | 3 ++- templates/ReactSpa/ClientApp/components/FetchData.tsx | 2 +- templates/ReactSpa/webpack.config.js | 2 +- templates/ReactSpa/webpack.config.vendor.js | 2 +- .../ClientApp/components/fetchdata/fetchdata.ts | 2 +- templates/VueSpa/webpack.config.js | 2 +- templates/VueSpa/webpack.config.vendor.js | 2 +- 31 files changed, 65 insertions(+), 44 deletions(-) diff --git a/templates/AngularSpa/ClientApp/app/app.module.browser.ts b/templates/AngularSpa/ClientApp/app/app.module.browser.ts index 7e71ca97..03104b45 100644 --- a/templates/AngularSpa/ClientApp/app/app.module.browser.ts +++ b/templates/AngularSpa/ClientApp/app/app.module.browser.ts @@ -10,12 +10,12 @@ import { AppComponent } from './components/app/app.component'; AppModuleShared ], providers: [ - { provide: 'ORIGIN_URL', useFactory: getOriginUrl } + { provide: 'BASE_URL', useFactory: getBaseUrl } ] }) export class AppModule { } -export function getOriginUrl() { - return location.origin; +export function getBaseUrl() { + return document.getElementsByTagName('base')[0].href; } diff --git a/templates/AngularSpa/ClientApp/app/components/fetchdata/fetchdata.component.ts b/templates/AngularSpa/ClientApp/app/components/fetchdata/fetchdata.component.ts index 6296925e..a4c06f42 100644 --- a/templates/AngularSpa/ClientApp/app/components/fetchdata/fetchdata.component.ts +++ b/templates/AngularSpa/ClientApp/app/components/fetchdata/fetchdata.component.ts @@ -8,8 +8,8 @@ import { Http } from '@angular/http'; export class FetchDataComponent { public forecasts: WeatherForecast[]; - constructor(http: Http, @Inject('ORIGIN_URL') originUrl: string) { - http.get(originUrl + '/api/SampleData/WeatherForecasts').subscribe(result => { + constructor(http: Http, @Inject('BASE_URL') baseUrl: string) { + http.get(baseUrl + 'api/SampleData/WeatherForecasts').subscribe(result => { this.forecasts = result.json() as WeatherForecast[]; }, error => console.error(error)); } diff --git a/templates/AngularSpa/ClientApp/boot.server.ts b/templates/AngularSpa/ClientApp/boot.server.ts index 08474cfa..851e1379 100644 --- a/templates/AngularSpa/ClientApp/boot.server.ts +++ b/templates/AngularSpa/ClientApp/boot.server.ts @@ -1,6 +1,7 @@ import 'reflect-metadata'; import 'zone.js'; import 'rxjs/add/operator/first'; +import { APP_BASE_HREF } from '@angular/common'; import { enableProdMode, ApplicationRef, NgZone, ValueProvider } from '@angular/core'; import { platformDynamicServer, PlatformState, INITIAL_CONFIG } from '@angular/platform-server'; import { createServerRenderer, RenderResult } from 'aspnet-prerendering'; @@ -11,7 +12,8 @@ enableProdMode(); export default createServerRenderer(params => { const providers = [ { provide: INITIAL_CONFIG, useValue: { document: '', url: params.url } }, - { provide: 'ORIGIN_URL', useValue: params.origin } + { provide: APP_BASE_HREF, useValue: params.baseUrl }, + { provide: 'BASE_URL', useValue: params.origin + params.baseUrl }, ]; return platformDynamicServer(providers).bootstrapModule(AppModule).then(moduleRef => { diff --git a/templates/AngularSpa/webpack.config.js b/templates/AngularSpa/webpack.config.js index fd1ff6e7..85e238de 100644 --- a/templates/AngularSpa/webpack.config.js +++ b/templates/AngularSpa/webpack.config.js @@ -13,7 +13,7 @@ module.exports = (env) => { resolve: { extensions: [ '.js', '.ts' ] }, output: { filename: '[name].js', - publicPath: '/dist/' // Webpack dev middleware, if enabled, handles requests for this URL prefix + publicPath: 'dist/' // Webpack dev middleware, if enabled, handles requests for this URL prefix }, module: { rules: [ diff --git a/templates/AngularSpa/webpack.config.vendor.js b/templates/AngularSpa/webpack.config.vendor.js index ed7fa931..36e43864 100644 --- a/templates/AngularSpa/webpack.config.vendor.js +++ b/templates/AngularSpa/webpack.config.vendor.js @@ -36,7 +36,7 @@ module.exports = (env) => { ] }, output: { - publicPath: '/dist/', + publicPath: 'dist/', filename: '[name].js', library: '[name]_[hash]' }, diff --git a/templates/AureliaSpa/ClientApp/app/components/fetchdata/fetchdata.ts b/templates/AureliaSpa/ClientApp/app/components/fetchdata/fetchdata.ts index ff86025f..6cd72ac1 100644 --- a/templates/AureliaSpa/ClientApp/app/components/fetchdata/fetchdata.ts +++ b/templates/AureliaSpa/ClientApp/app/components/fetchdata/fetchdata.ts @@ -6,7 +6,7 @@ export class Fetchdata { public forecasts: WeatherForecast[]; constructor(http: HttpClient) { - http.fetch('http://github.com/api/SampleData/WeatherForecasts') + http.fetch('http://github.com/api/SampleData/WeatherForecasts') .then(result => result.json() as Promise) .then(data => { this.forecasts = data; diff --git a/templates/AureliaSpa/ClientApp/boot.ts b/templates/AureliaSpa/ClientApp/boot.ts index 5c9e2fd5..053b9c31 100644 --- a/templates/AureliaSpa/ClientApp/boot.ts +++ b/templates/AureliaSpa/ClientApp/boot.ts @@ -1,5 +1,6 @@ import 'isomorphic-fetch'; import { Aurelia, PLATFORM } from 'aurelia-framework'; +import { HttpClient } from 'aurelia-fetch-client'; import 'bootstrap/dist/css/bootstrap.css'; import 'bootstrap'; declare const IS_DEV_BUILD: boolean; // The value is supplied by Webpack during the build @@ -11,5 +12,10 @@ export function configure(aurelia: Aurelia) { aurelia.use.developmentLogging(); } + new HttpClient().configure(config => { + const baseUrl = document.getElementsByTagName('base')[0].href; + config.withBaseUrl(baseUrl); + }); + aurelia.start().then(() => aurelia.setRoot(PLATFORM.moduleName('app/components/app/app'))); } diff --git a/templates/AureliaSpa/webpack.config.js b/templates/AureliaSpa/webpack.config.js index 4ddc35cc..5ff94d09 100644 --- a/templates/AureliaSpa/webpack.config.js +++ b/templates/AureliaSpa/webpack.config.js @@ -14,7 +14,7 @@ module.exports = (env) => { }, output: { path: path.resolve(bundleOutputDir), - publicPath: '/dist/', + publicPath: 'dist/', filename: '[name].js' }, module: { diff --git a/templates/AureliaSpa/webpack.config.vendor.js b/templates/AureliaSpa/webpack.config.vendor.js index 9625a315..1dc579ce 100644 --- a/templates/AureliaSpa/webpack.config.vendor.js +++ b/templates/AureliaSpa/webpack.config.vendor.js @@ -38,7 +38,7 @@ module.exports = ({ prod } = {}) => { }, output: { path: path.join(__dirname, 'wwwroot', 'dist'), - publicPath: '/dist/', + publicPath: 'dist/', filename: '[name].js', library: '[name]_[hash]', }, diff --git a/templates/KnockoutSpa/ClientApp/boot.ts b/templates/KnockoutSpa/ClientApp/boot.ts index 143e8e5f..b8da1ddd 100644 --- a/templates/KnockoutSpa/ClientApp/boot.ts +++ b/templates/KnockoutSpa/ClientApp/boot.ts @@ -4,12 +4,14 @@ import * as ko from 'knockout'; import './webpack-component-loader'; import AppRootComponent from './components/app-root/app-root'; const createHistory = require('history').createBrowserHistory; +const baseUrl = document.getElementsByTagName('base')[0].getAttribute('href'); +const basename = baseUrl.substring(0, baseUrl.length - 1); // History component needs no trailing slash // Load and register the component ko.components.register('app-root', AppRootComponent); // Tell Knockout to start up an instance of your application -ko.applyBindings({ history: createHistory() }); +ko.applyBindings({ history: createHistory({ basename }), basename }); // Basic hot reloading support. Automatically reloads and restarts the Knockout app each time // you modify source files. This will not preserve any application state other than the URL. diff --git a/templates/KnockoutSpa/ClientApp/components/app-root/app-root.html b/templates/KnockoutSpa/ClientApp/components/app-root/app-root.html index f1f11b40..88e345bd 100644 --- a/templates/KnockoutSpa/ClientApp/components/app-root/app-root.html +++ b/templates/KnockoutSpa/ClientApp/components/app-root/app-root.html @@ -1,7 +1,7 @@
    - +
    diff --git a/templates/KnockoutSpa/ClientApp/components/app-root/app-root.ts b/templates/KnockoutSpa/ClientApp/components/app-root/app-root.ts index af9062c3..2ca1bfeb 100644 --- a/templates/KnockoutSpa/ClientApp/components/app-root/app-root.ts +++ b/templates/KnockoutSpa/ClientApp/components/app-root/app-root.ts @@ -12,12 +12,12 @@ const routes: Route[] = [ class AppRootViewModel { public route: KnockoutObservable; - private _router: Router; + public router: Router; - constructor(params: { history: History.History }) { + constructor(params: { history: History.History, basename: string }) { // Activate the client-side router - this._router = new Router(params.history, routes) - this.route = this._router.currentRoute; + this.router = new Router(params.history, routes, params.basename); + this.route = this.router.currentRoute; // Load and register all the KO components needed to handle the routes // The optional 'bundle-loader?lazy!' prefix is a Webpack feature that causes the referenced modules @@ -32,7 +32,7 @@ class AppRootViewModel { // To support hot module replacement, this method unregisters the router and KO components. // In production scenarios where hot module replacement is disabled, this would not be invoked. public dispose() { - this._router.dispose(); + this.router.dispose(); // TODO: Need a better API for this Object.getOwnPropertyNames((ko).components._allRegisteredComponents).forEach(componentName => { diff --git a/templates/KnockoutSpa/ClientApp/components/fetch-data/fetch-data.ts b/templates/KnockoutSpa/ClientApp/components/fetch-data/fetch-data.ts index 9576d669..b0538900 100644 --- a/templates/KnockoutSpa/ClientApp/components/fetch-data/fetch-data.ts +++ b/templates/KnockoutSpa/ClientApp/components/fetch-data/fetch-data.ts @@ -12,7 +12,7 @@ class FetchDataViewModel { public forecasts = ko.observableArray(); constructor() { - fetch('http://github.com/api/SampleData/WeatherForecasts') + fetch('http://github.com/api/SampleData/WeatherForecasts') .then(response => response.json() as Promise) .then(data => { this.forecasts(data); diff --git a/templates/KnockoutSpa/ClientApp/components/nav-menu/nav-menu.html b/templates/KnockoutSpa/ClientApp/components/nav-menu/nav-menu.html index 0bfd32c9..f053cef4 100644 --- a/templates/KnockoutSpa/ClientApp/components/nav-menu/nav-menu.html +++ b/templates/KnockoutSpa/ClientApp/components/nav-menu/nav-menu.html @@ -13,17 +13,17 @@
    • - + Home
    • - + Counter
    • - + Fetch data
      • diff --git a/templates/KnockoutSpa/ClientApp/components/nav-menu/nav-menu.ts b/templates/KnockoutSpa/ClientApp/components/nav-menu/nav-menu.ts index 186c60e1..4ea1fdb8 100644 --- a/templates/KnockoutSpa/ClientApp/components/nav-menu/nav-menu.ts +++ b/templates/KnockoutSpa/ClientApp/components/nav-menu/nav-menu.ts @@ -1,18 +1,20 @@ import * as ko from 'knockout'; -import { Route } from '../../router'; +import { Route, Router } from '../../router'; interface NavMenuParams { - route: KnockoutObservable; + router: Router; } class NavMenuViewModel { + public router: Router; public route: KnockoutObservable; constructor(params: NavMenuParams) { // This viewmodel doesn't do anything except pass through the 'route' parameter to the view. // You could remove this viewmodel entirely, and define 'nav-menu' as a template-only component. // But in most apps, you'll want some viewmodel logic to determine what navigation options appear. - this.route = params.route; + this.router = params.router; + this.route = this.router.currentRoute; } } diff --git a/templates/KnockoutSpa/ClientApp/router.ts b/templates/KnockoutSpa/ClientApp/router.ts index d3ac7497..5045487c 100644 --- a/templates/KnockoutSpa/ClientApp/router.ts +++ b/templates/KnockoutSpa/ClientApp/router.ts @@ -16,7 +16,7 @@ export class Router { private disposeHistory: () => void; private clickEventListener: EventListener; - constructor(history: History.History, routes: Route[]) { + constructor(private history: History.History, routes: Route[], basename: string) { // Reset and configure Crossroads so it matches routes and updates this.currentRoute crossroads.removeAllRoutes(); crossroads.resetState(); @@ -33,8 +33,9 @@ export class Router { let target: any = evt.currentTarget; if (target && target.tagName === 'A') { let href = target.getAttribute('href'); - if (href && href.charAt(0) == '/') { - history.push(href); + if (href && href.indexOf(basename + '/') === 0) { + const hrefAfterBasename = href.substring(basename.length); + history.push(hrefAfterBasename); evt.preventDefault(); } } @@ -46,6 +47,10 @@ export class Router { crossroads.parse((history as any).location.pathname); } + public link(url: string): string { + return this.history.createHref({ pathname: url }); + } + public dispose() { this.disposeHistory(); $(document).off('click', 'a', this.clickEventListener); diff --git a/templates/KnockoutSpa/Views/Home/Index.cshtml b/templates/KnockoutSpa/Views/Home/Index.cshtml index 866fb01b..02530207 100644 --- a/templates/KnockoutSpa/Views/Home/Index.cshtml +++ b/templates/KnockoutSpa/Views/Home/Index.cshtml @@ -2,7 +2,7 @@ ViewData["Title"] = "Home Page"; } - + @section scripts { diff --git a/templates/KnockoutSpa/webpack.config.js b/templates/KnockoutSpa/webpack.config.js index 9be0b9ee..98a37b68 100644 --- a/templates/KnockoutSpa/webpack.config.js +++ b/templates/KnockoutSpa/webpack.config.js @@ -13,7 +13,7 @@ module.exports = (env) => { output: { path: path.join(__dirname, bundleOutputDir), filename: '[name].js', - publicPath: '/dist/' + publicPath: 'dist/' }, module: { rules: [ diff --git a/templates/KnockoutSpa/webpack.config.vendor.js b/templates/KnockoutSpa/webpack.config.vendor.js index f53c6bac..12d4dba5 100644 --- a/templates/KnockoutSpa/webpack.config.vendor.js +++ b/templates/KnockoutSpa/webpack.config.vendor.js @@ -21,7 +21,7 @@ module.exports = (env) => { }, output: { path: path.join(__dirname, 'wwwroot', 'dist'), - publicPath: '/dist/', + publicPath: 'dist/', filename: '[name].js', library: '[name]_[hash]', }, diff --git a/templates/ReactReduxSpa/ClientApp/boot-client.tsx b/templates/ReactReduxSpa/ClientApp/boot-client.tsx index cd84cc9a..188729eb 100644 --- a/templates/ReactReduxSpa/ClientApp/boot-client.tsx +++ b/templates/ReactReduxSpa/ClientApp/boot-client.tsx @@ -12,7 +12,8 @@ import * as RoutesModule from './routes'; let routes = RoutesModule.routes; // Create browser history to use in the Redux store -const history = createBrowserHistory(); +const baseUrl = document.getElementsByTagName('base')[0].getAttribute('href'); +const history = createBrowserHistory({ basename: baseUrl }); // Get the application-wide store instance, prepopulating with state from the server where available. const initialState = (window as any).initialReduxState as ApplicationState; diff --git a/templates/ReactReduxSpa/ClientApp/boot-server.tsx b/templates/ReactReduxSpa/ClientApp/boot-server.tsx index 62be9682..7b622c02 100644 --- a/templates/ReactReduxSpa/ClientApp/boot-server.tsx +++ b/templates/ReactReduxSpa/ClientApp/boot-server.tsx @@ -12,15 +12,17 @@ export default createServerRenderer(params => { return new Promise((resolve, reject) => { // Prepare Redux store with in-memory history, and dispatch a navigation event // corresponding to the incoming URL + const basename = params.baseUrl.substring(0, params.baseUrl.length - 1); // Remove trailing slash + const urlAfterBasename = params.url.substring(basename.length); const store = configureStore(createMemoryHistory()); - store.dispatch(replace(params.location)); + store.dispatch(replace(urlAfterBasename)); // Prepare an instance of the application and perform an inital render that will // cause any async tasks (e.g., data access) to begin const routerContext: any = {}; const app = ( - + ); renderToString(app); diff --git a/templates/ReactReduxSpa/ClientApp/store/WeatherForecasts.ts b/templates/ReactReduxSpa/ClientApp/store/WeatherForecasts.ts index 87828de3..e7960b15 100644 --- a/templates/ReactReduxSpa/ClientApp/store/WeatherForecasts.ts +++ b/templates/ReactReduxSpa/ClientApp/store/WeatherForecasts.ts @@ -45,7 +45,7 @@ export const actionCreators = { requestWeatherForecasts: (startDateIndex: number): AppThunkAction => (dispatch, getState) => { // Only load data if it's something we don't already have (and are not already loading) if (startDateIndex !== getState().weatherForecasts.startDateIndex) { - let fetchTask = fetch(`/api/SampleData/WeatherForecasts?startDateIndex=${ startDateIndex }`) + let fetchTask = fetch(`api/SampleData/WeatherForecasts?startDateIndex=${ startDateIndex }`) .then(response => response.json() as Promise) .then(data => { dispatch({ type: 'RECEIVE_WEATHER_FORECASTS', startDateIndex: startDateIndex, forecasts: data }); diff --git a/templates/ReactReduxSpa/webpack.config.js b/templates/ReactReduxSpa/webpack.config.js index 5a613b81..deebbeba 100644 --- a/templates/ReactReduxSpa/webpack.config.js +++ b/templates/ReactReduxSpa/webpack.config.js @@ -13,7 +13,7 @@ module.exports = (env) => { resolve: { extensions: ['.js', '.jsx', '.ts', '.tsx'] }, output: { filename: '[name].js', - publicPath: '/dist/' // Webpack dev middleware, if enabled, handles requests for this URL prefix + publicPath: 'dist/' // Webpack dev middleware, if enabled, handles requests for this URL prefix }, module: { rules: [ diff --git a/templates/ReactReduxSpa/webpack.config.vendor.js b/templates/ReactReduxSpa/webpack.config.vendor.js index dbc03036..eaaa647a 100644 --- a/templates/ReactReduxSpa/webpack.config.vendor.js +++ b/templates/ReactReduxSpa/webpack.config.vendor.js @@ -33,7 +33,7 @@ module.exports = (env) => { ], }, output: { - publicPath: '/dist/', + publicPath: 'dist/', filename: '[name].js', library: '[name]_[hash]', }, diff --git a/templates/ReactSpa/ClientApp/boot.tsx b/templates/ReactSpa/ClientApp/boot.tsx index 3b2debf7..a97ee68f 100644 --- a/templates/ReactSpa/ClientApp/boot.tsx +++ b/templates/ReactSpa/ClientApp/boot.tsx @@ -10,9 +10,10 @@ let routes = RoutesModule.routes; function renderApp() { // This code starts up the React app when it runs in a browser. It sets up the routing // configuration and injects the app into a DOM element. + const baseUrl = document.getElementsByTagName('base')[0].getAttribute('href'); ReactDOM.render( - + , document.getElementById('react-app') ); diff --git a/templates/ReactSpa/ClientApp/components/FetchData.tsx b/templates/ReactSpa/ClientApp/components/FetchData.tsx index 6474f012..c958ea69 100644 --- a/templates/ReactSpa/ClientApp/components/FetchData.tsx +++ b/templates/ReactSpa/ClientApp/components/FetchData.tsx @@ -11,7 +11,7 @@ export class FetchData extends React.Component<{}, FetchDataExampleState> { super(); this.state = { forecasts: [], loading: true }; - fetch('http://github.com/api/SampleData/WeatherForecasts') + fetch('http://github.com/api/SampleData/WeatherForecasts') .then(response => response.json() as Promise) .then(data => { this.setState({ forecasts: data, loading: false }); diff --git a/templates/ReactSpa/webpack.config.js b/templates/ReactSpa/webpack.config.js index e2254d67..01e45ea4 100644 --- a/templates/ReactSpa/webpack.config.js +++ b/templates/ReactSpa/webpack.config.js @@ -13,7 +13,7 @@ module.exports = (env) => { output: { path: path.join(__dirname, bundleOutputDir), filename: '[name].js', - publicPath: '/dist/' + publicPath: 'dist/' }, module: { rules: [ diff --git a/templates/ReactSpa/webpack.config.vendor.js b/templates/ReactSpa/webpack.config.vendor.js index 11fc2a64..d23ac4ff 100644 --- a/templates/ReactSpa/webpack.config.vendor.js +++ b/templates/ReactSpa/webpack.config.vendor.js @@ -21,7 +21,7 @@ module.exports = (env) => { }, output: { path: path.join(__dirname, 'wwwroot', 'dist'), - publicPath: '/dist/', + publicPath: 'dist/', filename: '[name].js', library: '[name]_[hash]', }, diff --git a/templates/VueSpa/ClientApp/components/fetchdata/fetchdata.ts b/templates/VueSpa/ClientApp/components/fetchdata/fetchdata.ts index dcc37f02..c6108f93 100644 --- a/templates/VueSpa/ClientApp/components/fetchdata/fetchdata.ts +++ b/templates/VueSpa/ClientApp/components/fetchdata/fetchdata.ts @@ -13,7 +13,7 @@ export default class FetchDataComponent extends Vue { forecasts: WeatherForecast[] = []; mounted() { - fetch('http://github.com/api/SampleData/WeatherForecasts') + fetch('http://github.com/api/SampleData/WeatherForecasts') .then(response => response.json() as Promise) .then(data => { this.forecasts = data; diff --git a/templates/VueSpa/webpack.config.js b/templates/VueSpa/webpack.config.js index 7aca565f..a44f366f 100644 --- a/templates/VueSpa/webpack.config.js +++ b/templates/VueSpa/webpack.config.js @@ -23,7 +23,7 @@ module.exports = (env) => { output: { path: path.join(__dirname, bundleOutputDir), filename: '[name].js', - publicPath: '/dist/' + publicPath: 'dist/' }, plugins: [ new CheckerPlugin(), diff --git a/templates/VueSpa/webpack.config.vendor.js b/templates/VueSpa/webpack.config.vendor.js index 2cd2af60..5c21d672 100644 --- a/templates/VueSpa/webpack.config.vendor.js +++ b/templates/VueSpa/webpack.config.vendor.js @@ -28,7 +28,7 @@ module.exports = (env) => { }, output: { path: path.join(__dirname, 'wwwroot', 'dist'), - publicPath: '/dist/', + publicPath: 'dist/', filename: '[name].js', library: '[name]_[hash]' }, From dab0faea66daa7303ad041958bba81732fb82352 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 12 Jul 2017 00:39:28 +0100 Subject: [PATCH 190/411] Update to AspNetCore 2.0.0-rtm-26219 --- templates/AngularSpa/AngularSpa.csproj | 12 ++++++------ templates/AureliaSpa/AureliaSpa.csproj | 12 ++++++------ templates/KnockoutSpa/KnockoutSpa.csproj | 12 ++++++------ templates/ReactReduxSpa/ReactReduxSpa.csproj | 12 ++++++------ templates/ReactSpa/ReactSpa.csproj | 12 ++++++------ templates/VueSpa/VueSpa.csproj | 12 ++++++------ 6 files changed, 36 insertions(+), 36 deletions(-) diff --git a/templates/AngularSpa/AngularSpa.csproj b/templates/AngularSpa/AngularSpa.csproj index c8f88edd..eaac51b5 100644 --- a/templates/AngularSpa/AngularSpa.csproj +++ b/templates/AngularSpa/AngularSpa.csproj @@ -9,17 +9,17 @@ - + - - - - + + + + - + diff --git a/templates/AureliaSpa/AureliaSpa.csproj b/templates/AureliaSpa/AureliaSpa.csproj index e36a892e..2574bb16 100644 --- a/templates/AureliaSpa/AureliaSpa.csproj +++ b/templates/AureliaSpa/AureliaSpa.csproj @@ -9,17 +9,17 @@ - + - - - - + + + + - + diff --git a/templates/KnockoutSpa/KnockoutSpa.csproj b/templates/KnockoutSpa/KnockoutSpa.csproj index e36a892e..2574bb16 100644 --- a/templates/KnockoutSpa/KnockoutSpa.csproj +++ b/templates/KnockoutSpa/KnockoutSpa.csproj @@ -9,17 +9,17 @@ - + - - - - + + + + - + diff --git a/templates/ReactReduxSpa/ReactReduxSpa.csproj b/templates/ReactReduxSpa/ReactReduxSpa.csproj index 4708b1f8..eaac51b5 100644 --- a/templates/ReactReduxSpa/ReactReduxSpa.csproj +++ b/templates/ReactReduxSpa/ReactReduxSpa.csproj @@ -9,17 +9,17 @@ - + - - - - + + + + - + diff --git a/templates/ReactSpa/ReactSpa.csproj b/templates/ReactSpa/ReactSpa.csproj index e36a892e..2574bb16 100644 --- a/templates/ReactSpa/ReactSpa.csproj +++ b/templates/ReactSpa/ReactSpa.csproj @@ -9,17 +9,17 @@ - + - - - - + + + + - + diff --git a/templates/VueSpa/VueSpa.csproj b/templates/VueSpa/VueSpa.csproj index e36a892e..2574bb16 100644 --- a/templates/VueSpa/VueSpa.csproj +++ b/templates/VueSpa/VueSpa.csproj @@ -9,17 +9,17 @@ - + - - - - + + + + - + From 576e3debf1476e84f0ba685ea239ed65fac90dc7 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 12 Jul 2017 14:53:40 +0100 Subject: [PATCH 191/411] Complete the lstat patching for #1101 --- .../Content/Node/entrypoint-http.js | 4 ++-- .../TypeScript/Util/PatchModuleResolutionLStat.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Microsoft.AspNetCore.NodeServices/Content/Node/entrypoint-http.js b/src/Microsoft.AspNetCore.NodeServices/Content/Node/entrypoint-http.js index 7524fb06..644cb36d 100644 --- a/src/Microsoft.AspNetCore.NodeServices/Content/Node/entrypoint-http.js +++ b/src/Microsoft.AspNetCore.NodeServices/Content/Node/entrypoint-http.js @@ -149,7 +149,7 @@ var path = __webpack_require__(3); var startsWith = function (str, prefix) { return str.substring(0, prefix.length) === prefix; }; var appRootDir = process.cwd(); - function patchedLStat(pathToStatLong) { + function patchedLStat(pathToStatLong, fsReqWrap) { try { // If the lstat completes without errors, we don't modify its behavior at all return origLStat.apply(this, arguments); @@ -165,7 +165,7 @@ // ancestor directories are symlinks or not. If there's a genuine file // permissions issue, it will still surface later when Node actually // tries to read the file. - return origLStat.call(this, appRootDir); + return origLStat.call(this, appRootDir, fsReqWrap); } else { // In any other case, preserve the original error diff --git a/src/Microsoft.AspNetCore.NodeServices/TypeScript/Util/PatchModuleResolutionLStat.ts b/src/Microsoft.AspNetCore.NodeServices/TypeScript/Util/PatchModuleResolutionLStat.ts index 71dccbab..de5185ff 100644 --- a/src/Microsoft.AspNetCore.NodeServices/TypeScript/Util/PatchModuleResolutionLStat.ts +++ b/src/Microsoft.AspNetCore.NodeServices/TypeScript/Util/PatchModuleResolutionLStat.ts @@ -2,7 +2,7 @@ import * as path from 'path'; const startsWith = (str: string, prefix: string) => str.substring(0, prefix.length) === prefix; const appRootDir = process.cwd(); -function patchedLStat(pathToStatLong: string) { +function patchedLStat(pathToStatLong: string, fsReqWrap?: any) { try { // If the lstat completes without errors, we don't modify its behavior at all return origLStat.apply(this, arguments); @@ -19,7 +19,7 @@ function patchedLStat(pathToStatLong: string) { // ancestor directories are symlinks or not. If there's a genuine file // permissions issue, it will still surface later when Node actually // tries to read the file. - return origLStat.call(this, appRootDir); + return origLStat.call(this, appRootDir, fsReqWrap); } else { // In any other case, preserve the original error throw ex; From cdb04c74f9bcbf505d4dbc863c715ebb25ceb14f Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 12 Jul 2017 23:06:05 +0100 Subject: [PATCH 192/411] Update aspnet-webpack to 2.0.1, automatically disabling the middleware if we detect the process doesn't have sufficient disk permissions --- .../npm/aspnet-webpack/package-lock.json | 1700 +++++++++++++++++ .../npm/aspnet-webpack/package.json | 2 +- .../src/WebpackDevMiddleware.ts | 20 +- .../src/WebpackTestPermissions.ts | 58 + 4 files changed, 1772 insertions(+), 8 deletions(-) create mode 100644 src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/package-lock.json create mode 100644 src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/WebpackTestPermissions.ts diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/package-lock.json b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/package-lock.json new file mode 100644 index 00000000..960a4f23 --- /dev/null +++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/package-lock.json @@ -0,0 +1,1700 @@ +{ + "name": "aspnet-webpack", + "version": "2.0.1", + "lockfileVersion": 1, + "dependencies": { + "@types/connect": { + "version": "3.4.30", + "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.30.tgz", + "integrity": "sha1-Co7eMJzg69ui8FNOV0aSUR3XHrY=", + "dev": true + }, + "@types/node": { + "version": "6.0.81", + "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.81.tgz", + "integrity": "sha512-KdtXOH8l9O2wwOOX+swjbFx+YW/RJFfI14o6S50+Zy79FK1WFGkzFdDsiuNjrG5L6FaBSKpKzSpWgTvXurbbYg==", + "dev": true + }, + "@types/source-map": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/@types/source-map/-/source-map-0.5.0.tgz", + "integrity": "sha1-3TS72OMv5OdPLj2KwH+KpbRaR6w=", + "dev": true + }, + "@types/tapable": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/@types/tapable/-/tapable-0.2.3.tgz", + "integrity": "sha1-CIiw8gzH5Y4cIqGIi06WPu+qgQo=", + "dev": true + }, + "@types/uglify-js": { + "version": "2.6.29", + "resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-2.6.29.tgz", + "integrity": "sha512-BdFLCZW0GTl31AbqXSak8ss/MqEZ3DN2MH9rkAyGoTuzK7ifGUlX+u0nfbWeTsa7IPcZhtn8BlpYBXSV+vqGhQ==", + "dev": true + }, + "@types/webpack": { + "version": "2.2.16", + "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-2.2.16.tgz", + "integrity": "sha512-RWL7Qrf9dE2Y3SPR8FZ2ATIJzKzvzvpfAhXs2A+2YpAYufoBqc94766Dv7TLB8zj7P6NK8t4KMrGNnYFJGKGiQ==", + "dev": true + }, + "acorn": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz", + "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=", + "dev": true + }, + "align-text": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", + "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", + "dev": true + }, + "amdefine": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", + "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", + "dev": true + }, + "anymatch": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.0.tgz", + "integrity": "sha1-o+Uvo5FoyCX/V7AkgSbOWo/5VQc=", + "dev": true + }, + "arr-diff": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz", + "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", + "dev": true + }, + "arr-flatten": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", + "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==", + "dev": true + }, + "array-unique": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz", + "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=", + "dev": true + }, + "arrify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", + "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=", + "dev": true + }, + "assert": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz", + "integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=", + "dev": true + }, + "async": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", + "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", + "dev": true + }, + "async-each": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz", + "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=", + "dev": true + }, + "balanced-match": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", + "dev": true + }, + "base64-js": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.1.tgz", + "integrity": "sha512-dwVUVIXsBZXwTuwnXI9RK8sBmgq09NDHzyR9SAph9eqk76gKK2JSQmZARC2zRC81JC2QTtxD0ARU5qTS25gIGw==", + "dev": true + }, + "big.js": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.1.3.tgz", + "integrity": "sha1-TK2iGTZS6zyp7I5VyQFWacmAaXg=", + "dev": true + }, + "binary-extensions": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.8.0.tgz", + "integrity": "sha1-SOyNFt9Dd+rl+liEaCSAr02Vx3Q=", + "dev": true + }, + "brace-expansion": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", + "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", + "dev": true + }, + "braces": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz", + "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", + "dev": true + }, + "browserify-aes": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-0.4.0.tgz", + "integrity": "sha1-BnFJtmjfMcS1hTPgLQHoBthgjiw=", + "dev": true + }, + "browserify-zlib": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz", + "integrity": "sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0=", + "dev": true + }, + "buffer": { + "version": "4.9.1", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz", + "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=", + "dev": true + }, + "builtin-status-codes": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz", + "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=", + "dev": true + }, + "camelcase": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", + "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", + "dev": true + }, + "center-align": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz", + "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=", + "dev": true + }, + "chokidar": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz", + "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=", + "dev": true + }, + "cliui": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", + "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", + "dev": true, + "dependencies": { + "wordwrap": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz", + "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=", + "dev": true + } + } + }, + "clone": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz", + "integrity": "sha1-Jgt6meux7f4kdTgXX3gyQ8sZ0Uk=", + "dev": true + }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", + "dev": true + }, + "connect": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/connect/-/connect-3.6.2.tgz", + "integrity": "sha1-aU6NIGgb/kkCgsiriGvpjwn0L+c=" + }, + "console-browserify": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz", + "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=", + "dev": true + }, + "constants-browserify": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz", + "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=", + "dev": true + }, + "core-util-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" + }, + "crypto-browserify": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.3.0.tgz", + "integrity": "sha1-ufx1u0oO1h3PHNXa6W6zDJw+UGw=", + "dev": true + }, + "date-now": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz", + "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=", + "dev": true + }, + "debug": { + "version": "2.6.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz", + "integrity": "sha1-krrR9tBbu2u6Isyoi80OyJTChh4=" + }, + "decamelize": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", + "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", + "dev": true + }, + "domain-browser": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.7.tgz", + "integrity": "sha1-hnqksJP6oF8d4IwG9NeyH9+GmLw=", + "dev": true + }, + "ee-first": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", + "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" + }, + "emojis-list": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz", + "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=", + "dev": true + }, + "encodeurl": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.1.tgz", + "integrity": "sha1-eePVhlU0aQn+bw9Fpd5oEDspTSA=" + }, + "enhanced-resolve": { + "version": "0.9.1", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz", + "integrity": "sha1-TW5omzcl+GCQknzMhs2fFjW4ni4=", + "dev": true, + "dependencies": { + "memory-fs": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.2.0.tgz", + "integrity": "sha1-8rslNovBIeORwlIN6Slpyu4KApA=", + "dev": true + } + } + }, + "errno": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.4.tgz", + "integrity": "sha1-uJbiOp5ei6M4cfyZar02NfyaHH0=" + }, + "es6-promise": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz", + "integrity": "sha1-oIzd6EzNvzTQJ6FFG8kdS80ophM=" + }, + "escape-html": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", + "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=" + }, + "events": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz", + "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=", + "dev": true + }, + "expand-brackets": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz", + "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", + "dev": true + }, + "expand-range": { + "version": "1.8.2", + "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz", + "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=", + "dev": true + }, + "extglob": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz", + "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", + "dev": true + }, + "filename-regex": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz", + "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=", + "dev": true + }, + "fill-range": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz", + "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=", + "dev": true + }, + "finalhandler": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.3.tgz", + "integrity": "sha1-70fneVDpmXgOhgIqVg4yF+DQzIk=" + }, + "for-in": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", + "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=", + "dev": true + }, + "for-own": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz", + "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=", + "dev": true + }, + "fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", + "dev": true + }, + "fsevents": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.2.tgz", + "integrity": "sha512-Sn44E5wQW4bTHXvQmvSHwqbuiXtduD6Rrjm2ZtUEGbyrig+nUH3t/QD4M4/ZXViY556TBpRgZkHLDx3JxPwxiw==", + "dev": true, + "optional": true, + "dependencies": { + "abbrev": { + "version": "1.1.0", + "bundled": true, + "dev": true, + "optional": true + }, + "ajv": { + "version": "4.11.8", + "bundled": true, + "dev": true, + "optional": true + }, + "ansi-regex": { + "version": "2.1.1", + "bundled": true, + "dev": true + }, + "aproba": { + "version": "1.1.1", + "bundled": true, + "dev": true, + "optional": true + }, + "are-we-there-yet": { + "version": "1.1.4", + "bundled": true, + "dev": true, + "optional": true + }, + "asn1": { + "version": "0.2.3", + "bundled": true, + "dev": true, + "optional": true + }, + "assert-plus": { + "version": "0.2.0", + "bundled": true, + "dev": true, + "optional": true + }, + "asynckit": { + "version": "0.4.0", + "bundled": true, + "dev": true, + "optional": true + }, + "aws-sign2": { + "version": "0.6.0", + "bundled": true, + "dev": true, + "optional": true + }, + "aws4": { + "version": "1.6.0", + "bundled": true, + "dev": true, + "optional": true + }, + "balanced-match": { + "version": "0.4.2", + "bundled": true, + "dev": true + }, + "bcrypt-pbkdf": { + "version": "1.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "block-stream": { + "version": "0.0.9", + "bundled": true, + "dev": true + }, + "boom": { + "version": "2.10.1", + "bundled": true, + "dev": true + }, + "brace-expansion": { + "version": "1.1.7", + "bundled": true, + "dev": true + }, + "buffer-shims": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "caseless": { + "version": "0.12.0", + "bundled": true, + "dev": true, + "optional": true + }, + "co": { + "version": "4.6.0", + "bundled": true, + "dev": true, + "optional": true + }, + "code-point-at": { + "version": "1.1.0", + "bundled": true, + "dev": true + }, + "combined-stream": { + "version": "1.0.5", + "bundled": true, + "dev": true + }, + "concat-map": { + "version": "0.0.1", + "bundled": true, + "dev": true + }, + "console-control-strings": { + "version": "1.1.0", + "bundled": true, + "dev": true + }, + "core-util-is": { + "version": "1.0.2", + "bundled": true, + "dev": true + }, + "cryptiles": { + "version": "2.0.5", + "bundled": true, + "dev": true, + "optional": true + }, + "dashdash": { + "version": "1.14.1", + "bundled": true, + "dev": true, + "optional": true, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "optional": true + } + } + }, + "debug": { + "version": "2.6.8", + "bundled": true, + "dev": true, + "optional": true + }, + "deep-extend": { + "version": "0.4.2", + "bundled": true, + "dev": true, + "optional": true + }, + "delayed-stream": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "delegates": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "optional": true + }, + "ecc-jsbn": { + "version": "0.1.1", + "bundled": true, + "dev": true, + "optional": true + }, + "extend": { + "version": "3.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "extsprintf": { + "version": "1.0.2", + "bundled": true, + "dev": true + }, + "forever-agent": { + "version": "0.6.1", + "bundled": true, + "dev": true, + "optional": true + }, + "form-data": { + "version": "2.1.4", + "bundled": true, + "dev": true, + "optional": true + }, + "fs.realpath": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "fstream": { + "version": "1.0.11", + "bundled": true, + "dev": true + }, + "fstream-ignore": { + "version": "1.0.5", + "bundled": true, + "dev": true, + "optional": true + }, + "gauge": { + "version": "2.7.4", + "bundled": true, + "dev": true, + "optional": true + }, + "getpass": { + "version": "0.1.7", + "bundled": true, + "dev": true, + "optional": true, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "optional": true + } + } + }, + "glob": { + "version": "7.1.2", + "bundled": true, + "dev": true + }, + "graceful-fs": { + "version": "4.1.11", + "bundled": true, + "dev": true + }, + "har-schema": { + "version": "1.0.5", + "bundled": true, + "dev": true, + "optional": true + }, + "har-validator": { + "version": "4.2.1", + "bundled": true, + "dev": true, + "optional": true + }, + "has-unicode": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "hawk": { + "version": "3.1.3", + "bundled": true, + "dev": true, + "optional": true + }, + "hoek": { + "version": "2.16.3", + "bundled": true, + "dev": true + }, + "http-signature": { + "version": "1.1.1", + "bundled": true, + "dev": true, + "optional": true + }, + "inflight": { + "version": "1.0.6", + "bundled": true, + "dev": true + }, + "inherits": { + "version": "2.0.3", + "bundled": true, + "dev": true + }, + "ini": { + "version": "1.3.4", + "bundled": true, + "dev": true, + "optional": true + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "is-typedarray": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "optional": true + }, + "isarray": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "isstream": { + "version": "0.1.2", + "bundled": true, + "dev": true, + "optional": true + }, + "jodid25519": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "optional": true + }, + "jsbn": { + "version": "0.1.1", + "bundled": true, + "dev": true, + "optional": true + }, + "json-schema": { + "version": "0.2.3", + "bundled": true, + "dev": true, + "optional": true + }, + "json-stable-stringify": { + "version": "1.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "json-stringify-safe": { + "version": "5.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "jsonify": { + "version": "0.0.0", + "bundled": true, + "dev": true, + "optional": true + }, + "jsprim": { + "version": "1.4.0", + "bundled": true, + "dev": true, + "optional": true, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "optional": true + } + } + }, + "mime-db": { + "version": "1.27.0", + "bundled": true, + "dev": true + }, + "mime-types": { + "version": "2.1.15", + "bundled": true, + "dev": true + }, + "minimatch": { + "version": "3.0.4", + "bundled": true, + "dev": true + }, + "minimist": { + "version": "0.0.8", + "bundled": true, + "dev": true + }, + "mkdirp": { + "version": "0.5.1", + "bundled": true, + "dev": true + }, + "ms": { + "version": "2.0.0", + "bundled": true, + "dev": true, + "optional": true + }, + "node-pre-gyp": { + "version": "0.6.36", + "bundled": true, + "dev": true, + "optional": true + }, + "nopt": { + "version": "4.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "npmlog": { + "version": "4.1.0", + "bundled": true, + "dev": true, + "optional": true + }, + "number-is-nan": { + "version": "1.0.1", + "bundled": true, + "dev": true + }, + "oauth-sign": { + "version": "0.8.2", + "bundled": true, + "dev": true, + "optional": true + }, + "object-assign": { + "version": "4.1.1", + "bundled": true, + "dev": true, + "optional": true + }, + "once": { + "version": "1.4.0", + "bundled": true, + "dev": true + }, + "os-homedir": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "optional": true + }, + "os-tmpdir": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "optional": true + }, + "osenv": { + "version": "0.1.4", + "bundled": true, + "dev": true, + "optional": true + }, + "path-is-absolute": { + "version": "1.0.1", + "bundled": true, + "dev": true + }, + "performance-now": { + "version": "0.2.0", + "bundled": true, + "dev": true, + "optional": true + }, + "process-nextick-args": { + "version": "1.0.7", + "bundled": true, + "dev": true + }, + "punycode": { + "version": "1.4.1", + "bundled": true, + "dev": true, + "optional": true + }, + "qs": { + "version": "6.4.0", + "bundled": true, + "dev": true, + "optional": true + }, + "rc": { + "version": "1.2.1", + "bundled": true, + "dev": true, + "optional": true, + "dependencies": { + "minimist": { + "version": "1.2.0", + "bundled": true, + "dev": true, + "optional": true + } + } + }, + "readable-stream": { + "version": "2.2.9", + "bundled": true, + "dev": true + }, + "request": { + "version": "2.81.0", + "bundled": true, + "dev": true, + "optional": true + }, + "rimraf": { + "version": "2.6.1", + "bundled": true, + "dev": true + }, + "safe-buffer": { + "version": "5.0.1", + "bundled": true, + "dev": true + }, + "semver": { + "version": "5.3.0", + "bundled": true, + "dev": true, + "optional": true + }, + "set-blocking": { + "version": "2.0.0", + "bundled": true, + "dev": true, + "optional": true + }, + "signal-exit": { + "version": "3.0.2", + "bundled": true, + "dev": true, + "optional": true + }, + "sntp": { + "version": "1.0.9", + "bundled": true, + "dev": true, + "optional": true + }, + "sshpk": { + "version": "1.13.0", + "bundled": true, + "dev": true, + "optional": true, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "optional": true + } + } + }, + "string_decoder": { + "version": "1.0.1", + "bundled": true, + "dev": true + }, + "string-width": { + "version": "1.0.2", + "bundled": true, + "dev": true + }, + "stringstream": { + "version": "0.0.5", + "bundled": true, + "dev": true, + "optional": true + }, + "strip-ansi": { + "version": "3.0.1", + "bundled": true, + "dev": true + }, + "strip-json-comments": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "tar": { + "version": "2.2.1", + "bundled": true, + "dev": true + }, + "tar-pack": { + "version": "3.4.0", + "bundled": true, + "dev": true, + "optional": true + }, + "tough-cookie": { + "version": "2.3.2", + "bundled": true, + "dev": true, + "optional": true + }, + "tunnel-agent": { + "version": "0.6.0", + "bundled": true, + "dev": true, + "optional": true + }, + "tweetnacl": { + "version": "0.14.5", + "bundled": true, + "dev": true, + "optional": true + }, + "uid-number": { + "version": "0.0.6", + "bundled": true, + "dev": true, + "optional": true + }, + "util-deprecate": { + "version": "1.0.2", + "bundled": true, + "dev": true + }, + "uuid": { + "version": "3.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "verror": { + "version": "1.3.6", + "bundled": true, + "dev": true, + "optional": true + }, + "wide-align": { + "version": "1.1.2", + "bundled": true, + "dev": true, + "optional": true + }, + "wrappy": { + "version": "1.0.2", + "bundled": true, + "dev": true + } + } + }, + "glob": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "dev": true + }, + "glob-base": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz", + "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=", + "dev": true + }, + "glob-parent": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz", + "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", + "dev": true + }, + "graceful-fs": { + "version": "4.1.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", + "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", + "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 + }, + "https-browserify": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz", + "integrity": "sha1-P5E2XKvmC3ftDruiS0VOPgnZWoI=", + "dev": true + }, + "ieee754": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz", + "integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q=", + "dev": true + }, + "indexof": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz", + "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=", + "dev": true + }, + "inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "dev": true + }, + "inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + }, + "interpret": { + "version": "0.6.6", + "resolved": "https://registry.npmjs.org/interpret/-/interpret-0.6.6.tgz", + "integrity": "sha1-/s16GOfOXKar+5U+H4YhOknxYls=", + "dev": true + }, + "is-binary-path": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", + "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", + "dev": true + }, + "is-buffer": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz", + "integrity": "sha1-Hzsm72E7IUuIy8ojzGwB2Hlh7sw=", + "dev": true + }, + "is-dotfile": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz", + "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=", + "dev": true + }, + "is-equal-shallow": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz", + "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=", + "dev": true + }, + "is-extendable": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", + "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=", + "dev": true + }, + "is-extglob": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", + "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", + "dev": true + }, + "is-glob": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", + "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "dev": true + }, + "is-number": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz", + "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=", + "dev": true + }, + "is-posix-bracket": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz", + "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=", + "dev": true + }, + "is-primitive": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz", + "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=", + "dev": true + }, + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + }, + "isobject": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", + "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", + "dev": true + }, + "json5": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz", + "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=", + "dev": true + }, + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true + }, + "lazy-cache": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", + "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=", + "dev": true + }, + "loader-utils": { + "version": "0.2.17", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz", + "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=", + "dev": true + }, + "longest": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", + "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", + "dev": true + }, + "memory-fs": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.3.0.tgz", + "integrity": "sha1-e8xrYp46Q+hx1+Kaymrop/FcuyA=" + }, + "micromatch": { + "version": "2.3.11", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", + "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", + "dev": true + }, + "mime": { + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.6.tgz", + "integrity": "sha1-WR2E02U6awtKO5343lqoEI5y5eA=" + }, + "minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "dev": true + }, + "minimist": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", + "dev": true + }, + "mkdirp": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "dev": true + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + }, + "nan": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz", + "integrity": "sha1-5P805slf37WuzAjeZZb0NgWn20U=", + "dev": true, + "optional": true + }, + "node-libs-browser": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-0.7.0.tgz", + "integrity": "sha1-PicsCBnjCJNeJmdECNevDhSRuDs=", + "dev": true, + "dependencies": { + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", + "dev": true + } + } + }, + "normalize-path": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", + "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", + "dev": true + }, + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", + "dev": true + }, + "object.omit": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz", + "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=", + "dev": true + }, + "on-finished": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", + "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=" + }, + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "dev": true + }, + "optimist": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", + "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", + "dev": true + }, + "os-browserify": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.2.1.tgz", + "integrity": "sha1-Y/xMzuXS13Y9Jrv4YBB45sLgBE8=", + "dev": true + }, + "pako": { + "version": "0.2.9", + "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz", + "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=", + "dev": true + }, + "parse-glob": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz", + "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=", + "dev": true + }, + "parseurl": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz", + "integrity": "sha1-yKuMkiO6NIiKpkopeyiFO+wY2lY=" + }, + "path-browserify": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz", + "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=", + "dev": true + }, + "path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" + }, + "pbkdf2-compat": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/pbkdf2-compat/-/pbkdf2-compat-2.0.1.tgz", + "integrity": "sha1-tuDI+plJTZTgURV1gCpZpcFC8og=", + "dev": true + }, + "preserve": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz", + "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=", + "dev": true + }, + "process": { + "version": "0.11.10", + "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", + "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=", + "dev": true + }, + "process-nextick-args": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", + "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=" + }, + "prr": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz", + "integrity": "sha1-GoS4WQgyVQFBGFPQCB7j+obikmo=" + }, + "punycode": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", + "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", + "dev": true + }, + "querystring": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", + "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=", + "dev": true + }, + "querystring-es3": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz", + "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=", + "dev": true + }, + "randomatic": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz", + "integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==", + "dev": true, + "dependencies": { + "is-number": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "dev": true, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true + } + } + }, + "kind-of": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", + "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", + "dev": true + } + } + }, + "range-parser": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz", + "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=" + }, + "readable-stream": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", + "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==" + }, + "readdirp": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz", + "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=", + "dev": true + }, + "regex-cache": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz", + "integrity": "sha1-mxpsNdTQ3871cRrmUejp09cRQUU=", + "dev": true + }, + "remove-trailing-separator": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.0.2.tgz", + "integrity": "sha1-abBi2XhyetFNxrVrpKt3L9jXBRE=", + "dev": true + }, + "repeat-element": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz", + "integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=", + "dev": true + }, + "repeat-string": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", + "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=", + "dev": true + }, + "require-from-string": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-1.2.1.tgz", + "integrity": "sha1-UpyczvJzgK3+yaL5ZbZJu+5jZBg=" + }, + "right-align": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz", + "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=", + "dev": true + }, + "rimraf": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz", + "integrity": "sha1-wjOOxkPfeht/5cVPqG9XQopV8z0=", + "dev": true + }, + "ripemd160": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-0.2.0.tgz", + "integrity": "sha1-K/GYveFnys+lHAqSjoS2i74XH84=", + "dev": true + }, + "safe-buffer": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", + "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==" + }, + "set-immediate-shim": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz", + "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=", + "dev": true + }, + "setimmediate": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", + "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=", + "dev": true + }, + "sha.js": { + "version": "2.2.6", + "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.2.6.tgz", + "integrity": "sha1-F93t3F9yL7ZlAWWIlUYZd4ZzFbo=", + "dev": true + }, + "source-list-map": { + "version": "0.1.8", + "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz", + "integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=", + "dev": true + }, + "source-map": { + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz", + "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=", + "dev": true + }, + "statuses": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz", + "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=" + }, + "stream-browserify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz", + "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=", + "dev": true + }, + "stream-http": { + "version": "2.7.2", + "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.7.2.tgz", + "integrity": "sha512-c0yTD2rbQzXtSsFSVhtpvY/vS6u066PcXOX9kBB3mSO76RiUQzL340uJkGBWnlBg4/HZzqiUXtaVA7wcRcJgEw==", + "dev": true + }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==" + }, + "supports-color": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "dev": true + }, + "tapable": { + "version": "0.1.10", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz", + "integrity": "sha1-KcNXB8K3DlDQdIK10gLo7URtr9Q=", + "dev": true + }, + "timers-browserify": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.2.tgz", + "integrity": "sha1-q0iDz1l9zVCvIRNJoA+8pWrIa4Y=", + "dev": true + }, + "to-arraybuffer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz", + "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=", + "dev": true + }, + "tty-browserify": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz", + "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=", + "dev": true + }, + "typescript": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.4.1.tgz", + "integrity": "sha1-w8yxbdqgsjFN4DHn5v7onlujRrw=", + "dev": true + }, + "uglify-js": { + "version": "2.7.5", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz", + "integrity": "sha1-RhLAx7qu4rp8SH3kkErhIgefLKg=", + "dev": true, + "dependencies": { + "async": { + "version": "0.2.10", + "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz", + "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=", + "dev": true + } + } + }, + "uglify-to-browserify": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz", + "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=", + "dev": true + }, + "unpipe": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", + "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=" + }, + "url": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", + "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=", + "dev": true, + "dependencies": { + "punycode": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", + "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=", + "dev": true + } + } + }, + "util": { + "version": "0.10.3", + "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", + "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=", + "dev": true, + "dependencies": { + "inherits": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", + "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=", + "dev": true + } + } + }, + "util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" + }, + "utils-merge": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz", + "integrity": "sha1-ApT7kiu5N1FTVBxPcJYjHyh8ivg=" + }, + "vm-browserify": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz", + "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=", + "dev": true + }, + "watchpack": { + "version": "0.2.9", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-0.2.9.tgz", + "integrity": "sha1-Yuqkq15bo1/fwBgnVibjwPXj+ws=", + "dev": true, + "dependencies": { + "async": { + "version": "0.9.2", + "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz", + "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=", + "dev": true + } + } + }, + "webpack": { + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-1.15.0.tgz", + "integrity": "sha1-T/MfU9sDM55VFkqdRo7gMklo/pg=", + "dev": true + }, + "webpack-core": { + "version": "0.6.9", + "resolved": "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.9.tgz", + "integrity": "sha1-/FcViMhVjad76e+23r3Fo7FyvcI=", + "dev": true, + "dependencies": { + "source-map": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", + "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", + "dev": true + } + } + }, + "webpack-dev-middleware": { + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-1.11.0.tgz", + "integrity": "sha1-CWkdCXOjCtH4Ksc6EuIIfwpHVPk=", + "dependencies": { + "memory-fs": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz", + "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=" + } + } + }, + "webpack-node-externals": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/webpack-node-externals/-/webpack-node-externals-1.6.0.tgz", + "integrity": "sha1-Iyxi7GCSsQBjWj0p2DwXRxKN+b0=" + }, + "window-size": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz", + "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=", + "dev": true + }, + "wordwrap": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", + "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=", + "dev": true + }, + "wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "dev": true + }, + "xtend": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", + "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=", + "dev": true + }, + "yargs": { + "version": "3.10.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", + "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", + "dev": true + } + } +} diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/package.json b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/package.json index 47b33818..d2353dfa 100644 --- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/package.json +++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/package.json @@ -1,6 +1,6 @@ { "name": "aspnet-webpack", - "version": "2.0.0", + "version": "2.0.1", "description": "Helpers for using Webpack in ASP.NET Core projects. Works in conjunction with the Microsoft.AspNetCore.SpaServices NuGet package.", "main": "index.js", "scripts": { diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/WebpackDevMiddleware.ts b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/WebpackDevMiddleware.ts index 7fba9de0..6731f978 100644 --- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/WebpackDevMiddleware.ts +++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/WebpackDevMiddleware.ts @@ -5,11 +5,11 @@ import * as fs from 'fs'; import * as path from 'path'; import * as querystring from 'querystring'; import { requireNewCopy } from './RequireNewCopy'; +import { hasSufficientPermissions } from './WebpackTestPermissions'; export type CreateDevServerResult = { Port: number, - PublicPaths: string[], - PublicPath: string // For backward compatibility with older verions of Microsoft.AspNetCore.SpaServices. Will be removed soon. + PublicPaths: string[] }; export interface CreateDevServerCallback { @@ -224,6 +224,16 @@ function beginWebpackWatcher(webpackConfig: webpack.Configuration) { export function createWebpackDevServer(callback: CreateDevServerCallback, optionsJson: string) { const options: CreateDevServerOptions = JSON.parse(optionsJson); + // See the large comment in WebpackTestPermissions.ts for details about this + if (!hasSufficientPermissions()) { + console.log('WARNING: Webpack dev middleware is not enabled because the server process does not have sufficient permissions. You should either remove the UseWebpackDevMiddleware call from your code, or to make it work, give your server process user account permission to write to your application directory and to read all ancestor-level directories.'); + callback(null, { + Port: 0, + PublicPaths: [] + }); + return; + } + // Read the webpack config's export, and normalize it into the more general 'array of configs' format let webpackConfigExport: WebpackConfigFileExport = requireNewCopy(options.webpackConfigPath); if (webpackConfigExport instanceof Function) { @@ -298,11 +308,7 @@ export function createWebpackDevServer(callback: CreateDevServerCallback, option // Tell the ASP.NET app what addresses we're listening on, so that it can proxy requests here callback(null, { Port: listener.address().port, - PublicPaths: normalizedPublicPaths, - - // For back-compatibility with older versions of Microsoft.AspNetCore.SpaServices, in the case where - // you have exactly one webpackConfigArray entry. This will be removed soon. - PublicPath: normalizedPublicPaths[0] + PublicPaths: normalizedPublicPaths }); } catch (ex) { callback(ex.stack, null); diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/WebpackTestPermissions.ts b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/WebpackTestPermissions.ts new file mode 100644 index 00000000..57476147 --- /dev/null +++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/WebpackTestPermissions.ts @@ -0,0 +1,58 @@ +import * as fs from 'fs'; +import * as path from 'path'; +const isWindows = /^win/.test(process.platform); + +// On Windows, Node (still as of v8.1.3) has an issue whereby, when locating JavaScript modules +// on disk, it walks up the directory hierarchy to the disk root, testing whether each directory +// is a symlink or not. This fails with an exception if the process doesn't have permission to +// read those directories. This is a problem when hosting in full IIS, because in typical cases +// the process does not have read permission for higher-level directories. +// +// NodeServices itself works around this by injecting a patched version of Node's 'lstat' API that +// suppresses these irrelevant errors during module loads. This covers most scenarios, but isn't +// enough to make Webpack dev middleware work, because typical Webpack configs use loaders such as +// 'awesome-typescript-loader', which works by forking a child process to do some of its work. The +// child process does not get the patched 'lstat', and hence fails. It's an especially bad failure, +// because the Webpack compiler doesn't even surface the exception - it just never completes the +// compilation process, causing the application to hang indefinitely. +// +// Additionally, Webpack dev middleware will want to write its output to disk, which is also going +// to fail in a typical IIS process, because you won't have 'write' permission to the app dir by +// default. We have to actually write the build output to disk (and not purely keep it in the in- +// memory file system) because the server-side prerendering Node instance is a separate process +// that only knows about code changes when it sees the compiled files on disk change. +// +// In the future, we'll hopefully get Node to fix its underlying issue, and figure out whether VS +// could give 'write' access to the app dir when launching sites in IIS. But until then, disable +// Webpack dev middleware if we detect the server process doesn't have the necessary permissions. + +export function hasSufficientPermissions() { + if (isWindows) { + return canReadDirectoryAndAllAncestors(process.cwd()); + } else { + return true; + } +} + +function canReadDirectoryAndAllAncestors(dir: string): boolean { + if (!canReadDirectory(dir)) { + return false; + } + + const parentDir = path.resolve(dir, '..'); + if (parentDir === dir) { + // There are no more parent directories - we've reached the disk root + return true; + } else { + return canReadDirectoryAndAllAncestors(parentDir); + } +} + +function canReadDirectory(dir: string): boolean { + try { + fs.statSync(dir); + return true; + } catch(ex) { + return false; + } +} From 7b07fb66eba9e569e5d84f7ab6153e7f12fbd033 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 12 Jul 2017 23:11:30 +0100 Subject: [PATCH 193/411] Update all templates to aspnet-webpack@2.0.1 --- templates/AngularSpa/npm-shrinkwrap.json | 6 +++--- templates/AngularSpa/package.json | 2 +- templates/AureliaSpa/npm-shrinkwrap.json | 6 +++--- templates/AureliaSpa/package.json | 2 +- templates/KnockoutSpa/npm-shrinkwrap.json | 6 +++--- templates/KnockoutSpa/package.json | 2 +- templates/ReactReduxSpa/npm-shrinkwrap.json | 6 +++--- templates/ReactReduxSpa/package.json | 2 +- templates/ReactSpa/npm-shrinkwrap.json | 6 +++--- templates/ReactSpa/package.json | 2 +- templates/VueSpa/npm-shrinkwrap.json | 6 +++--- templates/VueSpa/package.json | 2 +- 12 files changed, 24 insertions(+), 24 deletions(-) diff --git a/templates/AngularSpa/npm-shrinkwrap.json b/templates/AngularSpa/npm-shrinkwrap.json index e87dcf5b..32e317f4 100644 --- a/templates/AngularSpa/npm-shrinkwrap.json +++ b/templates/AngularSpa/npm-shrinkwrap.json @@ -279,9 +279,9 @@ "resolved": "https://registry.npmjs.org/aspnet-prerendering/-/aspnet-prerendering-3.0.1.tgz" }, "aspnet-webpack": { - "version": "2.0.0", - "from": "aspnet-webpack@2.0.0", - "resolved": "https://registry.npmjs.org/aspnet-webpack/-/aspnet-webpack-2.0.0.tgz" + "version": "2.0.1", + "from": "aspnet-webpack@2.0.1", + "resolved": "https://registry.npmjs.org/aspnet-webpack/-/aspnet-webpack-2.0.1.tgz" }, "assert": { "version": "1.4.1", diff --git a/templates/AngularSpa/package.json b/templates/AngularSpa/package.json index 65f753f0..98683212 100644 --- a/templates/AngularSpa/package.json +++ b/templates/AngularSpa/package.json @@ -21,7 +21,7 @@ "@types/node": "8.0.8", "angular2-template-loader": "0.6.2", "aspnet-prerendering": "^3.0.1", - "aspnet-webpack": "^2.0.0", + "aspnet-webpack": "^2.0.1", "awesome-typescript-loader": "3.2.1", "bootstrap": "3.3.7", "css": "2.2.1", diff --git a/templates/AureliaSpa/npm-shrinkwrap.json b/templates/AureliaSpa/npm-shrinkwrap.json index 5a52826b..898a93f9 100644 --- a/templates/AureliaSpa/npm-shrinkwrap.json +++ b/templates/AureliaSpa/npm-shrinkwrap.json @@ -113,9 +113,9 @@ "dev": true }, "aspnet-webpack": { - "version": "2.0.0", - "from": "aspnet-webpack@2.0.0", - "resolved": "https://registry.npmjs.org/aspnet-webpack/-/aspnet-webpack-2.0.0.tgz", + "version": "2.0.1", + "from": "aspnet-webpack@2.0.1", + "resolved": "https://registry.npmjs.org/aspnet-webpack/-/aspnet-webpack-2.0.1.tgz", "dev": true }, "assert": { diff --git a/templates/AureliaSpa/package.json b/templates/AureliaSpa/package.json index 7e92b5a3..29c450af 100644 --- a/templates/AureliaSpa/package.json +++ b/templates/AureliaSpa/package.json @@ -15,7 +15,7 @@ }, "devDependencies": { "@types/node": "^7.0.12", - "aspnet-webpack": "^2.0.0", + "aspnet-webpack": "^2.0.1", "aurelia-webpack-plugin": "^2.0.0-rc.2", "css-loader": "^0.28.0", "extract-text-webpack-plugin": "^2.1.0", diff --git a/templates/KnockoutSpa/npm-shrinkwrap.json b/templates/KnockoutSpa/npm-shrinkwrap.json index 75ccbab8..a87ce6c6 100644 --- a/templates/KnockoutSpa/npm-shrinkwrap.json +++ b/templates/KnockoutSpa/npm-shrinkwrap.json @@ -167,9 +167,9 @@ "dev": true }, "aspnet-webpack": { - "version": "2.0.0", - "from": "aspnet-webpack@2.0.0", - "resolved": "https://registry.npmjs.org/aspnet-webpack/-/aspnet-webpack-2.0.0.tgz", + "version": "2.0.1", + "from": "aspnet-webpack@2.0.1", + "resolved": "https://registry.npmjs.org/aspnet-webpack/-/aspnet-webpack-2.0.1.tgz", "dev": true }, "assert": { diff --git a/templates/KnockoutSpa/package.json b/templates/KnockoutSpa/package.json index 385775a6..2c54e1ad 100644 --- a/templates/KnockoutSpa/package.json +++ b/templates/KnockoutSpa/package.json @@ -12,7 +12,7 @@ "@types/react-router": "^2.0.37", "@types/requirejs": "^2.1.26", "@types/signals": "0.0.16", - "aspnet-webpack": "^2.0.0", + "aspnet-webpack": "^2.0.1", "awesome-typescript-loader": "^3.0.0", "bootstrap": "^3.3.6", "bundle-loader": "^0.5.4", diff --git a/templates/ReactReduxSpa/npm-shrinkwrap.json b/templates/ReactReduxSpa/npm-shrinkwrap.json index 5e4df914..e2132771 100644 --- a/templates/ReactReduxSpa/npm-shrinkwrap.json +++ b/templates/ReactReduxSpa/npm-shrinkwrap.json @@ -175,9 +175,9 @@ "resolved": "https://registry.npmjs.org/aspnet-prerendering/-/aspnet-prerendering-3.0.1.tgz" }, "aspnet-webpack": { - "version": "2.0.0", - "from": "aspnet-webpack@2.0.0", - "resolved": "https://registry.npmjs.org/aspnet-webpack/-/aspnet-webpack-2.0.0.tgz" + "version": "2.0.1", + "from": "aspnet-webpack@2.0.1", + "resolved": "https://registry.npmjs.org/aspnet-webpack/-/aspnet-webpack-2.0.1.tgz" }, "aspnet-webpack-react": { "version": "3.0.0", diff --git a/templates/ReactReduxSpa/package.json b/templates/ReactReduxSpa/package.json index b8c308a9..6d12441b 100644 --- a/templates/ReactReduxSpa/package.json +++ b/templates/ReactReduxSpa/package.json @@ -13,7 +13,7 @@ "@types/webpack": "2.2.15", "@types/webpack-env": "1.13.0", "aspnet-prerendering": "^3.0.1", - "aspnet-webpack": "^2.0.0", + "aspnet-webpack": "^2.0.1", "aspnet-webpack-react": "^3.0.0", "awesome-typescript-loader": "3.2.1", "bootstrap": "3.3.7", diff --git a/templates/ReactSpa/npm-shrinkwrap.json b/templates/ReactSpa/npm-shrinkwrap.json index 4069cea9..9207894c 100644 --- a/templates/ReactSpa/npm-shrinkwrap.json +++ b/templates/ReactSpa/npm-shrinkwrap.json @@ -155,9 +155,9 @@ "dev": true }, "aspnet-webpack": { - "version": "2.0.0", - "from": "aspnet-webpack@2.0.0", - "resolved": "https://registry.npmjs.org/aspnet-webpack/-/aspnet-webpack-2.0.0.tgz", + "version": "2.0.1", + "from": "aspnet-webpack@2.0.1", + "resolved": "https://registry.npmjs.org/aspnet-webpack/-/aspnet-webpack-2.0.1.tgz", "dev": true }, "aspnet-webpack-react": { diff --git a/templates/ReactSpa/package.json b/templates/ReactSpa/package.json index 913de25f..ac9de0be 100644 --- a/templates/ReactSpa/package.json +++ b/templates/ReactSpa/package.json @@ -8,7 +8,7 @@ "@types/react-dom": "15.5.1", "@types/react-router": "4.0.12", "@types/webpack-env": "1.13.0", - "aspnet-webpack": "^2.0.0", + "aspnet-webpack": "^2.0.1", "aspnet-webpack-react": "^3.0.0", "awesome-typescript-loader": "3.2.1", "bootstrap": "3.3.7", diff --git a/templates/VueSpa/npm-shrinkwrap.json b/templates/VueSpa/npm-shrinkwrap.json index ab6bf012..02788988 100644 --- a/templates/VueSpa/npm-shrinkwrap.json +++ b/templates/VueSpa/npm-shrinkwrap.json @@ -119,9 +119,9 @@ "dev": true }, "aspnet-webpack": { - "version": "2.0.0", - "from": "aspnet-webpack@2.0.0", - "resolved": "https://registry.npmjs.org/aspnet-webpack/-/aspnet-webpack-2.0.0.tgz", + "version": "2.0.1", + "from": "aspnet-webpack@2.0.1", + "resolved": "https://registry.npmjs.org/aspnet-webpack/-/aspnet-webpack-2.0.1.tgz", "dev": true }, "assert": { diff --git a/templates/VueSpa/package.json b/templates/VueSpa/package.json index eac756d3..a786d6cb 100644 --- a/templates/VueSpa/package.json +++ b/templates/VueSpa/package.json @@ -4,7 +4,7 @@ "version": "0.0.0", "devDependencies": { "@types/requirejs": "^2.1.28", - "aspnet-webpack": "^2.0.0", + "aspnet-webpack": "^2.0.1", "awesome-typescript-loader": "^3.0.0", "bootstrap": "^3.3.6", "css-loader": "^0.25.0", From 8b37dc8561d7ac1eae345b1a7a27bb86f64bc425 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 12 Jul 2017 23:17:22 +0100 Subject: [PATCH 194/411] Update to ASP.NET Core 2.0.0-rtm-26272 --- templates/AngularSpa/AngularSpa.csproj | 12 ++++++------ templates/AureliaSpa/AureliaSpa.csproj | 12 ++++++------ templates/KnockoutSpa/KnockoutSpa.csproj | 12 ++++++------ templates/ReactReduxSpa/ReactReduxSpa.csproj | 12 ++++++------ templates/ReactSpa/ReactSpa.csproj | 12 ++++++------ templates/VueSpa/VueSpa.csproj | 12 ++++++------ 6 files changed, 36 insertions(+), 36 deletions(-) diff --git a/templates/AngularSpa/AngularSpa.csproj b/templates/AngularSpa/AngularSpa.csproj index eaac51b5..f6340d1d 100644 --- a/templates/AngularSpa/AngularSpa.csproj +++ b/templates/AngularSpa/AngularSpa.csproj @@ -9,17 +9,17 @@ - + - - - - + + + + - + diff --git a/templates/AureliaSpa/AureliaSpa.csproj b/templates/AureliaSpa/AureliaSpa.csproj index 2574bb16..21015a44 100644 --- a/templates/AureliaSpa/AureliaSpa.csproj +++ b/templates/AureliaSpa/AureliaSpa.csproj @@ -9,17 +9,17 @@ - + - - - - + + + + - + diff --git a/templates/KnockoutSpa/KnockoutSpa.csproj b/templates/KnockoutSpa/KnockoutSpa.csproj index 2574bb16..21015a44 100644 --- a/templates/KnockoutSpa/KnockoutSpa.csproj +++ b/templates/KnockoutSpa/KnockoutSpa.csproj @@ -9,17 +9,17 @@ - + - - - - + + + + - + diff --git a/templates/ReactReduxSpa/ReactReduxSpa.csproj b/templates/ReactReduxSpa/ReactReduxSpa.csproj index eaac51b5..f6340d1d 100644 --- a/templates/ReactReduxSpa/ReactReduxSpa.csproj +++ b/templates/ReactReduxSpa/ReactReduxSpa.csproj @@ -9,17 +9,17 @@ - + - - - - + + + + - + diff --git a/templates/ReactSpa/ReactSpa.csproj b/templates/ReactSpa/ReactSpa.csproj index 2574bb16..21015a44 100644 --- a/templates/ReactSpa/ReactSpa.csproj +++ b/templates/ReactSpa/ReactSpa.csproj @@ -9,17 +9,17 @@ - + - - - - + + + + - + diff --git a/templates/VueSpa/VueSpa.csproj b/templates/VueSpa/VueSpa.csproj index 2574bb16..21015a44 100644 --- a/templates/VueSpa/VueSpa.csproj +++ b/templates/VueSpa/VueSpa.csproj @@ -9,17 +9,17 @@ - + - - - - + + + + - + From b8c006a3e98763be08b4841e46eb4df8b0d7c1c9 Mon Sep 17 00:00:00 2001 From: Stephan Troyer Date: Thu, 13 Jul 2017 00:08:42 +0200 Subject: [PATCH 195/411] Update templates to support TypeScript 'strict' mode --- templates/AngularSpa/ClientApp/boot.browser.ts | 8 ++++---- templates/AngularSpa/ClientApp/boot.server.ts | 4 ++-- templates/AngularSpa/npm-shrinkwrap.json | 8 ++++---- templates/AngularSpa/package.json | 2 +- templates/AngularSpa/tsconfig.json | 2 +- templates/AureliaSpa/npm-shrinkwrap.json | 8 ++++---- templates/AureliaSpa/package.json | 2 +- templates/AureliaSpa/tsconfig.json | 2 +- templates/KnockoutSpa/ClientApp/boot.ts | 7 +++---- templates/KnockoutSpa/ClientApp/router.ts | 2 +- .../ClientApp/webpack-component-loader.ts | 6 +++--- templates/KnockoutSpa/npm-shrinkwrap.json | 12 ++++++------ templates/KnockoutSpa/package.json | 8 ++++---- templates/KnockoutSpa/tsconfig.json | 2 +- templates/ReactReduxSpa/ClientApp/boot-client.tsx | 2 +- .../ReactReduxSpa/ClientApp/components/FetchData.tsx | 6 +++--- templates/ReactReduxSpa/ClientApp/configureStore.ts | 6 +++--- .../ClientApp/store/WeatherForecasts.ts | 10 +++++----- templates/ReactReduxSpa/ClientApp/store/index.ts | 4 ++-- templates/ReactReduxSpa/npm-shrinkwrap.json | 5 +++++ templates/ReactReduxSpa/package.json | 1 + templates/ReactSpa/ClientApp/boot.tsx | 2 +- templates/ReactSpa/npm-shrinkwrap.json | 12 ++++++++++++ templates/ReactSpa/package.json | 2 ++ templates/VueSpa/npm-shrinkwrap.json | 8 ++++---- templates/VueSpa/package.json | 2 +- templates/VueSpa/tsconfig.json | 2 +- 27 files changed, 77 insertions(+), 58 deletions(-) diff --git a/templates/AngularSpa/ClientApp/boot.browser.ts b/templates/AngularSpa/ClientApp/boot.browser.ts index e1311bdb..f9c0ba2b 100644 --- a/templates/AngularSpa/ClientApp/boot.browser.ts +++ b/templates/AngularSpa/ClientApp/boot.browser.ts @@ -5,13 +5,13 @@ import { enableProdMode } from '@angular/core'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; import { AppModule } from './app/app.module.browser'; -if (module['hot']) { - module['hot'].accept(); - module['hot'].dispose(() => { +if (module.hot) { + module.hot.accept(); + module.hot.dispose(() => { // Before restarting the app, we create a new root element and dispose the old one const oldRootElem = document.querySelector('app'); const newRootElem = document.createElement('app'); - oldRootElem.parentNode.insertBefore(newRootElem, oldRootElem); + oldRootElem!.parentNode!.insertBefore(newRootElem, oldRootElem); modulePromise.then(appModule => appModule.destroy()); }); } else { diff --git a/templates/AngularSpa/ClientApp/boot.server.ts b/templates/AngularSpa/ClientApp/boot.server.ts index 851e1379..00460e93 100644 --- a/templates/AngularSpa/ClientApp/boot.server.ts +++ b/templates/AngularSpa/ClientApp/boot.server.ts @@ -17,12 +17,12 @@ export default createServerRenderer(params => { ]; return platformDynamicServer(providers).bootstrapModule(AppModule).then(moduleRef => { - const appRef = moduleRef.injector.get(ApplicationRef); + const appRef: ApplicationRef = moduleRef.injector.get(ApplicationRef); const state = moduleRef.injector.get(PlatformState); const zone = moduleRef.injector.get(NgZone); return new Promise((resolve, reject) => { - zone.onError.subscribe(errorInfo => reject(errorInfo)); + zone.onError.subscribe((errorInfo: any) => reject(errorInfo)); appRef.isStable.first(isStable => isStable).subscribe(() => { // Because 'onStable' fires before 'onError', we have to delay slightly before // completing the request in case there's an error to report diff --git a/templates/AngularSpa/npm-shrinkwrap.json b/templates/AngularSpa/npm-shrinkwrap.json index 32e317f4..c79f8e79 100644 --- a/templates/AngularSpa/npm-shrinkwrap.json +++ b/templates/AngularSpa/npm-shrinkwrap.json @@ -93,10 +93,10 @@ "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-2.5.53.tgz", "dev": true }, - "@types/node": { - "version": "8.0.8", - "from": "@types/node@8.0.8", - "resolved": "https://registry.npmjs.org/@types/node/-/node-8.0.8.tgz" + "@types/webpack-env": { + "version": "1.13.0", + "from": "@types/webpack-env@1.13.0", + "resolved": "https://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.13.0.tgz" }, "accepts": { "version": "1.3.3", diff --git a/templates/AngularSpa/package.json b/templates/AngularSpa/package.json index 98683212..4d1b203d 100644 --- a/templates/AngularSpa/package.json +++ b/templates/AngularSpa/package.json @@ -18,7 +18,7 @@ "@angular/platform-server": "4.2.5", "@angular/router": "4.2.5", "@ngtools/webpack": "1.5.0", - "@types/node": "8.0.8", + "@types/webpack-env": "1.13.0", "angular2-template-loader": "0.6.2", "aspnet-prerendering": "^3.0.1", "aspnet-webpack": "^2.0.1", diff --git a/templates/AngularSpa/tsconfig.json b/templates/AngularSpa/tsconfig.json index 94b22fce..939be481 100644 --- a/templates/AngularSpa/tsconfig.json +++ b/templates/AngularSpa/tsconfig.json @@ -7,7 +7,7 @@ "emitDecoratorMetadata": true, "skipDefaultLibCheck": true, "lib": [ "es6", "dom" ], - "types": [ "node" ] + "types": [ "webpack-env" ] }, "exclude": [ "bin", "node_modules" ], "atom": { "rewriteTsconfig": false } diff --git a/templates/AureliaSpa/npm-shrinkwrap.json b/templates/AureliaSpa/npm-shrinkwrap.json index 898a93f9..2a1e3648 100644 --- a/templates/AureliaSpa/npm-shrinkwrap.json +++ b/templates/AureliaSpa/npm-shrinkwrap.json @@ -2,10 +2,10 @@ "name": "WebApplicationBasic", "version": "0.0.0", "dependencies": { - "@types/node": { - "version": "7.0.32", - "from": "@types/node@>=7.0.12 <8.0.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.32.tgz", + "@types/webpack-env": { + "version": "1.13.0", + "from": "@types/webpack-env@>=1.13.0 <2.0.0", + "resolved": "https://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.13.0.tgz", "dev": true }, "acorn": { diff --git a/templates/AureliaSpa/package.json b/templates/AureliaSpa/package.json index 29c450af..1a5045ce 100644 --- a/templates/AureliaSpa/package.json +++ b/templates/AureliaSpa/package.json @@ -14,7 +14,7 @@ "jquery": "^3.2.1" }, "devDependencies": { - "@types/node": "^7.0.12", + "@types/webpack-env": "^1.13.0", "aspnet-webpack": "^2.0.1", "aurelia-webpack-plugin": "^2.0.0-rc.2", "css-loader": "^0.28.0", diff --git a/templates/AureliaSpa/tsconfig.json b/templates/AureliaSpa/tsconfig.json index 9ee62866..b60045f7 100644 --- a/templates/AureliaSpa/tsconfig.json +++ b/templates/AureliaSpa/tsconfig.json @@ -7,7 +7,7 @@ "emitDecoratorMetadata": true, "skipDefaultLibCheck": true, "lib": [ "es2015", "dom" ], - "types": [ "node" ] + "types": [ "webpack-env" ] }, "exclude": [ "bin", "node_modules" ], "atom": { "rewriteTsconfig": false } diff --git a/templates/KnockoutSpa/ClientApp/boot.ts b/templates/KnockoutSpa/ClientApp/boot.ts index b8da1ddd..5edafc02 100644 --- a/templates/KnockoutSpa/ClientApp/boot.ts +++ b/templates/KnockoutSpa/ClientApp/boot.ts @@ -3,19 +3,18 @@ import 'bootstrap'; import * as ko from 'knockout'; import './webpack-component-loader'; import AppRootComponent from './components/app-root/app-root'; -const createHistory = require('history').createBrowserHistory; -const baseUrl = document.getElementsByTagName('base')[0].getAttribute('href'); +import { createBrowserHistory } from 'history'; +const baseUrl = document.getElementsByTagName('base')[0].getAttribute('href')!; const basename = baseUrl.substring(0, baseUrl.length - 1); // History component needs no trailing slash // Load and register the component ko.components.register('app-root', AppRootComponent); // Tell Knockout to start up an instance of your application -ko.applyBindings({ history: createHistory({ basename }), basename }); +ko.applyBindings({ history: createBrowserHistory({ basename }), basename }); // Basic hot reloading support. Automatically reloads and restarts the Knockout app each time // you modify source files. This will not preserve any application state other than the URL. -declare var module: any; if (module.hot) { module.hot.accept(); module.hot.dispose(() => ko.cleanNode(document.body)); diff --git a/templates/KnockoutSpa/ClientApp/router.ts b/templates/KnockoutSpa/ClientApp/router.ts index 5045487c..ca354650 100644 --- a/templates/KnockoutSpa/ClientApp/router.ts +++ b/templates/KnockoutSpa/ClientApp/router.ts @@ -22,7 +22,7 @@ export class Router { crossroads.resetState(); crossroads.normalizeFn = crossroads.NORM_AS_OBJECT; routes.forEach(route => { - crossroads.addRoute(route.url, (requestParams) => { + crossroads.addRoute(route.url, (requestParams: any) => { this.currentRoute(ko.utils.extend(requestParams, route.params)); }); }); diff --git a/templates/KnockoutSpa/ClientApp/webpack-component-loader.ts b/templates/KnockoutSpa/ClientApp/webpack-component-loader.ts index d429bbb5..823ab546 100644 --- a/templates/KnockoutSpa/ClientApp/webpack-component-loader.ts +++ b/templates/KnockoutSpa/ClientApp/webpack-component-loader.ts @@ -8,18 +8,18 @@ ko.components.loaders.unshift({ loadComponent: (name, componentConfig, callback) => { if (typeof componentConfig === 'function') { // It's a lazy-loaded Webpack bundle - (componentConfig as any)(loadedModule => { + (componentConfig as any)((loadedModule: any) => { // Handle TypeScript-style default exports if (loadedModule.__esModule && loadedModule.default) { loadedModule = loadedModule.default; } // Pass the loaded module to KO's default loader - ko.components.defaultLoader.loadComponent(name, loadedModule, callback); + ko.components.defaultLoader.loadComponent!(name, loadedModule as KnockoutComponentTypes.ComponentConfig, callback); }); } else { // It's something else - let another component loader handle it - callback(null); + callback((null as any) as KnockoutComponentTypes.Definition); // workaround until https://github.com/DefinitelyTyped/DefinitelyTyped/pull/17999 } } }); diff --git a/templates/KnockoutSpa/npm-shrinkwrap.json b/templates/KnockoutSpa/npm-shrinkwrap.json index a87ce6c6..1c2e723f 100644 --- a/templates/KnockoutSpa/npm-shrinkwrap.json +++ b/templates/KnockoutSpa/npm-shrinkwrap.json @@ -50,18 +50,18 @@ "resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-2.0.50.tgz", "dev": true }, - "@types/requirejs": { - "version": "2.1.29", - "from": "@types/requirejs@>=2.1.26 <3.0.0", - "resolved": "https://registry.npmjs.org/@types/requirejs/-/requirejs-2.1.29.tgz", - "dev": true - }, "@types/signals": { "version": "0.0.16", "from": "@types/signals@0.0.16", "resolved": "https://registry.npmjs.org/@types/signals/-/signals-0.0.16.tgz", "dev": true }, + "@types/webpack-env": { + "version": "1.13.0", + "from": "@types/webpack-env@>=1.13.0 <2.0.0", + "resolved": "https://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.13.0.tgz", + "dev": true + }, "acorn": { "version": "5.0.3", "from": "acorn@>=5.0.0 <6.0.0", diff --git a/templates/KnockoutSpa/package.json b/templates/KnockoutSpa/package.json index 2c54e1ad..89434654 100644 --- a/templates/KnockoutSpa/package.json +++ b/templates/KnockoutSpa/package.json @@ -6,12 +6,12 @@ "@types/core-js": "^0.9.34", "@types/crossroads": "0.0.29", "@types/es6-promise": "0.0.32", - "@types/history": "^2.0.38", + "@types/history": "^4.6.0", "@types/jquery": "^2.0.32", - "@types/knockout": "^3.4.35", + "@types/knockout": "^3.4.41", "@types/react-router": "^2.0.37", - "@types/requirejs": "^2.1.26", "@types/signals": "0.0.16", + "@types/webpack-env": "^1.13.0", "aspnet-webpack": "^2.0.1", "awesome-typescript-loader": "^3.0.0", "bootstrap": "^3.3.6", @@ -21,7 +21,7 @@ "event-source-polyfill": "^0.0.7", "extract-text-webpack-plugin": "^2.0.0-rc", "file-loader": "^0.9.0", - "history": "^4.3.0", + "history": "^4.6.3", "isomorphic-fetch": "^2.2.1", "jquery": "^2.2.1", "json-loader": "^0.5.4", diff --git a/templates/KnockoutSpa/tsconfig.json b/templates/KnockoutSpa/tsconfig.json index 7022bac1..7f4f8df4 100644 --- a/templates/KnockoutSpa/tsconfig.json +++ b/templates/KnockoutSpa/tsconfig.json @@ -4,7 +4,7 @@ "target": "es5", "sourceMap": true, "skipDefaultLibCheck": true, - "types": ["es6-promise", "history", "requirejs"] + "types": ["es6-promise", "webpack-env"] }, "exclude": [ "bin", diff --git a/templates/ReactReduxSpa/ClientApp/boot-client.tsx b/templates/ReactReduxSpa/ClientApp/boot-client.tsx index 188729eb..cc4ce3e9 100644 --- a/templates/ReactReduxSpa/ClientApp/boot-client.tsx +++ b/templates/ReactReduxSpa/ClientApp/boot-client.tsx @@ -12,7 +12,7 @@ import * as RoutesModule from './routes'; let routes = RoutesModule.routes; // Create browser history to use in the Redux store -const baseUrl = document.getElementsByTagName('base')[0].getAttribute('href'); +const baseUrl = document.getElementsByTagName('base')[0].getAttribute('href')!; const history = createBrowserHistory({ basename: baseUrl }); // Get the application-wide store instance, prepopulating with state from the server where available. diff --git a/templates/ReactReduxSpa/ClientApp/components/FetchData.tsx b/templates/ReactReduxSpa/ClientApp/components/FetchData.tsx index dd8a7f44..a2a1bdf9 100644 --- a/templates/ReactReduxSpa/ClientApp/components/FetchData.tsx +++ b/templates/ReactReduxSpa/ClientApp/components/FetchData.tsx @@ -8,7 +8,7 @@ import * as WeatherForecastsState from '../store/WeatherForecasts'; type WeatherForecastProps = WeatherForecastsState.WeatherForecastsState // ... state we've requested from the Redux store & typeof WeatherForecastsState.actionCreators // ... plus action creators we've requested - & RouteComponentProps<{ startDateIndex: string }>; // ... plus incoming routing parameters + & RouteComponentProps<{ startDateIndex: string }>; // ... plus incoming routing parameters class FetchData extends React.Component { componentWillMount() { @@ -56,8 +56,8 @@ class FetchData extends React.Component { } private renderPagination() { - let prevStartDateIndex = this.props.startDateIndex - 5; - let nextStartDateIndex = this.props.startDateIndex + 5; + let prevStartDateIndex = (this.props.startDateIndex || 0) - 5; + let nextStartDateIndex = (this.props.startDateIndex || 0) + 5; return

      Previous diff --git a/templates/ReactReduxSpa/ClientApp/configureStore.ts b/templates/ReactReduxSpa/ClientApp/configureStore.ts index 65ff9060..79c22aba 100644 --- a/templates/ReactReduxSpa/ClientApp/configureStore.ts +++ b/templates/ReactReduxSpa/ClientApp/configureStore.ts @@ -1,4 +1,4 @@ -import { createStore, applyMiddleware, compose, combineReducers, GenericStoreEnhancer, Store } from 'redux'; +import { createStore, applyMiddleware, compose, combineReducers, GenericStoreEnhancer, Store, StoreEnhancerStoreCreator, ReducersMapObject } from 'redux'; import thunk from 'redux-thunk'; import { routerReducer, routerMiddleware } from 'react-router-redux'; import * as StoreModule from './store'; @@ -12,7 +12,7 @@ export default function configureStore(history: History, initialState?: Applicat const devToolsExtension = windowIfDefined && windowIfDefined.devToolsExtension as () => GenericStoreEnhancer; const createStoreWithMiddleware = compose( applyMiddleware(thunk, routerMiddleware(history)), - devToolsExtension ? devToolsExtension() : f => f + devToolsExtension ? devToolsExtension() : (next: StoreEnhancerStoreCreator) => next )(createStore); // Combine all reducers and instantiate the app-wide store instance @@ -30,6 +30,6 @@ export default function configureStore(history: History, initialState?: Applicat return store; } -function buildRootReducer(allReducers) { +function buildRootReducer(allReducers: ReducersMapObject) { return combineReducers(Object.assign({}, allReducers, { routing: routerReducer })); } diff --git a/templates/ReactReduxSpa/ClientApp/store/WeatherForecasts.ts b/templates/ReactReduxSpa/ClientApp/store/WeatherForecasts.ts index e7960b15..6af905c1 100644 --- a/templates/ReactReduxSpa/ClientApp/store/WeatherForecasts.ts +++ b/templates/ReactReduxSpa/ClientApp/store/WeatherForecasts.ts @@ -7,7 +7,7 @@ import { AppThunkAction } from './'; export interface WeatherForecastsState { isLoading: boolean; - startDateIndex: number; + startDateIndex?: number; forecasts: WeatherForecast[]; } @@ -23,14 +23,14 @@ export interface WeatherForecast { // They do not themselves have any side-effects; they just describe something that is going to happen. interface RequestWeatherForecastsAction { - type: 'REQUEST_WEATHER_FORECASTS', + type: 'REQUEST_WEATHER_FORECASTS'; startDateIndex: number; } interface ReceiveWeatherForecastsAction { - type: 'RECEIVE_WEATHER_FORECASTS', + type: 'RECEIVE_WEATHER_FORECASTS'; startDateIndex: number; - forecasts: WeatherForecast[] + forecasts: WeatherForecast[]; } // Declare a 'discriminated union' type. This guarantees that all references to 'type' properties contain one of the @@ -60,7 +60,7 @@ export const actionCreators = { // ---------------- // REDUCER - For a given state and action, returns the new state. To support time travel, this must not mutate the old state. -const unloadedState: WeatherForecastsState = { startDateIndex: null, forecasts: [], isLoading: false }; +const unloadedState: WeatherForecastsState = { startDateIndex: undefined, forecasts: [], isLoading: false }; export const reducer: Reducer = (state: WeatherForecastsState, incomingAction: Action) => { const action = incomingAction as KnownAction; diff --git a/templates/ReactReduxSpa/ClientApp/store/index.ts b/templates/ReactReduxSpa/ClientApp/store/index.ts index 9016cbbb..0b5b3c12 100644 --- a/templates/ReactReduxSpa/ClientApp/store/index.ts +++ b/templates/ReactReduxSpa/ClientApp/store/index.ts @@ -3,8 +3,8 @@ import * as Counter from './Counter'; // The top-level state object export interface ApplicationState { - counter: Counter.CounterState, - weatherForecasts: WeatherForecasts.WeatherForecastsState + counter: Counter.CounterState; + weatherForecasts: WeatherForecasts.WeatherForecastsState; } // Whenever an action is dispatched, Redux will update each top-level application state property using diff --git a/templates/ReactReduxSpa/npm-shrinkwrap.json b/templates/ReactReduxSpa/npm-shrinkwrap.json index e2132771..4da356cf 100644 --- a/templates/ReactReduxSpa/npm-shrinkwrap.json +++ b/templates/ReactReduxSpa/npm-shrinkwrap.json @@ -22,6 +22,11 @@ "from": "@types/react-dom@15.5.1", "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-15.5.1.tgz" }, + "@types/react-hot-loader": { + "version": "3.0.3", + "from": "@types/react-hot-loader@3.0.3", + "resolved": "https://registry.npmjs.org/@types/react-hot-loader/-/react-hot-loader-3.0.3.tgz" + }, "@types/react-redux": { "version": "4.4.45", "from": "@types/react-redux@4.4.45", diff --git a/templates/ReactReduxSpa/package.json b/templates/ReactReduxSpa/package.json index 6d12441b..cf2a4a36 100644 --- a/templates/ReactReduxSpa/package.json +++ b/templates/ReactReduxSpa/package.json @@ -6,6 +6,7 @@ "@types/history": "4.6.0", "@types/react": "15.0.35", "@types/react-dom": "15.5.1", + "@types/react-hot-loader": "3.0.3", "@types/react-redux": "4.4.45", "@types/react-router": "4.0.12", "@types/react-router-dom": "4.0.5", diff --git a/templates/ReactSpa/ClientApp/boot.tsx b/templates/ReactSpa/ClientApp/boot.tsx index a97ee68f..f1081ffb 100644 --- a/templates/ReactSpa/ClientApp/boot.tsx +++ b/templates/ReactSpa/ClientApp/boot.tsx @@ -10,7 +10,7 @@ let routes = RoutesModule.routes; function renderApp() { // This code starts up the React app when it runs in a browser. It sets up the routing // configuration and injects the app into a DOM element. - const baseUrl = document.getElementsByTagName('base')[0].getAttribute('href'); + const baseUrl = document.getElementsByTagName('base')[0].getAttribute('href')!; ReactDOM.render( diff --git a/templates/ReactSpa/npm-shrinkwrap.json b/templates/ReactSpa/npm-shrinkwrap.json index 9207894c..3df0b409 100644 --- a/templates/ReactSpa/npm-shrinkwrap.json +++ b/templates/ReactSpa/npm-shrinkwrap.json @@ -20,12 +20,24 @@ "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-15.5.1.tgz", "dev": true }, + "@types/react-hot-loader": { + "version": "3.0.3", + "from": "@types/react-hot-loader@3.0.3", + "resolved": "https://registry.npmjs.org/@types/react-hot-loader/-/react-hot-loader-3.0.3.tgz", + "dev": true + }, "@types/react-router": { "version": "4.0.12", "from": "@types/react-router@4.0.12", "resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-4.0.12.tgz", "dev": true }, + "@types/react-router-dom": { + "version": "4.0.5", + "from": "@types/react-router-dom@4.0.5", + "resolved": "https://registry.npmjs.org/@types/react-router-dom/-/react-router-dom-4.0.5.tgz", + "dev": true + }, "@types/webpack-env": { "version": "1.13.0", "from": "@types/webpack-env@1.13.0", diff --git a/templates/ReactSpa/package.json b/templates/ReactSpa/package.json index ac9de0be..5431d17d 100644 --- a/templates/ReactSpa/package.json +++ b/templates/ReactSpa/package.json @@ -6,7 +6,9 @@ "@types/history": "4.6.0", "@types/react": "15.0.35", "@types/react-dom": "15.5.1", + "@types/react-hot-loader": "3.0.3", "@types/react-router": "4.0.12", + "@types/react-router-dom": "4.0.5", "@types/webpack-env": "1.13.0", "aspnet-webpack": "^2.0.1", "aspnet-webpack-react": "^3.0.0", diff --git a/templates/VueSpa/npm-shrinkwrap.json b/templates/VueSpa/npm-shrinkwrap.json index 02788988..2ca94caf 100644 --- a/templates/VueSpa/npm-shrinkwrap.json +++ b/templates/VueSpa/npm-shrinkwrap.json @@ -2,10 +2,10 @@ "name": "WebApplicationBasic", "version": "0.0.0", "dependencies": { - "@types/requirejs": { - "version": "2.1.29", - "from": "@types/requirejs@>=2.1.28 <3.0.0", - "resolved": "https://registry.npmjs.org/@types/requirejs/-/requirejs-2.1.29.tgz", + "@types/webpack-env": { + "version": "1.13.0", + "from": "@types/webpack-env@>=1.13.0 <2.0.0", + "resolved": "https://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.13.0.tgz", "dev": true }, "abbrev": { diff --git a/templates/VueSpa/package.json b/templates/VueSpa/package.json index a786d6cb..58d76cc4 100644 --- a/templates/VueSpa/package.json +++ b/templates/VueSpa/package.json @@ -3,7 +3,7 @@ "private": true, "version": "0.0.0", "devDependencies": { - "@types/requirejs": "^2.1.28", + "@types/webpack-env": "^1.13.0", "aspnet-webpack": "^2.0.1", "awesome-typescript-loader": "^3.0.0", "bootstrap": "^3.3.6", diff --git a/templates/VueSpa/tsconfig.json b/templates/VueSpa/tsconfig.json index fb41fd37..04827d07 100644 --- a/templates/VueSpa/tsconfig.json +++ b/templates/VueSpa/tsconfig.json @@ -7,7 +7,7 @@ "target": "es5", "sourceMap": true, "skipDefaultLibCheck": true, - "types": ["requirejs"] + "types": ["webpack-env"] }, "exclude": [ "bin", From 9528dd7432b427e55b820a259e98fa42ca5b68d4 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 13 Jul 2017 10:11:59 +0100 Subject: [PATCH 196/411] Enable TS strict mode in all templates and generally clean up TS references --- templates/AngularSpa/tsconfig.json | 3 +++ templates/AureliaSpa/tsconfig.json | 2 ++ templates/KnockoutSpa/ClientApp/boot.ts | 2 +- templates/KnockoutSpa/ClientApp/router.ts | 4 ++-- templates/KnockoutSpa/npm-shrinkwrap.json | 18 +++--------------- templates/KnockoutSpa/package.json | 1 - templates/KnockoutSpa/tsconfig.json | 2 ++ .../ClientApp/store/WeatherForecasts.ts | 2 +- templates/ReactReduxSpa/tsconfig.json | 11 +++-------- .../ReactSpa/ClientApp/components/Counter.tsx | 3 ++- .../ClientApp/components/FetchData.tsx | 3 ++- .../ReactSpa/ClientApp/components/Home.tsx | 3 ++- templates/ReactSpa/tsconfig.json | 10 +++------- templates/VueSpa/tsconfig.json | 1 + 14 files changed, 27 insertions(+), 38 deletions(-) diff --git a/templates/AngularSpa/tsconfig.json b/templates/AngularSpa/tsconfig.json index 939be481..4a6a3716 100644 --- a/templates/AngularSpa/tsconfig.json +++ b/templates/AngularSpa/tsconfig.json @@ -1,11 +1,14 @@ { "compilerOptions": { + "module": "es2015", "moduleResolution": "node", "target": "es5", "sourceMap": true, "experimentalDecorators": true, "emitDecoratorMetadata": true, "skipDefaultLibCheck": true, + "skipLibCheck": true, // Workaround for https://github.com/angular/angular/issues/17863. Remove this if you upgrade to a fixed version of Angular. + "strict": true, "lib": [ "es6", "dom" ], "types": [ "webpack-env" ] }, diff --git a/templates/AureliaSpa/tsconfig.json b/templates/AureliaSpa/tsconfig.json index b60045f7..bcbfa21c 100644 --- a/templates/AureliaSpa/tsconfig.json +++ b/templates/AureliaSpa/tsconfig.json @@ -1,11 +1,13 @@ { "compilerOptions": { + "module": "es2015", "moduleResolution": "node", "target": "es5", "sourceMap": true, "experimentalDecorators": true, "emitDecoratorMetadata": true, "skipDefaultLibCheck": true, + "strict": true, "lib": [ "es2015", "dom" ], "types": [ "webpack-env" ] }, diff --git a/templates/KnockoutSpa/ClientApp/boot.ts b/templates/KnockoutSpa/ClientApp/boot.ts index 5edafc02..833ec8e2 100644 --- a/templates/KnockoutSpa/ClientApp/boot.ts +++ b/templates/KnockoutSpa/ClientApp/boot.ts @@ -1,9 +1,9 @@ import './css/site.css'; import 'bootstrap'; import * as ko from 'knockout'; +import { createBrowserHistory } from 'history'; import './webpack-component-loader'; import AppRootComponent from './components/app-root/app-root'; -import { createBrowserHistory } from 'history'; const baseUrl = document.getElementsByTagName('base')[0].getAttribute('href')!; const basename = baseUrl.substring(0, baseUrl.length - 1); // History component needs no trailing slash diff --git a/templates/KnockoutSpa/ClientApp/router.ts b/templates/KnockoutSpa/ClientApp/router.ts index ca354650..61317504 100644 --- a/templates/KnockoutSpa/ClientApp/router.ts +++ b/templates/KnockoutSpa/ClientApp/router.ts @@ -1,7 +1,7 @@ import * as ko from 'knockout'; import * as $ from 'jquery'; import * as History from 'history'; -import crossroads = require('crossroads'); +import * as crossroads from 'crossroads'; // This module configures crossroads.js, a routing library. If you prefer, you // can use any other routing library (or none at all) as Knockout is designed to @@ -20,7 +20,7 @@ export class Router { // Reset and configure Crossroads so it matches routes and updates this.currentRoute crossroads.removeAllRoutes(); crossroads.resetState(); - crossroads.normalizeFn = crossroads.NORM_AS_OBJECT; + (crossroads as any).normalizeFn = crossroads.NORM_AS_OBJECT; routes.forEach(route => { crossroads.addRoute(route.url, (requestParams: any) => { this.currentRoute(ko.utils.extend(requestParams, route.params)); diff --git a/templates/KnockoutSpa/npm-shrinkwrap.json b/templates/KnockoutSpa/npm-shrinkwrap.json index 1c2e723f..290db883 100644 --- a/templates/KnockoutSpa/npm-shrinkwrap.json +++ b/templates/KnockoutSpa/npm-shrinkwrap.json @@ -21,9 +21,9 @@ "dev": true }, "@types/history": { - "version": "2.0.48", - "from": "@types/history@>=2.0.38 <3.0.0", - "resolved": "https://registry.npmjs.org/@types/history/-/history-2.0.48.tgz", + "version": "4.6.0", + "from": "@types/history@4.6.0", + "resolved": "https://registry.npmjs.org/@types/history/-/history-4.6.0.tgz", "dev": true }, "@types/jquery": { @@ -38,18 +38,6 @@ "resolved": "https://registry.npmjs.org/@types/knockout/-/knockout-3.4.41.tgz", "dev": true }, - "@types/react": { - "version": "15.0.31", - "from": "@types/react@*", - "resolved": "https://registry.npmjs.org/@types/react/-/react-15.0.31.tgz", - "dev": true - }, - "@types/react-router": { - "version": "2.0.50", - "from": "@types/react-router@>=2.0.37 <3.0.0", - "resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-2.0.50.tgz", - "dev": true - }, "@types/signals": { "version": "0.0.16", "from": "@types/signals@0.0.16", diff --git a/templates/KnockoutSpa/package.json b/templates/KnockoutSpa/package.json index 89434654..64f132d4 100644 --- a/templates/KnockoutSpa/package.json +++ b/templates/KnockoutSpa/package.json @@ -9,7 +9,6 @@ "@types/history": "^4.6.0", "@types/jquery": "^2.0.32", "@types/knockout": "^3.4.41", - "@types/react-router": "^2.0.37", "@types/signals": "0.0.16", "@types/webpack-env": "^1.13.0", "aspnet-webpack": "^2.0.1", diff --git a/templates/KnockoutSpa/tsconfig.json b/templates/KnockoutSpa/tsconfig.json index 7f4f8df4..78973bd6 100644 --- a/templates/KnockoutSpa/tsconfig.json +++ b/templates/KnockoutSpa/tsconfig.json @@ -1,9 +1,11 @@ { "compilerOptions": { + "module": "es2015", "moduleResolution": "node", "target": "es5", "sourceMap": true, "skipDefaultLibCheck": true, + "strict": true, "types": ["es6-promise", "webpack-env"] }, "exclude": [ diff --git a/templates/ReactReduxSpa/ClientApp/store/WeatherForecasts.ts b/templates/ReactReduxSpa/ClientApp/store/WeatherForecasts.ts index 6af905c1..ea79d9f0 100644 --- a/templates/ReactReduxSpa/ClientApp/store/WeatherForecasts.ts +++ b/templates/ReactReduxSpa/ClientApp/store/WeatherForecasts.ts @@ -60,7 +60,7 @@ export const actionCreators = { // ---------------- // REDUCER - For a given state and action, returns the new state. To support time travel, this must not mutate the old state. -const unloadedState: WeatherForecastsState = { startDateIndex: undefined, forecasts: [], isLoading: false }; +const unloadedState: WeatherForecastsState = { forecasts: [], isLoading: false }; export const reducer: Reducer = (state: WeatherForecastsState, incomingAction: Action) => { const action = incomingAction as KnownAction; diff --git a/templates/ReactReduxSpa/tsconfig.json b/templates/ReactReduxSpa/tsconfig.json index 0a2eb677..7909f2df 100644 --- a/templates/ReactReduxSpa/tsconfig.json +++ b/templates/ReactReduxSpa/tsconfig.json @@ -1,21 +1,16 @@ { "compilerOptions": { "baseUrl": ".", + "module": "es2015", "moduleResolution": "node", "target": "es5", "jsx": "react", "experimentalDecorators": true, "sourceMap": true, "skipDefaultLibCheck": true, + "strict": true, "lib": ["es6", "dom"], - "types": [ "webpack-env" ], - "paths": { - // Fix "Duplicate identifier" errors caused by multiple dependencies fetching their own copies of type definitions. - // We tell TypeScript which type definitions module to treat as the canonical one (instead of combining all of them). - "history": ["./node_modules/@types/history/index"], - "redux": ["./node_modules/@types/redux/index"], - "react": ["./node_modules/@types/react/index"] - } + "types": ["webpack-env"] }, "exclude": [ "bin", diff --git a/templates/ReactSpa/ClientApp/components/Counter.tsx b/templates/ReactSpa/ClientApp/components/Counter.tsx index ef51b168..4532857d 100644 --- a/templates/ReactSpa/ClientApp/components/Counter.tsx +++ b/templates/ReactSpa/ClientApp/components/Counter.tsx @@ -1,10 +1,11 @@ import * as React from 'react'; +import { RouteComponentProps } from 'react-router'; interface CounterState { currentCount: number; } -export class Counter extends React.Component<{}, CounterState> { +export class Counter extends React.Component, CounterState> { constructor() { super(); this.state = { currentCount: 0 }; diff --git a/templates/ReactSpa/ClientApp/components/FetchData.tsx b/templates/ReactSpa/ClientApp/components/FetchData.tsx index c958ea69..ce191bd7 100644 --- a/templates/ReactSpa/ClientApp/components/FetchData.tsx +++ b/templates/ReactSpa/ClientApp/components/FetchData.tsx @@ -1,4 +1,5 @@ import * as React from 'react'; +import { RouteComponentProps } from 'react-router'; import 'isomorphic-fetch'; interface FetchDataExampleState { @@ -6,7 +7,7 @@ interface FetchDataExampleState { loading: boolean; } -export class FetchData extends React.Component<{}, FetchDataExampleState> { +export class FetchData extends React.Component, FetchDataExampleState> { constructor() { super(); this.state = { forecasts: [], loading: true }; diff --git a/templates/ReactSpa/ClientApp/components/Home.tsx b/templates/ReactSpa/ClientApp/components/Home.tsx index 76d8d047..e9ce1f2e 100644 --- a/templates/ReactSpa/ClientApp/components/Home.tsx +++ b/templates/ReactSpa/ClientApp/components/Home.tsx @@ -1,6 +1,7 @@ import * as React from 'react'; +import { RouteComponentProps } from 'react-router'; -export class Home extends React.Component<{}, {}> { +export class Home extends React.Component, {}> { public render() { return

      Hello, world!

      diff --git a/templates/ReactSpa/tsconfig.json b/templates/ReactSpa/tsconfig.json index cd7432a8..ed531010 100644 --- a/templates/ReactSpa/tsconfig.json +++ b/templates/ReactSpa/tsconfig.json @@ -1,18 +1,14 @@ { "compilerOptions": { "baseUrl": ".", + "module": "es2015", "moduleResolution": "node", "target": "es5", "jsx": "react", "sourceMap": true, "skipDefaultLibCheck": true, - "types": [ "webpack-env" ], - "paths": { - // Fix "Duplicate identifier" errors caused by multiple dependencies fetching their own copies of type definitions. - // We tell TypeScript which type definitions module to treat as the canonical one (instead of combining all of them). - "history": ["./node_modules/@types/history/index"], - "react": ["./node_modules/@types/react/index"] - } + "strict": true, + "types": ["webpack-env"] }, "exclude": [ "bin", diff --git a/templates/VueSpa/tsconfig.json b/templates/VueSpa/tsconfig.json index 04827d07..b523b751 100644 --- a/templates/VueSpa/tsconfig.json +++ b/templates/VueSpa/tsconfig.json @@ -7,6 +7,7 @@ "target": "es5", "sourceMap": true, "skipDefaultLibCheck": true, + "strict": true, "types": ["webpack-env"] }, "exclude": [ From c79db4e8e245604e0aaa97388055130bbfa8942e Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 13 Jul 2017 16:16:45 +0100 Subject: [PATCH 197/411] In React-Redux template, move Webpack config for images into sharedConfig so that adding images doesn't break the server build --- templates/ReactReduxSpa/webpack.config.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/ReactReduxSpa/webpack.config.js b/templates/ReactReduxSpa/webpack.config.js index deebbeba..59a57390 100644 --- a/templates/ReactReduxSpa/webpack.config.js +++ b/templates/ReactReduxSpa/webpack.config.js @@ -17,7 +17,8 @@ module.exports = (env) => { }, module: { rules: [ - { test: /\.tsx?$/, include: /ClientApp/, use: 'awesome-typescript-loader?silent=true' } + { test: /\.tsx?$/, include: /ClientApp/, use: 'awesome-typescript-loader?silent=true' }, + { test: /\.(png|jpg|jpeg|gif|svg)$/, use: 'url-loader?limit=25000' } ] }, plugins: [new CheckerPlugin()] @@ -29,8 +30,7 @@ module.exports = (env) => { entry: { 'main-client': './ClientApp/boot-client.tsx' }, module: { rules: [ - { test: /\.css$/, use: ExtractTextPlugin.extract({ use: isDevBuild ? 'css-loader' : 'css-loader?minimize' }) }, - { test: /\.(png|jpg|jpeg|gif|svg)$/, use: 'url-loader?limit=25000' } + { test: /\.css$/, use: ExtractTextPlugin.extract({ use: isDevBuild ? 'css-loader' : 'css-loader?minimize' }) } ] }, output: { path: path.join(__dirname, clientBundleOutputDir) }, From a9028747543893db16e39cce9d3f0a3be2c534bd Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Tue, 18 Jul 2017 18:39:44 -0700 Subject: [PATCH 198/411] Remove unused variable AutoMapperVersion --- build/dependencies.props | 1 - 1 file changed, 1 deletion(-) diff --git a/build/dependencies.props b/build/dependencies.props index fdda160f..28d7ec17 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,7 +1,6 @@ 2.0.0-* - 5.0.2 2.0.1-* 10.0.1 2.0.0-* From 789ea5a320c0c7d2b21690a9dee10f78f4253d84 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 19 Jul 2017 14:24:32 +0100 Subject: [PATCH 199/411] Update to ASP.NET Core 2.0.0-rtm-26380 --- templates/AngularSpa/AngularSpa.csproj | 12 ++++++------ templates/AureliaSpa/AureliaSpa.csproj | 12 ++++++------ templates/KnockoutSpa/KnockoutSpa.csproj | 12 ++++++------ templates/ReactReduxSpa/ReactReduxSpa.csproj | 12 ++++++------ templates/ReactSpa/ReactSpa.csproj | 12 ++++++------ templates/VueSpa/VueSpa.csproj | 12 ++++++------ 6 files changed, 36 insertions(+), 36 deletions(-) diff --git a/templates/AngularSpa/AngularSpa.csproj b/templates/AngularSpa/AngularSpa.csproj index f6340d1d..78eaaf26 100644 --- a/templates/AngularSpa/AngularSpa.csproj +++ b/templates/AngularSpa/AngularSpa.csproj @@ -9,17 +9,17 @@ - + - - - - + + + + - + diff --git a/templates/AureliaSpa/AureliaSpa.csproj b/templates/AureliaSpa/AureliaSpa.csproj index 21015a44..83a4abec 100644 --- a/templates/AureliaSpa/AureliaSpa.csproj +++ b/templates/AureliaSpa/AureliaSpa.csproj @@ -9,17 +9,17 @@ - + - - - - + + + + - + diff --git a/templates/KnockoutSpa/KnockoutSpa.csproj b/templates/KnockoutSpa/KnockoutSpa.csproj index 21015a44..83a4abec 100644 --- a/templates/KnockoutSpa/KnockoutSpa.csproj +++ b/templates/KnockoutSpa/KnockoutSpa.csproj @@ -9,17 +9,17 @@ - + - - - - + + + + - + diff --git a/templates/ReactReduxSpa/ReactReduxSpa.csproj b/templates/ReactReduxSpa/ReactReduxSpa.csproj index f6340d1d..78eaaf26 100644 --- a/templates/ReactReduxSpa/ReactReduxSpa.csproj +++ b/templates/ReactReduxSpa/ReactReduxSpa.csproj @@ -9,17 +9,17 @@ - + - - - - + + + + - + diff --git a/templates/ReactSpa/ReactSpa.csproj b/templates/ReactSpa/ReactSpa.csproj index 21015a44..83a4abec 100644 --- a/templates/ReactSpa/ReactSpa.csproj +++ b/templates/ReactSpa/ReactSpa.csproj @@ -9,17 +9,17 @@ - + - - - - + + + + - + diff --git a/templates/VueSpa/VueSpa.csproj b/templates/VueSpa/VueSpa.csproj index 21015a44..83a4abec 100644 --- a/templates/VueSpa/VueSpa.csproj +++ b/templates/VueSpa/VueSpa.csproj @@ -9,17 +9,17 @@ - + - - - - + + + + - + From 0cb14a3c688ca5372ba306370b3f1ba510f53626 Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Fri, 21 Jul 2017 13:00:05 -0700 Subject: [PATCH 200/411] 2.0.0-rtm to 2.1.0-preview1 --- version.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.props b/version.props index eba6b167..1ea46af4 100644 --- a/version.props +++ b/version.props @@ -1,7 +1,7 @@ - 2.0.0 - rtm + 2.1.0 + preview1 From 27f1d07d21924178d25c51dfba0498cffe2bf640 Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Mon, 24 Jul 2017 17:56:46 -0700 Subject: [PATCH 201/411] Set AspNetCoreVersion --- build/dependencies.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/dependencies.props b/build/dependencies.props index 28d7ec17..d7a8c3e6 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,6 +1,6 @@ - 2.0.0-* + 2.1.0-* 2.0.1-* 10.0.1 2.0.0-* From c4aad6bcabfeb8138b5039f0d057b8bf26ef7d8a Mon Sep 17 00:00:00 2001 From: Pranav K Date: Tue, 25 Jul 2017 15:13:39 -0700 Subject: [PATCH 202/411] Updating to InternalAspNetCoreSdkVersion 2.1.1-* --- build/dependencies.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/dependencies.props b/build/dependencies.props index d7a8c3e6..1964f88c 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,7 +1,7 @@ 2.1.0-* - 2.0.1-* + 2.1.1-* 10.0.1 2.0.0-* 2.0.0-* From b8b769aa74d962fd43db68b79ca313d060688d65 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 25 Jul 2017 16:32:45 -0700 Subject: [PATCH 203/411] Update bootstrappers to use the compiled version of KoreBuild [ci skip] --- .gitignore | 2 + build.cmd | 2 +- build.ps1 | 206 ++++++++++++++++++++++++++-------- build.sh | 212 ++++++++++++++++++++++++++++++----- build/common.props | 2 +- version.props => version.xml | 3 +- 6 files changed, 345 insertions(+), 82 deletions(-) rename version.props => version.xml (55%) diff --git a/.gitignore b/.gitignore index 100aa3b9..1a704fbe 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,5 @@ npm-debug.log .vscode/ /templates/*/Properties/launchSettings.json +global.json +korebuild-lock.txt diff --git a/build.cmd b/build.cmd index 7d4894cb..b6c8d248 100755 --- a/build.cmd +++ b/build.cmd @@ -1,2 +1,2 @@ @ECHO OFF -PowerShell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command "[System.Threading.Thread]::CurrentThread.CurrentCulture = ''; [System.Threading.Thread]::CurrentThread.CurrentUICulture = '';& '%~dp0build.ps1' %*; exit $LASTEXITCODE" \ No newline at end of file +PowerShell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command "[System.Threading.Thread]::CurrentThread.CurrentCulture = ''; [System.Threading.Thread]::CurrentThread.CurrentUICulture = '';& '%~dp0build.ps1' %*; exit $LASTEXITCODE" diff --git a/build.ps1 b/build.ps1 index 5bf0e2c1..d5eb4d5c 100644 --- a/build.ps1 +++ b/build.ps1 @@ -1,67 +1,177 @@ -$ErrorActionPreference = "Stop" - -function DownloadWithRetry([string] $url, [string] $downloadLocation, [int] $retries) -{ - while($true) - { - try - { - Invoke-WebRequest $url -OutFile $downloadLocation - break - } - catch - { - $exceptionMessage = $_.Exception.Message - Write-Host "Failed to download '$url': $exceptionMessage" - if ($retries -gt 0) { - $retries-- - Write-Host "Waiting 10 seconds before retrying. Retries left: $retries" - Start-Sleep -Seconds 10 +#!/usr/bin/env powershell +#requires -version 4 + +<# +.SYNOPSIS +Build this repository + +.DESCRIPTION +Downloads korebuild if required. Then builds the repository. + +.PARAMETER Path +The folder to build. Defaults to the folder containing this script. + +.PARAMETER Channel +The channel of KoreBuild to download. Overrides the value from the config file. + +.PARAMETER DotNetHome +The directory where .NET Core tools will be stored. + +.PARAMETER ToolsSource +The base url where build tools can be downloaded. Overrides the value from the config file. + +.PARAMETER Update +Updates KoreBuild to the latest version even if a lock file is present. + +.PARAMETER ConfigFile +The path to the configuration file that stores values. Defaults to version.xml. + +.PARAMETER MSBuildArgs +Arguments to be passed to MSBuild + +.NOTES +This function will create a file $PSScriptRoot/korebuild-lock.txt. This lock file can be committed to source, but does not have to be. +When the lockfile is not present, KoreBuild will create one using latest available version from $Channel. + +The $ConfigFile is expected to be an XML file. It is optional, and the configuration values in it are optional as well. + +.EXAMPLE +Example config file: +```xml + + + + dev + https://aspnetcore.blob.core.windows.net/buildtools + + +``` +#> +[CmdletBinding(PositionalBinding = $false)] +param( + [string]$Path = $PSScriptRoot, + [Alias('c')] + [string]$Channel, + [Alias('d')] + [string]$DotNetHome, + [Alias('s')] + [string]$ToolsSource, + [Alias('u')] + [switch]$Update, + [string]$ConfigFile = (Join-Path $PSScriptRoot 'version.xml'), + [Parameter(ValueFromRemainingArguments = $true)] + [string[]]$MSBuildArgs +) + +Set-StrictMode -Version 2 +$ErrorActionPreference = 'Stop' + +# +# Functions +# + +function Get-KoreBuild { + + $lockFile = Join-Path $Path 'korebuild-lock.txt' + + if (!(Test-Path $lockFile) -or $Update) { + Get-RemoteFile "$ToolsSource/korebuild/channels/$Channel/latest.txt" $lockFile + } + + $version = Get-Content $lockFile | Where-Object { $_ -like 'version:*' } | Select-Object -first 1 + if (!$version) { + Write-Error "Failed to parse version from $lockFile. Expected a line that begins with 'version:'" + } + $version = $version.TrimStart('version:').Trim() + $korebuildPath = Join-Paths $DotNetHome ('buildtools', 'korebuild', $version) + if (!(Test-Path $korebuildPath)) { + Write-Host -ForegroundColor Magenta "Downloading KoreBuild $version" + New-Item -ItemType Directory -Path $korebuildPath | Out-Null + $remotePath = "$ToolsSource/korebuild/artifacts/$version/korebuild.$version.zip" + + try { + $tmpfile = Join-Path ([IO.Path]::GetTempPath()) "KoreBuild-$([guid]::NewGuid()).zip" + Get-RemoteFile $remotePath $tmpfile + if (Get-Command -Name 'Expand-Archive' -ErrorAction Ignore) { + # Use built-in commands where possible as they are cross-plat compatible + Expand-Archive -Path $tmpfile -DestinationPath $korebuildPath } - else - { - $exception = $_.Exception - throw $exception + else { + # Fallback to old approach for old installations of PowerShell + Add-Type -AssemblyName System.IO.Compression.FileSystem + [System.IO.Compression.ZipFile]::ExtractToDirectory($tmpfile, $korebuildPath) } } + catch { + Remove-Item -Recurse -Force $korebuildPath -ErrorAction Ignore + throw + } + finally { + Remove-Item $tmpfile -ErrorAction Ignore + } } + + return $korebuildPath +} + +function Join-Paths([string]$path, [string[]]$childPaths) { + $childPaths | ForEach-Object { $path = Join-Path $path $_ } + return $path } -cd $PSScriptRoot +function Get-RemoteFile([string]$RemotePath, [string]$LocalPath) { + if ($RemotePath -notlike 'http*') { + Copy-Item $RemotePath $LocalPath + return + } -$repoFolder = $PSScriptRoot -$env:REPO_FOLDER = $repoFolder + $retries = 10 + while ($retries -gt 0) { + $retries -= 1 + try { + Invoke-WebRequest -UseBasicParsing -Uri $RemotePath -OutFile $LocalPath + return + } + catch { + Write-Verbose "Request failed. $retries retries remaining" + } + } -$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/dev.zip" -if ($env:KOREBUILD_ZIP) -{ - $koreBuildZip=$env:KOREBUILD_ZIP + Write-Error "Download failed: '$RemotePath'." } -$buildFolder = ".build" -$buildFile="$buildFolder\KoreBuild.ps1" +# +# Main +# -if (!(Test-Path $buildFolder)) { - Write-Host "Downloading KoreBuild from $koreBuildZip" +# Load configuration or set defaults - $tempFolder=$env:TEMP + "\KoreBuild-" + [guid]::NewGuid() - New-Item -Path "$tempFolder" -Type directory | Out-Null +if (Test-Path $ConfigFile) { + [xml] $config = Get-Content $ConfigFile + if (!($Channel)) { [string] $Channel = Select-Xml -Xml $config -XPath '/Project/PropertyGroup/KoreBuildChannel' } + if (!($ToolsSource)) { [string] $ToolsSource = Select-Xml -Xml $config -XPath '/Project/PropertyGroup/KoreBuildToolsSource' } +} - $localZipFile="$tempFolder\korebuild.zip" +if (!$DotNetHome) { + $DotNetHome = if ($env:DOTNET_HOME) { $env:DOTNET_HOME } ` + elseif ($env:USERPROFILE) { Join-Path $env:USERPROFILE '.dotnet'} ` + elseif ($env:HOME) {Join-Path $env:HOME '.dotnet'}` + else { Join-Path $PSScriptRoot '.dotnet'} +} - DownloadWithRetry -url $koreBuildZip -downloadLocation $localZipFile -retries 6 +if (!$Channel) { $Channel = 'dev' } +if (!$ToolsSource) { $ToolsSource = 'https://aspnetcore.blob.core.windows.net/buildtools' } - Add-Type -AssemblyName System.IO.Compression.FileSystem - [System.IO.Compression.ZipFile]::ExtractToDirectory($localZipFile, $tempFolder) +# Execute - New-Item -Path "$buildFolder" -Type directory | Out-Null - copy-item "$tempFolder\**\build\*" $buildFolder -Recurse +$korebuildPath = Get-KoreBuild +Import-Module -Force -Scope Local (Join-Path $korebuildPath 'KoreBuild.psd1') - # Cleanup - if (Test-Path $tempFolder) { - Remove-Item -Recurse -Force $tempFolder - } +try { + Install-Tools $ToolsSource $DotNetHome + Invoke-RepositoryBuild $Path @MSBuildArgs +} +finally { + Remove-Module 'KoreBuild' -ErrorAction Ignore } - -&"$buildFile" @args diff --git a/build.sh b/build.sh index b0bcadb5..ab590e62 100755 --- a/build.sh +++ b/build.sh @@ -1,46 +1,196 @@ #!/usr/bin/env bash -repoFolder="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -cd $repoFolder -koreBuildZip="https://github.com/aspnet/KoreBuild/archive/dev.zip" -if [ ! -z $KOREBUILD_ZIP ]; then - koreBuildZip=$KOREBUILD_ZIP -fi +set -euo pipefail + +# +# variables +# -buildFolder=".build" -buildFile="$buildFolder/KoreBuild.sh" +RESET="\033[0m" +RED="\033[0;31m" +MAGENTA="\033[0;95m" +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +[ -z "${DOTNET_HOME:-}"] && DOTNET_HOME="$HOME/.dotnet" +config_file="$DIR/version.xml" +verbose=false +update=false +repo_path="$DIR" +channel='' +tools_source='' -if test ! -d $buildFolder; then - echo "Downloading KoreBuild from $koreBuildZip" +# +# Functions +# +__usage() { + echo "Usage: $(basename ${BASH_SOURCE[0]}) [options] [[--] ...]" + echo "" + echo "Arguments:" + echo " ... Arguments passed to MSBuild. Variable number of arguments allowed." + echo "" + echo "Options:" + echo " --verbose Show verbose output." + echo " -c|--channel The channel of KoreBuild to download. Overrides the value from the config file.." + echo " --config-file TThe path to the configuration file that stores values. Defaults to version.xml." + echo " -d|--dotnet-home The directory where .NET Core tools will be stored. Defaults to '\$DOTNET_HOME' or '\$HOME/.dotnet." + echo " --path The directory to build. Defaults to the directory containing the script." + echo " -s|--tools-source The base url where build tools can be downloaded. Overrides the value from the config file." + echo " -u|--update Update to the latest KoreBuild even if the lock file is present." + echo "" + echo "Description:" + echo " This function will create a file \$DIR/korebuild-lock.txt. This lock file can be committed to source, but does not have to be." + echo " When the lockfile is not present, KoreBuild will create one using latest available version from \$channel." - tempFolder="/tmp/KoreBuild-$(uuidgen)" - mkdir $tempFolder + if [[ "${1:-}" != '--no-exit' ]]; then + exit 2 + fi +} - localZipFile="$tempFolder/korebuild.zip" +get_korebuild() { + local lock_file="$repo_path/korebuild-lock.txt" + if [ ! -f $lock_file ] || [ "$update" = true ]; then + __get_remote_file "$tools_source/korebuild/channels/$channel/latest.txt" $lock_file + fi + local version="$(grep 'version:*' -m 1 $lock_file)" + if [[ "$version" == '' ]]; then + __error "Failed to parse version from $lock_file. Expected a line that begins with 'version:'" + return 1 + fi + version="$(echo ${version#version:} | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')" + local korebuild_path="$DOTNET_HOME/buildtools/korebuild/$version" - retries=6 - until (wget -O $localZipFile $koreBuildZip 2>/dev/null || curl -o $localZipFile --location $koreBuildZip 2>/dev/null) - do - echo "Failed to download '$koreBuildZip'" - if [ "$retries" -le 0 ]; then - exit 1 + { + if [ ! -d "$korebuild_path" ]; then + mkdir -p "$korebuild_path" + local remote_path="$tools_source/korebuild/artifacts/$version/korebuild.$version.zip" + tmpfile="$(mktemp)" + echo -e "${MAGENTA}Downloading KoreBuild ${version}${RESET}" + if __get_remote_file $remote_path $tmpfile; then + unzip -q -d "$korebuild_path" $tmpfile + fi + rm $tmpfile || true fi - retries=$((retries - 1)) - echo "Waiting 10 seconds before retrying. Retries left: $retries" - sleep 10s - done - unzip -q -d $tempFolder $localZipFile + source "$korebuild_path/KoreBuild.sh" + } || { + if [ -d "$korebuild_path" ]; then + echo "Cleaning up after failed installation" + rm -rf "$korebuild_path" || true + fi + return 1 + } +} + +__error() { + echo -e "${RED}$@${RESET}" 1>&2 +} + +__machine_has() { + hash "$1" > /dev/null 2>&1 + return $? +} + +__get_remote_file() { + local remote_path=$1 + local local_path=$2 + + if [[ "$remote_path" != 'http'* ]]; then + cp $remote_path $local_path + return 0 + fi - mkdir $buildFolder - cp -r $tempFolder/**/build/** $buildFolder + failed=false + if __machine_has wget; then + wget --tries 10 --quiet -O $local_path $remote_path || failed=true + fi - chmod +x $buildFile + if [ "$failed" = true ] && __machine_has curl; then + failed=false + curl --retry 10 -sSL -f --create-dirs -o $local_path $remote_path || failed=true + fi - # Cleanup - if test -d $tempFolder; then - rm -rf $tempFolder + if [ "$failed" = true ]; then + __error "Download failed: $remote_path" 1>&2 + return 1 fi +} + +__read_dom () { local IFS=\> ; read -d \< ENTITY CONTENT ;} + +# +# main +# + +while [[ $# > 0 ]]; do + case $1 in + -\?|-h|--help) + __usage --no-exit + exit 0 + ;; + -c|--channel|-Channel) + shift + channel=${1:-} + [ -z "$channel" ] && __usage + ;; + --config-file|-ConfigFile) + shift + config_file="${1:-}" + [ -z "$config_file" ] && __usage + ;; + -d|--dotnet-home|-DotNetHome) + shift + DOTNET_HOME=${1:-} + [ -z "$DOTNET_HOME" ] && __usage + ;; + --path|-Path) + shift + repo_path="${1:-}" + [ -z "$repo_path" ] && __usage + ;; + -s|--tools-source|-ToolsSource) + shift + tools_source="${1:-}" + [ -z "$tools_source" ] && __usage + ;; + -u|--update|-Update) + update=true + ;; + --verbose|-Verbose) + verbose=true + ;; + --) + shift + break + ;; + *) + break + ;; + esac + shift +done + +if ! __machine_has unzip; then + __error 'Missing required command: unzip' + exit 1 fi -$buildFile -r $repoFolder "$@" +if ! __machine_has curl && ! __machine_has wget; then + __error 'Missing required command. Either wget or curl is required.' + exit 1 +fi + +if [ -f $config_file ]; then + comment=false + while __read_dom; do + if [ "$comment" = true ]; then [[ $CONTENT == *'-->'* ]] && comment=false ; continue; fi + if [[ $ENTITY == '!--'* ]]; then comment=true; continue; fi + if [ -z "$channel" ] && [[ $ENTITY == "KoreBuildChannel" ]]; then channel=$CONTENT; fi + if [ -z "$tools_source" ] && [[ $ENTITY == "KoreBuildToolsSource" ]]; then tools_source=$CONTENT; fi + done < $config_file +fi + +[ -z "$channel" ] && channel='dev' +[ -z "$tools_source" ] && tools_source='https://aspnetcore.blob.core.windows.net/buildtools' + +get_korebuild +install_tools "$tools_source" "$DOTNET_HOME" +invoke_repository_build "$repo_path" $@ diff --git a/build/common.props b/build/common.props index 34b88643..1febbfb4 100644 --- a/build/common.props +++ b/build/common.props @@ -1,6 +1,6 @@ - + Microsoft ASP.NET Core diff --git a/version.props b/version.xml similarity index 55% rename from version.props rename to version.xml index 1ea46af4..3c05022b 100644 --- a/version.props +++ b/version.xml @@ -1,6 +1,7 @@ - + + dev 2.1.0 preview1 From 895a61160e95441d97b6cd2eb42b736d7a00190f Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 26 Jul 2017 10:27:55 -0700 Subject: [PATCH 204/411] Fix syntax warning when running build.sh on older versions of bash [ci skip] --- build.sh | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/build.sh b/build.sh index ab590e62..5568c618 100755 --- a/build.sh +++ b/build.sh @@ -10,7 +10,7 @@ RESET="\033[0m" RED="\033[0;31m" MAGENTA="\033[0;95m" DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -[ -z "${DOTNET_HOME:-}"] && DOTNET_HOME="$HOME/.dotnet" +[ -z "${DOTNET_HOME:-}" ] && DOTNET_HOME="$HOME/.dotnet" config_file="$DIR/version.xml" verbose=false update=false @@ -22,7 +22,7 @@ tools_source='' # Functions # __usage() { - echo "Usage: $(basename ${BASH_SOURCE[0]}) [options] [[--] ...]" + echo "Usage: $(basename "${BASH_SOURCE[0]}") [options] [[--] ...]" echo "" echo "Arguments:" echo " ... Arguments passed to MSBuild. Variable number of arguments allowed." @@ -46,16 +46,17 @@ __usage() { } get_korebuild() { + local version local lock_file="$repo_path/korebuild-lock.txt" - if [ ! -f $lock_file ] || [ "$update" = true ]; then - __get_remote_file "$tools_source/korebuild/channels/$channel/latest.txt" $lock_file + if [ ! -f "$lock_file" ] || [ "$update" = true ]; then + __get_remote_file "$tools_source/korebuild/channels/$channel/latest.txt" "$lock_file" fi - local version="$(grep 'version:*' -m 1 $lock_file)" + version="$(grep 'version:*' -m 1 "$lock_file")" if [[ "$version" == '' ]]; then __error "Failed to parse version from $lock_file. Expected a line that begins with 'version:'" return 1 fi - version="$(echo ${version#version:} | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')" + version="$(echo "${version#version:}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')" local korebuild_path="$DOTNET_HOME/buildtools/korebuild/$version" { @@ -64,10 +65,10 @@ get_korebuild() { local remote_path="$tools_source/korebuild/artifacts/$version/korebuild.$version.zip" tmpfile="$(mktemp)" echo -e "${MAGENTA}Downloading KoreBuild ${version}${RESET}" - if __get_remote_file $remote_path $tmpfile; then - unzip -q -d "$korebuild_path" $tmpfile + if __get_remote_file "$remote_path" "$tmpfile"; then + unzip -q -d "$korebuild_path" "$tmpfile" fi - rm $tmpfile || true + rm "$tmpfile" || true fi source "$korebuild_path/KoreBuild.sh" @@ -81,7 +82,7 @@ get_korebuild() { } __error() { - echo -e "${RED}$@${RESET}" 1>&2 + echo -e "${RED}$*${RESET}" 1>&2 } __machine_has() { @@ -94,18 +95,18 @@ __get_remote_file() { local local_path=$2 if [[ "$remote_path" != 'http'* ]]; then - cp $remote_path $local_path + cp "$remote_path" "$local_path" return 0 fi failed=false if __machine_has wget; then - wget --tries 10 --quiet -O $local_path $remote_path || failed=true + wget --tries 10 --quiet -O "$local_path" "$remote_path" || failed=true fi if [ "$failed" = true ] && __machine_has curl; then failed=false - curl --retry 10 -sSL -f --create-dirs -o $local_path $remote_path || failed=true + curl --retry 10 -sSL -f --create-dirs -o "$local_path" "$remote_path" || failed=true fi if [ "$failed" = true ]; then @@ -114,13 +115,13 @@ __get_remote_file() { fi } -__read_dom () { local IFS=\> ; read -d \< ENTITY CONTENT ;} +__read_dom () { local IFS=\> ; read -r -d \< ENTITY CONTENT ;} # # main # -while [[ $# > 0 ]]; do +while [[ $# -gt 0 ]]; do case $1 in -\?|-h|--help) __usage --no-exit @@ -128,7 +129,7 @@ while [[ $# > 0 ]]; do ;; -c|--channel|-Channel) shift - channel=${1:-} + channel="${1:-}" [ -z "$channel" ] && __usage ;; --config-file|-ConfigFile) @@ -138,7 +139,7 @@ while [[ $# > 0 ]]; do ;; -d|--dotnet-home|-DotNetHome) shift - DOTNET_HOME=${1:-} + DOTNET_HOME="${1:-}" [ -z "$DOTNET_HOME" ] && __usage ;; --path|-Path) @@ -178,14 +179,14 @@ if ! __machine_has curl && ! __machine_has wget; then exit 1 fi -if [ -f $config_file ]; then +if [ -f "$config_file" ]; then comment=false while __read_dom; do if [ "$comment" = true ]; then [[ $CONTENT == *'-->'* ]] && comment=false ; continue; fi if [[ $ENTITY == '!--'* ]]; then comment=true; continue; fi if [ -z "$channel" ] && [[ $ENTITY == "KoreBuildChannel" ]]; then channel=$CONTENT; fi if [ -z "$tools_source" ] && [[ $ENTITY == "KoreBuildToolsSource" ]]; then tools_source=$CONTENT; fi - done < $config_file + done < "$config_file" fi [ -z "$channel" ] && channel='dev' @@ -193,4 +194,4 @@ fi get_korebuild install_tools "$tools_source" "$DOTNET_HOME" -invoke_repository_build "$repo_path" $@ +invoke_repository_build "$repo_path" "$@" From 50481fe23f0b318521d03e1645a9e5bb5a38fa18 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 27 Jul 2017 14:27:15 +0100 Subject: [PATCH 205/411] Update templates to reference ASP.NET Core 2.0.0 final --- templates/AngularSpa/AngularSpa.csproj | 12 ++++++------ templates/AureliaSpa/AureliaSpa.csproj | 12 ++++++------ templates/KnockoutSpa/KnockoutSpa.csproj | 12 ++++++------ templates/ReactReduxSpa/ReactReduxSpa.csproj | 12 ++++++------ templates/ReactSpa/ReactSpa.csproj | 12 ++++++------ templates/VueSpa/VueSpa.csproj | 12 ++++++------ 6 files changed, 36 insertions(+), 36 deletions(-) diff --git a/templates/AngularSpa/AngularSpa.csproj b/templates/AngularSpa/AngularSpa.csproj index 78eaaf26..c2c5cfe3 100644 --- a/templates/AngularSpa/AngularSpa.csproj +++ b/templates/AngularSpa/AngularSpa.csproj @@ -9,17 +9,17 @@ - + - - - - + + + + - + diff --git a/templates/AureliaSpa/AureliaSpa.csproj b/templates/AureliaSpa/AureliaSpa.csproj index 83a4abec..eff4c62c 100644 --- a/templates/AureliaSpa/AureliaSpa.csproj +++ b/templates/AureliaSpa/AureliaSpa.csproj @@ -9,17 +9,17 @@ - + - - - - + + + + - + diff --git a/templates/KnockoutSpa/KnockoutSpa.csproj b/templates/KnockoutSpa/KnockoutSpa.csproj index 83a4abec..eff4c62c 100644 --- a/templates/KnockoutSpa/KnockoutSpa.csproj +++ b/templates/KnockoutSpa/KnockoutSpa.csproj @@ -9,17 +9,17 @@ - + - - - - + + + + - + diff --git a/templates/ReactReduxSpa/ReactReduxSpa.csproj b/templates/ReactReduxSpa/ReactReduxSpa.csproj index 78eaaf26..c2c5cfe3 100644 --- a/templates/ReactReduxSpa/ReactReduxSpa.csproj +++ b/templates/ReactReduxSpa/ReactReduxSpa.csproj @@ -9,17 +9,17 @@ - + - - - - + + + + - + diff --git a/templates/ReactSpa/ReactSpa.csproj b/templates/ReactSpa/ReactSpa.csproj index 83a4abec..eff4c62c 100644 --- a/templates/ReactSpa/ReactSpa.csproj +++ b/templates/ReactSpa/ReactSpa.csproj @@ -9,17 +9,17 @@ - + - - - - + + + + - + diff --git a/templates/VueSpa/VueSpa.csproj b/templates/VueSpa/VueSpa.csproj index 83a4abec..eff4c62c 100644 --- a/templates/VueSpa/VueSpa.csproj +++ b/templates/VueSpa/VueSpa.csproj @@ -9,17 +9,17 @@ - + - - - - + + + + - + From c2e4d4f261d29194eb39513d29a32c167043330f Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 27 Jul 2017 14:41:55 +0100 Subject: [PATCH 206/411] Re-enable the "dotnet restore" postAction, like the stock templates --- templates/package-builder/src/build/build.ts | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/templates/package-builder/src/build/build.ts b/templates/package-builder/src/build/build.ts index a7aa3828..40d4fc06 100644 --- a/templates/package-builder/src/build/build.ts +++ b/templates/package-builder/src/build/build.ts @@ -206,10 +206,23 @@ function buildDotNetNewNuGetPackage(packageId: string) { HostIdentifier: { type: 'bind', binding: 'HostIdentifier' + }, + skipRestore: { + type: 'parameter', + datatype: 'bool', + description: 'If specified, skips the automatic restore of the project on create.', + defaultValue: 'false' } }, tags: { language: 'C#', type: 'project' }, postActions: [ + { + condition: '(!skipRestore)', + description: 'Restore NuGet packages required by this project.', + manualInstructions: [{ text: 'Run \'dotnet restore\'' }], + actionId: '210D431B-A78B-4D2F-B762-4ED3E3EA9025', + continueOnError: true + }, /* // Currently it doesn't appear to be possible to run `npm install` from a // postAction, due to https://github.com/dotnet/templating/issues/849 @@ -245,7 +258,11 @@ function buildDotNetNewNuGetPackage(packageId: string) { }, Framework: { longName: 'framework' - } + }, + skipRestore: { + longName: 'no-restore', + shortName: '' + }, } }, null, 2)); From f5d58f3f2e499325f2fe67878fdae9d18961f88d Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 27 Jul 2017 14:43:22 +0100 Subject: [PATCH 207/411] Update AppVeyor build to use SDK 006857 --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 9f382f96..ef16c222 100755 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,7 +4,7 @@ install: - ps: Install-Product node 6.9.2 x64 # .NET Core SDK binaries # Download .NET Core 2.0 Preview 3 SDK and add to PATH - - ps: $urlCurrent = "https://dotnetcli.azureedge.net/dotnet/Sdk/2.0.0-preview3-006729/dotnet-sdk-2.0.0-preview3-006729-win-x64.zip" + - ps: $urlCurrent = "https://dotnetcli.azureedge.net/dotnet/Sdk/2.0.0-preview3-006857/dotnet-sdk-2.0.0-preview3-006857-win-x64.zip" - ps: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetsdk" - ps: mkdir $env:DOTNET_INSTALL_DIR -Force | Out-Null - ps: $tempFileCurrent = [System.IO.Path]::Combine([System.IO.Path]::GetTempPath(), [System.IO.Path]::GetRandomFileName()) From 169ef12cd80dfcc143bbc11437f3fb1bc86066dc Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 27 Jul 2017 14:51:21 +0100 Subject: [PATCH 208/411] Change Microsoft.DotNet.Web.Spa.ProjectTemplates to use non-prerelease version number in NuGet package --- templates/package-builder/src/build/build.ts | 11 ++--------- .../Microsoft.DotNet.Web.Spa.ProjectTemplates.nuspec | 2 +- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/templates/package-builder/src/build/build.ts b/templates/package-builder/src/build/build.ts index 40d4fc06..fab6d48b 100644 --- a/templates/package-builder/src/build/build.ts +++ b/templates/package-builder/src/build/build.ts @@ -91,20 +91,13 @@ function copyRecursive(sourceRoot: string, destRoot: string, matchGlob: string) }); } -function leftPad(str: string, minLength: number, padChar: string) { - while (str.length < minLength) { - str = padChar + str; - } - return str; -} - function getBuildNumber(): string { if (process.env.APPVEYOR_BUILD_NUMBER) { - return leftPad(process.env.APPVEYOR_BUILD_NUMBER, 6, '0'); + return process.env.APPVEYOR_BUILD_NUMBER; } // For local builds, use timestamp - return 't-' + Math.floor((new Date().valueOf() - new Date(2017, 0, 1).valueOf()) / (60*1000)); + return Math.floor((new Date().valueOf() - new Date(2017, 0, 1).valueOf()) / (60*1000)) + '-local'; } function buildYeomanNpmPackage(outputRoot: string) { diff --git a/templates/package-builder/src/dotnetnew/Microsoft.DotNet.Web.Spa.ProjectTemplates.nuspec b/templates/package-builder/src/dotnetnew/Microsoft.DotNet.Web.Spa.ProjectTemplates.nuspec index 14066315..05690b87 100644 --- a/templates/package-builder/src/dotnetnew/Microsoft.DotNet.Web.Spa.ProjectTemplates.nuspec +++ b/templates/package-builder/src/dotnetnew/Microsoft.DotNet.Web.Spa.ProjectTemplates.nuspec @@ -2,7 +2,7 @@ Microsoft.DotNet.Web.Spa.ProjectTemplates - 1.0.0-preview-{buildnumber} + 1.0.{buildnumber} Single Page Application templates for ASP.NET Core Microsoft en-US From 3715ec7c3f518bf32bb682f5ce73a448ed57a037 Mon Sep 17 00:00:00 2001 From: Charles Lowell Date: Tue, 1 Aug 2017 10:45:51 -0700 Subject: [PATCH 209/411] Fix typo --- .../ClientApp/app/components/home/home.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/AngularSpa/ClientApp/app/components/home/home.component.html b/templates/AngularSpa/ClientApp/app/components/home/home.component.html index 3f2c0584..dcdc6f98 100644 --- a/templates/AngularSpa/ClientApp/app/components/home/home.component.html +++ b/templates/AngularSpa/ClientApp/app/components/home/home.component.html @@ -11,6 +11,6 @@

      Hello, world!

    • Client-side navigation. For example, click Counter then Back to return here.
    • Server-side prerendering. For faster initial loading and improved SEO, your Angular app is prerendered on the server. The resulting HTML is then transferred to the browser where a client-side copy of the app takes over.
    • Webpack dev middleware. In development mode, there's no need to run the webpack build tool. Your client-side resources are dynamically built on demand. Updates are available as soon as you modify any file.
      • -
    • Hot module replacement. In development mode, you don't even need to reload the page after making most changes. Within seconds of saving changes to files, your Angular app will be rebuilt and a new instance injected is into the page.
      • +
    • Hot module replacement. In development mode, you don't even need to reload the page after making most changes. Within seconds of saving changes to files, your Angular app will be rebuilt and a new instance injected into the page.
    • Efficient production builds. In production mode, development-time features are disabled, and the webpack build tool produces minified static CSS and JavaScript files.
    From 372e597f349f20b2d317ea210d89893a65236ea8 Mon Sep 17 00:00:00 2001 From: Eric Green Date: Tue, 1 Aug 2017 12:56:39 -0500 Subject: [PATCH 210/411] Added Timeout to HttpClient to always be longer than the InvocationTimeoutMilliseconds. HttpClient defaults to 100 seconds. If InvocationTimeoutMilliseconds is greater than the default of the HttpClient, the task will fail with a Task was canceled exception. --- .../HostingModels/HttpNodeInstance.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Microsoft.AspNetCore.NodeServices/HostingModels/HttpNodeInstance.cs b/src/Microsoft.AspNetCore.NodeServices/HostingModels/HttpNodeInstance.cs index a87e3d33..69b12e47 100644 --- a/src/Microsoft.AspNetCore.NodeServices/HostingModels/HttpNodeInstance.cs +++ b/src/Microsoft.AspNetCore.NodeServices/HostingModels/HttpNodeInstance.cs @@ -50,6 +50,7 @@ public HttpNodeInstance(NodeServicesOptions options, int port = 0) options.DebuggingPort) { _client = new HttpClient(); + _client.Timeout = TimeSpan.FromMilliseconds(options.InvocationTimeoutMilliseconds + 1000); } private static string MakeCommandLineOptions(int port) From fc12d722b87932d02146b5270dab07b4a9ea95ac Mon Sep 17 00:00:00 2001 From: Stephen Lautier Date: Mon, 31 Jul 2017 17:58:48 +0200 Subject: [PATCH 211/411] fix(webpack): fix middleware to specifically serialize options as non-camecased --- .../Webpack/WebpackDevMiddleware.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddleware.cs b/src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddleware.cs index cfcbb7ce..ef8ac001 100644 --- a/src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddleware.cs +++ b/src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddleware.cs @@ -4,6 +4,7 @@ using Microsoft.AspNetCore.NodeServices; using Microsoft.AspNetCore.SpaServices.Webpack; using Newtonsoft.Json; +using Newtonsoft.Json.Serialization; namespace Microsoft.AspNetCore.Builder { @@ -87,7 +88,7 @@ public static void UseWebpackDevMiddleware( }; var devServerInfo = nodeServices.InvokeExportAsync(nodeScript.FileName, "createWebpackDevServer", - JsonConvert.SerializeObject(devServerOptions)).Result; + JsonConvert.SerializeObject(devServerOptions, new JsonSerializerSettings() { ContractResolver = new DefaultContractResolver() })).Result; // If we're talking to an older version of aspnet-webpack, it will return only a single PublicPath, // not an array of PublicPaths. Handle that scenario. From c83605baff9e8f011c31dad90a521155acd95dfd Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 2 Aug 2017 10:05:42 +0100 Subject: [PATCH 212/411] Add aspnet-angular NPM package containing HttpWithStateTransfer utility --- .../npm/aspnet-angular/.gitignore | 3 + .../npm/aspnet-angular/.npmignore | 2 + .../npm/aspnet-angular/LICENSE.txt | 12 +++ .../npm/aspnet-angular/package.json | 32 +++++++ .../src/HttpWithStateTransfer.ts | 94 +++++++++++++++++++ .../npm/aspnet-angular/src/index.ts | 1 + .../npm/aspnet-angular/tsconfig.json | 17 ++++ 7 files changed, 161 insertions(+) create mode 100644 src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/.gitignore create mode 100644 src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/.npmignore create mode 100644 src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/LICENSE.txt create mode 100644 src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/package.json create mode 100644 src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/src/HttpWithStateTransfer.ts create mode 100644 src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/src/index.ts create mode 100644 src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/tsconfig.json diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/.gitignore b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/.gitignore new file mode 100644 index 00000000..78790965 --- /dev/null +++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/.gitignore @@ -0,0 +1,3 @@ +/node_modules/ +**/*.js +**/*.d.ts diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/.npmignore b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/.npmignore new file mode 100644 index 00000000..74dbfa8f --- /dev/null +++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/.npmignore @@ -0,0 +1,2 @@ +!/*.js +!/*.d.ts diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/LICENSE.txt b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/LICENSE.txt new file mode 100644 index 00000000..0bdc1962 --- /dev/null +++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/LICENSE.txt @@ -0,0 +1,12 @@ +Copyright (c) .NET Foundation. All rights reserved. + +Licensed under the Apache License, Version 2.0 (the "License"); you may not use +these files except in compliance with the License. You may obtain a copy of the +License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/package.json b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/package.json new file mode 100644 index 00000000..59548232 --- /dev/null +++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/package.json @@ -0,0 +1,32 @@ +{ + "name": "aspnet-angular", + "version": "0.1.0", + "description": "Helpers for using Angular in ASP.NET Core projects", + "main": "index.js", + "scripts": { + "prepublish": "rimraf *.d.ts && tsc && echo 'Finished building NPM package \"aspnet-angular\"'", + "test": "echo \"Error: no test specified\" && exit 1" + }, + "repository": { + "type": "git", + "url": "https://github.com/aspnet/JavaScriptServices.git" + }, + "author": "Microsoft", + "license": "Apache-2.0", + "bugs": { + "url": "https://github.com/aspnet/JavaScriptServices/issues" + }, + "devDependencies": { + "@angular/common": "^4.3.2", + "@angular/core": "^4.3.2", + "@angular/http": "^4.3.2", + "@angular/platform-browser": "^4.3.2", + "rimraf": "^2.6.1", + "typescript": "^2.4.2", + "rxjs": "^5.4.2", + "zone.js": "^0.8.16" + }, + "peerDependencies": { + "@angular/core": "^4.2.5 || ^5.0.0-beta" + } +} diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/src/HttpWithStateTransfer.ts b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/src/HttpWithStateTransfer.ts new file mode 100644 index 00000000..517dd7e7 --- /dev/null +++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/src/HttpWithStateTransfer.ts @@ -0,0 +1,94 @@ +import { Provider, NgModule, Inject } from '@angular/core'; +import { Headers, Http, ResponseOptions, RequestOptionsArgs, Response } from '@angular/http'; +import { Observable } from 'rxjs/Observable'; +import 'rxjs/add/observable/of'; +import 'rxjs/add/operator/map'; +const globalSerializedStateKey = 'HTTP_STATE_TRANSFER'; +const backingStoreDIToken = 'HTTP_STATE_BACKING_STORE'; + +export interface CacheOptions { + permanent: boolean; +} + +export interface CachedHttpResponse { + headers: { [name: string]: any } | null; + status: number; + statusText: string | null; + text: string; + url: string; +} + +export type BackingStore = { [key: string]: CachedHttpResponse }; + +export class HttpWithStateTransfer { + private backingStore: BackingStore; + private http: Http; + + constructor(@Inject(Http) http: Http, @Inject(backingStoreDIToken) backingStore: BackingStore) { + this.http = http; + this.backingStore = backingStore; + } + + public stateForTransfer(): any { + return { [globalSerializedStateKey]: this.backingStore }; + } + + public get(url: string, options?: CacheOptions, requestOptions?: RequestOptionsArgs): Observable { + return this.getCachedResponse(/* cacheKey */ url, () => this.http.get(url, requestOptions), options); + } + + private getCachedResponse(cacheKey: string, provider: () => Observable, options?: CacheOptions): Observable { + // By default, the cache is only used for the *first* client-side read. So, we're only performing + // a one-time transfer of server-side response to the client. If you want to keep and reuse cached + // responses continually during server-side and client-side execution, set 'permanent' to 'true. + const isClient = typeof window !== 'undefined'; + const isPermanent = options && options.permanent; + + const allowReadFromCache = isClient || isPermanent; + if (allowReadFromCache && this.backingStore.hasOwnProperty(cacheKey)) { + const cachedValue = this.backingStore[cacheKey]; + if (!isPermanent) { + delete this.backingStore[cacheKey]; + } + return Observable.of(new Response(new ResponseOptions({ + body: cachedValue.text, + headers: new Headers(cachedValue.headers), + status: cachedValue.status, + url: cachedValue.url + }))); + } + + return provider() + .map(response => { + const allowWriteToCache = !isClient || isPermanent; + if (allowWriteToCache) { + this.backingStore[cacheKey] = { + headers: response.headers ? response.headers.toJSON() : null, + status: response.status, + statusText: response.statusText, + text: response.text(), + url: response.url + }; + } + + return response; + }); + } +} + +export function defaultBackingStoreFactory() { + const transferredData = typeof window !== 'undefined' ? (window as any)[globalSerializedStateKey] : null; + return transferredData || {}; +} + +@NgModule({ + providers: [ + // The backing store is a separate DI service so you could override exactly how it gets + // transferred from server to client + { provide: backingStoreDIToken, useFactory: defaultBackingStoreFactory }, + + { provide: HttpWithStateTransfer, useClass: HttpWithStateTransfer }, + ] +}) +export class HttpWithStateTransferModule { +} diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/src/index.ts b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/src/index.ts new file mode 100644 index 00000000..93d21853 --- /dev/null +++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/src/index.ts @@ -0,0 +1 @@ +export * from './HttpWithStateTransfer'; diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/tsconfig.json b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/tsconfig.json new file mode 100644 index 00000000..22a6c266 --- /dev/null +++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/tsconfig.json @@ -0,0 +1,17 @@ +{ + "compilerOptions": { + "experimentalDecorators": true, + "moduleResolution": "node", + "module": "commonjs", + "target": "es5", + "declaration": true, + "outDir": ".", + "lib": ["es2015", "dom"] + }, + "files": [ + "src/index.ts" + ], + "exclude": [ + "node_modules" + ] +} From 5f1450c9bab9fce033564d381bff9dd62261b907 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 2 Aug 2017 10:53:46 +0100 Subject: [PATCH 213/411] Make aspnet-angular compatible with AoT compilation --- .../npm/aspnet-angular/.gitignore | 2 ++ .../npm/aspnet-angular/.npmignore | 1 + .../npm/aspnet-angular/package.json | 7 ++++--- .../npm/aspnet-angular/tsconfig.json | 5 ++++- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/.gitignore b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/.gitignore index 78790965..93666fdf 100644 --- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/.gitignore +++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/.gitignore @@ -1,3 +1,5 @@ /node_modules/ **/*.js **/*.d.ts +**/*.metadata.json +/compiled diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/.npmignore b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/.npmignore index 74dbfa8f..2df2c09c 100644 --- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/.npmignore +++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/.npmignore @@ -1,2 +1,3 @@ !/*.js !/*.d.ts +/compiled diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/package.json b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/package.json index 59548232..5153adea 100644 --- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/package.json +++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/package.json @@ -1,10 +1,10 @@ { "name": "aspnet-angular", - "version": "0.1.0", + "version": "0.1.1", "description": "Helpers for using Angular in ASP.NET Core projects", "main": "index.js", "scripts": { - "prepublish": "rimraf *.d.ts && tsc && echo 'Finished building NPM package \"aspnet-angular\"'", + "prepublish": "rimraf *.d.ts && ngc && echo 'Finished building NPM package \"aspnet-angular\"'", "test": "echo \"Error: no test specified\" && exit 1" }, "repository": { @@ -18,11 +18,12 @@ }, "devDependencies": { "@angular/common": "^4.3.2", + "@angular/compiler": "^4.3.2", + "@angular/compiler-cli": "^4.3.2", "@angular/core": "^4.3.2", "@angular/http": "^4.3.2", "@angular/platform-browser": "^4.3.2", "rimraf": "^2.6.1", - "typescript": "^2.4.2", "rxjs": "^5.4.2", "zone.js": "^0.8.16" }, diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/tsconfig.json b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/tsconfig.json index 22a6c266..3c6a30b7 100644 --- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/tsconfig.json +++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/tsconfig.json @@ -13,5 +13,8 @@ ], "exclude": [ "node_modules" - ] + ], + "angularCompilerOptions": { + "genDir": "compiled" + } } From d2858beaa183c18289d984d1e8b922a85b897cea Mon Sep 17 00:00:00 2001 From: John Luo Date: Wed, 2 Aug 2017 12:44:45 -0700 Subject: [PATCH 214/411] Update __get_remote_file logic --- build.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/build.sh b/build.sh index 5568c618..8eace4c2 100755 --- a/build.sh +++ b/build.sh @@ -99,17 +99,16 @@ __get_remote_file() { return 0 fi - failed=false + local succeeded=false if __machine_has wget; then - wget --tries 10 --quiet -O "$local_path" "$remote_path" || failed=true + wget --tries 10 --quiet -O "$local_path" "$remote_path" && succeeded=true fi - if [ "$failed" = true ] && __machine_has curl; then - failed=false - curl --retry 10 -sSL -f --create-dirs -o "$local_path" "$remote_path" || failed=true + if [ "$succeeded" = false ] && __machine_has curl; then + curl --retry 10 -sSL -f --create-dirs -o "$local_path" "$remote_path" && succeeded=true fi - if [ "$failed" = true ]; then + if [ "$succeeded" = false ]; then __error "Download failed: $remote_path" 1>&2 return 1 fi From 63f7ac9330f592b6fca3ba4c639f7f42b0c99edd Mon Sep 17 00:00:00 2001 From: John Luo Date: Wed, 2 Aug 2017 14:32:21 -0700 Subject: [PATCH 215/411] Ensure fallback to curl after failed wget --- build.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/build.sh b/build.sh index 8eace4c2..11cdbe55 100755 --- a/build.sh +++ b/build.sh @@ -99,16 +99,19 @@ __get_remote_file() { return 0 fi - local succeeded=false + local failed=false if __machine_has wget; then - wget --tries 10 --quiet -O "$local_path" "$remote_path" && succeeded=true + wget --tries 10 --quiet -O "$local_path" "$remote_path" || failed=true + else + failed=true fi - if [ "$succeeded" = false ] && __machine_has curl; then - curl --retry 10 -sSL -f --create-dirs -o "$local_path" "$remote_path" && succeeded=true + if [ "$failed" = true ] && __machine_has curl; then + failed=false + curl --retry 10 -sSL -f --create-dirs -o "$local_path" "$remote_path" || failed=true fi - if [ "$succeeded" = false ]; then + if [ "$failed" = true ]; then __error "Download failed: $remote_path" 1>&2 return 1 fi From 287c10fd2e2eaa8fe0e0f3421a20dcdfe39333a4 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 3 Aug 2017 10:52:08 +0100 Subject: [PATCH 216/411] Bump additional SPA templates package version to 1.0.0 --- templates/package-builder/src/yeoman/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/package-builder/src/yeoman/package.json b/templates/package-builder/src/yeoman/package.json index 289adfd9..3a41f2f9 100644 --- a/templates/package-builder/src/yeoman/package.json +++ b/templates/package-builder/src/yeoman/package.json @@ -1,6 +1,6 @@ { "name": "generator-aspnetcore-spa", - "version": "0.9.4", + "version": "1.0.0", "description": "Single-Page App templates for ASP.NET Core", "author": "Microsoft", "license": "Apache-2.0", From 5ed1a35ce0ff373e8a61278a096226b9dc5fe472 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 3 Aug 2017 18:00:46 +0100 Subject: [PATCH 217/411] Fix problems with AoT when using Angular Material. Fixes #1168 --- templates/AngularSpa/webpack.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/AngularSpa/webpack.config.js b/templates/AngularSpa/webpack.config.js index 85e238de..3354909a 100644 --- a/templates/AngularSpa/webpack.config.js +++ b/templates/AngularSpa/webpack.config.js @@ -17,7 +17,7 @@ module.exports = (env) => { }, module: { rules: [ - { test: /\.ts$/, include: /ClientApp/, use: isDevBuild ? ['awesome-typescript-loader?silent=true', 'angular2-template-loader'] : '@ngtools/webpack' }, + { test: /\.ts$/, use: isDevBuild ? ['awesome-typescript-loader?silent=true', 'angular2-template-loader'] : '@ngtools/webpack' }, { test: /\.html$/, use: 'html-loader?minimize=false' }, { test: /\.css$/, use: [ 'to-string-loader', isDevBuild ? 'css-loader' : 'css-loader?minimize' ] }, { test: /\.(png|jpg|jpeg|gif|svg)$/, use: 'url-loader?limit=25000' } From 128683be0ec7661a4bfaad50a83b1efb564aa5c4 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Thu, 17 Aug 2017 15:00:10 -0700 Subject: [PATCH 218/411] Pinning versions for 2.0.0 --- NuGet.config | 2 +- build/dependencies.props | 14 +++++++------- version.props | 1 - 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 37f0d27e..6a62aeda 100644 --- a/NuGet.config +++ b/NuGet.config @@ -2,7 +2,7 @@ - + diff --git a/build/dependencies.props b/build/dependencies.props index fdda160f..bf628533 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,12 +1,12 @@ - + - 2.0.0-* + 2.0.0 5.0.2 - 2.0.1-* + 2.0.1-rtm-15400 10.0.1 - 2.0.0-* - 2.0.0-* - 2.0.0-* - 4.8.0-* + 2.0.0 + 2.0.0 + 2.0.0 + 4.8.0 diff --git a/version.props b/version.props index eba6b167..e69e2c65 100644 --- a/version.props +++ b/version.props @@ -2,6 +2,5 @@ 2.0.0 - rtm From 6dddc9d01d4c827544d7a4406804c1fa552c9e4e Mon Sep 17 00:00:00 2001 From: alejandro garcia Date: Sat, 19 Aug 2017 13:07:49 +0200 Subject: [PATCH 219/411] Removed json loader from react redux template --- templates/ReactReduxSpa/package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/templates/ReactReduxSpa/package.json b/templates/ReactReduxSpa/package.json index cf2a4a36..c7c82883 100644 --- a/templates/ReactReduxSpa/package.json +++ b/templates/ReactReduxSpa/package.json @@ -25,7 +25,6 @@ "file-loader": "0.11.2", "history": "4.6.3", "jquery": "3.2.1", - "json-loader": "0.5.4", "node-noop": "1.0.0", "react": "15.6.1", "react-dom": "15.6.1", From a7e715c88f1bd8b9390540abdb57f35b0c423542 Mon Sep 17 00:00:00 2001 From: Steve Lathrop Date: Wed, 16 Aug 2017 03:03:34 -0400 Subject: [PATCH 220/411] Small grammatical fix to README.md --- src/Microsoft.AspNetCore.NodeServices/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.AspNetCore.NodeServices/README.md b/src/Microsoft.AspNetCore.NodeServices/README.md index fe905c58..c314db36 100644 --- a/src/Microsoft.AspNetCore.NodeServices/README.md +++ b/src/Microsoft.AspNetCore.NodeServices/README.md @@ -317,7 +317,7 @@ module.exports = { ## Hosting models -NodeServices has a pluggable hosting/transport mechanism, because it is an abstraction over various possible ways to invoke Node.js from .NET. This allows more high-level facilities (e.g., for Angular prerendering) to be agnostic to the details of launching Node and communicating it - those high-level facilities can just trust that *somehow* we can invoke code in Node for them. +NodeServices has a pluggable hosting/transport mechanism, because it is an abstraction over various possible ways to invoke Node.js from .NET. This allows more high-level facilities (e.g., for Angular prerendering) to be agnostic to the details of launching Node and communicating with it - those high-level facilities can just trust that *somehow* we can invoke code in Node for them. Using this abstraction, we could run Node inside the .NET process, in a separate process on the same machine, or even on a different machine altogether. At the time of writing, all the built-in hosting mechanisms work by launching Node as a separate process on the same machine as your .NET code. From fc398d602a9e908b62028c26fb7ecde827a519f7 Mon Sep 17 00:00:00 2001 From: frederikprijck Date: Tue, 15 Aug 2017 23:45:31 +0200 Subject: [PATCH 221/411] Allow lazy loading with AngularSpa in dev build Previously, the AngularSpa didn't include `angular2-router-loader`. This commit ensures it does. Closes #1194 --- templates/AngularSpa/package.json | 1 + templates/AngularSpa/webpack.config.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/templates/AngularSpa/package.json b/templates/AngularSpa/package.json index 4d1b203d..523908ac 100644 --- a/templates/AngularSpa/package.json +++ b/templates/AngularSpa/package.json @@ -19,6 +19,7 @@ "@angular/router": "4.2.5", "@ngtools/webpack": "1.5.0", "@types/webpack-env": "1.13.0", + "angular2-router-loader": "0.3.5", "angular2-template-loader": "0.6.2", "aspnet-prerendering": "^3.0.1", "aspnet-webpack": "^2.0.1", diff --git a/templates/AngularSpa/webpack.config.js b/templates/AngularSpa/webpack.config.js index 3354909a..c5e834ba 100644 --- a/templates/AngularSpa/webpack.config.js +++ b/templates/AngularSpa/webpack.config.js @@ -17,7 +17,7 @@ module.exports = (env) => { }, module: { rules: [ - { test: /\.ts$/, use: isDevBuild ? ['awesome-typescript-loader?silent=true', 'angular2-template-loader'] : '@ngtools/webpack' }, + { test: /\.ts$/, use: isDevBuild ? ['awesome-typescript-loader?silent=true', 'angular2-template-loader', 'angular2-router-loader'] : '@ngtools/webpack' }, { test: /\.html$/, use: 'html-loader?minimize=false' }, { test: /\.css$/, use: [ 'to-string-loader', isDevBuild ? 'css-loader' : 'css-loader?minimize' ] }, { test: /\.(png|jpg|jpeg|gif|svg)$/, use: 'url-loader?limit=25000' } From c2a284d5b8e2a42514ca9b55161bd3499c28fc65 Mon Sep 17 00:00:00 2001 From: Stephan Troyer Date: Thu, 13 Jul 2017 12:16:29 +0200 Subject: [PATCH 222/411] small Knockout cleanup --- templates/KnockoutSpa/ClientApp/router.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/templates/KnockoutSpa/ClientApp/router.ts b/templates/KnockoutSpa/ClientApp/router.ts index 61317504..eeb1b405 100644 --- a/templates/KnockoutSpa/ClientApp/router.ts +++ b/templates/KnockoutSpa/ClientApp/router.ts @@ -43,8 +43,7 @@ export class Router { $(document).on('click', 'a', this.clickEventListener); // Initialize Crossroads with starting location - // Need to cast history to 'any' because @types/history is out-of-date - crossroads.parse((history as any).location.pathname); + crossroads.parse(history.location.pathname); } public link(url: string): string { From a40adab38dba34458b25ecc2b3884278a8b2394c Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Mon, 21 Aug 2017 16:40:25 -0700 Subject: [PATCH 223/411] In non-ASP.NET apps, default project path to current working directory. Fixes #1100. --- samples/misc/LatencyTest/Program.cs | 1 - .../Configuration/NodeServicesOptions.cs | 9 +++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/samples/misc/LatencyTest/Program.cs b/samples/misc/LatencyTest/Program.cs index 9d426b68..bafe4b9f 100755 --- a/samples/misc/LatencyTest/Program.cs +++ b/samples/misc/LatencyTest/Program.cs @@ -21,7 +21,6 @@ public static void Main(string[] args) { // Since .NET Core 1.1, the HTTP hosting model has become basically as fast as the Socket hosting model //options.UseSocketHosting(); - options.ProjectPath = Directory.GetCurrentDirectory(); options.WatchFileExtensions = new string[] {}; // Don't watch anything }); var serviceProvider = services.BuildServiceProvider(); diff --git a/src/Microsoft.AspNetCore.NodeServices/Configuration/NodeServicesOptions.cs b/src/Microsoft.AspNetCore.NodeServices/Configuration/NodeServicesOptions.cs index 73dd2289..384abad0 100644 --- a/src/Microsoft.AspNetCore.NodeServices/Configuration/NodeServicesOptions.cs +++ b/src/Microsoft.AspNetCore.NodeServices/Configuration/NodeServicesOptions.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.IO; using System.Threading; using Microsoft.AspNetCore.NodeServices.HostingModels; using Microsoft.Extensions.Logging; @@ -34,14 +35,18 @@ public NodeServicesOptions(IServiceProvider serviceProvider) InvocationTimeoutMilliseconds = DefaultInvocationTimeoutMilliseconds; WatchFileExtensions = (string[])DefaultWatchFileExtensions.Clone(); - // In an ASP.NET environment, we can use the IHostingEnvironment data to auto-populate a few - // things that you'd otherwise have to specify manually var hostEnv = serviceProvider.GetService(); if (hostEnv != null) { + // In an ASP.NET environment, we can use the IHostingEnvironment data to auto-populate a few + // things that you'd otherwise have to specify manually ProjectPath = hostEnv.ContentRootPath; EnvironmentVariables["NODE_ENV"] = hostEnv.IsDevelopment() ? "development" : "production"; // De-facto standard values for Node } + else + { + ProjectPath = Directory.GetCurrentDirectory(); + } var applicationLifetime = serviceProvider.GetService(); if (applicationLifetime != null) From a94ac6f37e12c50705be6a7912f21e253c4aacc1 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Mon, 21 Aug 2017 16:48:30 -0700 Subject: [PATCH 224/411] For Redux dev tools, use newer __REDUX_DEVTOOLS_EXTENSION__ API. Fixes #1196 --- templates/ReactReduxSpa/ClientApp/configureStore.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/ReactReduxSpa/ClientApp/configureStore.ts b/templates/ReactReduxSpa/ClientApp/configureStore.ts index 79c22aba..7a3b4f44 100644 --- a/templates/ReactReduxSpa/ClientApp/configureStore.ts +++ b/templates/ReactReduxSpa/ClientApp/configureStore.ts @@ -9,7 +9,7 @@ export default function configureStore(history: History, initialState?: Applicat // Build middleware. These are functions that can process the actions before they reach the store. const windowIfDefined = typeof window === 'undefined' ? null : window as any; // If devTools is installed, connect to it - const devToolsExtension = windowIfDefined && windowIfDefined.devToolsExtension as () => GenericStoreEnhancer; + const devToolsExtension = windowIfDefined && windowIfDefined.__REDUX_DEVTOOLS_EXTENSION__ as () => GenericStoreEnhancer; const createStoreWithMiddleware = compose( applyMiddleware(thunk, routerMiddleware(history)), devToolsExtension ? devToolsExtension() : (next: StoreEnhancerStoreCreator) => next From d6ae8829b6c27b2306dc683017ecb7ba3483450c Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Mon, 21 Aug 2017 17:11:47 -0700 Subject: [PATCH 225/411] In HMR, don't rely on default JsonSerializer settings. Fixes #688 --- .../Webpack/WebpackDevMiddleware.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddleware.cs b/src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddleware.cs index ef8ac001..190fb492 100644 --- a/src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddleware.cs +++ b/src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddleware.cs @@ -15,6 +15,12 @@ public static class WebpackDevMiddleware { private const string DefaultConfigFile = "webpack.config.js"; + private static readonly JsonSerializerSettings jsonSerializerSettings = new JsonSerializerSettings + { + ContractResolver = new CamelCasePropertyNamesContractResolver(), + TypeNameHandling = TypeNameHandling.None + }; + /// /// Enables Webpack dev middleware support. This hosts an instance of the Webpack compiler in memory /// in your application so that you can always serve up-to-date Webpack-built resources without having @@ -88,7 +94,7 @@ public static void UseWebpackDevMiddleware( }; var devServerInfo = nodeServices.InvokeExportAsync(nodeScript.FileName, "createWebpackDevServer", - JsonConvert.SerializeObject(devServerOptions, new JsonSerializerSettings() { ContractResolver = new DefaultContractResolver() })).Result; + JsonConvert.SerializeObject(devServerOptions, jsonSerializerSettings)).Result; // If we're talking to an older version of aspnet-webpack, it will return only a single PublicPath, // not an array of PublicPaths. Handle that scenario. From eea2066a6d37938413cf068d012a3fac65215487 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Tue, 22 Aug 2017 14:33:30 -0700 Subject: [PATCH 226/411] Remove Yeoman generator - replace it with deprecation notice. --- .../package-builder/src/yeoman/.gitignore | 1 - .../package-builder/src/yeoman/README.md | 21 +- .../package-builder/src/yeoman/app/index.ts | 238 ------------------ .../package-builder/src/yeoman/package.json | 12 +- 4 files changed, 12 insertions(+), 260 deletions(-) delete mode 100644 templates/package-builder/src/yeoman/.gitignore delete mode 100644 templates/package-builder/src/yeoman/app/index.ts diff --git a/templates/package-builder/src/yeoman/.gitignore b/templates/package-builder/src/yeoman/.gitignore deleted file mode 100644 index 2ccbe465..00000000 --- a/templates/package-builder/src/yeoman/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/node_modules/ diff --git a/templates/package-builder/src/yeoman/README.md b/templates/package-builder/src/yeoman/README.md index fc87aa22..a64e1f90 100644 --- a/templates/package-builder/src/yeoman/README.md +++ b/templates/package-builder/src/yeoman/README.md @@ -1,14 +1,15 @@ -Generates ASP.NET Core projects for single-page applications. +# Please use "dotnet new" templates instead -Can generate projects with: +As of .NET Core 2.0, it's no longer necessary to use Yeoman to create new Single-Page Application projects. - * Angular - * Aurelia - * Knockout - * React - * React with Redux - * Vue +Using the .NET Core 2.0 SDK, you can run any of the following commands in an empty directory, without needing to install any external packages first: -For more information about features and usage, see [this blog post](https://blogs.msdn.microsoft.com/webdev/2017/02/14/building-single-page-applications-on-asp-net-core-with-javascriptservices/). + * `dotnet new angular` + * `dotnet new react` + * `dotnet new redux` -To learn more about the underlying technologies, or to report any issues, see [this project's GitHub repo](https://github.com/aspnet/JavaScriptServices). +Or, if you want to create an Aurelia, Knockout, or Vue application, you should run `dotnet new --install Microsoft.AspNetCore.SpaTemplates::*` first. This will add `aurelia`, `knockout`, and `vue` templates to `dotnet new`. + +#### This Yeoman generator is DEPRECATED + +Please don't use `generator-aspnetcore-spa` to create new projects. Its output is outdated and no longer maintained. Instead, use `dotnet new` as described above (or if you're on Windows and use Visual Studio, you can just use *File->New Project* to create Angular, React, or React+Redux projects). diff --git a/templates/package-builder/src/yeoman/app/index.ts b/templates/package-builder/src/yeoman/app/index.ts deleted file mode 100644 index 709af7ab..00000000 --- a/templates/package-builder/src/yeoman/app/index.ts +++ /dev/null @@ -1,238 +0,0 @@ -import * as fs from 'fs'; -import * as path from 'path'; -import * as yeoman from 'yeoman-generator'; -import * as uuid from 'node-uuid'; -import * as glob from 'glob'; -import * as semver from 'semver'; -import * as chalk from 'chalk'; -import { execSync } from 'child_process'; -const yosay = require('yosay'); -const toPascalCase = require('to-pascal-case'); -const isWindows = /^win/.test(process.platform); -const generatorPackageJson = require(path.resolve(__dirname, '../package.json')); - -// Paths matching these regexes will only be included if the user wants tests -const testSpecificPaths = [ - /\.spec.ts$/, // Files ending '.spec.ts' - /(^|\/|\\)test($|\/|\\)/ // Files under any directory called 'test' -]; - -// These NPM dependencies will only be included if the user wants tests -const testSpecificNpmPackages = [ - "@types/chai", - "@types/jasmine", - "chai", - "jasmine-core", - "karma", - "karma-chai", - "karma-chrome-launcher", - "karma-cli", - "karma-jasmine", - "karma-webpack" -]; - -type YeomanPrompt = (opt: yeoman.IPromptOptions | yeoman.IPromptOptions[], callback: (answers: any) => void) => void; -const optionOrPrompt: YeomanPrompt = require('yeoman-option-or-prompt'); - -interface TemplateConfig { - value: string; // Internal unique ID for Yeoman prompt - rootDir: string; // Which of the template root directories should be used - name: string; // Display name - tests: boolean; -} - -const templates: TemplateConfig[] = [ - { value: 'angular', rootDir: 'angular', name: 'Angular', tests: true }, - { value: 'aurelia', rootDir: 'aurelia', name: 'Aurelia', tests: false }, - { value: 'knockout', rootDir: 'knockout', name: 'Knockout', tests: false }, - { value: 'react', rootDir: 'react', name: 'React', tests: false }, - { value: 'react-redux', rootDir: 'react-redux', name: 'React with Redux', tests: false }, - { value: 'vue', rootDir: 'vue', name: 'Vue', tests: false } -]; - -class MyGenerator extends yeoman.Base { - private _answers: any; - private _optionOrPrompt: YeomanPrompt; - - constructor(args: string | string[], options: any) { - super(args, options); - this._optionOrPrompt = optionOrPrompt; - this.log(yosay('Welcome to the ASP.NET Core Single-Page App generator!\n\nVersion: ' + generatorPackageJson.version)); - - if (isWindows) { - assertNpmVersionIsAtLeast('3.0.0'); - } - - assertDotNetSDKVersionIsAtLeast('1.0.0'); - } - - prompting() { - this.option('projectguid'); - - const done = this.async(); - this._optionOrPrompt([{ - type: 'list', - name: 'framework', - message: 'Framework', - choices: templates - }], firstAnswers => { - const templateConfig = templates.filter(t => t.value === firstAnswers.framework)[0]; - const furtherQuestions = [{ - type: 'input', - name: 'name', - message: 'Your project name', - default: this.appname - }]; - - if (templateConfig.tests) { - furtherQuestions.unshift({ - type: 'confirm', - name: 'tests', - message: 'Do you want to include unit tests?', - default: true as any - }); - } - - this._optionOrPrompt(furtherQuestions, answers => { - answers.framework = firstAnswers.framework; - this._answers = answers; - this._answers.framework = firstAnswers.framework; - this._answers.templateConfig = templateConfig; - this._answers.namePascalCase = toPascalCase(answers.name); - this._answers.projectGuid = this.options['projectguid'] || uuid.v4(); - this._answers.sdkVersion = getDotNetSDKVersion(); - - done(); - }); - }); - } - - writing() { - const templateConfig = this._answers.templateConfig as TemplateConfig; - const templateRoot = this.templatePath(templateConfig.rootDir); - glob.sync('**/*', { cwd: templateRoot, dot: true, nodir: true }).forEach(fn => { - // Token replacement in filenames - let outputFn = fn.replace(/tokenreplace\-([^\.\/]*)/g, (substr, token) => this._answers[token]); - - // Rename template_gitignore to .gitignore in output - if (path.basename(fn) === 'template_gitignore') { - outputFn = path.join(path.dirname(fn), '.gitignore'); - } - - // Decide whether to emit this file - const isTestSpecificFile = testSpecificPaths.some(regex => regex.test(outputFn)); - const emitFile = (this._answers.tests || !isTestSpecificFile); - - if (emitFile) { - let inputFullPath = path.join(templateRoot, fn); - let destinationFullPath = this.destinationPath(outputFn); - let deleteInputFileAfter = false; - if (path.basename(fn) === 'package.json') { - // Special handling for package.json, because we rewrite it dynamically - const tempPath = destinationFullPath + '.tmp'; - this.fs.writeJSON( - tempPath, - rewritePackageJson(JSON.parse(fs.readFileSync(inputFullPath, 'utf8')), this._answers.tests), - /* replacer */ null, - /* space */ 2 - ); - inputFullPath = tempPath; - deleteInputFileAfter = true; - } - - const outputDirBasename = path.basename(path.dirname(destinationFullPath)); - if (outputDirBasename === 'dist') { - // Don't do token replacement in 'dist' files, as they might just randomly contain - // sequences like '<%=' even though they aren't actually template files - this.fs.copy( - inputFullPath, - destinationFullPath - ); - } else { - this.fs.copyTpl( - inputFullPath, - destinationFullPath, - this._answers - ); - } - - if (deleteInputFileAfter) { - this.fs.delete(inputFullPath); - } - } - }); - } - - installingDeps() { - this.installDependencies({ - npm: true, - bower: false, - callback: () => { - this.spawnCommandSync('dotnet', ['restore']); - this.spawnCommandSync('./node_modules/.bin/webpack', ['--config', 'webpack.config.vendor.js']); - this.spawnCommandSync('./node_modules/.bin/webpack'); - } - }); - } -} - -function assertNpmVersionIsAtLeast(minVersion: string) { - const runningVersion = execSync('npm -v').toString(); - if (!semver.gte(runningVersion, minVersion, /* loose */ true)) { - console.error(`This generator requires NPM version ${minVersion} or later. You are running NPM version ${runningVersion}`); - process.exit(1); - } -} - -function assertDotNetSDKVersionIsAtLeast(minVersion: string) { - const runningVersion = getDotNetSDKVersion(); - if (!runningVersion) { - console.error('Could not find dotnet tool on system path. Please install dotnet core SDK then try again.'); - console.error('Try running "dotnet --version" to verify you have it.'); - process.exit(1); - } else if (!semver.gte(runningVersion, minVersion, /* loose */ true)) { - console.error(`This generator requires dotnet SDK version ${minVersion} or later. You have version ${runningVersion}`); - console.error('Please update your dotnet SDK then try again. You can run "dotnet --version" to check your version.'); - process.exit(1); - } -} - -function getDotNetSDKVersion() { - try { - return execSync('dotnet --version').toString().replace(/\r|\n/g, ''); - } catch (ex) { - return null; - } -} - -function rewritePackageJson(contents, includeTests) { - if (!includeTests) { - // Delete any test-specific packages from dependencies and devDependencies - ['dependencies', 'devDependencies'].forEach(dependencyListName => { - var packageList = contents[dependencyListName]; - if (packageList) { - testSpecificNpmPackages.forEach(packageToRemove => { - delete packageList[packageToRemove]; - }); - - if (Object.getOwnPropertyNames(packageList).length === 0) { - delete contents[dependencyListName]; - } - } - }); - - // Delete any script called 'test' - const scripts = contents.scripts; - if (scripts && scripts.test) { - delete scripts.test; - if (Object.getOwnPropertyNames(scripts).length === 0) { - delete contents.scripts; - } - } - } - - return contents; -} - -declare var module: any; -(module).exports = MyGenerator; diff --git a/templates/package-builder/src/yeoman/package.json b/templates/package-builder/src/yeoman/package.json index 3a41f2f9..7cbccd53 100644 --- a/templates/package-builder/src/yeoman/package.json +++ b/templates/package-builder/src/yeoman/package.json @@ -1,12 +1,9 @@ { "name": "generator-aspnetcore-spa", "version": "1.0.0", - "description": "Single-Page App templates for ASP.NET Core", + "description": "DEPRECATED. Do not use. Use 'dotnet new' to create ASP.NET Core Single-Page Application projects instead.", "author": "Microsoft", "license": "Apache-2.0", - "files": [ - "app" - ], "keywords": [ "yeoman-generator" ], @@ -18,12 +15,5 @@ "url": "https://github.com/aspnet/JavaScriptServices.git" }, "dependencies": { - "chalk": "^1.1.3", - "glob": "^7.0.3", - "node-uuid": "^1.4.7", - "to-pascal-case": "^1.0.0", - "yeoman-generator": "^0.20.2", - "yeoman-option-or-prompt": "^1.0.2", - "yosay": "^1.1.1" } } From e057cb35ec879f3b22bf6983a9b6c61bdefaf5a6 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Tue, 22 Aug 2017 14:43:51 -0700 Subject: [PATCH 227/411] Remove Yeoman from the template build process --- templates/package-builder/README.md | 4 +- templates/package-builder/package.json | 5 +-- templates/package-builder/src/build/build.ts | 37 ------------------- .../Microsoft.AspNetCore.SpaTemplates.nuspec | 2 +- 4 files changed, 5 insertions(+), 43 deletions(-) diff --git a/templates/package-builder/README.md b/templates/package-builder/README.md index 74d42abf..a4b9d47c 100644 --- a/templates/package-builder/README.md +++ b/templates/package-builder/README.md @@ -1,5 +1,5 @@ -To generator the Yeoman generator, execute: +To generator the package generator, execute: npm run build -Output will appear in the `generator-aspnetcore-spa` directory. +Output will appear in the `dist/artifacts` directory. diff --git a/templates/package-builder/package.json b/templates/package-builder/package.json index 4b91c7a4..d3b248c8 100644 --- a/templates/package-builder/package.json +++ b/templates/package-builder/package.json @@ -1,11 +1,11 @@ { "name": "generator-aspnetcore-spa-generator", "version": "1.0.0", - "description": "Creates the Yeoman generator and 'dotnet new' package for ASP.NET Core SPA templates", + "description": "Creates the 'dotnet new' package for ASP.NET Core SPA templates", "main": "index.js", "scripts": { "test": "echo \"Error: no test specified\" && exit 1", - "build": "tsc && node ./tmp/build/build.js" + "build": "tsc && node ./tmp/build.js" }, "author": "Microsoft", "license": "Apache-2.0", @@ -28,7 +28,6 @@ "@types/node": "^6.0.45", "@types/node-uuid": "0.0.28", "@types/rimraf": "0.0.28", - "@types/yeoman-generator": "0.0.30", "typescript": "^2.0.0" } } diff --git a/templates/package-builder/src/build/build.ts b/templates/package-builder/src/build/build.ts index fab6d48b..c0827deb 100644 --- a/templates/package-builder/src/build/build.ts +++ b/templates/package-builder/src/build/build.ts @@ -10,7 +10,6 @@ import * as targz from 'tar.gz'; const isWindows = /^win/.test(process.platform); const textFileExtensions = ['.gitignore', 'template_gitignore', '.config', '.cs', '.cshtml', '.csproj', '.html', '.js', '.json', '.jsx', '.md', '.nuspec', '.ts', '.tsx']; -const yeomanGeneratorSource = './src/yeoman'; const webToolsVSPackageGuid = '{0CD94836-1526-4E85-87D3-FB5274C5AFC9}'; const dotNetPackages = { @@ -100,31 +99,6 @@ function getBuildNumber(): string { return Math.floor((new Date().valueOf() - new Date(2017, 0, 1).valueOf()) / (60*1000)) + '-local'; } -function buildYeomanNpmPackage(outputRoot: string) { - const outputTemplatesRoot = path.join(outputRoot, 'app/templates'); - rimraf.sync(outputTemplatesRoot); - - // Copy template files - const filenameReplacements = [ - { from: /.*\.csproj$/, to: 'tokenreplace-namePascalCase.csproj' } - ]; - const contentReplacements = [ - // Currently, there are none - ]; - _.forEach(templates, (templateConfig, templateName) => { - const outputDir = path.join(outputTemplatesRoot, templateName); - writeTemplate(templateConfig.dir, outputDir, contentReplacements, filenameReplacements); - }); - - // Also copy the generator files (that's the compiled .js files, plus all other non-.ts files) - const tempRoot = './tmp'; - copyRecursive(path.join(tempRoot, 'yeoman'), outputRoot, '**/*.js'); - copyRecursive(yeomanGeneratorSource, outputRoot, '**/!(*.ts)'); - - // Clean up - rimraf.sync(tempRoot); -} - function buildDotNetNewNuGetPackages(outputDir: string) { const dotNetPackageIds = _.values(dotNetPackages); dotNetPackageIds.forEach(packageId => { @@ -275,12 +249,10 @@ function buildDotNetNewNuGetPackage(packageId: string) { }); // Create the .nuspec file - const yeomanPackageVersion = JSON.parse(fs.readFileSync(path.join(yeomanGeneratorSource, 'package.json'), 'utf8')).version; const nuspecContentTemplate = fs.readFileSync(`./src/dotnetnew/${ packageId }.nuspec`); writeFileEnsuringDirExists(outputRoot, `${ packageId }.nuspec`, applyContentReplacements(nuspecContentTemplate, [ - { from: /\{yeomanversion\}/g, to: yeomanPackageVersion }, { from: /\{buildnumber\}/g, to: getBuildNumber() }, ]) ); @@ -313,16 +285,7 @@ function runPrepublishScripts(rootDir: string, scripts: string[]) { const distDir = './dist'; const artifactsDir = path.join(distDir, 'artifacts'); -const yeomanOutputRoot = path.join(distDir, 'generator-aspnetcore-spa'); rimraf.sync(distDir); mkdirp.sync(artifactsDir); -buildYeomanNpmPackage(yeomanOutputRoot); buildDotNetNewNuGetPackages(artifactsDir); - -// Finally, create a .tar.gz file containing the built generator-aspnetcore-spa. -// The CI system can treat this as the final built artifact. -// Note that the targz APIs only come in async flavor. -targz().compress(yeomanOutputRoot, path.join(artifactsDir, 'generator-aspnetcore-spa.tar.gz'), err => { - if (err) { throw err; } -}); diff --git a/templates/package-builder/src/dotnetnew/Microsoft.AspNetCore.SpaTemplates.nuspec b/templates/package-builder/src/dotnetnew/Microsoft.AspNetCore.SpaTemplates.nuspec index 615d8b0b..e873687a 100644 --- a/templates/package-builder/src/dotnetnew/Microsoft.AspNetCore.SpaTemplates.nuspec +++ b/templates/package-builder/src/dotnetnew/Microsoft.AspNetCore.SpaTemplates.nuspec @@ -2,7 +2,7 @@ Microsoft.AspNetCore.SpaTemplates - {yeomanversion} + 1.0.{buildnumber} Single Page Application templates for ASP.NET Core Microsoft en-US From cd9ad38a99c443ca576b1d52c394ee709051bb04 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Tue, 22 Aug 2017 16:13:34 -0700 Subject: [PATCH 228/411] Run tests against 'dotnet new' output instead of Yeoman output --- test/package.json | 3 +- test/templates/angular.spec.ts | 19 ++++++---- test/templates/util/dotnetnew.ts | 63 ++++++++++++++++++++++++++++++++ test/templates/util/yeoman.ts | 52 -------------------------- 4 files changed, 75 insertions(+), 62 deletions(-) create mode 100644 test/templates/util/dotnetnew.ts delete mode 100644 test/templates/util/yeoman.ts diff --git a/test/package.json b/test/package.json index 9bcf24a2..39e4e4a9 100644 --- a/test/package.json +++ b/test/package.json @@ -23,8 +23,7 @@ "selenium-standalone": "^5.9.0", "tree-kill": "^1.1.0", "typescript": "^2.1.4", - "webdriverio": "^4.5.0", - "yo": "^1.8.5" + "webdriverio": "^4.5.0" }, "devDependencies": { "wdio-junit-reporter": "^0.2.0", diff --git a/test/templates/angular.spec.ts b/test/templates/angular.spec.ts index 9a96d139..fc214e2d 100644 --- a/test/templates/angular.spec.ts +++ b/test/templates/angular.spec.ts @@ -1,21 +1,24 @@ import * as fs from 'fs'; import * as path from 'path'; +import * as rimraf from 'rimraf'; import { expect } from 'chai'; -import { generateProjectSync } from './util/yeoman'; +import { generateProjectSync } from './util/dotnetnew'; import { AspNetProcess, AspNetCoreEnviroment, defaultUrl, publishProjectSync } from './util/aspnet'; import { getValue, getCssPropertyValue } from './util/webdriverio'; -// First, generate a new project using the locally-built generator-aspnetcore-spa +// First, generate a new project using the locally-built templates package // Do this outside the Mocha fixture, otherwise Mocha will time out const appDir = path.resolve(__dirname, '../generated/angular'); const publishedAppDir = path.resolve(appDir, './bin/Release/published'); +const publishedAppDllName = path.basename(appDir) + '.dll'; if (!process.env.SKIP_PROJECT_GENERATION) { - generateProjectSync(appDir, { - framework: 'angular', - name: 'Test App', - tests: true - }); + generateProjectSync(appDir, 'angular'); publishProjectSync(appDir, publishedAppDir); + + // Clear out any artifacts produced during publishing so they don't affect + // the dev-mode application + rimraf.sync(path.join(appDir, 'ClientApp/dist')); + rimraf.sync(path.join(appDir, 'wwwroot/dist')); } function testBasicNavigation() { @@ -95,6 +98,6 @@ describe('Angular template: dev mode', () => { }); describe('Angular template: production mode', () => { - AspNetProcess.RunInMochaContext(publishedAppDir, AspNetCoreEnviroment.production, 'TestApp.dll'); + AspNetProcess.RunInMochaContext(publishedAppDir, AspNetCoreEnviroment.production, publishedAppDllName); testBasicNavigation(); }); \ No newline at end of file diff --git a/test/templates/util/dotnetnew.ts b/test/templates/util/dotnetnew.ts new file mode 100644 index 00000000..171607a5 --- /dev/null +++ b/test/templates/util/dotnetnew.ts @@ -0,0 +1,63 @@ +import * as childProcess from 'child_process'; +import * as fs from 'fs'; +import * as path from 'path'; +import * as rimraf from 'rimraf'; +import * as mkdirp from 'mkdirp'; + +const templatePackageName = 'Microsoft.DotNet.Web.Spa.ProjectTemplates'; +const templatePackageArtifactsDir = '../templates/package-builder/dist/artifacts'; + +export function generateProjectSync(targetDir: string, templateName: string) { + installTemplatePackage(targetDir, templatePackageName, templateName); + executeDotNetNewTemplateSync(targetDir, templateName); + executeCommand('npm install', /* quiet */ false, targetDir); +} + +function installTemplatePackage(targetDir: string, packageName: string, templateName: string) { + // First figure out which file is the latest one for this package + const packagePaths = fs.readdirSync(templatePackageArtifactsDir) + .filter(name => name.startsWith(templatePackageName + '.')) + .filter(name => path.extname(name) === '.nupkg') + .map(name => path.join(templatePackageArtifactsDir, name)) + .sort(); + const latestPackagePath = packagePaths[packagePaths.length - 1]; + + if (!latestPackagePath) { + throw new Error(`Could not find ${packageName}.*.nupkg in directory ${templatePackageArtifactsDir}`); + } + + // Uninstall any older version so we can be sure the new one did install + try { + console.log(`Uninstalling any prior version of ${packageName}...`); + executeCommand(`dotnet new --uninstall ${packageName}`, /* quiet */ true); + } catch (ex) { + // Either no prior version existed, or we failed to uninstall. We'll determine + // which it was next. + } + try { + console.log(`Verifying that no prior version of ${packageName} is still installed...`); + executeDotNetNewTemplateSync(targetDir, templateName, /* quiet */ true); + throw new Error(`Failed to uninstall template package ${packageName}. The template '${templateName}' was not removed as expected.`); + } catch (ex) { + // Looks like we successfully uninstalled it + console.log(`Confirmed that no prior version of ${templatePackageName} remains installed.`); + } + + // Now install the new version + console.log(`Installing new templates package at ${latestPackagePath}...`); + executeCommand(`dotnet new --install ${latestPackagePath}`, /* quiet */ true); +} + +function executeDotNetNewTemplateSync(targetDir: string, templateName: string, quiet?: boolean) { + rimraf.sync(targetDir); + mkdirp.sync(targetDir); + executeCommand(`dotnet new ${templateName}`, quiet, targetDir); +} + +function executeCommand(command: string, quiet?: boolean, cwd?: string) { + childProcess.execSync(command, { + cwd, + stdio: quiet ? null : 'inherit', + encoding: 'utf8' + }); +} diff --git a/test/templates/util/yeoman.ts b/test/templates/util/yeoman.ts deleted file mode 100644 index 12177fc7..00000000 --- a/test/templates/util/yeoman.ts +++ /dev/null @@ -1,52 +0,0 @@ -import * as childProcess from 'child_process'; -import * as path from 'path'; -import * as rimraf from 'rimraf'; -import * as mkdirp from 'mkdirp'; - -const generatorDirRelative = '../templates/package-builder/dist/generator-aspnetcore-spa'; -const yoPackageDirAbsolute = path.resolve('./node_modules/yo'); - -export interface GeneratorOptions { - framework: string; - name: string; - tests?: boolean; -} - -export function generateProjectSync(targetDir: string, generatorOptions: GeneratorOptions) { - const generatorDirAbsolute = path.resolve(generatorDirRelative); - console.log(`Running NPM install to prepare Yeoman generator at ${ generatorDirAbsolute }`); - childProcess.execSync(`npm install`, { stdio: 'inherit', cwd: generatorDirAbsolute }); - - console.log(`Ensuring empty output directory at ${ targetDir }`); - rimraf.sync(targetDir); - mkdirp.sync(targetDir); - - const yoExecutableAbsolute = findYeomanCliScript(); - console.log(`Will invoke Yeoman at ${ yoExecutableAbsolute } to generate application in ${ targetDir } with options:`); - console.log(JSON.stringify(generatorOptions, null, 2)); - const command = `node "${ yoExecutableAbsolute }" "${ path.resolve(generatorDirAbsolute, './app/index.js') }"`; - const args = makeYeomanCommandLineArgs(generatorOptions); - childProcess.execSync(`${ command } ${ args }`, { - stdio: 'inherit', - cwd: targetDir - }); -} - -function findYeomanCliScript() { - // On Windows, you can't invoke ./node_modules/.bin/yo from the shell for some reason. - // So instead, we'll locate the CLI entrypoint that yeoman would expose if it was installed globally. - const yeomanPackageJsonPath = path.join(yoPackageDirAbsolute, './package.json'); - const yeomanPackageJson = require(yeomanPackageJsonPath); - const yeomanCliScriptRelative = yeomanPackageJson.bin.yo; - if (!yeomanCliScriptRelative) { - throw new Error(`Could not find Yeoman CLI script. Looked for a bin/yo entry in ${ yeomanPackageJsonPath }`); - } - - return path.join(yoPackageDirAbsolute, yeomanCliScriptRelative); -} - -function makeYeomanCommandLineArgs(generatorOptions: GeneratorOptions) { - return Object.getOwnPropertyNames(generatorOptions) - .map(key => `--${ key }="${ generatorOptions[key] }"`) - .join(' '); -} From ad758b10601a7ef188cefb6c072016d63174442b Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Tue, 22 Aug 2017 16:20:25 -0700 Subject: [PATCH 229/411] Update AppVeyor config to remove Yeoman artifact reference --- appveyor.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index f4cfc668..00f7bb63 100755 --- a/appveyor.yml +++ b/appveyor.yml @@ -18,8 +18,6 @@ build_script: - npm run build - ps: Pop-Location artifacts: - - path: templates\package-builder\dist\artifacts\generator-aspnetcore-spa.tar.gz - name: generator-aspnetcore-spa - path: templates\package-builder\dist\artifacts\*.nupkg name: Microsoft.AspNetCore.SpaTemplates type: NuGetPackage From 900e9ca835c77e347b10ebf619706f7b88401df7 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Tue, 22 Aug 2017 17:11:02 -0700 Subject: [PATCH 230/411] Add deprecation notice to Yeoman package --- templates/package-builder/src/yeoman/.gitignore | 1 + templates/package-builder/src/yeoman/README.md | 4 ++-- templates/package-builder/src/yeoman/app/index.js | 15 +++++++++++++++ templates/package-builder/src/yeoman/package.json | 7 +++++++ 4 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 templates/package-builder/src/yeoman/.gitignore create mode 100644 templates/package-builder/src/yeoman/app/index.js diff --git a/templates/package-builder/src/yeoman/.gitignore b/templates/package-builder/src/yeoman/.gitignore new file mode 100644 index 00000000..07e6e472 --- /dev/null +++ b/templates/package-builder/src/yeoman/.gitignore @@ -0,0 +1 @@ +/node_modules diff --git a/templates/package-builder/src/yeoman/README.md b/templates/package-builder/src/yeoman/README.md index a64e1f90..549f7cf0 100644 --- a/templates/package-builder/src/yeoman/README.md +++ b/templates/package-builder/src/yeoman/README.md @@ -1,4 +1,4 @@ -# Please use "dotnet new" templates instead +## Please use "dotnet new" templates instead As of .NET Core 2.0, it's no longer necessary to use Yeoman to create new Single-Page Application projects. @@ -10,6 +10,6 @@ Using the .NET Core 2.0 SDK, you can run any of the following commands in an emp Or, if you want to create an Aurelia, Knockout, or Vue application, you should run `dotnet new --install Microsoft.AspNetCore.SpaTemplates::*` first. This will add `aurelia`, `knockout`, and `vue` templates to `dotnet new`. -#### This Yeoman generator is DEPRECATED +### This Yeoman generator is DEPRECATED Please don't use `generator-aspnetcore-spa` to create new projects. Its output is outdated and no longer maintained. Instead, use `dotnet new` as described above (or if you're on Windows and use Visual Studio, you can just use *File->New Project* to create Angular, React, or React+Redux projects). diff --git a/templates/package-builder/src/yeoman/app/index.js b/templates/package-builder/src/yeoman/app/index.js new file mode 100644 index 00000000..bcddcc5f --- /dev/null +++ b/templates/package-builder/src/yeoman/app/index.js @@ -0,0 +1,15 @@ +var Generator = require('yeoman-generator'); +var fs = require('fs'); +var path = require('path'); +var marked = require('marked'); +var TerminalRenderer = require('marked-terminal'); + +marked.setOptions({ renderer: new TerminalRenderer() }); + +module.exports = class extends Generator { + run() { + // Just display deprecation notice from README.md + const readmePath = path.join(__dirname, '../README.md'); + console.log(marked(fs.readFileSync(readmePath, 'utf8'))); + } +}; diff --git a/templates/package-builder/src/yeoman/package.json b/templates/package-builder/src/yeoman/package.json index 7cbccd53..252f1aec 100644 --- a/templates/package-builder/src/yeoman/package.json +++ b/templates/package-builder/src/yeoman/package.json @@ -4,6 +4,10 @@ "description": "DEPRECATED. Do not use. Use 'dotnet new' to create ASP.NET Core Single-Page Application projects instead.", "author": "Microsoft", "license": "Apache-2.0", + "files": [ + "app", + "README.md" + ], "keywords": [ "yeoman-generator" ], @@ -15,5 +19,8 @@ "url": "https://github.com/aspnet/JavaScriptServices.git" }, "dependencies": { + "marked": "^0.3.6", + "marked-terminal": "^2.0.0", + "yeoman-generator": "^1.0.0" } } From 7c52be5e42df10973e54b0a4110d27ce235adf91 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Tue, 22 Aug 2017 18:06:48 -0700 Subject: [PATCH 231/411] Stop generating .template.config files dynamically. Convert them to plain files on disk. --- .../.template.config/dotnetcli.host.json | 17 +++ .../AngularSpa/.template.config/template.json | 87 +++++++++++ .../.template.config/vs-2017.3.host.json | 20 +++ .../.template.config/dotnetcli.host.json | 17 +++ .../AureliaSpa/.template.config/template.json | 87 +++++++++++ .../.template.config/vs-2017.3.host.json | 20 +++ .../.template.config/dotnetcli.host.json | 17 +++ .../.template.config/template.json | 87 +++++++++++ .../.template.config/vs-2017.3.host.json | 20 +++ .../.template.config/dotnetcli.host.json | 17 +++ .../.template.config/template.json | 87 +++++++++++ .../.template.config/vs-2017.3.host.json | 20 +++ .../.template.config/dotnetcli.host.json | 17 +++ .../ReactSpa/.template.config/template.json | 87 +++++++++++ .../.template.config/vs-2017.3.host.json | 20 +++ .../.template.config/dotnetcli.host.json | 17 +++ .../VueSpa/.template.config/template.json | 87 +++++++++++ .../.template.config/vs-2017.3.host.json | 20 +++ templates/package-builder/src/build/build.ts | 142 +----------------- 19 files changed, 750 insertions(+), 136 deletions(-) create mode 100644 templates/AngularSpa/.template.config/dotnetcli.host.json create mode 100644 templates/AngularSpa/.template.config/template.json create mode 100644 templates/AngularSpa/.template.config/vs-2017.3.host.json create mode 100644 templates/AureliaSpa/.template.config/dotnetcli.host.json create mode 100644 templates/AureliaSpa/.template.config/template.json create mode 100644 templates/AureliaSpa/.template.config/vs-2017.3.host.json create mode 100644 templates/KnockoutSpa/.template.config/dotnetcli.host.json create mode 100644 templates/KnockoutSpa/.template.config/template.json create mode 100644 templates/KnockoutSpa/.template.config/vs-2017.3.host.json create mode 100644 templates/ReactReduxSpa/.template.config/dotnetcli.host.json create mode 100644 templates/ReactReduxSpa/.template.config/template.json create mode 100644 templates/ReactReduxSpa/.template.config/vs-2017.3.host.json create mode 100644 templates/ReactSpa/.template.config/dotnetcli.host.json create mode 100644 templates/ReactSpa/.template.config/template.json create mode 100644 templates/ReactSpa/.template.config/vs-2017.3.host.json create mode 100644 templates/VueSpa/.template.config/dotnetcli.host.json create mode 100644 templates/VueSpa/.template.config/template.json create mode 100644 templates/VueSpa/.template.config/vs-2017.3.host.json diff --git a/templates/AngularSpa/.template.config/dotnetcli.host.json b/templates/AngularSpa/.template.config/dotnetcli.host.json new file mode 100644 index 00000000..c15c6681 --- /dev/null +++ b/templates/AngularSpa/.template.config/dotnetcli.host.json @@ -0,0 +1,17 @@ +{ + "$schema": "http://json.schemastore.org/dotnetcli.host", + "symbolInfo": { + "TargetFrameworkOverride": { + "isHidden": "true", + "longName": "target-framework-override", + "shortName": "" + }, + "Framework": { + "longName": "framework" + }, + "skipRestore": { + "longName": "no-restore", + "shortName": "" + } + } +} \ No newline at end of file diff --git a/templates/AngularSpa/.template.config/template.json b/templates/AngularSpa/.template.config/template.json new file mode 100644 index 00000000..179a495b --- /dev/null +++ b/templates/AngularSpa/.template.config/template.json @@ -0,0 +1,87 @@ +{ + "author": "Microsoft", + "classifications": [ + "Web", + "MVC", + "SPA" + ], + "groupIdentity": "Microsoft.DotNet.Web.Spa.ProjectTemplates.Angular", + "identity": "Microsoft.DotNet.Web.Spa.ProjectTemplates.Angular.CSharp", + "name": "ASP.NET Core with Angular", + "preferNameDirectory": true, + "primaryOutputs": [ + { + "path": "WebApplicationBasic.csproj" + } + ], + "shortName": "angular", + "sourceName": "WebApplicationBasic", + "sources": [ + { + "source": "./", + "target": "./", + "exclude": [ + ".template.config/**" + ] + } + ], + "symbols": { + "TargetFrameworkOverride": { + "type": "parameter", + "description": "Overrides the target framework", + "replaces": "TargetFrameworkOverride", + "datatype": "string", + "defaultValue": "" + }, + "Framework": { + "type": "parameter", + "description": "The target framework for the project.", + "datatype": "choice", + "choices": [ + { + "choice": "netcoreapp2.0", + "description": "Target netcoreapp2.0" + } + ], + "replaces": "netcoreapp2.0", + "defaultValue": "netcoreapp2.0" + }, + "HostIdentifier": { + "type": "bind", + "binding": "HostIdentifier" + }, + "skipRestore": { + "type": "parameter", + "datatype": "bool", + "description": "If specified, skips the automatic restore of the project on create.", + "defaultValue": "false" + } + }, + "tags": { + "language": "C#", + "type": "project" + }, + "postActions": [ + { + "condition": "(!skipRestore)", + "description": "Restore NuGet packages required by this project.", + "manualInstructions": [ + { + "text": "Run 'dotnet restore'" + } + ], + "actionId": "210D431B-A78B-4D2F-B762-4ED3E3EA9025", + "continueOnError": true + }, + { + "condition": "(HostIdentifier == \"dotnetcli\" || HostIdentifier == \"dotnetcli-preview\")", + "actionId": "AC1156F7-BB77-4DB8-B28F-24EEBCCA1E5C", + "description": "\n\n-------------------------------------------------------------------\nIMPORTANT: Before running this project on the command line,\n you must restore NPM packages by running \"npm install\"\n-------------------------------------------------------------------\n", + "manualInstructions": [ + { + "text": "Run \"npm install\"" + } + ] + } + ] +} \ No newline at end of file diff --git a/templates/AngularSpa/.template.config/vs-2017.3.host.json b/templates/AngularSpa/.template.config/vs-2017.3.host.json new file mode 100644 index 00000000..c260ba3c --- /dev/null +++ b/templates/AngularSpa/.template.config/vs-2017.3.host.json @@ -0,0 +1,20 @@ +{ + "$schema": "http://json.schemastore.org/vs-2017.3.host", + "name": { + "text": "Angular", + "package": "{0CD94836-1526-4E85-87D3-FB5274C5AFC9}", + "id": "1100" + }, + "description": { + "text": "A project template for creating an ASP.NET Core application with Angular", + "package": "{0CD94836-1526-4E85-87D3-FB5274C5AFC9}", + "id": "1101" + }, + "order": 301, + "icon": "icon.png", + "learnMoreLink": "https://github.com/aspnet/JavaScriptServices", + "uiFilters": [ + "oneaspnet" + ], + "minFullFrameworkVersion": "4.6.1" +} \ No newline at end of file diff --git a/templates/AureliaSpa/.template.config/dotnetcli.host.json b/templates/AureliaSpa/.template.config/dotnetcli.host.json new file mode 100644 index 00000000..c15c6681 --- /dev/null +++ b/templates/AureliaSpa/.template.config/dotnetcli.host.json @@ -0,0 +1,17 @@ +{ + "$schema": "http://json.schemastore.org/dotnetcli.host", + "symbolInfo": { + "TargetFrameworkOverride": { + "isHidden": "true", + "longName": "target-framework-override", + "shortName": "" + }, + "Framework": { + "longName": "framework" + }, + "skipRestore": { + "longName": "no-restore", + "shortName": "" + } + } +} \ No newline at end of file diff --git a/templates/AureliaSpa/.template.config/template.json b/templates/AureliaSpa/.template.config/template.json new file mode 100644 index 00000000..5c2277b3 --- /dev/null +++ b/templates/AureliaSpa/.template.config/template.json @@ -0,0 +1,87 @@ +{ + "author": "Microsoft", + "classifications": [ + "Web", + "MVC", + "SPA" + ], + "groupIdentity": "Microsoft.AspNetCore.SpaTemplates.Aurelia", + "identity": "Microsoft.AspNetCore.SpaTemplates.Aurelia.CSharp", + "name": "ASP.NET Core with Aurelia", + "preferNameDirectory": true, + "primaryOutputs": [ + { + "path": "WebApplicationBasic.csproj" + } + ], + "shortName": "aurelia", + "sourceName": "WebApplicationBasic", + "sources": [ + { + "source": "./", + "target": "./", + "exclude": [ + ".template.config/**" + ] + } + ], + "symbols": { + "TargetFrameworkOverride": { + "type": "parameter", + "description": "Overrides the target framework", + "replaces": "TargetFrameworkOverride", + "datatype": "string", + "defaultValue": "" + }, + "Framework": { + "type": "parameter", + "description": "The target framework for the project.", + "datatype": "choice", + "choices": [ + { + "choice": "netcoreapp2.0", + "description": "Target netcoreapp2.0" + } + ], + "replaces": "netcoreapp2.0", + "defaultValue": "netcoreapp2.0" + }, + "HostIdentifier": { + "type": "bind", + "binding": "HostIdentifier" + }, + "skipRestore": { + "type": "parameter", + "datatype": "bool", + "description": "If specified, skips the automatic restore of the project on create.", + "defaultValue": "false" + } + }, + "tags": { + "language": "C#", + "type": "project" + }, + "postActions": [ + { + "condition": "(!skipRestore)", + "description": "Restore NuGet packages required by this project.", + "manualInstructions": [ + { + "text": "Run 'dotnet restore'" + } + ], + "actionId": "210D431B-A78B-4D2F-B762-4ED3E3EA9025", + "continueOnError": true + }, + { + "condition": "(HostIdentifier == \"dotnetcli\" || HostIdentifier == \"dotnetcli-preview\")", + "actionId": "AC1156F7-BB77-4DB8-B28F-24EEBCCA1E5C", + "description": "\n\n-------------------------------------------------------------------\nIMPORTANT: Before running this project on the command line,\n you must restore NPM packages by running \"npm install\"\n-------------------------------------------------------------------\n", + "manualInstructions": [ + { + "text": "Run \"npm install\"" + } + ] + } + ] +} \ No newline at end of file diff --git a/templates/AureliaSpa/.template.config/vs-2017.3.host.json b/templates/AureliaSpa/.template.config/vs-2017.3.host.json new file mode 100644 index 00000000..18e8697a --- /dev/null +++ b/templates/AureliaSpa/.template.config/vs-2017.3.host.json @@ -0,0 +1,20 @@ +{ + "$schema": "http://json.schemastore.org/vs-2017.3.host", + "name": { + "text": "Aurelia", + "package": "{0CD94836-1526-4E85-87D3-FB5274C5AFC9}", + "id": "1200" + }, + "description": { + "text": "A project template for creating an ASP.NET Core application with Aurelia", + "package": "{0CD94836-1526-4E85-87D3-FB5274C5AFC9}", + "id": "1201" + }, + "order": 301, + "icon": "icon.png", + "learnMoreLink": "https://github.com/aspnet/JavaScriptServices", + "uiFilters": [ + "oneaspnet" + ], + "minFullFrameworkVersion": "4.6.1" +} \ No newline at end of file diff --git a/templates/KnockoutSpa/.template.config/dotnetcli.host.json b/templates/KnockoutSpa/.template.config/dotnetcli.host.json new file mode 100644 index 00000000..c15c6681 --- /dev/null +++ b/templates/KnockoutSpa/.template.config/dotnetcli.host.json @@ -0,0 +1,17 @@ +{ + "$schema": "http://json.schemastore.org/dotnetcli.host", + "symbolInfo": { + "TargetFrameworkOverride": { + "isHidden": "true", + "longName": "target-framework-override", + "shortName": "" + }, + "Framework": { + "longName": "framework" + }, + "skipRestore": { + "longName": "no-restore", + "shortName": "" + } + } +} \ No newline at end of file diff --git a/templates/KnockoutSpa/.template.config/template.json b/templates/KnockoutSpa/.template.config/template.json new file mode 100644 index 00000000..a9e8dd43 --- /dev/null +++ b/templates/KnockoutSpa/.template.config/template.json @@ -0,0 +1,87 @@ +{ + "author": "Microsoft", + "classifications": [ + "Web", + "MVC", + "SPA" + ], + "groupIdentity": "Microsoft.AspNetCore.SpaTemplates.Knockout", + "identity": "Microsoft.AspNetCore.SpaTemplates.Knockout.CSharp", + "name": "ASP.NET Core with Knockout.js", + "preferNameDirectory": true, + "primaryOutputs": [ + { + "path": "WebApplicationBasic.csproj" + } + ], + "shortName": "knockout", + "sourceName": "WebApplicationBasic", + "sources": [ + { + "source": "./", + "target": "./", + "exclude": [ + ".template.config/**" + ] + } + ], + "symbols": { + "TargetFrameworkOverride": { + "type": "parameter", + "description": "Overrides the target framework", + "replaces": "TargetFrameworkOverride", + "datatype": "string", + "defaultValue": "" + }, + "Framework": { + "type": "parameter", + "description": "The target framework for the project.", + "datatype": "choice", + "choices": [ + { + "choice": "netcoreapp2.0", + "description": "Target netcoreapp2.0" + } + ], + "replaces": "netcoreapp2.0", + "defaultValue": "netcoreapp2.0" + }, + "HostIdentifier": { + "type": "bind", + "binding": "HostIdentifier" + }, + "skipRestore": { + "type": "parameter", + "datatype": "bool", + "description": "If specified, skips the automatic restore of the project on create.", + "defaultValue": "false" + } + }, + "tags": { + "language": "C#", + "type": "project" + }, + "postActions": [ + { + "condition": "(!skipRestore)", + "description": "Restore NuGet packages required by this project.", + "manualInstructions": [ + { + "text": "Run 'dotnet restore'" + } + ], + "actionId": "210D431B-A78B-4D2F-B762-4ED3E3EA9025", + "continueOnError": true + }, + { + "condition": "(HostIdentifier == \"dotnetcli\" || HostIdentifier == \"dotnetcli-preview\")", + "actionId": "AC1156F7-BB77-4DB8-B28F-24EEBCCA1E5C", + "description": "\n\n-------------------------------------------------------------------\nIMPORTANT: Before running this project on the command line,\n you must restore NPM packages by running \"npm install\"\n-------------------------------------------------------------------\n", + "manualInstructions": [ + { + "text": "Run \"npm install\"" + } + ] + } + ] +} \ No newline at end of file diff --git a/templates/KnockoutSpa/.template.config/vs-2017.3.host.json b/templates/KnockoutSpa/.template.config/vs-2017.3.host.json new file mode 100644 index 00000000..7ce1189f --- /dev/null +++ b/templates/KnockoutSpa/.template.config/vs-2017.3.host.json @@ -0,0 +1,20 @@ +{ + "$schema": "http://json.schemastore.org/vs-2017.3.host", + "name": { + "text": "Knockout.js", + "package": "{0CD94836-1526-4E85-87D3-FB5274C5AFC9}", + "id": "1300" + }, + "description": { + "text": "A project template for creating an ASP.NET Core application with Knockout.js", + "package": "{0CD94836-1526-4E85-87D3-FB5274C5AFC9}", + "id": "1301" + }, + "order": 301, + "icon": "icon.png", + "learnMoreLink": "https://github.com/aspnet/JavaScriptServices", + "uiFilters": [ + "oneaspnet" + ], + "minFullFrameworkVersion": "4.6.1" +} \ No newline at end of file diff --git a/templates/ReactReduxSpa/.template.config/dotnetcli.host.json b/templates/ReactReduxSpa/.template.config/dotnetcli.host.json new file mode 100644 index 00000000..c15c6681 --- /dev/null +++ b/templates/ReactReduxSpa/.template.config/dotnetcli.host.json @@ -0,0 +1,17 @@ +{ + "$schema": "http://json.schemastore.org/dotnetcli.host", + "symbolInfo": { + "TargetFrameworkOverride": { + "isHidden": "true", + "longName": "target-framework-override", + "shortName": "" + }, + "Framework": { + "longName": "framework" + }, + "skipRestore": { + "longName": "no-restore", + "shortName": "" + } + } +} \ No newline at end of file diff --git a/templates/ReactReduxSpa/.template.config/template.json b/templates/ReactReduxSpa/.template.config/template.json new file mode 100644 index 00000000..0dc06ba6 --- /dev/null +++ b/templates/ReactReduxSpa/.template.config/template.json @@ -0,0 +1,87 @@ +{ + "author": "Microsoft", + "classifications": [ + "Web", + "MVC", + "SPA" + ], + "groupIdentity": "Microsoft.DotNet.Web.Spa.ProjectTemplates.ReactRedux", + "identity": "Microsoft.DotNet.Web.Spa.ProjectTemplates.ReactRedux.CSharp", + "name": "ASP.NET Core with React.js and Redux", + "preferNameDirectory": true, + "primaryOutputs": [ + { + "path": "WebApplicationBasic.csproj" + } + ], + "shortName": "reactredux", + "sourceName": "WebApplicationBasic", + "sources": [ + { + "source": "./", + "target": "./", + "exclude": [ + ".template.config/**" + ] + } + ], + "symbols": { + "TargetFrameworkOverride": { + "type": "parameter", + "description": "Overrides the target framework", + "replaces": "TargetFrameworkOverride", + "datatype": "string", + "defaultValue": "" + }, + "Framework": { + "type": "parameter", + "description": "The target framework for the project.", + "datatype": "choice", + "choices": [ + { + "choice": "netcoreapp2.0", + "description": "Target netcoreapp2.0" + } + ], + "replaces": "netcoreapp2.0", + "defaultValue": "netcoreapp2.0" + }, + "HostIdentifier": { + "type": "bind", + "binding": "HostIdentifier" + }, + "skipRestore": { + "type": "parameter", + "datatype": "bool", + "description": "If specified, skips the automatic restore of the project on create.", + "defaultValue": "false" + } + }, + "tags": { + "language": "C#", + "type": "project" + }, + "postActions": [ + { + "condition": "(!skipRestore)", + "description": "Restore NuGet packages required by this project.", + "manualInstructions": [ + { + "text": "Run 'dotnet restore'" + } + ], + "actionId": "210D431B-A78B-4D2F-B762-4ED3E3EA9025", + "continueOnError": true + }, + { + "condition": "(HostIdentifier == \"dotnetcli\" || HostIdentifier == \"dotnetcli-preview\")", + "actionId": "AC1156F7-BB77-4DB8-B28F-24EEBCCA1E5C", + "description": "\n\n-------------------------------------------------------------------\nIMPORTANT: Before running this project on the command line,\n you must restore NPM packages by running \"npm install\"\n-------------------------------------------------------------------\n", + "manualInstructions": [ + { + "text": "Run \"npm install\"" + } + ] + } + ] +} \ No newline at end of file diff --git a/templates/ReactReduxSpa/.template.config/vs-2017.3.host.json b/templates/ReactReduxSpa/.template.config/vs-2017.3.host.json new file mode 100644 index 00000000..02f9d521 --- /dev/null +++ b/templates/ReactReduxSpa/.template.config/vs-2017.3.host.json @@ -0,0 +1,20 @@ +{ + "$schema": "http://json.schemastore.org/vs-2017.3.host", + "name": { + "text": "React.js and Redux", + "package": "{0CD94836-1526-4E85-87D3-FB5274C5AFC9}", + "id": "1400" + }, + "description": { + "text": "A project template for creating an ASP.NET Core application with React.js and Redux", + "package": "{0CD94836-1526-4E85-87D3-FB5274C5AFC9}", + "id": "1401" + }, + "order": 301, + "icon": "icon.png", + "learnMoreLink": "https://github.com/aspnet/JavaScriptServices", + "uiFilters": [ + "oneaspnet" + ], + "minFullFrameworkVersion": "4.6.1" +} \ No newline at end of file diff --git a/templates/ReactSpa/.template.config/dotnetcli.host.json b/templates/ReactSpa/.template.config/dotnetcli.host.json new file mode 100644 index 00000000..c15c6681 --- /dev/null +++ b/templates/ReactSpa/.template.config/dotnetcli.host.json @@ -0,0 +1,17 @@ +{ + "$schema": "http://json.schemastore.org/dotnetcli.host", + "symbolInfo": { + "TargetFrameworkOverride": { + "isHidden": "true", + "longName": "target-framework-override", + "shortName": "" + }, + "Framework": { + "longName": "framework" + }, + "skipRestore": { + "longName": "no-restore", + "shortName": "" + } + } +} \ No newline at end of file diff --git a/templates/ReactSpa/.template.config/template.json b/templates/ReactSpa/.template.config/template.json new file mode 100644 index 00000000..9aaf30f1 --- /dev/null +++ b/templates/ReactSpa/.template.config/template.json @@ -0,0 +1,87 @@ +{ + "author": "Microsoft", + "classifications": [ + "Web", + "MVC", + "SPA" + ], + "groupIdentity": "Microsoft.DotNet.Web.Spa.ProjectTemplates.React", + "identity": "Microsoft.DotNet.Web.Spa.ProjectTemplates.React.CSharp", + "name": "ASP.NET Core with React.js", + "preferNameDirectory": true, + "primaryOutputs": [ + { + "path": "WebApplicationBasic.csproj" + } + ], + "shortName": "react", + "sourceName": "WebApplicationBasic", + "sources": [ + { + "source": "./", + "target": "./", + "exclude": [ + ".template.config/**" + ] + } + ], + "symbols": { + "TargetFrameworkOverride": { + "type": "parameter", + "description": "Overrides the target framework", + "replaces": "TargetFrameworkOverride", + "datatype": "string", + "defaultValue": "" + }, + "Framework": { + "type": "parameter", + "description": "The target framework for the project.", + "datatype": "choice", + "choices": [ + { + "choice": "netcoreapp2.0", + "description": "Target netcoreapp2.0" + } + ], + "replaces": "netcoreapp2.0", + "defaultValue": "netcoreapp2.0" + }, + "HostIdentifier": { + "type": "bind", + "binding": "HostIdentifier" + }, + "skipRestore": { + "type": "parameter", + "datatype": "bool", + "description": "If specified, skips the automatic restore of the project on create.", + "defaultValue": "false" + } + }, + "tags": { + "language": "C#", + "type": "project" + }, + "postActions": [ + { + "condition": "(!skipRestore)", + "description": "Restore NuGet packages required by this project.", + "manualInstructions": [ + { + "text": "Run 'dotnet restore'" + } + ], + "actionId": "210D431B-A78B-4D2F-B762-4ED3E3EA9025", + "continueOnError": true + }, + { + "condition": "(HostIdentifier == \"dotnetcli\" || HostIdentifier == \"dotnetcli-preview\")", + "actionId": "AC1156F7-BB77-4DB8-B28F-24EEBCCA1E5C", + "description": "\n\n-------------------------------------------------------------------\nIMPORTANT: Before running this project on the command line,\n you must restore NPM packages by running \"npm install\"\n-------------------------------------------------------------------\n", + "manualInstructions": [ + { + "text": "Run \"npm install\"" + } + ] + } + ] +} \ No newline at end of file diff --git a/templates/ReactSpa/.template.config/vs-2017.3.host.json b/templates/ReactSpa/.template.config/vs-2017.3.host.json new file mode 100644 index 00000000..f77016a3 --- /dev/null +++ b/templates/ReactSpa/.template.config/vs-2017.3.host.json @@ -0,0 +1,20 @@ +{ + "$schema": "http://json.schemastore.org/vs-2017.3.host", + "name": { + "text": "React.js", + "package": "{0CD94836-1526-4E85-87D3-FB5274C5AFC9}", + "id": "1500" + }, + "description": { + "text": "A project template for creating an ASP.NET Core application with React.js", + "package": "{0CD94836-1526-4E85-87D3-FB5274C5AFC9}", + "id": "1501" + }, + "order": 301, + "icon": "icon.png", + "learnMoreLink": "https://github.com/aspnet/JavaScriptServices", + "uiFilters": [ + "oneaspnet" + ], + "minFullFrameworkVersion": "4.6.1" +} \ No newline at end of file diff --git a/templates/VueSpa/.template.config/dotnetcli.host.json b/templates/VueSpa/.template.config/dotnetcli.host.json new file mode 100644 index 00000000..c15c6681 --- /dev/null +++ b/templates/VueSpa/.template.config/dotnetcli.host.json @@ -0,0 +1,17 @@ +{ + "$schema": "http://json.schemastore.org/dotnetcli.host", + "symbolInfo": { + "TargetFrameworkOverride": { + "isHidden": "true", + "longName": "target-framework-override", + "shortName": "" + }, + "Framework": { + "longName": "framework" + }, + "skipRestore": { + "longName": "no-restore", + "shortName": "" + } + } +} \ No newline at end of file diff --git a/templates/VueSpa/.template.config/template.json b/templates/VueSpa/.template.config/template.json new file mode 100644 index 00000000..2986930f --- /dev/null +++ b/templates/VueSpa/.template.config/template.json @@ -0,0 +1,87 @@ +{ + "author": "Microsoft", + "classifications": [ + "Web", + "MVC", + "SPA" + ], + "groupIdentity": "Microsoft.AspNetCore.SpaTemplates.Vue", + "identity": "Microsoft.AspNetCore.SpaTemplates.Vue.CSharp", + "name": "ASP.NET Core with Vue.js", + "preferNameDirectory": true, + "primaryOutputs": [ + { + "path": "WebApplicationBasic.csproj" + } + ], + "shortName": "vue", + "sourceName": "WebApplicationBasic", + "sources": [ + { + "source": "./", + "target": "./", + "exclude": [ + ".template.config/**" + ] + } + ], + "symbols": { + "TargetFrameworkOverride": { + "type": "parameter", + "description": "Overrides the target framework", + "replaces": "TargetFrameworkOverride", + "datatype": "string", + "defaultValue": "" + }, + "Framework": { + "type": "parameter", + "description": "The target framework for the project.", + "datatype": "choice", + "choices": [ + { + "choice": "netcoreapp2.0", + "description": "Target netcoreapp2.0" + } + ], + "replaces": "netcoreapp2.0", + "defaultValue": "netcoreapp2.0" + }, + "HostIdentifier": { + "type": "bind", + "binding": "HostIdentifier" + }, + "skipRestore": { + "type": "parameter", + "datatype": "bool", + "description": "If specified, skips the automatic restore of the project on create.", + "defaultValue": "false" + } + }, + "tags": { + "language": "C#", + "type": "project" + }, + "postActions": [ + { + "condition": "(!skipRestore)", + "description": "Restore NuGet packages required by this project.", + "manualInstructions": [ + { + "text": "Run 'dotnet restore'" + } + ], + "actionId": "210D431B-A78B-4D2F-B762-4ED3E3EA9025", + "continueOnError": true + }, + { + "condition": "(HostIdentifier == \"dotnetcli\" || HostIdentifier == \"dotnetcli-preview\")", + "actionId": "AC1156F7-BB77-4DB8-B28F-24EEBCCA1E5C", + "description": "\n\n-------------------------------------------------------------------\nIMPORTANT: Before running this project on the command line,\n you must restore NPM packages by running \"npm install\"\n-------------------------------------------------------------------\n", + "manualInstructions": [ + { + "text": "Run \"npm install\"" + } + ] + } + ] +} \ No newline at end of file diff --git a/templates/VueSpa/.template.config/vs-2017.3.host.json b/templates/VueSpa/.template.config/vs-2017.3.host.json new file mode 100644 index 00000000..9b9b6a5f --- /dev/null +++ b/templates/VueSpa/.template.config/vs-2017.3.host.json @@ -0,0 +1,20 @@ +{ + "$schema": "http://json.schemastore.org/vs-2017.3.host", + "name": { + "text": "Vue.js", + "package": "{0CD94836-1526-4E85-87D3-FB5274C5AFC9}", + "id": "1600" + }, + "description": { + "text": "A project template for creating an ASP.NET Core application with Vue.js", + "package": "{0CD94836-1526-4E85-87D3-FB5274C5AFC9}", + "id": "1601" + }, + "order": 301, + "icon": "icon.png", + "learnMoreLink": "https://github.com/aspnet/JavaScriptServices", + "uiFilters": [ + "oneaspnet" + ], + "minFullFrameworkVersion": "4.6.1" +} \ No newline at end of file diff --git a/templates/package-builder/src/build/build.ts b/templates/package-builder/src/build/build.ts index c0827deb..d234bfc3 100644 --- a/templates/package-builder/src/build/build.ts +++ b/templates/package-builder/src/build/build.ts @@ -10,7 +10,6 @@ import * as targz from 'tar.gz'; const isWindows = /^win/.test(process.platform); const textFileExtensions = ['.gitignore', 'template_gitignore', '.config', '.cs', '.cshtml', '.csproj', '.html', '.js', '.json', '.jsx', '.md', '.nuspec', '.ts', '.tsx']; -const webToolsVSPackageGuid = '{0CD94836-1526-4E85-87D3-FB5274C5AFC9}'; const dotNetPackages = { builtIn: 'Microsoft.DotNet.Web.Spa.ProjectTemplates', @@ -19,19 +18,16 @@ const dotNetPackages = { interface TemplateConfig { dir: string; - dotNetNewId: string; dotNetPackageId: string; - displayName: string; - localizationIdStart: number; } const templates: { [key: string]: TemplateConfig } = { - 'angular': { dotNetPackageId: dotNetPackages.builtIn, dir: '../../templates/AngularSpa/', dotNetNewId: 'Angular', displayName: 'Angular', localizationIdStart: 1100 }, - 'aurelia': { dotNetPackageId: dotNetPackages.extra, dir: '../../templates/AureliaSpa/', dotNetNewId: 'Aurelia', displayName: 'Aurelia', localizationIdStart: 1200 }, - 'knockout': { dotNetPackageId: dotNetPackages.extra, dir: '../../templates/KnockoutSpa/', dotNetNewId: 'Knockout', displayName: 'Knockout.js', localizationIdStart: 1300 }, - 'react-redux': { dotNetPackageId: dotNetPackages.builtIn, dir: '../../templates/ReactReduxSpa/', dotNetNewId: 'ReactRedux', displayName: 'React.js and Redux', localizationIdStart: 1400 }, - 'react': { dotNetPackageId: dotNetPackages.builtIn, dir: '../../templates/ReactSpa/', dotNetNewId: 'React', displayName: 'React.js', localizationIdStart: 1500 }, - 'vue': { dotNetPackageId: dotNetPackages.extra, dir: '../../templates/VueSpa/', dotNetNewId: 'Vue', displayName: 'Vue.js', localizationIdStart: 1600 } + 'angular': { dotNetPackageId: dotNetPackages.builtIn, dir: '../../templates/AngularSpa/' }, + 'aurelia': { dotNetPackageId: dotNetPackages.extra, dir: '../../templates/AureliaSpa/' }, + 'knockout': { dotNetPackageId: dotNetPackages.extra, dir: '../../templates/KnockoutSpa/' }, + 'react-redux': { dotNetPackageId: dotNetPackages.builtIn, dir: '../../templates/ReactReduxSpa/' }, + 'react': { dotNetPackageId: dotNetPackages.builtIn, dir: '../../templates/ReactSpa/' }, + 'vue': { dotNetPackageId: dotNetPackages.extra, dir: '../../templates/VueSpa/' } }; function isTextFile(filename: string): boolean { @@ -129,123 +125,6 @@ function buildDotNetNewNuGetPackage(packageId: string) { const templateOutputDir = path.join(outputRoot, 'Content', templateName); writeTemplate(templateConfig.dir, templateOutputDir, contentReplacements, filenameReplacements); - - // Add the .template.config dir and its contents - const templateConfigDir = path.join(templateOutputDir, '.template.config'); - mkdirp.sync(templateConfigDir); - - fs.writeFileSync(path.join(templateConfigDir, 'template.json'), JSON.stringify({ - author: 'Microsoft', - classifications: ['Web', 'MVC', 'SPA'], - groupIdentity: `${packageId}.${templateConfig.dotNetNewId}`, - identity: `${packageId}.${templateConfig.dotNetNewId}.CSharp`, - name: `ASP.NET Core with ${templateConfig.displayName}`, - preferNameDirectory: true, - primaryOutputs: [{ path: `${sourceProjectName}.csproj` }], - shortName: `${templateConfig.dotNetNewId.toLowerCase()}`, - sourceName: sourceProjectName, - sources: [{ - source: './', - target: './', - exclude: ['.template.config/**'] - }], - symbols: { - TargetFrameworkOverride: { - type: 'parameter', - description: 'Overrides the target framework', - replaces: 'TargetFrameworkOverride', - datatype: 'string', - defaultValue: '' - }, - Framework: { - type: 'parameter', - description: 'The target framework for the project.', - datatype: 'choice', - choices: [ - { - choice: 'netcoreapp2.0', - description: 'Target netcoreapp2.0' - } - ], - replaces: 'netcoreapp2.0', - defaultValue: 'netcoreapp2.0' - }, - HostIdentifier: { - type: 'bind', - binding: 'HostIdentifier' - }, - skipRestore: { - type: 'parameter', - datatype: 'bool', - description: 'If specified, skips the automatic restore of the project on create.', - defaultValue: 'false' - } - }, - tags: { language: 'C#', type: 'project' }, - postActions: [ - { - condition: '(!skipRestore)', - description: 'Restore NuGet packages required by this project.', - manualInstructions: [{ text: 'Run \'dotnet restore\'' }], - actionId: '210D431B-A78B-4D2F-B762-4ED3E3EA9025', - continueOnError: true - }, - /* - // Currently it doesn't appear to be possible to run `npm install` from a - // postAction, due to https://github.com/dotnet/templating/issues/849 - // We will re-enable this when that bug is fixed. - { - condition: '(!skipRestore)', - description: 'Restores NPM packages required by this project.', - manualInstructions: [{ text: 'Run \'npm install\'' }], - actionId: '3A7C4B45-1F5D-4A30-959A-51B88E82B5D2', - args: { executable: 'npm', args: 'install' }, - continueOnError: false - } - */ - { - // For the preview2 release, just display manual instructions instead. - // This is only applicable on the command line, because VS will restore - // NPM packages automatically by default. - condition: '(HostIdentifier == "dotnetcli" || HostIdentifier == "dotnetcli-preview")', - actionId: 'AC1156F7-BB77-4DB8-B28F-24EEBCCA1E5C', - description: '\n\n-------------------------------------------------------------------\nIMPORTANT: Before running this project on the command line,\n you must restore NPM packages by running "npm install"\n-------------------------------------------------------------------\n', - manualInstructions: [{ text: 'Run "npm install"' }] - } - ], - }, null, 2)); - - fs.writeFileSync(path.join(templateConfigDir, 'dotnetcli.host.json'), JSON.stringify({ - $schema: 'http://json.schemastore.org/dotnetcli.host', - symbolInfo: { - TargetFrameworkOverride: { - isHidden: 'true', - longName: 'target-framework-override', - shortName: '' - }, - Framework: { - longName: 'framework' - }, - skipRestore: { - longName: 'no-restore', - shortName: '' - }, - } - }, null, 2)); - - const localisedNameId = templateConfig.localizationIdStart + 0; - const localisedDescId = templateConfig.localizationIdStart + 1; - - fs.writeFileSync(path.join(templateConfigDir, 'vs-2017.3.host.json'), JSON.stringify({ - $schema: 'http://json.schemastore.org/vs-2017.3.host', - name: { text: templateConfig.displayName, package: webToolsVSPackageGuid, id: localisedNameId.toString() }, - description: { text: `A project template for creating an ASP.NET Core application with ${templateConfig.displayName}`, package: webToolsVSPackageGuid, id: localisedDescId.toString() }, - order: 301, - icon: 'icon.png', - learnMoreLink: 'https://github.com/aspnet/JavaScriptServices', - uiFilters: [ 'oneaspnet' ], - minFullFrameworkVersion: '4.6.1' - }, null, 2)); }); // Create the .nuspec file @@ -274,15 +153,6 @@ function buildDotNetNewNuGetPackage(packageId: string) { return glob.sync(path.join(outputRoot, './*.nupkg'))[0]; } -function runPrepublishScripts(rootDir: string, scripts: string[]) { - console.log(`[Prepublish] In directory: ${ rootDir }`); - scripts.forEach(script => { - console.log(`[Prepublish] Running: ${ script }`); - childProcess.execSync(script, { cwd: rootDir, stdio: 'inherit' }); - }); - console.log(`[Prepublish] Done`) -} - const distDir = './dist'; const artifactsDir = path.join(distDir, 'artifacts'); From 0291686b2056954c9aa7ea31ade261f43b3bd797 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 23 Aug 2017 14:58:49 -0700 Subject: [PATCH 232/411] Reorganize templates into dir structure matching 'dotnet new' templates --- .gitignore | 10 ++--- .../.template.config/dotnetcli.host.json | 0 .../aurelia}/.template.config/icon.png | Bin .../aurelia}/.template.config/template.json | 0 .../.template.config/vs-2017.3.host.json | 0 .../Content/aurelia}/AureliaSpa.csproj | 0 .../ClientApp/app/components/app/app.css | 0 .../ClientApp/app/components/app/app.html | 0 .../ClientApp/app/components/app/app.ts | 0 .../app/components/counter/counter.html | 0 .../app/components/counter/counter.ts | 0 .../app/components/fetchdata/fetchdata.html | 0 .../app/components/fetchdata/fetchdata.ts | 0 .../ClientApp/app/components/home/home.html | 0 .../ClientApp/app/components/home/home.ts | 0 .../app/components/navmenu/navmenu.css | 0 .../app/components/navmenu/navmenu.html | 0 .../Content/aurelia}/ClientApp/boot.ts | 0 .../aurelia}/Controllers/HomeController.cs | 0 .../Controllers/SampleDataController.cs | 0 .../Content/aurelia}/Program.cs | 0 .../Content/aurelia}/Startup.cs | 0 .../Content/aurelia}/Views/Home/Index.cshtml | 0 .../aurelia}/Views/Shared/Error.cshtml | 0 .../aurelia}/Views/Shared/_Layout.cshtml | 0 .../aurelia}/Views/_ViewImports.cshtml | 0 .../Content/aurelia}/Views/_ViewStart.cshtml | 0 .../aurelia}/appsettings.Development.json | 0 .../Content/aurelia}/appsettings.json | 0 .../Content/aurelia}/npm-shrinkwrap.json | 0 .../Content/aurelia}/package.json | 0 .../Content/aurelia}/template_gitignore | 0 .../Content/aurelia}/tsconfig.json | 0 .../Content/aurelia}/webpack.config.js | 0 .../Content/aurelia}/webpack.config.vendor.js | 0 .../Content/aurelia}/wwwroot/favicon.ico | Bin .../.template.config/dotnetcli.host.json | 0 .../knockout}/.template.config/icon.png | Bin .../knockout}/.template.config/template.json | 0 .../.template.config/vs-2017.3.host.json | 0 .../Content/knockout}/ClientApp/boot.ts | 0 .../components/app-root/app-root.html | 0 .../ClientApp/components/app-root/app-root.ts | 0 .../counter-example/counter-example.html | 0 .../counter-example/counter-example.ts | 0 .../components/fetch-data/fetch-data.html | 0 .../components/fetch-data/fetch-data.ts | 0 .../components/home-page/home-page.html | 0 .../components/home-page/home-page.ts | 0 .../components/nav-menu/nav-menu.html | 0 .../ClientApp/components/nav-menu/nav-menu.ts | 0 .../Content/knockout}/ClientApp/css/site.css | 0 .../Content/knockout}/ClientApp/router.ts | 0 .../ClientApp/webpack-component-loader.ts | 0 .../knockout}/Controllers/HomeController.cs | 0 .../Controllers/SampleDataController.cs | 0 .../Content/knockout}/KnockoutSpa.csproj | 0 .../Content/knockout}/Program.cs | 0 .../Content/knockout}/Startup.cs | 0 .../Content/knockout}/Views/Home/Index.cshtml | 0 .../knockout}/Views/Shared/Error.cshtml | 0 .../knockout}/Views/Shared/_Layout.cshtml | 0 .../knockout}/Views/_ViewImports.cshtml | 0 .../Content/knockout}/Views/_ViewStart.cshtml | 0 .../knockout}/appsettings.Development.json | 0 .../Content/knockout}/appsettings.json | 0 .../Content/knockout}/npm-shrinkwrap.json | 0 .../Content/knockout}/package.json | 0 .../Content/knockout}/template_gitignore | 0 .../Content/knockout}/tsconfig.json | 0 .../Content/knockout}/webpack.config.js | 0 .../knockout}/webpack.config.vendor.js | 0 .../Content/knockout}/wwwroot/favicon.ico | Bin .../vue}/.template.config/dotnetcli.host.json | 0 .../Content/vue}/.template.config/icon.png | Bin .../vue}/.template.config/template.json | 0 .../vue}/.template.config/vs-2017.3.host.json | 0 .../Content/vue}/ClientApp/boot.ts | 0 .../vue}/ClientApp/components/app/app.ts | 0 .../ClientApp/components/app/app.vue.html | 0 .../ClientApp/components/counter/counter.ts | 0 .../components/counter/counter.vue.html | 0 .../components/fetchdata/fetchdata.ts | 0 .../components/fetchdata/fetchdata.vue.html | 0 .../ClientApp/components/home/home.vue.html | 0 .../ClientApp/components/navmenu/navmenu.css | 0 .../components/navmenu/navmenu.vue.html | 0 .../Content/vue}/ClientApp/css/site.css | 0 .../vue}/Controllers/HomeController.cs | 0 .../vue}/Controllers/SampleDataController.cs | 0 .../Content/vue}/Program.cs | 0 .../Content/vue}/Startup.cs | 0 .../Content/vue}/Views/Home/Index.cshtml | 0 .../Content/vue}/Views/Shared/Error.cshtml | 0 .../Content/vue}/Views/Shared/_Layout.cshtml | 0 .../Content/vue}/Views/_ViewImports.cshtml | 0 .../Content/vue}/Views/_ViewStart.cshtml | 0 .../Content/vue}/VueSpa.csproj | 0 .../Content/vue}/appsettings.Development.json | 0 .../Content/vue}/appsettings.json | 0 .../Content/vue}/npm-shrinkwrap.json | 0 .../Content/vue}/package.json | 0 .../Content/vue}/template_gitignore | 0 .../Content/vue}/tsconfig.json | 0 .../Content/vue}/webpack.config.js | 0 .../Content/vue}/webpack.config.vendor.js | 0 .../Content/vue}/wwwroot/favicon.ico | Bin .../Microsoft.AspNetCore.SpaTemplates.nuspec | 0 .../.template.config/dotnetcli.host.json | 0 .../angular}/.template.config/icon.png | Bin .../angular}/.template.config/template.json | 0 .../.template.config/vs-2017.3.host.json | 0 .../Content/angular}/AngularSpa.csproj | 0 .../ClientApp/app/app.module.browser.ts | 0 .../ClientApp/app/app.module.server.ts | 0 .../ClientApp/app/app.module.shared.ts | 0 .../app/components/app/app.component.css | 0 .../app/components/app/app.component.html | 0 .../app/components/app/app.component.ts | 0 .../components/counter/counter.component.html | 0 .../counter/counter.component.spec.ts | 0 .../components/counter/counter.component.ts | 0 .../fetchdata/fetchdata.component.html | 0 .../fetchdata/fetchdata.component.ts | 0 .../app/components/home/home.component.html | 0 .../app/components/home/home.component.ts | 0 .../components/navmenu/navmenu.component.css | 0 .../components/navmenu/navmenu.component.html | 0 .../components/navmenu/navmenu.component.ts | 0 .../angular}/ClientApp/boot.browser.ts | 0 .../Content/angular}/ClientApp/boot.server.ts | 0 .../angular}/ClientApp/test/boot-tests.ts | 0 .../angular}/ClientApp/test/karma.conf.js | 0 .../angular}/Controllers/HomeController.cs | 0 .../Controllers/SampleDataController.cs | 0 .../Content/angular}/Program.cs | 0 .../Content/angular}/Startup.cs | 0 .../Content/angular}/Views/Home/Index.cshtml | 0 .../angular}/Views/Shared/Error.cshtml | 0 .../angular}/Views/Shared/_Layout.cshtml | 0 .../angular}/Views/_ViewImports.cshtml | 0 .../Content/angular}/Views/_ViewStart.cshtml | 0 .../angular}/appsettings.Development.json | 0 .../Content/angular}/appsettings.json | 0 .../Content/angular}/npm-shrinkwrap.json | 0 .../Content/angular}/package.json | 0 .../Content/angular}/template_gitignore | 0 .../Content/angular}/tsconfig.json | 0 .../Content/angular}/webpack.config.js | 0 .../Content/angular}/webpack.config.vendor.js | 0 .../Content/angular}/wwwroot/favicon.ico | Bin .../.template.config/dotnetcli.host.json | 0 .../Content/react}/.template.config/icon.png | Bin .../react}/.template.config/template.json | 0 .../.template.config/vs-2017.3.host.json | 0 .../Content/react}/ClientApp/boot.tsx | 0 .../react}/ClientApp/components/Counter.tsx | 0 .../react}/ClientApp/components/FetchData.tsx | 0 .../react}/ClientApp/components/Home.tsx | 0 .../react}/ClientApp/components/Layout.tsx | 0 .../react}/ClientApp/components/NavMenu.tsx | 0 .../Content/react}/ClientApp/css/site.css | 0 .../Content/react}/ClientApp/routes.tsx | 0 .../react}/Controllers/HomeController.cs | 0 .../Controllers/SampleDataController.cs | 0 .../Content/react}/Program.cs | 0 .../Content/react}/ReactSpa.csproj | 0 .../Content/react}/Startup.cs | 0 .../Content/react}/Views/Home/Index.cshtml | 0 .../Content/react}/Views/Shared/Error.cshtml | 0 .../react}/Views/Shared/_Layout.cshtml | 0 .../Content/react}/Views/_ViewImports.cshtml | 0 .../Content/react}/Views/_ViewStart.cshtml | 0 .../react}/appsettings.Development.json | 0 .../Content/react}/appsettings.json | 0 .../Content/react}/npm-shrinkwrap.json | 0 .../Content/react}/package.json | 0 .../Content/react}/template_gitignore | 0 .../Content/react}/tsconfig.json | 0 .../Content/react}/webpack.config.js | 0 .../Content/react}/webpack.config.vendor.js | 0 .../Content/react}/wwwroot/favicon.ico | Bin .../.template.config/dotnetcli.host.json | 0 .../Content/redux}/.template.config/icon.png | Bin .../redux}/.template.config/template.json | 0 .../.template.config/vs-2017.3.host.json | 0 .../Content/redux}/ClientApp/boot-client.tsx | 0 .../Content/redux}/ClientApp/boot-server.tsx | 0 .../redux}/ClientApp/components/Counter.tsx | 0 .../redux}/ClientApp/components/FetchData.tsx | 0 .../redux}/ClientApp/components/Home.tsx | 0 .../redux}/ClientApp/components/Layout.tsx | 0 .../redux}/ClientApp/components/NavMenu.tsx | 0 .../redux}/ClientApp/configureStore.ts | 0 .../Content/redux}/ClientApp/css/site.css | 0 .../Content/redux}/ClientApp/routes.tsx | 0 .../Content/redux}/ClientApp/store/Counter.ts | 0 .../ClientApp/store/WeatherForecasts.ts | 0 .../Content/redux}/ClientApp/store/index.ts | 0 .../redux}/Controllers/HomeController.cs | 0 .../Controllers/SampleDataController.cs | 0 .../Content/redux}/Program.cs | 0 .../Content/redux}/ReactReduxSpa.csproj | 0 .../Content/redux}/Startup.cs | 0 .../Content/redux}/Views/Home/Index.cshtml | 0 .../Content/redux}/Views/Shared/Error.cshtml | 0 .../redux}/Views/Shared/_Layout.cshtml | 0 .../Content/redux}/Views/_ViewImports.cshtml | 0 .../Content/redux}/Views/_ViewStart.cshtml | 0 .../redux}/appsettings.Development.json | 0 .../Content/redux}/appsettings.json | 0 .../Content/redux}/npm-shrinkwrap.json | 0 .../Content/redux}/package.json | 0 .../Content/redux}/template_gitignore | 0 .../Content/redux}/tsconfig.json | 0 .../Content/redux}/webpack.config.js | 0 .../Content/redux}/webpack.config.vendor.js | 0 .../Content/redux}/wwwroot/favicon.ico | Bin ...oft.DotNet.Web.Spa.ProjectTemplates.nuspec | 0 templates/package-builder/src/build/build.ts | 36 ++++++------------ 220 files changed, 16 insertions(+), 30 deletions(-) rename templates/{AngularSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/.template.config/dotnetcli.host.json (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/.template.config/icon.png (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/.template.config/template.json (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/.template.config/vs-2017.3.host.json (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/AureliaSpa.csproj (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/ClientApp/app/components/app/app.css (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/ClientApp/app/components/app/app.html (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/ClientApp/app/components/app/app.ts (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/ClientApp/app/components/counter/counter.html (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/ClientApp/app/components/counter/counter.ts (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/ClientApp/app/components/fetchdata/fetchdata.html (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/ClientApp/app/components/fetchdata/fetchdata.ts (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/ClientApp/app/components/home/home.html (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/ClientApp/app/components/home/home.ts (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/ClientApp/app/components/navmenu/navmenu.css (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/ClientApp/app/components/navmenu/navmenu.html (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/ClientApp/boot.ts (100%) rename templates/{AngularSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/Controllers/HomeController.cs (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/Controllers/SampleDataController.cs (100%) rename templates/{AngularSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/Program.cs (100%) rename templates/{AngularSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/Startup.cs (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/Views/Home/Index.cshtml (100%) rename templates/{AngularSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/Views/Shared/Error.cshtml (100%) rename templates/{AngularSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/Views/Shared/_Layout.cshtml (100%) rename templates/{AngularSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/Views/_ViewImports.cshtml (100%) rename templates/{AngularSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/Views/_ViewStart.cshtml (100%) rename templates/{AngularSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/appsettings.Development.json (100%) rename templates/{AngularSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/appsettings.json (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/npm-shrinkwrap.json (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/package.json (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/template_gitignore (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/tsconfig.json (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/webpack.config.js (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/webpack.config.vendor.js (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/wwwroot/favicon.ico (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/.template.config/dotnetcli.host.json (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/.template.config/icon.png (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/.template.config/template.json (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/.template.config/vs-2017.3.host.json (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/ClientApp/boot.ts (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/ClientApp/components/app-root/app-root.html (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/ClientApp/components/app-root/app-root.ts (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/ClientApp/components/counter-example/counter-example.html (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/ClientApp/components/counter-example/counter-example.ts (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/ClientApp/components/fetch-data/fetch-data.html (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/ClientApp/components/fetch-data/fetch-data.ts (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/ClientApp/components/home-page/home-page.html (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/ClientApp/components/home-page/home-page.ts (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/ClientApp/components/nav-menu/nav-menu.html (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/ClientApp/components/nav-menu/nav-menu.ts (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/ClientApp/css/site.css (100%) mode change 100755 => 100644 rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/ClientApp/router.ts (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/ClientApp/webpack-component-loader.ts (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/Controllers/HomeController.cs (100%) rename templates/{AngularSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/Controllers/SampleDataController.cs (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/KnockoutSpa.csproj (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/Program.cs (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/Startup.cs (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/Views/Home/Index.cshtml (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/Views/Shared/Error.cshtml (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/Views/Shared/_Layout.cshtml (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/Views/_ViewImports.cshtml (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/Views/_ViewStart.cshtml (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/appsettings.Development.json (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/appsettings.json (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/npm-shrinkwrap.json (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/package.json (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/template_gitignore (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/tsconfig.json (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/webpack.config.js (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/webpack.config.vendor.js (100%) rename templates/{AngularSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/wwwroot/favicon.ico (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/.template.config/dotnetcli.host.json (100%) rename templates/{VueSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/.template.config/icon.png (100%) rename templates/{VueSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/.template.config/template.json (100%) rename templates/{VueSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/.template.config/vs-2017.3.host.json (100%) rename templates/{VueSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/ClientApp/boot.ts (100%) rename templates/{VueSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/ClientApp/components/app/app.ts (100%) rename templates/{VueSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/ClientApp/components/app/app.vue.html (100%) rename templates/{VueSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/ClientApp/components/counter/counter.ts (100%) rename templates/{VueSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/ClientApp/components/counter/counter.vue.html (100%) rename templates/{VueSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/ClientApp/components/fetchdata/fetchdata.ts (100%) rename templates/{VueSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/ClientApp/components/fetchdata/fetchdata.vue.html (100%) rename templates/{VueSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/ClientApp/components/home/home.vue.html (100%) rename templates/{VueSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/ClientApp/components/navmenu/navmenu.css (100%) rename templates/{VueSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/ClientApp/components/navmenu/navmenu.vue.html (100%) rename templates/{VueSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/ClientApp/css/site.css (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/Controllers/HomeController.cs (100%) mode change 100755 => 100644 rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/Controllers/SampleDataController.cs (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/Program.cs (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/Startup.cs (100%) mode change 100755 => 100644 rename templates/{VueSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/Views/Home/Index.cshtml (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/Views/Shared/Error.cshtml (100%) mode change 100755 => 100644 rename templates/{ReactSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/Views/Shared/_Layout.cshtml (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/Views/_ViewImports.cshtml (100%) mode change 100755 => 100644 rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/Views/_ViewStart.cshtml (100%) mode change 100755 => 100644 rename templates/{VueSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/VueSpa.csproj (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/appsettings.Development.json (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/appsettings.json (100%) mode change 100755 => 100644 rename templates/{VueSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/npm-shrinkwrap.json (100%) rename templates/{VueSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/package.json (100%) rename templates/{VueSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/template_gitignore (100%) rename templates/{VueSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/tsconfig.json (100%) rename templates/{VueSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/webpack.config.js (100%) rename templates/{VueSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/webpack.config.vendor.js (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/wwwroot/favicon.ico (100%) mode change 100755 => 100644 rename templates/{package-builder/src/dotnetnew => Microsoft.AspNetCore.SpaTemplates}/Microsoft.AspNetCore.SpaTemplates.nuspec (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/.template.config/dotnetcli.host.json (100%) rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/.template.config/icon.png (100%) rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/.template.config/template.json (100%) rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/.template.config/vs-2017.3.host.json (100%) rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/AngularSpa.csproj (100%) rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/ClientApp/app/app.module.browser.ts (100%) rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/ClientApp/app/app.module.server.ts (100%) rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/ClientApp/app/app.module.shared.ts (100%) rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/ClientApp/app/components/app/app.component.css (100%) rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/ClientApp/app/components/app/app.component.html (100%) rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/ClientApp/app/components/app/app.component.ts (100%) rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/ClientApp/app/components/counter/counter.component.html (100%) rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/ClientApp/app/components/counter/counter.component.spec.ts (100%) rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/ClientApp/app/components/counter/counter.component.ts (100%) rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/ClientApp/app/components/fetchdata/fetchdata.component.html (100%) rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/ClientApp/app/components/fetchdata/fetchdata.component.ts (100%) rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/ClientApp/app/components/home/home.component.html (100%) rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/ClientApp/app/components/home/home.component.ts (100%) rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/ClientApp/app/components/navmenu/navmenu.component.css (100%) rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/ClientApp/app/components/navmenu/navmenu.component.html (100%) rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/ClientApp/app/components/navmenu/navmenu.component.ts (100%) rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/ClientApp/boot.browser.ts (100%) rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/ClientApp/boot.server.ts (100%) rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/ClientApp/test/boot-tests.ts (100%) rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/ClientApp/test/karma.conf.js (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/Controllers/HomeController.cs (100%) mode change 100755 => 100644 rename templates/{ReactSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/Controllers/SampleDataController.cs (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/Program.cs (100%) rename templates/{VueSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/Startup.cs (100%) rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/Views/Home/Index.cshtml (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/Views/Shared/Error.cshtml (100%) mode change 100755 => 100644 rename templates/{AureliaSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/Views/Shared/_Layout.cshtml (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/Views/_ViewImports.cshtml (100%) mode change 100755 => 100644 rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/Views/_ViewStart.cshtml (100%) mode change 100755 => 100644 rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/appsettings.Development.json (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/appsettings.json (100%) mode change 100755 => 100644 rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/npm-shrinkwrap.json (100%) rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/package.json (100%) rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/template_gitignore (100%) rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/tsconfig.json (100%) rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/webpack.config.js (100%) rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/webpack.config.vendor.js (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/wwwroot/favicon.ico (100%) mode change 100755 => 100644 rename templates/{ReactSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/.template.config/dotnetcli.host.json (100%) rename templates/{ReactSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/.template.config/icon.png (100%) rename templates/{ReactSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/.template.config/template.json (100%) rename templates/{ReactSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/.template.config/vs-2017.3.host.json (100%) rename templates/{ReactSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/ClientApp/boot.tsx (100%) rename templates/{ReactSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/ClientApp/components/Counter.tsx (100%) rename templates/{ReactSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/ClientApp/components/FetchData.tsx (100%) rename templates/{ReactSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/ClientApp/components/Home.tsx (100%) rename templates/{ReactSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/ClientApp/components/Layout.tsx (100%) rename templates/{ReactSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/ClientApp/components/NavMenu.tsx (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/ClientApp/css/site.css (100%) mode change 100755 => 100644 rename templates/{ReactSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/ClientApp/routes.tsx (100%) rename templates/{ReactSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/Controllers/HomeController.cs (100%) mode change 100755 => 100644 rename templates/{VueSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/Controllers/SampleDataController.cs (100%) rename templates/{ReactSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/Program.cs (100%) rename templates/{ReactSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/ReactSpa.csproj (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/Startup.cs (100%) mode change 100755 => 100644 rename templates/{ReactSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/Views/Home/Index.cshtml (100%) rename templates/{ReactSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/Views/Shared/Error.cshtml (100%) mode change 100755 => 100644 rename templates/{VueSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/Views/Shared/_Layout.cshtml (100%) rename templates/{ReactSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/Views/_ViewImports.cshtml (100%) mode change 100755 => 100644 rename templates/{ReactSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/Views/_ViewStart.cshtml (100%) mode change 100755 => 100644 rename templates/{ReactSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/appsettings.Development.json (100%) rename templates/{ReactSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/appsettings.json (100%) mode change 100755 => 100644 rename templates/{ReactSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/npm-shrinkwrap.json (100%) rename templates/{ReactSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/package.json (100%) rename templates/{ReactSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/template_gitignore (100%) rename templates/{ReactSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/tsconfig.json (100%) rename templates/{ReactSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/webpack.config.js (100%) rename templates/{ReactSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/webpack.config.vendor.js (100%) rename templates/{ReactSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/wwwroot/favicon.ico (100%) mode change 100755 => 100644 rename templates/{VueSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/.template.config/dotnetcli.host.json (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/.template.config/icon.png (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/.template.config/template.json (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/.template.config/vs-2017.3.host.json (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/ClientApp/boot-client.tsx (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/ClientApp/boot-server.tsx (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/ClientApp/components/Counter.tsx (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/ClientApp/components/FetchData.tsx (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/ClientApp/components/Home.tsx (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/ClientApp/components/Layout.tsx (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/ClientApp/components/NavMenu.tsx (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/ClientApp/configureStore.ts (100%) rename templates/{ReactSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/ClientApp/css/site.css (100%) mode change 100755 => 100644 rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/ClientApp/routes.tsx (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/ClientApp/store/Counter.ts (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/ClientApp/store/WeatherForecasts.ts (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/ClientApp/store/index.ts (100%) rename templates/{VueSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/Controllers/HomeController.cs (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/Controllers/SampleDataController.cs (100%) rename templates/{VueSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/Program.cs (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/ReactReduxSpa.csproj (100%) rename templates/{ReactSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/Startup.cs (100%) mode change 100755 => 100644 rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/Views/Home/Index.cshtml (100%) rename templates/{VueSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/Views/Shared/Error.cshtml (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/Views/Shared/_Layout.cshtml (100%) rename templates/{VueSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/Views/_ViewImports.cshtml (100%) rename templates/{VueSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/Views/_ViewStart.cshtml (100%) rename templates/{VueSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/appsettings.Development.json (100%) rename templates/{VueSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/appsettings.json (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/npm-shrinkwrap.json (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/package.json (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/template_gitignore (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/tsconfig.json (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/webpack.config.js (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/webpack.config.vendor.js (100%) rename templates/{VueSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/wwwroot/favicon.ico (100%) rename templates/{package-builder/src/dotnetnew => Microsoft.DotNet.Web.Spa.ProjectTemplates}/Microsoft.DotNet.Web.Spa.ProjectTemplates.nuspec (100%) diff --git a/.gitignore b/.gitignore index 1a704fbe..8abcfa13 100644 --- a/.gitignore +++ b/.gitignore @@ -33,12 +33,12 @@ npm-debug.log # files with that name (https://github.com/npm/npm/issues/1862). So, each template instead has a template_gitignore # file which gets renamed after the files are copied. And so any files that need to be excluded in the source # repo have to be excluded here. -/templates/*/node_modules/ -/templates/*/wwwroot/dist/ -/templates/*/ClientApp/dist/ -/templates/*/yarn.lock +/templates/*/*/*/node_modules/ +/templates/*/*/*/wwwroot/dist/ +/templates/*/*/*/ClientApp/dist/ +/templates/*/*/*/yarn.lock .vscode/ -/templates/*/Properties/launchSettings.json +/templates/*/*/*/Properties/launchSettings.json global.json korebuild-lock.txt diff --git a/templates/AngularSpa/.template.config/dotnetcli.host.json b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/.template.config/dotnetcli.host.json similarity index 100% rename from templates/AngularSpa/.template.config/dotnetcli.host.json rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/.template.config/dotnetcli.host.json diff --git a/templates/AureliaSpa/.template.config/icon.png b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/.template.config/icon.png similarity index 100% rename from templates/AureliaSpa/.template.config/icon.png rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/.template.config/icon.png diff --git a/templates/AureliaSpa/.template.config/template.json b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/.template.config/template.json similarity index 100% rename from templates/AureliaSpa/.template.config/template.json rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/.template.config/template.json diff --git a/templates/AureliaSpa/.template.config/vs-2017.3.host.json b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/.template.config/vs-2017.3.host.json similarity index 100% rename from templates/AureliaSpa/.template.config/vs-2017.3.host.json rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/.template.config/vs-2017.3.host.json diff --git a/templates/AureliaSpa/AureliaSpa.csproj b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/AureliaSpa.csproj similarity index 100% rename from templates/AureliaSpa/AureliaSpa.csproj rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/AureliaSpa.csproj diff --git a/templates/AureliaSpa/ClientApp/app/components/app/app.css b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/app/app.css similarity index 100% rename from templates/AureliaSpa/ClientApp/app/components/app/app.css rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/app/app.css diff --git a/templates/AureliaSpa/ClientApp/app/components/app/app.html b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/app/app.html similarity index 100% rename from templates/AureliaSpa/ClientApp/app/components/app/app.html rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/app/app.html diff --git a/templates/AureliaSpa/ClientApp/app/components/app/app.ts b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/app/app.ts similarity index 100% rename from templates/AureliaSpa/ClientApp/app/components/app/app.ts rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/app/app.ts diff --git a/templates/AureliaSpa/ClientApp/app/components/counter/counter.html b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/counter/counter.html similarity index 100% rename from templates/AureliaSpa/ClientApp/app/components/counter/counter.html rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/counter/counter.html diff --git a/templates/AureliaSpa/ClientApp/app/components/counter/counter.ts b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/counter/counter.ts similarity index 100% rename from templates/AureliaSpa/ClientApp/app/components/counter/counter.ts rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/counter/counter.ts diff --git a/templates/AureliaSpa/ClientApp/app/components/fetchdata/fetchdata.html b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/fetchdata/fetchdata.html similarity index 100% rename from templates/AureliaSpa/ClientApp/app/components/fetchdata/fetchdata.html rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/fetchdata/fetchdata.html diff --git a/templates/AureliaSpa/ClientApp/app/components/fetchdata/fetchdata.ts b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/fetchdata/fetchdata.ts similarity index 100% rename from templates/AureliaSpa/ClientApp/app/components/fetchdata/fetchdata.ts rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/fetchdata/fetchdata.ts diff --git a/templates/AureliaSpa/ClientApp/app/components/home/home.html b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/home/home.html similarity index 100% rename from templates/AureliaSpa/ClientApp/app/components/home/home.html rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/home/home.html diff --git a/templates/AureliaSpa/ClientApp/app/components/home/home.ts b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/home/home.ts similarity index 100% rename from templates/AureliaSpa/ClientApp/app/components/home/home.ts rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/home/home.ts diff --git a/templates/AureliaSpa/ClientApp/app/components/navmenu/navmenu.css b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/navmenu/navmenu.css similarity index 100% rename from templates/AureliaSpa/ClientApp/app/components/navmenu/navmenu.css rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/navmenu/navmenu.css diff --git a/templates/AureliaSpa/ClientApp/app/components/navmenu/navmenu.html b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/navmenu/navmenu.html similarity index 100% rename from templates/AureliaSpa/ClientApp/app/components/navmenu/navmenu.html rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/navmenu/navmenu.html diff --git a/templates/AureliaSpa/ClientApp/boot.ts b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/boot.ts similarity index 100% rename from templates/AureliaSpa/ClientApp/boot.ts rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/boot.ts diff --git a/templates/AngularSpa/Controllers/HomeController.cs b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Controllers/HomeController.cs similarity index 100% rename from templates/AngularSpa/Controllers/HomeController.cs rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Controllers/HomeController.cs diff --git a/templates/AureliaSpa/Controllers/SampleDataController.cs b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Controllers/SampleDataController.cs similarity index 100% rename from templates/AureliaSpa/Controllers/SampleDataController.cs rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Controllers/SampleDataController.cs diff --git a/templates/AngularSpa/Program.cs b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Program.cs similarity index 100% rename from templates/AngularSpa/Program.cs rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Program.cs diff --git a/templates/AngularSpa/Startup.cs b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Startup.cs similarity index 100% rename from templates/AngularSpa/Startup.cs rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Startup.cs diff --git a/templates/AureliaSpa/Views/Home/Index.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Views/Home/Index.cshtml similarity index 100% rename from templates/AureliaSpa/Views/Home/Index.cshtml rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Views/Home/Index.cshtml diff --git a/templates/AngularSpa/Views/Shared/Error.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Views/Shared/Error.cshtml similarity index 100% rename from templates/AngularSpa/Views/Shared/Error.cshtml rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Views/Shared/Error.cshtml diff --git a/templates/AngularSpa/Views/Shared/_Layout.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Views/Shared/_Layout.cshtml similarity index 100% rename from templates/AngularSpa/Views/Shared/_Layout.cshtml rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Views/Shared/_Layout.cshtml diff --git a/templates/AngularSpa/Views/_ViewImports.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Views/_ViewImports.cshtml similarity index 100% rename from templates/AngularSpa/Views/_ViewImports.cshtml rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Views/_ViewImports.cshtml diff --git a/templates/AngularSpa/Views/_ViewStart.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Views/_ViewStart.cshtml similarity index 100% rename from templates/AngularSpa/Views/_ViewStart.cshtml rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Views/_ViewStart.cshtml diff --git a/templates/AngularSpa/appsettings.Development.json b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/appsettings.Development.json similarity index 100% rename from templates/AngularSpa/appsettings.Development.json rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/appsettings.Development.json diff --git a/templates/AngularSpa/appsettings.json b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/appsettings.json similarity index 100% rename from templates/AngularSpa/appsettings.json rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/appsettings.json diff --git a/templates/AureliaSpa/npm-shrinkwrap.json b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/npm-shrinkwrap.json similarity index 100% rename from templates/AureliaSpa/npm-shrinkwrap.json rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/npm-shrinkwrap.json diff --git a/templates/AureliaSpa/package.json b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/package.json similarity index 100% rename from templates/AureliaSpa/package.json rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/package.json diff --git a/templates/AureliaSpa/template_gitignore b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/template_gitignore similarity index 100% rename from templates/AureliaSpa/template_gitignore rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/template_gitignore diff --git a/templates/AureliaSpa/tsconfig.json b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/tsconfig.json similarity index 100% rename from templates/AureliaSpa/tsconfig.json rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/tsconfig.json diff --git a/templates/AureliaSpa/webpack.config.js b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/webpack.config.js similarity index 100% rename from templates/AureliaSpa/webpack.config.js rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/webpack.config.js diff --git a/templates/AureliaSpa/webpack.config.vendor.js b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/webpack.config.vendor.js similarity index 100% rename from templates/AureliaSpa/webpack.config.vendor.js rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/webpack.config.vendor.js diff --git a/templates/AureliaSpa/wwwroot/favicon.ico b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/wwwroot/favicon.ico similarity index 100% rename from templates/AureliaSpa/wwwroot/favicon.ico rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/wwwroot/favicon.ico diff --git a/templates/AureliaSpa/.template.config/dotnetcli.host.json b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/.template.config/dotnetcli.host.json similarity index 100% rename from templates/AureliaSpa/.template.config/dotnetcli.host.json rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/.template.config/dotnetcli.host.json diff --git a/templates/KnockoutSpa/.template.config/icon.png b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/.template.config/icon.png similarity index 100% rename from templates/KnockoutSpa/.template.config/icon.png rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/.template.config/icon.png diff --git a/templates/KnockoutSpa/.template.config/template.json b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/.template.config/template.json similarity index 100% rename from templates/KnockoutSpa/.template.config/template.json rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/.template.config/template.json diff --git a/templates/KnockoutSpa/.template.config/vs-2017.3.host.json b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/.template.config/vs-2017.3.host.json similarity index 100% rename from templates/KnockoutSpa/.template.config/vs-2017.3.host.json rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/.template.config/vs-2017.3.host.json diff --git a/templates/KnockoutSpa/ClientApp/boot.ts b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/boot.ts similarity index 100% rename from templates/KnockoutSpa/ClientApp/boot.ts rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/boot.ts diff --git a/templates/KnockoutSpa/ClientApp/components/app-root/app-root.html b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/app-root/app-root.html similarity index 100% rename from templates/KnockoutSpa/ClientApp/components/app-root/app-root.html rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/app-root/app-root.html diff --git a/templates/KnockoutSpa/ClientApp/components/app-root/app-root.ts b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/app-root/app-root.ts similarity index 100% rename from templates/KnockoutSpa/ClientApp/components/app-root/app-root.ts rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/app-root/app-root.ts diff --git a/templates/KnockoutSpa/ClientApp/components/counter-example/counter-example.html b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/counter-example/counter-example.html similarity index 100% rename from templates/KnockoutSpa/ClientApp/components/counter-example/counter-example.html rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/counter-example/counter-example.html diff --git a/templates/KnockoutSpa/ClientApp/components/counter-example/counter-example.ts b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/counter-example/counter-example.ts similarity index 100% rename from templates/KnockoutSpa/ClientApp/components/counter-example/counter-example.ts rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/counter-example/counter-example.ts diff --git a/templates/KnockoutSpa/ClientApp/components/fetch-data/fetch-data.html b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/fetch-data/fetch-data.html similarity index 100% rename from templates/KnockoutSpa/ClientApp/components/fetch-data/fetch-data.html rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/fetch-data/fetch-data.html diff --git a/templates/KnockoutSpa/ClientApp/components/fetch-data/fetch-data.ts b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/fetch-data/fetch-data.ts similarity index 100% rename from templates/KnockoutSpa/ClientApp/components/fetch-data/fetch-data.ts rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/fetch-data/fetch-data.ts diff --git a/templates/KnockoutSpa/ClientApp/components/home-page/home-page.html b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/home-page/home-page.html similarity index 100% rename from templates/KnockoutSpa/ClientApp/components/home-page/home-page.html rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/home-page/home-page.html diff --git a/templates/KnockoutSpa/ClientApp/components/home-page/home-page.ts b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/home-page/home-page.ts similarity index 100% rename from templates/KnockoutSpa/ClientApp/components/home-page/home-page.ts rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/home-page/home-page.ts diff --git a/templates/KnockoutSpa/ClientApp/components/nav-menu/nav-menu.html b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/nav-menu/nav-menu.html similarity index 100% rename from templates/KnockoutSpa/ClientApp/components/nav-menu/nav-menu.html rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/nav-menu/nav-menu.html diff --git a/templates/KnockoutSpa/ClientApp/components/nav-menu/nav-menu.ts b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/nav-menu/nav-menu.ts similarity index 100% rename from templates/KnockoutSpa/ClientApp/components/nav-menu/nav-menu.ts rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/nav-menu/nav-menu.ts diff --git a/templates/KnockoutSpa/ClientApp/css/site.css b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/css/site.css old mode 100755 new mode 100644 similarity index 100% rename from templates/KnockoutSpa/ClientApp/css/site.css rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/css/site.css diff --git a/templates/KnockoutSpa/ClientApp/router.ts b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/router.ts similarity index 100% rename from templates/KnockoutSpa/ClientApp/router.ts rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/router.ts diff --git a/templates/KnockoutSpa/ClientApp/webpack-component-loader.ts b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/webpack-component-loader.ts similarity index 100% rename from templates/KnockoutSpa/ClientApp/webpack-component-loader.ts rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/webpack-component-loader.ts diff --git a/templates/AureliaSpa/Controllers/HomeController.cs b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Controllers/HomeController.cs similarity index 100% rename from templates/AureliaSpa/Controllers/HomeController.cs rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Controllers/HomeController.cs diff --git a/templates/AngularSpa/Controllers/SampleDataController.cs b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Controllers/SampleDataController.cs similarity index 100% rename from templates/AngularSpa/Controllers/SampleDataController.cs rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Controllers/SampleDataController.cs diff --git a/templates/KnockoutSpa/KnockoutSpa.csproj b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/KnockoutSpa.csproj similarity index 100% rename from templates/KnockoutSpa/KnockoutSpa.csproj rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/KnockoutSpa.csproj diff --git a/templates/AureliaSpa/Program.cs b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Program.cs similarity index 100% rename from templates/AureliaSpa/Program.cs rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Program.cs diff --git a/templates/AureliaSpa/Startup.cs b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Startup.cs similarity index 100% rename from templates/AureliaSpa/Startup.cs rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Startup.cs diff --git a/templates/KnockoutSpa/Views/Home/Index.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Views/Home/Index.cshtml similarity index 100% rename from templates/KnockoutSpa/Views/Home/Index.cshtml rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Views/Home/Index.cshtml diff --git a/templates/AureliaSpa/Views/Shared/Error.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Views/Shared/Error.cshtml similarity index 100% rename from templates/AureliaSpa/Views/Shared/Error.cshtml rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Views/Shared/Error.cshtml diff --git a/templates/KnockoutSpa/Views/Shared/_Layout.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Views/Shared/_Layout.cshtml similarity index 100% rename from templates/KnockoutSpa/Views/Shared/_Layout.cshtml rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Views/Shared/_Layout.cshtml diff --git a/templates/AureliaSpa/Views/_ViewImports.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Views/_ViewImports.cshtml similarity index 100% rename from templates/AureliaSpa/Views/_ViewImports.cshtml rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Views/_ViewImports.cshtml diff --git a/templates/AureliaSpa/Views/_ViewStart.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Views/_ViewStart.cshtml similarity index 100% rename from templates/AureliaSpa/Views/_ViewStart.cshtml rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Views/_ViewStart.cshtml diff --git a/templates/AureliaSpa/appsettings.Development.json b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/appsettings.Development.json similarity index 100% rename from templates/AureliaSpa/appsettings.Development.json rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/appsettings.Development.json diff --git a/templates/AureliaSpa/appsettings.json b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/appsettings.json similarity index 100% rename from templates/AureliaSpa/appsettings.json rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/appsettings.json diff --git a/templates/KnockoutSpa/npm-shrinkwrap.json b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/npm-shrinkwrap.json similarity index 100% rename from templates/KnockoutSpa/npm-shrinkwrap.json rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/npm-shrinkwrap.json diff --git a/templates/KnockoutSpa/package.json b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/package.json similarity index 100% rename from templates/KnockoutSpa/package.json rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/package.json diff --git a/templates/KnockoutSpa/template_gitignore b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/template_gitignore similarity index 100% rename from templates/KnockoutSpa/template_gitignore rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/template_gitignore diff --git a/templates/KnockoutSpa/tsconfig.json b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/tsconfig.json similarity index 100% rename from templates/KnockoutSpa/tsconfig.json rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/tsconfig.json diff --git a/templates/KnockoutSpa/webpack.config.js b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/webpack.config.js similarity index 100% rename from templates/KnockoutSpa/webpack.config.js rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/webpack.config.js diff --git a/templates/KnockoutSpa/webpack.config.vendor.js b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/webpack.config.vendor.js similarity index 100% rename from templates/KnockoutSpa/webpack.config.vendor.js rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/webpack.config.vendor.js diff --git a/templates/AngularSpa/wwwroot/favicon.ico b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/wwwroot/favicon.ico similarity index 100% rename from templates/AngularSpa/wwwroot/favicon.ico rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/wwwroot/favicon.ico diff --git a/templates/KnockoutSpa/.template.config/dotnetcli.host.json b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/.template.config/dotnetcli.host.json similarity index 100% rename from templates/KnockoutSpa/.template.config/dotnetcli.host.json rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/.template.config/dotnetcli.host.json diff --git a/templates/VueSpa/.template.config/icon.png b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/.template.config/icon.png similarity index 100% rename from templates/VueSpa/.template.config/icon.png rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/.template.config/icon.png diff --git a/templates/VueSpa/.template.config/template.json b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/.template.config/template.json similarity index 100% rename from templates/VueSpa/.template.config/template.json rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/.template.config/template.json diff --git a/templates/VueSpa/.template.config/vs-2017.3.host.json b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/.template.config/vs-2017.3.host.json similarity index 100% rename from templates/VueSpa/.template.config/vs-2017.3.host.json rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/.template.config/vs-2017.3.host.json diff --git a/templates/VueSpa/ClientApp/boot.ts b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/boot.ts similarity index 100% rename from templates/VueSpa/ClientApp/boot.ts rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/boot.ts diff --git a/templates/VueSpa/ClientApp/components/app/app.ts b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/app/app.ts similarity index 100% rename from templates/VueSpa/ClientApp/components/app/app.ts rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/app/app.ts diff --git a/templates/VueSpa/ClientApp/components/app/app.vue.html b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/app/app.vue.html similarity index 100% rename from templates/VueSpa/ClientApp/components/app/app.vue.html rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/app/app.vue.html diff --git a/templates/VueSpa/ClientApp/components/counter/counter.ts b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/counter/counter.ts similarity index 100% rename from templates/VueSpa/ClientApp/components/counter/counter.ts rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/counter/counter.ts diff --git a/templates/VueSpa/ClientApp/components/counter/counter.vue.html b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/counter/counter.vue.html similarity index 100% rename from templates/VueSpa/ClientApp/components/counter/counter.vue.html rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/counter/counter.vue.html diff --git a/templates/VueSpa/ClientApp/components/fetchdata/fetchdata.ts b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/fetchdata/fetchdata.ts similarity index 100% rename from templates/VueSpa/ClientApp/components/fetchdata/fetchdata.ts rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/fetchdata/fetchdata.ts diff --git a/templates/VueSpa/ClientApp/components/fetchdata/fetchdata.vue.html b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/fetchdata/fetchdata.vue.html similarity index 100% rename from templates/VueSpa/ClientApp/components/fetchdata/fetchdata.vue.html rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/fetchdata/fetchdata.vue.html diff --git a/templates/VueSpa/ClientApp/components/home/home.vue.html b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/home/home.vue.html similarity index 100% rename from templates/VueSpa/ClientApp/components/home/home.vue.html rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/home/home.vue.html diff --git a/templates/VueSpa/ClientApp/components/navmenu/navmenu.css b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/navmenu/navmenu.css similarity index 100% rename from templates/VueSpa/ClientApp/components/navmenu/navmenu.css rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/navmenu/navmenu.css diff --git a/templates/VueSpa/ClientApp/components/navmenu/navmenu.vue.html b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/navmenu/navmenu.vue.html similarity index 100% rename from templates/VueSpa/ClientApp/components/navmenu/navmenu.vue.html rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/navmenu/navmenu.vue.html diff --git a/templates/VueSpa/ClientApp/css/site.css b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/css/site.css similarity index 100% rename from templates/VueSpa/ClientApp/css/site.css rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/css/site.css diff --git a/templates/KnockoutSpa/Controllers/HomeController.cs b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Controllers/HomeController.cs old mode 100755 new mode 100644 similarity index 100% rename from templates/KnockoutSpa/Controllers/HomeController.cs rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Controllers/HomeController.cs diff --git a/templates/KnockoutSpa/Controllers/SampleDataController.cs b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Controllers/SampleDataController.cs similarity index 100% rename from templates/KnockoutSpa/Controllers/SampleDataController.cs rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Controllers/SampleDataController.cs diff --git a/templates/KnockoutSpa/Program.cs b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Program.cs similarity index 100% rename from templates/KnockoutSpa/Program.cs rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Program.cs diff --git a/templates/KnockoutSpa/Startup.cs b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Startup.cs old mode 100755 new mode 100644 similarity index 100% rename from templates/KnockoutSpa/Startup.cs rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Startup.cs diff --git a/templates/VueSpa/Views/Home/Index.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Views/Home/Index.cshtml similarity index 100% rename from templates/VueSpa/Views/Home/Index.cshtml rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Views/Home/Index.cshtml diff --git a/templates/KnockoutSpa/Views/Shared/Error.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Views/Shared/Error.cshtml old mode 100755 new mode 100644 similarity index 100% rename from templates/KnockoutSpa/Views/Shared/Error.cshtml rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Views/Shared/Error.cshtml diff --git a/templates/ReactSpa/Views/Shared/_Layout.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Views/Shared/_Layout.cshtml similarity index 100% rename from templates/ReactSpa/Views/Shared/_Layout.cshtml rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Views/Shared/_Layout.cshtml diff --git a/templates/KnockoutSpa/Views/_ViewImports.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Views/_ViewImports.cshtml old mode 100755 new mode 100644 similarity index 100% rename from templates/KnockoutSpa/Views/_ViewImports.cshtml rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Views/_ViewImports.cshtml diff --git a/templates/KnockoutSpa/Views/_ViewStart.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Views/_ViewStart.cshtml old mode 100755 new mode 100644 similarity index 100% rename from templates/KnockoutSpa/Views/_ViewStart.cshtml rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Views/_ViewStart.cshtml diff --git a/templates/VueSpa/VueSpa.csproj b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/VueSpa.csproj similarity index 100% rename from templates/VueSpa/VueSpa.csproj rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/VueSpa.csproj diff --git a/templates/KnockoutSpa/appsettings.Development.json b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/appsettings.Development.json similarity index 100% rename from templates/KnockoutSpa/appsettings.Development.json rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/appsettings.Development.json diff --git a/templates/KnockoutSpa/appsettings.json b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/appsettings.json old mode 100755 new mode 100644 similarity index 100% rename from templates/KnockoutSpa/appsettings.json rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/appsettings.json diff --git a/templates/VueSpa/npm-shrinkwrap.json b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/npm-shrinkwrap.json similarity index 100% rename from templates/VueSpa/npm-shrinkwrap.json rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/npm-shrinkwrap.json diff --git a/templates/VueSpa/package.json b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/package.json similarity index 100% rename from templates/VueSpa/package.json rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/package.json diff --git a/templates/VueSpa/template_gitignore b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/template_gitignore similarity index 100% rename from templates/VueSpa/template_gitignore rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/template_gitignore diff --git a/templates/VueSpa/tsconfig.json b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/tsconfig.json similarity index 100% rename from templates/VueSpa/tsconfig.json rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/tsconfig.json diff --git a/templates/VueSpa/webpack.config.js b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/webpack.config.js similarity index 100% rename from templates/VueSpa/webpack.config.js rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/webpack.config.js diff --git a/templates/VueSpa/webpack.config.vendor.js b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/webpack.config.vendor.js similarity index 100% rename from templates/VueSpa/webpack.config.vendor.js rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/webpack.config.vendor.js diff --git a/templates/KnockoutSpa/wwwroot/favicon.ico b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/wwwroot/favicon.ico old mode 100755 new mode 100644 similarity index 100% rename from templates/KnockoutSpa/wwwroot/favicon.ico rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/wwwroot/favicon.ico diff --git a/templates/package-builder/src/dotnetnew/Microsoft.AspNetCore.SpaTemplates.nuspec b/templates/Microsoft.AspNetCore.SpaTemplates/Microsoft.AspNetCore.SpaTemplates.nuspec similarity index 100% rename from templates/package-builder/src/dotnetnew/Microsoft.AspNetCore.SpaTemplates.nuspec rename to templates/Microsoft.AspNetCore.SpaTemplates/Microsoft.AspNetCore.SpaTemplates.nuspec diff --git a/templates/ReactReduxSpa/.template.config/dotnetcli.host.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/.template.config/dotnetcli.host.json similarity index 100% rename from templates/ReactReduxSpa/.template.config/dotnetcli.host.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/.template.config/dotnetcli.host.json diff --git a/templates/AngularSpa/.template.config/icon.png b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/.template.config/icon.png similarity index 100% rename from templates/AngularSpa/.template.config/icon.png rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/.template.config/icon.png diff --git a/templates/AngularSpa/.template.config/template.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/.template.config/template.json similarity index 100% rename from templates/AngularSpa/.template.config/template.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/.template.config/template.json diff --git a/templates/AngularSpa/.template.config/vs-2017.3.host.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/.template.config/vs-2017.3.host.json similarity index 100% rename from templates/AngularSpa/.template.config/vs-2017.3.host.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/.template.config/vs-2017.3.host.json diff --git a/templates/AngularSpa/AngularSpa.csproj b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/AngularSpa.csproj similarity index 100% rename from templates/AngularSpa/AngularSpa.csproj rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/AngularSpa.csproj diff --git a/templates/AngularSpa/ClientApp/app/app.module.browser.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/app.module.browser.ts similarity index 100% rename from templates/AngularSpa/ClientApp/app/app.module.browser.ts rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/app.module.browser.ts diff --git a/templates/AngularSpa/ClientApp/app/app.module.server.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/app.module.server.ts similarity index 100% rename from templates/AngularSpa/ClientApp/app/app.module.server.ts rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/app.module.server.ts diff --git a/templates/AngularSpa/ClientApp/app/app.module.shared.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/app.module.shared.ts similarity index 100% rename from templates/AngularSpa/ClientApp/app/app.module.shared.ts rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/app.module.shared.ts diff --git a/templates/AngularSpa/ClientApp/app/components/app/app.component.css b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/app/app.component.css similarity index 100% rename from templates/AngularSpa/ClientApp/app/components/app/app.component.css rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/app/app.component.css diff --git a/templates/AngularSpa/ClientApp/app/components/app/app.component.html b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/app/app.component.html similarity index 100% rename from templates/AngularSpa/ClientApp/app/components/app/app.component.html rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/app/app.component.html diff --git a/templates/AngularSpa/ClientApp/app/components/app/app.component.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/app/app.component.ts similarity index 100% rename from templates/AngularSpa/ClientApp/app/components/app/app.component.ts rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/app/app.component.ts diff --git a/templates/AngularSpa/ClientApp/app/components/counter/counter.component.html b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/counter/counter.component.html similarity index 100% rename from templates/AngularSpa/ClientApp/app/components/counter/counter.component.html rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/counter/counter.component.html diff --git a/templates/AngularSpa/ClientApp/app/components/counter/counter.component.spec.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/counter/counter.component.spec.ts similarity index 100% rename from templates/AngularSpa/ClientApp/app/components/counter/counter.component.spec.ts rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/counter/counter.component.spec.ts diff --git a/templates/AngularSpa/ClientApp/app/components/counter/counter.component.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/counter/counter.component.ts similarity index 100% rename from templates/AngularSpa/ClientApp/app/components/counter/counter.component.ts rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/counter/counter.component.ts diff --git a/templates/AngularSpa/ClientApp/app/components/fetchdata/fetchdata.component.html b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/fetchdata/fetchdata.component.html similarity index 100% rename from templates/AngularSpa/ClientApp/app/components/fetchdata/fetchdata.component.html rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/fetchdata/fetchdata.component.html diff --git a/templates/AngularSpa/ClientApp/app/components/fetchdata/fetchdata.component.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/fetchdata/fetchdata.component.ts similarity index 100% rename from templates/AngularSpa/ClientApp/app/components/fetchdata/fetchdata.component.ts rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/fetchdata/fetchdata.component.ts diff --git a/templates/AngularSpa/ClientApp/app/components/home/home.component.html b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/home/home.component.html similarity index 100% rename from templates/AngularSpa/ClientApp/app/components/home/home.component.html rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/home/home.component.html diff --git a/templates/AngularSpa/ClientApp/app/components/home/home.component.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/home/home.component.ts similarity index 100% rename from templates/AngularSpa/ClientApp/app/components/home/home.component.ts rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/home/home.component.ts diff --git a/templates/AngularSpa/ClientApp/app/components/navmenu/navmenu.component.css b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/navmenu/navmenu.component.css similarity index 100% rename from templates/AngularSpa/ClientApp/app/components/navmenu/navmenu.component.css rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/navmenu/navmenu.component.css diff --git a/templates/AngularSpa/ClientApp/app/components/navmenu/navmenu.component.html b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/navmenu/navmenu.component.html similarity index 100% rename from templates/AngularSpa/ClientApp/app/components/navmenu/navmenu.component.html rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/navmenu/navmenu.component.html diff --git a/templates/AngularSpa/ClientApp/app/components/navmenu/navmenu.component.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/navmenu/navmenu.component.ts similarity index 100% rename from templates/AngularSpa/ClientApp/app/components/navmenu/navmenu.component.ts rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/navmenu/navmenu.component.ts diff --git a/templates/AngularSpa/ClientApp/boot.browser.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/boot.browser.ts similarity index 100% rename from templates/AngularSpa/ClientApp/boot.browser.ts rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/boot.browser.ts diff --git a/templates/AngularSpa/ClientApp/boot.server.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/boot.server.ts similarity index 100% rename from templates/AngularSpa/ClientApp/boot.server.ts rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/boot.server.ts diff --git a/templates/AngularSpa/ClientApp/test/boot-tests.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/test/boot-tests.ts similarity index 100% rename from templates/AngularSpa/ClientApp/test/boot-tests.ts rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/test/boot-tests.ts diff --git a/templates/AngularSpa/ClientApp/test/karma.conf.js b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/test/karma.conf.js similarity index 100% rename from templates/AngularSpa/ClientApp/test/karma.conf.js rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/test/karma.conf.js diff --git a/templates/ReactReduxSpa/Controllers/HomeController.cs b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Controllers/HomeController.cs old mode 100755 new mode 100644 similarity index 100% rename from templates/ReactReduxSpa/Controllers/HomeController.cs rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Controllers/HomeController.cs diff --git a/templates/ReactSpa/Controllers/SampleDataController.cs b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Controllers/SampleDataController.cs similarity index 100% rename from templates/ReactSpa/Controllers/SampleDataController.cs rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Controllers/SampleDataController.cs diff --git a/templates/ReactReduxSpa/Program.cs b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Program.cs similarity index 100% rename from templates/ReactReduxSpa/Program.cs rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Program.cs diff --git a/templates/VueSpa/Startup.cs b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Startup.cs similarity index 100% rename from templates/VueSpa/Startup.cs rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Startup.cs diff --git a/templates/AngularSpa/Views/Home/Index.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Views/Home/Index.cshtml similarity index 100% rename from templates/AngularSpa/Views/Home/Index.cshtml rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Views/Home/Index.cshtml diff --git a/templates/ReactReduxSpa/Views/Shared/Error.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Views/Shared/Error.cshtml old mode 100755 new mode 100644 similarity index 100% rename from templates/ReactReduxSpa/Views/Shared/Error.cshtml rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Views/Shared/Error.cshtml diff --git a/templates/AureliaSpa/Views/Shared/_Layout.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Views/Shared/_Layout.cshtml similarity index 100% rename from templates/AureliaSpa/Views/Shared/_Layout.cshtml rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Views/Shared/_Layout.cshtml diff --git a/templates/ReactReduxSpa/Views/_ViewImports.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Views/_ViewImports.cshtml old mode 100755 new mode 100644 similarity index 100% rename from templates/ReactReduxSpa/Views/_ViewImports.cshtml rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Views/_ViewImports.cshtml diff --git a/templates/ReactReduxSpa/Views/_ViewStart.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Views/_ViewStart.cshtml old mode 100755 new mode 100644 similarity index 100% rename from templates/ReactReduxSpa/Views/_ViewStart.cshtml rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Views/_ViewStart.cshtml diff --git a/templates/ReactReduxSpa/appsettings.Development.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/appsettings.Development.json similarity index 100% rename from templates/ReactReduxSpa/appsettings.Development.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/appsettings.Development.json diff --git a/templates/ReactReduxSpa/appsettings.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/appsettings.json old mode 100755 new mode 100644 similarity index 100% rename from templates/ReactReduxSpa/appsettings.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/appsettings.json diff --git a/templates/AngularSpa/npm-shrinkwrap.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/npm-shrinkwrap.json similarity index 100% rename from templates/AngularSpa/npm-shrinkwrap.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/npm-shrinkwrap.json diff --git a/templates/AngularSpa/package.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/package.json similarity index 100% rename from templates/AngularSpa/package.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/package.json diff --git a/templates/AngularSpa/template_gitignore b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/template_gitignore similarity index 100% rename from templates/AngularSpa/template_gitignore rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/template_gitignore diff --git a/templates/AngularSpa/tsconfig.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/tsconfig.json similarity index 100% rename from templates/AngularSpa/tsconfig.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/tsconfig.json diff --git a/templates/AngularSpa/webpack.config.js b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/webpack.config.js similarity index 100% rename from templates/AngularSpa/webpack.config.js rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/webpack.config.js diff --git a/templates/AngularSpa/webpack.config.vendor.js b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/webpack.config.vendor.js similarity index 100% rename from templates/AngularSpa/webpack.config.vendor.js rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/webpack.config.vendor.js diff --git a/templates/ReactReduxSpa/wwwroot/favicon.ico b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/wwwroot/favicon.ico old mode 100755 new mode 100644 similarity index 100% rename from templates/ReactReduxSpa/wwwroot/favicon.ico rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/wwwroot/favicon.ico diff --git a/templates/ReactSpa/.template.config/dotnetcli.host.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/.template.config/dotnetcli.host.json similarity index 100% rename from templates/ReactSpa/.template.config/dotnetcli.host.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/.template.config/dotnetcli.host.json diff --git a/templates/ReactSpa/.template.config/icon.png b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/.template.config/icon.png similarity index 100% rename from templates/ReactSpa/.template.config/icon.png rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/.template.config/icon.png diff --git a/templates/ReactSpa/.template.config/template.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/.template.config/template.json similarity index 100% rename from templates/ReactSpa/.template.config/template.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/.template.config/template.json diff --git a/templates/ReactSpa/.template.config/vs-2017.3.host.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/.template.config/vs-2017.3.host.json similarity index 100% rename from templates/ReactSpa/.template.config/vs-2017.3.host.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/.template.config/vs-2017.3.host.json diff --git a/templates/ReactSpa/ClientApp/boot.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/boot.tsx similarity index 100% rename from templates/ReactSpa/ClientApp/boot.tsx rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/boot.tsx diff --git a/templates/ReactSpa/ClientApp/components/Counter.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/components/Counter.tsx similarity index 100% rename from templates/ReactSpa/ClientApp/components/Counter.tsx rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/components/Counter.tsx diff --git a/templates/ReactSpa/ClientApp/components/FetchData.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/components/FetchData.tsx similarity index 100% rename from templates/ReactSpa/ClientApp/components/FetchData.tsx rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/components/FetchData.tsx diff --git a/templates/ReactSpa/ClientApp/components/Home.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/components/Home.tsx similarity index 100% rename from templates/ReactSpa/ClientApp/components/Home.tsx rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/components/Home.tsx diff --git a/templates/ReactSpa/ClientApp/components/Layout.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/components/Layout.tsx similarity index 100% rename from templates/ReactSpa/ClientApp/components/Layout.tsx rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/components/Layout.tsx diff --git a/templates/ReactSpa/ClientApp/components/NavMenu.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/components/NavMenu.tsx similarity index 100% rename from templates/ReactSpa/ClientApp/components/NavMenu.tsx rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/components/NavMenu.tsx diff --git a/templates/ReactReduxSpa/ClientApp/css/site.css b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/css/site.css old mode 100755 new mode 100644 similarity index 100% rename from templates/ReactReduxSpa/ClientApp/css/site.css rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/css/site.css diff --git a/templates/ReactSpa/ClientApp/routes.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/routes.tsx similarity index 100% rename from templates/ReactSpa/ClientApp/routes.tsx rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/routes.tsx diff --git a/templates/ReactSpa/Controllers/HomeController.cs b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Controllers/HomeController.cs old mode 100755 new mode 100644 similarity index 100% rename from templates/ReactSpa/Controllers/HomeController.cs rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Controllers/HomeController.cs diff --git a/templates/VueSpa/Controllers/SampleDataController.cs b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Controllers/SampleDataController.cs similarity index 100% rename from templates/VueSpa/Controllers/SampleDataController.cs rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Controllers/SampleDataController.cs diff --git a/templates/ReactSpa/Program.cs b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Program.cs similarity index 100% rename from templates/ReactSpa/Program.cs rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Program.cs diff --git a/templates/ReactSpa/ReactSpa.csproj b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ReactSpa.csproj similarity index 100% rename from templates/ReactSpa/ReactSpa.csproj rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ReactSpa.csproj diff --git a/templates/ReactReduxSpa/Startup.cs b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Startup.cs old mode 100755 new mode 100644 similarity index 100% rename from templates/ReactReduxSpa/Startup.cs rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Startup.cs diff --git a/templates/ReactSpa/Views/Home/Index.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Views/Home/Index.cshtml similarity index 100% rename from templates/ReactSpa/Views/Home/Index.cshtml rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Views/Home/Index.cshtml diff --git a/templates/ReactSpa/Views/Shared/Error.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Views/Shared/Error.cshtml old mode 100755 new mode 100644 similarity index 100% rename from templates/ReactSpa/Views/Shared/Error.cshtml rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Views/Shared/Error.cshtml diff --git a/templates/VueSpa/Views/Shared/_Layout.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Views/Shared/_Layout.cshtml similarity index 100% rename from templates/VueSpa/Views/Shared/_Layout.cshtml rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Views/Shared/_Layout.cshtml diff --git a/templates/ReactSpa/Views/_ViewImports.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Views/_ViewImports.cshtml old mode 100755 new mode 100644 similarity index 100% rename from templates/ReactSpa/Views/_ViewImports.cshtml rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Views/_ViewImports.cshtml diff --git a/templates/ReactSpa/Views/_ViewStart.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Views/_ViewStart.cshtml old mode 100755 new mode 100644 similarity index 100% rename from templates/ReactSpa/Views/_ViewStart.cshtml rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Views/_ViewStart.cshtml diff --git a/templates/ReactSpa/appsettings.Development.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/appsettings.Development.json similarity index 100% rename from templates/ReactSpa/appsettings.Development.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/appsettings.Development.json diff --git a/templates/ReactSpa/appsettings.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/appsettings.json old mode 100755 new mode 100644 similarity index 100% rename from templates/ReactSpa/appsettings.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/appsettings.json diff --git a/templates/ReactSpa/npm-shrinkwrap.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/npm-shrinkwrap.json similarity index 100% rename from templates/ReactSpa/npm-shrinkwrap.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/npm-shrinkwrap.json diff --git a/templates/ReactSpa/package.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/package.json similarity index 100% rename from templates/ReactSpa/package.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/package.json diff --git a/templates/ReactSpa/template_gitignore b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/template_gitignore similarity index 100% rename from templates/ReactSpa/template_gitignore rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/template_gitignore diff --git a/templates/ReactSpa/tsconfig.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/tsconfig.json similarity index 100% rename from templates/ReactSpa/tsconfig.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/tsconfig.json diff --git a/templates/ReactSpa/webpack.config.js b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/webpack.config.js similarity index 100% rename from templates/ReactSpa/webpack.config.js rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/webpack.config.js diff --git a/templates/ReactSpa/webpack.config.vendor.js b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/webpack.config.vendor.js similarity index 100% rename from templates/ReactSpa/webpack.config.vendor.js rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/webpack.config.vendor.js diff --git a/templates/ReactSpa/wwwroot/favicon.ico b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/wwwroot/favicon.ico old mode 100755 new mode 100644 similarity index 100% rename from templates/ReactSpa/wwwroot/favicon.ico rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/wwwroot/favicon.ico diff --git a/templates/VueSpa/.template.config/dotnetcli.host.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/.template.config/dotnetcli.host.json similarity index 100% rename from templates/VueSpa/.template.config/dotnetcli.host.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/.template.config/dotnetcli.host.json diff --git a/templates/ReactReduxSpa/.template.config/icon.png b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/.template.config/icon.png similarity index 100% rename from templates/ReactReduxSpa/.template.config/icon.png rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/.template.config/icon.png diff --git a/templates/ReactReduxSpa/.template.config/template.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/.template.config/template.json similarity index 100% rename from templates/ReactReduxSpa/.template.config/template.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/.template.config/template.json diff --git a/templates/ReactReduxSpa/.template.config/vs-2017.3.host.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/.template.config/vs-2017.3.host.json similarity index 100% rename from templates/ReactReduxSpa/.template.config/vs-2017.3.host.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/.template.config/vs-2017.3.host.json diff --git a/templates/ReactReduxSpa/ClientApp/boot-client.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/boot-client.tsx similarity index 100% rename from templates/ReactReduxSpa/ClientApp/boot-client.tsx rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/boot-client.tsx diff --git a/templates/ReactReduxSpa/ClientApp/boot-server.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/boot-server.tsx similarity index 100% rename from templates/ReactReduxSpa/ClientApp/boot-server.tsx rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/boot-server.tsx diff --git a/templates/ReactReduxSpa/ClientApp/components/Counter.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/components/Counter.tsx similarity index 100% rename from templates/ReactReduxSpa/ClientApp/components/Counter.tsx rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/components/Counter.tsx diff --git a/templates/ReactReduxSpa/ClientApp/components/FetchData.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/components/FetchData.tsx similarity index 100% rename from templates/ReactReduxSpa/ClientApp/components/FetchData.tsx rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/components/FetchData.tsx diff --git a/templates/ReactReduxSpa/ClientApp/components/Home.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/components/Home.tsx similarity index 100% rename from templates/ReactReduxSpa/ClientApp/components/Home.tsx rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/components/Home.tsx diff --git a/templates/ReactReduxSpa/ClientApp/components/Layout.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/components/Layout.tsx similarity index 100% rename from templates/ReactReduxSpa/ClientApp/components/Layout.tsx rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/components/Layout.tsx diff --git a/templates/ReactReduxSpa/ClientApp/components/NavMenu.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/components/NavMenu.tsx similarity index 100% rename from templates/ReactReduxSpa/ClientApp/components/NavMenu.tsx rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/components/NavMenu.tsx diff --git a/templates/ReactReduxSpa/ClientApp/configureStore.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/configureStore.ts similarity index 100% rename from templates/ReactReduxSpa/ClientApp/configureStore.ts rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/configureStore.ts diff --git a/templates/ReactSpa/ClientApp/css/site.css b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/css/site.css old mode 100755 new mode 100644 similarity index 100% rename from templates/ReactSpa/ClientApp/css/site.css rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/css/site.css diff --git a/templates/ReactReduxSpa/ClientApp/routes.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/routes.tsx similarity index 100% rename from templates/ReactReduxSpa/ClientApp/routes.tsx rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/routes.tsx diff --git a/templates/ReactReduxSpa/ClientApp/store/Counter.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/store/Counter.ts similarity index 100% rename from templates/ReactReduxSpa/ClientApp/store/Counter.ts rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/store/Counter.ts diff --git a/templates/ReactReduxSpa/ClientApp/store/WeatherForecasts.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/store/WeatherForecasts.ts similarity index 100% rename from templates/ReactReduxSpa/ClientApp/store/WeatherForecasts.ts rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/store/WeatherForecasts.ts diff --git a/templates/ReactReduxSpa/ClientApp/store/index.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/store/index.ts similarity index 100% rename from templates/ReactReduxSpa/ClientApp/store/index.ts rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/store/index.ts diff --git a/templates/VueSpa/Controllers/HomeController.cs b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Controllers/HomeController.cs similarity index 100% rename from templates/VueSpa/Controllers/HomeController.cs rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Controllers/HomeController.cs diff --git a/templates/ReactReduxSpa/Controllers/SampleDataController.cs b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Controllers/SampleDataController.cs similarity index 100% rename from templates/ReactReduxSpa/Controllers/SampleDataController.cs rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Controllers/SampleDataController.cs diff --git a/templates/VueSpa/Program.cs b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Program.cs similarity index 100% rename from templates/VueSpa/Program.cs rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Program.cs diff --git a/templates/ReactReduxSpa/ReactReduxSpa.csproj b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ReactReduxSpa.csproj similarity index 100% rename from templates/ReactReduxSpa/ReactReduxSpa.csproj rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ReactReduxSpa.csproj diff --git a/templates/ReactSpa/Startup.cs b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Startup.cs old mode 100755 new mode 100644 similarity index 100% rename from templates/ReactSpa/Startup.cs rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Startup.cs diff --git a/templates/ReactReduxSpa/Views/Home/Index.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Views/Home/Index.cshtml similarity index 100% rename from templates/ReactReduxSpa/Views/Home/Index.cshtml rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Views/Home/Index.cshtml diff --git a/templates/VueSpa/Views/Shared/Error.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Views/Shared/Error.cshtml similarity index 100% rename from templates/VueSpa/Views/Shared/Error.cshtml rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Views/Shared/Error.cshtml diff --git a/templates/ReactReduxSpa/Views/Shared/_Layout.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Views/Shared/_Layout.cshtml similarity index 100% rename from templates/ReactReduxSpa/Views/Shared/_Layout.cshtml rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Views/Shared/_Layout.cshtml diff --git a/templates/VueSpa/Views/_ViewImports.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Views/_ViewImports.cshtml similarity index 100% rename from templates/VueSpa/Views/_ViewImports.cshtml rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Views/_ViewImports.cshtml diff --git a/templates/VueSpa/Views/_ViewStart.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Views/_ViewStart.cshtml similarity index 100% rename from templates/VueSpa/Views/_ViewStart.cshtml rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Views/_ViewStart.cshtml diff --git a/templates/VueSpa/appsettings.Development.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/appsettings.Development.json similarity index 100% rename from templates/VueSpa/appsettings.Development.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/appsettings.Development.json diff --git a/templates/VueSpa/appsettings.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/appsettings.json similarity index 100% rename from templates/VueSpa/appsettings.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/appsettings.json diff --git a/templates/ReactReduxSpa/npm-shrinkwrap.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/npm-shrinkwrap.json similarity index 100% rename from templates/ReactReduxSpa/npm-shrinkwrap.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/npm-shrinkwrap.json diff --git a/templates/ReactReduxSpa/package.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/package.json similarity index 100% rename from templates/ReactReduxSpa/package.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/package.json diff --git a/templates/ReactReduxSpa/template_gitignore b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/template_gitignore similarity index 100% rename from templates/ReactReduxSpa/template_gitignore rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/template_gitignore diff --git a/templates/ReactReduxSpa/tsconfig.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/tsconfig.json similarity index 100% rename from templates/ReactReduxSpa/tsconfig.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/tsconfig.json diff --git a/templates/ReactReduxSpa/webpack.config.js b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/webpack.config.js similarity index 100% rename from templates/ReactReduxSpa/webpack.config.js rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/webpack.config.js diff --git a/templates/ReactReduxSpa/webpack.config.vendor.js b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/webpack.config.vendor.js similarity index 100% rename from templates/ReactReduxSpa/webpack.config.vendor.js rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/webpack.config.vendor.js diff --git a/templates/VueSpa/wwwroot/favicon.ico b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/wwwroot/favicon.ico similarity index 100% rename from templates/VueSpa/wwwroot/favicon.ico rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/wwwroot/favicon.ico diff --git a/templates/package-builder/src/dotnetnew/Microsoft.DotNet.Web.Spa.ProjectTemplates.nuspec b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.nuspec similarity index 100% rename from templates/package-builder/src/dotnetnew/Microsoft.DotNet.Web.Spa.ProjectTemplates.nuspec rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.nuspec diff --git a/templates/package-builder/src/build/build.ts b/templates/package-builder/src/build/build.ts index d234bfc3..3abc13d3 100644 --- a/templates/package-builder/src/build/build.ts +++ b/templates/package-builder/src/build/build.ts @@ -11,24 +11,10 @@ import * as targz from 'tar.gz'; const isWindows = /^win/.test(process.platform); const textFileExtensions = ['.gitignore', 'template_gitignore', '.config', '.cs', '.cshtml', '.csproj', '.html', '.js', '.json', '.jsx', '.md', '.nuspec', '.ts', '.tsx']; -const dotNetPackages = { - builtIn: 'Microsoft.DotNet.Web.Spa.ProjectTemplates', - extra: 'Microsoft.AspNetCore.SpaTemplates' -}; - -interface TemplateConfig { - dir: string; - dotNetPackageId: string; -} - -const templates: { [key: string]: TemplateConfig } = { - 'angular': { dotNetPackageId: dotNetPackages.builtIn, dir: '../../templates/AngularSpa/' }, - 'aurelia': { dotNetPackageId: dotNetPackages.extra, dir: '../../templates/AureliaSpa/' }, - 'knockout': { dotNetPackageId: dotNetPackages.extra, dir: '../../templates/KnockoutSpa/' }, - 'react-redux': { dotNetPackageId: dotNetPackages.builtIn, dir: '../../templates/ReactReduxSpa/' }, - 'react': { dotNetPackageId: dotNetPackages.builtIn, dir: '../../templates/ReactSpa/' }, - 'vue': { dotNetPackageId: dotNetPackages.extra, dir: '../../templates/VueSpa/' } -}; +const dotNetPackages = [ + 'Microsoft.DotNet.Web.Spa.ProjectTemplates', + 'Microsoft.AspNetCore.SpaTemplates' +]; function isTextFile(filename: string): boolean { return textFileExtensions.indexOf(path.extname(filename).toLowerCase()) >= 0 @@ -117,18 +103,18 @@ function buildDotNetNewNuGetPackage(packageId: string) { { from: /\btemplate_gitignore$/, to: '.gitignore' } ]; const contentReplacements = []; - _.forEach(templates, (templateConfig, templateName) => { - // Only include templates matching the output package ID - if (templateConfig.dotNetPackageId !== packageId) { - return; - } + const packageSourceRootDir = path.join('../', packageId); + const templatesInPackage = fs.readdirSync(path.join(packageSourceRootDir, 'Content')); + + _.forEach(templatesInPackage, templateName => { + const templateSourceDir = path.join(packageSourceRootDir, 'Content', templateName); const templateOutputDir = path.join(outputRoot, 'Content', templateName); - writeTemplate(templateConfig.dir, templateOutputDir, contentReplacements, filenameReplacements); + writeTemplate(templateSourceDir, templateOutputDir, contentReplacements, filenameReplacements); }); // Create the .nuspec file - const nuspecContentTemplate = fs.readFileSync(`./src/dotnetnew/${ packageId }.nuspec`); + const nuspecContentTemplate = fs.readFileSync(path.join(packageSourceRootDir, `${ packageId }.nuspec`)); writeFileEnsuringDirExists(outputRoot, `${ packageId }.nuspec`, applyContentReplacements(nuspecContentTemplate, [ From 8d6119f31dc5c65052125ec09cd1ac5bc86cce0d Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 23 Aug 2017 15:04:04 -0700 Subject: [PATCH 233/411] Remove the Yeoman-specific gitignore workaround --- .../Content/aurelia/{template_gitignore => .gitignore} | 0 .../knockout/{template_gitignore => .gitignore} | 0 .../Content/vue/{template_gitignore => .gitignore} | 0 .../Content/angular/{template_gitignore => .gitignore} | 0 .../Content/react/{template_gitignore => .gitignore} | 0 .../Content/redux/{template_gitignore => .gitignore} | 0 templates/package-builder/src/build/build.ts | 10 +++------- 7 files changed, 3 insertions(+), 7 deletions(-) rename templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/{template_gitignore => .gitignore} (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/{template_gitignore => .gitignore} (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/{template_gitignore => .gitignore} (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/{template_gitignore => .gitignore} (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/{template_gitignore => .gitignore} (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/{template_gitignore => .gitignore} (100%) diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/template_gitignore b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/.gitignore similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/template_gitignore rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/.gitignore diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/template_gitignore b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/.gitignore similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/template_gitignore rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/.gitignore diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/template_gitignore b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/.gitignore similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/template_gitignore rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/.gitignore diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/template_gitignore b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/.gitignore similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/template_gitignore rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/.gitignore diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/template_gitignore b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/.gitignore similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/template_gitignore rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/.gitignore diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/template_gitignore b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/.gitignore similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/template_gitignore rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/.gitignore diff --git a/templates/package-builder/src/build/build.ts b/templates/package-builder/src/build/build.ts index 3abc13d3..ee57fc13 100644 --- a/templates/package-builder/src/build/build.ts +++ b/templates/package-builder/src/build/build.ts @@ -9,7 +9,7 @@ import * as childProcess from 'child_process'; import * as targz from 'tar.gz'; const isWindows = /^win/.test(process.platform); -const textFileExtensions = ['.gitignore', 'template_gitignore', '.config', '.cs', '.cshtml', '.csproj', '.html', '.js', '.json', '.jsx', '.md', '.nuspec', '.ts', '.tsx']; +const textFileExtensions = ['.gitignore', '.config', '.cs', '.cshtml', '.csproj', '.html', '.js', '.json', '.jsx', '.md', '.nuspec', '.ts', '.tsx']; const dotNetPackages = [ 'Microsoft.DotNet.Web.Spa.ProjectTemplates', @@ -28,10 +28,7 @@ function writeFileEnsuringDirExists(root: string, filename: string, contents: st } function listFilesExcludingGitignored(root: string): string[] { - // Note that the gitignore files, prior to be written by the generator, are called 'template_gitignore' - // instead of '.gitignore'. This is a workaround for Yeoman doing strange stuff with .gitignore files - // (it renames them to .npmignore, which is not helpful). - let gitIgnorePath = path.join(root, 'template_gitignore'); + let gitIgnorePath = path.join(root, '.gitignore'); let gitignoreEvaluator = fs.existsSync(gitIgnorePath) ? gitignore.compile(fs.readFileSync(gitIgnorePath, 'utf8')) : { accepts: () => true }; @@ -99,8 +96,7 @@ function buildDotNetNewNuGetPackage(packageId: string) { const sourceProjectName = 'WebApplicationBasic'; const projectGuid = '00000000-0000-0000-0000-000000000000'; const filenameReplacements = [ - { from: /.*\.csproj$/, to: `${sourceProjectName}.csproj` }, - { from: /\btemplate_gitignore$/, to: '.gitignore' } + { from: /.*\.csproj$/, to: `${sourceProjectName}.csproj` } ]; const contentReplacements = []; From 45d645931b248692c60b267f467def6b0ef1e9df Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 23 Aug 2017 15:27:15 -0700 Subject: [PATCH 234/411] Remove template build dynamic filename replacement. Working towards eliminating template build process completely. --- .../aurelia/.template.config/template.json | 4 +-- .../app/components/navmenu/navmenu.html | 2 +- .../aurelia/Controllers/HomeController.cs | 2 +- .../Controllers/SampleDataController.cs | 2 +- .../Content/aurelia/Program.cs | 2 +- .../Content/aurelia/Startup.cs | 2 +- .../aurelia/Views/Shared/_Layout.cshtml | 2 +- .../Content/aurelia/Views/_ViewImports.cshtml | 2 +- .../Content/aurelia/npm-shrinkwrap.json | 2 +- .../Content/aurelia/package.json | 2 +- .../knockout/.template.config/template.json | 4 +-- .../components/nav-menu/nav-menu.html | 2 +- .../knockout/Controllers/HomeController.cs | 2 +- .../Controllers/SampleDataController.cs | 2 +- .../Content/knockout/Program.cs | 2 +- .../Content/knockout/Startup.cs | 2 +- .../knockout/Views/Shared/_Layout.cshtml | 2 +- .../knockout/Views/_ViewImports.cshtml | 2 +- .../Content/knockout/npm-shrinkwrap.json | 2 +- .../Content/knockout/package.json | 2 +- .../vue/.template.config/template.json | 4 +-- .../components/navmenu/navmenu.vue.html | 2 +- .../Content/vue/Controllers/HomeController.cs | 2 +- .../vue/Controllers/SampleDataController.cs | 2 +- .../Content/vue/Program.cs | 2 +- .../Content/vue/Startup.cs | 2 +- .../Content/vue/Views/Shared/_Layout.cshtml | 2 +- .../Content/vue/Views/_ViewImports.cshtml | 2 +- .../Content/vue/npm-shrinkwrap.json | 2 +- .../Content/vue/package.json | 2 +- .../angular/.template.config/template.json | 4 +-- .../components/navmenu/navmenu.component.html | 2 +- .../angular/Controllers/HomeController.cs | 2 +- .../Controllers/SampleDataController.cs | 2 +- .../Content/angular/Program.cs | 2 +- .../Content/angular/Startup.cs | 2 +- .../angular/Views/Shared/_Layout.cshtml | 2 +- .../Content/angular/Views/_ViewImports.cshtml | 2 +- .../Content/angular/npm-shrinkwrap.json | 2 +- .../Content/angular/package.json | 2 +- .../react/.template.config/template.json | 4 +-- .../react/ClientApp/components/NavMenu.tsx | 2 +- .../react/Controllers/HomeController.cs | 2 +- .../react/Controllers/SampleDataController.cs | 2 +- .../Content/react/Program.cs | 2 +- .../Content/react/Startup.cs | 2 +- .../Content/react/Views/Shared/_Layout.cshtml | 2 +- .../Content/react/Views/_ViewImports.cshtml | 2 +- .../Content/react/npm-shrinkwrap.json | 2 +- .../Content/react/package.json | 2 +- .../redux/.template.config/template.json | 4 +-- .../redux/ClientApp/components/NavMenu.tsx | 2 +- .../redux/Controllers/HomeController.cs | 2 +- .../redux/Controllers/SampleDataController.cs | 2 +- .../Content/redux/Program.cs | 2 +- .../Content/redux/Startup.cs | 2 +- .../Content/redux/Views/Shared/_Layout.cshtml | 2 +- .../Content/redux/Views/_ViewImports.cshtml | 2 +- .../Content/redux/npm-shrinkwrap.json | 2 +- .../Content/redux/package.json | 2 +- templates/package-builder/src/build/build.ts | 26 ++----------------- 61 files changed, 68 insertions(+), 90 deletions(-) diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/.template.config/template.json b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/.template.config/template.json index 5c2277b3..3b176af9 100644 --- a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/.template.config/template.json +++ b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/.template.config/template.json @@ -11,11 +11,11 @@ "preferNameDirectory": true, "primaryOutputs": [ { - "path": "WebApplicationBasic.csproj" + "path": "AureliaSpa.csproj" } ], "shortName": "aurelia", - "sourceName": "WebApplicationBasic", + "sourceName": "AureliaSpa", "sources": [ { "source": "./", diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/navmenu/navmenu.html b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/navmenu/navmenu.html index a604b7e8..1661aa62 100644 --- a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/navmenu/navmenu.html +++ b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/navmenu/navmenu.html @@ -9,7 +9,7 @@ - WebApplicationBasic + AureliaSpa
    diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Controllers/HomeController.cs b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Controllers/HomeController.cs index 2889abd9..18346598 100644 --- a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Controllers/HomeController.cs +++ b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Controllers/HomeController.cs @@ -5,7 +5,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; -namespace WebApplicationBasic.Controllers +namespace AureliaSpa.Controllers { public class HomeController : Controller { diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Controllers/SampleDataController.cs b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Controllers/SampleDataController.cs index 1f46d127..6705a682 100644 --- a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Controllers/SampleDataController.cs +++ b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Controllers/SampleDataController.cs @@ -4,7 +4,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; -namespace WebApplicationBasic.Controllers +namespace AureliaSpa.Controllers { [Route("api/[controller]")] public class SampleDataController : Controller diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Program.cs b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Program.cs index e1e634e4..0b628556 100644 --- a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Program.cs +++ b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Program.cs @@ -8,7 +8,7 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; -namespace WebApplicationBasic +namespace AureliaSpa { public class Program { diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Startup.cs b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Startup.cs index d381113d..4a96590e 100644 --- a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Startup.cs +++ b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Startup.cs @@ -8,7 +8,7 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -namespace WebApplicationBasic +namespace AureliaSpa { public class Startup { diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Views/Shared/_Layout.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Views/Shared/_Layout.cshtml index d5b7a0f5..4e0019c4 100644 --- a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Views/Shared/_Layout.cshtml +++ b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Views/Shared/_Layout.cshtml @@ -3,7 +3,7 @@ - @ViewData["Title"] - WebApplicationBasic + @ViewData["Title"] - AureliaSpa diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Views/_ViewImports.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Views/_ViewImports.cshtml index 8edbc68c..4542402d 100644 --- a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Views/_ViewImports.cshtml +++ b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Views/_ViewImports.cshtml @@ -1,3 +1,3 @@ -@using WebApplicationBasic +@using AureliaSpa @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers @addTagHelper *, Microsoft.AspNetCore.SpaServices diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/npm-shrinkwrap.json b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/npm-shrinkwrap.json index 2a1e3648..de9bb136 100644 --- a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/npm-shrinkwrap.json +++ b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/npm-shrinkwrap.json @@ -1,5 +1,5 @@ { - "name": "WebApplicationBasic", + "name": "AureliaSpa", "version": "0.0.0", "dependencies": { "@types/webpack-env": { diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/package.json b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/package.json index 1a5045ce..00b009e1 100644 --- a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/package.json +++ b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/package.json @@ -1,5 +1,5 @@ { - "name": "WebApplicationBasic", + "name": "AureliaSpa", "private": true, "version": "0.0.0", "dependencies": { diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/.template.config/template.json b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/.template.config/template.json index a9e8dd43..9e821a4f 100644 --- a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/.template.config/template.json +++ b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/.template.config/template.json @@ -11,11 +11,11 @@ "preferNameDirectory": true, "primaryOutputs": [ { - "path": "WebApplicationBasic.csproj" + "path": "KnockoutSpa.csproj" } ], "shortName": "knockout", - "sourceName": "WebApplicationBasic", + "sourceName": "KnockoutSpa", "sources": [ { "source": "./", diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/nav-menu/nav-menu.html b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/nav-menu/nav-menu.html index f053cef4..d2af38d8 100644 --- a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/nav-menu/nav-menu.html +++ b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/nav-menu/nav-menu.html @@ -7,7 +7,7 @@ - WebApplicationBasic + KnockoutSpa
    diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Controllers/HomeController.cs b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Controllers/HomeController.cs index 2889abd9..e952e8d3 100644 --- a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Controllers/HomeController.cs +++ b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Controllers/HomeController.cs @@ -5,7 +5,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; -namespace WebApplicationBasic.Controllers +namespace KnockoutSpa.Controllers { public class HomeController : Controller { diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Controllers/SampleDataController.cs b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Controllers/SampleDataController.cs index 0f1aa37a..0b30849b 100644 --- a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Controllers/SampleDataController.cs +++ b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Controllers/SampleDataController.cs @@ -4,7 +4,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; -namespace WebApplicationBasic.Controllers +namespace KnockoutSpa.Controllers { [Route("api/[controller]")] public class SampleDataController : Controller diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Program.cs b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Program.cs index e1e634e4..514e143e 100644 --- a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Program.cs +++ b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Program.cs @@ -8,7 +8,7 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; -namespace WebApplicationBasic +namespace KnockoutSpa { public class Program { diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Startup.cs b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Startup.cs index d381113d..fc7290b4 100644 --- a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Startup.cs +++ b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Startup.cs @@ -8,7 +8,7 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -namespace WebApplicationBasic +namespace KnockoutSpa { public class Startup { diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Views/Shared/_Layout.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Views/Shared/_Layout.cshtml index 2860f315..448e6d7b 100644 --- a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Views/Shared/_Layout.cshtml +++ b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Views/Shared/_Layout.cshtml @@ -3,7 +3,7 @@ - @ViewData["Title"] - WebApplicationBasic + @ViewData["Title"] - KnockoutSpa diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Views/_ViewImports.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Views/_ViewImports.cshtml index 8edbc68c..b4dea68c 100644 --- a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Views/_ViewImports.cshtml +++ b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Views/_ViewImports.cshtml @@ -1,3 +1,3 @@ -@using WebApplicationBasic +@using KnockoutSpa @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers @addTagHelper *, Microsoft.AspNetCore.SpaServices diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/npm-shrinkwrap.json b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/npm-shrinkwrap.json index 290db883..8c897ce3 100644 --- a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/npm-shrinkwrap.json +++ b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/npm-shrinkwrap.json @@ -1,5 +1,5 @@ { - "name": "WebApplicationBasic", + "name": "KnockoutSpa", "version": "0.0.0", "dependencies": { "@types/core-js": { diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/package.json b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/package.json index 64f132d4..86722a70 100644 --- a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/package.json +++ b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/package.json @@ -1,5 +1,5 @@ { - "name": "WebApplicationBasic", + "name": "KnockoutSpa", "private": true, "version": "0.0.0", "devDependencies": { diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/.template.config/template.json b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/.template.config/template.json index 2986930f..6cb8810d 100644 --- a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/.template.config/template.json +++ b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/.template.config/template.json @@ -11,11 +11,11 @@ "preferNameDirectory": true, "primaryOutputs": [ { - "path": "WebApplicationBasic.csproj" + "path": "VueSpa.csproj" } ], "shortName": "vue", - "sourceName": "WebApplicationBasic", + "sourceName": "VueSpa", "sources": [ { "source": "./", diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/navmenu/navmenu.vue.html b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/navmenu/navmenu.vue.html index 642a5221..d4d40601 100644 --- a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/navmenu/navmenu.vue.html +++ b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/navmenu/navmenu.vue.html @@ -8,7 +8,7 @@ - WebApplicationBasic + VueSpa
    diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Controllers/HomeController.cs b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Controllers/HomeController.cs index 2889abd9..70ebae73 100644 --- a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Controllers/HomeController.cs +++ b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Controllers/HomeController.cs @@ -5,7 +5,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; -namespace WebApplicationBasic.Controllers +namespace VueSpa.Controllers { public class HomeController : Controller { diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Controllers/SampleDataController.cs b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Controllers/SampleDataController.cs index 0f1aa37a..0454a16f 100644 --- a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Controllers/SampleDataController.cs +++ b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Controllers/SampleDataController.cs @@ -4,7 +4,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; -namespace WebApplicationBasic.Controllers +namespace VueSpa.Controllers { [Route("api/[controller]")] public class SampleDataController : Controller diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Program.cs b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Program.cs index e1e634e4..46363bf3 100644 --- a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Program.cs +++ b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Program.cs @@ -8,7 +8,7 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; -namespace WebApplicationBasic +namespace VueSpa { public class Program { diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Startup.cs b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Startup.cs index d381113d..c79526fd 100644 --- a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Startup.cs +++ b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Startup.cs @@ -8,7 +8,7 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -namespace WebApplicationBasic +namespace VueSpa { public class Startup { diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Views/Shared/_Layout.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Views/Shared/_Layout.cshtml index 2860f315..b8d9bd38 100644 --- a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Views/Shared/_Layout.cshtml +++ b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Views/Shared/_Layout.cshtml @@ -3,7 +3,7 @@ - @ViewData["Title"] - WebApplicationBasic + @ViewData["Title"] - VueSpa diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Views/_ViewImports.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Views/_ViewImports.cshtml index 8edbc68c..bba39eb1 100644 --- a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Views/_ViewImports.cshtml +++ b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Views/_ViewImports.cshtml @@ -1,3 +1,3 @@ -@using WebApplicationBasic +@using VueSpa @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers @addTagHelper *, Microsoft.AspNetCore.SpaServices diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/npm-shrinkwrap.json b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/npm-shrinkwrap.json index 2ca94caf..31558445 100644 --- a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/npm-shrinkwrap.json +++ b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/npm-shrinkwrap.json @@ -1,5 +1,5 @@ { - "name": "WebApplicationBasic", + "name": "VueSpa", "version": "0.0.0", "dependencies": { "@types/webpack-env": { diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/package.json b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/package.json index 58d76cc4..821a60c5 100644 --- a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/package.json +++ b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/package.json @@ -1,5 +1,5 @@ { - "name": "WebApplicationBasic", + "name": "VueSpa", "private": true, "version": "0.0.0", "devDependencies": { diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/.template.config/template.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/.template.config/template.json index 179a495b..e6e58992 100644 --- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/.template.config/template.json +++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/.template.config/template.json @@ -11,11 +11,11 @@ "preferNameDirectory": true, "primaryOutputs": [ { - "path": "WebApplicationBasic.csproj" + "path": "AngularSpa.csproj" } ], "shortName": "angular", - "sourceName": "WebApplicationBasic", + "sourceName": "AngularSpa", "sources": [ { "source": "./", diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/navmenu/navmenu.component.html b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/navmenu/navmenu.component.html index c49d5097..ef80a604 100644 --- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/navmenu/navmenu.component.html +++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/navmenu/navmenu.component.html @@ -7,7 +7,7 @@ - WebApplicationBasic + AngularSpa
    diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Controllers/HomeController.cs b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Controllers/HomeController.cs index 2889abd9..49afe0ce 100644 --- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Controllers/HomeController.cs +++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Controllers/HomeController.cs @@ -5,7 +5,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; -namespace WebApplicationBasic.Controllers +namespace AngularSpa.Controllers { public class HomeController : Controller { diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Controllers/SampleDataController.cs b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Controllers/SampleDataController.cs index 0f1aa37a..cedab19f 100644 --- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Controllers/SampleDataController.cs +++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Controllers/SampleDataController.cs @@ -4,7 +4,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; -namespace WebApplicationBasic.Controllers +namespace AngularSpa.Controllers { [Route("api/[controller]")] public class SampleDataController : Controller diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Program.cs b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Program.cs index e1e634e4..73c7e9e1 100644 --- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Program.cs +++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Program.cs @@ -8,7 +8,7 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; -namespace WebApplicationBasic +namespace AngularSpa { public class Program { diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Startup.cs b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Startup.cs index d381113d..d5d1b0a7 100644 --- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Startup.cs +++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Startup.cs @@ -8,7 +8,7 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -namespace WebApplicationBasic +namespace AngularSpa { public class Startup { diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Views/Shared/_Layout.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Views/Shared/_Layout.cshtml index d5b7a0f5..70d20583 100644 --- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Views/Shared/_Layout.cshtml +++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Views/Shared/_Layout.cshtml @@ -3,7 +3,7 @@ - @ViewData["Title"] - WebApplicationBasic + @ViewData["Title"] - AngularSpa diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Views/_ViewImports.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Views/_ViewImports.cshtml index 8edbc68c..6f913d93 100644 --- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Views/_ViewImports.cshtml +++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Views/_ViewImports.cshtml @@ -1,3 +1,3 @@ -@using WebApplicationBasic +@using AngularSpa @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers @addTagHelper *, Microsoft.AspNetCore.SpaServices diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/npm-shrinkwrap.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/npm-shrinkwrap.json index c79f8e79..951d3f3d 100644 --- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/npm-shrinkwrap.json +++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/npm-shrinkwrap.json @@ -1,5 +1,5 @@ { - "name": "WebApplicationBasic", + "name": "AngularSpa", "version": "0.0.0", "dependencies": { "@angular/animations": { diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/package.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/package.json index 523908ac..f72210bf 100644 --- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/package.json +++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/package.json @@ -1,5 +1,5 @@ { - "name": "WebApplicationBasic", + "name": "AngularSpa", "private": true, "version": "0.0.0", "scripts": { diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/.template.config/template.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/.template.config/template.json index 9aaf30f1..35efb5e6 100644 --- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/.template.config/template.json +++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/.template.config/template.json @@ -11,11 +11,11 @@ "preferNameDirectory": true, "primaryOutputs": [ { - "path": "WebApplicationBasic.csproj" + "path": "ReactSpa.csproj" } ], "shortName": "react", - "sourceName": "WebApplicationBasic", + "sourceName": "ReactSpa", "sources": [ { "source": "./", diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/components/NavMenu.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/components/NavMenu.tsx index 5547ab4a..6d25220e 100644 --- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/components/NavMenu.tsx +++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/components/NavMenu.tsx @@ -12,7 +12,7 @@ export class NavMenu extends React.Component<{}, {}> { - WebApplicationBasic + ReactSpa
    diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Controllers/HomeController.cs b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Controllers/HomeController.cs index 2889abd9..32f2cee1 100644 --- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Controllers/HomeController.cs +++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Controllers/HomeController.cs @@ -5,7 +5,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; -namespace WebApplicationBasic.Controllers +namespace ReactSpa.Controllers { public class HomeController : Controller { diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Controllers/SampleDataController.cs b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Controllers/SampleDataController.cs index 0f1aa37a..c0c9e37a 100644 --- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Controllers/SampleDataController.cs +++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Controllers/SampleDataController.cs @@ -4,7 +4,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; -namespace WebApplicationBasic.Controllers +namespace ReactSpa.Controllers { [Route("api/[controller]")] public class SampleDataController : Controller diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Program.cs b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Program.cs index e1e634e4..719033ca 100644 --- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Program.cs +++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Program.cs @@ -8,7 +8,7 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; -namespace WebApplicationBasic +namespace ReactSpa { public class Program { diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Startup.cs b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Startup.cs index 740f1139..5920452e 100644 --- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Startup.cs +++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Startup.cs @@ -8,7 +8,7 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -namespace WebApplicationBasic +namespace ReactSpa { public class Startup { diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Views/Shared/_Layout.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Views/Shared/_Layout.cshtml index 2860f315..74472d3c 100644 --- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Views/Shared/_Layout.cshtml +++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Views/Shared/_Layout.cshtml @@ -3,7 +3,7 @@ - @ViewData["Title"] - WebApplicationBasic + @ViewData["Title"] - ReactSpa diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Views/_ViewImports.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Views/_ViewImports.cshtml index 8edbc68c..d097fcbd 100644 --- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Views/_ViewImports.cshtml +++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Views/_ViewImports.cshtml @@ -1,3 +1,3 @@ -@using WebApplicationBasic +@using ReactSpa @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers @addTagHelper *, Microsoft.AspNetCore.SpaServices diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/npm-shrinkwrap.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/npm-shrinkwrap.json index 3df0b409..cc531399 100644 --- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/npm-shrinkwrap.json +++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/npm-shrinkwrap.json @@ -1,5 +1,5 @@ { - "name": "WebApplicationBasic", + "name": "ReactSpa", "version": "0.0.0", "dependencies": { "@types/history": { diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/package.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/package.json index 5431d17d..29cf148d 100644 --- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/package.json +++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/package.json @@ -1,5 +1,5 @@ { - "name": "WebApplicationBasic", + "name": "ReactSpa", "private": true, "version": "0.0.0", "devDependencies": { diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/.template.config/template.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/.template.config/template.json index 0dc06ba6..38418e8d 100644 --- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/.template.config/template.json +++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/.template.config/template.json @@ -11,11 +11,11 @@ "preferNameDirectory": true, "primaryOutputs": [ { - "path": "WebApplicationBasic.csproj" + "path": "ReactReduxSpa.csproj" } ], "shortName": "reactredux", - "sourceName": "WebApplicationBasic", + "sourceName": "ReactReduxSpa", "sources": [ { "source": "./", diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/components/NavMenu.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/components/NavMenu.tsx index 17471480..3f60015d 100644 --- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/components/NavMenu.tsx +++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/components/NavMenu.tsx @@ -12,7 +12,7 @@ export class NavMenu extends React.Component<{}, {}> { - WebApplicationBasic + ReactReduxSpa
    diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Controllers/HomeController.cs b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Controllers/HomeController.cs index 2889abd9..6931d537 100644 --- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Controllers/HomeController.cs +++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Controllers/HomeController.cs @@ -5,7 +5,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; -namespace WebApplicationBasic.Controllers +namespace ReactReduxSpa.Controllers { public class HomeController : Controller { diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Controllers/SampleDataController.cs b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Controllers/SampleDataController.cs index 69724757..82868243 100644 --- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Controllers/SampleDataController.cs +++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Controllers/SampleDataController.cs @@ -4,7 +4,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; -namespace WebApplicationBasic.Controllers +namespace ReactReduxSpa.Controllers { [Route("api/[controller]")] public class SampleDataController : Controller diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Program.cs b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Program.cs index e1e634e4..708408ce 100644 --- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Program.cs +++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Program.cs @@ -8,7 +8,7 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; -namespace WebApplicationBasic +namespace ReactReduxSpa { public class Program { diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Startup.cs b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Startup.cs index 740f1139..7da1e590 100644 --- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Startup.cs +++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Startup.cs @@ -8,7 +8,7 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -namespace WebApplicationBasic +namespace ReactReduxSpa { public class Startup { diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Views/Shared/_Layout.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Views/Shared/_Layout.cshtml index 388f8f90..7c3e0f87 100644 --- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Views/Shared/_Layout.cshtml +++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Views/Shared/_Layout.cshtml @@ -3,7 +3,7 @@ - @ViewData["Title"] - WebApplicationBasic + @ViewData["Title"] - ReactReduxSpa diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Views/_ViewImports.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Views/_ViewImports.cshtml index 8edbc68c..cda19287 100644 --- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Views/_ViewImports.cshtml +++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Views/_ViewImports.cshtml @@ -1,3 +1,3 @@ -@using WebApplicationBasic +@using ReactReduxSpa @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers @addTagHelper *, Microsoft.AspNetCore.SpaServices diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/npm-shrinkwrap.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/npm-shrinkwrap.json index 4da356cf..13165b4c 100644 --- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/npm-shrinkwrap.json +++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/npm-shrinkwrap.json @@ -1,5 +1,5 @@ { - "name": "WebApplicationBasic", + "name": "ReactReduxSpa", "version": "0.0.0", "dependencies": { "@types/history": { diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/package.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/package.json index c7c82883..3991fb10 100644 --- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/package.json +++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/package.json @@ -1,5 +1,5 @@ { - "name": "WebApplicationBasic", + "name": "ReactReduxSpa", "private": true, "version": "0.0.0", "dependencies": { diff --git a/templates/package-builder/src/build/build.ts b/templates/package-builder/src/build/build.ts index ee57fc13..05611e05 100644 --- a/templates/package-builder/src/build/build.ts +++ b/templates/package-builder/src/build/build.ts @@ -9,18 +9,12 @@ import * as childProcess from 'child_process'; import * as targz from 'tar.gz'; const isWindows = /^win/.test(process.platform); -const textFileExtensions = ['.gitignore', '.config', '.cs', '.cshtml', '.csproj', '.html', '.js', '.json', '.jsx', '.md', '.nuspec', '.ts', '.tsx']; const dotNetPackages = [ 'Microsoft.DotNet.Web.Spa.ProjectTemplates', 'Microsoft.AspNetCore.SpaTemplates' ]; -function isTextFile(filename: string): boolean { - return textFileExtensions.indexOf(path.extname(filename).toLowerCase()) >= 0 - || textFileExtensions.indexOf(path.basename(filename)) >= 0; -} - function writeFileEnsuringDirExists(root: string, filename: string, contents: string | Buffer) { let fullPath = path.join(root, filename); mkdirp.sync(path.dirname(fullPath)); @@ -45,18 +39,9 @@ function applyContentReplacements(sourceContent: Buffer, contentReplacements: { return new Buffer(sourceText, 'utf8'); } -function writeTemplate(sourceRoot: string, destRoot: string, contentReplacements: { from: RegExp, to: string }[], filenameReplacements: { from: RegExp, to: string }[]) { +function writeTemplate(sourceRoot: string, destRoot: string) { listFilesExcludingGitignored(sourceRoot).forEach(fn => { let sourceContent = fs.readFileSync(path.join(sourceRoot, fn)); - if (isTextFile(fn)) { - sourceContent = applyContentReplacements(sourceContent, contentReplacements); - } - - // Also apply replacements in filenames - filenameReplacements.forEach(replacement => { - fn = fn.replace(replacement.from, replacement.to); - }); - writeFileEnsuringDirExists(destRoot, fn, sourceContent); }); } @@ -93,20 +78,13 @@ function buildDotNetNewNuGetPackage(packageId: string) { rimraf.sync(outputRoot); // Copy template files - const sourceProjectName = 'WebApplicationBasic'; - const projectGuid = '00000000-0000-0000-0000-000000000000'; - const filenameReplacements = [ - { from: /.*\.csproj$/, to: `${sourceProjectName}.csproj` } - ]; - const contentReplacements = []; - const packageSourceRootDir = path.join('../', packageId); const templatesInPackage = fs.readdirSync(path.join(packageSourceRootDir, 'Content')); _.forEach(templatesInPackage, templateName => { const templateSourceDir = path.join(packageSourceRootDir, 'Content', templateName); const templateOutputDir = path.join(outputRoot, 'Content', templateName); - writeTemplate(templateSourceDir, templateOutputDir, contentReplacements, filenameReplacements); + writeTemplate(templateSourceDir, templateOutputDir); }); // Create the .nuspec file From 559832bb6d557229e909ac0e669def3d1ec174e3 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 23 Aug 2017 15:41:09 -0700 Subject: [PATCH 235/411] Remove dynamic content replacement from nuspec files --- .../Microsoft.AspNetCore.SpaTemplates.nuspec | 2 +- ...oft.DotNet.Web.Spa.ProjectTemplates.nuspec | 2 +- templates/package-builder/src/build/build.ts | 33 +++++-------------- 3 files changed, 11 insertions(+), 26 deletions(-) diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Microsoft.AspNetCore.SpaTemplates.nuspec b/templates/Microsoft.AspNetCore.SpaTemplates/Microsoft.AspNetCore.SpaTemplates.nuspec index e873687a..5d2159cf 100644 --- a/templates/Microsoft.AspNetCore.SpaTemplates/Microsoft.AspNetCore.SpaTemplates.nuspec +++ b/templates/Microsoft.AspNetCore.SpaTemplates/Microsoft.AspNetCore.SpaTemplates.nuspec @@ -2,7 +2,7 @@ Microsoft.AspNetCore.SpaTemplates - 1.0.{buildnumber} + 0.0.0 Single Page Application templates for ASP.NET Core Microsoft en-US diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.nuspec b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.nuspec index 05690b87..604ed87b 100644 --- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.nuspec +++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.nuspec @@ -2,7 +2,7 @@ Microsoft.DotNet.Web.Spa.ProjectTemplates - 1.0.{buildnumber} + 0.0.0 Single Page Application templates for ASP.NET Core Microsoft en-US diff --git a/templates/package-builder/src/build/build.ts b/templates/package-builder/src/build/build.ts index 05611e05..4e884467 100644 --- a/templates/package-builder/src/build/build.ts +++ b/templates/package-builder/src/build/build.ts @@ -30,15 +30,6 @@ function listFilesExcludingGitignored(root: string): string[] { .filter(fn => gitignoreEvaluator.accepts(fn)); } -function applyContentReplacements(sourceContent: Buffer, contentReplacements: { from: RegExp, to: string }[]) { - let sourceText = sourceContent.toString('utf8'); - contentReplacements.forEach(replacement => { - sourceText = sourceText.replace(replacement.from, replacement.to); - }); - - return new Buffer(sourceText, 'utf8'); -} - function writeTemplate(sourceRoot: string, destRoot: string) { listFilesExcludingGitignored(sourceRoot).forEach(fn => { let sourceContent = fs.readFileSync(path.join(sourceRoot, fn)); @@ -46,14 +37,6 @@ function writeTemplate(sourceRoot: string, destRoot: string) { }); } -function copyRecursive(sourceRoot: string, destRoot: string, matchGlob: string) { - glob.sync(matchGlob, { cwd: sourceRoot, dot: true, nodir: true }) - .forEach(fn => { - const sourceContent = fs.readFileSync(path.join(sourceRoot, fn)); - writeFileEnsuringDirExists(destRoot, fn, sourceContent); - }); -} - function getBuildNumber(): string { if (process.env.APPVEYOR_BUILD_NUMBER) { return process.env.APPVEYOR_BUILD_NUMBER; @@ -88,23 +71,25 @@ function buildDotNetNewNuGetPackage(packageId: string) { }); // Create the .nuspec file - const nuspecContentTemplate = fs.readFileSync(path.join(packageSourceRootDir, `${ packageId }.nuspec`)); + const nuspecFilename = `${ packageId }.nuspec`; + const nuspecContentTemplate = fs.readFileSync(path.join(packageSourceRootDir, nuspecFilename)); writeFileEnsuringDirExists(outputRoot, - `${ packageId }.nuspec`, - applyContentReplacements(nuspecContentTemplate, [ - { from: /\{buildnumber\}/g, to: getBuildNumber() }, - ]) + nuspecFilename, + nuspecContentTemplate ); // Invoke NuGet to create the final package const nugetExe = path.join(process.cwd(), './bin/NuGet.exe'); const nugetStartInfo = { cwd: outputRoot, stdio: 'inherit' }; + const packageVersion = `1.0.${ getBuildNumber() }`; + const nugetArgs = ['pack', nuspecFilename, '-Version', packageVersion]; if (isWindows) { // Invoke NuGet.exe directly - childProcess.spawnSync(nugetExe, ['pack'], nugetStartInfo); + childProcess.spawnSync(nugetExe, nugetArgs, nugetStartInfo); } else { // Invoke via Mono (relying on that being available) - childProcess.spawnSync('mono', [nugetExe, 'pack'], nugetStartInfo); + nugetArgs.unshift(nugetExe); + childProcess.spawnSync('mono', nugetArgs, nugetStartInfo); } // Clean up From c62a3b491cc96622882337e80bb00edcdb5eec7b Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 23 Aug 2017 16:38:16 -0700 Subject: [PATCH 236/411] Fix templates directory structure to produce correct nupkg output --- .../{Content => }/aurelia/.gitignore | 0 .../aurelia/.template.config/dotnetcli.host.json | 0 .../{Content => }/aurelia/.template.config/icon.png | Bin .../aurelia/.template.config/template.json | 0 .../aurelia/.template.config/vs-2017.3.host.json | 0 .../{Content => }/aurelia/AureliaSpa.csproj | 0 .../aurelia/ClientApp/app/components/app/app.css | 0 .../aurelia/ClientApp/app/components/app/app.html | 0 .../aurelia/ClientApp/app/components/app/app.ts | 0 .../ClientApp/app/components/counter/counter.html | 0 .../ClientApp/app/components/counter/counter.ts | 0 .../app/components/fetchdata/fetchdata.html | 0 .../ClientApp/app/components/fetchdata/fetchdata.ts | 0 .../aurelia/ClientApp/app/components/home/home.html | 0 .../aurelia/ClientApp/app/components/home/home.ts | 0 .../ClientApp/app/components/navmenu/navmenu.css | 0 .../ClientApp/app/components/navmenu/navmenu.html | 0 .../{Content => }/aurelia/ClientApp/boot.ts | 0 .../aurelia/Controllers/HomeController.cs | 0 .../aurelia/Controllers/SampleDataController.cs | 0 .../{Content => }/aurelia/Program.cs | 0 .../{Content => }/aurelia/Startup.cs | 0 .../{Content => }/aurelia/Views/Home/Index.cshtml | 0 .../{Content => }/aurelia/Views/Shared/Error.cshtml | 0 .../aurelia/Views/Shared/_Layout.cshtml | 0 .../{Content => }/aurelia/Views/_ViewImports.cshtml | 0 .../{Content => }/aurelia/Views/_ViewStart.cshtml | 0 .../aurelia/appsettings.Development.json | 0 .../{Content => }/aurelia/appsettings.json | 0 .../{Content => }/aurelia/npm-shrinkwrap.json | 0 .../{Content => }/aurelia/package.json | 0 .../{Content => }/aurelia/tsconfig.json | 0 .../{Content => }/aurelia/webpack.config.js | 0 .../{Content => }/aurelia/webpack.config.vendor.js | 0 .../{Content => }/aurelia/wwwroot/favicon.ico | Bin .../{Content => }/knockout/.gitignore | 0 .../knockout/.template.config/dotnetcli.host.json | 0 .../knockout/.template.config/icon.png | Bin .../knockout/.template.config/template.json | 0 .../knockout/.template.config/vs-2017.3.host.json | 0 .../{Content => }/knockout/ClientApp/boot.ts | 0 .../ClientApp/components/app-root/app-root.html | 0 .../ClientApp/components/app-root/app-root.ts | 0 .../components/counter-example/counter-example.html | 0 .../components/counter-example/counter-example.ts | 0 .../ClientApp/components/fetch-data/fetch-data.html | 0 .../ClientApp/components/fetch-data/fetch-data.ts | 0 .../ClientApp/components/home-page/home-page.html | 0 .../ClientApp/components/home-page/home-page.ts | 0 .../ClientApp/components/nav-menu/nav-menu.html | 0 .../ClientApp/components/nav-menu/nav-menu.ts | 0 .../{Content => }/knockout/ClientApp/css/site.css | 0 .../{Content => }/knockout/ClientApp/router.ts | 0 .../knockout/ClientApp/webpack-component-loader.ts | 0 .../knockout/Controllers/HomeController.cs | 0 .../knockout/Controllers/SampleDataController.cs | 0 .../{Content => }/knockout/KnockoutSpa.csproj | 0 .../{Content => }/knockout/Program.cs | 0 .../{Content => }/knockout/Startup.cs | 0 .../{Content => }/knockout/Views/Home/Index.cshtml | 0 .../knockout/Views/Shared/Error.cshtml | 0 .../knockout/Views/Shared/_Layout.cshtml | 0 .../knockout/Views/_ViewImports.cshtml | 0 .../{Content => }/knockout/Views/_ViewStart.cshtml | 0 .../knockout/appsettings.Development.json | 0 .../{Content => }/knockout/appsettings.json | 0 .../{Content => }/knockout/npm-shrinkwrap.json | 0 .../{Content => }/knockout/package.json | 0 .../{Content => }/knockout/tsconfig.json | 0 .../{Content => }/knockout/webpack.config.js | 0 .../{Content => }/knockout/webpack.config.vendor.js | 0 .../{Content => }/knockout/wwwroot/favicon.ico | Bin .../{Content => }/vue/.gitignore | 0 .../vue/.template.config/dotnetcli.host.json | 0 .../{Content => }/vue/.template.config/icon.png | Bin .../vue/.template.config/template.json | 0 .../vue/.template.config/vs-2017.3.host.json | 0 .../{Content => }/vue/ClientApp/boot.ts | 0 .../vue/ClientApp/components/app/app.ts | 0 .../vue/ClientApp/components/app/app.vue.html | 0 .../vue/ClientApp/components/counter/counter.ts | 0 .../ClientApp/components/counter/counter.vue.html | 0 .../vue/ClientApp/components/fetchdata/fetchdata.ts | 0 .../components/fetchdata/fetchdata.vue.html | 0 .../vue/ClientApp/components/home/home.vue.html | 0 .../vue/ClientApp/components/navmenu/navmenu.css | 0 .../ClientApp/components/navmenu/navmenu.vue.html | 0 .../{Content => }/vue/ClientApp/css/site.css | 0 .../{Content => }/vue/Controllers/HomeController.cs | 0 .../vue/Controllers/SampleDataController.cs | 0 .../{Content => }/vue/Program.cs | 0 .../{Content => }/vue/Startup.cs | 0 .../{Content => }/vue/Views/Home/Index.cshtml | 0 .../{Content => }/vue/Views/Shared/Error.cshtml | 0 .../{Content => }/vue/Views/Shared/_Layout.cshtml | 0 .../{Content => }/vue/Views/_ViewImports.cshtml | 0 .../{Content => }/vue/Views/_ViewStart.cshtml | 0 .../{Content => }/vue/VueSpa.csproj | 0 .../{Content => }/vue/appsettings.Development.json | 0 .../{Content => }/vue/appsettings.json | 0 .../{Content => }/vue/npm-shrinkwrap.json | 0 .../{Content => }/vue/package.json | 0 .../{Content => }/vue/tsconfig.json | 0 .../{Content => }/vue/webpack.config.js | 0 .../{Content => }/vue/webpack.config.vendor.js | 0 .../{Content => }/vue/wwwroot/favicon.ico | Bin .../{Content => }/angular/.gitignore | 0 .../angular/.template.config/dotnetcli.host.json | 0 .../{Content => }/angular/.template.config/icon.png | Bin .../angular/.template.config/template.json | 0 .../angular/.template.config/vs-2017.3.host.json | 0 .../{Content => }/angular/AngularSpa.csproj | 0 .../angular/ClientApp/app/app.module.browser.ts | 0 .../angular/ClientApp/app/app.module.server.ts | 0 .../angular/ClientApp/app/app.module.shared.ts | 0 .../ClientApp/app/components/app/app.component.css | 0 .../ClientApp/app/components/app/app.component.html | 0 .../ClientApp/app/components/app/app.component.ts | 0 .../app/components/counter/counter.component.html | 0 .../components/counter/counter.component.spec.ts | 0 .../app/components/counter/counter.component.ts | 0 .../components/fetchdata/fetchdata.component.html | 0 .../app/components/fetchdata/fetchdata.component.ts | 0 .../app/components/home/home.component.html | 0 .../ClientApp/app/components/home/home.component.ts | 0 .../app/components/navmenu/navmenu.component.css | 0 .../app/components/navmenu/navmenu.component.html | 0 .../app/components/navmenu/navmenu.component.ts | 0 .../{Content => }/angular/ClientApp/boot.browser.ts | 0 .../{Content => }/angular/ClientApp/boot.server.ts | 0 .../angular/ClientApp/test/boot-tests.ts | 0 .../angular/ClientApp/test/karma.conf.js | 0 .../angular/Controllers/HomeController.cs | 0 .../angular/Controllers/SampleDataController.cs | 0 .../{Content => }/angular/Program.cs | 0 .../{Content => }/angular/Startup.cs | 0 .../{Content => }/angular/Views/Home/Index.cshtml | 0 .../{Content => }/angular/Views/Shared/Error.cshtml | 0 .../angular/Views/Shared/_Layout.cshtml | 0 .../{Content => }/angular/Views/_ViewImports.cshtml | 0 .../{Content => }/angular/Views/_ViewStart.cshtml | 0 .../angular/appsettings.Development.json | 0 .../{Content => }/angular/appsettings.json | 0 .../{Content => }/angular/npm-shrinkwrap.json | 0 .../{Content => }/angular/package.json | 0 .../{Content => }/angular/tsconfig.json | 0 .../{Content => }/angular/webpack.config.js | 0 .../{Content => }/angular/webpack.config.vendor.js | 0 .../{Content => }/angular/wwwroot/favicon.ico | Bin .../{Content => }/react/.gitignore | 0 .../react/.template.config/dotnetcli.host.json | 0 .../{Content => }/react/.template.config/icon.png | Bin .../react/.template.config/template.json | 0 .../react/.template.config/vs-2017.3.host.json | 0 .../{Content => }/react/ClientApp/boot.tsx | 0 .../react/ClientApp/components/Counter.tsx | 0 .../react/ClientApp/components/FetchData.tsx | 0 .../react/ClientApp/components/Home.tsx | 0 .../react/ClientApp/components/Layout.tsx | 0 .../react/ClientApp/components/NavMenu.tsx | 0 .../{Content => }/react/ClientApp/css/site.css | 0 .../{Content => }/react/ClientApp/routes.tsx | 0 .../react/Controllers/HomeController.cs | 0 .../react/Controllers/SampleDataController.cs | 0 .../{Content => }/react/Program.cs | 0 .../{Content => }/react/ReactSpa.csproj | 0 .../{Content => }/react/Startup.cs | 0 .../{Content => }/react/Views/Home/Index.cshtml | 0 .../{Content => }/react/Views/Shared/Error.cshtml | 0 .../{Content => }/react/Views/Shared/_Layout.cshtml | 0 .../{Content => }/react/Views/_ViewImports.cshtml | 0 .../{Content => }/react/Views/_ViewStart.cshtml | 0 .../react/appsettings.Development.json | 0 .../{Content => }/react/appsettings.json | 0 .../{Content => }/react/npm-shrinkwrap.json | 0 .../{Content => }/react/package.json | 0 .../{Content => }/react/tsconfig.json | 0 .../{Content => }/react/webpack.config.js | 0 .../{Content => }/react/webpack.config.vendor.js | 0 .../{Content => }/react/wwwroot/favicon.ico | Bin .../{Content => }/redux/.gitignore | 0 .../redux/.template.config/dotnetcli.host.json | 0 .../{Content => }/redux/.template.config/icon.png | Bin .../redux/.template.config/template.json | 0 .../redux/.template.config/vs-2017.3.host.json | 0 .../{Content => }/redux/ClientApp/boot-client.tsx | 0 .../{Content => }/redux/ClientApp/boot-server.tsx | 0 .../redux/ClientApp/components/Counter.tsx | 0 .../redux/ClientApp/components/FetchData.tsx | 0 .../redux/ClientApp/components/Home.tsx | 0 .../redux/ClientApp/components/Layout.tsx | 0 .../redux/ClientApp/components/NavMenu.tsx | 0 .../{Content => }/redux/ClientApp/configureStore.ts | 0 .../{Content => }/redux/ClientApp/css/site.css | 0 .../{Content => }/redux/ClientApp/routes.tsx | 0 .../{Content => }/redux/ClientApp/store/Counter.ts | 0 .../redux/ClientApp/store/WeatherForecasts.ts | 0 .../{Content => }/redux/ClientApp/store/index.ts | 0 .../redux/Controllers/HomeController.cs | 0 .../redux/Controllers/SampleDataController.cs | 0 .../{Content => }/redux/Program.cs | 0 .../{Content => }/redux/ReactReduxSpa.csproj | 0 .../{Content => }/redux/Startup.cs | 0 .../{Content => }/redux/Views/Home/Index.cshtml | 0 .../{Content => }/redux/Views/Shared/Error.cshtml | 0 .../{Content => }/redux/Views/Shared/_Layout.cshtml | 0 .../{Content => }/redux/Views/_ViewImports.cshtml | 0 .../{Content => }/redux/Views/_ViewStart.cshtml | 0 .../redux/appsettings.Development.json | 0 .../{Content => }/redux/appsettings.json | 0 .../{Content => }/redux/npm-shrinkwrap.json | 0 .../{Content => }/redux/package.json | 0 .../{Content => }/redux/tsconfig.json | 0 .../{Content => }/redux/webpack.config.js | 0 .../{Content => }/redux/webpack.config.vendor.js | 0 .../{Content => }/redux/wwwroot/favicon.ico | Bin 216 files changed, 0 insertions(+), 0 deletions(-) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/aurelia/.gitignore (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/aurelia/.template.config/dotnetcli.host.json (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/aurelia/.template.config/icon.png (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/aurelia/.template.config/template.json (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/aurelia/.template.config/vs-2017.3.host.json (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/aurelia/AureliaSpa.csproj (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/aurelia/ClientApp/app/components/app/app.css (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/aurelia/ClientApp/app/components/app/app.html (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/aurelia/ClientApp/app/components/app/app.ts (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/aurelia/ClientApp/app/components/counter/counter.html (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/aurelia/ClientApp/app/components/counter/counter.ts (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/aurelia/ClientApp/app/components/fetchdata/fetchdata.html (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/aurelia/ClientApp/app/components/fetchdata/fetchdata.ts (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/aurelia/ClientApp/app/components/home/home.html (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/aurelia/ClientApp/app/components/home/home.ts (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/aurelia/ClientApp/app/components/navmenu/navmenu.css (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/aurelia/ClientApp/app/components/navmenu/navmenu.html (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/aurelia/ClientApp/boot.ts (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/aurelia/Controllers/HomeController.cs (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/aurelia/Controllers/SampleDataController.cs (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/aurelia/Program.cs (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/aurelia/Startup.cs (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/aurelia/Views/Home/Index.cshtml (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/aurelia/Views/Shared/Error.cshtml (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/aurelia/Views/Shared/_Layout.cshtml (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/aurelia/Views/_ViewImports.cshtml (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/aurelia/Views/_ViewStart.cshtml (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/aurelia/appsettings.Development.json (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/aurelia/appsettings.json (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/aurelia/npm-shrinkwrap.json (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/aurelia/package.json (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/aurelia/tsconfig.json (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/aurelia/webpack.config.js (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/aurelia/webpack.config.vendor.js (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/aurelia/wwwroot/favicon.ico (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/knockout/.gitignore (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/knockout/.template.config/dotnetcli.host.json (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/knockout/.template.config/icon.png (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/knockout/.template.config/template.json (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/knockout/.template.config/vs-2017.3.host.json (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/knockout/ClientApp/boot.ts (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/knockout/ClientApp/components/app-root/app-root.html (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/knockout/ClientApp/components/app-root/app-root.ts (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/knockout/ClientApp/components/counter-example/counter-example.html (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/knockout/ClientApp/components/counter-example/counter-example.ts (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/knockout/ClientApp/components/fetch-data/fetch-data.html (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/knockout/ClientApp/components/fetch-data/fetch-data.ts (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/knockout/ClientApp/components/home-page/home-page.html (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/knockout/ClientApp/components/home-page/home-page.ts (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/knockout/ClientApp/components/nav-menu/nav-menu.html (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/knockout/ClientApp/components/nav-menu/nav-menu.ts (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/knockout/ClientApp/css/site.css (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/knockout/ClientApp/router.ts (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/knockout/ClientApp/webpack-component-loader.ts (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/knockout/Controllers/HomeController.cs (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/knockout/Controllers/SampleDataController.cs (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/knockout/KnockoutSpa.csproj (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/knockout/Program.cs (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/knockout/Startup.cs (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/knockout/Views/Home/Index.cshtml (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/knockout/Views/Shared/Error.cshtml (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/knockout/Views/Shared/_Layout.cshtml (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/knockout/Views/_ViewImports.cshtml (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/knockout/Views/_ViewStart.cshtml (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/knockout/appsettings.Development.json (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/knockout/appsettings.json (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/knockout/npm-shrinkwrap.json (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/knockout/package.json (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/knockout/tsconfig.json (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/knockout/webpack.config.js (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/knockout/webpack.config.vendor.js (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/knockout/wwwroot/favicon.ico (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/vue/.gitignore (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/vue/.template.config/dotnetcli.host.json (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/vue/.template.config/icon.png (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/vue/.template.config/template.json (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/vue/.template.config/vs-2017.3.host.json (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/vue/ClientApp/boot.ts (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/vue/ClientApp/components/app/app.ts (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/vue/ClientApp/components/app/app.vue.html (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/vue/ClientApp/components/counter/counter.ts (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/vue/ClientApp/components/counter/counter.vue.html (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/vue/ClientApp/components/fetchdata/fetchdata.ts (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/vue/ClientApp/components/fetchdata/fetchdata.vue.html (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/vue/ClientApp/components/home/home.vue.html (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/vue/ClientApp/components/navmenu/navmenu.css (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/vue/ClientApp/components/navmenu/navmenu.vue.html (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/vue/ClientApp/css/site.css (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/vue/Controllers/HomeController.cs (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/vue/Controllers/SampleDataController.cs (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/vue/Program.cs (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/vue/Startup.cs (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/vue/Views/Home/Index.cshtml (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/vue/Views/Shared/Error.cshtml (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/vue/Views/Shared/_Layout.cshtml (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/vue/Views/_ViewImports.cshtml (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/vue/Views/_ViewStart.cshtml (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/vue/VueSpa.csproj (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/vue/appsettings.Development.json (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/vue/appsettings.json (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/vue/npm-shrinkwrap.json (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/vue/package.json (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/vue/tsconfig.json (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/vue/webpack.config.js (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/vue/webpack.config.vendor.js (100%) rename templates/Microsoft.AspNetCore.SpaTemplates/{Content => }/vue/wwwroot/favicon.ico (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/angular/.gitignore (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/angular/.template.config/dotnetcli.host.json (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/angular/.template.config/icon.png (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/angular/.template.config/template.json (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/angular/.template.config/vs-2017.3.host.json (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/angular/AngularSpa.csproj (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/angular/ClientApp/app/app.module.browser.ts (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/angular/ClientApp/app/app.module.server.ts (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/angular/ClientApp/app/app.module.shared.ts (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/angular/ClientApp/app/components/app/app.component.css (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/angular/ClientApp/app/components/app/app.component.html (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/angular/ClientApp/app/components/app/app.component.ts (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/angular/ClientApp/app/components/counter/counter.component.html (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/angular/ClientApp/app/components/counter/counter.component.spec.ts (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/angular/ClientApp/app/components/counter/counter.component.ts (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/angular/ClientApp/app/components/fetchdata/fetchdata.component.html (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/angular/ClientApp/app/components/fetchdata/fetchdata.component.ts (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/angular/ClientApp/app/components/home/home.component.html (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/angular/ClientApp/app/components/home/home.component.ts (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/angular/ClientApp/app/components/navmenu/navmenu.component.css (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/angular/ClientApp/app/components/navmenu/navmenu.component.html (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/angular/ClientApp/app/components/navmenu/navmenu.component.ts (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/angular/ClientApp/boot.browser.ts (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/angular/ClientApp/boot.server.ts (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/angular/ClientApp/test/boot-tests.ts (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/angular/ClientApp/test/karma.conf.js (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/angular/Controllers/HomeController.cs (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/angular/Controllers/SampleDataController.cs (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/angular/Program.cs (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/angular/Startup.cs (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/angular/Views/Home/Index.cshtml (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/angular/Views/Shared/Error.cshtml (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/angular/Views/Shared/_Layout.cshtml (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/angular/Views/_ViewImports.cshtml (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/angular/Views/_ViewStart.cshtml (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/angular/appsettings.Development.json (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/angular/appsettings.json (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/angular/npm-shrinkwrap.json (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/angular/package.json (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/angular/tsconfig.json (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/angular/webpack.config.js (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/angular/webpack.config.vendor.js (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/angular/wwwroot/favicon.ico (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/react/.gitignore (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/react/.template.config/dotnetcli.host.json (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/react/.template.config/icon.png (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/react/.template.config/template.json (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/react/.template.config/vs-2017.3.host.json (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/react/ClientApp/boot.tsx (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/react/ClientApp/components/Counter.tsx (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/react/ClientApp/components/FetchData.tsx (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/react/ClientApp/components/Home.tsx (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/react/ClientApp/components/Layout.tsx (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/react/ClientApp/components/NavMenu.tsx (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/react/ClientApp/css/site.css (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/react/ClientApp/routes.tsx (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/react/Controllers/HomeController.cs (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/react/Controllers/SampleDataController.cs (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/react/Program.cs (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/react/ReactSpa.csproj (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/react/Startup.cs (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/react/Views/Home/Index.cshtml (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/react/Views/Shared/Error.cshtml (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/react/Views/Shared/_Layout.cshtml (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/react/Views/_ViewImports.cshtml (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/react/Views/_ViewStart.cshtml (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/react/appsettings.Development.json (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/react/appsettings.json (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/react/npm-shrinkwrap.json (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/react/package.json (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/react/tsconfig.json (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/react/webpack.config.js (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/react/webpack.config.vendor.js (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/react/wwwroot/favicon.ico (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/redux/.gitignore (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/redux/.template.config/dotnetcli.host.json (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/redux/.template.config/icon.png (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/redux/.template.config/template.json (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/redux/.template.config/vs-2017.3.host.json (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/redux/ClientApp/boot-client.tsx (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/redux/ClientApp/boot-server.tsx (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/redux/ClientApp/components/Counter.tsx (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/redux/ClientApp/components/FetchData.tsx (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/redux/ClientApp/components/Home.tsx (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/redux/ClientApp/components/Layout.tsx (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/redux/ClientApp/components/NavMenu.tsx (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/redux/ClientApp/configureStore.ts (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/redux/ClientApp/css/site.css (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/redux/ClientApp/routes.tsx (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/redux/ClientApp/store/Counter.ts (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/redux/ClientApp/store/WeatherForecasts.ts (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/redux/ClientApp/store/index.ts (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/redux/Controllers/HomeController.cs (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/redux/Controllers/SampleDataController.cs (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/redux/Program.cs (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/redux/ReactReduxSpa.csproj (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/redux/Startup.cs (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/redux/Views/Home/Index.cshtml (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/redux/Views/Shared/Error.cshtml (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/redux/Views/Shared/_Layout.cshtml (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/redux/Views/_ViewImports.cshtml (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/redux/Views/_ViewStart.cshtml (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/redux/appsettings.Development.json (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/redux/appsettings.json (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/redux/npm-shrinkwrap.json (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/redux/package.json (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/redux/tsconfig.json (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/redux/webpack.config.js (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/redux/webpack.config.vendor.js (100%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/{Content => }/redux/wwwroot/favicon.ico (100%) diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/.gitignore b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/.gitignore similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/.gitignore rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/.gitignore diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/.template.config/dotnetcli.host.json b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/.template.config/dotnetcli.host.json similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/.template.config/dotnetcli.host.json rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/.template.config/dotnetcli.host.json diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/.template.config/icon.png b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/.template.config/icon.png similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/.template.config/icon.png rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/.template.config/icon.png diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/.template.config/template.json b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/.template.config/template.json similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/.template.config/template.json rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/.template.config/template.json diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/.template.config/vs-2017.3.host.json b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/.template.config/vs-2017.3.host.json similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/.template.config/vs-2017.3.host.json rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/.template.config/vs-2017.3.host.json diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/AureliaSpa.csproj b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/AureliaSpa.csproj similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/AureliaSpa.csproj rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/AureliaSpa.csproj diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/app/app.css b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/app/app.css similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/app/app.css rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/app/app.css diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/app/app.html b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/app/app.html similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/app/app.html rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/app/app.html diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/app/app.ts b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/app/app.ts similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/app/app.ts rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/app/app.ts diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/counter/counter.html b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/counter/counter.html similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/counter/counter.html rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/counter/counter.html diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/counter/counter.ts b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/counter/counter.ts similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/counter/counter.ts rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/counter/counter.ts diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/fetchdata/fetchdata.html b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/fetchdata/fetchdata.html similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/fetchdata/fetchdata.html rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/fetchdata/fetchdata.html diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/fetchdata/fetchdata.ts b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/fetchdata/fetchdata.ts similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/fetchdata/fetchdata.ts rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/fetchdata/fetchdata.ts diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/home/home.html b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/home/home.html similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/home/home.html rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/home/home.html diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/home/home.ts b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/home/home.ts similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/home/home.ts rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/home/home.ts diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/navmenu/navmenu.css b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/navmenu/navmenu.css similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/navmenu/navmenu.css rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/navmenu/navmenu.css diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/navmenu/navmenu.html b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/navmenu/navmenu.html similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/navmenu/navmenu.html rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/navmenu/navmenu.html diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/boot.ts b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/boot.ts similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/boot.ts rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/boot.ts diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Controllers/HomeController.cs b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Controllers/HomeController.cs similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Controllers/HomeController.cs rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Controllers/HomeController.cs diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Controllers/SampleDataController.cs b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Controllers/SampleDataController.cs similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Controllers/SampleDataController.cs rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Controllers/SampleDataController.cs diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Program.cs b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Program.cs similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Program.cs rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Program.cs diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Startup.cs b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Startup.cs similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Startup.cs rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Startup.cs diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Views/Home/Index.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Views/Home/Index.cshtml similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Views/Home/Index.cshtml rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Views/Home/Index.cshtml diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Views/Shared/Error.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Views/Shared/Error.cshtml similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Views/Shared/Error.cshtml rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Views/Shared/Error.cshtml diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Views/Shared/_Layout.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Views/Shared/_Layout.cshtml similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Views/Shared/_Layout.cshtml rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Views/Shared/_Layout.cshtml diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Views/_ViewImports.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Views/_ViewImports.cshtml similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Views/_ViewImports.cshtml rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Views/_ViewImports.cshtml diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Views/_ViewStart.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Views/_ViewStart.cshtml similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Views/_ViewStart.cshtml rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Views/_ViewStart.cshtml diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/appsettings.Development.json b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/appsettings.Development.json similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/appsettings.Development.json rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/appsettings.Development.json diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/appsettings.json b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/appsettings.json similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/appsettings.json rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/appsettings.json diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/npm-shrinkwrap.json b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/npm-shrinkwrap.json similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/npm-shrinkwrap.json rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/npm-shrinkwrap.json diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/package.json b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/package.json similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/package.json rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/package.json diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/tsconfig.json b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/tsconfig.json similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/tsconfig.json rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/tsconfig.json diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/webpack.config.js b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/webpack.config.js similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/webpack.config.js rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/webpack.config.js diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/webpack.config.vendor.js b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/webpack.config.vendor.js similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/webpack.config.vendor.js rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/webpack.config.vendor.js diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/wwwroot/favicon.ico b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/wwwroot/favicon.ico similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/wwwroot/favicon.ico rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/wwwroot/favicon.ico diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/.gitignore b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/.gitignore similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/.gitignore rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/.gitignore diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/.template.config/dotnetcli.host.json b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/.template.config/dotnetcli.host.json similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/.template.config/dotnetcli.host.json rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/.template.config/dotnetcli.host.json diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/.template.config/icon.png b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/.template.config/icon.png similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/.template.config/icon.png rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/.template.config/icon.png diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/.template.config/template.json b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/.template.config/template.json similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/.template.config/template.json rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/.template.config/template.json diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/.template.config/vs-2017.3.host.json b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/.template.config/vs-2017.3.host.json similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/.template.config/vs-2017.3.host.json rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/.template.config/vs-2017.3.host.json diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/boot.ts b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/boot.ts similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/boot.ts rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/boot.ts diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/app-root/app-root.html b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/app-root/app-root.html similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/app-root/app-root.html rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/app-root/app-root.html diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/app-root/app-root.ts b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/app-root/app-root.ts similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/app-root/app-root.ts rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/app-root/app-root.ts diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/counter-example/counter-example.html b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/counter-example/counter-example.html similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/counter-example/counter-example.html rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/counter-example/counter-example.html diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/counter-example/counter-example.ts b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/counter-example/counter-example.ts similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/counter-example/counter-example.ts rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/counter-example/counter-example.ts diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/fetch-data/fetch-data.html b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/fetch-data/fetch-data.html similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/fetch-data/fetch-data.html rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/fetch-data/fetch-data.html diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/fetch-data/fetch-data.ts b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/fetch-data/fetch-data.ts similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/fetch-data/fetch-data.ts rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/fetch-data/fetch-data.ts diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/home-page/home-page.html b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/home-page/home-page.html similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/home-page/home-page.html rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/home-page/home-page.html diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/home-page/home-page.ts b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/home-page/home-page.ts similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/home-page/home-page.ts rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/home-page/home-page.ts diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/nav-menu/nav-menu.html b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/nav-menu/nav-menu.html similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/nav-menu/nav-menu.html rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/nav-menu/nav-menu.html diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/nav-menu/nav-menu.ts b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/nav-menu/nav-menu.ts similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/nav-menu/nav-menu.ts rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/nav-menu/nav-menu.ts diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/css/site.css b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/css/site.css similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/css/site.css rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/css/site.css diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/router.ts b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/router.ts similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/router.ts rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/router.ts diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/webpack-component-loader.ts b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/webpack-component-loader.ts similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/webpack-component-loader.ts rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/webpack-component-loader.ts diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Controllers/HomeController.cs b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/Controllers/HomeController.cs similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Controllers/HomeController.cs rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/Controllers/HomeController.cs diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Controllers/SampleDataController.cs b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/Controllers/SampleDataController.cs similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Controllers/SampleDataController.cs rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/Controllers/SampleDataController.cs diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/KnockoutSpa.csproj b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/KnockoutSpa.csproj similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/KnockoutSpa.csproj rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/KnockoutSpa.csproj diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Program.cs b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/Program.cs similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Program.cs rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/Program.cs diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Startup.cs b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/Startup.cs similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Startup.cs rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/Startup.cs diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Views/Home/Index.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/Views/Home/Index.cshtml similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Views/Home/Index.cshtml rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/Views/Home/Index.cshtml diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Views/Shared/Error.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/Views/Shared/Error.cshtml similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Views/Shared/Error.cshtml rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/Views/Shared/Error.cshtml diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Views/Shared/_Layout.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/Views/Shared/_Layout.cshtml similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Views/Shared/_Layout.cshtml rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/Views/Shared/_Layout.cshtml diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Views/_ViewImports.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/Views/_ViewImports.cshtml similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Views/_ViewImports.cshtml rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/Views/_ViewImports.cshtml diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Views/_ViewStart.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/Views/_ViewStart.cshtml similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Views/_ViewStart.cshtml rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/Views/_ViewStart.cshtml diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/appsettings.Development.json b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/appsettings.Development.json similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/appsettings.Development.json rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/appsettings.Development.json diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/appsettings.json b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/appsettings.json similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/appsettings.json rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/appsettings.json diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/npm-shrinkwrap.json b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/npm-shrinkwrap.json similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/npm-shrinkwrap.json rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/npm-shrinkwrap.json diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/package.json b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/package.json similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/package.json rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/package.json diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/tsconfig.json b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/tsconfig.json similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/tsconfig.json rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/tsconfig.json diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/webpack.config.js b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/webpack.config.js similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/webpack.config.js rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/webpack.config.js diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/webpack.config.vendor.js b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/webpack.config.vendor.js similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/webpack.config.vendor.js rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/webpack.config.vendor.js diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/wwwroot/favicon.ico b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/wwwroot/favicon.ico similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/wwwroot/favicon.ico rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/wwwroot/favicon.ico diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/.gitignore b/templates/Microsoft.AspNetCore.SpaTemplates/vue/.gitignore similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/.gitignore rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/.gitignore diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/.template.config/dotnetcli.host.json b/templates/Microsoft.AspNetCore.SpaTemplates/vue/.template.config/dotnetcli.host.json similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/.template.config/dotnetcli.host.json rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/.template.config/dotnetcli.host.json diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/.template.config/icon.png b/templates/Microsoft.AspNetCore.SpaTemplates/vue/.template.config/icon.png similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/.template.config/icon.png rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/.template.config/icon.png diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/.template.config/template.json b/templates/Microsoft.AspNetCore.SpaTemplates/vue/.template.config/template.json similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/.template.config/template.json rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/.template.config/template.json diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/.template.config/vs-2017.3.host.json b/templates/Microsoft.AspNetCore.SpaTemplates/vue/.template.config/vs-2017.3.host.json similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/.template.config/vs-2017.3.host.json rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/.template.config/vs-2017.3.host.json diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/boot.ts b/templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/boot.ts similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/boot.ts rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/boot.ts diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/app/app.ts b/templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/app/app.ts similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/app/app.ts rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/app/app.ts diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/app/app.vue.html b/templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/app/app.vue.html similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/app/app.vue.html rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/app/app.vue.html diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/counter/counter.ts b/templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/counter/counter.ts similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/counter/counter.ts rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/counter/counter.ts diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/counter/counter.vue.html b/templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/counter/counter.vue.html similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/counter/counter.vue.html rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/counter/counter.vue.html diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/fetchdata/fetchdata.ts b/templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/fetchdata/fetchdata.ts similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/fetchdata/fetchdata.ts rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/fetchdata/fetchdata.ts diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/fetchdata/fetchdata.vue.html b/templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/fetchdata/fetchdata.vue.html similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/fetchdata/fetchdata.vue.html rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/fetchdata/fetchdata.vue.html diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/home/home.vue.html b/templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/home/home.vue.html similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/home/home.vue.html rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/home/home.vue.html diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/navmenu/navmenu.css b/templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/navmenu/navmenu.css similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/navmenu/navmenu.css rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/navmenu/navmenu.css diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/navmenu/navmenu.vue.html b/templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/navmenu/navmenu.vue.html similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/navmenu/navmenu.vue.html rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/navmenu/navmenu.vue.html diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/css/site.css b/templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/css/site.css similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/css/site.css rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/css/site.css diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Controllers/HomeController.cs b/templates/Microsoft.AspNetCore.SpaTemplates/vue/Controllers/HomeController.cs similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Controllers/HomeController.cs rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/Controllers/HomeController.cs diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Controllers/SampleDataController.cs b/templates/Microsoft.AspNetCore.SpaTemplates/vue/Controllers/SampleDataController.cs similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Controllers/SampleDataController.cs rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/Controllers/SampleDataController.cs diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Program.cs b/templates/Microsoft.AspNetCore.SpaTemplates/vue/Program.cs similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Program.cs rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/Program.cs diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Startup.cs b/templates/Microsoft.AspNetCore.SpaTemplates/vue/Startup.cs similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Startup.cs rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/Startup.cs diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Views/Home/Index.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/vue/Views/Home/Index.cshtml similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Views/Home/Index.cshtml rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/Views/Home/Index.cshtml diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Views/Shared/Error.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/vue/Views/Shared/Error.cshtml similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Views/Shared/Error.cshtml rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/Views/Shared/Error.cshtml diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Views/Shared/_Layout.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/vue/Views/Shared/_Layout.cshtml similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Views/Shared/_Layout.cshtml rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/Views/Shared/_Layout.cshtml diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Views/_ViewImports.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/vue/Views/_ViewImports.cshtml similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Views/_ViewImports.cshtml rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/Views/_ViewImports.cshtml diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Views/_ViewStart.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/vue/Views/_ViewStart.cshtml similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Views/_ViewStart.cshtml rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/Views/_ViewStart.cshtml diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/VueSpa.csproj b/templates/Microsoft.AspNetCore.SpaTemplates/vue/VueSpa.csproj similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/VueSpa.csproj rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/VueSpa.csproj diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/appsettings.Development.json b/templates/Microsoft.AspNetCore.SpaTemplates/vue/appsettings.Development.json similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/appsettings.Development.json rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/appsettings.Development.json diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/appsettings.json b/templates/Microsoft.AspNetCore.SpaTemplates/vue/appsettings.json similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/appsettings.json rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/appsettings.json diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/npm-shrinkwrap.json b/templates/Microsoft.AspNetCore.SpaTemplates/vue/npm-shrinkwrap.json similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/npm-shrinkwrap.json rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/npm-shrinkwrap.json diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/package.json b/templates/Microsoft.AspNetCore.SpaTemplates/vue/package.json similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/package.json rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/package.json diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/tsconfig.json b/templates/Microsoft.AspNetCore.SpaTemplates/vue/tsconfig.json similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/tsconfig.json rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/tsconfig.json diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/webpack.config.js b/templates/Microsoft.AspNetCore.SpaTemplates/vue/webpack.config.js similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/webpack.config.js rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/webpack.config.js diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/webpack.config.vendor.js b/templates/Microsoft.AspNetCore.SpaTemplates/vue/webpack.config.vendor.js similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/webpack.config.vendor.js rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/webpack.config.vendor.js diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/wwwroot/favicon.ico b/templates/Microsoft.AspNetCore.SpaTemplates/vue/wwwroot/favicon.ico similarity index 100% rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/wwwroot/favicon.ico rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/wwwroot/favicon.ico diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/.gitignore b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/.gitignore similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/.gitignore rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/.gitignore diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/.template.config/dotnetcli.host.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/.template.config/dotnetcli.host.json similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/.template.config/dotnetcli.host.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/.template.config/dotnetcli.host.json diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/.template.config/icon.png b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/.template.config/icon.png similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/.template.config/icon.png rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/.template.config/icon.png diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/.template.config/template.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/.template.config/template.json similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/.template.config/template.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/.template.config/template.json diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/.template.config/vs-2017.3.host.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/.template.config/vs-2017.3.host.json similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/.template.config/vs-2017.3.host.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/.template.config/vs-2017.3.host.json diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/AngularSpa.csproj b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/AngularSpa.csproj similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/AngularSpa.csproj rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/AngularSpa.csproj diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/app.module.browser.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/app.module.browser.ts similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/app.module.browser.ts rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/app.module.browser.ts diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/app.module.server.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/app.module.server.ts similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/app.module.server.ts rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/app.module.server.ts diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/app.module.shared.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/app.module.shared.ts similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/app.module.shared.ts rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/app.module.shared.ts diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/app/app.component.css b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/app/app.component.css similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/app/app.component.css rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/app/app.component.css diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/app/app.component.html b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/app/app.component.html similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/app/app.component.html rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/app/app.component.html diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/app/app.component.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/app/app.component.ts similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/app/app.component.ts rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/app/app.component.ts diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/counter/counter.component.html b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/counter/counter.component.html similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/counter/counter.component.html rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/counter/counter.component.html diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/counter/counter.component.spec.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/counter/counter.component.spec.ts similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/counter/counter.component.spec.ts rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/counter/counter.component.spec.ts diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/counter/counter.component.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/counter/counter.component.ts similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/counter/counter.component.ts rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/counter/counter.component.ts diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/fetchdata/fetchdata.component.html b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/fetchdata/fetchdata.component.html similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/fetchdata/fetchdata.component.html rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/fetchdata/fetchdata.component.html diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/fetchdata/fetchdata.component.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/fetchdata/fetchdata.component.ts similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/fetchdata/fetchdata.component.ts rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/fetchdata/fetchdata.component.ts diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/home/home.component.html b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/home/home.component.html similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/home/home.component.html rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/home/home.component.html diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/home/home.component.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/home/home.component.ts similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/home/home.component.ts rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/home/home.component.ts diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/navmenu/navmenu.component.css b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/navmenu/navmenu.component.css similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/navmenu/navmenu.component.css rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/navmenu/navmenu.component.css diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/navmenu/navmenu.component.html b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/navmenu/navmenu.component.html similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/navmenu/navmenu.component.html rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/navmenu/navmenu.component.html diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/navmenu/navmenu.component.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/navmenu/navmenu.component.ts similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/navmenu/navmenu.component.ts rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/navmenu/navmenu.component.ts diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/boot.browser.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/boot.browser.ts similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/boot.browser.ts rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/boot.browser.ts diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/boot.server.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/boot.server.ts similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/boot.server.ts rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/boot.server.ts diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/test/boot-tests.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/test/boot-tests.ts similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/test/boot-tests.ts rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/test/boot-tests.ts diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/test/karma.conf.js b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/test/karma.conf.js similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/test/karma.conf.js rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/test/karma.conf.js diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Controllers/HomeController.cs b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/Controllers/HomeController.cs similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Controllers/HomeController.cs rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/Controllers/HomeController.cs diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Controllers/SampleDataController.cs b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/Controllers/SampleDataController.cs similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Controllers/SampleDataController.cs rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/Controllers/SampleDataController.cs diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Program.cs b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/Program.cs similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Program.cs rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/Program.cs diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Startup.cs b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/Startup.cs similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Startup.cs rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/Startup.cs diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Views/Home/Index.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/Views/Home/Index.cshtml similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Views/Home/Index.cshtml rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/Views/Home/Index.cshtml diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Views/Shared/Error.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/Views/Shared/Error.cshtml similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Views/Shared/Error.cshtml rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/Views/Shared/Error.cshtml diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Views/Shared/_Layout.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/Views/Shared/_Layout.cshtml similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Views/Shared/_Layout.cshtml rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/Views/Shared/_Layout.cshtml diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Views/_ViewImports.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/Views/_ViewImports.cshtml similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Views/_ViewImports.cshtml rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/Views/_ViewImports.cshtml diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Views/_ViewStart.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/Views/_ViewStart.cshtml similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Views/_ViewStart.cshtml rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/Views/_ViewStart.cshtml diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/appsettings.Development.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/appsettings.Development.json similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/appsettings.Development.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/appsettings.Development.json diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/appsettings.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/appsettings.json similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/appsettings.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/appsettings.json diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/npm-shrinkwrap.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/npm-shrinkwrap.json similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/npm-shrinkwrap.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/npm-shrinkwrap.json diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/package.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/package.json similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/package.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/package.json diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/tsconfig.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/tsconfig.json similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/tsconfig.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/tsconfig.json diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/webpack.config.js b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/webpack.config.js similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/webpack.config.js rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/webpack.config.js diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/webpack.config.vendor.js b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/webpack.config.vendor.js similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/webpack.config.vendor.js rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/webpack.config.vendor.js diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/wwwroot/favicon.ico b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/wwwroot/favicon.ico similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/wwwroot/favicon.ico rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/wwwroot/favicon.ico diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/.gitignore b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/.gitignore similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/.gitignore rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/.gitignore diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/.template.config/dotnetcli.host.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/.template.config/dotnetcli.host.json similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/.template.config/dotnetcli.host.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/.template.config/dotnetcli.host.json diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/.template.config/icon.png b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/.template.config/icon.png similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/.template.config/icon.png rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/.template.config/icon.png diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/.template.config/template.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/.template.config/template.json similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/.template.config/template.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/.template.config/template.json diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/.template.config/vs-2017.3.host.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/.template.config/vs-2017.3.host.json similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/.template.config/vs-2017.3.host.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/.template.config/vs-2017.3.host.json diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/boot.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/ClientApp/boot.tsx similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/boot.tsx rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/ClientApp/boot.tsx diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/components/Counter.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/ClientApp/components/Counter.tsx similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/components/Counter.tsx rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/ClientApp/components/Counter.tsx diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/components/FetchData.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/ClientApp/components/FetchData.tsx similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/components/FetchData.tsx rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/ClientApp/components/FetchData.tsx diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/components/Home.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/ClientApp/components/Home.tsx similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/components/Home.tsx rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/ClientApp/components/Home.tsx diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/components/Layout.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/ClientApp/components/Layout.tsx similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/components/Layout.tsx rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/ClientApp/components/Layout.tsx diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/components/NavMenu.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/ClientApp/components/NavMenu.tsx similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/components/NavMenu.tsx rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/ClientApp/components/NavMenu.tsx diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/css/site.css b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/ClientApp/css/site.css similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/css/site.css rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/ClientApp/css/site.css diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/routes.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/ClientApp/routes.tsx similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/routes.tsx rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/ClientApp/routes.tsx diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Controllers/HomeController.cs b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/Controllers/HomeController.cs similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Controllers/HomeController.cs rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/Controllers/HomeController.cs diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Controllers/SampleDataController.cs b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/Controllers/SampleDataController.cs similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Controllers/SampleDataController.cs rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/Controllers/SampleDataController.cs diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Program.cs b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/Program.cs similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Program.cs rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/Program.cs diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ReactSpa.csproj b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/ReactSpa.csproj similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ReactSpa.csproj rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/ReactSpa.csproj diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Startup.cs b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/Startup.cs similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Startup.cs rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/Startup.cs diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Views/Home/Index.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/Views/Home/Index.cshtml similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Views/Home/Index.cshtml rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/Views/Home/Index.cshtml diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Views/Shared/Error.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/Views/Shared/Error.cshtml similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Views/Shared/Error.cshtml rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/Views/Shared/Error.cshtml diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Views/Shared/_Layout.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/Views/Shared/_Layout.cshtml similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Views/Shared/_Layout.cshtml rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/Views/Shared/_Layout.cshtml diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Views/_ViewImports.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/Views/_ViewImports.cshtml similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Views/_ViewImports.cshtml rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/Views/_ViewImports.cshtml diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Views/_ViewStart.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/Views/_ViewStart.cshtml similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Views/_ViewStart.cshtml rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/Views/_ViewStart.cshtml diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/appsettings.Development.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/appsettings.Development.json similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/appsettings.Development.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/appsettings.Development.json diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/appsettings.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/appsettings.json similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/appsettings.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/appsettings.json diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/npm-shrinkwrap.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/npm-shrinkwrap.json similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/npm-shrinkwrap.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/npm-shrinkwrap.json diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/package.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/package.json similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/package.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/package.json diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/tsconfig.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/tsconfig.json similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/tsconfig.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/tsconfig.json diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/webpack.config.js b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/webpack.config.js similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/webpack.config.js rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/webpack.config.js diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/webpack.config.vendor.js b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/webpack.config.vendor.js similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/webpack.config.vendor.js rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/webpack.config.vendor.js diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/wwwroot/favicon.ico b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/wwwroot/favicon.ico similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/wwwroot/favicon.ico rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/wwwroot/favicon.ico diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/.gitignore b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/.gitignore similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/.gitignore rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/.gitignore diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/.template.config/dotnetcli.host.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/.template.config/dotnetcli.host.json similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/.template.config/dotnetcli.host.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/.template.config/dotnetcli.host.json diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/.template.config/icon.png b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/.template.config/icon.png similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/.template.config/icon.png rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/.template.config/icon.png diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/.template.config/template.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/.template.config/template.json similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/.template.config/template.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/.template.config/template.json diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/.template.config/vs-2017.3.host.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/.template.config/vs-2017.3.host.json similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/.template.config/vs-2017.3.host.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/.template.config/vs-2017.3.host.json diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/boot-client.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/boot-client.tsx similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/boot-client.tsx rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/boot-client.tsx diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/boot-server.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/boot-server.tsx similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/boot-server.tsx rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/boot-server.tsx diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/components/Counter.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/components/Counter.tsx similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/components/Counter.tsx rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/components/Counter.tsx diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/components/FetchData.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/components/FetchData.tsx similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/components/FetchData.tsx rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/components/FetchData.tsx diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/components/Home.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/components/Home.tsx similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/components/Home.tsx rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/components/Home.tsx diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/components/Layout.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/components/Layout.tsx similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/components/Layout.tsx rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/components/Layout.tsx diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/components/NavMenu.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/components/NavMenu.tsx similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/components/NavMenu.tsx rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/components/NavMenu.tsx diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/configureStore.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/configureStore.ts similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/configureStore.ts rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/configureStore.ts diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/css/site.css b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/css/site.css similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/css/site.css rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/css/site.css diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/routes.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/routes.tsx similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/routes.tsx rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/routes.tsx diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/store/Counter.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/store/Counter.ts similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/store/Counter.ts rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/store/Counter.ts diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/store/WeatherForecasts.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/store/WeatherForecasts.ts similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/store/WeatherForecasts.ts rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/store/WeatherForecasts.ts diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/store/index.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/store/index.ts similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/store/index.ts rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/store/index.ts diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Controllers/HomeController.cs b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/Controllers/HomeController.cs similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Controllers/HomeController.cs rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/Controllers/HomeController.cs diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Controllers/SampleDataController.cs b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/Controllers/SampleDataController.cs similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Controllers/SampleDataController.cs rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/Controllers/SampleDataController.cs diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Program.cs b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/Program.cs similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Program.cs rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/Program.cs diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ReactReduxSpa.csproj b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ReactReduxSpa.csproj similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ReactReduxSpa.csproj rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ReactReduxSpa.csproj diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Startup.cs b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/Startup.cs similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Startup.cs rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/Startup.cs diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Views/Home/Index.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/Views/Home/Index.cshtml similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Views/Home/Index.cshtml rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/Views/Home/Index.cshtml diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Views/Shared/Error.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/Views/Shared/Error.cshtml similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Views/Shared/Error.cshtml rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/Views/Shared/Error.cshtml diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Views/Shared/_Layout.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/Views/Shared/_Layout.cshtml similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Views/Shared/_Layout.cshtml rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/Views/Shared/_Layout.cshtml diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Views/_ViewImports.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/Views/_ViewImports.cshtml similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Views/_ViewImports.cshtml rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/Views/_ViewImports.cshtml diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Views/_ViewStart.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/Views/_ViewStart.cshtml similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Views/_ViewStart.cshtml rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/Views/_ViewStart.cshtml diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/appsettings.Development.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/appsettings.Development.json similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/appsettings.Development.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/appsettings.Development.json diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/appsettings.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/appsettings.json similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/appsettings.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/appsettings.json diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/npm-shrinkwrap.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/npm-shrinkwrap.json similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/npm-shrinkwrap.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/npm-shrinkwrap.json diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/package.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/package.json similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/package.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/package.json diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/tsconfig.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/tsconfig.json similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/tsconfig.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/tsconfig.json diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/webpack.config.js b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/webpack.config.js similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/webpack.config.js rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/webpack.config.js diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/webpack.config.vendor.js b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/webpack.config.vendor.js similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/webpack.config.vendor.js rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/webpack.config.vendor.js diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/wwwroot/favicon.ico b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/wwwroot/favicon.ico similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/wwwroot/favicon.ico rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/wwwroot/favicon.ico From 412ec1b42735fd90739c16d83c079d7a5cdeb1e7 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 23 Aug 2017 16:56:07 -0700 Subject: [PATCH 237/411] Build templates nupkgs directly from source without copying to staging location --- appveyor.yml | 2 +- .../Microsoft.AspNetCore.SpaTemplates.nuspec | 6 ++ ...oft.DotNet.Web.Spa.ProjectTemplates.nuspec | 6 ++ templates/package-builder/.gitignore | 3 +- templates/package-builder/src/build/build.ts | 58 ++----------------- 5 files changed, 20 insertions(+), 55 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 00f7bb63..3813cea8 100755 --- a/appveyor.yml +++ b/appveyor.yml @@ -18,7 +18,7 @@ build_script: - npm run build - ps: Pop-Location artifacts: - - path: templates\package-builder\dist\artifacts\*.nupkg + - path: templates\package-builder\artifacts\*.nupkg name: Microsoft.AspNetCore.SpaTemplates type: NuGetPackage # - ps: .\build.ps1 diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Microsoft.AspNetCore.SpaTemplates.nuspec b/templates/Microsoft.AspNetCore.SpaTemplates/Microsoft.AspNetCore.SpaTemplates.nuspec index 5d2159cf..1d2178fe 100644 --- a/templates/Microsoft.AspNetCore.SpaTemplates/Microsoft.AspNetCore.SpaTemplates.nuspec +++ b/templates/Microsoft.AspNetCore.SpaTemplates/Microsoft.AspNetCore.SpaTemplates.nuspec @@ -14,4 +14,10 @@ + + + diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.nuspec b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.nuspec index 604ed87b..71ecb54f 100644 --- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.nuspec +++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.nuspec @@ -14,4 +14,10 @@ + + + diff --git a/templates/package-builder/.gitignore b/templates/package-builder/.gitignore index f0cef27c..cbdf9d5c 100644 --- a/templates/package-builder/.gitignore +++ b/templates/package-builder/.gitignore @@ -1,3 +1,4 @@ /node_modules/ /built/ -/dist/ +/artifacts/ +/tmp/ diff --git a/templates/package-builder/src/build/build.ts b/templates/package-builder/src/build/build.ts index 4e884467..8b834470 100644 --- a/templates/package-builder/src/build/build.ts +++ b/templates/package-builder/src/build/build.ts @@ -15,28 +15,6 @@ const dotNetPackages = [ 'Microsoft.AspNetCore.SpaTemplates' ]; -function writeFileEnsuringDirExists(root: string, filename: string, contents: string | Buffer) { - let fullPath = path.join(root, filename); - mkdirp.sync(path.dirname(fullPath)); - fs.writeFileSync(fullPath, contents); -} - -function listFilesExcludingGitignored(root: string): string[] { - let gitIgnorePath = path.join(root, '.gitignore'); - let gitignoreEvaluator = fs.existsSync(gitIgnorePath) - ? gitignore.compile(fs.readFileSync(gitIgnorePath, 'utf8')) - : { accepts: () => true }; - return glob.sync('**/*', { cwd: root, dot: true, nodir: true }) - .filter(fn => gitignoreEvaluator.accepts(fn)); -} - -function writeTemplate(sourceRoot: string, destRoot: string) { - listFilesExcludingGitignored(sourceRoot).forEach(fn => { - let sourceContent = fs.readFileSync(path.join(sourceRoot, fn)); - writeFileEnsuringDirExists(destRoot, fn, sourceContent); - }); -} - function getBuildNumber(): string { if (process.env.APPVEYOR_BUILD_NUMBER) { return process.env.APPVEYOR_BUILD_NUMBER; @@ -52,35 +30,17 @@ function buildDotNetNewNuGetPackages(outputDir: string) { const dotNetNewNupkgPath = buildDotNetNewNuGetPackage(packageId); // Move the .nupkg file to the output dir + mkdirp.sync(outputDir); fs.renameSync(dotNetNewNupkgPath, path.join(outputDir, path.basename(dotNetNewNupkgPath))); }); } function buildDotNetNewNuGetPackage(packageId: string) { - const outputRoot = './dist/dotnetnew'; - rimraf.sync(outputRoot); - - // Copy template files + // Invoke NuGet to create the final package const packageSourceRootDir = path.join('../', packageId); - const templatesInPackage = fs.readdirSync(path.join(packageSourceRootDir, 'Content')); - - _.forEach(templatesInPackage, templateName => { - const templateSourceDir = path.join(packageSourceRootDir, 'Content', templateName); - const templateOutputDir = path.join(outputRoot, 'Content', templateName); - writeTemplate(templateSourceDir, templateOutputDir); - }); - - // Create the .nuspec file const nuspecFilename = `${ packageId }.nuspec`; - const nuspecContentTemplate = fs.readFileSync(path.join(packageSourceRootDir, nuspecFilename)); - writeFileEnsuringDirExists(outputRoot, - nuspecFilename, - nuspecContentTemplate - ); - - // Invoke NuGet to create the final package const nugetExe = path.join(process.cwd(), './bin/NuGet.exe'); - const nugetStartInfo = { cwd: outputRoot, stdio: 'inherit' }; + const nugetStartInfo = { cwd: packageSourceRootDir, stdio: 'inherit' }; const packageVersion = `1.0.${ getBuildNumber() }`; const nugetArgs = ['pack', nuspecFilename, '-Version', packageVersion]; if (isWindows) { @@ -92,15 +52,7 @@ function buildDotNetNewNuGetPackage(packageId: string) { childProcess.spawnSync('mono', nugetArgs, nugetStartInfo); } - // Clean up - rimraf.sync('./tmp'); - - return glob.sync(path.join(outputRoot, './*.nupkg'))[0]; + return glob.sync(path.join(packageSourceRootDir, './*.nupkg'))[0]; } -const distDir = './dist'; -const artifactsDir = path.join(distDir, 'artifacts'); - -rimraf.sync(distDir); -mkdirp.sync(artifactsDir); -buildDotNetNewNuGetPackages(artifactsDir); +buildDotNetNewNuGetPackages('./artifacts'); From 28920c7691e73184b9aa2e8680f3700db1146b4a Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 23 Aug 2017 16:57:43 -0700 Subject: [PATCH 238/411] Simplify .gitignore --- .gitignore | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.gitignore b/.gitignore index 8abcfa13..3f3bbd7b 100644 --- a/.gitignore +++ b/.gitignore @@ -29,16 +29,7 @@ nuget.exe npm-debug.log /.build/ -# The templates can't contain their own .gitignore files, because Yeoman has strange default handling for -# files with that name (https://github.com/npm/npm/issues/1862). So, each template instead has a template_gitignore -# file which gets renamed after the files are copied. And so any files that need to be excluded in the source -# repo have to be excluded here. -/templates/*/*/*/node_modules/ -/templates/*/*/*/wwwroot/dist/ -/templates/*/*/*/ClientApp/dist/ -/templates/*/*/*/yarn.lock .vscode/ -/templates/*/*/*/Properties/launchSettings.json global.json korebuild-lock.txt From 8b243e8cc7e7ffd692027e13afec98d8fdc4a120 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 23 Aug 2017 17:12:06 -0700 Subject: [PATCH 239/411] Simplify build script further --- templates/package-builder/package.json | 15 +------- templates/package-builder/src/build/build.ts | 38 ++++++-------------- 2 files changed, 12 insertions(+), 41 deletions(-) diff --git a/templates/package-builder/package.json b/templates/package-builder/package.json index d3b248c8..d5a87fc2 100644 --- a/templates/package-builder/package.json +++ b/templates/package-builder/package.json @@ -10,24 +10,11 @@ "author": "Microsoft", "license": "Apache-2.0", "dependencies": { - "@types/chalk": "^0.4.31", - "@types/semver": "^5.3.30", - "diff": "^2.2.2", - "gitignore-parser": "0.0.2", - "glob": "^7.0.3", - "lodash": "^4.11.1", - "mkdirp": "^0.5.1", - "rimraf": "^2.5.2", - "semver": "^5.3.0", - "tar.gz": "^1.0.5" + "mkdirp": "^0.5.1" }, "devDependencies": { - "@types/glob": "^5.0.30", - "@types/lodash": "^4.14.37", "@types/mkdirp": "^0.3.29", "@types/node": "^6.0.45", - "@types/node-uuid": "0.0.28", - "@types/rimraf": "0.0.28", "typescript": "^2.0.0" } } diff --git a/templates/package-builder/src/build/build.ts b/templates/package-builder/src/build/build.ts index 8b834470..24168e55 100644 --- a/templates/package-builder/src/build/build.ts +++ b/templates/package-builder/src/build/build.ts @@ -1,19 +1,14 @@ -import * as glob from 'glob'; -import * as gitignore from 'gitignore-parser'; import * as fs from 'fs'; import * as path from 'path'; -import * as _ from 'lodash'; import * as mkdirp from 'mkdirp'; -import * as rimraf from 'rimraf'; import * as childProcess from 'child_process'; -import * as targz from 'tar.gz'; const isWindows = /^win/.test(process.platform); - -const dotNetPackages = [ +const packageIds = [ 'Microsoft.DotNet.Web.Spa.ProjectTemplates', 'Microsoft.AspNetCore.SpaTemplates' ]; +const packageVersion = `1.0.${ getBuildNumber() }`; function getBuildNumber(): string { if (process.env.APPVEYOR_BUILD_NUMBER) { @@ -24,25 +19,18 @@ function getBuildNumber(): string { return Math.floor((new Date().valueOf() - new Date(2017, 0, 1).valueOf()) / (60*1000)) + '-local'; } -function buildDotNetNewNuGetPackages(outputDir: string) { - const dotNetPackageIds = _.values(dotNetPackages); - dotNetPackageIds.forEach(packageId => { - const dotNetNewNupkgPath = buildDotNetNewNuGetPackage(packageId); - - // Move the .nupkg file to the output dir - mkdirp.sync(outputDir); - fs.renameSync(dotNetNewNupkgPath, path.join(outputDir, path.basename(dotNetNewNupkgPath))); - }); -} - -function buildDotNetNewNuGetPackage(packageId: string) { +packageIds.forEach(packageId => { // Invoke NuGet to create the final package const packageSourceRootDir = path.join('../', packageId); const nuspecFilename = `${ packageId }.nuspec`; - const nugetExe = path.join(process.cwd(), './bin/NuGet.exe'); + const nugetExe = path.resolve('./bin/NuGet.exe'); const nugetStartInfo = { cwd: packageSourceRootDir, stdio: 'inherit' }; - const packageVersion = `1.0.${ getBuildNumber() }`; - const nugetArgs = ['pack', nuspecFilename, '-Version', packageVersion]; + const nugetArgs = [ + 'pack', nuspecFilename, + '-Version', packageVersion, + '-OutputDirectory', path.resolve('./artifacts') + ]; + if (isWindows) { // Invoke NuGet.exe directly childProcess.spawnSync(nugetExe, nugetArgs, nugetStartInfo); @@ -51,8 +39,4 @@ function buildDotNetNewNuGetPackage(packageId: string) { nugetArgs.unshift(nugetExe); childProcess.spawnSync('mono', nugetArgs, nugetStartInfo); } - - return glob.sync(path.join(packageSourceRootDir, './*.nupkg'))[0]; -} - -buildDotNetNewNuGetPackages('./artifacts'); +}); From c922eee1d668b4836e47f459238afaa90a96e03f Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 23 Aug 2017 17:15:37 -0700 Subject: [PATCH 240/411] Fix artifacts dir for test --- test/templates/util/dotnetnew.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/templates/util/dotnetnew.ts b/test/templates/util/dotnetnew.ts index 171607a5..c44bd8e5 100644 --- a/test/templates/util/dotnetnew.ts +++ b/test/templates/util/dotnetnew.ts @@ -5,7 +5,7 @@ import * as rimraf from 'rimraf'; import * as mkdirp from 'mkdirp'; const templatePackageName = 'Microsoft.DotNet.Web.Spa.ProjectTemplates'; -const templatePackageArtifactsDir = '../templates/package-builder/dist/artifacts'; +const templatePackageArtifactsDir = '../templates/package-builder/artifacts'; export function generateProjectSync(targetDir: string, templateName: string) { installTemplatePackage(targetDir, templatePackageName, templateName); From e5f12992394bc77cf4e1dbae81a7b91dca4047af Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 24 Aug 2017 15:31:34 -0700 Subject: [PATCH 241/411] Use devDependencies consistently in templates (no packages required in production, as webpack publish builds are standalone). Fixes #747 --- .../aurelia/package.json | 14 +++++------ .../angular/package.json | 24 +++++++++---------- .../redux/package.json | 2 +- 3 files changed, 18 insertions(+), 22 deletions(-) diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/package.json b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/package.json index 00b009e1..cc8cc6b1 100644 --- a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/package.json +++ b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/package.json @@ -2,25 +2,23 @@ "name": "AureliaSpa", "private": true, "version": "0.0.0", - "dependencies": { + "devDependencies": { + "@types/webpack-env": "^1.13.0", + "aspnet-webpack": "^2.0.1", "aurelia-bootstrapper": "^2.0.1", "aurelia-fetch-client": "^1.0.1", "aurelia-framework": "^1.1.0", "aurelia-loader-webpack": "^2.0.0", "aurelia-pal": "^1.3.0", "aurelia-router": "^1.2.1", - "bootstrap": "^3.3.7", - "isomorphic-fetch": "^2.2.1", - "jquery": "^3.2.1" - }, - "devDependencies": { - "@types/webpack-env": "^1.13.0", - "aspnet-webpack": "^2.0.1", "aurelia-webpack-plugin": "^2.0.0-rc.2", + "bootstrap": "^3.3.7", "css-loader": "^0.28.0", "extract-text-webpack-plugin": "^2.1.0", "file-loader": "^0.11.1", "html-loader": "^0.4.5", + "isomorphic-fetch": "^2.2.1", + "jquery": "^3.2.1", "json-loader": "^0.5.4", "style-loader": "^0.16.1", "ts-loader": "^2.0.3", diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/package.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/package.json index f72210bf..dc456f2f 100644 --- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/package.json +++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/package.json @@ -5,7 +5,7 @@ "scripts": { "test": "karma start ClientApp/test/karma.conf.js" }, - "dependencies": { + "devDependencies": { "@angular/animations": "4.2.5", "@angular/common": "4.2.5", "@angular/compiler": "4.2.5", @@ -18,6 +18,8 @@ "@angular/platform-server": "4.2.5", "@angular/router": "4.2.5", "@ngtools/webpack": "1.5.0", + "@types/chai": "4.0.1", + "@types/jasmine": "2.5.53", "@types/webpack-env": "1.13.0", "angular2-router-loader": "0.3.5", "angular2-template-loader": "0.6.2", @@ -25,6 +27,7 @@ "aspnet-webpack": "^2.0.1", "awesome-typescript-loader": "3.2.1", "bootstrap": "3.3.7", + "chai": "4.0.2", "css": "2.2.1", "css-loader": "0.28.4", "es6-shim": "0.35.3", @@ -34,8 +37,15 @@ "file-loader": "0.11.2", "html-loader": "0.4.5", "isomorphic-fetch": "2.2.1", + "jasmine-core": "2.6.4", "jquery": "3.2.1", "json-loader": "0.5.4", + "karma": "1.7.0", + "karma-chai": "0.1.0", + "karma-chrome-launcher": "2.2.0", + "karma-cli": "1.0.1", + "karma-jasmine": "1.1.0", + "karma-webpack": "2.0.3", "preboot": "4.5.2", "raw-loader": "0.5.1", "reflect-metadata": "0.1.10", @@ -48,17 +58,5 @@ "webpack-hot-middleware": "2.18.2", "webpack-merge": "4.1.0", "zone.js": "0.8.12" - }, - "devDependencies": { - "@types/chai": "4.0.1", - "@types/jasmine": "2.5.53", - "chai": "4.0.2", - "jasmine-core": "2.6.4", - "karma": "1.7.0", - "karma-chai": "0.1.0", - "karma-chrome-launcher": "2.2.0", - "karma-cli": "1.0.1", - "karma-jasmine": "1.1.0", - "karma-webpack": "2.0.3" } } diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/package.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/package.json index 3991fb10..1844d568 100644 --- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/package.json +++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/package.json @@ -2,7 +2,7 @@ "name": "ReactReduxSpa", "private": true, "version": "0.0.0", - "dependencies": { + "devDependencies": { "@types/history": "4.6.0", "@types/react": "15.0.35", "@types/react-dom": "15.5.1", From e2030fb1fa1c27a53c318d7b8fc39c45c01a5294 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 24 Aug 2017 17:52:35 -0700 Subject: [PATCH 242/411] Handle publicPath=/ in HMR. Fixes #1191. --- .../Webpack/ConditionalProxyMiddleware.cs | 4 +++- .../Webpack/WebpackDevMiddleware.cs | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/Microsoft.AspNetCore.SpaServices/Webpack/ConditionalProxyMiddleware.cs b/src/Microsoft.AspNetCore.SpaServices/Webpack/ConditionalProxyMiddleware.cs index 1b36cd58..292f62d0 100644 --- a/src/Microsoft.AspNetCore.SpaServices/Webpack/ConditionalProxyMiddleware.cs +++ b/src/Microsoft.AspNetCore.SpaServices/Webpack/ConditionalProxyMiddleware.cs @@ -22,6 +22,7 @@ internal class ConditionalProxyMiddleware private readonly RequestDelegate _next; private readonly ConditionalProxyMiddlewareOptions _options; private readonly string _pathPrefix; + private readonly bool _pathPrefixIsRoot; public ConditionalProxyMiddleware( RequestDelegate next, @@ -35,6 +36,7 @@ public ConditionalProxyMiddleware( _next = next; _pathPrefix = pathPrefix; + _pathPrefixIsRoot = string.Equals(_pathPrefix, "/", StringComparison.Ordinal); _options = options; _httpClient = new HttpClient(new HttpClientHandler()); _httpClient.Timeout = _options.RequestTimeout; @@ -42,7 +44,7 @@ public ConditionalProxyMiddleware( public async Task Invoke(HttpContext context) { - if (context.Request.Path.StartsWithSegments(_pathPrefix)) + if (context.Request.Path.StartsWithSegments(_pathPrefix) || _pathPrefixIsRoot) { var didProxyRequest = await PerformProxyRequest(context); if (didProxyRequest) diff --git a/src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddleware.cs b/src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddleware.cs index 190fb492..2e8f92ea 100644 --- a/src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddleware.cs +++ b/src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddleware.cs @@ -17,7 +17,10 @@ public static class WebpackDevMiddleware private static readonly JsonSerializerSettings jsonSerializerSettings = new JsonSerializerSettings { - ContractResolver = new CamelCasePropertyNamesContractResolver(), + // Note that the aspnet-webpack JS code specifically expects options to be serialized with + // PascalCase property names, so it's important to be explicit about this contract resolver + ContractResolver = new DefaultContractResolver(), + TypeNameHandling = TypeNameHandling.None }; From 04fe1204a95ee09c9c0bf14c81e680c6f38f37dc Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Fri, 25 Aug 2017 11:02:02 -0700 Subject: [PATCH 243/411] Rename app.module.(server|browser).ts to app.(server|browser).module.ts. Fixes #1228. --- .../app/{app.module.browser.ts => app.browser.module.ts} | 2 +- .../app/{app.module.server.ts => app.server.module.ts} | 2 +- .../app/{app.module.shared.ts => app.shared.module.ts} | 0 .../angular/ClientApp/boot.browser.ts | 2 +- .../angular/ClientApp/boot.server.ts | 2 +- .../angular/webpack.config.js | 4 ++-- 6 files changed, 6 insertions(+), 6 deletions(-) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/{app.module.browser.ts => app.browser.module.ts} (89%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/{app.module.server.ts => app.server.module.ts} (84%) rename templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/{app.module.shared.ts => app.shared.module.ts} (100%) diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/app.module.browser.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/app.browser.module.ts similarity index 89% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/app.module.browser.ts rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/app.browser.module.ts index 03104b45..3aec0239 100644 --- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/app.module.browser.ts +++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/app.browser.module.ts @@ -1,6 +1,6 @@ import { NgModule } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; -import { AppModuleShared } from './app.module.shared'; +import { AppModuleShared } from './app.shared.module'; import { AppComponent } from './components/app/app.component'; @NgModule({ diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/app.module.server.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/app.server.module.ts similarity index 84% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/app.module.server.ts rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/app.server.module.ts index 0608381c..90532aec 100644 --- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/app.module.server.ts +++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/app.server.module.ts @@ -1,6 +1,6 @@ import { NgModule } from '@angular/core'; import { ServerModule } from '@angular/platform-server'; -import { AppModuleShared } from './app.module.shared'; +import { AppModuleShared } from './app.shared.module'; import { AppComponent } from './components/app/app.component'; @NgModule({ diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/app.module.shared.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/app.shared.module.ts similarity index 100% rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/app.module.shared.ts rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/app.shared.module.ts diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/boot.browser.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/boot.browser.ts index f9c0ba2b..5a5201b5 100644 --- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/boot.browser.ts +++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/boot.browser.ts @@ -3,7 +3,7 @@ import 'zone.js'; import 'bootstrap'; import { enableProdMode } from '@angular/core'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; -import { AppModule } from './app/app.module.browser'; +import { AppModule } from './app/app.browser.module'; if (module.hot) { module.hot.accept(); diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/boot.server.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/boot.server.ts index 00460e93..419a17f5 100644 --- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/boot.server.ts +++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/boot.server.ts @@ -5,7 +5,7 @@ import { APP_BASE_HREF } from '@angular/common'; import { enableProdMode, ApplicationRef, NgZone, ValueProvider } from '@angular/core'; import { platformDynamicServer, PlatformState, INITIAL_CONFIG } from '@angular/platform-server'; import { createServerRenderer, RenderResult } from 'aspnet-prerendering'; -import { AppModule } from './app/app.module.server'; +import { AppModule } from './app/app.server.module'; enableProdMode(); diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/webpack.config.js b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/webpack.config.js index c5e834ba..5ec3222e 100644 --- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/webpack.config.js +++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/webpack.config.js @@ -47,7 +47,7 @@ module.exports = (env) => { new webpack.optimize.UglifyJsPlugin(), new AotPlugin({ tsConfigPath: './tsconfig.json', - entryModule: path.join(__dirname, 'ClientApp/app/app.module.browser#AppModule'), + entryModule: path.join(__dirname, 'ClientApp/app/app.browser.module#AppModule'), exclude: ['./**/*.server.ts'] }) ]) @@ -68,7 +68,7 @@ module.exports = (env) => { // Plugins that apply in production builds only new AotPlugin({ tsConfigPath: './tsconfig.json', - entryModule: path.join(__dirname, 'ClientApp/app/app.module.server#AppModule'), + entryModule: path.join(__dirname, 'ClientApp/app/app.server.module#AppModule'), exclude: ['./**/*.browser.ts'] }) ]), From 64ed1c794521999193271d7c4ae3e39c97fac6db Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 30 Aug 2017 14:48:58 -0700 Subject: [PATCH 244/411] Use Directory.Build.props/targets (#1235) --- appveyor.yml => .appveyor.yml | 0 Directory.Build.props | 15 ++++++++++++ Directory.Build.targets | 2 ++ JavaScriptServices.sln | 14 +++++++---- build/common.props | 23 ------------------- samples/misc/LatencyTest/LatencyTest.csproj | 2 -- .../NodeServicesExamples.csproj | 4 +--- samples/misc/Webpack/Webpack.csproj | 4 +--- src/Directory.Build.props | 13 +++++++++++ ...oft.AspNetCore.NodeServices.Sockets.csproj | 4 ---- .../Microsoft.AspNetCore.NodeServices.csproj | 5 ---- .../Microsoft.AspNetCore.SpaServices.csproj | 5 ---- templates/Directory.Build.props | 3 +++ templates/Directory.Build.targets | 3 +++ 14 files changed, 48 insertions(+), 49 deletions(-) rename appveyor.yml => .appveyor.yml (100%) create mode 100644 Directory.Build.props create mode 100644 Directory.Build.targets delete mode 100644 build/common.props create mode 100644 src/Directory.Build.props create mode 100644 templates/Directory.Build.props create mode 100644 templates/Directory.Build.targets diff --git a/appveyor.yml b/.appveyor.yml similarity index 100% rename from appveyor.yml rename to .appveyor.yml diff --git a/Directory.Build.props b/Directory.Build.props new file mode 100644 index 00000000..c13af935 --- /dev/null +++ b/Directory.Build.props @@ -0,0 +1,15 @@ + + + + + + Microsoft ASP.NET Core + https://github.com/aspnet/javascriptservices + git + $(MSBuildThisFileDirectory)build\Key.snk + true + true + $(VersionSuffix)-$(BuildNumber) + true + + diff --git a/Directory.Build.targets b/Directory.Build.targets new file mode 100644 index 00000000..f75adf7e --- /dev/null +++ b/Directory.Build.targets @@ -0,0 +1,2 @@ + + diff --git a/JavaScriptServices.sln b/JavaScriptServices.sln index f1dd9654..04461b41 100644 --- a/JavaScriptServices.sln +++ b/JavaScriptServices.sln @@ -1,9 +1,12 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26430.4 +VisualStudioVersion = 15.0.26730.10 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{27304DDE-AFB2-4F8B-B765-E3E2F11E886C}" + ProjectSection(SolutionItems) = preProject + src\Directory.Build.props = src\Directory.Build.props + EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.NodeServices", "src\Microsoft.AspNetCore.NodeServices\Microsoft.AspNetCore.NodeServices.csproj", "{66B77203-1469-41DF-92F2-2BE6900BD36F}" EndProject @@ -30,10 +33,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NodeServicesExamples", "sam EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "templates", "templates", "{1598B415-73F1-4B37-B3B4-0A10677ABB2D}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{E415FE14-13B0-469F-836D-95059E6BAA6E}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{645F7363-1240-4FB6-9422-B32A327C979F}" ProjectSection(SolutionItems) = preProject - src\build\common.props = src\build\common.props - src\build\Key.snk = src\build\Key.snk + Directory.Build.props = Directory.Build.props + Directory.Build.targets = Directory.Build.targets EndProjectSection EndProject Global @@ -79,4 +82,7 @@ Global {DE479DC3-1461-4EAD-A188-4AF7AA4AE344} = {E6A161EA-646C-4033-9090-95BE809AB8D9} {93EFCC5F-C6EE-4623-894F-A42B22C0B6FE} = {E6A161EA-646C-4033-9090-95BE809AB8D9} EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {DDF59B0D-2DEC-45D6-8667-DCB767487101} + EndGlobalSection EndGlobal diff --git a/build/common.props b/build/common.props deleted file mode 100644 index 1febbfb4..00000000 --- a/build/common.props +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - Microsoft ASP.NET Core - https://github.com/aspnet/javascriptservices - git - $(MSBuildThisFileDirectory)Key.snk - true - true - $(VersionSuffix)-$(BuildNumber) - true - - - - - - - - - - diff --git a/samples/misc/LatencyTest/LatencyTest.csproj b/samples/misc/LatencyTest/LatencyTest.csproj index 43d5f17a..0d88fae4 100644 --- a/samples/misc/LatencyTest/LatencyTest.csproj +++ b/samples/misc/LatencyTest/LatencyTest.csproj @@ -1,7 +1,5 @@  - - netcoreapp2.0;net461 false diff --git a/samples/misc/NodeServicesExamples/NodeServicesExamples.csproj b/samples/misc/NodeServicesExamples/NodeServicesExamples.csproj index eedacabc..6758a2fb 100644 --- a/samples/misc/NodeServicesExamples/NodeServicesExamples.csproj +++ b/samples/misc/NodeServicesExamples/NodeServicesExamples.csproj @@ -1,6 +1,4 @@ - - - + netcoreapp2.0;net461 diff --git a/samples/misc/Webpack/Webpack.csproj b/samples/misc/Webpack/Webpack.csproj index eedacabc..6758a2fb 100644 --- a/samples/misc/Webpack/Webpack.csproj +++ b/samples/misc/Webpack/Webpack.csproj @@ -1,6 +1,4 @@ - - - + netcoreapp2.0;net461 diff --git a/src/Directory.Build.props b/src/Directory.Build.props new file mode 100644 index 00000000..235e5c9b --- /dev/null +++ b/src/Directory.Build.props @@ -0,0 +1,13 @@ + + + + + true + true + aspnetcore;aspnetcoremvc;nodeservices + + + + + + diff --git a/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj b/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj index 1e3e542b..65c47155 100644 --- a/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj +++ b/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj @@ -1,12 +1,8 @@  - - Socket-based RPC for Microsoft.AspNetCore.NodeServices. netstandard2.0 - aspnetcore;aspnetcoremvc;nodeservices - true diff --git a/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj b/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj index 7f7822e2..03d4ace8 100644 --- a/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj +++ b/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj @@ -1,13 +1,8 @@  - - Invoke Node.js modules at runtime in ASP.NET Core applications. netstandard2.0 - aspnetcore;aspnetcoremvc;nodeservices - true - true diff --git a/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj b/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj index 730c9444..268fc099 100644 --- a/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj +++ b/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj @@ -1,13 +1,8 @@  - - Helpers for building single-page applications on ASP.NET MVC Core. netstandard2.0 - aspnetcore;aspnetcoremvc;nodeservices - true - true diff --git a/templates/Directory.Build.props b/templates/Directory.Build.props new file mode 100644 index 00000000..141834c2 --- /dev/null +++ b/templates/Directory.Build.props @@ -0,0 +1,3 @@ + + + diff --git a/templates/Directory.Build.targets b/templates/Directory.Build.targets new file mode 100644 index 00000000..141834c2 --- /dev/null +++ b/templates/Directory.Build.targets @@ -0,0 +1,3 @@ + + + From a0269fb0adfd8b112ee95f7f68564836b8bc4c36 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 29 Aug 2017 15:07:34 -0700 Subject: [PATCH 245/411] Use PackageLineup to manage PackageReference versions --- Directory.Build.props | 1 - Directory.Build.targets | 14 +++++++++++++- NuGet.config | 3 +-- build/dependencies.props | 11 ----------- build/repo.props | 6 ++++++ samples/misc/LatencyTest/LatencyTest.csproj | 2 +- .../NodeServicesExamples.csproj | 14 +++++++------- samples/misc/Webpack/Webpack.csproj | 14 +++++++------- src/Directory.Build.props | 2 +- ...icrosoft.AspNetCore.NodeServices.Sockets.csproj | 5 ++++- .../Microsoft.AspNetCore.NodeServices.csproj | 6 +++--- .../Microsoft.AspNetCore.SpaServices.csproj | 10 ++++++++-- 12 files changed, 51 insertions(+), 37 deletions(-) delete mode 100644 build/dependencies.props create mode 100644 build/repo.props diff --git a/Directory.Build.props b/Directory.Build.props index c13af935..8edbff70 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,5 +1,4 @@  - diff --git a/Directory.Build.targets b/Directory.Build.targets index f75adf7e..bc118fd9 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,2 +1,14 @@ - + + + + <_BootstrapperFile Condition=" $([MSBuild]::IsOSUnixLike()) ">build.sh + <_BootstrapperFile Condition="! $([MSBuild]::IsOSUnixLike()) ">build.cmd + <_BootstrapperError> + Package references have not been pinned. Run './$(_BootstrapperFile) /t:Pin'. + Also, you can run './$(_BootstrapperFile) /t:Restore' which will pin *and* restore packages. '$(_BootstrapperFile)' can be found in '$(MSBuildThisFileDirectory)'. + + + + + diff --git a/NuGet.config b/NuGet.config index f4952688..20060c93 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,7 +3,6 @@ - - \ No newline at end of file + diff --git a/build/dependencies.props b/build/dependencies.props deleted file mode 100644 index 1964f88c..00000000 --- a/build/dependencies.props +++ /dev/null @@ -1,11 +0,0 @@ - - - 2.1.0-* - 2.1.1-* - 10.0.1 - 2.0.0-* - 2.0.0-* - 2.0.0-* - 4.8.0-* - - diff --git a/build/repo.props b/build/repo.props new file mode 100644 index 00000000..13fe1c29 --- /dev/null +++ b/build/repo.props @@ -0,0 +1,6 @@ + + + + + + diff --git a/samples/misc/LatencyTest/LatencyTest.csproj b/samples/misc/LatencyTest/LatencyTest.csproj index 0d88fae4..8ad37df1 100644 --- a/samples/misc/LatencyTest/LatencyTest.csproj +++ b/samples/misc/LatencyTest/LatencyTest.csproj @@ -12,7 +12,7 @@ - + diff --git a/samples/misc/NodeServicesExamples/NodeServicesExamples.csproj b/samples/misc/NodeServicesExamples/NodeServicesExamples.csproj index 6758a2fb..d85540c6 100644 --- a/samples/misc/NodeServicesExamples/NodeServicesExamples.csproj +++ b/samples/misc/NodeServicesExamples/NodeServicesExamples.csproj @@ -11,13 +11,13 @@ - - - - - - - + + + + + + + diff --git a/samples/misc/Webpack/Webpack.csproj b/samples/misc/Webpack/Webpack.csproj index 6758a2fb..d85540c6 100644 --- a/samples/misc/Webpack/Webpack.csproj +++ b/samples/misc/Webpack/Webpack.csproj @@ -11,13 +11,13 @@ - - - - - - - + + + + + + + diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 235e5c9b..55417710 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -8,6 +8,6 @@ - + diff --git a/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj b/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj index 65c47155..535a9d78 100644 --- a/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj +++ b/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj @@ -12,7 +12,10 @@ - + + + + diff --git a/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj b/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj index 03d4ace8..28b9ab33 100644 --- a/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj +++ b/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj @@ -11,9 +11,9 @@ - - - + + + diff --git a/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj b/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj index 268fc099..5c856e99 100644 --- a/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj +++ b/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj @@ -8,9 +8,15 @@ + + + - - + + + + + From 09317b83a863cfcec9f0a3ae9450c8cf2718b98d Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 7 Sep 2017 13:28:18 +0100 Subject: [PATCH 246/411] SPA templates have now moved to the aspnet/templating repo --- .appveyor.yml | 23 - JavaScriptServices.sln | 4 +- templates/Directory.Build.props | 3 - templates/Directory.Build.targets | 3 - .../Microsoft.AspNetCore.SpaTemplates.nuspec | 23 - .../aurelia/.gitignore | 237 -- .../.template.config/dotnetcli.host.json | 17 - .../aurelia/.template.config/icon.png | Bin 2355 -> 0 bytes .../aurelia/.template.config/template.json | 87 - .../.template.config/vs-2017.3.host.json | 20 - .../aurelia/AureliaSpa.csproj | 57 - .../ClientApp/app/components/app/app.css | 6 - .../ClientApp/app/components/app/app.html | 14 - .../ClientApp/app/components/app/app.ts | 34 - .../app/components/counter/counter.html | 9 - .../app/components/counter/counter.ts | 7 - .../app/components/fetchdata/fetchdata.html | 26 - .../app/components/fetchdata/fetchdata.ts | 22 - .../ClientApp/app/components/home/home.html | 16 - .../ClientApp/app/components/home/home.ts | 2 - .../app/components/navmenu/navmenu.css | 59 - .../app/components/navmenu/navmenu.html | 26 - .../aurelia/ClientApp/boot.ts | 21 - .../aurelia/Controllers/HomeController.cs | 23 - .../Controllers/SampleDataController.cs | 44 - .../aurelia/Program.cs | 25 - .../aurelia/Startup.cs | 58 - .../aurelia/Views/Home/Index.cshtml | 10 - .../aurelia/Views/Shared/Error.cshtml | 21 - .../aurelia/Views/Shared/_Layout.cshtml | 16 - .../aurelia/Views/_ViewImports.cshtml | 3 - .../aurelia/Views/_ViewStart.cshtml | 3 - .../aurelia/appsettings.Development.json | 19 - .../aurelia/appsettings.json | 15 - .../aurelia/npm-shrinkwrap.json | 2615 ------------ .../aurelia/package.json | 30 - .../aurelia/tsconfig.json | 16 - .../aurelia/webpack.config.js | 44 - .../aurelia/webpack.config.vendor.js | 56 - .../aurelia/wwwroot/favicon.ico | Bin 85432 -> 0 bytes .../knockout/.gitignore | 236 -- .../.template.config/dotnetcli.host.json | 17 - .../knockout/.template.config/icon.png | Bin 6109 -> 0 bytes .../knockout/.template.config/template.json | 87 - .../.template.config/vs-2017.3.host.json | 20 - .../knockout/ClientApp/boot.ts | 21 - .../components/app-root/app-root.html | 8 - .../ClientApp/components/app-root/app-root.ts | 44 - .../counter-example/counter-example.html | 7 - .../counter-example/counter-example.ts | 12 - .../components/fetch-data/fetch-data.html | 24 - .../components/fetch-data/fetch-data.ts | 23 - .../components/home-page/home-page.html | 16 - .../components/home-page/home-page.ts | 6 - .../components/nav-menu/nav-menu.html | 33 - .../ClientApp/components/nav-menu/nav-menu.ts | 21 - .../knockout/ClientApp/css/site.css | 66 - .../knockout/ClientApp/router.ts | 62 - .../ClientApp/webpack-component-loader.ts | 25 - .../knockout/Controllers/HomeController.cs | 23 - .../Controllers/SampleDataController.cs | 44 - .../knockout/KnockoutSpa.csproj | 57 - .../knockout/Program.cs | 25 - .../knockout/Startup.cs | 58 - .../knockout/Views/Home/Index.cshtml | 9 - .../knockout/Views/Shared/Error.cshtml | 21 - .../knockout/Views/Shared/_Layout.cshtml | 20 - .../knockout/Views/_ViewImports.cshtml | 3 - .../knockout/Views/_ViewStart.cshtml | 3 - .../knockout/appsettings.Development.json | 19 - .../knockout/appsettings.json | 15 - .../knockout/npm-shrinkwrap.json | 2491 ----------- .../knockout/package.json | 35 - .../knockout/tsconfig.json | 15 - .../knockout/webpack.config.js | 44 - .../knockout/webpack.config.vendor.js | 39 - .../knockout/wwwroot/favicon.ico | Bin 32038 -> 0 bytes .../vue/.gitignore | 239 -- .../vue/.template.config/dotnetcli.host.json | 17 - .../vue/.template.config/icon.png | Bin 1661 -> 0 bytes .../vue/.template.config/template.json | 87 - .../vue/.template.config/vs-2017.3.host.json | 20 - .../vue/ClientApp/boot.ts | 17 - .../vue/ClientApp/components/app/app.ts | 10 - .../vue/ClientApp/components/app/app.vue.html | 14 - .../ClientApp/components/counter/counter.ts | 11 - .../components/counter/counter.vue.html | 13 - .../components/fetchdata/fetchdata.ts | 22 - .../components/fetchdata/fetchdata.vue.html | 30 - .../ClientApp/components/home/home.vue.html | 19 - .../ClientApp/components/navmenu/navmenu.css | 59 - .../components/navmenu/navmenu.vue.html | 37 - .../vue/ClientApp/css/site.css | 6 - .../vue/Controllers/HomeController.cs | 23 - .../vue/Controllers/SampleDataController.cs | 44 - .../vue/Program.cs | 25 - .../vue/Startup.cs | 58 - .../vue/Views/Home/Index.cshtml | 9 - .../vue/Views/Shared/Error.cshtml | 21 - .../vue/Views/Shared/_Layout.cshtml | 20 - .../vue/Views/_ViewImports.cshtml | 3 - .../vue/Views/_ViewStart.cshtml | 3 - .../vue/VueSpa.csproj | 57 - .../vue/appsettings.Development.json | 19 - .../vue/appsettings.json | 15 - .../vue/npm-shrinkwrap.json | 2603 ------------ .../vue/package.json | 27 - .../vue/tsconfig.json | 17 - .../vue/webpack.config.js | 51 - .../vue/webpack.config.vendor.js | 49 - .../vue/wwwroot/favicon.ico | Bin 32038 -> 0 bytes ...oft.DotNet.Web.Spa.ProjectTemplates.nuspec | 23 - .../angular/.gitignore | 237 -- .../.template.config/dotnetcli.host.json | 17 - .../angular/.template.config/icon.png | Bin 1833 -> 0 bytes .../angular/.template.config/template.json | 87 - .../.template.config/vs-2017.3.host.json | 20 - .../angular/AngularSpa.csproj | 62 - .../ClientApp/app/app.browser.module.ts | 21 - .../ClientApp/app/app.server.module.ts | 14 - .../ClientApp/app/app.shared.module.ts | 35 - .../app/components/app/app.component.css | 6 - .../app/components/app/app.component.html | 10 - .../app/components/app/app.component.ts | 9 - .../components/counter/counter.component.html | 7 - .../counter/counter.component.spec.ts | 29 - .../components/counter/counter.component.ts | 13 - .../fetchdata/fetchdata.component.html | 24 - .../fetchdata/fetchdata.component.ts | 23 - .../app/components/home/home.component.html | 16 - .../app/components/home/home.component.ts | 8 - .../components/navmenu/navmenu.component.css | 59 - .../components/navmenu/navmenu.component.html | 33 - .../components/navmenu/navmenu.component.ts | 9 - .../angular/ClientApp/boot.browser.ts | 23 - .../angular/ClientApp/boot.server.ts | 38 - .../angular/ClientApp/test/boot-tests.ts | 33 - .../angular/ClientApp/test/karma.conf.js | 26 - .../angular/Controllers/HomeController.cs | 23 - .../Controllers/SampleDataController.cs | 44 - .../angular/Program.cs | 25 - .../angular/Startup.cs | 58 - .../angular/Views/Home/Index.cshtml | 10 - .../angular/Views/Shared/Error.cshtml | 21 - .../angular/Views/Shared/_Layout.cshtml | 16 - .../angular/Views/_ViewImports.cshtml | 3 - .../angular/Views/_ViewStart.cshtml | 3 - .../angular/appsettings.Development.json | 19 - .../angular/appsettings.json | 15 - .../angular/npm-shrinkwrap.json | 3730 ----------------- .../angular/package.json | 62 - .../angular/tsconfig.json | 17 - .../angular/webpack.config.js | 84 - .../angular/webpack.config.vendor.js | 94 - .../angular/wwwroot/favicon.ico | Bin 32038 -> 0 bytes .../react/.gitignore | 236 -- .../.template.config/dotnetcli.host.json | 17 - .../react/.template.config/icon.png | Bin 2431 -> 0 bytes .../react/.template.config/template.json | 87 - .../.template.config/vs-2017.3.host.json | 20 - .../react/ClientApp/boot.tsx | 30 - .../react/ClientApp/components/Counter.tsx | 31 - .../react/ClientApp/components/FetchData.tsx | 63 - .../react/ClientApp/components/Home.tsx | 29 - .../react/ClientApp/components/Layout.tsx | 21 - .../react/ClientApp/components/NavMenu.tsx | 40 - .../react/ClientApp/css/site.css | 66 - .../react/ClientApp/routes.tsx | 12 - .../react/Controllers/HomeController.cs | 23 - .../react/Controllers/SampleDataController.cs | 44 - .../react/Program.cs | 25 - .../react/ReactSpa.csproj | 57 - .../react/Startup.cs | 59 - .../react/Views/Home/Index.cshtml | 9 - .../react/Views/Shared/Error.cshtml | 21 - .../react/Views/Shared/_Layout.cshtml | 20 - .../react/Views/_ViewImports.cshtml | 3 - .../react/Views/_ViewStart.cshtml | 3 - .../react/appsettings.Development.json | 19 - .../react/appsettings.json | 15 - .../react/npm-shrinkwrap.json | 3377 --------------- .../react/package.json | 34 - .../react/tsconfig.json | 17 - .../react/webpack.config.js | 43 - .../react/webpack.config.vendor.js | 42 - .../react/wwwroot/favicon.ico | Bin 32038 -> 0 bytes .../redux/.gitignore | 237 -- .../.template.config/dotnetcli.host.json | 17 - .../redux/.template.config/icon.png | Bin 2876 -> 0 bytes .../redux/.template.config/template.json | 87 - .../.template.config/vs-2017.3.host.json | 20 - .../redux/ClientApp/boot-client.tsx | 43 - .../redux/ClientApp/boot-server.tsx | 45 - .../redux/ClientApp/components/Counter.tsx | 31 - .../redux/ClientApp/components/FetchData.tsx | 73 - .../redux/ClientApp/components/Home.tsx | 25 - .../redux/ClientApp/components/Layout.tsx | 17 - .../redux/ClientApp/components/NavMenu.tsx | 40 - .../redux/ClientApp/configureStore.ts | 35 - .../redux/ClientApp/css/site.css | 66 - .../redux/ClientApp/routes.tsx | 12 - .../redux/ClientApp/store/Counter.ts | 48 - .../redux/ClientApp/store/WeatherForecasts.ts | 91 - .../redux/ClientApp/store/index.ts | 22 - .../redux/Controllers/HomeController.cs | 23 - .../redux/Controllers/SampleDataController.cs | 44 - .../redux/Program.cs | 25 - .../redux/ReactReduxSpa.csproj | 62 - .../redux/Startup.cs | 59 - .../redux/Views/Home/Index.cshtml | 9 - .../redux/Views/Shared/Error.cshtml | 21 - .../redux/Views/Shared/_Layout.cshtml | 18 - .../redux/Views/_ViewImports.cshtml | 3 - .../redux/Views/_ViewStart.cshtml | 3 - .../redux/appsettings.Development.json | 19 - .../redux/appsettings.json | 15 - .../redux/npm-shrinkwrap.json | 2921 ------------- .../redux/package.json | 44 - .../redux/tsconfig.json | 19 - .../redux/webpack.config.js | 76 - .../redux/webpack.config.vendor.js | 87 - .../redux/wwwroot/favicon.ico | Bin 32038 -> 0 bytes templates/WhereHaveTheTemplatesGone.md | 11 + templates/package-builder/.gitignore | 4 - templates/package-builder/README.md | 5 - templates/package-builder/bin/NuGet.exe | Bin 4589784 -> 0 bytes templates/package-builder/package.json | 20 - templates/package-builder/src/build/build.ts | 42 - .../package-builder/src/yeoman/.gitignore | 1 - .../package-builder/src/yeoman/README.md | 15 - .../package-builder/src/yeoman/app/index.js | 15 - .../package-builder/src/yeoman/package.json | 26 - templates/package-builder/tsconfig.json | 14 - .../gitignore-parser/gitignore-parser.d.ts | 3 - .../typings/npm-which/npm-which.d.ts | 8 - test/.gitignore | 3 - test/package.json | 33 - test/start-selenium.js | 30 - test/templates/angular.spec.ts | 103 - test/templates/util/aspnet.ts | 127 - test/templates/util/dotnetnew.ts | 63 - test/templates/util/ports.ts | 24 - test/templates/util/webdriverio.ts | 12 - test/tsconfig.json | 15 - test/wdio.conf.js | 204 - 245 files changed, 12 insertions(+), 25700 deletions(-) delete mode 100644 templates/Directory.Build.props delete mode 100644 templates/Directory.Build.targets delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/Microsoft.AspNetCore.SpaTemplates.nuspec delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/aurelia/.gitignore delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/aurelia/.template.config/dotnetcli.host.json delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/aurelia/.template.config/icon.png delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/aurelia/.template.config/template.json delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/aurelia/.template.config/vs-2017.3.host.json delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/aurelia/AureliaSpa.csproj delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/app/app.css delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/app/app.html delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/app/app.ts delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/counter/counter.html delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/counter/counter.ts delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/fetchdata/fetchdata.html delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/fetchdata/fetchdata.ts delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/home/home.html delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/home/home.ts delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/navmenu/navmenu.css delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/navmenu/navmenu.html delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/boot.ts delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Controllers/HomeController.cs delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Controllers/SampleDataController.cs delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Program.cs delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Startup.cs delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Views/Home/Index.cshtml delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Views/Shared/Error.cshtml delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Views/Shared/_Layout.cshtml delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Views/_ViewImports.cshtml delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Views/_ViewStart.cshtml delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/aurelia/appsettings.Development.json delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/aurelia/appsettings.json delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/aurelia/npm-shrinkwrap.json delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/aurelia/package.json delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/aurelia/tsconfig.json delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/aurelia/webpack.config.js delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/aurelia/webpack.config.vendor.js delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/aurelia/wwwroot/favicon.ico delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/knockout/.gitignore delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/knockout/.template.config/dotnetcli.host.json delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/knockout/.template.config/icon.png delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/knockout/.template.config/template.json delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/knockout/.template.config/vs-2017.3.host.json delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/boot.ts delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/app-root/app-root.html delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/app-root/app-root.ts delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/counter-example/counter-example.html delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/counter-example/counter-example.ts delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/fetch-data/fetch-data.html delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/fetch-data/fetch-data.ts delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/home-page/home-page.html delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/home-page/home-page.ts delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/nav-menu/nav-menu.html delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/nav-menu/nav-menu.ts delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/css/site.css delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/router.ts delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/webpack-component-loader.ts delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/knockout/Controllers/HomeController.cs delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/knockout/Controllers/SampleDataController.cs delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/knockout/KnockoutSpa.csproj delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/knockout/Program.cs delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/knockout/Startup.cs delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/knockout/Views/Home/Index.cshtml delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/knockout/Views/Shared/Error.cshtml delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/knockout/Views/Shared/_Layout.cshtml delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/knockout/Views/_ViewImports.cshtml delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/knockout/Views/_ViewStart.cshtml delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/knockout/appsettings.Development.json delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/knockout/appsettings.json delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/knockout/npm-shrinkwrap.json delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/knockout/package.json delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/knockout/tsconfig.json delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/knockout/webpack.config.js delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/knockout/webpack.config.vendor.js delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/knockout/wwwroot/favicon.ico delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/vue/.gitignore delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/vue/.template.config/dotnetcli.host.json delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/vue/.template.config/icon.png delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/vue/.template.config/template.json delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/vue/.template.config/vs-2017.3.host.json delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/boot.ts delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/app/app.ts delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/app/app.vue.html delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/counter/counter.ts delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/counter/counter.vue.html delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/fetchdata/fetchdata.ts delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/fetchdata/fetchdata.vue.html delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/home/home.vue.html delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/navmenu/navmenu.css delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/navmenu/navmenu.vue.html delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/css/site.css delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/vue/Controllers/HomeController.cs delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/vue/Controllers/SampleDataController.cs delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/vue/Program.cs delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/vue/Startup.cs delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/vue/Views/Home/Index.cshtml delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/vue/Views/Shared/Error.cshtml delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/vue/Views/Shared/_Layout.cshtml delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/vue/Views/_ViewImports.cshtml delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/vue/Views/_ViewStart.cshtml delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/vue/VueSpa.csproj delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/vue/appsettings.Development.json delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/vue/appsettings.json delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/vue/npm-shrinkwrap.json delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/vue/package.json delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/vue/tsconfig.json delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/vue/webpack.config.js delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/vue/webpack.config.vendor.js delete mode 100644 templates/Microsoft.AspNetCore.SpaTemplates/vue/wwwroot/favicon.ico delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.nuspec delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/.gitignore delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/.template.config/dotnetcli.host.json delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/.template.config/icon.png delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/.template.config/template.json delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/.template.config/vs-2017.3.host.json delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/AngularSpa.csproj delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/app.browser.module.ts delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/app.server.module.ts delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/app.shared.module.ts delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/app/app.component.css delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/app/app.component.html delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/app/app.component.ts delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/counter/counter.component.html delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/counter/counter.component.spec.ts delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/counter/counter.component.ts delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/fetchdata/fetchdata.component.html delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/fetchdata/fetchdata.component.ts delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/home/home.component.html delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/home/home.component.ts delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/navmenu/navmenu.component.css delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/navmenu/navmenu.component.html delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/navmenu/navmenu.component.ts delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/boot.browser.ts delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/boot.server.ts delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/test/boot-tests.ts delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/test/karma.conf.js delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/Controllers/HomeController.cs delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/Controllers/SampleDataController.cs delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/Program.cs delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/Startup.cs delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/Views/Home/Index.cshtml delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/Views/Shared/Error.cshtml delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/Views/Shared/_Layout.cshtml delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/Views/_ViewImports.cshtml delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/Views/_ViewStart.cshtml delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/appsettings.Development.json delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/appsettings.json delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/npm-shrinkwrap.json delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/package.json delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/tsconfig.json delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/webpack.config.js delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/webpack.config.vendor.js delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/wwwroot/favicon.ico delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/.gitignore delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/.template.config/dotnetcli.host.json delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/.template.config/icon.png delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/.template.config/template.json delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/.template.config/vs-2017.3.host.json delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/ClientApp/boot.tsx delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/ClientApp/components/Counter.tsx delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/ClientApp/components/FetchData.tsx delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/ClientApp/components/Home.tsx delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/ClientApp/components/Layout.tsx delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/ClientApp/components/NavMenu.tsx delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/ClientApp/css/site.css delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/ClientApp/routes.tsx delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/Controllers/HomeController.cs delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/Controllers/SampleDataController.cs delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/Program.cs delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/ReactSpa.csproj delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/Startup.cs delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/Views/Home/Index.cshtml delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/Views/Shared/Error.cshtml delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/Views/Shared/_Layout.cshtml delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/Views/_ViewImports.cshtml delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/Views/_ViewStart.cshtml delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/appsettings.Development.json delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/appsettings.json delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/npm-shrinkwrap.json delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/package.json delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/tsconfig.json delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/webpack.config.js delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/webpack.config.vendor.js delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/wwwroot/favicon.ico delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/.gitignore delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/.template.config/dotnetcli.host.json delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/.template.config/icon.png delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/.template.config/template.json delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/.template.config/vs-2017.3.host.json delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/boot-client.tsx delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/boot-server.tsx delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/components/Counter.tsx delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/components/FetchData.tsx delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/components/Home.tsx delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/components/Layout.tsx delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/components/NavMenu.tsx delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/configureStore.ts delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/css/site.css delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/routes.tsx delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/store/Counter.ts delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/store/WeatherForecasts.ts delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/store/index.ts delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/Controllers/HomeController.cs delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/Controllers/SampleDataController.cs delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/Program.cs delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ReactReduxSpa.csproj delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/Startup.cs delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/Views/Home/Index.cshtml delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/Views/Shared/Error.cshtml delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/Views/Shared/_Layout.cshtml delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/Views/_ViewImports.cshtml delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/Views/_ViewStart.cshtml delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/appsettings.Development.json delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/appsettings.json delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/npm-shrinkwrap.json delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/package.json delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/tsconfig.json delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/webpack.config.js delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/webpack.config.vendor.js delete mode 100644 templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/wwwroot/favicon.ico create mode 100644 templates/WhereHaveTheTemplatesGone.md delete mode 100644 templates/package-builder/.gitignore delete mode 100644 templates/package-builder/README.md delete mode 100644 templates/package-builder/bin/NuGet.exe delete mode 100644 templates/package-builder/package.json delete mode 100644 templates/package-builder/src/build/build.ts delete mode 100644 templates/package-builder/src/yeoman/.gitignore delete mode 100644 templates/package-builder/src/yeoman/README.md delete mode 100644 templates/package-builder/src/yeoman/app/index.js delete mode 100644 templates/package-builder/src/yeoman/package.json delete mode 100644 templates/package-builder/tsconfig.json delete mode 100644 templates/package-builder/typings/gitignore-parser/gitignore-parser.d.ts delete mode 100644 templates/package-builder/typings/npm-which/npm-which.d.ts delete mode 100644 test/.gitignore delete mode 100644 test/package.json delete mode 100644 test/start-selenium.js delete mode 100644 test/templates/angular.spec.ts delete mode 100644 test/templates/util/aspnet.ts delete mode 100644 test/templates/util/dotnetnew.ts delete mode 100644 test/templates/util/ports.ts delete mode 100644 test/templates/util/webdriverio.ts delete mode 100644 test/tsconfig.json delete mode 100644 test/wdio.conf.js diff --git a/.appveyor.yml b/.appveyor.yml index 3813cea8..890f62a2 100755 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -11,32 +11,9 @@ install: - ps: (New-Object System.Net.WebClient).DownloadFile($urlCurrent, $tempFileCurrent) - ps: Add-Type -AssemblyName System.IO.Compression.FileSystem; [System.IO.Compression.ZipFile]::ExtractToDirectory($tempFileCurrent, $env:DOTNET_INSTALL_DIR) - ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path" -build_script: - - ps: Push-Location - - cd templates/package-builder - - npm install - - npm run build - - ps: Pop-Location -artifacts: - - path: templates\package-builder\artifacts\*.nupkg - name: Microsoft.AspNetCore.SpaTemplates - type: NuGetPackage -# - ps: .\build.ps1 clone_depth: 1 environment: global: DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true DOTNET_CLI_TELEMETRY_OPTOUT: 1 -test_script: - - dotnet restore - - ps: Push-Location - - cd test - - npm install selenium-standalone - - ps: Start-Process node './start-selenium.js' - - npm install - - npm test -on_finish : - - ps: Pop-Location - # After running tests, upload results to Appveyor - - ps: (new-object net.webclient).UploadFile("https://ci.appveyor.com/api/testresults/junit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path .\test\tmp\junit\*.xml)) deploy: off diff --git a/JavaScriptServices.sln b/JavaScriptServices.sln index 04461b41..8f605451 100644 --- a/JavaScriptServices.sln +++ b/JavaScriptServices.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26730.10 +VisualStudioVersion = 15.0.26730.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{27304DDE-AFB2-4F8B-B765-E3E2F11E886C}" ProjectSection(SolutionItems) = preProject @@ -31,8 +31,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Webpack", "samples\misc\Web EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NodeServicesExamples", "samples\misc\NodeServicesExamples\NodeServicesExamples.csproj", "{93EFCC5F-C6EE-4623-894F-A42B22C0B6FE}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "templates", "templates", "{1598B415-73F1-4B37-B3B4-0A10677ABB2D}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{645F7363-1240-4FB6-9422-B32A327C979F}" ProjectSection(SolutionItems) = preProject Directory.Build.props = Directory.Build.props diff --git a/templates/Directory.Build.props b/templates/Directory.Build.props deleted file mode 100644 index 141834c2..00000000 --- a/templates/Directory.Build.props +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/templates/Directory.Build.targets b/templates/Directory.Build.targets deleted file mode 100644 index 141834c2..00000000 --- a/templates/Directory.Build.targets +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Microsoft.AspNetCore.SpaTemplates.nuspec b/templates/Microsoft.AspNetCore.SpaTemplates/Microsoft.AspNetCore.SpaTemplates.nuspec deleted file mode 100644 index 1d2178fe..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/Microsoft.AspNetCore.SpaTemplates.nuspec +++ /dev/null @@ -1,23 +0,0 @@ - - - - Microsoft.AspNetCore.SpaTemplates - 0.0.0 - Single Page Application templates for ASP.NET Core - Microsoft - en-US - https://github.com/aspnet/javascriptservices - https://www.microsoft.com/web/webpi/eula/net_library_eula_enu.htm - Copyright © Microsoft Corporation - true - - - - - - - - diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/.gitignore b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/.gitignore deleted file mode 100644 index c8274b5f..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/.gitignore +++ /dev/null @@ -1,237 +0,0 @@ -/Properties/launchSettings.json - -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. - -# User-specific files -*.suo -*.user -*.userosscache -*.sln.docstates - -# User-specific files (MonoDevelop/Xamarin Studio) -*.userprefs - -# Build results -[Dd]ebug/ -[Dd]ebugPublic/ -[Rr]elease/ -[Rr]eleases/ -x64/ -x86/ -build/ -bld/ -bin/ -Bin/ -obj/ -Obj/ - -# Visual Studio 2015 cache/options directory -.vs/ -/wwwroot/dist/ -/ClientApp/dist/ - -/yarn.lock - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* - -# NUNIT -*.VisualState.xml -TestResult.xml - -# Build Results of an ATL Project -[Dd]ebugPS/ -[Rr]eleasePS/ -dlldata.c - -*_i.c -*_p.c -*_i.h -*.ilk -*.meta -*.obj -*.pch -*.pdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*.log -*.vspscc -*.vssscc -.builds -*.pidb -*.svclog -*.scc - -# Chutzpah Test files -_Chutzpah* - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opendb -*.opensdf -*.sdf -*.cachefile - -# Visual Studio profiler -*.psess -*.vsp -*.vspx -*.sap - -# TFS 2012 Local Workspace -$tf/ - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper -*.DotSettings.user - -# JustCode is a .NET coding add-in -.JustCode - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# NCrunch -_NCrunch_* -.*crunch*.local.xml -nCrunchTemp_* - -# MightyMoose -*.mm.* -AutoTest.Net/ - -# Web workbench (sass) -.sass-cache/ - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ - -# Publish Web Output -*.[Pp]ublish.xml -*.azurePubxml -# TODO: Comment the next line if you want to checkin your web deploy settings -# but database connection strings (with potential passwords) will be unencrypted -*.pubxml -*.publishproj - -# NuGet Packages -*.nupkg -# The packages folder can be ignored because of Package Restore -**/packages/* -# except build/, which is used as an MSBuild target. -!**/packages/build/ -# Uncomment if necessary however generally it will be regenerated when needed -#!**/packages/repositories.config - -# Microsoft Azure Build Output -csx/ -*.build.csdef - -# Microsoft Azure Emulator -ecf/ -rcf/ - -# Microsoft Azure ApplicationInsights config file -ApplicationInsights.config - -# Windows Store app package directory -AppPackages/ -BundleArtifacts/ - -# Visual Studio cache files -# files ending in .cache can be ignored -*.[Cc]ache -# but keep track of directories ending in .cache -!*.[Cc]ache/ - -# Others -ClientBin/ -~$* -*~ -*.dbmdl -*.dbproj.schemaview -*.pfx -*.publishsettings -orleans.codegen.cs - -/node_modules - -# RIA/Silverlight projects -Generated_Code/ - -# Backup & report files from converting an old project file -# to a newer Visual Studio version. Backup files are not needed, -# because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML -UpgradeLog*.htm - -# SQL Server files -*.mdf -*.ldf - -# Business Intelligence projects -*.rdl.data -*.bim.layout -*.bim_*.settings - -# Microsoft Fakes -FakesAssemblies/ - -# GhostDoc plugin setting file -*.GhostDoc.xml - -# Node.js Tools for Visual Studio -.ntvs_analysis.dat - -# Visual Studio 6 build log -*.plg - -# Visual Studio 6 workspace options file -*.opt - -# Visual Studio LightSwitch build output -**/*.HTMLClient/GeneratedArtifacts -**/*.DesktopClient/GeneratedArtifacts -**/*.DesktopClient/ModelManifest.xml -**/*.Server/GeneratedArtifacts -**/*.Server/ModelManifest.xml -_Pvt_Extensions - -# Paket dependency manager -.paket/paket.exe - -# FAKE - F# Make -.fake/ diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/.template.config/dotnetcli.host.json b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/.template.config/dotnetcli.host.json deleted file mode 100644 index c15c6681..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/.template.config/dotnetcli.host.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "$schema": "http://json.schemastore.org/dotnetcli.host", - "symbolInfo": { - "TargetFrameworkOverride": { - "isHidden": "true", - "longName": "target-framework-override", - "shortName": "" - }, - "Framework": { - "longName": "framework" - }, - "skipRestore": { - "longName": "no-restore", - "shortName": "" - } - } -} \ No newline at end of file diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/.template.config/icon.png b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/.template.config/icon.png deleted file mode 100644 index 5a82b498eb54df3edf098fc06467ccb1cb6a0d1a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2355 zcmV-33C#A1P)=USqXWvk^)o!oP?ut15JXtCTx zma&Dun`f`+I+5u^m*P&InP;%)VW;0Yl-e_odQzS2N}J+7mW*Yot8=-WZ?e`bi@tHY zjApIVB#G)voa;D|q%?rqCW+ZLlb2_$v2VAEVyKvGu-ht&u^)NfJCu!EqoHW9-a3<; zV64|Ah=p6FvTnHHG>@EMt>-q7;3|r;Hihdnj&4Gf;XIYqAcp8Pj-O(#uOWKgDvHt` zh37ev?Kh99WU<^aj(AX;ie9MdJd)ijjJ9jIn`N$vU8d6@hUqzxg;%BNEQ-5mx0NAs z=RA|tB8Qn{t=S)ivS+nnoLs}yskWwF^GgxMg5iBq6? zTB6V!gsT&BpJ1)#D2RwxqtX?CoL;M$CwAW`iq@JIu9B$ASf!ZB|c~PI0U#pK9Y^e}%g!k-5`aKS*Onsex6^f=q88aB!|@*gMLw>*cXA|A%^TLiQOH9id&}A6n?5@ zvZ)bqksfc}9)#i|h1eN_+8cu4AcfW!f#f8H+#Q3{6@cd^hua*3=_rWZ9fQ#lf9olT z&k%o&7HZNIf2R#^<|c=6NS5d)h=@_2o?)(uSf$?|h1nW{m0hZ(WU&euYq;k6Wm3N0otAqL^Q-rweX{R-|`O zpM_JQkXxvp7H_i=bGH_EdQF>{UaO;Hu(oTrkQQsk6?=P8pX4Hihftp9C5DU?X{Zfv z%@%&i8hhO#gsWz=s19(~9)W;SpEY37YybcNv2;>SQvd-21_lWU4Gj?z5)&6292_1Z zBqk;+FfubUIy^o>K|w=9L`zImR9RVDTV7vcWMyV)YjbvZd3kz#eSLp_e}IF9iI9?# zla!T}mzS5An3$fPsi~@~ud%YTw6wLhx3{>tySu!+zQ4b~!O6?a&d$!y(9qG+($&}4 z+1lFL-r(Wk;p61w<>lt*=;-L^>Few6?(XpM@$vEU^Yrxe^!4@j_xk$!`uqF){QUj? z{{BYU2Fm~d1wcteK~#9!rIvYER8<(p&z)i4cR|PvBSH|x1(7s_zzPFVDM+DcwE`(H zkOa(%Ot3OEAT?9af(VRNb{VE&fKYIN(b!}uWeJQ*t^Vqqb7#Bf4i_Hy{V_Aox$}PS zeeXHnITxsbTF3+QLDR2$?R@mM(cSggHglHiY{{;N#8S#3(`W5xuU{BlN8_P*AkJTp zzppWC`+^1;-|Epr`g?9b0%vPqsU#K;Z7A$Q6fT*CoWJE7gGbR|;#HbYDAm6@eaus% zk1l7DjzU=HG|_BV{!=fsyL*S40?8!=yOGVt(Oa0&rSgaBl+g`&m|bB}?#~1`#Jim| z$LN_b2(8Ctn6WDaloF&Hp%7B3w0RhQ1mW}<^)lX6Gl@wR1SkZxZE(1!XLxXM7XU^P z-SrCAGsG4+M1C!k3KT;7NDm}yB@ZmixUNF>0;OErr_Be4C?ZHjAr?dZUUOjVcfF25 zw5D8d{WhE@YxIPYT9}lDqU%8?+$dn1Qb$6EkWY3Z4pGLSWny3xxc)FIQRH`FIM^->9GSXBw69;d~DW3RCC=?Dn0S9*!RH`RJ zzQXm<4_$lIP?u#?+!jJkufq1zvRY*(?LYj&9DaFERYBVC{e$dZ)&m9sx#iOXyIy_| zf#c)jd*H&+JXlrLcwc5ufknyXoFvHf&IfKFoY9_G(|8Z3e?<@I`d;JKr@PYjPZf4y zK1U&ZvHhi0uvT&jH?Nz~yI$f|Ij^FAKMn2QG66ciGstE3z^CaK1x;(^rD zw>8xPu7b5a^(LmtO33=R%r`@I%`zqPu8lXG6|P2I3x zBEj|)FgsqsO@a;34Lm?ra2cBX583n9->>B)-wRMKaM^AkD})VYxdC7qQ(MGIoE0z( z>yvgpcwj*k(0;=d@E^}4%z>Hr>>5Dtgk(LnUk}gni?|uzbhfT$pRjCx#V}FY@odW+gD;5T!{i2QJnUC zp5rOnUa=7ykuP^=ewv2%IN106FR^`z5>|-KQ&nm?vl%ZvM`&MAqKXswb{?fpKJ}gr z(0?4Ax#4%n4NZrr@K7V03*LaTJ0#i=DwjF?84&r;-(3B13Fd>c58%f5}(a zeiXhtwXH!RiiqxPSxs&yX>xtMC4B2@Z5fHB<{dP(hoVJ z()T;tRk#^!q~>)$$_jq!9)<<7tU=i1siYA3CS_S|S`PjkWGB%0=69WZAcIyz25`?*7f1oPq7d@86J Z`yX78Fv2fUZ=V1F002ovPDHLkV1kW!in{;+ diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/.template.config/template.json b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/.template.config/template.json deleted file mode 100644 index 3b176af9..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/.template.config/template.json +++ /dev/null @@ -1,87 +0,0 @@ -{ - "author": "Microsoft", - "classifications": [ - "Web", - "MVC", - "SPA" - ], - "groupIdentity": "Microsoft.AspNetCore.SpaTemplates.Aurelia", - "identity": "Microsoft.AspNetCore.SpaTemplates.Aurelia.CSharp", - "name": "ASP.NET Core with Aurelia", - "preferNameDirectory": true, - "primaryOutputs": [ - { - "path": "AureliaSpa.csproj" - } - ], - "shortName": "aurelia", - "sourceName": "AureliaSpa", - "sources": [ - { - "source": "./", - "target": "./", - "exclude": [ - ".template.config/**" - ] - } - ], - "symbols": { - "TargetFrameworkOverride": { - "type": "parameter", - "description": "Overrides the target framework", - "replaces": "TargetFrameworkOverride", - "datatype": "string", - "defaultValue": "" - }, - "Framework": { - "type": "parameter", - "description": "The target framework for the project.", - "datatype": "choice", - "choices": [ - { - "choice": "netcoreapp2.0", - "description": "Target netcoreapp2.0" - } - ], - "replaces": "netcoreapp2.0", - "defaultValue": "netcoreapp2.0" - }, - "HostIdentifier": { - "type": "bind", - "binding": "HostIdentifier" - }, - "skipRestore": { - "type": "parameter", - "datatype": "bool", - "description": "If specified, skips the automatic restore of the project on create.", - "defaultValue": "false" - } - }, - "tags": { - "language": "C#", - "type": "project" - }, - "postActions": [ - { - "condition": "(!skipRestore)", - "description": "Restore NuGet packages required by this project.", - "manualInstructions": [ - { - "text": "Run 'dotnet restore'" - } - ], - "actionId": "210D431B-A78B-4D2F-B762-4ED3E3EA9025", - "continueOnError": true - }, - { - "condition": "(HostIdentifier == \"dotnetcli\" || HostIdentifier == \"dotnetcli-preview\")", - "actionId": "AC1156F7-BB77-4DB8-B28F-24EEBCCA1E5C", - "description": "\n\n-------------------------------------------------------------------\nIMPORTANT: Before running this project on the command line,\n you must restore NPM packages by running \"npm install\"\n-------------------------------------------------------------------\n", - "manualInstructions": [ - { - "text": "Run \"npm install\"" - } - ] - } - ] -} \ No newline at end of file diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/.template.config/vs-2017.3.host.json b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/.template.config/vs-2017.3.host.json deleted file mode 100644 index 18e8697a..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/.template.config/vs-2017.3.host.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "$schema": "http://json.schemastore.org/vs-2017.3.host", - "name": { - "text": "Aurelia", - "package": "{0CD94836-1526-4E85-87D3-FB5274C5AFC9}", - "id": "1200" - }, - "description": { - "text": "A project template for creating an ASP.NET Core application with Aurelia", - "package": "{0CD94836-1526-4E85-87D3-FB5274C5AFC9}", - "id": "1201" - }, - "order": 301, - "icon": "icon.png", - "learnMoreLink": "https://github.com/aspnet/JavaScriptServices", - "uiFilters": [ - "oneaspnet" - ], - "minFullFrameworkVersion": "4.6.1" -} \ No newline at end of file diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/AureliaSpa.csproj b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/AureliaSpa.csproj deleted file mode 100644 index eff4c62c..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/AureliaSpa.csproj +++ /dev/null @@ -1,57 +0,0 @@ - - - - netcoreapp2.0 - TargetFrameworkOverride - true - Latest - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - %(DistFiles.Identity) - PreserveNewest - - - - - \ No newline at end of file diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/app/app.css b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/app/app.css deleted file mode 100644 index 63926006..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/app/app.css +++ /dev/null @@ -1,6 +0,0 @@ -@media (max-width: 767px) { - /* On small screens, the nav menu spans the full width of the screen. Leave a space for it. */ - .body-content { - padding-top: 50px; - } -} diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/app/app.html b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/app/app.html deleted file mode 100644 index 27cae10e..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/app/app.html +++ /dev/null @@ -1,14 +0,0 @@ - diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/app/app.ts b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/app/app.ts deleted file mode 100644 index 1ff0e627..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/app/app.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { Aurelia, PLATFORM } from 'aurelia-framework'; -import { Router, RouterConfiguration } from 'aurelia-router'; - -export class App { - router: Router; - - configureRouter(config: RouterConfiguration, router: Router) { - config.title = 'Aurelia'; - config.map([{ - route: [ '', 'home' ], - name: 'home', - settings: { icon: 'home' }, - moduleId: PLATFORM.moduleName('../home/home'), - nav: true, - title: 'Home' - }, { - route: 'counter', - name: 'counter', - settings: { icon: 'education' }, - moduleId: PLATFORM.moduleName('../counter/counter'), - nav: true, - title: 'Counter' - }, { - route: 'fetch-data', - name: 'fetchdata', - settings: { icon: 'th-list' }, - moduleId: PLATFORM.moduleName('../fetchdata/fetchdata'), - nav: true, - title: 'Fetch data' - }]); - - this.router = router; - } -} diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/counter/counter.html b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/counter/counter.html deleted file mode 100644 index 7636a4f1..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/counter/counter.html +++ /dev/null @@ -1,9 +0,0 @@ - diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/counter/counter.ts b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/counter/counter.ts deleted file mode 100644 index 3217c449..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/counter/counter.ts +++ /dev/null @@ -1,7 +0,0 @@ -export class Counter { - public currentCount = 0; - - public incrementCounter() { - this.currentCount++; - } -} diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/fetchdata/fetchdata.html b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/fetchdata/fetchdata.html deleted file mode 100644 index bd06c35d..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/fetchdata/fetchdata.html +++ /dev/null @@ -1,26 +0,0 @@ - diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/fetchdata/fetchdata.ts b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/fetchdata/fetchdata.ts deleted file mode 100644 index 6cd72ac1..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/fetchdata/fetchdata.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { HttpClient } from 'aurelia-fetch-client'; -import { inject } from 'aurelia-framework'; - -@inject(HttpClient) -export class Fetchdata { - public forecasts: WeatherForecast[]; - - constructor(http: HttpClient) { - http.fetch('http://github.com/api/SampleData/WeatherForecasts') - .then(result => result.json() as Promise) - .then(data => { - this.forecasts = data; - }); - } -} - -interface WeatherForecast { - dateFormatted: string; - temperatureC: number; - temperatureF: number; - summary: string; -} diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/home/home.html b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/home/home.html deleted file mode 100644 index 50437ca2..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/home/home.html +++ /dev/null @@ -1,16 +0,0 @@ - diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/home/home.ts b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/home/home.ts deleted file mode 100644 index 737d6cc2..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/home/home.ts +++ /dev/null @@ -1,2 +0,0 @@ -export class Home { -} diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/navmenu/navmenu.css b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/navmenu/navmenu.css deleted file mode 100644 index 8518eda3..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/navmenu/navmenu.css +++ /dev/null @@ -1,59 +0,0 @@ -li .glyphicon { - margin-right: 10px; -} - -/* Highlighting rules for nav menu items */ -li.au-target.link-active a, -li.au-target.link-active a:hover, -li.au-target.link-active a:focus { - background-color: #4189C7; - color: white; -} - -/* Keep the nav menu independent of scrolling and on top of other items */ -.main-nav { - position: fixed; - top: 0; - left: 0; - right: 0; - z-index: 1; -} - -@media (min-width: 768px) { - /* On small screens, convert the nav menu to a vertical sidebar */ - .main-nav { - height: 100%; - width: calc(25% - 20px); - } - .navbar { - border-radius: 0px; - border-width: 0px; - height: 100%; - } - .navbar-header { - float: none; - } - .navbar-collapse { - border-top: 1px solid #444; - padding: 0px; - } - .navbar ul { - float: none; - } - .navbar li { - float: none; - font-size: 15px; - margin: 6px; - } - .navbar li a { - padding: 10px 16px; - border-radius: 4px; - } - .navbar a { - /* If a menu item's text is too long, truncate it */ - width: 100%; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - } -} diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/navmenu/navmenu.html b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/navmenu/navmenu.html deleted file mode 100644 index 1661aa62..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/navmenu/navmenu.html +++ /dev/null @@ -1,26 +0,0 @@ - diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/boot.ts b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/boot.ts deleted file mode 100644 index 053b9c31..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/boot.ts +++ /dev/null @@ -1,21 +0,0 @@ -import 'isomorphic-fetch'; -import { Aurelia, PLATFORM } from 'aurelia-framework'; -import { HttpClient } from 'aurelia-fetch-client'; -import 'bootstrap/dist/css/bootstrap.css'; -import 'bootstrap'; -declare const IS_DEV_BUILD: boolean; // The value is supplied by Webpack during the build - -export function configure(aurelia: Aurelia) { - aurelia.use.standardConfiguration(); - - if (IS_DEV_BUILD) { - aurelia.use.developmentLogging(); - } - - new HttpClient().configure(config => { - const baseUrl = document.getElementsByTagName('base')[0].href; - config.withBaseUrl(baseUrl); - }); - - aurelia.start().then(() => aurelia.setRoot(PLATFORM.moduleName('app/components/app/app'))); -} diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Controllers/HomeController.cs b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Controllers/HomeController.cs deleted file mode 100644 index 18346598..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Controllers/HomeController.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Mvc; - -namespace AureliaSpa.Controllers -{ - public class HomeController : Controller - { - public IActionResult Index() - { - return View(); - } - - public IActionResult Error() - { - ViewData["RequestId"] = Activity.Current?.Id ?? HttpContext.TraceIdentifier; - return View(); - } - } -} diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Controllers/SampleDataController.cs b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Controllers/SampleDataController.cs deleted file mode 100644 index 6705a682..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Controllers/SampleDataController.cs +++ /dev/null @@ -1,44 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Mvc; - -namespace AureliaSpa.Controllers -{ - [Route("api/[controller]")] - public class SampleDataController : Controller - { - private static string[] Summaries = new[] - { - "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching" - }; - - [HttpGet("[action]")] - public IEnumerable WeatherForecasts() - { - var rng = new Random(); - return Enumerable.Range(1, 5).Select(index => new WeatherForecast - { - DateFormatted = DateTime.Now.AddDays(index).ToString("d"), - TemperatureC = rng.Next(-20, 55), - Summary = Summaries[rng.Next(Summaries.Length)] - }); - } - - public class WeatherForecast - { - public string DateFormatted { get; set; } - public int TemperatureC { get; set; } - public string Summary { get; set; } - - public int TemperatureF - { - get - { - return 32 + (int)(this.TemperatureC / 0.5556); - } - } - } - } -} diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Program.cs b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Program.cs deleted file mode 100644 index 0b628556..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Program.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.Logging; - -namespace AureliaSpa -{ - public class Program - { - public static void Main(string[] args) - { - BuildWebHost(args).Run(); - } - - public static IWebHost BuildWebHost(string[] args) => - WebHost.CreateDefaultBuilder(args) - .UseStartup() - .Build(); - } -} diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Startup.cs b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Startup.cs deleted file mode 100644 index 4a96590e..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Startup.cs +++ /dev/null @@ -1,58 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.SpaServices.Webpack; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; - -namespace AureliaSpa -{ - public class Startup - { - public Startup(IConfiguration configuration) - { - Configuration = configuration; - } - - public IConfiguration Configuration { get; } - - // This method gets called by the runtime. Use this method to add services to the container. - public void ConfigureServices(IServiceCollection services) - { - services.AddMvc(); - } - - // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IHostingEnvironment env) - { - if (env.IsDevelopment()) - { - app.UseDeveloperExceptionPage(); - app.UseWebpackDevMiddleware(new WebpackDevMiddlewareOptions - { - HotModuleReplacement = true - }); - } - else - { - app.UseExceptionHandler("/Home/Error"); - } - - app.UseStaticFiles(); - - app.UseMvc(routes => - { - routes.MapRoute( - name: "default", - template: "{controller=Home}/{action=Index}/{id?}"); - - routes.MapSpaFallbackRoute( - name: "spa-fallback", - defaults: new { controller = "Home", action = "Index" }); - }); - } - } -} diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Views/Home/Index.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Views/Home/Index.cshtml deleted file mode 100644 index f6b17914..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Views/Home/Index.cshtml +++ /dev/null @@ -1,10 +0,0 @@ -@{ - ViewData["Title"] = "Home Page"; -} - -
    Loading...
    - -@section scripts { - - -} diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Views/Shared/Error.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Views/Shared/Error.cshtml deleted file mode 100644 index 78e35d5d..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Views/Shared/Error.cshtml +++ /dev/null @@ -1,21 +0,0 @@ -@{ - ViewData["Title"] = "Error"; -} - -

    Error.

    -

    An error occurred while processing your request.

    - -@if (!string.IsNullOrEmpty((string)ViewData["RequestId"])) -{ -

    - Request ID: @ViewData["RequestId"] -

    -} - -

    Development Mode

    -

    - Swapping to Development environment will display more detailed information about the error that occurred. -

    -

    - Development environment should not be enabled in deployed applications, as it can result in sensitive information from exceptions being displayed to end users. For local debugging, development environment can be enabled by setting the ASPNETCORE_ENVIRONMENT environment variable to Development, and restarting the application. -

    diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Views/Shared/_Layout.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Views/Shared/_Layout.cshtml deleted file mode 100644 index 4e0019c4..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Views/Shared/_Layout.cshtml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - @ViewData["Title"] - AureliaSpa - - - - - - @RenderBody() - - @RenderSection("scripts", required: false) - - diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Views/_ViewImports.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Views/_ViewImports.cshtml deleted file mode 100644 index 4542402d..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Views/_ViewImports.cshtml +++ /dev/null @@ -1,3 +0,0 @@ -@using AureliaSpa -@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers -@addTagHelper *, Microsoft.AspNetCore.SpaServices diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Views/_ViewStart.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Views/_ViewStart.cshtml deleted file mode 100644 index 820a2f6e..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Views/_ViewStart.cshtml +++ /dev/null @@ -1,3 +0,0 @@ -@{ - Layout = "_Layout"; -} diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/appsettings.Development.json b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/appsettings.Development.json deleted file mode 100644 index 457e0033..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/appsettings.Development.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "Logging": { - "IncludeScopes": false, - "Debug": { - "LogLevel": { - "Default": "Debug", - "System": "Information", - "Microsoft": "Information" - } - }, - "Console": { - "LogLevel": { - "Default": "Debug", - "System": "Information", - "Microsoft": "Information" - } - } - } -} diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/appsettings.json b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/appsettings.json deleted file mode 100644 index c851e129..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/appsettings.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "Logging": { - "IncludeScopes": false, - "Debug": { - "LogLevel": { - "Default": "Warning" - } - }, - "Console": { - "LogLevel": { - "Default": "Warning" - } - } - } -} diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/npm-shrinkwrap.json b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/npm-shrinkwrap.json deleted file mode 100644 index de9bb136..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/npm-shrinkwrap.json +++ /dev/null @@ -1,2615 +0,0 @@ -{ - "name": "AureliaSpa", - "version": "0.0.0", - "dependencies": { - "@types/webpack-env": { - "version": "1.13.0", - "from": "@types/webpack-env@>=1.13.0 <2.0.0", - "resolved": "https://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.13.0.tgz", - "dev": true - }, - "acorn": { - "version": "5.0.3", - "from": "acorn@>=5.0.0 <6.0.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.0.3.tgz", - "dev": true - }, - "acorn-dynamic-import": { - "version": "2.0.2", - "from": "acorn-dynamic-import@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz", - "dev": true, - "dependencies": { - "acorn": { - "version": "4.0.13", - "from": "acorn@>=4.0.3 <5.0.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz", - "dev": true - } - } - }, - "ajv": { - "version": "5.2.0", - "from": "ajv@>=5.0.0 <6.0.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.0.tgz", - "dev": true - }, - "ajv-keywords": { - "version": "1.5.1", - "from": "ajv-keywords@>=1.1.1 <2.0.0", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.1.tgz", - "dev": true - }, - "align-text": { - "version": "0.1.4", - "from": "align-text@>=0.1.3 <0.2.0", - "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", - "dev": true - }, - "alphanum-sort": { - "version": "1.0.2", - "from": "alphanum-sort@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz", - "dev": true - }, - "ansi-html": { - "version": "0.0.7", - "from": "ansi-html@0.0.7", - "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz", - "dev": true - }, - "ansi-regex": { - "version": "2.1.1", - "from": "ansi-regex@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "dev": true - }, - "ansi-styles": { - "version": "2.2.1", - "from": "ansi-styles@>=2.2.1 <3.0.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "dev": true - }, - "anymatch": { - "version": "1.3.0", - "from": "anymatch@>=1.3.0 <2.0.0", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.0.tgz", - "dev": true - }, - "argparse": { - "version": "1.0.9", - "from": "argparse@>=1.0.7 <2.0.0", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz", - "dev": true - }, - "arr-diff": { - "version": "2.0.0", - "from": "arr-diff@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz", - "dev": true - }, - "arr-flatten": { - "version": "1.0.3", - "from": "arr-flatten@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.3.tgz", - "dev": true - }, - "array-unique": { - "version": "0.2.1", - "from": "array-unique@>=0.2.1 <0.3.0", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz", - "dev": true - }, - "arrify": { - "version": "1.0.1", - "from": "arrify@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", - "dev": true - }, - "asn1.js": { - "version": "4.9.1", - "from": "asn1.js@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.1.tgz", - "dev": true - }, - "aspnet-webpack": { - "version": "2.0.1", - "from": "aspnet-webpack@2.0.1", - "resolved": "https://registry.npmjs.org/aspnet-webpack/-/aspnet-webpack-2.0.1.tgz", - "dev": true - }, - "assert": { - "version": "1.4.1", - "from": "assert@>=1.1.1 <2.0.0", - "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz", - "dev": true - }, - "ast-types": { - "version": "0.9.6", - "from": "ast-types@0.9.6", - "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.9.6.tgz", - "dev": true - }, - "async": { - "version": "2.5.0", - "from": "async@>=2.1.2 <3.0.0", - "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz", - "dev": true - }, - "async-each": { - "version": "1.0.1", - "from": "async-each@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz", - "dev": true - }, - "aurelia-binding": { - "version": "1.2.1", - "from": "aurelia-binding@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/aurelia-binding/-/aurelia-binding-1.2.1.tgz" - }, - "aurelia-bootstrapper": { - "version": "2.1.1", - "from": "aurelia-bootstrapper@>=2.0.1 <3.0.0", - "resolved": "https://registry.npmjs.org/aurelia-bootstrapper/-/aurelia-bootstrapper-2.1.1.tgz" - }, - "aurelia-dependency-injection": { - "version": "1.3.1", - "from": "aurelia-dependency-injection@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/aurelia-dependency-injection/-/aurelia-dependency-injection-1.3.1.tgz" - }, - "aurelia-event-aggregator": { - "version": "1.0.1", - "from": "aurelia-event-aggregator@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/aurelia-event-aggregator/-/aurelia-event-aggregator-1.0.1.tgz" - }, - "aurelia-fetch-client": { - "version": "1.1.2", - "from": "aurelia-fetch-client@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/aurelia-fetch-client/-/aurelia-fetch-client-1.1.2.tgz" - }, - "aurelia-framework": { - "version": "1.1.2", - "from": "aurelia-framework@>=1.1.0 <2.0.0", - "resolved": "https://registry.npmjs.org/aurelia-framework/-/aurelia-framework-1.1.2.tgz" - }, - "aurelia-history": { - "version": "1.0.0", - "from": "aurelia-history@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/aurelia-history/-/aurelia-history-1.0.0.tgz" - }, - "aurelia-history-browser": { - "version": "1.0.0", - "from": "aurelia-history-browser@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/aurelia-history-browser/-/aurelia-history-browser-1.0.0.tgz" - }, - "aurelia-hot-module-reload": { - "version": "0.1.0", - "from": "aurelia-hot-module-reload@>=0.1.0 <0.2.0", - "resolved": "https://registry.npmjs.org/aurelia-hot-module-reload/-/aurelia-hot-module-reload-0.1.0.tgz" - }, - "aurelia-loader": { - "version": "1.0.0", - "from": "aurelia-loader@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/aurelia-loader/-/aurelia-loader-1.0.0.tgz" - }, - "aurelia-loader-default": { - "version": "1.0.2", - "from": "aurelia-loader-default@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/aurelia-loader-default/-/aurelia-loader-default-1.0.2.tgz" - }, - "aurelia-loader-webpack": { - "version": "2.1.0", - "from": "aurelia-loader-webpack@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/aurelia-loader-webpack/-/aurelia-loader-webpack-2.1.0.tgz" - }, - "aurelia-logging": { - "version": "1.3.1", - "from": "aurelia-logging@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/aurelia-logging/-/aurelia-logging-1.3.1.tgz" - }, - "aurelia-logging-console": { - "version": "1.0.0", - "from": "aurelia-logging-console@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/aurelia-logging-console/-/aurelia-logging-console-1.0.0.tgz" - }, - "aurelia-metadata": { - "version": "1.0.3", - "from": "aurelia-metadata@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/aurelia-metadata/-/aurelia-metadata-1.0.3.tgz" - }, - "aurelia-pal": { - "version": "1.3.0", - "from": "aurelia-pal@>=1.3.0 <2.0.0", - "resolved": "https://registry.npmjs.org/aurelia-pal/-/aurelia-pal-1.3.0.tgz" - }, - "aurelia-pal-browser": { - "version": "1.2.1", - "from": "aurelia-pal-browser@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/aurelia-pal-browser/-/aurelia-pal-browser-1.2.1.tgz" - }, - "aurelia-path": { - "version": "1.1.1", - "from": "aurelia-path@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/aurelia-path/-/aurelia-path-1.1.1.tgz" - }, - "aurelia-polyfills": { - "version": "1.2.1", - "from": "aurelia-polyfills@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/aurelia-polyfills/-/aurelia-polyfills-1.2.1.tgz" - }, - "aurelia-route-recognizer": { - "version": "1.1.0", - "from": "aurelia-route-recognizer@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/aurelia-route-recognizer/-/aurelia-route-recognizer-1.1.0.tgz" - }, - "aurelia-router": { - "version": "1.3.0", - "from": "aurelia-router@>=1.2.1 <2.0.0", - "resolved": "https://registry.npmjs.org/aurelia-router/-/aurelia-router-1.3.0.tgz" - }, - "aurelia-task-queue": { - "version": "1.2.0", - "from": "aurelia-task-queue@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/aurelia-task-queue/-/aurelia-task-queue-1.2.0.tgz" - }, - "aurelia-templating": { - "version": "1.4.2", - "from": "aurelia-templating@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/aurelia-templating/-/aurelia-templating-1.4.2.tgz" - }, - "aurelia-templating-binding": { - "version": "1.3.0", - "from": "aurelia-templating-binding@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/aurelia-templating-binding/-/aurelia-templating-binding-1.3.0.tgz" - }, - "aurelia-templating-resources": { - "version": "1.4.0", - "from": "aurelia-templating-resources@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/aurelia-templating-resources/-/aurelia-templating-resources-1.4.0.tgz" - }, - "aurelia-templating-router": { - "version": "1.1.0", - "from": "aurelia-templating-router@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/aurelia-templating-router/-/aurelia-templating-router-1.1.0.tgz" - }, - "aurelia-webpack-plugin": { - "version": "2.0.0-rc.2", - "from": "aurelia-webpack-plugin@>=2.0.0-rc.2 <3.0.0", - "resolved": "https://registry.npmjs.org/aurelia-webpack-plugin/-/aurelia-webpack-plugin-2.0.0-rc.2.tgz", - "dev": true - }, - "autoprefixer": { - "version": "6.7.7", - "from": "autoprefixer@>=6.3.1 <7.0.0", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.7.7.tgz", - "dev": true - }, - "babel-code-frame": { - "version": "6.22.0", - "from": "babel-code-frame@>=6.11.0 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz", - "dev": true - }, - "balanced-match": { - "version": "1.0.0", - "from": "balanced-match@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "dev": true - }, - "base64-js": { - "version": "1.2.1", - "from": "base64-js@>=1.0.2 <2.0.0", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.1.tgz", - "dev": true - }, - "big.js": { - "version": "3.1.3", - "from": "big.js@>=3.1.3 <4.0.0", - "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.1.3.tgz", - "dev": true - }, - "binary-extensions": { - "version": "1.8.0", - "from": "binary-extensions@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.8.0.tgz", - "dev": true - }, - "bn.js": { - "version": "4.11.7", - "from": "bn.js@>=4.1.1 <5.0.0", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.7.tgz", - "dev": true - }, - "bootstrap": { - "version": "3.3.7", - "from": "bootstrap@>=3.3.7 <4.0.0", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.3.7.tgz" - }, - "brace-expansion": { - "version": "1.1.8", - "from": "brace-expansion@>=1.1.7 <2.0.0", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", - "dev": true - }, - "braces": { - "version": "1.8.5", - "from": "braces@>=1.8.2 <2.0.0", - "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz", - "dev": true - }, - "brorand": { - "version": "1.1.0", - "from": "brorand@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", - "dev": true - }, - "browserify-aes": { - "version": "1.0.6", - "from": "browserify-aes@>=1.0.4 <2.0.0", - "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.6.tgz", - "dev": true - }, - "browserify-cipher": { - "version": "1.0.0", - "from": "browserify-cipher@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz", - "dev": true - }, - "browserify-des": { - "version": "1.0.0", - "from": "browserify-des@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz", - "dev": true - }, - "browserify-rsa": { - "version": "4.0.1", - "from": "browserify-rsa@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", - "dev": true - }, - "browserify-sign": { - "version": "4.0.4", - "from": "browserify-sign@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz", - "dev": true - }, - "browserify-zlib": { - "version": "0.1.4", - "from": "browserify-zlib@>=0.1.4 <0.2.0", - "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz", - "dev": true - }, - "browserslist": { - "version": "1.7.7", - "from": "browserslist@>=1.7.6 <2.0.0", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz", - "dev": true - }, - "buffer": { - "version": "4.9.1", - "from": "buffer@>=4.3.0 <5.0.0", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz", - "dev": true - }, - "buffer-xor": { - "version": "1.0.3", - "from": "buffer-xor@>=1.0.2 <2.0.0", - "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz", - "dev": true - }, - "builtin-modules": { - "version": "1.1.1", - "from": "builtin-modules@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", - "dev": true - }, - "builtin-status-codes": { - "version": "3.0.0", - "from": "builtin-status-codes@>=3.0.0 <4.0.0", - "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz", - "dev": true - }, - "bundle-loader": { - "version": "0.5.5", - "from": "bundle-loader@>=0.5.4 <0.6.0", - "resolved": "https://registry.npmjs.org/bundle-loader/-/bundle-loader-0.5.5.tgz", - "dev": true - }, - "camel-case": { - "version": "3.0.0", - "from": "camel-case@>=3.0.0 <3.1.0", - "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz", - "dev": true - }, - "camelcase": { - "version": "1.2.1", - "from": "camelcase@>=1.0.2 <2.0.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", - "dev": true - }, - "caniuse-api": { - "version": "1.6.1", - "from": "caniuse-api@>=1.5.2 <2.0.0", - "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-1.6.1.tgz", - "dev": true - }, - "caniuse-db": { - "version": "1.0.30000694", - "from": "caniuse-db@>=1.0.30000634 <2.0.0", - "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000694.tgz", - "dev": true - }, - "center-align": { - "version": "0.1.3", - "from": "center-align@>=0.1.1 <0.2.0", - "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "from": "chalk@>=1.1.0 <2.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "dev": true - }, - "chokidar": { - "version": "1.7.0", - "from": "chokidar@>=1.4.3 <2.0.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz", - "dev": true - }, - "cipher-base": { - "version": "1.0.3", - "from": "cipher-base@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.3.tgz", - "dev": true - }, - "clap": { - "version": "1.2.0", - "from": "clap@>=1.0.9 <2.0.0", - "resolved": "https://registry.npmjs.org/clap/-/clap-1.2.0.tgz", - "dev": true - }, - "clean-css": { - "version": "4.1.4", - "from": "clean-css@>=4.1.0 <4.2.0", - "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.1.4.tgz", - "dev": true - }, - "cliui": { - "version": "2.1.0", - "from": "cliui@>=2.1.0 <3.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", - "dev": true - }, - "clone": { - "version": "1.0.2", - "from": "clone@>=1.0.2 <2.0.0", - "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz", - "dev": true - }, - "co": { - "version": "4.6.0", - "from": "co@>=4.6.0 <5.0.0", - "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", - "dev": true - }, - "coa": { - "version": "1.0.3", - "from": "coa@>=1.0.1 <1.1.0", - "resolved": "https://registry.npmjs.org/coa/-/coa-1.0.3.tgz", - "dev": true - }, - "code-point-at": { - "version": "1.1.0", - "from": "code-point-at@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", - "dev": true - }, - "color": { - "version": "0.11.4", - "from": "color@>=0.11.0 <0.12.0", - "resolved": "https://registry.npmjs.org/color/-/color-0.11.4.tgz", - "dev": true - }, - "color-convert": { - "version": "1.9.0", - "from": "color-convert@>=1.3.0 <2.0.0", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz", - "dev": true - }, - "color-name": { - "version": "1.1.2", - "from": "color-name@>=1.1.1 <2.0.0", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.2.tgz", - "dev": true - }, - "color-string": { - "version": "0.3.0", - "from": "color-string@>=0.3.0 <0.4.0", - "resolved": "https://registry.npmjs.org/color-string/-/color-string-0.3.0.tgz", - "dev": true - }, - "colormin": { - "version": "1.1.2", - "from": "colormin@>=1.0.5 <2.0.0", - "resolved": "https://registry.npmjs.org/colormin/-/colormin-1.1.2.tgz", - "dev": true - }, - "colors": { - "version": "1.1.2", - "from": "colors@>=1.1.2 <1.2.0", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz", - "dev": true - }, - "commander": { - "version": "2.9.0", - "from": "commander@>=2.9.0 <2.10.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz", - "dev": true - }, - "concat-map": { - "version": "0.0.1", - "from": "concat-map@0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "dev": true - }, - "connect": { - "version": "3.6.2", - "from": "connect@>=3.4.1 <4.0.0", - "resolved": "https://registry.npmjs.org/connect/-/connect-3.6.2.tgz", - "dev": true - }, - "console-browserify": { - "version": "1.1.0", - "from": "console-browserify@>=1.1.0 <2.0.0", - "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz", - "dev": true - }, - "constants-browserify": { - "version": "1.0.0", - "from": "constants-browserify@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz", - "dev": true - }, - "core-util-is": { - "version": "1.0.2", - "from": "core-util-is@>=1.0.0 <1.1.0", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "dev": true - }, - "create-ecdh": { - "version": "4.0.0", - "from": "create-ecdh@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz", - "dev": true - }, - "create-hash": { - "version": "1.1.3", - "from": "create-hash@>=1.1.0 <2.0.0", - "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz", - "dev": true - }, - "create-hmac": { - "version": "1.1.6", - "from": "create-hmac@>=1.1.0 <2.0.0", - "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.6.tgz", - "dev": true - }, - "crypto-browserify": { - "version": "3.11.0", - "from": "crypto-browserify@>=3.11.0 <4.0.0", - "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.0.tgz", - "dev": true - }, - "css-color-names": { - "version": "0.0.4", - "from": "css-color-names@0.0.4", - "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz", - "dev": true - }, - "css-loader": { - "version": "0.28.4", - "from": "css-loader@>=0.28.0 <0.29.0", - "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.28.4.tgz", - "dev": true - }, - "css-selector-tokenizer": { - "version": "0.7.0", - "from": "css-selector-tokenizer@>=0.7.0 <0.8.0", - "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz", - "dev": true - }, - "cssesc": { - "version": "0.1.0", - "from": "cssesc@>=0.1.0 <0.2.0", - "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-0.1.0.tgz", - "dev": true - }, - "cssnano": { - "version": "3.10.0", - "from": "cssnano@>=2.6.1 <4.0.0", - "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-3.10.0.tgz", - "dev": true - }, - "csso": { - "version": "2.3.2", - "from": "csso@>=2.3.1 <2.4.0", - "resolved": "https://registry.npmjs.org/csso/-/csso-2.3.2.tgz", - "dev": true - }, - "date-now": { - "version": "0.1.4", - "from": "date-now@>=0.1.4 <0.2.0", - "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz", - "dev": true - }, - "debug": { - "version": "2.6.7", - "from": "debug@2.6.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz", - "dev": true - }, - "decamelize": { - "version": "1.2.0", - "from": "decamelize@>=1.1.2 <2.0.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "dev": true - }, - "defined": { - "version": "1.0.0", - "from": "defined@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz", - "dev": true - }, - "des.js": { - "version": "1.0.0", - "from": "des.js@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz", - "dev": true - }, - "diffie-hellman": { - "version": "5.0.2", - "from": "diffie-hellman@>=5.0.0 <6.0.0", - "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.2.tgz", - "dev": true - }, - "domain-browser": { - "version": "1.1.7", - "from": "domain-browser@>=1.1.1 <2.0.0", - "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.7.tgz", - "dev": true - }, - "ee-first": { - "version": "1.1.1", - "from": "ee-first@1.1.1", - "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", - "dev": true - }, - "electron-to-chromium": { - "version": "1.3.14", - "from": "electron-to-chromium@>=1.2.7 <2.0.0", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.14.tgz", - "dev": true - }, - "elliptic": { - "version": "6.4.0", - "from": "elliptic@>=6.0.0 <7.0.0", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz", - "dev": true - }, - "emojis-list": { - "version": "2.1.0", - "from": "emojis-list@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz", - "dev": true - }, - "encodeurl": { - "version": "1.0.1", - "from": "encodeurl@>=1.0.1 <1.1.0", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.1.tgz", - "dev": true - }, - "encoding": { - "version": "0.1.12", - "from": "encoding@>=0.1.11 <0.2.0", - "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz" - }, - "enhanced-resolve": { - "version": "3.1.0", - "from": "enhanced-resolve@>=3.0.0 <4.0.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.1.0.tgz", - "dev": true, - "dependencies": { - "memory-fs": { - "version": "0.4.1", - "from": "memory-fs@>=0.4.0 <0.5.0", - "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz", - "dev": true - } - } - }, - "errno": { - "version": "0.1.4", - "from": "errno@>=0.1.3 <0.2.0", - "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.4.tgz", - "dev": true - }, - "error-ex": { - "version": "1.3.1", - "from": "error-ex@>=1.2.0 <2.0.0", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz", - "dev": true - }, - "es6-promise": { - "version": "3.3.1", - "from": "es6-promise@>=3.1.2 <4.0.0", - "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz", - "dev": true - }, - "es6-templates": { - "version": "0.2.3", - "from": "es6-templates@>=0.2.2 <0.3.0", - "resolved": "https://registry.npmjs.org/es6-templates/-/es6-templates-0.2.3.tgz", - "dev": true - }, - "escape-html": { - "version": "1.0.3", - "from": "escape-html@>=1.0.3 <1.1.0", - "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", - "dev": true - }, - "escape-string-regexp": { - "version": "1.0.5", - "from": "escape-string-regexp@>=1.0.2 <2.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "dev": true - }, - "esprima": { - "version": "3.1.3", - "from": "esprima@>=3.1.0 <3.2.0", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz", - "dev": true - }, - "esutils": { - "version": "2.0.2", - "from": "esutils@>=2.0.2 <3.0.0", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", - "dev": true - }, - "events": { - "version": "1.1.1", - "from": "events@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz", - "dev": true - }, - "evp_bytestokey": { - "version": "1.0.0", - "from": "evp_bytestokey@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz", - "dev": true - }, - "expand-brackets": { - "version": "0.1.5", - "from": "expand-brackets@>=0.1.4 <0.2.0", - "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz", - "dev": true - }, - "expand-range": { - "version": "1.8.2", - "from": "expand-range@>=1.8.1 <2.0.0", - "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz", - "dev": true - }, - "extglob": { - "version": "0.3.2", - "from": "extglob@>=0.3.1 <0.4.0", - "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz", - "dev": true - }, - "extract-text-webpack-plugin": { - "version": "2.1.2", - "from": "extract-text-webpack-plugin@>=2.1.0 <3.0.0", - "resolved": "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-2.1.2.tgz", - "dev": true - }, - "fast-deep-equal": { - "version": "0.1.0", - "from": "fast-deep-equal@>=0.1.0 <0.2.0", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-0.1.0.tgz", - "dev": true - }, - "fastparse": { - "version": "1.1.1", - "from": "fastparse@>=1.1.1 <2.0.0", - "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.1.tgz", - "dev": true - }, - "file-loader": { - "version": "0.11.2", - "from": "file-loader@>=0.11.1 <0.12.0", - "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-0.11.2.tgz", - "dev": true - }, - "filename-regex": { - "version": "2.0.1", - "from": "filename-regex@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz", - "dev": true - }, - "fill-range": { - "version": "2.2.3", - "from": "fill-range@>=2.1.0 <3.0.0", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz", - "dev": true - }, - "finalhandler": { - "version": "1.0.3", - "from": "finalhandler@1.0.3", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.3.tgz", - "dev": true - }, - "find-up": { - "version": "1.1.2", - "from": "find-up@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", - "dev": true - }, - "flatten": { - "version": "1.0.2", - "from": "flatten@>=1.0.2 <2.0.0", - "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz", - "dev": true - }, - "for-in": { - "version": "1.0.2", - "from": "for-in@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", - "dev": true - }, - "for-own": { - "version": "0.1.5", - "from": "for-own@>=0.1.4 <0.2.0", - "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz", - "dev": true - }, - "function-bind": { - "version": "1.1.0", - "from": "function-bind@>=1.0.2 <2.0.0", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.0.tgz", - "dev": true - }, - "get-caller-file": { - "version": "1.0.2", - "from": "get-caller-file@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz", - "dev": true - }, - "glob-base": { - "version": "0.3.0", - "from": "glob-base@>=0.3.0 <0.4.0", - "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz", - "dev": true - }, - "glob-parent": { - "version": "2.0.0", - "from": "glob-parent@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz", - "dev": true - }, - "graceful-fs": { - "version": "4.1.11", - "from": "graceful-fs@>=4.1.2 <5.0.0", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", - "dev": true - }, - "graceful-readlink": { - "version": "1.0.1", - "from": "graceful-readlink@>=1.0.0", - "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz", - "dev": true - }, - "has": { - "version": "1.0.1", - "from": "has@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz", - "dev": true - }, - "has-ansi": { - "version": "2.0.0", - "from": "has-ansi@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", - "dev": true - }, - "has-flag": { - "version": "1.0.0", - "from": "has-flag@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "dev": true - }, - "hash-base": { - "version": "2.0.2", - "from": "hash-base@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz", - "dev": true - }, - "hash.js": { - "version": "1.1.1", - "from": "hash.js@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.1.tgz", - "dev": true - }, - "he": { - "version": "1.1.1", - "from": "he@>=1.1.0 <1.2.0", - "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz", - "dev": true - }, - "hmac-drbg": { - "version": "1.0.1", - "from": "hmac-drbg@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", - "dev": true - }, - "hosted-git-info": { - "version": "2.4.2", - "from": "hosted-git-info@>=2.1.4 <3.0.0", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.4.2.tgz", - "dev": true - }, - "html-comment-regex": { - "version": "1.1.1", - "from": "html-comment-regex@>=1.1.0 <2.0.0", - "resolved": "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.1.tgz", - "dev": true - }, - "html-entities": { - "version": "1.2.1", - "from": "html-entities@>=1.2.0 <2.0.0", - "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz", - "dev": true - }, - "html-loader": { - "version": "0.4.5", - "from": "html-loader@>=0.4.5 <0.5.0", - "resolved": "https://registry.npmjs.org/html-loader/-/html-loader-0.4.5.tgz", - "dev": true - }, - "html-minifier": { - "version": "3.5.2", - "from": "html-minifier@>=3.0.1 <4.0.0", - "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.2.tgz", - "dev": true - }, - "https-browserify": { - "version": "0.0.1", - "from": "https-browserify@0.0.1", - "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz", - "dev": true - }, - "iconv-lite": { - "version": "0.4.18", - "from": "iconv-lite@>=0.4.13 <0.5.0", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.18.tgz" - }, - "icss-replace-symbols": { - "version": "1.1.0", - "from": "icss-replace-symbols@>=1.1.0 <2.0.0", - "resolved": "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz", - "dev": true - }, - "icss-utils": { - "version": "2.1.0", - "from": "icss-utils@>=2.1.0 <3.0.0", - "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-2.1.0.tgz", - "dev": true, - "dependencies": { - "has-flag": { - "version": "2.0.0", - "from": "has-flag@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", - "dev": true - }, - "postcss": { - "version": "6.0.3", - "from": "postcss@>=6.0.1 <7.0.0", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.3.tgz", - "dev": true - }, - "supports-color": { - "version": "4.0.0", - "from": "supports-color@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.0.0.tgz", - "dev": true - } - } - }, - "ieee754": { - "version": "1.1.8", - "from": "ieee754@>=1.1.4 <2.0.0", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz", - "dev": true - }, - "indexes-of": { - "version": "1.0.1", - "from": "indexes-of@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz", - "dev": true - }, - "indexof": { - "version": "0.0.1", - "from": "indexof@0.0.1", - "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz", - "dev": true - }, - "inherits": { - "version": "2.0.3", - "from": "inherits@>=2.0.3 <2.1.0", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "dev": true - }, - "interpret": { - "version": "1.0.3", - "from": "interpret@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.3.tgz", - "dev": true - }, - "invert-kv": { - "version": "1.0.0", - "from": "invert-kv@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", - "dev": true - }, - "is-absolute-url": { - "version": "2.1.0", - "from": "is-absolute-url@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz", - "dev": true - }, - "is-arrayish": { - "version": "0.2.1", - "from": "is-arrayish@>=0.2.1 <0.3.0", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "dev": true - }, - "is-binary-path": { - "version": "1.0.1", - "from": "is-binary-path@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", - "dev": true - }, - "is-buffer": { - "version": "1.1.5", - "from": "is-buffer@>=1.1.5 <2.0.0", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz", - "dev": true - }, - "is-builtin-module": { - "version": "1.0.0", - "from": "is-builtin-module@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", - "dev": true - }, - "is-dotfile": { - "version": "1.0.3", - "from": "is-dotfile@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz", - "dev": true - }, - "is-equal-shallow": { - "version": "0.1.3", - "from": "is-equal-shallow@>=0.1.3 <0.2.0", - "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz", - "dev": true - }, - "is-extendable": { - "version": "0.1.1", - "from": "is-extendable@>=0.1.1 <0.2.0", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", - "dev": true - }, - "is-extglob": { - "version": "1.0.0", - "from": "is-extglob@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "from": "is-fullwidth-code-point@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "dev": true - }, - "is-glob": { - "version": "2.0.1", - "from": "is-glob@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", - "dev": true - }, - "is-number": { - "version": "2.1.0", - "from": "is-number@>=2.1.0 <3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz", - "dev": true - }, - "is-plain-obj": { - "version": "1.1.0", - "from": "is-plain-obj@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", - "dev": true - }, - "is-posix-bracket": { - "version": "0.1.1", - "from": "is-posix-bracket@>=0.1.0 <0.2.0", - "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz", - "dev": true - }, - "is-primitive": { - "version": "2.0.0", - "from": "is-primitive@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz", - "dev": true - }, - "is-stream": { - "version": "1.1.0", - "from": "is-stream@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz" - }, - "is-svg": { - "version": "2.1.0", - "from": "is-svg@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-2.1.0.tgz", - "dev": true - }, - "is-utf8": { - "version": "0.2.1", - "from": "is-utf8@>=0.2.0 <0.3.0", - "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", - "dev": true - }, - "isarray": { - "version": "1.0.0", - "from": "isarray@>=1.0.0 <1.1.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "dev": true - }, - "isobject": { - "version": "2.1.0", - "from": "isobject@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", - "dev": true - }, - "isomorphic-fetch": { - "version": "2.2.1", - "from": "isomorphic-fetch@>=2.2.1 <3.0.0", - "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz" - }, - "jquery": { - "version": "3.2.1", - "from": "jquery@>=3.2.1 <4.0.0", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.2.1.tgz" - }, - "js-base64": { - "version": "2.1.9", - "from": "js-base64@>=2.1.9 <3.0.0", - "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.1.9.tgz", - "dev": true - }, - "js-tokens": { - "version": "3.0.1", - "from": "js-tokens@>=3.0.0 <4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.1.tgz", - "dev": true - }, - "js-yaml": { - "version": "3.7.0", - "from": "js-yaml@>=3.7.0 <3.8.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz", - "dev": true, - "dependencies": { - "esprima": { - "version": "2.7.3", - "from": "esprima@>=2.6.0 <3.0.0", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", - "dev": true - } - } - }, - "jsesc": { - "version": "0.5.0", - "from": "jsesc@>=0.5.0 <0.6.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", - "dev": true - }, - "json-loader": { - "version": "0.5.4", - "from": "json-loader@>=0.5.4 <0.6.0", - "resolved": "https://registry.npmjs.org/json-loader/-/json-loader-0.5.4.tgz", - "dev": true - }, - "json-schema-traverse": { - "version": "0.3.1", - "from": "json-schema-traverse@>=0.3.0 <0.4.0", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz", - "dev": true - }, - "json-stable-stringify": { - "version": "1.0.1", - "from": "json-stable-stringify@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz", - "dev": true - }, - "json5": { - "version": "0.5.1", - "from": "json5@>=0.5.0 <0.6.0", - "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz", - "dev": true - }, - "jsonify": { - "version": "0.0.0", - "from": "jsonify@>=0.0.0 <0.1.0", - "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz", - "dev": true - }, - "kind-of": { - "version": "3.2.2", - "from": "kind-of@>=3.0.2 <4.0.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "dev": true - }, - "lazy-cache": { - "version": "1.0.4", - "from": "lazy-cache@>=1.0.3 <2.0.0", - "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", - "dev": true - }, - "lcid": { - "version": "1.0.0", - "from": "lcid@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", - "dev": true - }, - "load-json-file": { - "version": "1.1.0", - "from": "load-json-file@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", - "dev": true - }, - "loader-runner": { - "version": "2.3.0", - "from": "loader-runner@>=2.3.0 <3.0.0", - "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.0.tgz", - "dev": true - }, - "loader-utils": { - "version": "1.1.0", - "from": "loader-utils@>=1.0.2 <2.0.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz", - "dev": true - }, - "lodash": { - "version": "4.17.4", - "from": "lodash@>=4.14.0 <5.0.0", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", - "dev": true - }, - "lodash.camelcase": { - "version": "4.3.0", - "from": "lodash.camelcase@>=4.3.0 <5.0.0", - "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", - "dev": true - }, - "lodash.memoize": { - "version": "4.1.2", - "from": "lodash.memoize@>=4.1.2 <5.0.0", - "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", - "dev": true - }, - "lodash.uniq": { - "version": "4.5.0", - "from": "lodash.uniq@>=4.5.0 <5.0.0", - "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", - "dev": true - }, - "longest": { - "version": "1.0.1", - "from": "longest@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", - "dev": true - }, - "lower-case": { - "version": "1.1.4", - "from": "lower-case@>=1.1.1 <2.0.0", - "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz", - "dev": true - }, - "macaddress": { - "version": "0.2.8", - "from": "macaddress@>=0.2.8 <0.3.0", - "resolved": "https://registry.npmjs.org/macaddress/-/macaddress-0.2.8.tgz", - "dev": true - }, - "math-expression-evaluator": { - "version": "1.2.17", - "from": "math-expression-evaluator@>=1.2.14 <2.0.0", - "resolved": "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz", - "dev": true - }, - "memory-fs": { - "version": "0.3.0", - "from": "memory-fs@>=0.3.0 <0.4.0", - "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.3.0.tgz", - "dev": true - }, - "micromatch": { - "version": "2.3.11", - "from": "micromatch@>=2.1.5 <3.0.0", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", - "dev": true - }, - "miller-rabin": { - "version": "4.0.0", - "from": "miller-rabin@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.0.tgz", - "dev": true - }, - "mime": { - "version": "1.3.6", - "from": "mime@>=1.3.4 <2.0.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.6.tgz", - "dev": true - }, - "minimalistic-assert": { - "version": "1.0.0", - "from": "minimalistic-assert@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz", - "dev": true - }, - "minimalistic-crypto-utils": { - "version": "1.0.1", - "from": "minimalistic-crypto-utils@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz", - "dev": true - }, - "minimatch": { - "version": "3.0.4", - "from": "minimatch@>=3.0.3 <4.0.0", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "dev": true - }, - "minimist": { - "version": "0.0.8", - "from": "minimist@0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "dev": true - }, - "mkdirp": { - "version": "0.5.1", - "from": "mkdirp@>=0.5.1 <0.6.0", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "dev": true - }, - "ms": { - "version": "2.0.0", - "from": "ms@2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "dev": true - }, - "ncname": { - "version": "1.0.0", - "from": "ncname@>=1.0.0 <1.1.0", - "resolved": "https://registry.npmjs.org/ncname/-/ncname-1.0.0.tgz", - "dev": true - }, - "no-case": { - "version": "2.3.1", - "from": "no-case@>=2.2.0 <3.0.0", - "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.1.tgz", - "dev": true - }, - "node-fetch": { - "version": "1.7.1", - "from": "node-fetch@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.1.tgz" - }, - "node-libs-browser": { - "version": "2.0.0", - "from": "node-libs-browser@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.0.0.tgz", - "dev": true, - "dependencies": { - "string_decoder": { - "version": "0.10.31", - "from": "string_decoder@>=0.10.25 <0.11.0", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "dev": true - } - } - }, - "normalize-package-data": { - "version": "2.3.8", - "from": "normalize-package-data@>=2.3.2 <3.0.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.8.tgz", - "dev": true - }, - "normalize-path": { - "version": "2.1.1", - "from": "normalize-path@>=2.0.1 <3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", - "dev": true - }, - "normalize-range": { - "version": "0.1.2", - "from": "normalize-range@>=0.1.2 <0.2.0", - "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz", - "dev": true - }, - "normalize-url": { - "version": "1.9.1", - "from": "normalize-url@>=1.4.0 <2.0.0", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz", - "dev": true - }, - "num2fraction": { - "version": "1.2.2", - "from": "num2fraction@>=1.2.2 <2.0.0", - "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz", - "dev": true - }, - "number-is-nan": { - "version": "1.0.1", - "from": "number-is-nan@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "dev": true - }, - "object-assign": { - "version": "4.1.1", - "from": "object-assign@>=4.1.0 <5.0.0", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "dev": true - }, - "object.omit": { - "version": "2.0.1", - "from": "object.omit@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz", - "dev": true - }, - "on-finished": { - "version": "2.3.0", - "from": "on-finished@>=2.3.0 <2.4.0", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", - "dev": true - }, - "os-browserify": { - "version": "0.2.1", - "from": "os-browserify@>=0.2.0 <0.3.0", - "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.2.1.tgz", - "dev": true - }, - "os-locale": { - "version": "1.4.0", - "from": "os-locale@>=1.4.0 <2.0.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", - "dev": true - }, - "pako": { - "version": "0.2.9", - "from": "pako@>=0.2.0 <0.3.0", - "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz", - "dev": true - }, - "param-case": { - "version": "2.1.1", - "from": "param-case@>=2.1.0 <2.2.0", - "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz", - "dev": true - }, - "parse-asn1": { - "version": "5.1.0", - "from": "parse-asn1@>=5.0.0 <6.0.0", - "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz", - "dev": true - }, - "parse-glob": { - "version": "3.0.4", - "from": "parse-glob@>=3.0.4 <4.0.0", - "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz", - "dev": true - }, - "parse-json": { - "version": "2.2.0", - "from": "parse-json@>=2.2.0 <3.0.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", - "dev": true - }, - "parseurl": { - "version": "1.3.1", - "from": "parseurl@>=1.3.1 <1.4.0", - "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz", - "dev": true - }, - "path-browserify": { - "version": "0.0.0", - "from": "path-browserify@0.0.0", - "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz", - "dev": true - }, - "path-exists": { - "version": "2.1.0", - "from": "path-exists@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", - "dev": true - }, - "path-is-absolute": { - "version": "1.0.1", - "from": "path-is-absolute@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "dev": true - }, - "path-type": { - "version": "1.1.0", - "from": "path-type@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", - "dev": true - }, - "pbkdf2": { - "version": "3.0.12", - "from": "pbkdf2@>=3.0.3 <4.0.0", - "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.12.tgz", - "dev": true - }, - "pify": { - "version": "2.3.0", - "from": "pify@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "dev": true - }, - "pinkie": { - "version": "2.0.4", - "from": "pinkie@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", - "dev": true - }, - "pinkie-promise": { - "version": "2.0.1", - "from": "pinkie-promise@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", - "dev": true - }, - "postcss": { - "version": "5.2.17", - "from": "postcss@>=5.0.6 <6.0.0", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", - "dev": true, - "dependencies": { - "supports-color": { - "version": "3.2.3", - "from": "supports-color@>=3.2.3 <4.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "dev": true - } - } - }, - "postcss-calc": { - "version": "5.3.1", - "from": "postcss-calc@>=5.2.0 <6.0.0", - "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-5.3.1.tgz", - "dev": true - }, - "postcss-colormin": { - "version": "2.2.2", - "from": "postcss-colormin@>=2.1.8 <3.0.0", - "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-2.2.2.tgz", - "dev": true - }, - "postcss-convert-values": { - "version": "2.6.1", - "from": "postcss-convert-values@>=2.3.4 <3.0.0", - "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-2.6.1.tgz", - "dev": true - }, - "postcss-discard-comments": { - "version": "2.0.4", - "from": "postcss-discard-comments@>=2.0.4 <3.0.0", - "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz", - "dev": true - }, - "postcss-discard-duplicates": { - "version": "2.1.0", - "from": "postcss-discard-duplicates@>=2.0.1 <3.0.0", - "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-2.1.0.tgz", - "dev": true - }, - "postcss-discard-empty": { - "version": "2.1.0", - "from": "postcss-discard-empty@>=2.0.1 <3.0.0", - "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-2.1.0.tgz", - "dev": true - }, - "postcss-discard-overridden": { - "version": "0.1.1", - "from": "postcss-discard-overridden@>=0.1.1 <0.2.0", - "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz", - "dev": true - }, - "postcss-discard-unused": { - "version": "2.2.3", - "from": "postcss-discard-unused@>=2.2.1 <3.0.0", - "resolved": "https://registry.npmjs.org/postcss-discard-unused/-/postcss-discard-unused-2.2.3.tgz", - "dev": true - }, - "postcss-filter-plugins": { - "version": "2.0.2", - "from": "postcss-filter-plugins@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/postcss-filter-plugins/-/postcss-filter-plugins-2.0.2.tgz", - "dev": true - }, - "postcss-merge-idents": { - "version": "2.1.7", - "from": "postcss-merge-idents@>=2.1.5 <3.0.0", - "resolved": "https://registry.npmjs.org/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz", - "dev": true - }, - "postcss-merge-longhand": { - "version": "2.0.2", - "from": "postcss-merge-longhand@>=2.0.1 <3.0.0", - "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-2.0.2.tgz", - "dev": true - }, - "postcss-merge-rules": { - "version": "2.1.2", - "from": "postcss-merge-rules@>=2.0.3 <3.0.0", - "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-2.1.2.tgz", - "dev": true - }, - "postcss-message-helpers": { - "version": "2.0.0", - "from": "postcss-message-helpers@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz", - "dev": true - }, - "postcss-minify-font-values": { - "version": "1.0.5", - "from": "postcss-minify-font-values@>=1.0.2 <2.0.0", - "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-1.0.5.tgz", - "dev": true - }, - "postcss-minify-gradients": { - "version": "1.0.5", - "from": "postcss-minify-gradients@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-1.0.5.tgz", - "dev": true - }, - "postcss-minify-params": { - "version": "1.2.2", - "from": "postcss-minify-params@>=1.0.4 <2.0.0", - "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-1.2.2.tgz", - "dev": true - }, - "postcss-minify-selectors": { - "version": "2.1.1", - "from": "postcss-minify-selectors@>=2.0.4 <3.0.0", - "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-2.1.1.tgz", - "dev": true - }, - "postcss-modules-extract-imports": { - "version": "1.1.0", - "from": "postcss-modules-extract-imports@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.1.0.tgz", - "dev": true, - "dependencies": { - "has-flag": { - "version": "2.0.0", - "from": "has-flag@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", - "dev": true - }, - "postcss": { - "version": "6.0.3", - "from": "postcss@>=6.0.1 <7.0.0", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.3.tgz", - "dev": true - }, - "supports-color": { - "version": "4.0.0", - "from": "supports-color@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.0.0.tgz", - "dev": true - } - } - }, - "postcss-modules-local-by-default": { - "version": "1.2.0", - "from": "postcss-modules-local-by-default@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz", - "dev": true, - "dependencies": { - "has-flag": { - "version": "2.0.0", - "from": "has-flag@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", - "dev": true - }, - "postcss": { - "version": "6.0.3", - "from": "postcss@>=6.0.1 <7.0.0", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.3.tgz", - "dev": true - }, - "supports-color": { - "version": "4.0.0", - "from": "supports-color@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.0.0.tgz", - "dev": true - } - } - }, - "postcss-modules-scope": { - "version": "1.1.0", - "from": "postcss-modules-scope@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz", - "dev": true, - "dependencies": { - "has-flag": { - "version": "2.0.0", - "from": "has-flag@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", - "dev": true - }, - "postcss": { - "version": "6.0.3", - "from": "postcss@>=6.0.1 <7.0.0", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.3.tgz", - "dev": true - }, - "supports-color": { - "version": "4.0.0", - "from": "supports-color@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.0.0.tgz", - "dev": true - } - } - }, - "postcss-modules-values": { - "version": "1.3.0", - "from": "postcss-modules-values@>=1.1.0 <2.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz", - "dev": true, - "dependencies": { - "has-flag": { - "version": "2.0.0", - "from": "has-flag@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", - "dev": true - }, - "postcss": { - "version": "6.0.3", - "from": "postcss@>=6.0.1 <7.0.0", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.3.tgz", - "dev": true - }, - "supports-color": { - "version": "4.0.0", - "from": "supports-color@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.0.0.tgz", - "dev": true - } - } - }, - "postcss-normalize-charset": { - "version": "1.1.1", - "from": "postcss-normalize-charset@>=1.1.0 <2.0.0", - "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz", - "dev": true - }, - "postcss-normalize-url": { - "version": "3.0.8", - "from": "postcss-normalize-url@>=3.0.7 <4.0.0", - "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-3.0.8.tgz", - "dev": true - }, - "postcss-ordered-values": { - "version": "2.2.3", - "from": "postcss-ordered-values@>=2.1.0 <3.0.0", - "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-2.2.3.tgz", - "dev": true - }, - "postcss-reduce-idents": { - "version": "2.4.0", - "from": "postcss-reduce-idents@>=2.2.2 <3.0.0", - "resolved": "https://registry.npmjs.org/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz", - "dev": true - }, - "postcss-reduce-initial": { - "version": "1.0.1", - "from": "postcss-reduce-initial@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-1.0.1.tgz", - "dev": true - }, - "postcss-reduce-transforms": { - "version": "1.0.4", - "from": "postcss-reduce-transforms@>=1.0.3 <2.0.0", - "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.4.tgz", - "dev": true - }, - "postcss-selector-parser": { - "version": "2.2.3", - "from": "postcss-selector-parser@>=2.2.2 <3.0.0", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz", - "dev": true - }, - "postcss-svgo": { - "version": "2.1.6", - "from": "postcss-svgo@>=2.1.1 <3.0.0", - "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-2.1.6.tgz", - "dev": true - }, - "postcss-unique-selectors": { - "version": "2.0.2", - "from": "postcss-unique-selectors@>=2.0.2 <3.0.0", - "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-2.0.2.tgz", - "dev": true - }, - "postcss-value-parser": { - "version": "3.3.0", - "from": "postcss-value-parser@>=3.3.0 <4.0.0", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz", - "dev": true - }, - "postcss-zindex": { - "version": "2.2.0", - "from": "postcss-zindex@>=2.0.1 <3.0.0", - "resolved": "https://registry.npmjs.org/postcss-zindex/-/postcss-zindex-2.2.0.tgz", - "dev": true - }, - "prepend-http": { - "version": "1.0.4", - "from": "prepend-http@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz", - "dev": true - }, - "preserve": { - "version": "0.2.0", - "from": "preserve@>=0.2.0 <0.3.0", - "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz", - "dev": true - }, - "private": { - "version": "0.1.7", - "from": "private@>=0.1.5 <0.2.0", - "resolved": "https://registry.npmjs.org/private/-/private-0.1.7.tgz", - "dev": true - }, - "process": { - "version": "0.11.10", - "from": "process@>=0.11.0 <0.12.0", - "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", - "dev": true - }, - "process-nextick-args": { - "version": "1.0.7", - "from": "process-nextick-args@>=1.0.6 <1.1.0", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", - "dev": true - }, - "prr": { - "version": "0.0.0", - "from": "prr@>=0.0.0 <0.1.0", - "resolved": "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz", - "dev": true - }, - "public-encrypt": { - "version": "4.0.0", - "from": "public-encrypt@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz", - "dev": true - }, - "punycode": { - "version": "1.4.1", - "from": "punycode@>=1.2.4 <2.0.0", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "dev": true - }, - "q": { - "version": "1.5.0", - "from": "q@>=1.1.2 <2.0.0", - "resolved": "https://registry.npmjs.org/q/-/q-1.5.0.tgz", - "dev": true - }, - "query-string": { - "version": "4.3.4", - "from": "query-string@>=4.1.0 <5.0.0", - "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz", - "dev": true - }, - "querystring": { - "version": "0.2.0", - "from": "querystring@0.2.0", - "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", - "dev": true - }, - "querystring-es3": { - "version": "0.2.1", - "from": "querystring-es3@>=0.2.0 <0.3.0", - "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz", - "dev": true - }, - "randomatic": { - "version": "1.1.7", - "from": "randomatic@>=1.1.3 <2.0.0", - "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz", - "dev": true, - "dependencies": { - "is-number": { - "version": "3.0.0", - "from": "is-number@>=3.0.0 <4.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "dev": true, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "from": "kind-of@^3.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "dev": true - } - } - }, - "kind-of": { - "version": "4.0.0", - "from": "kind-of@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", - "dev": true - } - } - }, - "randombytes": { - "version": "2.0.5", - "from": "randombytes@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.5.tgz", - "dev": true - }, - "range-parser": { - "version": "1.2.0", - "from": "range-parser@>=1.0.3 <2.0.0", - "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz", - "dev": true - }, - "read-pkg": { - "version": "1.1.0", - "from": "read-pkg@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", - "dev": true - }, - "read-pkg-up": { - "version": "1.0.1", - "from": "read-pkg-up@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", - "dev": true - }, - "readable-stream": { - "version": "2.3.2", - "from": "readable-stream@>=2.0.1 <3.0.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.2.tgz", - "dev": true - }, - "readdirp": { - "version": "2.1.0", - "from": "readdirp@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz", - "dev": true - }, - "recast": { - "version": "0.11.23", - "from": "recast@>=0.11.12 <0.12.0", - "resolved": "https://registry.npmjs.org/recast/-/recast-0.11.23.tgz", - "dev": true - }, - "reduce-css-calc": { - "version": "1.3.0", - "from": "reduce-css-calc@>=1.2.6 <2.0.0", - "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz", - "dev": true, - "dependencies": { - "balanced-match": { - "version": "0.4.2", - "from": "balanced-match@>=0.4.2 <0.5.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz", - "dev": true - } - } - }, - "reduce-function-call": { - "version": "1.0.2", - "from": "reduce-function-call@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/reduce-function-call/-/reduce-function-call-1.0.2.tgz", - "dev": true, - "dependencies": { - "balanced-match": { - "version": "0.4.2", - "from": "balanced-match@>=0.4.2 <0.5.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz", - "dev": true - } - } - }, - "regenerate": { - "version": "1.3.2", - "from": "regenerate@>=1.2.1 <2.0.0", - "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.2.tgz", - "dev": true - }, - "regex-cache": { - "version": "0.4.3", - "from": "regex-cache@>=0.4.2 <0.5.0", - "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz", - "dev": true - }, - "regexpu-core": { - "version": "1.0.0", - "from": "regexpu-core@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz", - "dev": true - }, - "regjsgen": { - "version": "0.2.0", - "from": "regjsgen@>=0.2.0 <0.3.0", - "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz", - "dev": true - }, - "regjsparser": { - "version": "0.1.5", - "from": "regjsparser@>=0.1.4 <0.2.0", - "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz", - "dev": true - }, - "relateurl": { - "version": "0.2.7", - "from": "relateurl@>=0.2.0 <0.3.0", - "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz", - "dev": true - }, - "remove-trailing-separator": { - "version": "1.0.2", - "from": "remove-trailing-separator@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.0.2.tgz", - "dev": true - }, - "repeat-element": { - "version": "1.1.2", - "from": "repeat-element@>=1.1.2 <2.0.0", - "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz", - "dev": true - }, - "repeat-string": { - "version": "1.6.1", - "from": "repeat-string@>=1.5.2 <2.0.0", - "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", - "dev": true - }, - "require-directory": { - "version": "2.1.1", - "from": "require-directory@>=2.1.1 <3.0.0", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "dev": true - }, - "require-from-string": { - "version": "1.2.1", - "from": "require-from-string@>=1.1.0 <2.0.0", - "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-1.2.1.tgz", - "dev": true - }, - "require-main-filename": { - "version": "1.0.1", - "from": "require-main-filename@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", - "dev": true - }, - "right-align": { - "version": "0.1.3", - "from": "right-align@>=0.1.1 <0.2.0", - "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz", - "dev": true - }, - "ripemd160": { - "version": "2.0.1", - "from": "ripemd160@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz", - "dev": true - }, - "safe-buffer": { - "version": "5.1.1", - "from": "safe-buffer@>=5.1.0 <5.2.0", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", - "dev": true - }, - "sax": { - "version": "1.2.4", - "from": "sax@>=1.2.1 <1.3.0", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", - "dev": true - }, - "schema-utils": { - "version": "0.3.0", - "from": "schema-utils@>=0.3.0 <0.4.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz", - "dev": true - }, - "semver": { - "version": "5.3.0", - "from": "semver@>=5.0.1 <6.0.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", - "dev": true - }, - "set-blocking": { - "version": "2.0.0", - "from": "set-blocking@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "dev": true - }, - "set-immediate-shim": { - "version": "1.0.1", - "from": "set-immediate-shim@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz", - "dev": true - }, - "setimmediate": { - "version": "1.0.5", - "from": "setimmediate@>=1.0.4 <2.0.0", - "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", - "dev": true - }, - "sha.js": { - "version": "2.4.8", - "from": "sha.js@>=2.4.0 <3.0.0", - "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.8.tgz", - "dev": true - }, - "sort-keys": { - "version": "1.1.2", - "from": "sort-keys@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz", - "dev": true - }, - "source-list-map": { - "version": "0.1.8", - "from": "source-list-map@>=0.1.7 <0.2.0", - "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz", - "dev": true - }, - "source-map": { - "version": "0.5.6", - "from": "source-map@>=0.5.0 <0.6.0", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz", - "dev": true - }, - "spdx-correct": { - "version": "1.0.2", - "from": "spdx-correct@>=1.0.0 <1.1.0", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz", - "dev": true - }, - "spdx-expression-parse": { - "version": "1.0.4", - "from": "spdx-expression-parse@>=1.0.0 <1.1.0", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz", - "dev": true - }, - "spdx-license-ids": { - "version": "1.2.2", - "from": "spdx-license-ids@>=1.0.2 <2.0.0", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz", - "dev": true - }, - "sprintf-js": { - "version": "1.0.3", - "from": "sprintf-js@>=1.0.2 <1.1.0", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "dev": true - }, - "statuses": { - "version": "1.3.1", - "from": "statuses@>=1.3.1 <1.4.0", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz", - "dev": true - }, - "stream-browserify": { - "version": "2.0.1", - "from": "stream-browserify@>=2.0.1 <3.0.0", - "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz", - "dev": true - }, - "stream-http": { - "version": "2.7.2", - "from": "stream-http@>=2.3.1 <3.0.0", - "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.7.2.tgz", - "dev": true - }, - "strict-uri-encode": { - "version": "1.1.0", - "from": "strict-uri-encode@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz", - "dev": true - }, - "string_decoder": { - "version": "1.0.3", - "from": "string_decoder@>=1.0.0 <1.1.0", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", - "dev": true - }, - "string-width": { - "version": "1.0.2", - "from": "string-width@>=1.0.2 <2.0.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "dev": true - }, - "strip-ansi": { - "version": "3.0.1", - "from": "strip-ansi@>=3.0.0 <4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "dev": true - }, - "strip-bom": { - "version": "2.0.0", - "from": "strip-bom@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", - "dev": true - }, - "style-loader": { - "version": "0.16.1", - "from": "style-loader@>=0.16.1 <0.17.0", - "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.16.1.tgz", - "dev": true - }, - "supports-color": { - "version": "2.0.0", - "from": "supports-color@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "dev": true - }, - "svgo": { - "version": "0.7.2", - "from": "svgo@>=0.7.0 <0.8.0", - "resolved": "https://registry.npmjs.org/svgo/-/svgo-0.7.2.tgz", - "dev": true - }, - "tapable": { - "version": "0.2.6", - "from": "tapable@>=0.2.5 <0.3.0", - "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.2.6.tgz", - "dev": true - }, - "through": { - "version": "2.3.8", - "from": "through@>=2.3.6 <2.4.0", - "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "dev": true - }, - "timers-browserify": { - "version": "2.0.2", - "from": "timers-browserify@>=2.0.2 <3.0.0", - "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.2.tgz", - "dev": true - }, - "to-arraybuffer": { - "version": "1.0.1", - "from": "to-arraybuffer@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz", - "dev": true - }, - "ts-loader": { - "version": "2.2.0", - "from": "ts-loader@>=2.0.3 <3.0.0", - "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-2.2.0.tgz", - "dev": true - }, - "tty-browserify": { - "version": "0.0.0", - "from": "tty-browserify@0.0.0", - "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz", - "dev": true - }, - "typescript": { - "version": "2.3.4", - "from": "typescript@>=2.2.2 <3.0.0", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.3.4.tgz", - "dev": true - }, - "uglify-js": { - "version": "3.0.20", - "from": "uglify-js@>=3.0.0 <3.1.0", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.20.tgz", - "dev": true - }, - "uglify-to-browserify": { - "version": "1.0.2", - "from": "uglify-to-browserify@>=1.0.0 <1.1.0", - "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz", - "dev": true, - "optional": true - }, - "uniq": { - "version": "1.0.1", - "from": "uniq@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz", - "dev": true - }, - "uniqid": { - "version": "4.1.1", - "from": "uniqid@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/uniqid/-/uniqid-4.1.1.tgz", - "dev": true - }, - "uniqs": { - "version": "2.0.0", - "from": "uniqs@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz", - "dev": true - }, - "unpipe": { - "version": "1.0.0", - "from": "unpipe@>=1.0.0 <1.1.0", - "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", - "dev": true - }, - "upper-case": { - "version": "1.1.3", - "from": "upper-case@>=1.1.1 <2.0.0", - "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz", - "dev": true - }, - "url": { - "version": "0.11.0", - "from": "url@>=0.11.0 <0.12.0", - "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", - "dev": true, - "dependencies": { - "punycode": { - "version": "1.3.2", - "from": "punycode@1.3.2", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", - "dev": true - } - } - }, - "url-loader": { - "version": "0.5.9", - "from": "url-loader@>=0.5.8 <0.6.0", - "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-0.5.9.tgz", - "dev": true - }, - "util": { - "version": "0.10.3", - "from": "util@>=0.10.3 <0.11.0", - "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", - "dev": true, - "dependencies": { - "inherits": { - "version": "2.0.1", - "from": "inherits@2.0.1", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "dev": true - } - } - }, - "util-deprecate": { - "version": "1.0.2", - "from": "util-deprecate@>=1.0.1 <1.1.0", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "dev": true - }, - "utils-merge": { - "version": "1.0.0", - "from": "utils-merge@1.0.0", - "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz", - "dev": true - }, - "validate-npm-package-license": { - "version": "3.0.1", - "from": "validate-npm-package-license@>=3.0.1 <4.0.0", - "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz", - "dev": true - }, - "vendors": { - "version": "1.0.1", - "from": "vendors@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.1.tgz", - "dev": true - }, - "vm-browserify": { - "version": "0.0.4", - "from": "vm-browserify@0.0.4", - "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz", - "dev": true - }, - "watchpack": { - "version": "1.3.1", - "from": "watchpack@>=1.3.1 <2.0.0", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.3.1.tgz", - "dev": true - }, - "webpack": { - "version": "2.6.1", - "from": "webpack@>=2.3.3 <3.0.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-2.6.1.tgz", - "dev": true, - "dependencies": { - "ajv": { - "version": "4.11.8", - "from": "ajv@>=4.7.0 <5.0.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz", - "dev": true - }, - "loader-utils": { - "version": "0.2.17", - "from": "loader-utils@>=0.2.16 <0.3.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz", - "dev": true - }, - "memory-fs": { - "version": "0.4.1", - "from": "memory-fs@>=0.4.1 <0.5.0", - "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz", - "dev": true - }, - "source-list-map": { - "version": "1.1.2", - "from": "source-list-map@>=1.1.1 <2.0.0", - "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-1.1.2.tgz", - "dev": true - }, - "supports-color": { - "version": "3.2.3", - "from": "supports-color@>=3.1.0 <4.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "dev": true - }, - "uglify-js": { - "version": "2.8.29", - "from": "uglify-js@>=2.8.27 <3.0.0", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz", - "dev": true, - "dependencies": { - "yargs": { - "version": "3.10.0", - "from": "yargs@>=3.10.0 <3.11.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", - "dev": true - } - } - }, - "webpack-sources": { - "version": "0.2.3", - "from": "webpack-sources@>=0.2.3 <0.3.0", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.2.3.tgz", - "dev": true - } - } - }, - "webpack-dev-middleware": { - "version": "1.11.0", - "from": "webpack-dev-middleware@>=1.8.4 <2.0.0", - "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-1.11.0.tgz", - "dev": true, - "dependencies": { - "memory-fs": { - "version": "0.4.1", - "from": "memory-fs@>=0.4.1 <0.5.0", - "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz", - "dev": true - } - } - }, - "webpack-hot-middleware": { - "version": "2.18.0", - "from": "webpack-hot-middleware@>=2.18.0 <3.0.0", - "resolved": "https://registry.npmjs.org/webpack-hot-middleware/-/webpack-hot-middleware-2.18.0.tgz", - "dev": true - }, - "webpack-node-externals": { - "version": "1.6.0", - "from": "webpack-node-externals@>=1.4.3 <2.0.0", - "resolved": "https://registry.npmjs.org/webpack-node-externals/-/webpack-node-externals-1.6.0.tgz", - "dev": true - }, - "webpack-sources": { - "version": "1.0.1", - "from": "webpack-sources@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.0.1.tgz", - "dev": true, - "dependencies": { - "source-list-map": { - "version": "2.0.0", - "from": "source-list-map@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz", - "dev": true - } - } - }, - "whatwg-fetch": { - "version": "2.0.3", - "from": "whatwg-fetch@>=0.10.0", - "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz" - }, - "whet.extend": { - "version": "0.9.9", - "from": "whet.extend@>=0.9.9 <0.10.0", - "resolved": "https://registry.npmjs.org/whet.extend/-/whet.extend-0.9.9.tgz", - "dev": true - }, - "which-module": { - "version": "1.0.0", - "from": "which-module@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz", - "dev": true - }, - "window-size": { - "version": "0.1.0", - "from": "window-size@0.1.0", - "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz", - "dev": true - }, - "wordwrap": { - "version": "0.0.2", - "from": "wordwrap@0.0.2", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz", - "dev": true - }, - "wrap-ansi": { - "version": "2.1.0", - "from": "wrap-ansi@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", - "dev": true - }, - "xml-char-classes": { - "version": "1.0.0", - "from": "xml-char-classes@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/xml-char-classes/-/xml-char-classes-1.0.0.tgz", - "dev": true - }, - "xtend": { - "version": "4.0.1", - "from": "xtend@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", - "dev": true - }, - "y18n": { - "version": "3.2.1", - "from": "y18n@>=3.2.1 <4.0.0", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", - "dev": true - }, - "yargs": { - "version": "6.6.0", - "from": "yargs@>=6.0.0 <7.0.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz", - "dev": true, - "dependencies": { - "camelcase": { - "version": "3.0.0", - "from": "camelcase@>=3.0.0 <4.0.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", - "dev": true - }, - "cliui": { - "version": "3.2.0", - "from": "cliui@>=3.2.0 <4.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", - "dev": true - } - } - }, - "yargs-parser": { - "version": "4.2.1", - "from": "yargs-parser@>=4.2.0 <5.0.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz", - "dev": true, - "dependencies": { - "camelcase": { - "version": "3.0.0", - "from": "camelcase@>=3.0.0 <4.0.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", - "dev": true - } - } - } - } -} diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/package.json b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/package.json deleted file mode 100644 index cc8cc6b1..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/package.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "AureliaSpa", - "private": true, - "version": "0.0.0", - "devDependencies": { - "@types/webpack-env": "^1.13.0", - "aspnet-webpack": "^2.0.1", - "aurelia-bootstrapper": "^2.0.1", - "aurelia-fetch-client": "^1.0.1", - "aurelia-framework": "^1.1.0", - "aurelia-loader-webpack": "^2.0.0", - "aurelia-pal": "^1.3.0", - "aurelia-router": "^1.2.1", - "aurelia-webpack-plugin": "^2.0.0-rc.2", - "bootstrap": "^3.3.7", - "css-loader": "^0.28.0", - "extract-text-webpack-plugin": "^2.1.0", - "file-loader": "^0.11.1", - "html-loader": "^0.4.5", - "isomorphic-fetch": "^2.2.1", - "jquery": "^3.2.1", - "json-loader": "^0.5.4", - "style-loader": "^0.16.1", - "ts-loader": "^2.0.3", - "typescript": "^2.2.2", - "url-loader": "^0.5.8", - "webpack": "^2.3.3", - "webpack-hot-middleware": "^2.18.0" - } -} diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/tsconfig.json b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/tsconfig.json deleted file mode 100644 index bcbfa21c..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/tsconfig.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "compilerOptions": { - "module": "es2015", - "moduleResolution": "node", - "target": "es5", - "sourceMap": true, - "experimentalDecorators": true, - "emitDecoratorMetadata": true, - "skipDefaultLibCheck": true, - "strict": true, - "lib": [ "es2015", "dom" ], - "types": [ "webpack-env" ] - }, - "exclude": [ "bin", "node_modules" ], - "atom": { "rewriteTsconfig": false } -} diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/webpack.config.js b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/webpack.config.js deleted file mode 100644 index 5ff94d09..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/webpack.config.js +++ /dev/null @@ -1,44 +0,0 @@ -const path = require('path'); -const webpack = require('webpack'); -const { AureliaPlugin } = require('aurelia-webpack-plugin'); -const bundleOutputDir = './wwwroot/dist'; - -module.exports = (env) => { - const isDevBuild = !(env && env.prod); - return [{ - stats: { modules: false }, - entry: { 'app': 'aurelia-bootstrapper' }, - resolve: { - extensions: ['.ts', '.js'], - modules: ['ClientApp', 'node_modules'], - }, - output: { - path: path.resolve(bundleOutputDir), - publicPath: 'dist/', - filename: '[name].js' - }, - module: { - rules: [ - { test: /\.ts$/i, include: /ClientApp/, use: 'ts-loader?silent=true' }, - { test: /\.html$/i, use: 'html-loader' }, - { test: /\.css$/i, use: isDevBuild ? 'css-loader' : 'css-loader?minimize' }, - { test: /\.(png|jpg|jpeg|gif|svg)$/, use: 'url-loader?limit=25000' } - ] - }, - plugins: [ - new webpack.DefinePlugin({ IS_DEV_BUILD: JSON.stringify(isDevBuild) }), - new webpack.DllReferencePlugin({ - context: __dirname, - manifest: require('./wwwroot/dist/vendor-manifest.json') - }), - new AureliaPlugin({ aureliaApp: 'boot' }) - ].concat(isDevBuild ? [ - new webpack.SourceMapDevToolPlugin({ - filename: '[file].map', // Remove this line if you prefer inline source maps - moduleFilenameTemplate: path.relative(bundleOutputDir, '[resourcePath]') // Point sourcemap entries to the original file locations on disk - }) - ] : [ - new webpack.optimize.UglifyJsPlugin() - ]) - }]; -} diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/webpack.config.vendor.js b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/webpack.config.vendor.js deleted file mode 100644 index 1dc579ce..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/webpack.config.vendor.js +++ /dev/null @@ -1,56 +0,0 @@ -var path = require('path'); -var webpack = require('webpack'); -var ExtractTextPlugin = require('extract-text-webpack-plugin'); -var extractCSS = new ExtractTextPlugin('vendor.css'); - -module.exports = ({ prod } = {}) => { - const isDevBuild = !prod; - - return [{ - stats: { modules: false }, - resolve: { - extensions: ['.js'] - }, - module: { - loaders: [ - { test: /\.(png|woff|woff2|eot|ttf|svg)(\?|$)/, loader: 'url-loader?limit=100000' }, - { test: /\.css(\?|$)/, loader: extractCSS.extract([isDevBuild ? 'css-loader' : 'css-loader?minimize']) } - ] - }, - entry: { - vendor: [ - 'aurelia-event-aggregator', - 'aurelia-fetch-client', - 'aurelia-framework', - 'aurelia-history-browser', - 'aurelia-logging-console', - 'aurelia-pal-browser', - 'aurelia-polyfills', - 'aurelia-route-recognizer', - 'aurelia-router', - 'aurelia-templating-binding', - 'aurelia-templating-resources', - 'aurelia-templating-router', - 'bootstrap', - 'bootstrap/dist/css/bootstrap.css', - 'jquery' - ], - }, - output: { - path: path.join(__dirname, 'wwwroot', 'dist'), - publicPath: 'dist/', - filename: '[name].js', - library: '[name]_[hash]', - }, - plugins: [ - extractCSS, - new webpack.ProvidePlugin({ $: 'jquery', jQuery: 'jquery' }), // Maps these identifiers to the jQuery package (because Bootstrap expects it to be a global variable) - new webpack.DllPlugin({ - path: path.join(__dirname, 'wwwroot', 'dist', '[name]-manifest.json'), - name: '[name]_[hash]' - }) - ].concat(isDevBuild ? [] : [ - new webpack.optimize.UglifyJsPlugin({ compress: { warnings: false } }) - ]) - }] -}; diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/wwwroot/favicon.ico b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/wwwroot/favicon.ico deleted file mode 100644 index 6884543f9617d81e56ccd478989bec1ece300e3a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 85432 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 HVFdmUW_yrt diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/.gitignore b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/.gitignore deleted file mode 100644 index 3e035eee..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/.gitignore +++ /dev/null @@ -1,236 +0,0 @@ -/Properties/launchSettings.json - -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. - -# User-specific files -*.suo -*.user -*.userosscache -*.sln.docstates - -# User-specific files (MonoDevelop/Xamarin Studio) -*.userprefs - -# Build results -[Dd]ebug/ -[Dd]ebugPublic/ -[Rr]elease/ -[Rr]eleases/ -x64/ -x86/ -build/ -bld/ -bin/ -Bin/ -obj/ -Obj/ - -# Visual Studio 2015 cache/options directory -.vs/ -/wwwroot/dist/ - -/yarn.lock - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* - -# NUNIT -*.VisualState.xml -TestResult.xml - -# Build Results of an ATL Project -[Dd]ebugPS/ -[Rr]eleasePS/ -dlldata.c - -*_i.c -*_p.c -*_i.h -*.ilk -*.meta -*.obj -*.pch -*.pdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*.log -*.vspscc -*.vssscc -.builds -*.pidb -*.svclog -*.scc - -# Chutzpah Test files -_Chutzpah* - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opendb -*.opensdf -*.sdf -*.cachefile - -# Visual Studio profiler -*.psess -*.vsp -*.vspx -*.sap - -# TFS 2012 Local Workspace -$tf/ - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper -*.DotSettings.user - -# JustCode is a .NET coding add-in -.JustCode - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# NCrunch -_NCrunch_* -.*crunch*.local.xml -nCrunchTemp_* - -# MightyMoose -*.mm.* -AutoTest.Net/ - -# Web workbench (sass) -.sass-cache/ - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ - -# Publish Web Output -*.[Pp]ublish.xml -*.azurePubxml -# TODO: Comment the next line if you want to checkin your web deploy settings -# but database connection strings (with potential passwords) will be unencrypted -*.pubxml -*.publishproj - -# NuGet Packages -*.nupkg -# The packages folder can be ignored because of Package Restore -**/packages/* -# except build/, which is used as an MSBuild target. -!**/packages/build/ -# Uncomment if necessary however generally it will be regenerated when needed -#!**/packages/repositories.config - -# Microsoft Azure Build Output -csx/ -*.build.csdef - -# Microsoft Azure Emulator -ecf/ -rcf/ - -# Microsoft Azure ApplicationInsights config file -ApplicationInsights.config - -# Windows Store app package directory -AppPackages/ -BundleArtifacts/ - -# Visual Studio cache files -# files ending in .cache can be ignored -*.[Cc]ache -# but keep track of directories ending in .cache -!*.[Cc]ache/ - -# Others -ClientBin/ -~$* -*~ -*.dbmdl -*.dbproj.schemaview -*.pfx -*.publishsettings -orleans.codegen.cs - -/node_modules - -# RIA/Silverlight projects -Generated_Code/ - -# Backup & report files from converting an old project file -# to a newer Visual Studio version. Backup files are not needed, -# because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML -UpgradeLog*.htm - -# SQL Server files -*.mdf -*.ldf - -# Business Intelligence projects -*.rdl.data -*.bim.layout -*.bim_*.settings - -# Microsoft Fakes -FakesAssemblies/ - -# GhostDoc plugin setting file -*.GhostDoc.xml - -# Node.js Tools for Visual Studio -.ntvs_analysis.dat - -# Visual Studio 6 build log -*.plg - -# Visual Studio 6 workspace options file -*.opt - -# Visual Studio LightSwitch build output -**/*.HTMLClient/GeneratedArtifacts -**/*.DesktopClient/GeneratedArtifacts -**/*.DesktopClient/ModelManifest.xml -**/*.Server/GeneratedArtifacts -**/*.Server/ModelManifest.xml -_Pvt_Extensions - -# Paket dependency manager -.paket/paket.exe - -# FAKE - F# Make -.fake/ diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/.template.config/dotnetcli.host.json b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/.template.config/dotnetcli.host.json deleted file mode 100644 index c15c6681..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/.template.config/dotnetcli.host.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "$schema": "http://json.schemastore.org/dotnetcli.host", - "symbolInfo": { - "TargetFrameworkOverride": { - "isHidden": "true", - "longName": "target-framework-override", - "shortName": "" - }, - "Framework": { - "longName": "framework" - }, - "skipRestore": { - "longName": "no-restore", - "shortName": "" - } - } -} \ No newline at end of file diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/.template.config/icon.png b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/.template.config/icon.png deleted file mode 100644 index adeddc23cf5f3f58c1b9e37cffd76b073e4f5d23..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6109 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 component -ko.components.register('app-root', AppRootComponent); - -// Tell Knockout to start up an instance of your application -ko.applyBindings({ history: createBrowserHistory({ basename }), basename }); - -// Basic hot reloading support. Automatically reloads and restarts the Knockout app each time -// you modify source files. This will not preserve any application state other than the URL. -if (module.hot) { - module.hot.accept(); - module.hot.dispose(() => ko.cleanNode(document.body)); -} diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/app-root/app-root.html b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/app-root/app-root.html deleted file mode 100644 index 88e345bd..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/app-root/app-root.html +++ /dev/null @@ -1,8 +0,0 @@ -
    -
    -
    - -
    -
    -
    -
    diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/app-root/app-root.ts b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/app-root/app-root.ts deleted file mode 100644 index 2ca1bfeb..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/app-root/app-root.ts +++ /dev/null @@ -1,44 +0,0 @@ -import * as ko from 'knockout'; -import * as History from 'history'; -import { Route, Router } from '../../router'; -import navMenu from '../nav-menu/nav-menu'; - -// Declare the client-side routing configuration -const routes: Route[] = [ - { url: '', params: { page: 'home-page' } }, - { url: 'counter', params: { page: 'counter-example' } }, - { url: 'fetch-data', params: { page: 'fetch-data' } } -]; - -class AppRootViewModel { - public route: KnockoutObservable; - public router: Router; - - constructor(params: { history: History.History, basename: string }) { - // Activate the client-side router - this.router = new Router(params.history, routes, params.basename); - this.route = this.router.currentRoute; - - // Load and register all the KO components needed to handle the routes - // The optional 'bundle-loader?lazy!' prefix is a Webpack feature that causes the referenced modules - // to be split into separate files that are then loaded on demand. - // For docs, see https://github.com/webpack/bundle-loader - ko.components.register('nav-menu', navMenu); - ko.components.register('home-page', require('bundle-loader?lazy!../home-page/home-page')); - ko.components.register('counter-example', require('bundle-loader?lazy!../counter-example/counter-example')); - ko.components.register('fetch-data', require('bundle-loader?lazy!../fetch-data/fetch-data')); - } - - // To support hot module replacement, this method unregisters the router and KO components. - // In production scenarios where hot module replacement is disabled, this would not be invoked. - public dispose() { - this.router.dispose(); - - // TODO: Need a better API for this - Object.getOwnPropertyNames((ko).components._allRegisteredComponents).forEach(componentName => { - ko.components.unregister(componentName); - }); - } -} - -export default { viewModel: AppRootViewModel, template: require('./app-root.html') }; diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/counter-example/counter-example.html b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/counter-example/counter-example.html deleted file mode 100644 index 3656d7d3..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/counter-example/counter-example.html +++ /dev/null @@ -1,7 +0,0 @@ -

    Counter

    - -

    This is a simple example of a Knockout component.

    - -

    Current count:

    - - diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/counter-example/counter-example.ts b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/counter-example/counter-example.ts deleted file mode 100644 index 39b7f046..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/counter-example/counter-example.ts +++ /dev/null @@ -1,12 +0,0 @@ -import * as ko from 'knockout'; - -class CounterExampleViewModel { - public currentCount = ko.observable(0); - - public incrementCounter() { - let prevCount = this.currentCount(); - this.currentCount(prevCount + 1); - } -} - -export default { viewModel: CounterExampleViewModel, template: require('./counter-example.html') }; diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/fetch-data/fetch-data.html b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/fetch-data/fetch-data.html deleted file mode 100644 index 8e9223bb..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/fetch-data/fetch-data.html +++ /dev/null @@ -1,24 +0,0 @@ -

    Weather forecast

    - -

    This component demonstrates fetching data from the server.

    - -

    Loading...

    - - - - - - - - - - - - - - - - - - -
    DateTemp. (C)Temp. (F)Summary
    diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/fetch-data/fetch-data.ts b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/fetch-data/fetch-data.ts deleted file mode 100644 index b0538900..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/fetch-data/fetch-data.ts +++ /dev/null @@ -1,23 +0,0 @@ -import * as ko from 'knockout'; -import 'isomorphic-fetch'; - -interface WeatherForecast { - dateFormatted: string; - temperatureC: number; - temperatureF: number; - summary: string; -} - -class FetchDataViewModel { - public forecasts = ko.observableArray(); - - constructor() { - fetch('http://github.com/api/SampleData/WeatherForecasts') - .then(response => response.json() as Promise) - .then(data => { - this.forecasts(data); - }); - } -} - -export default { viewModel: FetchDataViewModel, template: require('./fetch-data.html') }; diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/home-page/home-page.html b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/home-page/home-page.html deleted file mode 100644 index 46242687..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/home-page/home-page.html +++ /dev/null @@ -1,16 +0,0 @@ -

    Hello, world!

    -

    Welcome to your new single-page application, built with:

    - -

    To help you get started, we've also set up:

    -
      -
    • Client-side navigation. For example, click Counter then Back to return here.
      • -
    • Webpack dev middleware. In development mode, there's no need to run the webpack build tool. Your client-side resources are dynamically built on demand. Updates are available as soon as you modify any file.
      • -
    • Hot module replacement. In development mode, you don't even need to reload the page after making most changes. Within seconds of saving changes to files, your Knockout app will be rebuilt and a new instance injected is into the page.
      • -
    • Code splitting and lazy loading. KO components may optionally be bundled individually and loaded on demand. For example, the code and template for 'Counter' is not loaded until you navigate to it..
      • -
    • Efficient production builds. In production mode, development-time features are disabled, and the webpack build tool produces minified static CSS and JavaScript files.
      • -
    diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/home-page/home-page.ts b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/home-page/home-page.ts deleted file mode 100644 index 588024e2..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/home-page/home-page.ts +++ /dev/null @@ -1,6 +0,0 @@ -import * as ko from 'knockout'; - -class HomePageViewModel { -} - -export default { viewModel: HomePageViewModel, template: require('./home-page.html') }; diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/nav-menu/nav-menu.html b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/nav-menu/nav-menu.html deleted file mode 100644 index d2af38d8..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/nav-menu/nav-menu.html +++ /dev/null @@ -1,33 +0,0 @@ -
    -
    -
    - - KnockoutSpa -
    -
    -
    - -
    -
    -
    diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/nav-menu/nav-menu.ts b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/nav-menu/nav-menu.ts deleted file mode 100644 index 4ea1fdb8..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/nav-menu/nav-menu.ts +++ /dev/null @@ -1,21 +0,0 @@ -import * as ko from 'knockout'; -import { Route, Router } from '../../router'; - -interface NavMenuParams { - router: Router; -} - -class NavMenuViewModel { - public router: Router; - public route: KnockoutObservable; - - constructor(params: NavMenuParams) { - // This viewmodel doesn't do anything except pass through the 'route' parameter to the view. - // You could remove this viewmodel entirely, and define 'nav-menu' as a template-only component. - // But in most apps, you'll want some viewmodel logic to determine what navigation options appear. - this.router = params.router; - this.route = this.router.currentRoute; - } -} - -export default { viewModel: NavMenuViewModel, template: require('./nav-menu.html') }; diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/css/site.css b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/css/site.css deleted file mode 100644 index 3058af68..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/css/site.css +++ /dev/null @@ -1,66 +0,0 @@ -.main-nav li .glyphicon { - margin-right: 10px; -} - -/* Highlighting rules for nav menu items */ -.main-nav li a.active, -.main-nav li a.active:hover, -.main-nav li a.active:focus { - background-color: #4189C7; - color: white; -} - -/* Keep the nav menu independent of scrolling and on top of other items */ -.main-nav { - position: fixed; - top: 0; - left: 0; - right: 0; - z-index: 1; -} - -@media (max-width: 767px) { - /* On small screens, the nav menu spans the full width of the screen. Leave a space for it. */ - body { - padding-top: 50px; - } -} - -@media (min-width: 768px) { - /* On small screens, convert the nav menu to a vertical sidebar */ - .main-nav { - height: 100%; - width: calc(25% - 20px); - } - .main-nav .navbar { - border-radius: 0px; - border-width: 0px; - height: 100%; - } - .main-nav .navbar-header { - float: none; - } - .main-nav .navbar-collapse { - border-top: 1px solid #444; - padding: 0px; - } - .main-nav .navbar ul { - float: none; - } - .main-nav .navbar li { - float: none; - font-size: 15px; - margin: 6px; - } - .main-nav .navbar li a { - padding: 10px 16px; - border-radius: 4px; - } - .main-nav .navbar a { - /* If a menu item's text is too long, truncate it */ - width: 100%; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - } -} diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/router.ts b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/router.ts deleted file mode 100644 index eeb1b405..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/router.ts +++ /dev/null @@ -1,62 +0,0 @@ -import * as ko from 'knockout'; -import * as $ from 'jquery'; -import * as History from 'history'; -import * as crossroads from 'crossroads'; - -// This module configures crossroads.js, a routing library. If you prefer, you -// can use any other routing library (or none at all) as Knockout is designed to -// compose cleanly with external libraries. -// -// You *don't* have to follow the pattern established here (each route entry -// specifies a 'page', which is a Knockout component) - there's nothing built into -// Knockout that requires or even knows about this technique. It's just one of -// many possible ways of setting up client-side routes. -export class Router { - public currentRoute = ko.observable({}); - private disposeHistory: () => void; - private clickEventListener: EventListener; - - constructor(private history: History.History, routes: Route[], basename: string) { - // Reset and configure Crossroads so it matches routes and updates this.currentRoute - crossroads.removeAllRoutes(); - crossroads.resetState(); - (crossroads as any).normalizeFn = crossroads.NORM_AS_OBJECT; - routes.forEach(route => { - crossroads.addRoute(route.url, (requestParams: any) => { - this.currentRoute(ko.utils.extend(requestParams, route.params)); - }); - }); - - // Make history.js watch for navigation and notify Crossroads - this.disposeHistory = history.listen(location => crossroads.parse(location.pathname)); - this.clickEventListener = evt => { - let target: any = evt.currentTarget; - if (target && target.tagName === 'A') { - let href = target.getAttribute('href'); - if (href && href.indexOf(basename + '/') === 0) { - const hrefAfterBasename = href.substring(basename.length); - history.push(hrefAfterBasename); - evt.preventDefault(); - } - } - }; - $(document).on('click', 'a', this.clickEventListener); - - // Initialize Crossroads with starting location - crossroads.parse(history.location.pathname); - } - - public link(url: string): string { - return this.history.createHref({ pathname: url }); - } - - public dispose() { - this.disposeHistory(); - $(document).off('click', 'a', this.clickEventListener); - } -} - -export interface Route { - url?: string; - params?: any; -} diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/webpack-component-loader.ts b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/webpack-component-loader.ts deleted file mode 100644 index 823ab546..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/webpack-component-loader.ts +++ /dev/null @@ -1,25 +0,0 @@ -import * as ko from 'knockout'; - -// This Knockout component loader integrates with Webpack's lazy-loaded bundle feature. -// Having this means you can optionally declare components as follows: -// ko.components.register('my-component', require('bundle-loader?lazy!../some-path-to-a-js-or-ts-module')); -// ... and then it will be loaded on demand instead of being loaded up front. -ko.components.loaders.unshift({ - loadComponent: (name, componentConfig, callback) => { - if (typeof componentConfig === 'function') { - // It's a lazy-loaded Webpack bundle - (componentConfig as any)((loadedModule: any) => { - // Handle TypeScript-style default exports - if (loadedModule.__esModule && loadedModule.default) { - loadedModule = loadedModule.default; - } - - // Pass the loaded module to KO's default loader - ko.components.defaultLoader.loadComponent!(name, loadedModule as KnockoutComponentTypes.ComponentConfig, callback); - }); - } else { - // It's something else - let another component loader handle it - callback((null as any) as KnockoutComponentTypes.Definition); // workaround until https://github.com/DefinitelyTyped/DefinitelyTyped/pull/17999 - } - } -}); diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/Controllers/HomeController.cs b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/Controllers/HomeController.cs deleted file mode 100644 index e952e8d3..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/Controllers/HomeController.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Mvc; - -namespace KnockoutSpa.Controllers -{ - public class HomeController : Controller - { - public IActionResult Index() - { - return View(); - } - - public IActionResult Error() - { - ViewData["RequestId"] = Activity.Current?.Id ?? HttpContext.TraceIdentifier; - return View(); - } - } -} diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/Controllers/SampleDataController.cs b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/Controllers/SampleDataController.cs deleted file mode 100644 index 0b30849b..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/Controllers/SampleDataController.cs +++ /dev/null @@ -1,44 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Mvc; - -namespace KnockoutSpa.Controllers -{ - [Route("api/[controller]")] - public class SampleDataController : Controller - { - private static string[] Summaries = new[] - { - "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching" - }; - - [HttpGet("[action]")] - public IEnumerable WeatherForecasts() - { - var rng = new Random(); - return Enumerable.Range(1, 5).Select(index => new WeatherForecast - { - DateFormatted = DateTime.Now.AddDays(index).ToString("d"), - TemperatureC = rng.Next(-20, 55), - Summary = Summaries[rng.Next(Summaries.Length)] - }); - } - - public class WeatherForecast - { - public string DateFormatted { get; set; } - public int TemperatureC { get; set; } - public string Summary { get; set; } - - public int TemperatureF - { - get - { - return 32 + (int)(TemperatureC / 0.5556); - } - } - } - } -} diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/KnockoutSpa.csproj b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/KnockoutSpa.csproj deleted file mode 100644 index eff4c62c..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/KnockoutSpa.csproj +++ /dev/null @@ -1,57 +0,0 @@ - - - - netcoreapp2.0 - TargetFrameworkOverride - true - Latest - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - %(DistFiles.Identity) - PreserveNewest - - - - - \ No newline at end of file diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/Program.cs b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/Program.cs deleted file mode 100644 index 514e143e..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/Program.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.Logging; - -namespace KnockoutSpa -{ - public class Program - { - public static void Main(string[] args) - { - BuildWebHost(args).Run(); - } - - public static IWebHost BuildWebHost(string[] args) => - WebHost.CreateDefaultBuilder(args) - .UseStartup() - .Build(); - } -} diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/Startup.cs b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/Startup.cs deleted file mode 100644 index fc7290b4..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/Startup.cs +++ /dev/null @@ -1,58 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.SpaServices.Webpack; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; - -namespace KnockoutSpa -{ - public class Startup - { - public Startup(IConfiguration configuration) - { - Configuration = configuration; - } - - public IConfiguration Configuration { get; } - - // This method gets called by the runtime. Use this method to add services to the container. - public void ConfigureServices(IServiceCollection services) - { - services.AddMvc(); - } - - // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IHostingEnvironment env) - { - if (env.IsDevelopment()) - { - app.UseDeveloperExceptionPage(); - app.UseWebpackDevMiddleware(new WebpackDevMiddlewareOptions - { - HotModuleReplacement = true - }); - } - else - { - app.UseExceptionHandler("/Home/Error"); - } - - app.UseStaticFiles(); - - app.UseMvc(routes => - { - routes.MapRoute( - name: "default", - template: "{controller=Home}/{action=Index}/{id?}"); - - routes.MapSpaFallbackRoute( - name: "spa-fallback", - defaults: new { controller = "Home", action = "Index" }); - }); - } - } -} diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/Views/Home/Index.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/Views/Home/Index.cshtml deleted file mode 100644 index 02530207..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/Views/Home/Index.cshtml +++ /dev/null @@ -1,9 +0,0 @@ -@{ - ViewData["Title"] = "Home Page"; -} - - - -@section scripts { - -} diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/Views/Shared/Error.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/Views/Shared/Error.cshtml deleted file mode 100644 index 78e35d5d..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/Views/Shared/Error.cshtml +++ /dev/null @@ -1,21 +0,0 @@ -@{ - ViewData["Title"] = "Error"; -} - -

    Error.

    -

    An error occurred while processing your request.

    - -@if (!string.IsNullOrEmpty((string)ViewData["RequestId"])) -{ -

    - Request ID: @ViewData["RequestId"] -

    -} - -

    Development Mode

    -

    - Swapping to Development environment will display more detailed information about the error that occurred. -

    -

    - Development environment should not be enabled in deployed applications, as it can result in sensitive information from exceptions being displayed to end users. For local debugging, development environment can be enabled by setting the ASPNETCORE_ENVIRONMENT environment variable to Development, and restarting the application. -

    diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/Views/Shared/_Layout.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/Views/Shared/_Layout.cshtml deleted file mode 100644 index 448e6d7b..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/Views/Shared/_Layout.cshtml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - @ViewData["Title"] - KnockoutSpa - - - - - - - - - @RenderBody() - - - @RenderSection("scripts", required: false) - - diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/Views/_ViewImports.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/Views/_ViewImports.cshtml deleted file mode 100644 index b4dea68c..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/Views/_ViewImports.cshtml +++ /dev/null @@ -1,3 +0,0 @@ -@using KnockoutSpa -@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers -@addTagHelper *, Microsoft.AspNetCore.SpaServices diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/Views/_ViewStart.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/Views/_ViewStart.cshtml deleted file mode 100644 index 820a2f6e..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/Views/_ViewStart.cshtml +++ /dev/null @@ -1,3 +0,0 @@ -@{ - Layout = "_Layout"; -} diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/appsettings.Development.json b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/appsettings.Development.json deleted file mode 100644 index 457e0033..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/appsettings.Development.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "Logging": { - "IncludeScopes": false, - "Debug": { - "LogLevel": { - "Default": "Debug", - "System": "Information", - "Microsoft": "Information" - } - }, - "Console": { - "LogLevel": { - "Default": "Debug", - "System": "Information", - "Microsoft": "Information" - } - } - } -} diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/appsettings.json b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/appsettings.json deleted file mode 100644 index c851e129..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/appsettings.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "Logging": { - "IncludeScopes": false, - "Debug": { - "LogLevel": { - "Default": "Warning" - } - }, - "Console": { - "LogLevel": { - "Default": "Warning" - } - } - } -} diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/npm-shrinkwrap.json b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/npm-shrinkwrap.json deleted file mode 100644 index 8c897ce3..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/npm-shrinkwrap.json +++ /dev/null @@ -1,2491 +0,0 @@ -{ - "name": "KnockoutSpa", - "version": "0.0.0", - "dependencies": { - "@types/core-js": { - "version": "0.9.41", - "from": "@types/core-js@>=0.9.34 <0.10.0", - "resolved": "https://registry.npmjs.org/@types/core-js/-/core-js-0.9.41.tgz", - "dev": true - }, - "@types/crossroads": { - "version": "0.0.29", - "from": "@types/crossroads@0.0.29", - "resolved": "https://registry.npmjs.org/@types/crossroads/-/crossroads-0.0.29.tgz", - "dev": true - }, - "@types/es6-promise": { - "version": "0.0.32", - "from": "@types/es6-promise@0.0.32", - "resolved": "https://registry.npmjs.org/@types/es6-promise/-/es6-promise-0.0.32.tgz", - "dev": true - }, - "@types/history": { - "version": "4.6.0", - "from": "@types/history@4.6.0", - "resolved": "https://registry.npmjs.org/@types/history/-/history-4.6.0.tgz", - "dev": true - }, - "@types/jquery": { - "version": "2.0.47", - "from": "@types/jquery@>=2.0.32 <3.0.0", - "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-2.0.47.tgz", - "dev": true - }, - "@types/knockout": { - "version": "3.4.41", - "from": "@types/knockout@>=3.4.35 <4.0.0", - "resolved": "https://registry.npmjs.org/@types/knockout/-/knockout-3.4.41.tgz", - "dev": true - }, - "@types/signals": { - "version": "0.0.16", - "from": "@types/signals@0.0.16", - "resolved": "https://registry.npmjs.org/@types/signals/-/signals-0.0.16.tgz", - "dev": true - }, - "@types/webpack-env": { - "version": "1.13.0", - "from": "@types/webpack-env@>=1.13.0 <2.0.0", - "resolved": "https://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.13.0.tgz", - "dev": true - }, - "acorn": { - "version": "5.0.3", - "from": "acorn@>=5.0.0 <6.0.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.0.3.tgz", - "dev": true - }, - "acorn-dynamic-import": { - "version": "2.0.2", - "from": "acorn-dynamic-import@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz", - "dev": true, - "dependencies": { - "acorn": { - "version": "4.0.13", - "from": "acorn@>=4.0.3 <5.0.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz", - "dev": true - } - } - }, - "ajv": { - "version": "5.2.0", - "from": "ajv@>=5.0.0 <6.0.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.0.tgz", - "dev": true - }, - "ajv-keywords": { - "version": "1.5.1", - "from": "ajv-keywords@>=1.1.1 <2.0.0", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.1.tgz", - "dev": true - }, - "align-text": { - "version": "0.1.4", - "from": "align-text@>=0.1.3 <0.2.0", - "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", - "dev": true - }, - "alphanum-sort": { - "version": "1.0.2", - "from": "alphanum-sort@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz", - "dev": true - }, - "ansi-html": { - "version": "0.0.7", - "from": "ansi-html@0.0.7", - "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz", - "dev": true - }, - "ansi-regex": { - "version": "2.1.1", - "from": "ansi-regex@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "dev": true - }, - "ansi-styles": { - "version": "2.2.1", - "from": "ansi-styles@>=2.2.1 <3.0.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "dev": true - }, - "anymatch": { - "version": "1.3.0", - "from": "anymatch@>=1.3.0 <2.0.0", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.0.tgz", - "dev": true - }, - "argparse": { - "version": "1.0.9", - "from": "argparse@>=1.0.7 <2.0.0", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz", - "dev": true - }, - "arr-diff": { - "version": "2.0.0", - "from": "arr-diff@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz", - "dev": true - }, - "arr-flatten": { - "version": "1.0.3", - "from": "arr-flatten@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.3.tgz", - "dev": true - }, - "array-unique": { - "version": "0.2.1", - "from": "array-unique@>=0.2.1 <0.3.0", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz", - "dev": true - }, - "arrify": { - "version": "1.0.1", - "from": "arrify@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", - "dev": true - }, - "asn1.js": { - "version": "4.9.1", - "from": "asn1.js@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.1.tgz", - "dev": true - }, - "aspnet-webpack": { - "version": "2.0.1", - "from": "aspnet-webpack@2.0.1", - "resolved": "https://registry.npmjs.org/aspnet-webpack/-/aspnet-webpack-2.0.1.tgz", - "dev": true - }, - "assert": { - "version": "1.4.1", - "from": "assert@>=1.1.1 <2.0.0", - "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz", - "dev": true - }, - "async": { - "version": "2.5.0", - "from": "async@>=2.1.2 <3.0.0", - "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz", - "dev": true - }, - "async-each": { - "version": "1.0.1", - "from": "async-each@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz", - "dev": true - }, - "autoprefixer": { - "version": "6.7.7", - "from": "autoprefixer@>=6.3.1 <7.0.0", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.7.7.tgz", - "dev": true - }, - "awesome-typescript-loader": { - "version": "3.1.3", - "from": "awesome-typescript-loader@>=3.0.0 <4.0.0", - "resolved": "https://registry.npmjs.org/awesome-typescript-loader/-/awesome-typescript-loader-3.1.3.tgz", - "dev": true - }, - "babel-code-frame": { - "version": "6.22.0", - "from": "babel-code-frame@>=6.11.0 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz", - "dev": true - }, - "balanced-match": { - "version": "0.4.2", - "from": "balanced-match@>=0.4.2 <0.5.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz", - "dev": true - }, - "base64-js": { - "version": "1.2.1", - "from": "base64-js@>=1.0.2 <2.0.0", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.1.tgz", - "dev": true - }, - "big.js": { - "version": "3.1.3", - "from": "big.js@>=3.1.3 <4.0.0", - "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.1.3.tgz", - "dev": true - }, - "binary-extensions": { - "version": "1.8.0", - "from": "binary-extensions@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.8.0.tgz", - "dev": true - }, - "bn.js": { - "version": "4.11.7", - "from": "bn.js@>=4.1.1 <5.0.0", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.7.tgz", - "dev": true - }, - "bootstrap": { - "version": "3.3.7", - "from": "bootstrap@>=3.3.6 <4.0.0", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.3.7.tgz", - "dev": true - }, - "brace-expansion": { - "version": "1.1.8", - "from": "brace-expansion@>=1.1.7 <2.0.0", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", - "dev": true, - "dependencies": { - "balanced-match": { - "version": "1.0.0", - "from": "balanced-match@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "dev": true - } - } - }, - "braces": { - "version": "1.8.5", - "from": "braces@>=1.8.2 <2.0.0", - "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz", - "dev": true - }, - "brorand": { - "version": "1.1.0", - "from": "brorand@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", - "dev": true - }, - "browserify-aes": { - "version": "1.0.6", - "from": "browserify-aes@>=1.0.4 <2.0.0", - "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.6.tgz", - "dev": true - }, - "browserify-cipher": { - "version": "1.0.0", - "from": "browserify-cipher@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz", - "dev": true - }, - "browserify-des": { - "version": "1.0.0", - "from": "browserify-des@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz", - "dev": true - }, - "browserify-rsa": { - "version": "4.0.1", - "from": "browserify-rsa@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", - "dev": true - }, - "browserify-sign": { - "version": "4.0.4", - "from": "browserify-sign@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz", - "dev": true - }, - "browserify-zlib": { - "version": "0.1.4", - "from": "browserify-zlib@>=0.1.4 <0.2.0", - "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz", - "dev": true - }, - "browserslist": { - "version": "1.7.7", - "from": "browserslist@>=1.7.6 <2.0.0", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz", - "dev": true - }, - "buffer": { - "version": "4.9.1", - "from": "buffer@>=4.3.0 <5.0.0", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz", - "dev": true - }, - "buffer-xor": { - "version": "1.0.3", - "from": "buffer-xor@>=1.0.2 <2.0.0", - "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz", - "dev": true - }, - "builtin-modules": { - "version": "1.1.1", - "from": "builtin-modules@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", - "dev": true - }, - "builtin-status-codes": { - "version": "3.0.0", - "from": "builtin-status-codes@>=3.0.0 <4.0.0", - "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz", - "dev": true - }, - "bundle-loader": { - "version": "0.5.5", - "from": "bundle-loader@>=0.5.4 <0.6.0", - "resolved": "https://registry.npmjs.org/bundle-loader/-/bundle-loader-0.5.5.tgz", - "dev": true - }, - "camelcase": { - "version": "1.2.1", - "from": "camelcase@>=1.0.2 <2.0.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", - "dev": true - }, - "caniuse-api": { - "version": "1.6.1", - "from": "caniuse-api@>=1.5.2 <2.0.0", - "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-1.6.1.tgz", - "dev": true - }, - "caniuse-db": { - "version": "1.0.30000694", - "from": "caniuse-db@>=1.0.30000634 <2.0.0", - "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000694.tgz", - "dev": true - }, - "center-align": { - "version": "0.1.3", - "from": "center-align@>=0.1.1 <0.2.0", - "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "from": "chalk@>=1.1.0 <2.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "dev": true - }, - "chokidar": { - "version": "1.7.0", - "from": "chokidar@>=1.4.3 <2.0.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz", - "dev": true - }, - "cipher-base": { - "version": "1.0.3", - "from": "cipher-base@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.3.tgz", - "dev": true - }, - "clap": { - "version": "1.2.0", - "from": "clap@>=1.0.9 <2.0.0", - "resolved": "https://registry.npmjs.org/clap/-/clap-1.2.0.tgz", - "dev": true - }, - "cliui": { - "version": "2.1.0", - "from": "cliui@>=2.1.0 <3.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", - "dev": true - }, - "clone": { - "version": "1.0.2", - "from": "clone@>=1.0.2 <2.0.0", - "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz", - "dev": true - }, - "co": { - "version": "4.6.0", - "from": "co@>=4.6.0 <5.0.0", - "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", - "dev": true - }, - "coa": { - "version": "1.0.3", - "from": "coa@>=1.0.1 <1.1.0", - "resolved": "https://registry.npmjs.org/coa/-/coa-1.0.3.tgz", - "dev": true - }, - "code-point-at": { - "version": "1.1.0", - "from": "code-point-at@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", - "dev": true - }, - "color": { - "version": "0.11.4", - "from": "color@>=0.11.0 <0.12.0", - "resolved": "https://registry.npmjs.org/color/-/color-0.11.4.tgz", - "dev": true - }, - "color-convert": { - "version": "1.9.0", - "from": "color-convert@>=1.3.0 <2.0.0", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz", - "dev": true - }, - "color-name": { - "version": "1.1.2", - "from": "color-name@>=1.1.1 <2.0.0", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.2.tgz", - "dev": true - }, - "color-string": { - "version": "0.3.0", - "from": "color-string@>=0.3.0 <0.4.0", - "resolved": "https://registry.npmjs.org/color-string/-/color-string-0.3.0.tgz", - "dev": true - }, - "colormin": { - "version": "1.1.2", - "from": "colormin@>=1.0.5 <2.0.0", - "resolved": "https://registry.npmjs.org/colormin/-/colormin-1.1.2.tgz", - "dev": true - }, - "colors": { - "version": "1.1.2", - "from": "colors@>=1.1.2 <2.0.0", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz", - "dev": true - }, - "concat-map": { - "version": "0.0.1", - "from": "concat-map@0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "dev": true - }, - "connect": { - "version": "3.6.2", - "from": "connect@>=3.4.1 <4.0.0", - "resolved": "https://registry.npmjs.org/connect/-/connect-3.6.2.tgz", - "dev": true - }, - "console-browserify": { - "version": "1.1.0", - "from": "console-browserify@>=1.1.0 <2.0.0", - "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz", - "dev": true - }, - "constants-browserify": { - "version": "1.0.0", - "from": "constants-browserify@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz", - "dev": true - }, - "core-util-is": { - "version": "1.0.2", - "from": "core-util-is@>=1.0.0 <1.1.0", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "dev": true - }, - "create-ecdh": { - "version": "4.0.0", - "from": "create-ecdh@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz", - "dev": true - }, - "create-hash": { - "version": "1.1.3", - "from": "create-hash@>=1.1.0 <2.0.0", - "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz", - "dev": true - }, - "create-hmac": { - "version": "1.1.6", - "from": "create-hmac@>=1.1.0 <2.0.0", - "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.6.tgz", - "dev": true - }, - "crossroads": { - "version": "0.12.2", - "from": "crossroads@>=0.12.2 <0.13.0", - "resolved": "https://registry.npmjs.org/crossroads/-/crossroads-0.12.2.tgz", - "dev": true - }, - "crypto-browserify": { - "version": "3.11.0", - "from": "crypto-browserify@>=3.11.0 <4.0.0", - "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.0.tgz", - "dev": true - }, - "css-color-names": { - "version": "0.0.4", - "from": "css-color-names@0.0.4", - "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz", - "dev": true - }, - "css-loader": { - "version": "0.25.0", - "from": "css-loader@>=0.25.0 <0.26.0", - "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.25.0.tgz", - "dev": true, - "dependencies": { - "loader-utils": { - "version": "0.2.17", - "from": "loader-utils@>=0.2.2 <0.3.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz", - "dev": true - } - } - }, - "css-selector-tokenizer": { - "version": "0.6.0", - "from": "css-selector-tokenizer@>=0.6.0 <0.7.0", - "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.6.0.tgz", - "dev": true - }, - "cssesc": { - "version": "0.1.0", - "from": "cssesc@>=0.1.0 <0.2.0", - "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-0.1.0.tgz", - "dev": true - }, - "cssnano": { - "version": "3.10.0", - "from": "cssnano@>=2.6.1 <4.0.0", - "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-3.10.0.tgz", - "dev": true - }, - "csso": { - "version": "2.3.2", - "from": "csso@>=2.3.1 <2.4.0", - "resolved": "https://registry.npmjs.org/csso/-/csso-2.3.2.tgz", - "dev": true - }, - "date-now": { - "version": "0.1.4", - "from": "date-now@>=0.1.4 <0.2.0", - "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz", - "dev": true - }, - "debug": { - "version": "2.6.7", - "from": "debug@2.6.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz", - "dev": true - }, - "decamelize": { - "version": "1.2.0", - "from": "decamelize@>=1.1.2 <2.0.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "dev": true - }, - "defined": { - "version": "1.0.0", - "from": "defined@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz", - "dev": true - }, - "des.js": { - "version": "1.0.0", - "from": "des.js@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz", - "dev": true - }, - "diffie-hellman": { - "version": "5.0.2", - "from": "diffie-hellman@>=5.0.0 <6.0.0", - "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.2.tgz", - "dev": true - }, - "domain-browser": { - "version": "1.1.7", - "from": "domain-browser@>=1.1.1 <2.0.0", - "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.7.tgz", - "dev": true - }, - "ee-first": { - "version": "1.1.1", - "from": "ee-first@1.1.1", - "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", - "dev": true - }, - "electron-to-chromium": { - "version": "1.3.14", - "from": "electron-to-chromium@>=1.2.7 <2.0.0", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.14.tgz", - "dev": true - }, - "elliptic": { - "version": "6.4.0", - "from": "elliptic@>=6.0.0 <7.0.0", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz", - "dev": true - }, - "emojis-list": { - "version": "2.1.0", - "from": "emojis-list@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz", - "dev": true - }, - "encodeurl": { - "version": "1.0.1", - "from": "encodeurl@>=1.0.1 <1.1.0", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.1.tgz", - "dev": true - }, - "encoding": { - "version": "0.1.12", - "from": "encoding@>=0.1.11 <0.2.0", - "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz", - "dev": true - }, - "enhanced-resolve": { - "version": "3.1.0", - "from": "enhanced-resolve@>=3.1.0 <4.0.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.1.0.tgz", - "dev": true, - "dependencies": { - "memory-fs": { - "version": "0.4.1", - "from": "memory-fs@>=0.4.0 <0.5.0", - "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz", - "dev": true - } - } - }, - "errno": { - "version": "0.1.4", - "from": "errno@>=0.1.3 <0.2.0", - "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.4.tgz", - "dev": true - }, - "error-ex": { - "version": "1.3.1", - "from": "error-ex@>=1.2.0 <2.0.0", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz", - "dev": true - }, - "es6-promise": { - "version": "3.3.1", - "from": "es6-promise@>=3.1.2 <4.0.0", - "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz", - "dev": true - }, - "escape-html": { - "version": "1.0.3", - "from": "escape-html@>=1.0.3 <1.1.0", - "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", - "dev": true - }, - "escape-string-regexp": { - "version": "1.0.5", - "from": "escape-string-regexp@>=1.0.2 <2.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "dev": true - }, - "esprima": { - "version": "2.7.3", - "from": "esprima@>=2.6.0 <3.0.0", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", - "dev": true - }, - "esutils": { - "version": "2.0.2", - "from": "esutils@>=2.0.2 <3.0.0", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", - "dev": true - }, - "event-source-polyfill": { - "version": "0.0.7", - "from": "event-source-polyfill@>=0.0.7 <0.0.8", - "resolved": "https://registry.npmjs.org/event-source-polyfill/-/event-source-polyfill-0.0.7.tgz", - "dev": true - }, - "events": { - "version": "1.1.1", - "from": "events@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz", - "dev": true - }, - "evp_bytestokey": { - "version": "1.0.0", - "from": "evp_bytestokey@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz", - "dev": true - }, - "expand-brackets": { - "version": "0.1.5", - "from": "expand-brackets@>=0.1.4 <0.2.0", - "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz", - "dev": true - }, - "expand-range": { - "version": "1.8.2", - "from": "expand-range@>=1.8.1 <2.0.0", - "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz", - "dev": true - }, - "extglob": { - "version": "0.3.2", - "from": "extglob@>=0.3.1 <0.4.0", - "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz", - "dev": true - }, - "extract-text-webpack-plugin": { - "version": "2.1.2", - "from": "extract-text-webpack-plugin@>=2.0.0-rc <3.0.0", - "resolved": "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-2.1.2.tgz", - "dev": true - }, - "fast-deep-equal": { - "version": "0.1.0", - "from": "fast-deep-equal@>=0.1.0 <0.2.0", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-0.1.0.tgz", - "dev": true - }, - "fastparse": { - "version": "1.1.1", - "from": "fastparse@>=1.1.1 <2.0.0", - "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.1.tgz", - "dev": true - }, - "file-loader": { - "version": "0.9.0", - "from": "file-loader@>=0.9.0 <0.10.0", - "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-0.9.0.tgz", - "dev": true, - "dependencies": { - "loader-utils": { - "version": "0.2.17", - "from": "loader-utils@>=0.2.5 <0.3.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz", - "dev": true - } - } - }, - "filename-regex": { - "version": "2.0.1", - "from": "filename-regex@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz", - "dev": true - }, - "fill-range": { - "version": "2.2.3", - "from": "fill-range@>=2.1.0 <3.0.0", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz", - "dev": true - }, - "finalhandler": { - "version": "1.0.3", - "from": "finalhandler@1.0.3", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.3.tgz", - "dev": true - }, - "find-up": { - "version": "1.1.2", - "from": "find-up@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", - "dev": true - }, - "flatten": { - "version": "1.0.2", - "from": "flatten@>=1.0.2 <2.0.0", - "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz", - "dev": true - }, - "for-in": { - "version": "1.0.2", - "from": "for-in@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", - "dev": true - }, - "for-own": { - "version": "0.1.5", - "from": "for-own@>=0.1.4 <0.2.0", - "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz", - "dev": true - }, - "function-bind": { - "version": "1.1.0", - "from": "function-bind@>=1.0.2 <2.0.0", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.0.tgz", - "dev": true - }, - "get-caller-file": { - "version": "1.0.2", - "from": "get-caller-file@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz", - "dev": true - }, - "glob-base": { - "version": "0.3.0", - "from": "glob-base@>=0.3.0 <0.4.0", - "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz", - "dev": true - }, - "glob-parent": { - "version": "2.0.0", - "from": "glob-parent@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz", - "dev": true - }, - "graceful-fs": { - "version": "4.1.11", - "from": "graceful-fs@>=4.1.2 <5.0.0", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", - "dev": true - }, - "has": { - "version": "1.0.1", - "from": "has@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz", - "dev": true - }, - "has-ansi": { - "version": "2.0.0", - "from": "has-ansi@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", - "dev": true - }, - "has-flag": { - "version": "1.0.0", - "from": "has-flag@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "dev": true - }, - "hash-base": { - "version": "2.0.2", - "from": "hash-base@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz", - "dev": true - }, - "hash.js": { - "version": "1.1.1", - "from": "hash.js@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.1.tgz", - "dev": true - }, - "history": { - "version": "4.6.3", - "from": "history@>=4.3.0 <5.0.0", - "resolved": "https://registry.npmjs.org/history/-/history-4.6.3.tgz", - "dev": true - }, - "hmac-drbg": { - "version": "1.0.1", - "from": "hmac-drbg@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", - "dev": true - }, - "hosted-git-info": { - "version": "2.4.2", - "from": "hosted-git-info@>=2.1.4 <3.0.0", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.4.2.tgz", - "dev": true - }, - "html-comment-regex": { - "version": "1.1.1", - "from": "html-comment-regex@>=1.1.0 <2.0.0", - "resolved": "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.1.tgz", - "dev": true - }, - "html-entities": { - "version": "1.2.1", - "from": "html-entities@>=1.2.0 <2.0.0", - "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz", - "dev": true - }, - "https-browserify": { - "version": "0.0.1", - "from": "https-browserify@0.0.1", - "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz", - "dev": true - }, - "iconv-lite": { - "version": "0.4.18", - "from": "iconv-lite@>=0.4.13 <0.5.0", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.18.tgz", - "dev": true - }, - "icss-replace-symbols": { - "version": "1.1.0", - "from": "icss-replace-symbols@>=1.1.0 <2.0.0", - "resolved": "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz", - "dev": true - }, - "ieee754": { - "version": "1.1.8", - "from": "ieee754@>=1.1.4 <2.0.0", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz", - "dev": true - }, - "indexes-of": { - "version": "1.0.1", - "from": "indexes-of@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz", - "dev": true - }, - "indexof": { - "version": "0.0.1", - "from": "indexof@0.0.1", - "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz", - "dev": true - }, - "inherits": { - "version": "2.0.3", - "from": "inherits@>=2.0.3 <2.1.0", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "dev": true - }, - "interpret": { - "version": "1.0.3", - "from": "interpret@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.3.tgz", - "dev": true - }, - "invariant": { - "version": "2.2.2", - "from": "invariant@>=2.2.1 <3.0.0", - "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz", - "dev": true - }, - "invert-kv": { - "version": "1.0.0", - "from": "invert-kv@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", - "dev": true - }, - "is-absolute-url": { - "version": "2.1.0", - "from": "is-absolute-url@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz", - "dev": true - }, - "is-arrayish": { - "version": "0.2.1", - "from": "is-arrayish@>=0.2.1 <0.3.0", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "dev": true - }, - "is-binary-path": { - "version": "1.0.1", - "from": "is-binary-path@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", - "dev": true - }, - "is-buffer": { - "version": "1.1.5", - "from": "is-buffer@>=1.1.5 <2.0.0", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz", - "dev": true - }, - "is-builtin-module": { - "version": "1.0.0", - "from": "is-builtin-module@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", - "dev": true - }, - "is-dotfile": { - "version": "1.0.3", - "from": "is-dotfile@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz", - "dev": true - }, - "is-equal-shallow": { - "version": "0.1.3", - "from": "is-equal-shallow@>=0.1.3 <0.2.0", - "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz", - "dev": true - }, - "is-extendable": { - "version": "0.1.1", - "from": "is-extendable@>=0.1.1 <0.2.0", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", - "dev": true - }, - "is-extglob": { - "version": "1.0.0", - "from": "is-extglob@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "from": "is-fullwidth-code-point@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "dev": true - }, - "is-glob": { - "version": "2.0.1", - "from": "is-glob@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", - "dev": true - }, - "is-number": { - "version": "2.1.0", - "from": "is-number@>=2.1.0 <3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz", - "dev": true - }, - "is-plain-obj": { - "version": "1.1.0", - "from": "is-plain-obj@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", - "dev": true - }, - "is-posix-bracket": { - "version": "0.1.1", - "from": "is-posix-bracket@>=0.1.0 <0.2.0", - "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz", - "dev": true - }, - "is-primitive": { - "version": "2.0.0", - "from": "is-primitive@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz", - "dev": true - }, - "is-stream": { - "version": "1.1.0", - "from": "is-stream@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", - "dev": true - }, - "is-svg": { - "version": "2.1.0", - "from": "is-svg@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-2.1.0.tgz", - "dev": true - }, - "is-utf8": { - "version": "0.2.1", - "from": "is-utf8@>=0.2.0 <0.3.0", - "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", - "dev": true - }, - "isarray": { - "version": "1.0.0", - "from": "isarray@>=1.0.0 <1.1.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "dev": true - }, - "isobject": { - "version": "2.1.0", - "from": "isobject@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", - "dev": true - }, - "isomorphic-fetch": { - "version": "2.2.1", - "from": "isomorphic-fetch@>=2.2.1 <3.0.0", - "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz", - "dev": true - }, - "jquery": { - "version": "2.2.4", - "from": "jquery@>=2.2.1 <3.0.0", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-2.2.4.tgz", - "dev": true - }, - "js-base64": { - "version": "2.1.9", - "from": "js-base64@>=2.1.9 <3.0.0", - "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.1.9.tgz", - "dev": true - }, - "js-tokens": { - "version": "3.0.1", - "from": "js-tokens@>=3.0.0 <4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.1.tgz", - "dev": true - }, - "js-yaml": { - "version": "3.7.0", - "from": "js-yaml@>=3.7.0 <3.8.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz", - "dev": true - }, - "jsesc": { - "version": "0.5.0", - "from": "jsesc@>=0.5.0 <0.6.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", - "dev": true - }, - "json-loader": { - "version": "0.5.4", - "from": "json-loader@>=0.5.4 <0.6.0", - "resolved": "https://registry.npmjs.org/json-loader/-/json-loader-0.5.4.tgz", - "dev": true - }, - "json-schema-traverse": { - "version": "0.3.1", - "from": "json-schema-traverse@>=0.3.0 <0.4.0", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz", - "dev": true - }, - "json-stable-stringify": { - "version": "1.0.1", - "from": "json-stable-stringify@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz", - "dev": true - }, - "json5": { - "version": "0.5.1", - "from": "json5@>=0.5.0 <0.6.0", - "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz", - "dev": true - }, - "jsonify": { - "version": "0.0.0", - "from": "jsonify@>=0.0.0 <0.1.0", - "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz", - "dev": true - }, - "kind-of": { - "version": "3.2.2", - "from": "kind-of@>=3.0.2 <4.0.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "dev": true - }, - "knockout": { - "version": "3.4.2", - "from": "knockout@>=3.4.0 <4.0.0", - "resolved": "https://registry.npmjs.org/knockout/-/knockout-3.4.2.tgz", - "dev": true - }, - "lazy-cache": { - "version": "1.0.4", - "from": "lazy-cache@>=1.0.3 <2.0.0", - "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", - "dev": true - }, - "lcid": { - "version": "1.0.0", - "from": "lcid@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", - "dev": true - }, - "load-json-file": { - "version": "1.1.0", - "from": "load-json-file@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", - "dev": true - }, - "loader-runner": { - "version": "2.3.0", - "from": "loader-runner@>=2.3.0 <3.0.0", - "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.0.tgz", - "dev": true - }, - "loader-utils": { - "version": "1.1.0", - "from": "loader-utils@>=1.1.0 <2.0.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz", - "dev": true - }, - "lodash": { - "version": "4.17.4", - "from": "lodash@>=4.17.4 <5.0.0", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", - "dev": true - }, - "lodash._createcompounder": { - "version": "3.0.0", - "from": "lodash._createcompounder@>=3.0.0 <4.0.0", - "resolved": "https://registry.npmjs.org/lodash._createcompounder/-/lodash._createcompounder-3.0.0.tgz", - "dev": true - }, - "lodash._root": { - "version": "3.0.1", - "from": "lodash._root@>=3.0.0 <4.0.0", - "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz", - "dev": true - }, - "lodash.camelcase": { - "version": "3.0.1", - "from": "lodash.camelcase@>=3.0.1 <4.0.0", - "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-3.0.1.tgz", - "dev": true - }, - "lodash.deburr": { - "version": "3.2.0", - "from": "lodash.deburr@>=3.0.0 <4.0.0", - "resolved": "https://registry.npmjs.org/lodash.deburr/-/lodash.deburr-3.2.0.tgz", - "dev": true - }, - "lodash.memoize": { - "version": "4.1.2", - "from": "lodash.memoize@>=4.1.2 <5.0.0", - "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", - "dev": true - }, - "lodash.uniq": { - "version": "4.5.0", - "from": "lodash.uniq@>=4.5.0 <5.0.0", - "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", - "dev": true - }, - "lodash.words": { - "version": "3.2.0", - "from": "lodash.words@>=3.0.0 <4.0.0", - "resolved": "https://registry.npmjs.org/lodash.words/-/lodash.words-3.2.0.tgz", - "dev": true - }, - "longest": { - "version": "1.0.1", - "from": "longest@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", - "dev": true - }, - "loose-envify": { - "version": "1.3.1", - "from": "loose-envify@>=1.2.0 <2.0.0", - "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz", - "dev": true - }, - "macaddress": { - "version": "0.2.8", - "from": "macaddress@>=0.2.8 <0.3.0", - "resolved": "https://registry.npmjs.org/macaddress/-/macaddress-0.2.8.tgz", - "dev": true - }, - "math-expression-evaluator": { - "version": "1.2.17", - "from": "math-expression-evaluator@>=1.2.14 <2.0.0", - "resolved": "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz", - "dev": true - }, - "memory-fs": { - "version": "0.3.0", - "from": "memory-fs@>=0.3.0 <0.4.0", - "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.3.0.tgz", - "dev": true - }, - "micromatch": { - "version": "2.3.11", - "from": "micromatch@>=2.1.5 <3.0.0", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", - "dev": true - }, - "miller-rabin": { - "version": "4.0.0", - "from": "miller-rabin@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.0.tgz", - "dev": true - }, - "mime": { - "version": "1.3.6", - "from": "mime@>=1.3.4 <2.0.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.6.tgz", - "dev": true - }, - "minimalistic-assert": { - "version": "1.0.0", - "from": "minimalistic-assert@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz", - "dev": true - }, - "minimalistic-crypto-utils": { - "version": "1.0.1", - "from": "minimalistic-crypto-utils@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz", - "dev": true - }, - "minimatch": { - "version": "3.0.4", - "from": "minimatch@>=3.0.2 <4.0.0", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "dev": true - }, - "minimist": { - "version": "0.0.8", - "from": "minimist@0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "dev": true - }, - "mkdirp": { - "version": "0.5.1", - "from": "mkdirp@>=0.5.1 <0.6.0", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "dev": true - }, - "ms": { - "version": "2.0.0", - "from": "ms@2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "dev": true - }, - "node-fetch": { - "version": "1.7.1", - "from": "node-fetch@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.1.tgz", - "dev": true - }, - "node-libs-browser": { - "version": "2.0.0", - "from": "node-libs-browser@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.0.0.tgz", - "dev": true, - "dependencies": { - "string_decoder": { - "version": "0.10.31", - "from": "string_decoder@>=0.10.25 <0.11.0", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "dev": true - } - } - }, - "normalize-package-data": { - "version": "2.3.8", - "from": "normalize-package-data@>=2.3.2 <3.0.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.8.tgz", - "dev": true - }, - "normalize-path": { - "version": "2.1.1", - "from": "normalize-path@>=2.0.1 <3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", - "dev": true - }, - "normalize-range": { - "version": "0.1.2", - "from": "normalize-range@>=0.1.2 <0.2.0", - "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz", - "dev": true - }, - "normalize-url": { - "version": "1.9.1", - "from": "normalize-url@>=1.4.0 <2.0.0", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz", - "dev": true - }, - "num2fraction": { - "version": "1.2.2", - "from": "num2fraction@>=1.2.2 <2.0.0", - "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz", - "dev": true - }, - "number-is-nan": { - "version": "1.0.1", - "from": "number-is-nan@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "dev": true - }, - "object-assign": { - "version": "4.1.1", - "from": "object-assign@>=4.1.1 <5.0.0", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "dev": true - }, - "object.omit": { - "version": "2.0.1", - "from": "object.omit@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz", - "dev": true - }, - "on-finished": { - "version": "2.3.0", - "from": "on-finished@>=2.3.0 <2.4.0", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", - "dev": true - }, - "os-browserify": { - "version": "0.2.1", - "from": "os-browserify@>=0.2.0 <0.3.0", - "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.2.1.tgz", - "dev": true - }, - "os-locale": { - "version": "1.4.0", - "from": "os-locale@>=1.4.0 <2.0.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", - "dev": true - }, - "pako": { - "version": "0.2.9", - "from": "pako@>=0.2.0 <0.3.0", - "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz", - "dev": true - }, - "parse-asn1": { - "version": "5.1.0", - "from": "parse-asn1@>=5.0.0 <6.0.0", - "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz", - "dev": true - }, - "parse-glob": { - "version": "3.0.4", - "from": "parse-glob@>=3.0.4 <4.0.0", - "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz", - "dev": true - }, - "parse-json": { - "version": "2.2.0", - "from": "parse-json@>=2.2.0 <3.0.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", - "dev": true - }, - "parseurl": { - "version": "1.3.1", - "from": "parseurl@>=1.3.1 <1.4.0", - "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz", - "dev": true - }, - "path-browserify": { - "version": "0.0.0", - "from": "path-browserify@0.0.0", - "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz", - "dev": true - }, - "path-exists": { - "version": "2.1.0", - "from": "path-exists@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", - "dev": true - }, - "path-is-absolute": { - "version": "1.0.1", - "from": "path-is-absolute@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "dev": true - }, - "path-type": { - "version": "1.1.0", - "from": "path-type@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", - "dev": true - }, - "pbkdf2": { - "version": "3.0.12", - "from": "pbkdf2@>=3.0.3 <4.0.0", - "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.12.tgz", - "dev": true - }, - "pify": { - "version": "2.3.0", - "from": "pify@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "dev": true - }, - "pinkie": { - "version": "2.0.4", - "from": "pinkie@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", - "dev": true - }, - "pinkie-promise": { - "version": "2.0.1", - "from": "pinkie-promise@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", - "dev": true - }, - "postcss": { - "version": "5.2.17", - "from": "postcss@>=5.0.6 <6.0.0", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", - "dev": true, - "dependencies": { - "supports-color": { - "version": "3.2.3", - "from": "supports-color@>=3.2.3 <4.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "dev": true - } - } - }, - "postcss-calc": { - "version": "5.3.1", - "from": "postcss-calc@>=5.2.0 <6.0.0", - "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-5.3.1.tgz", - "dev": true - }, - "postcss-colormin": { - "version": "2.2.2", - "from": "postcss-colormin@>=2.1.8 <3.0.0", - "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-2.2.2.tgz", - "dev": true - }, - "postcss-convert-values": { - "version": "2.6.1", - "from": "postcss-convert-values@>=2.3.4 <3.0.0", - "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-2.6.1.tgz", - "dev": true - }, - "postcss-discard-comments": { - "version": "2.0.4", - "from": "postcss-discard-comments@>=2.0.4 <3.0.0", - "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz", - "dev": true - }, - "postcss-discard-duplicates": { - "version": "2.1.0", - "from": "postcss-discard-duplicates@>=2.0.1 <3.0.0", - "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-2.1.0.tgz", - "dev": true - }, - "postcss-discard-empty": { - "version": "2.1.0", - "from": "postcss-discard-empty@>=2.0.1 <3.0.0", - "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-2.1.0.tgz", - "dev": true - }, - "postcss-discard-overridden": { - "version": "0.1.1", - "from": "postcss-discard-overridden@>=0.1.1 <0.2.0", - "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz", - "dev": true - }, - "postcss-discard-unused": { - "version": "2.2.3", - "from": "postcss-discard-unused@>=2.2.1 <3.0.0", - "resolved": "https://registry.npmjs.org/postcss-discard-unused/-/postcss-discard-unused-2.2.3.tgz", - "dev": true - }, - "postcss-filter-plugins": { - "version": "2.0.2", - "from": "postcss-filter-plugins@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/postcss-filter-plugins/-/postcss-filter-plugins-2.0.2.tgz", - "dev": true - }, - "postcss-merge-idents": { - "version": "2.1.7", - "from": "postcss-merge-idents@>=2.1.5 <3.0.0", - "resolved": "https://registry.npmjs.org/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz", - "dev": true - }, - "postcss-merge-longhand": { - "version": "2.0.2", - "from": "postcss-merge-longhand@>=2.0.1 <3.0.0", - "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-2.0.2.tgz", - "dev": true - }, - "postcss-merge-rules": { - "version": "2.1.2", - "from": "postcss-merge-rules@>=2.0.3 <3.0.0", - "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-2.1.2.tgz", - "dev": true - }, - "postcss-message-helpers": { - "version": "2.0.0", - "from": "postcss-message-helpers@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz", - "dev": true - }, - "postcss-minify-font-values": { - "version": "1.0.5", - "from": "postcss-minify-font-values@>=1.0.2 <2.0.0", - "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-1.0.5.tgz", - "dev": true - }, - "postcss-minify-gradients": { - "version": "1.0.5", - "from": "postcss-minify-gradients@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-1.0.5.tgz", - "dev": true - }, - "postcss-minify-params": { - "version": "1.2.2", - "from": "postcss-minify-params@>=1.0.4 <2.0.0", - "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-1.2.2.tgz", - "dev": true - }, - "postcss-minify-selectors": { - "version": "2.1.1", - "from": "postcss-minify-selectors@>=2.0.4 <3.0.0", - "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-2.1.1.tgz", - "dev": true - }, - "postcss-modules-extract-imports": { - "version": "1.1.0", - "from": "postcss-modules-extract-imports@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.1.0.tgz", - "dev": true, - "dependencies": { - "has-flag": { - "version": "2.0.0", - "from": "has-flag@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", - "dev": true - }, - "postcss": { - "version": "6.0.3", - "from": "postcss@>=6.0.1 <7.0.0", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.3.tgz", - "dev": true - }, - "supports-color": { - "version": "4.0.0", - "from": "supports-color@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.0.0.tgz", - "dev": true - } - } - }, - "postcss-modules-local-by-default": { - "version": "1.2.0", - "from": "postcss-modules-local-by-default@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz", - "dev": true, - "dependencies": { - "css-selector-tokenizer": { - "version": "0.7.0", - "from": "css-selector-tokenizer@>=0.7.0 <0.8.0", - "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz", - "dev": true - }, - "has-flag": { - "version": "2.0.0", - "from": "has-flag@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", - "dev": true - }, - "postcss": { - "version": "6.0.3", - "from": "postcss@>=6.0.1 <7.0.0", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.3.tgz", - "dev": true - }, - "supports-color": { - "version": "4.0.0", - "from": "supports-color@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.0.0.tgz", - "dev": true - } - } - }, - "postcss-modules-scope": { - "version": "1.1.0", - "from": "postcss-modules-scope@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz", - "dev": true, - "dependencies": { - "css-selector-tokenizer": { - "version": "0.7.0", - "from": "css-selector-tokenizer@>=0.7.0 <0.8.0", - "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz", - "dev": true - }, - "has-flag": { - "version": "2.0.0", - "from": "has-flag@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", - "dev": true - }, - "postcss": { - "version": "6.0.3", - "from": "postcss@>=6.0.1 <7.0.0", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.3.tgz", - "dev": true - }, - "supports-color": { - "version": "4.0.0", - "from": "supports-color@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.0.0.tgz", - "dev": true - } - } - }, - "postcss-modules-values": { - "version": "1.3.0", - "from": "postcss-modules-values@>=1.1.0 <2.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz", - "dev": true, - "dependencies": { - "has-flag": { - "version": "2.0.0", - "from": "has-flag@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", - "dev": true - }, - "postcss": { - "version": "6.0.3", - "from": "postcss@>=6.0.1 <7.0.0", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.3.tgz", - "dev": true - }, - "supports-color": { - "version": "4.0.0", - "from": "supports-color@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.0.0.tgz", - "dev": true - } - } - }, - "postcss-normalize-charset": { - "version": "1.1.1", - "from": "postcss-normalize-charset@>=1.1.0 <2.0.0", - "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz", - "dev": true - }, - "postcss-normalize-url": { - "version": "3.0.8", - "from": "postcss-normalize-url@>=3.0.7 <4.0.0", - "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-3.0.8.tgz", - "dev": true - }, - "postcss-ordered-values": { - "version": "2.2.3", - "from": "postcss-ordered-values@>=2.1.0 <3.0.0", - "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-2.2.3.tgz", - "dev": true - }, - "postcss-reduce-idents": { - "version": "2.4.0", - "from": "postcss-reduce-idents@>=2.2.2 <3.0.0", - "resolved": "https://registry.npmjs.org/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz", - "dev": true - }, - "postcss-reduce-initial": { - "version": "1.0.1", - "from": "postcss-reduce-initial@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-1.0.1.tgz", - "dev": true - }, - "postcss-reduce-transforms": { - "version": "1.0.4", - "from": "postcss-reduce-transforms@>=1.0.3 <2.0.0", - "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.4.tgz", - "dev": true - }, - "postcss-selector-parser": { - "version": "2.2.3", - "from": "postcss-selector-parser@>=2.2.2 <3.0.0", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz", - "dev": true - }, - "postcss-svgo": { - "version": "2.1.6", - "from": "postcss-svgo@>=2.1.1 <3.0.0", - "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-2.1.6.tgz", - "dev": true - }, - "postcss-unique-selectors": { - "version": "2.0.2", - "from": "postcss-unique-selectors@>=2.0.2 <3.0.0", - "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-2.0.2.tgz", - "dev": true - }, - "postcss-value-parser": { - "version": "3.3.0", - "from": "postcss-value-parser@>=3.2.3 <4.0.0", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz", - "dev": true - }, - "postcss-zindex": { - "version": "2.2.0", - "from": "postcss-zindex@>=2.0.1 <3.0.0", - "resolved": "https://registry.npmjs.org/postcss-zindex/-/postcss-zindex-2.2.0.tgz", - "dev": true - }, - "prepend-http": { - "version": "1.0.4", - "from": "prepend-http@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz", - "dev": true - }, - "preserve": { - "version": "0.2.0", - "from": "preserve@>=0.2.0 <0.3.0", - "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz", - "dev": true - }, - "process": { - "version": "0.11.10", - "from": "process@>=0.11.0 <0.12.0", - "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", - "dev": true - }, - "process-nextick-args": { - "version": "1.0.7", - "from": "process-nextick-args@>=1.0.6 <1.1.0", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", - "dev": true - }, - "prr": { - "version": "0.0.0", - "from": "prr@>=0.0.0 <0.1.0", - "resolved": "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz", - "dev": true - }, - "public-encrypt": { - "version": "4.0.0", - "from": "public-encrypt@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz", - "dev": true - }, - "punycode": { - "version": "1.4.1", - "from": "punycode@>=1.2.4 <2.0.0", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "dev": true - }, - "q": { - "version": "1.5.0", - "from": "q@>=1.1.2 <2.0.0", - "resolved": "https://registry.npmjs.org/q/-/q-1.5.0.tgz", - "dev": true - }, - "query-string": { - "version": "4.3.4", - "from": "query-string@>=4.1.0 <5.0.0", - "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz", - "dev": true - }, - "querystring": { - "version": "0.2.0", - "from": "querystring@0.2.0", - "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", - "dev": true - }, - "querystring-es3": { - "version": "0.2.1", - "from": "querystring-es3@>=0.2.0 <0.3.0", - "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz", - "dev": true - }, - "randomatic": { - "version": "1.1.7", - "from": "randomatic@>=1.1.3 <2.0.0", - "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz", - "dev": true, - "dependencies": { - "is-number": { - "version": "3.0.0", - "from": "is-number@>=3.0.0 <4.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "dev": true, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "from": "kind-of@^3.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "dev": true - } - } - }, - "kind-of": { - "version": "4.0.0", - "from": "kind-of@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", - "dev": true - } - } - }, - "randombytes": { - "version": "2.0.5", - "from": "randombytes@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.5.tgz", - "dev": true - }, - "range-parser": { - "version": "1.2.0", - "from": "range-parser@>=1.0.3 <2.0.0", - "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz", - "dev": true - }, - "raw-loader": { - "version": "0.5.1", - "from": "raw-loader@>=0.5.1 <0.6.0", - "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-0.5.1.tgz", - "dev": true - }, - "read-pkg": { - "version": "1.1.0", - "from": "read-pkg@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", - "dev": true - }, - "read-pkg-up": { - "version": "1.0.1", - "from": "read-pkg-up@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", - "dev": true - }, - "readable-stream": { - "version": "2.3.2", - "from": "readable-stream@>=2.0.1 <3.0.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.2.tgz", - "dev": true - }, - "readdirp": { - "version": "2.1.0", - "from": "readdirp@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz", - "dev": true - }, - "reduce-css-calc": { - "version": "1.3.0", - "from": "reduce-css-calc@>=1.2.6 <2.0.0", - "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz", - "dev": true - }, - "reduce-function-call": { - "version": "1.0.2", - "from": "reduce-function-call@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/reduce-function-call/-/reduce-function-call-1.0.2.tgz", - "dev": true - }, - "regenerate": { - "version": "1.3.2", - "from": "regenerate@>=1.2.1 <2.0.0", - "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.2.tgz", - "dev": true - }, - "regex-cache": { - "version": "0.4.3", - "from": "regex-cache@>=0.4.2 <0.5.0", - "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz", - "dev": true - }, - "regexpu-core": { - "version": "1.0.0", - "from": "regexpu-core@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz", - "dev": true - }, - "regjsgen": { - "version": "0.2.0", - "from": "regjsgen@>=0.2.0 <0.3.0", - "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz", - "dev": true - }, - "regjsparser": { - "version": "0.1.5", - "from": "regjsparser@>=0.1.4 <0.2.0", - "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz", - "dev": true - }, - "remove-trailing-separator": { - "version": "1.0.2", - "from": "remove-trailing-separator@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.0.2.tgz", - "dev": true - }, - "repeat-element": { - "version": "1.1.2", - "from": "repeat-element@>=1.1.2 <2.0.0", - "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz", - "dev": true - }, - "repeat-string": { - "version": "1.6.1", - "from": "repeat-string@>=1.5.2 <2.0.0", - "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", - "dev": true - }, - "require-directory": { - "version": "2.1.1", - "from": "require-directory@>=2.1.1 <3.0.0", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "dev": true - }, - "require-from-string": { - "version": "1.2.1", - "from": "require-from-string@>=1.1.0 <2.0.0", - "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-1.2.1.tgz", - "dev": true - }, - "require-main-filename": { - "version": "1.0.1", - "from": "require-main-filename@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", - "dev": true - }, - "resolve-pathname": { - "version": "2.1.0", - "from": "resolve-pathname@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/resolve-pathname/-/resolve-pathname-2.1.0.tgz", - "dev": true - }, - "right-align": { - "version": "0.1.3", - "from": "right-align@>=0.1.1 <0.2.0", - "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz", - "dev": true - }, - "ripemd160": { - "version": "2.0.1", - "from": "ripemd160@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz", - "dev": true - }, - "safe-buffer": { - "version": "5.1.1", - "from": "safe-buffer@>=5.1.0 <5.2.0", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", - "dev": true - }, - "sax": { - "version": "1.2.4", - "from": "sax@>=1.2.1 <1.3.0", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", - "dev": true - }, - "schema-utils": { - "version": "0.3.0", - "from": "schema-utils@>=0.3.0 <0.4.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz", - "dev": true - }, - "semver": { - "version": "5.3.0", - "from": "semver@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0||>=4.0.0 <5.0.0||>=5.0.0 <6.0.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", - "dev": true - }, - "set-blocking": { - "version": "2.0.0", - "from": "set-blocking@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "dev": true - }, - "set-immediate-shim": { - "version": "1.0.1", - "from": "set-immediate-shim@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz", - "dev": true - }, - "setimmediate": { - "version": "1.0.5", - "from": "setimmediate@>=1.0.4 <2.0.0", - "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", - "dev": true - }, - "sha.js": { - "version": "2.4.8", - "from": "sha.js@>=2.4.0 <3.0.0", - "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.8.tgz", - "dev": true - }, - "signals": { - "version": "1.0.0", - "from": "signals@<2.0.0", - "resolved": "https://registry.npmjs.org/signals/-/signals-1.0.0.tgz", - "dev": true - }, - "sort-keys": { - "version": "1.1.2", - "from": "sort-keys@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz", - "dev": true - }, - "source-list-map": { - "version": "0.1.8", - "from": "source-list-map@>=0.1.4 <0.2.0", - "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz", - "dev": true - }, - "source-map": { - "version": "0.5.6", - "from": "source-map@>=0.5.6 <0.6.0", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz", - "dev": true - }, - "source-map-support": { - "version": "0.4.15", - "from": "source-map-support@>=0.4.15 <0.5.0", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.15.tgz", - "dev": true - }, - "spdx-correct": { - "version": "1.0.2", - "from": "spdx-correct@>=1.0.0 <1.1.0", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz", - "dev": true - }, - "spdx-expression-parse": { - "version": "1.0.4", - "from": "spdx-expression-parse@>=1.0.0 <1.1.0", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz", - "dev": true - }, - "spdx-license-ids": { - "version": "1.2.2", - "from": "spdx-license-ids@>=1.0.2 <2.0.0", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz", - "dev": true - }, - "sprintf-js": { - "version": "1.0.3", - "from": "sprintf-js@>=1.0.2 <1.1.0", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "dev": true - }, - "statuses": { - "version": "1.3.1", - "from": "statuses@>=1.3.1 <1.4.0", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz", - "dev": true - }, - "stream-browserify": { - "version": "2.0.1", - "from": "stream-browserify@>=2.0.1 <3.0.0", - "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz", - "dev": true - }, - "stream-http": { - "version": "2.7.2", - "from": "stream-http@>=2.3.1 <3.0.0", - "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.7.2.tgz", - "dev": true - }, - "strict-uri-encode": { - "version": "1.1.0", - "from": "strict-uri-encode@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz", - "dev": true - }, - "string_decoder": { - "version": "1.0.3", - "from": "string_decoder@>=1.0.0 <1.1.0", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", - "dev": true - }, - "string-width": { - "version": "1.0.2", - "from": "string-width@>=1.0.2 <2.0.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "dev": true - }, - "strip-ansi": { - "version": "3.0.1", - "from": "strip-ansi@>=3.0.0 <4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "dev": true - }, - "strip-bom": { - "version": "2.0.0", - "from": "strip-bom@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", - "dev": true - }, - "style-loader": { - "version": "0.13.2", - "from": "style-loader@>=0.13.1 <0.14.0", - "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.13.2.tgz", - "dev": true - }, - "supports-color": { - "version": "2.0.0", - "from": "supports-color@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "dev": true - }, - "svgo": { - "version": "0.7.2", - "from": "svgo@>=0.7.0 <0.8.0", - "resolved": "https://registry.npmjs.org/svgo/-/svgo-0.7.2.tgz", - "dev": true - }, - "tapable": { - "version": "0.2.6", - "from": "tapable@>=0.2.5 <0.3.0", - "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.2.6.tgz", - "dev": true - }, - "timers-browserify": { - "version": "2.0.2", - "from": "timers-browserify@>=2.0.2 <3.0.0", - "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.2.tgz", - "dev": true - }, - "to-arraybuffer": { - "version": "1.0.1", - "from": "to-arraybuffer@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz", - "dev": true - }, - "tty-browserify": { - "version": "0.0.0", - "from": "tty-browserify@0.0.0", - "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz", - "dev": true - }, - "typescript": { - "version": "2.3.4", - "from": "typescript@>=2.2.1 <3.0.0", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.3.4.tgz", - "dev": true - }, - "uglify-js": { - "version": "2.8.29", - "from": "uglify-js@>=2.8.27 <3.0.0", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz", - "dev": true, - "dependencies": { - "yargs": { - "version": "3.10.0", - "from": "yargs@>=3.10.0 <3.11.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", - "dev": true - } - } - }, - "uglify-to-browserify": { - "version": "1.0.2", - "from": "uglify-to-browserify@>=1.0.0 <1.1.0", - "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz", - "dev": true, - "optional": true - }, - "uniq": { - "version": "1.0.1", - "from": "uniq@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz", - "dev": true - }, - "uniqid": { - "version": "4.1.1", - "from": "uniqid@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/uniqid/-/uniqid-4.1.1.tgz", - "dev": true - }, - "uniqs": { - "version": "2.0.0", - "from": "uniqs@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz", - "dev": true - }, - "unpipe": { - "version": "1.0.0", - "from": "unpipe@>=1.0.0 <1.1.0", - "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", - "dev": true - }, - "url": { - "version": "0.11.0", - "from": "url@>=0.11.0 <0.12.0", - "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", - "dev": true, - "dependencies": { - "punycode": { - "version": "1.3.2", - "from": "punycode@1.3.2", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", - "dev": true - } - } - }, - "url-loader": { - "version": "0.5.9", - "from": "url-loader@>=0.5.7 <0.6.0", - "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-0.5.9.tgz", - "dev": true - }, - "util": { - "version": "0.10.3", - "from": "util@>=0.10.3 <0.11.0", - "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", - "dev": true, - "dependencies": { - "inherits": { - "version": "2.0.1", - "from": "inherits@2.0.1", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "dev": true - } - } - }, - "util-deprecate": { - "version": "1.0.2", - "from": "util-deprecate@>=1.0.1 <1.1.0", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "dev": true - }, - "utils-merge": { - "version": "1.0.0", - "from": "utils-merge@1.0.0", - "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz", - "dev": true - }, - "validate-npm-package-license": { - "version": "3.0.1", - "from": "validate-npm-package-license@>=3.0.1 <4.0.0", - "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz", - "dev": true - }, - "value-equal": { - "version": "0.2.1", - "from": "value-equal@>=0.2.0 <0.3.0", - "resolved": "https://registry.npmjs.org/value-equal/-/value-equal-0.2.1.tgz", - "dev": true - }, - "vendors": { - "version": "1.0.1", - "from": "vendors@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.1.tgz", - "dev": true - }, - "vm-browserify": { - "version": "0.0.4", - "from": "vm-browserify@0.0.4", - "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz", - "dev": true - }, - "warning": { - "version": "3.0.0", - "from": "warning@>=3.0.0 <4.0.0", - "resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz", - "dev": true - }, - "watchpack": { - "version": "1.3.1", - "from": "watchpack@>=1.3.1 <2.0.0", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.3.1.tgz", - "dev": true - }, - "webpack": { - "version": "2.6.1", - "from": "webpack@>=2.2.0 <3.0.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-2.6.1.tgz", - "dev": true, - "dependencies": { - "ajv": { - "version": "4.11.8", - "from": "ajv@>=4.7.0 <5.0.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz", - "dev": true - }, - "loader-utils": { - "version": "0.2.17", - "from": "loader-utils@>=0.2.16 <0.3.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz", - "dev": true - }, - "memory-fs": { - "version": "0.4.1", - "from": "memory-fs@>=0.4.1 <0.5.0", - "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz", - "dev": true - }, - "source-list-map": { - "version": "1.1.2", - "from": "source-list-map@>=1.1.1 <2.0.0", - "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-1.1.2.tgz", - "dev": true - }, - "supports-color": { - "version": "3.2.3", - "from": "supports-color@>=3.1.0 <4.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "dev": true - }, - "webpack-sources": { - "version": "0.2.3", - "from": "webpack-sources@>=0.2.3 <0.3.0", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.2.3.tgz", - "dev": true - } - } - }, - "webpack-dev-middleware": { - "version": "1.11.0", - "from": "webpack-dev-middleware@>=1.8.4 <2.0.0", - "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-1.11.0.tgz", - "dev": true, - "dependencies": { - "memory-fs": { - "version": "0.4.1", - "from": "memory-fs@>=0.4.1 <0.5.0", - "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz", - "dev": true - } - } - }, - "webpack-hot-middleware": { - "version": "2.18.0", - "from": "webpack-hot-middleware@>=2.12.2 <3.0.0", - "resolved": "https://registry.npmjs.org/webpack-hot-middleware/-/webpack-hot-middleware-2.18.0.tgz", - "dev": true - }, - "webpack-node-externals": { - "version": "1.6.0", - "from": "webpack-node-externals@>=1.4.3 <2.0.0", - "resolved": "https://registry.npmjs.org/webpack-node-externals/-/webpack-node-externals-1.6.0.tgz", - "dev": true - }, - "webpack-sources": { - "version": "1.0.1", - "from": "webpack-sources@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.0.1.tgz", - "dev": true, - "dependencies": { - "source-list-map": { - "version": "2.0.0", - "from": "source-list-map@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz", - "dev": true - } - } - }, - "whatwg-fetch": { - "version": "2.0.3", - "from": "whatwg-fetch@>=0.10.0", - "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz", - "dev": true - }, - "whet.extend": { - "version": "0.9.9", - "from": "whet.extend@>=0.9.9 <0.10.0", - "resolved": "https://registry.npmjs.org/whet.extend/-/whet.extend-0.9.9.tgz", - "dev": true - }, - "which-module": { - "version": "1.0.0", - "from": "which-module@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz", - "dev": true - }, - "window-size": { - "version": "0.1.0", - "from": "window-size@0.1.0", - "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz", - "dev": true - }, - "wordwrap": { - "version": "0.0.2", - "from": "wordwrap@0.0.2", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz", - "dev": true - }, - "wrap-ansi": { - "version": "2.1.0", - "from": "wrap-ansi@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", - "dev": true - }, - "xtend": { - "version": "4.0.1", - "from": "xtend@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", - "dev": true - }, - "y18n": { - "version": "3.2.1", - "from": "y18n@>=3.2.1 <4.0.0", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", - "dev": true - }, - "yargs": { - "version": "6.6.0", - "from": "yargs@>=6.0.0 <7.0.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz", - "dev": true, - "dependencies": { - "camelcase": { - "version": "3.0.0", - "from": "camelcase@>=3.0.0 <4.0.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", - "dev": true - }, - "cliui": { - "version": "3.2.0", - "from": "cliui@>=3.2.0 <4.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", - "dev": true - } - } - }, - "yargs-parser": { - "version": "4.2.1", - "from": "yargs-parser@>=4.2.0 <5.0.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz", - "dev": true, - "dependencies": { - "camelcase": { - "version": "3.0.0", - "from": "camelcase@>=3.0.0 <4.0.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", - "dev": true - } - } - } - } -} diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/package.json b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/package.json deleted file mode 100644 index 86722a70..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/package.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "name": "KnockoutSpa", - "private": true, - "version": "0.0.0", - "devDependencies": { - "@types/core-js": "^0.9.34", - "@types/crossroads": "0.0.29", - "@types/es6-promise": "0.0.32", - "@types/history": "^4.6.0", - "@types/jquery": "^2.0.32", - "@types/knockout": "^3.4.41", - "@types/signals": "0.0.16", - "@types/webpack-env": "^1.13.0", - "aspnet-webpack": "^2.0.1", - "awesome-typescript-loader": "^3.0.0", - "bootstrap": "^3.3.6", - "bundle-loader": "^0.5.4", - "crossroads": "^0.12.2", - "css-loader": "^0.25.0", - "event-source-polyfill": "^0.0.7", - "extract-text-webpack-plugin": "^2.0.0-rc", - "file-loader": "^0.9.0", - "history": "^4.6.3", - "isomorphic-fetch": "^2.2.1", - "jquery": "^2.2.1", - "json-loader": "^0.5.4", - "knockout": "^3.4.0", - "raw-loader": "^0.5.1", - "style-loader": "^0.13.1", - "typescript": "^2.2.1", - "url-loader": "^0.5.7", - "webpack": "^2.2.0", - "webpack-hot-middleware": "^2.12.2" - } -} diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/tsconfig.json b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/tsconfig.json deleted file mode 100644 index 78973bd6..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/tsconfig.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "compilerOptions": { - "module": "es2015", - "moduleResolution": "node", - "target": "es5", - "sourceMap": true, - "skipDefaultLibCheck": true, - "strict": true, - "types": ["es6-promise", "webpack-env"] - }, - "exclude": [ - "bin", - "node_modules" - ] -} diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/webpack.config.js b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/webpack.config.js deleted file mode 100644 index 98a37b68..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/webpack.config.js +++ /dev/null @@ -1,44 +0,0 @@ -const path = require('path'); -const webpack = require('webpack'); -const ExtractTextPlugin = require('extract-text-webpack-plugin'); -const CheckerPlugin = require('awesome-typescript-loader').CheckerPlugin; -const bundleOutputDir = './wwwroot/dist'; - -module.exports = (env) => { - const isDevBuild = !(env && env.prod); - return [{ - stats: { modules: false }, - entry: { 'main': './ClientApp/boot.ts' }, - resolve: { extensions: [ '.js', '.ts' ] }, - output: { - path: path.join(__dirname, bundleOutputDir), - filename: '[name].js', - publicPath: 'dist/' - }, - module: { - rules: [ - { test: /\.ts$/, include: /ClientApp/, use: 'awesome-typescript-loader?silent=true' }, - { test: /\.html$/, use: 'raw-loader' }, - { test: /\.css$/, use: isDevBuild ? [ 'style-loader', 'css-loader' ] : ExtractTextPlugin.extract({ use: 'css-loader?minimize' }) }, - { test: /\.(png|jpg|jpeg|gif|svg)$/, use: 'url-loader?limit=25000' } - ] - }, - plugins: [ - new CheckerPlugin(), - new webpack.DllReferencePlugin({ - context: __dirname, - manifest: require('./wwwroot/dist/vendor-manifest.json') - }) - ].concat(isDevBuild ? [ - // Plugins that apply in development builds only - new webpack.SourceMapDevToolPlugin({ - filename: '[file].map', // Remove this line if you prefer inline source maps - moduleFilenameTemplate: path.relative(bundleOutputDir, '[resourcePath]') // Point sourcemap entries to the original file locations on disk - }) - ] : [ - // Plugins that apply in production builds only - new webpack.optimize.UglifyJsPlugin(), - new ExtractTextPlugin('site.css') - ]) - }]; -}; diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/webpack.config.vendor.js b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/webpack.config.vendor.js deleted file mode 100644 index 12d4dba5..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/webpack.config.vendor.js +++ /dev/null @@ -1,39 +0,0 @@ -const path = require('path'); -const webpack = require('webpack'); -const ExtractTextPlugin = require('extract-text-webpack-plugin'); - -module.exports = (env) => { - const isDevBuild = !(env && env.prod); - const extractCSS = new ExtractTextPlugin('vendor.css'); - return [{ - stats: { modules: false }, - resolve: { - extensions: [ '.js' ] - }, - module: { - rules: [ - { test: /\.(png|woff|woff2|eot|ttf|svg)(\?|$)/, use: 'url-loader?limit=100000' }, - { test: /\.css(\?|$)/, use: extractCSS.extract({ use: isDevBuild ? 'css-loader' : 'css-loader?minimize' }) } - ] - }, - entry: { - vendor: ['bootstrap', 'bootstrap/dist/css/bootstrap.css', 'knockout', 'crossroads', 'event-source-polyfill', 'history', 'isomorphic-fetch', 'jquery'], - }, - output: { - path: path.join(__dirname, 'wwwroot', 'dist'), - publicPath: 'dist/', - filename: '[name].js', - library: '[name]_[hash]', - }, - plugins: [ - extractCSS, - new webpack.ProvidePlugin({ $: 'jquery', jQuery: 'jquery' }), // Maps these identifiers to the jQuery package (because Bootstrap expects it to be a global variable) - new webpack.DllPlugin({ - path: path.join(__dirname, 'wwwroot', 'dist', '[name]-manifest.json'), - name: '[name]_[hash]' - }) - ].concat(isDevBuild ? [] : [ - new webpack.optimize.UglifyJsPlugin() - ]) - }]; -}; diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/wwwroot/favicon.ico b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/wwwroot/favicon.ico deleted file mode 100644 index a3a799985c43bc7309d701b2cad129023377dc71..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32038 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 diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/vue/.template.config/template.json b/templates/Microsoft.AspNetCore.SpaTemplates/vue/.template.config/template.json deleted file mode 100644 index 6cb8810d..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/vue/.template.config/template.json +++ /dev/null @@ -1,87 +0,0 @@ -{ - "author": "Microsoft", - "classifications": [ - "Web", - "MVC", - "SPA" - ], - "groupIdentity": "Microsoft.AspNetCore.SpaTemplates.Vue", - "identity": "Microsoft.AspNetCore.SpaTemplates.Vue.CSharp", - "name": "ASP.NET Core with Vue.js", - "preferNameDirectory": true, - "primaryOutputs": [ - { - "path": "VueSpa.csproj" - } - ], - "shortName": "vue", - "sourceName": "VueSpa", - "sources": [ - { - "source": "./", - "target": "./", - "exclude": [ - ".template.config/**" - ] - } - ], - "symbols": { - "TargetFrameworkOverride": { - "type": "parameter", - "description": "Overrides the target framework", - "replaces": "TargetFrameworkOverride", - "datatype": "string", - "defaultValue": "" - }, - "Framework": { - "type": "parameter", - "description": "The target framework for the project.", - "datatype": "choice", - "choices": [ - { - "choice": "netcoreapp2.0", - "description": "Target netcoreapp2.0" - } - ], - "replaces": "netcoreapp2.0", - "defaultValue": "netcoreapp2.0" - }, - "HostIdentifier": { - "type": "bind", - "binding": "HostIdentifier" - }, - "skipRestore": { - "type": "parameter", - "datatype": "bool", - "description": "If specified, skips the automatic restore of the project on create.", - "defaultValue": "false" - } - }, - "tags": { - "language": "C#", - "type": "project" - }, - "postActions": [ - { - "condition": "(!skipRestore)", - "description": "Restore NuGet packages required by this project.", - "manualInstructions": [ - { - "text": "Run 'dotnet restore'" - } - ], - "actionId": "210D431B-A78B-4D2F-B762-4ED3E3EA9025", - "continueOnError": true - }, - { - "condition": "(HostIdentifier == \"dotnetcli\" || HostIdentifier == \"dotnetcli-preview\")", - "actionId": "AC1156F7-BB77-4DB8-B28F-24EEBCCA1E5C", - "description": "\n\n-------------------------------------------------------------------\nIMPORTANT: Before running this project on the command line,\n you must restore NPM packages by running \"npm install\"\n-------------------------------------------------------------------\n", - "manualInstructions": [ - { - "text": "Run \"npm install\"" - } - ] - } - ] -} \ No newline at end of file diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/vue/.template.config/vs-2017.3.host.json b/templates/Microsoft.AspNetCore.SpaTemplates/vue/.template.config/vs-2017.3.host.json deleted file mode 100644 index 9b9b6a5f..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/vue/.template.config/vs-2017.3.host.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "$schema": "http://json.schemastore.org/vs-2017.3.host", - "name": { - "text": "Vue.js", - "package": "{0CD94836-1526-4E85-87D3-FB5274C5AFC9}", - "id": "1600" - }, - "description": { - "text": "A project template for creating an ASP.NET Core application with Vue.js", - "package": "{0CD94836-1526-4E85-87D3-FB5274C5AFC9}", - "id": "1601" - }, - "order": 301, - "icon": "icon.png", - "learnMoreLink": "https://github.com/aspnet/JavaScriptServices", - "uiFilters": [ - "oneaspnet" - ], - "minFullFrameworkVersion": "4.6.1" -} \ No newline at end of file diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/boot.ts b/templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/boot.ts deleted file mode 100644 index b95bd381..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/boot.ts +++ /dev/null @@ -1,17 +0,0 @@ -import './css/site.css'; -import 'bootstrap'; -import Vue from 'vue'; -import VueRouter from 'vue-router'; -Vue.use(VueRouter); - -const routes = [ - { path: '/', component: require('./components/home/home.vue.html') }, - { path: '/counter', component: require('./components/counter/counter.vue.html') }, - { path: '/fetchdata', component: require('./components/fetchdata/fetchdata.vue.html') } -]; - -new Vue({ - el: '#app-root', - router: new VueRouter({ mode: 'history', routes: routes }), - render: h => h(require('./components/app/app.vue.html')) -}); diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/app/app.ts b/templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/app/app.ts deleted file mode 100644 index f580f76b..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/app/app.ts +++ /dev/null @@ -1,10 +0,0 @@ -import Vue from 'vue'; -import { Component } from 'vue-property-decorator'; - -@Component({ - components: { - MenuComponent: require('../navmenu/navmenu.vue.html') - } -}) -export default class AppComponent extends Vue { -} diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/app/app.vue.html b/templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/app/app.vue.html deleted file mode 100644 index 6a108b8a..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/app/app.vue.html +++ /dev/null @@ -1,14 +0,0 @@ - - - diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/counter/counter.ts b/templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/counter/counter.ts deleted file mode 100644 index e48ef79b..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/counter/counter.ts +++ /dev/null @@ -1,11 +0,0 @@ -import Vue from 'vue'; -import { Component } from 'vue-property-decorator'; - -@Component -export default class CounterComponent extends Vue { - currentcount: number = 0; - - incrementCounter() { - this.currentcount++; - } -} diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/counter/counter.vue.html b/templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/counter/counter.vue.html deleted file mode 100644 index 570d1a2e..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/counter/counter.vue.html +++ /dev/null @@ -1,13 +0,0 @@ - - - diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/fetchdata/fetchdata.ts b/templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/fetchdata/fetchdata.ts deleted file mode 100644 index c6108f93..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/fetchdata/fetchdata.ts +++ /dev/null @@ -1,22 +0,0 @@ -import Vue from 'vue'; -import { Component } from 'vue-property-decorator'; - -interface WeatherForecast { - dateFormatted: string; - temperatureC: number; - temperatureF: number; - summary: string; -} - -@Component -export default class FetchDataComponent extends Vue { - forecasts: WeatherForecast[] = []; - - mounted() { - fetch('http://github.com/api/SampleData/WeatherForecasts') - .then(response => response.json() as Promise) - .then(data => { - this.forecasts = data; - }); - } -} diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/fetchdata/fetchdata.vue.html b/templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/fetchdata/fetchdata.vue.html deleted file mode 100644 index 1b647748..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/fetchdata/fetchdata.vue.html +++ /dev/null @@ -1,30 +0,0 @@ - - - diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/home/home.vue.html b/templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/home/home.vue.html deleted file mode 100644 index d418e70a..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/home/home.vue.html +++ /dev/null @@ -1,19 +0,0 @@ - \ No newline at end of file diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/navmenu/navmenu.css b/templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/navmenu/navmenu.css deleted file mode 100644 index b7404b41..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/navmenu/navmenu.css +++ /dev/null @@ -1,59 +0,0 @@ -.main-nav li .glyphicon { - margin-right: 10px; -} - -/* Highlighting rules for nav menu items */ -.main-nav li a.router-link-active, -.main-nav li a.router-link-active:hover, -.main-nav li a.router-link-active:focus { - background-color: #4189C7; - color: white; -} - -/* Keep the nav menu independent of scrolling and on top of other items */ -.main-nav { - position: fixed; - top: 0; - left: 0; - right: 0; - z-index: 1; -} - -@media (min-width: 768px) { - /* On small screens, convert the nav menu to a vertical sidebar */ - .main-nav { - height: 100%; - width: calc(25% - 20px); - } - .main-nav .navbar { - border-radius: 0px; - border-width: 0px; - height: 100%; - } - .main-nav .navbar-header { - float: none; - } - .main-nav .navbar-collapse { - border-top: 1px solid #444; - padding: 0px; - } - .main-nav .navbar ul { - float: none; - } - .main-nav .navbar li { - float: none; - font-size: 15px; - margin: 6px; - } - .main-nav .navbar li a { - padding: 10px 16px; - border-radius: 4px; - } - .main-nav .navbar a { - /* If a menu item's text is too long, truncate it */ - width: 100%; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - } -} diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/navmenu/navmenu.vue.html b/templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/navmenu/navmenu.vue.html deleted file mode 100644 index d4d40601..00000000 --- a/templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/navmenu/navmenu.vue.html +++ /dev/null @@ -1,37 +0,0 @@ - - -