Merge pull request #83 from montagejs/features/app-manifest

hthetiot · web-flow · commit f96d631ad90b · 2018-02-05T14:10:56.000-08:00
add manifest.json and index.html use in app template
diff --git a/templates/app.js b/templates/app.js
@@ -24,6 +24,7 @@ exports.Template = Object.create(PackageTemplate, {
         value:function (command) {
             command = PackageTemplate.addOptions.call(this, command);
             command.option('-n, --name <name>', 'application name (required)');
+            command.option('-d, --description <description>', 'application description (optional)');
             command.option('-c, --copyright [path]', 'copyright file');
             return command;
         }
@@ -32,10 +33,16 @@ exports.Template = Object.create(PackageTemplate, {
     didSetOptions: {
         value:function (options) {
             if (options.name) {
+                options.originalName = options.name;
                 options.name = this.validateName(options.name);
             } else {
                 throw new ArgumentError("Required name option missing");
             }
+            if (options.description) {
+                options.description = this.validateDescription(options.description);
+            } else {
+                options.description = options.originalName + " Application";
+            }
             if (options.copyright) {
                 options.copyright = this.validateCopyright(options.copyright);
             }
@@ -52,6 +59,13 @@ exports.Template = Object.create(PackageTemplate, {
         }
     },
 
+    validateDescription: {
+        value: function(description) {
+            // ensure names are safe to use as npm package names
+            return removeDiacritics(description);
+        }
+    },
+
     validateCopyright: {
         value: function(path) {
             return fs.readFileSync(path, "utf-8");
@@ -63,6 +77,4 @@ exports.Template = Object.create(PackageTemplate, {
             return process.cwd();
         }
     }
-
-
 });
diff --git a/templates/app/__name__/index.html b/templates/app/__name__/index.html
@@ -4,7 +4,9 @@
 <html>
 <head>
     <meta charset="utf-8">
+    <link rel=manifest href=./manifest.json>
     <meta name="viewport" content="initial-scale=1.0, maximum-scale=1.0, user-scalable=0, minimal-ui">
+    <meta name="apple-mobile-web-app-title" content="{{name}}">
     <meta name="mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-capable" content="yes">
     <!-- For iPad with high-resolution Retina display running iOS ≥ 7: -->
diff --git a/templates/app/__name__/manifest.json b/templates/app/__name__/manifest.json
@@ -0,0 +1,27 @@
+{
+  "lang": "en",
+  "name": "{{name}}",
+  "short_name": "{{name}}",
+  "description": "{{description}}",
+  "start_url": "./?utm_source=homescreen",
+  "icons": [
+    {
+      "src": "./assets/icons/apple-touch-icon-120x120-precomposed.png",
+      "sizes": "120x120",
+      "type": "image/png"
+    },
+    {
+      "src": "./assets/icons/apple-touch-icon-152x152-precomposed.png",
+      "sizes": "152x152",
+      "type": "image/png"
+    },
+    {
+      "src": "./assets/icons/apple-touch-icon-76x76-precomposed.png",
+      "sizes": "76x76",
+      "type": "image/png"
+    }
+  ],
+  "theme_color": "#000",
+  "background_color": "#fff",
+  "display": "standalone"
+}
diff --git a/templates/app/__name__/package.json b/templates/app/__name__/package.json
@@ -1,6 +1,7 @@
 {
     "name": "{{name}}",
     "version": "0.1.0",
+    "description": "{{description}}",
     "dependencies": {
         "montage": "~17.0.11",
         "digit": "~3.0.0"
diff --git a/test/templates/app-spec.js b/test/templates/app-spec.js
@@ -75,6 +75,11 @@ describe("app template", function () {
             template.didSetOptions(options);
             expect(options.name).toEqual("my-app");
         });
+        it("should accept camelCased name", function () {
+            options.name = "MyApp";
+            template.didSetOptions(options);
+            expect(options.name).toEqual("my-app");
+        });
         it("should convert spaces to dashes in names", function () {
             options.name = "My App";
             template.didSetOptions(options);
@@ -91,6 +96,16 @@ describe("app template", function () {
             template.didSetOptions(options);
             expect(options.name).toEqual("rateau");
         });
+        it("should generate description", function () {
+            options.name = "MyApp";
+            template.didSetOptions(options);
+            expect(options.description).toEqual("MyApp Application");
+        });
+        it("should generate description", function () {
+            options.name = "MyApp";
+            options.description = "Test description";
+            template.didSetOptions(options);
+            expect(options.description).toEqual("Test description");
+        });
     });
-
 });

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "{{name}}",`
`3`	`3`	`"version": "0.1.0",`
	`4`	`+ "description": "{{description}}",`
`4`	`5`	`"dependencies": {`
`5`	`6`	`"montage": "~17.0.11",`
`6`	`7`	`"digit": "~3.0.0"`