Merge branch 'StfBauer-gulp-sass' into preview

jsuddsjr · Jun 3, 2019 · 96eda9f · 96eda9f
2 parents f7e5c39 + c34b327
commit 96eda9f
Show file tree

Hide file tree

Showing 10 changed files with 434 additions and 171 deletions.
diff --git a/package.json b/package.json
@@ -4,6 +4,7 @@
   "description": "Yeoman generator for Microsoft Teams Apps",
   "main": "generators/app/index.js",
   "scripts": {
+    "postinstall": "npm run build",
     "build": "node_modules/.bin/webpack",
     "test": "npm run build && mocha -r ts-node/register tests/**/*.spec.ts --timeout 15000"
   },

diff --git a/src/app/GeneratorTeamsApp.ts b/src/app/GeneratorTeamsApp.ts
@@ -371,6 +371,7 @@ export class GeneratorTeamsApp extends Generator {
                 "src/manifest/icon-outline.png",
                 "src/manifest/icon-color.png",
                 "src/app/web/assets/icon.png",
+                "src/app/web/styles/main.scss",
                 'deploy.cmd',
                 '_deployment',
                 "src/app/TeamsAppsComponents.ts"
@@ -379,6 +380,7 @@ export class GeneratorTeamsApp extends Generator {
             let templateFiles = [
                 "README.md",
                 "gulpfile.js",
+                "gulp.config.js",
                 "package.json",
                 ".env",
                 'src/app/server.ts',

diff --git a/src/app/templates/gulp.config.js b/src/app/templates/gulp.config.js
@@ -0,0 +1,45 @@
+const config = {
+    injectSources: [
+        "./dist/web/scripts/**/*.js",
+        "./dist/web/styles/**/*.css"
+    ],
+    staticFiles: [
+        "./src/app/**/*.html",
+        "./src/app/**/*.ejs",
+        "./src/app/web/assets/**/*"
+    ],
+    htmlFiles: [
+        "./src/app/**/*.html", "./src/app/**/*.ejs"
+    ],
+    watches: [
+        "./src/**/*.*",
+        "!./src/**/*.scss"
+    ],
+    manifests: [
+        "./src/manifest/**/*.*",
+        '!**/*.json'
+    ],
+    temp: [
+        "./temp"
+    ],
+    // Supported Schemas
+    SCHEMAS: [{
+            version: "1.3",
+            schema: "https://developer.microsoft.com/en-us/json-schemas/teams/v1.3/MicrosoftTeams.schema.json"
+        },
+        {
+            version: "1.4",
+            schema: "https://developer.microsoft.com/en-us/json-schemas/teams/v1.4/MicrosoftTeams.schema.json"
+        },
+        {
+            version: "devPreview",
+            schema: "https://raw.githubusercontent.com/OfficeDev/microsoft-teams-app-schema/preview/DevPreview/MicrosoftTeams.schema.json"
+        },
+        {
+            version: "1.5",
+            schema: "https://developer.microsoft.com/en-us/json-schemas/teams/v1.5/MicrosoftTeams.schema.json"
+        }    
+    ]
+};
+
+module.exports = config;