Improve file structure

Bruno Carvalhal · Bruno Carvalhal · commit c475fe3bfa9b · 2023-04-30T13:34:35.000+02:00
diff --git a/package.json b/package.json
@@ -17,11 +17,11 @@
     "lint": "eslint src --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
     "prettier": "office-addin-lint prettier",
     "preview": "vite preview",
-    "start": "office-addin-debugging start manifest.xml",
-    "start:desktop": "office-addin-debugging start manifest.xml desktop",
-    "start:web": "office-addin-debugging start manifest.xml web",
-    "stop": "office-addin-debugging stop manifest.xml",
-    "validate": "office-addin-manifest validate manifest.xml"
+    "start": "office-addin-debugging start src/manifest.xml",
+    "start:desktop": "office-addin-debugging start src/manifest.xml desktop",
+    "start:web": "office-addin-debugging start src/manifest.xml web",
+    "stop": "office-addin-debugging stop src/manifest.xml",
+    "validate": "office-addin-manifest validate src/manifest.xml"
   },
   "dependencies": {
     "@fluentui/react": "^8.52.3",
diff --git a/src/commands/commands.html b/src/commands/commands.html
@@ -9,7 +9,7 @@
 
     <!-- Office JavaScript API -->
     <script type="text/javascript" src="https://appsforoffice.microsoft.com/lib/1.1/hosted/office.js"></script>
-    <script type="module" src="/src/commands/commands.ts"></script>
+    <script type="module" src="/commands/commands.ts"></script>
 </head>
 
 <body>
diff --git a/src/manifest.xml b/src/manifest.xml
@@ -16,7 +16,7 @@
     <Host Name="Workbook"/>
   </Hosts>
   <DefaultSettings>
-    <SourceLocation DefaultValue="https://localhost:3000/taskpane.html"/>
+    <SourceLocation DefaultValue="https://localhost:3000/taskpane/taskpane.html"/>
   </DefaultSettings>
   <Permissions>ReadWriteDocument</Permissions>
   <VersionOverrides xmlns="http://schemas.microsoft.com/office/taskpaneappversionoverrides" xsi:type="VersionOverridesV1_0">
@@ -68,8 +68,8 @@
       </bt:Images>
       <bt:Urls>
         <bt:Url id="GetStarted.LearnMoreUrl" DefaultValue="https://go.microsoft.com/fwlink/?LinkId=276812"/>
-        <bt:Url id="Commands.Url" DefaultValue="https://localhost:3000/commands.html"/>
-        <bt:Url id="Taskpane.Url" DefaultValue="https://localhost:3000/taskpane.html"/>
+        <bt:Url id="Commands.Url" DefaultValue="https://localhost:3000/commands/commands.html"/>
+        <bt:Url id="Taskpane.Url" DefaultValue="https://localhost:3000/taskpane/taskpane.html"/>
       </bt:Urls>
       <bt:ShortStrings>
         <bt:String id="GetStarted.Title" DefaultValue="Get started with your sample add-in!"/>
diff --git a/src/taskpane/taskpane.html b/src/taskpane/taskpane.html
@@ -18,8 +18,8 @@
         href="https://static2.sharepointonline.com/files/fabric/office-ui-fabric-core/11.0.0/css/fabric.min.css" />
 
     <!-- Template styles -->
-    <link href="/src/taskpane/taskpane.css" rel="stylesheet" type="text/css" />
-    <script type="module" src="/src/taskpane/index.tsx"></script>
+    <link href="/taskpane/taskpane.css" rel="stylesheet" type="text/css" />
+    <script type="module" src="/taskpane/index.tsx"></script>
 </head>
 
 <body class="ms-font-m ms-Fabric">
diff --git a/src/vite-env.d.ts b/src/vite-env.d.ts
diff --git a/vite.config.ts b/vite.config.ts
@@ -14,15 +14,18 @@ async function getHttpsOptions() {
 export default defineConfig(async ({mode}) => ({
   plugins: [react(), eslint(), officeAddin({
     devUrl: "https://localhost:3000",
-    prodUrl: "https://www.contoso.com/" // CHANGE THIS TO YOUR PRODUCTION DEPLOYMENT LOCATION
+    prodUrl: "https://www.contoso.com" // CHANGE THIS TO YOUR PRODUCTION DEPLOYMENT LOCATION
   })],
+  root: "src",
   build: {
     rollupOptions: {
       input: {
-        "taskpane": "taskpane.html",
-        "commands": "commands.html",
+        "taskpane": "/taskpane/taskpane.html",
+        "commands": "/commands/commands.html",
       },
-    }
+    },
+    outDir: "../dist",
+    emptyOutDir: true
   },
   server: mode !== "production" ? { https: await getHttpsOptions() } : {}
 }));
