Skip to content

Commit afe9848

Browse files
Jacek Leszczynski - Contractormhartington
authored andcommitted
feat(): update to support angular 11
Closes #388 BREAKING: this update bumps the angular deps to the latest major release. This is not backwards compatible. If you are not updating to angular 11, please stay on the 2.x release of Angular Toolkit. In order to migrate, please see https://update.angular.io
1 parent 3bf92cd commit afe9848

File tree

5 files changed

+2438
-1511
lines changed

5 files changed

+2438
-1511
lines changed

builders/cordova-serve/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ import {
77
ExecutionTransformer,
88
executeDevServerBuilder
99
} from '@angular-devkit/build-angular';
10-
import { ScriptsWebpackPlugin } from '@angular-devkit/build-angular/src/angular-cli-files/plugins/scripts-webpack-plugin';
11-
import { IndexHtmlTransform } from '@angular-devkit/build-angular/src/angular-cli-files/utilities/index-file/write-index-html';
1210
import {
1311
DevServerBuilderOptions,
1412
DevServerBuilderOutput
1513
} from '@angular-devkit/build-angular/src/dev-server';
14+
import { IndexHtmlTransform } from '@angular-devkit/build-angular/src/utils/index-file/write-index-html';
15+
import { ScriptsWebpackPlugin } from '@angular-devkit/build-angular/src/webpack/plugins';
1616
import { json } from '@angular-devkit/core';
1717
import * as CopyWebpackPlugin from 'copy-webpack-plugin';
1818
import { basename } from 'path';

builders/utils/index.ts

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { normalizeExtraEntryPoints } from '@angular-devkit/build-angular/src/angular-cli-files/models/webpack-configs/utils';
21
import { AssetPatternClass } from '@angular-devkit/build-angular/src/browser/schema';
2+
import { normalizeExtraEntryPoints } from '@angular-devkit/build-angular/src/webpack/utils/helpers';
33
import { getSystemPath, join, normalize } from '@angular-devkit/core';
44
import { writeFileSync } from 'fs';
55
import { posix, resolve } from 'path';
@@ -71,14 +71,12 @@ export function prepareBrowserConfig(
7171
optionsStarter.scripts.push({
7272
input: configPath,
7373
bundleName: 'consolelogs',
74-
lazy: false,
7574
});
7675
optionsStarter.scripts.push({
7776
input: getSystemPath(
7877
join(normalize(__dirname), '../../assets', normalize('consolelogs.js'))
7978
),
8079
bundleName: 'consolelogs',
81-
lazy: false,
8280
});
8381
}
8482

@@ -89,7 +87,6 @@ export function prepareBrowserConfig(
8987
join(normalize(__dirname), '../../assets', normalize('cordova.js'))
9088
),
9189
bundleName: 'cordova',
92-
lazy: false,
9390
});
9491
}
9592
} else if (options.cordovaAssets) {
@@ -115,7 +112,6 @@ export function prepareBrowserConfig(
115112
optionsStarter.scripts.push({
116113
input: getSystemPath(join(platformWWWPath, normalize('cordova.js'))),
117114
bundleName: 'cordova',
118-
lazy: false,
119115
});
120116
}
121117
}
@@ -155,13 +151,12 @@ export function prepareServerConfig(
155151
configPath,
156152
`window.Ionic = window.Ionic || {}; Ionic.ConsoleLogServerConfig = { wsPort: ${options.consolelogsPort} }`
157153
);
158-
scripts.push({ input: configPath, bundleName: 'consolelogs', lazy: false });
154+
scripts.push({ input: configPath, bundleName: 'consolelogs' });
159155
scripts.push({
160156
input: getSystemPath(
161157
join(normalize(__dirname), '../../assets', normalize('consolelogs.js'))
162158
),
163159
bundleName: 'consolelogs',
164-
lazy: false,
165160
});
166161
}
167162
if (options.cordovaMock) {
@@ -170,7 +165,6 @@ export function prepareServerConfig(
170165
join(normalize(__dirname), '../../assets', normalize('cordova.js'))
171166
),
172167
bundleName: 'cordova',
173-
lazy: false,
174168
});
175169
} else if (options.cordovaAssets) {
176170
const platformWWWPath = join(
@@ -185,7 +179,6 @@ export function prepareServerConfig(
185179
scripts.push({
186180
input: getSystemPath(join(platformWWWPath, normalize('cordova.js'))),
187181
bundleName: 'cordova',
188-
lazy: false,
189182
});
190183
}
191184

0 commit comments

Comments
 (0)