github/JavaScriptServices
1
1
Fork 0
mirror of https://github.com/aspnet/JavaScriptServices.git synced 2025-12-22 17:47:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'rel/2.0.0-templates' into dev

Browse Source
This commit is contained in:
Steve Sanderson
2017-07-12 23:31:33 +01:00
parent a0a710a0df 8b37dc8561
commit a9ddf1413f
22 changed files with 1832 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1700
src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/package-lock.json generated Normal file
View File

File diff suppressed because it is too large Load Diff

2
src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/package.json
View File

@@ -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": {

20
src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/WebpackDevMiddleware.ts
View File

@@ -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);

58
src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/WebpackTestPermissions.ts Normal file
View File

@@ -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;
}
}

12
templates/AngularSpa/AngularSpa.csproj
View File

@@ -9,17 +9,17 @@
</PropertyGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-rtm-26219" />
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-rtm-26272" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-rtm-26219" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-rtm-26219" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-rtm-26219" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0-rtm-26219" />
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-rtm-26272" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-rtm-26272" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-rtm-26272" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0-rtm-26272" />
</ItemGroup>
<ItemGroup>
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0-rtm-26219" />
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0-rtm-26272" />
</ItemGroup>
<ItemGroup>

6
templates/AngularSpa/npm-shrinkwrap.json generated
View File

@@ -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",

2
templates/AngularSpa/package.json
View File

@@ -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",

12
templates/AureliaSpa/AureliaSpa.csproj
View File

@@ -9,17 +9,17 @@
</PropertyGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-rtm-26219" />
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-rtm-26272" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-rtm-26219" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-rtm-26219" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-rtm-26219" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0-rtm-26219" />
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-rtm-26272" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-rtm-26272" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-rtm-26272" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0-rtm-26272" />
</ItemGroup>
<ItemGroup>
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0-rtm-26219" />
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0-rtm-26272" />
</ItemGroup>
<!--/-:cnd:noEmit -->

6
templates/AureliaSpa/npm-shrinkwrap.json generated
View File

@@ -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": {

2
templates/AureliaSpa/package.json
View File

@@ -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",

12
templates/KnockoutSpa/KnockoutSpa.csproj
View File

@@ -9,17 +9,17 @@
</PropertyGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-rtm-26219" />
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-rtm-26272" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-rtm-26219" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-rtm-26219" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-rtm-26219" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0-rtm-26219" />
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-rtm-26272" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-rtm-26272" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-rtm-26272" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0-rtm-26272" />
</ItemGroup>
<ItemGroup>
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0-rtm-26219" />
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0-rtm-26272" />
</ItemGroup>
<!--/-:cnd:noEmit -->

6
templates/KnockoutSpa/npm-shrinkwrap.json generated
View File

@@ -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": {

2
templates/KnockoutSpa/package.json
View File

@@ -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",

12
templates/ReactReduxSpa/ReactReduxSpa.csproj
View File

@@ -9,17 +9,17 @@
</PropertyGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-rtm-26219" />
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-rtm-26272" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-rtm-26219" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-rtm-26219" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-rtm-26219" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0-rtm-26219" />
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-rtm-26272" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-rtm-26272" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-rtm-26272" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0-rtm-26272" />
</ItemGroup>
<ItemGroup>
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0-rtm-26219" />
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0-rtm-26272" />
</ItemGroup>
<ItemGroup>

6
templates/ReactReduxSpa/npm-shrinkwrap.json generated
View File

@@ -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",

2
templates/ReactReduxSpa/package.json
View File

@@ -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",

12
templates/ReactSpa/ReactSpa.csproj
View File

@@ -9,17 +9,17 @@
</PropertyGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-rtm-26219" />
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-rtm-26272" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-rtm-26219" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-rtm-26219" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-rtm-26219" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0-rtm-26219" />
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-rtm-26272" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-rtm-26272" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-rtm-26272" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0-rtm-26272" />
</ItemGroup>
<ItemGroup>
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0-rtm-26219" />
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0-rtm-26272" />
</ItemGroup>
<!--/-:cnd:noEmit -->

6
templates/ReactSpa/npm-shrinkwrap.json generated
View File

@@ -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": {

2
templates/ReactSpa/package.json
View File

@@ -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",

12
templates/VueSpa/VueSpa.csproj
View File

@@ -9,17 +9,17 @@
</PropertyGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-rtm-26219" />
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-rtm-26272" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-rtm-26219" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-rtm-26219" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-rtm-26219" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0-rtm-26219" />
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-rtm-26272" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-rtm-26272" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-rtm-26272" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0-rtm-26272" />
</ItemGroup>
<ItemGroup>
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0-rtm-26219" />
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0-rtm-26272" />
</ItemGroup>
<!--/-:cnd:noEmit -->

6
templates/VueSpa/npm-shrinkwrap.json generated
View File

@@ -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": {

2
templates/VueSpa/package.json
View File

@@ -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",