Skip to content

build: update ng-packagr to version 10 #17650

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dgp1130 merged 2 commits into from
May 7, 2020
Merged

build: update ng-packagr to version 10 #17650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f0da7a
build: udate angular packages to version 10
alan-agius4 May 6, 2020
a8685c9
build: update ng-packagr to version 10
alan-agius4 May 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,20 +66,20 @@
]
},
"devDependencies": {
"@angular/animations": "9.1.4",
"@angular/animations": "10.0.0-next.5",
"@angular/cdk": "9.2.2",
"@angular/common": "9.1.4",
"@angular/compiler": "9.1.4",
"@angular/compiler-cli": "9.1.4",
"@angular/core": "9.1.4",
"@angular/forms": "9.1.4",
"@angular/localize": "9.1.4",
"@angular/common": "10.0.0-next.5",
"@angular/compiler": "10.0.0-next.5",
"@angular/compiler-cli": "10.0.0-next.5",
"@angular/core": "10.0.0-next.5",
"@angular/forms": "10.0.0-next.5",
"@angular/localize": "10.0.0-next.5",
"@angular/material": "9.2.2",
"@angular/platform-browser": "9.1.4",
"@angular/platform-browser-dynamic": "9.1.4",
"@angular/platform-server": "9.1.4",
"@angular/router": "9.1.4",
"@angular/service-worker": "9.1.4",
"@angular/platform-browser": "10.0.0-next.5",
"@angular/platform-browser-dynamic": "10.0.0-next.5",
"@angular/platform-server": "10.0.0-next.5",
"@angular/router": "10.0.0-next.5",
"@angular/service-worker": "10.0.0-next.5",
"@babel/core": "7.9.6",
"@babel/generator": "7.9.6",
"@babel/plugin-transform-runtime": "7.9.6",
Expand Down Expand Up @@ -170,7 +170,7 @@
"mini-css-extract-plugin": "0.9.0",
"minimatch": "3.0.4",
"minimist": "^1.2.0",
"ng-packagr": "~9.0.0",
"ng-packagr": "~10.0.0-next.0",
"node-fetch": "^2.2.0",
"npm-registry-client": "8.6.0",
"open": "7.0.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/angular_devkit/build_angular/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
"worker-plugin": "4.0.3"
},
"peerDependencies": {
"@angular/compiler-cli": ">=9.0.0 < 10",
"@angular/compiler-cli": ">=10.0.0-next.0 < 11",
"typescript": ">=3.6 < 3.9"
},
"peerDependenciesMeta": {
Expand Down
12 changes: 12 additions & 0 deletions packages/angular_devkit/build_angular/src/browser/specs/service-worker_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,9 @@ describe('Browser Builder service worker', () => {
'/favicon.ico',
'/index.html',
],
cacheQueryOptions: {
ignoreVary: true,
},
patterns: [],
},
{
Expand All @@ -103,6 +106,9 @@ describe('Browser Builder service worker', () => {
'/assets/folder-asset.txt',
'/spectrum.png',
],
cacheQueryOptions: {
ignoreVary: true,
},
patterns: [],
},
],
Expand Down Expand Up @@ -152,6 +158,9 @@ describe('Browser Builder service worker', () => {
'/foo/bar/index.html',
],
patterns: [],
cacheQueryOptions: {
ignoreVary: true,
},
},
{
name: 'assets',
Expand All @@ -161,6 +170,9 @@ describe('Browser Builder service worker', () => {
'/foo/bar/assets/folder-asset.txt',
],
patterns: [],
cacheQueryOptions: {
ignoreVary: true,
},
},
],
dataGroups: [],
Expand Down
21 changes: 2 additions & 19 deletions packages/angular_devkit/build_angular/src/utils/process-bundle.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -694,14 +694,8 @@ async function inlineLocalesDirect(ast: ParseResult, options: InlineOptions) {

const { default: generate } = await import('@babel/generator');

// In Angular v10.0.0 the `source_file_utils` file was moved.
// (Remember to remove the `tryImport()` function when only one import path is required.)
// tslint:disable-next-line: no-implicit-dependencies
const utils = await tryImport<typeof import('@angular/localize/src/tools/src/translate/source_files/source_file_utils')>(
'@angular/localize/src/tools/src/source_file_utils',
'@angular/localize/src/tools/src/translate/source_files/source_file_utils',
);

const utils = await import('@angular/localize/src/tools/src/source_file_utils');
// tslint:disable-next-line: no-implicit-dependencies
const localizeDiag = await import('@angular/localize/src/tools/src/diagnostics');

Expand Down Expand Up @@ -783,17 +777,6 @@ async function inlineLocalesDirect(ast: ParseResult, options: InlineOptions) {
return { file: options.filename, diagnostics: diagnostics.messages, count: positions.length };
}

async function tryImport<T>(...importPaths: string[]): Promise<T> {
for (const importPath of importPaths) {
try {
return await import(importPath);
} catch {
// Do nothing
}
}
throw new Error('Unable to import from any of these paths:\n' + importPaths.map(p => ` - ${p}`).join('\n'));
}

function inlineCopyOnly(options: InlineOptions) {
if (!i18n) {
throw new Error('i18n options are missing');
Expand All @@ -818,7 +801,7 @@ function findLocalizePositions(
ast: ParseResult,
options: InlineOptions,
// tslint:disable-next-line: no-implicit-dependencies
utils: typeof import('@angular/localize/src/tools/src/translate/source_files/source_file_utils'),
utils: typeof import('@angular/localize/src/tools/src/source_file_utils'),
): LocalizePosition[] {
const positions: LocalizePosition[] = [];
if (options.es5) {
Expand Down
10 changes: 5 additions & 5 deletions packages/angular_devkit/build_ng_packagr/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
"rxjs": "6.5.5"
},
"peerDependencies": {
"ng-packagr": "^9.0.0",
"tsickle": "~0.37.1 || ~0.38.0"
"ng-packagr": "^10.0.0-next.0",
"tsickle": "~0.38.0"
},
"devDependencies": {
"@angular/compiler": "9.1.4",
"@angular/compiler-cli": "9.1.4",
"@angular/compiler": "10.0.0-next.5",
"@angular/compiler-cli": "10.0.0-next.5",
"@angular-devkit/core": "0.0.0",
"ng-packagr": "~9.1.0",
"ng-packagr": "~10.0.0-next.0",
"tslib": "^1.10.0"
},
"peerDependenciesMeta": {
Expand Down
6 changes: 3 additions & 3 deletions packages/angular_devkit/build_ng_packagr/src/build/index_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ describe('NgPackagr Builder', () => {

await run.stop();

expect(host.scopedSync().exists(normalize('./dist/lib/fesm5/lib.js'))).toBe(true);
expect(host.scopedSync().exists(normalize('./dist/lib/fesm2015/lib.js'))).toBe(true);
const content = virtualFs.fileBufferToString(
host.scopedSync().read(normalize('./dist/lib/fesm5/lib.js')),
host.scopedSync().read(normalize('./dist/lib/fesm2015/lib.js')),
);
expect(content).toContain('lib works');

Expand Down Expand Up @@ -99,7 +99,7 @@ describe('NgPackagr Builder', () => {
await run.output.pipe(
tap((buildEvent) => expect(buildEvent.success).toBe(true)),
map(() => {
const fileName = './dist/lib/fesm5/lib.js';
const fileName = './dist/lib/fesm2015/lib.js';
const content = virtualFs.fileBufferToString(
host.scopedSync().read(normalize(fileName)),
);
Expand Down
6 changes: 3 additions & 3 deletions packages/ngtools/webpack/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@
"webpack-sources": "1.4.3"
},
"peerDependencies": {
"@angular/compiler-cli": ">=9.0.0 < 10",
"@angular/compiler-cli": ">=10.0.0-next.0 < 11",
"typescript": ">=3.6 < 3.9",
"webpack": "^4.0.0"
},
"devDependencies": {
"@angular/compiler": "9.1.4",
"@angular/compiler-cli": "9.1.4",
"@angular/compiler": "10.0.0-next.5",
"@angular/compiler-cli": "10.0.0-next.5",
"typescript": "3.8.3",
"webpack": "4.42.1"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/schematics/angular/utility/latest-versions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ export const latestVersions = {
DevkitBuildNgPackagr: '~0.1000.0-next.3',
DevkitBuildWebpack: '~0.1000.0-next.3',

ngPackagr: '^9.0.0',
ngPackagr: '^10.0.0-next.0',
};
Loading