Skip to content

Commit 13dd491

Browse files
committed
Merge Office-Addin-Taskpane/master
1 parent b41551b commit 13dd491

File tree

5 files changed

+62
-28
lines changed

5 files changed

+62
-28
lines changed

.vscode/launch.json

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -58,24 +58,7 @@
5858
"url": "${input:officeOnlineDocumentUrl}",
5959
"webRoot": "${workspaceFolder}",
6060
"preLaunchTask": "Debug: Web"
61-
},
62-
{
63-
"type": "node",
64-
"request": "launch",
65-
"name": "Debug Tests",
66-
"program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
67-
"args": [
68-
"-u",
69-
"tdd",
70-
"--timeout",
71-
"999999",
72-
"--colors",
73-
"-r",
74-
"ts-node/register",
75-
"${workspaceFolder}/test/*.ts"
76-
],
77-
"internalConsoleOptions": "openOnSessionStart",
78-
},
61+
}
7962
],
8063
"inputs": [
8164
{

package-lock.json

Lines changed: 58 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"@types/office-js": "^1.0.9",
4141
"@types/office-runtime": "^1.0.8",
4242
"babel-loader": "^8.0.6",
43-
"clean-webpack-plugin": "^2.0.1",
43+
"clean-webpack-plugin": "^3.0.0",
4444
"copy-webpack-plugin": "^5.0.3",
4545
"custom-functions-metadata-plugin": "^1.0.0",
4646
"file-loader": "^3.0.1",

test/src/test-helpers.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ export function addTestResult(testValues: any[], resultName: string, resultValue
1919
data["resultName"] = resultName;
2020
data["resultValue"] = resultValue;
2121
testValues.push(data);
22-
}
22+
}

test/webpack.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const devCerts = require("office-addin-dev-certs");
2-
const CleanWebpackPlugin = require("clean-webpack-plugin");
2+
const { CleanWebpackPlugin } = require("clean-webpack-plugin");
33
const CopyWebpackPlugin = require("copy-webpack-plugin");
44
const CustomFunctionsMetadataPlugin = require("custom-functions-metadata-plugin");
55
const HtmlWebpackPlugin = require("html-webpack-plugin");

0 commit comments

Comments
 (0)