Graham/angular-cli
1
0
Fork 0
mirror of https://github.com/angular/angular-cli.git synced 2025-05-16 18:43:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(@angular/pwa): rename manifest.json to manifest.webmanifest

Browse Source 
Using the `webmanifest` file extension makes it easier to target the web app manifest in server configs and apply the correct MIME type (see https://github.com/w3c/manifest/issues/689#issuecomment-402773032).
This commit is contained in:
Christian Liebel 2018-11-09 23:24:42 +01:00 committed by Hans
parent 2f262bb75f
commit 2326850374
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
packages/angular/pwa/pwa/files/root/manifest.json → packages/angular/pwa/pwa/files/root/manifest.webmanifest
View File

4
packages/angular/pwa/pwa/index.ts
View File

@ -74,7 +74,7 @@ function updateIndexFile(path: string): Rule {
rewriter.on('endTag', (endTag: { tagName: string }) => {
if (endTag.tagName === 'head') {
rewriter.emitRaw(' <link rel="manifest" href="manifest.json">\n');
rewriter.emitRaw(' <link rel="manifest" href="manifest.webmanifest">\n');
rewriter.emitRaw(' <meta name="theme-color" content="#1976d2">\n');
} else if (endTag.tagName === 'body' && needsNoScript) {
rewriter.emitRaw(
@ -156,7 +156,7 @@ export default function (options: PwaOptions): Rule {
}
// Add manifest to asset configuration
const assetEntry = join(normalize(project.root), 'src', 'manifest.json');
const assetEntry = join(normalize(project.root), 'src', 'manifest.webmanifest');
for (const target of [...buildTargets, ...testTargets]) {
if (target.options) {
if (target.options.assets) {

12
packages/angular/pwa/pwa/index_spec.ts
View File

@ -71,14 +71,14 @@ describe('PWA Schematic', () => {
it('should create a manifest file', (done) => {
schematicRunner.runSchematicAsync('ng-add', defaultOptions, appTree).toPromise().then(tree => {
expect(tree.exists('/projects/bar/src/manifest.json')).toEqual(true);
expect(tree.exists('/projects/bar/src/manifest.webmanifest')).toEqual(true);
done();
}, done.fail);
});
it('should set the name & short_name in the manifest file', (done) => {
schematicRunner.runSchematicAsync('ng-add', defaultOptions, appTree).toPromise().then(tree => {
const manifestText = tree.readContent('/projects/bar/src/manifest.json');
const manifestText = tree.readContent('/projects/bar/src/manifest.webmanifest');
const manifest = JSON.parse(manifestText);
expect(manifest.name).toEqual(defaultOptions.title);
@ -90,7 +90,7 @@ describe('PWA Schematic', () => {
it('should set the name & short_name in the manifest file when no title provided', (done) => {
const options = {...defaultOptions, title: undefined};
schematicRunner.runSchematicAsync('ng-add', options, appTree).toPromise().then(tree => {
const manifestText = tree.readContent('/projects/bar/src/manifest.json');
const manifestText = tree.readContent('/projects/bar/src/manifest.webmanifest');
const manifest = JSON.parse(manifestText);
expect(manifest.name).toEqual(defaultOptions.project);
@ -103,7 +103,7 @@ describe('PWA Schematic', () => {
schematicRunner.runSchematicAsync('ng-add', defaultOptions, appTree).toPromise().then(tree => {
const content = tree.readContent('projects/bar/src/index.html');
expect(content).toMatch(/<link rel="manifest" href="manifest.json">/);
expect(content).toMatch(/<link rel="manifest" href="manifest.webmanifest">/);
expect(content).toMatch(/<meta name="theme-color" content="#1976d2">/);
expect(content)
.toMatch(/<noscript>Please enable JavaScript to continue using this application.<\/noscript>/);
@ -118,7 +118,7 @@ describe('PWA Schematic', () => {
schematicRunner.runSchematicAsync('ng-add', defaultOptions, appTree).toPromise().then(tree => {
const content = tree.readContent('projects/bar/src/index.html');
expect(content).toMatch(/<link rel="manifest" href="manifest.json">/);
expect(content).toMatch(/<link rel="manifest" href="manifest.webmanifest">/);
expect(content).toMatch(/<meta name="theme-color" content="#1976d2">/);
expect(content).not
.toMatch(/<noscript>Please enable JavaScript to continue using this application.<\/noscript>/);
@ -134,7 +134,7 @@ describe('PWA Schematic', () => {
const targets = config.projects.bar.architect;
['build', 'test'].forEach((target) => {
expect(targets[target].options.assets).toContain('projects/bar/src/manifest.json');
expect(targets[target].options.assets).toContain('projects/bar/src/manifest.webmanifest');
});
done();
}, done.fail);