From 950db82b7ac42f3f48aa6efd66f17d262730fbe0 Mon Sep 17 00:00:00 2001
From: Judah Gabriel Himango <judahgabriel@gmail.com>
Date: Tue, 9 Feb 2021 12:07:45 -0800
Subject: [PATCH 1/3] Adds package language and start_url to Windows

---
 package-lock.json        | 10 ++++-----
 pages/_lang/publish.vue  | 44 +++++++++++++++++++++++++++++++++++++++-
 store/modules/publish.ts |  4 +++-
 3 files changed, 51 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 83a5d8c7f..ff1e57931 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -361,7 +361,7 @@
     },
     "@types/json5": {
       "version": "0.0.29",
-      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
+      "resolved": "http://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
       "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=",
       "dev": true
     },
@@ -1143,7 +1143,7 @@
     },
     "babel-plugin-syntax-object-rest-spread": {
       "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz",
+      "resolved": "http://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz",
       "integrity": "sha1-/WU28rzhODb/o6VFjEkDpZe7O/U="
     },
     "babel-plugin-syntax-trailing-function-commas": {
@@ -6323,7 +6323,7 @@
     },
     "is-obj": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
+      "resolved": "http://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
       "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
       "dev": true
     },
@@ -7075,7 +7075,7 @@
     },
     "media-typer": {
       "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "resolved": "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
       "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
     },
     "mem": {
@@ -18203,7 +18203,7 @@
     },
     "through": {
       "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz",
       "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
     },
     "through2": {
diff --git a/pages/_lang/publish.vue b/pages/_lang/publish.vue
index b857cfeb5..887cdda03 100644
--- a/pages/_lang/publish.vue
+++ b/pages/_lang/publish.vue
@@ -991,10 +991,30 @@
                 />
               </div>
 
+              <div class="form-group">
+                <label for="windowsStartUrlInput">
+                  Start URL
+                  <i
+                    class="fas fa-info-circle"
+                    title="Optional. The preferred URL that should be loaded when the user launches the web app. Windows will use this to determine your app's identity, so this value should not change between releases of your app. This can be an absolute or relative path."
+                    aria-label="Optional. The preferred URL that should be loaded when the user launches the web app. Windows will use this to determine your app's identity, so this value should not change between releases of your app. This can be an absolute or relative path."
+                    role="definition"
+                  ></i>
+                </label>
+                <input
+                  type="url"
+                  class="form-control"
+                  id="windowsStartUrlInput"
+                  placeholder="https://mysite.com/startpoint.html"
+                  v-model="windowsForm.startUrl"
+                />
+              </div>
+
             </div>
 
             <!-- right half of the options dialog -->
             <div class="col-lg-6 col-md-12">
+              
               <div class="form-group">
                 <label for="windowsIconUrlInput">
                   <a href="https://github.com/pwa-builder/pwabuilder-windows-chromium-docs/blob/master/image-recommendations.md" target="_blank">
@@ -1059,6 +1079,26 @@
                     v-model="windowsForm.publisher.commonName"
                   />
                 </div>
+
+              <div class="form-group">
+                <label for="windowsLanguageInput">
+                  Language
+                  <i
+                    class="fas fa-info-circle"
+                    title="Optional. The primary language for your app package. Additional languages can be specified in Partner Center. If empty, EN-US will be used." 
+                    aria-label="Optional. The primary language for your app package. Additional languages can be specified in Partner Center. If empty, EN-US will be used."
+                    role="definition"
+                  ></i>
+                </label>
+                <input
+                  type="url"
+                  class="form-control"
+                  id="windowsLanguageInput"
+                  placeholder="EN-US"
+                  v-model="windowsForm.resourceLanguage"
+                />
+              </div>
+
             </div>
           </div>
         </form>
@@ -1847,7 +1887,9 @@ export default class extends Vue {
         baseImage: icon && icon.src ? icon.src : "",
         backgroundColor: "transparent",
         padding: 0.3
-      }
+      },
+      startUrl: this.manifest.start_url,
+      resourceLanguage: this.manifest.lang === "en" ? "EN-US" : this.manifest.lang ?? ""
     };
     
     return packageOptions;
diff --git a/store/modules/publish.ts b/store/modules/publish.ts
index eb0a6859b..9425d9194 100644
--- a/store/modules/publish.ts
+++ b/store/modules/publish.ts
@@ -53,7 +53,8 @@ export interface WindowsPackageOptions {
   edgeLaunchArgs?: string;
   appUserModelId?: string;
   generateModernPackage?: boolean;
-  manifestUrl?: string;
+  manifestUrl?: string | null;
+  startUrl?: string | null;
   manifest?: Manifest;
   classicPackage?: {
     generate?: boolean;
@@ -68,6 +69,7 @@ export interface WindowsPackageOptions {
   }
   images?: WindowsImageOptions;
   publisher: WindowsPublisherOptions;
+  resourceLanguage?: string | null;
 }
 
 /**

From 4a3d5837be3234ae3aa15b5081a3d27f02660a36 Mon Sep 17 00:00:00 2001
From: Judah Gabriel Himango <judahgabriel@gmail.com>
Date: Tue, 9 Feb 2021 12:10:11 -0800
Subject: [PATCH 2/3] I'm writing TS, not C#

---
 pages/_lang/publish.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/_lang/publish.vue b/pages/_lang/publish.vue
index 887cdda03..592a554f6 100644
--- a/pages/_lang/publish.vue
+++ b/pages/_lang/publish.vue
@@ -1889,7 +1889,7 @@ export default class extends Vue {
         padding: 0.3
       },
       startUrl: this.manifest.start_url,
-      resourceLanguage: this.manifest.lang === "en" ? "EN-US" : this.manifest.lang ?? ""
+      resourceLanguage: this.manifest.lang === "en" ? "EN-US" : this.manifest.lang || ""
     };
     
     return packageOptions;

From 5c8c41b76d52b28ccee61146ea36f0937b1d0437 Mon Sep 17 00:00:00 2001
From: Judah Gabriel Himango <judahgabriel@gmail.com>
Date: Tue, 9 Feb 2021 15:19:54 -0800
Subject: [PATCH 3/3] Fixed label name collision

---
 pages/_lang/publish.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/_lang/publish.vue b/pages/_lang/publish.vue
index 592a554f6..d4a04697a 100644
--- a/pages/_lang/publish.vue
+++ b/pages/_lang/publish.vue
@@ -952,7 +952,7 @@
               </div>
 
               <div class="form-group">
-                <label for="windowsStartUrlInput">
+                <label for="windowsUrlInput">
                   URL
                   <i
                     class="fas fa-info-circle"
@@ -964,7 +964,7 @@
                 <input
                   type="url"
                   class="form-control"
-                  id="windowsStartUrlInput"
+                  id="windowsUrlInput"
                   placeholder="/index.html"
                   required
                   v-model="windowsForm.url"