Skip to content

Commit 119971f

Browse files
author
Angular Builds
committed
affaabe6d fix(@schematics/angular): remove lint fix default value
1 parent 292af94 commit 119971f

File tree

3 files changed

+22
-17
lines changed

3 files changed

+22
-17
lines changed

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
{
22
"name": "@angular-devkit/build-angular",
3-
"version": "0.1100.0-next.7+77.faf650c",
3+
"version": "0.1100.0-next.7+76.affaabe",
44
"description": "Angular Webpack Build Facade",
55
"experimental": true,
66
"main": "src/index.js",
77
"typings": "src/index.d.ts",
88
"builders": "builders.json",
99
"dependencies": {
10-
"@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#faf650c99",
11-
"@angular-devkit/build-optimizer": "github:angular/angular-devkit-build-optimizer-builds#faf650c99",
12-
"@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#faf650c99",
13-
"@angular-devkit/core": "github:angular/angular-devkit-core-builds#faf650c99",
10+
"@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#affaabe6d",
11+
"@angular-devkit/build-optimizer": "github:angular/angular-devkit-build-optimizer-builds#affaabe6d",
12+
"@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#affaabe6d",
13+
"@angular-devkit/core": "github:angular/angular-devkit-core-builds#affaabe6d",
1414
"@babel/core": "7.12.3",
1515
"@babel/generator": "7.12.1",
1616
"@babel/plugin-transform-runtime": "7.12.1",
1717
"@babel/preset-env": "7.12.1",
1818
"@babel/runtime": "7.12.1",
1919
"@babel/template": "7.10.4",
2020
"@jsdevtools/coverage-istanbul-loader": "3.0.5",
21-
"@ngtools/webpack": "github:angular/ngtools-webpack-builds#faf650c99",
21+
"@ngtools/webpack": "github:angular/ngtools-webpack-builds#affaabe6d",
2222
"ansi-colors": "4.1.1",
2323
"autoprefixer": "9.8.6",
2424
"babel-loader": "8.1.0",

src/app-shell/index.js

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -70,17 +70,22 @@ async function _getServerModuleBundlePath(options, context, serverResult, browse
7070
if (options.appModuleBundle) {
7171
return path.join(context.workspaceRoot, options.appModuleBundle);
7272
}
73-
const { baseOutputPath = '' } = serverResult;
74-
const outputPath = path.join(baseOutputPath, browserLocaleDirectory);
75-
if (!fs.existsSync(outputPath)) {
76-
throw new Error(`Could not find server output directory: ${outputPath}.`);
77-
}
78-
const re = /^main\.(?:[a-zA-Z0-9]{20}\.)?js$/;
79-
const maybeMain = fs.readdirSync(outputPath).find(x => re.test(x));
80-
if (!maybeMain) {
81-
throw new Error('Could not find the main bundle.');
73+
else {
74+
const { baseOutputPath = '' } = serverResult;
75+
const outputPath = path.join(baseOutputPath, browserLocaleDirectory);
76+
if (!fs.existsSync(outputPath)) {
77+
throw new Error(`Could not find server output directory: ${outputPath}.`);
78+
}
79+
const files = fs.readdirSync(outputPath, 'utf8');
80+
const re = /^main\.(?:[a-zA-Z0-9]{20}\.)?(?:bundle\.)?js$/;
81+
const maybeMain = files.filter(x => re.test(x))[0];
82+
if (!maybeMain) {
83+
throw new Error('Could not find the main bundle.');
84+
}
85+
else {
86+
return path.join(outputPath, maybeMain);
87+
}
8288
}
83-
return path.join(outputPath, maybeMain);
8489
}
8590
async function _appShellBuilder(options, context) {
8691
const browserTarget = architect_1.targetFromTargetString(options.browserTarget);

uniqueId

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Thu Oct 22 2020 14:29:16 GMT+0000 (Coordinated Universal Time)
1+
Thu Oct 22 2020 14:32:15 GMT+0000 (Coordinated Universal Time)

0 commit comments

Comments
 (0)