Merge-office-addin-taskpane/master

Author: TCourtneyOwen

.github/CODEOWNERS

@@ -0,0 +1 @@
+* @OfficeDev/office-platform-devx 

.vscode/launch.json

@@ -11,7 +11,7 @@
       "program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
       "args": [
         "-u",
-        "tdd",
+        "bdd",
         "--timeout",
         "999999",
         "--colors",

convertToSingleHost.js

@@ -8,8 +8,11 @@ const unlinkFileAsync = util.promisify(fs.unlink);
 const writeFileAsync = util.promisify(fs.writeFile);
 
 async function removeTestInfraStructure() {
-    deleteFolder(path.resolve(`${process.cwd()}/test`));
-    deleteFolder(path.resolve(`${process.cwd()}/.github`));
+    deleteFolder(path.resolve(`./test`));
+    
+    // delete the .github folder
+    deleteFolder(path.resolve(`./.github`));
+    
     await updatePackageJsonFile();
     await updateLaunchJsonFile();
     // delete this script

package-lock.json

@@ -32,33 +32,33 @@
   },
   "dependencies": {},
   "devDependencies": {
-    "@babel/core": "^7.4.5",
+    "@babel/core": "^7.5.4",
     "@babel/polyfill": "^7.4.4",
-    "@babel/preset-env": "^7.4.5",
-    "@types/custom-functions-runtime": "^1.4.11",
+    "@babel/preset-env": "^7.5.4",
+    "@types/custom-functions-runtime": "^1.5.0",
     "@types/mocha": "^5.2.7",
-    "@types/node": "^12.0.4",
-    "@types/office-js": "^1.0.9",
+    "@types/node": "^12.6.3",
+    "@types/office-js": "^1.0.19",
     "@types/office-runtime": "^1.0.8",
     "babel-loader": "^8.0.6",
-    "clean-webpack-plugin": "^2.0.1",
+    "clean-webpack-plugin": "^3.0.0",
     "copy-webpack-plugin": "^5.0.3",
-    "custom-functions-metadata-plugin": "^1.0.0",
-    "file-loader": "^3.0.1",
+    "custom-functions-metadata-plugin": "^1.0.1",
+    "file-loader": "^4.0.0",
     "html-loader": "^0.5.5",
     "html-webpack-plugin": "^3.2.0",
-    "mocha": "^5.2.0",
-    "office-addin-debugging": "^2.1.13",
-    "office-addin-dev-certs": "^1.0.1",
-    "office-addin-test-helpers": "^0.3.0",
-    "office-addin-test-server": "^0.3.0",
-    "office-toolbox": "^0.1.1",
+    "mocha": "^6.1.4",
+    "office-addin-debugging": "^2.3.1",
+    "office-addin-dev-certs": "^1.2.5",
+    "office-addin-test-helpers": "^0.3.1",
+    "office-addin-test-server": "^0.3.1",
+    "office-toolbox": "^0.2.1",
     "source-map-loader": "^0.2.4",
-    "ts-loader": "^6.0.2",
-    "ts-node": "^8.2.0",
-    "typescript": "^3.5.1",
-    "webpack": "^4.33.0",
-    "webpack-cli": "^3.3.2",
-    "webpack-dev-server": "^3.5.1"
+    "ts-loader": "^6.0.4",
+    "ts-node": "^8.3.0",
+    "typescript": "^3.5.3",
+    "webpack": "^4.35.3",
+    "webpack-cli": "^3.3.6",
+    "webpack-dev-server": "^3.7.2"
   }
 }

package.json

@@ -1,5 +1,5 @@
 const devCerts = require("office-addin-dev-certs");
-const CleanWebpackPlugin = require("clean-webpack-plugin");
+const { CleanWebpackPlugin } = require("clean-webpack-plugin");
 const CopyWebpackPlugin = require("copy-webpack-plugin");
 const CustomFunctionsMetadataPlugin = require("custom-functions-metadata-plugin");
 const HtmlWebpackPlugin = require("html-webpack-plugin");

test/webpack.config.js

@@ -1,5 +1,5 @@
 const devCerts = require("office-addin-dev-certs");
-const CleanWebpackPlugin = require("clean-webpack-plugin");
+const { CleanWebpackPlugin } = require("clean-webpack-plugin");
 const CopyWebpackPlugin = require("copy-webpack-plugin");
 const CustomFunctionsMetadataPlugin = require("custom-functions-metadata-plugin");
 const HtmlWebpackPlugin = require("html-webpack-plugin");