Skip to content

Commit

Permalink
General improvements (microsoft#943)
Browse files Browse the repository at this point in the history
* Update URLs to decrease HTTP redirections

* Fix indentation

* Add missing newlines at EOF of text files

* Update engines  to match with the dependencies
Dependencies exports-loader, source-map-loader, webpack-dev-middleware &
webpack-dev-server requires node >= 18.12.0 that comes with npm 8.19.2

* Bugfix: make textarea non-resizable

---------

Co-authored-by: Stephen Griffin <[email protected]>
  • Loading branch information
oh2fih and stephenegriffin authored Mar 18, 2024
1 parent e6847a4 commit e6cba07
Show file tree
Hide file tree
Showing 77 changed files with 118 additions and 119 deletions.
2 changes: 1 addition & 1 deletion .deployment
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[config]
command = deploy.cmd
command = deploy.cmd
2 changes: 1 addition & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/Pages
/Pages
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ updates:
- package-ecosystem: docker
directory: /
schedule:
interval: daily
interval: daily
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@ jobs:
package.json
.deployment
deploy.cmd
Web.config
Web.config
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/.vs
/node_modules
/Pages
/Resources
/Resources
57 changes: 28 additions & 29 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -1,30 +1,29 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "Outlook Desktop (Edge Chromium)",
"type": "msedge",
"request": "attach",
"port": 9229,
"timeout": 600000,
"webRoot": "${workspaceRoot}",
"preLaunchTask": "Debug: Outlook Desktop",
"postDebugTask": "Stop Debug"
},
{
"name": "Outlook Desktop (Edge Legacy)",
"type": "office-addin",
"request": "attach",
"url": "https://localhost:3000/taskpane.html?_host_Info=Outlook$Win32$16.01$en-US$$$$0",
"port": 9222,
"timeout": 600000,
"webRoot": "${workspaceRoot}",
"preLaunchTask": "Debug: Outlook Desktop",
"postDebugTask": "Stop Debug"
},
]
}

// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "Outlook Desktop (Edge Chromium)",
"type": "msedge",
"request": "attach",
"port": 9229,
"timeout": 600000,
"webRoot": "${workspaceRoot}",
"preLaunchTask": "Debug: Outlook Desktop",
"postDebugTask": "Stop Debug"
},
{
"name": "Outlook Desktop (Edge Legacy)",
"type": "office-addin",
"request": "attach",
"url": "https://localhost:3000/taskpane.html?_host_Info=Outlook$Win32$16.01$en-US$$$$0",
"port": 9222,
"timeout": 600000,
"webRoot": "${workspaceRoot}",
"preLaunchTask": "Debug: Outlook Desktop",
"postDebugTask": "Stop Debug"
},
]
}
13 changes: 6 additions & 7 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
{
"eslint.validate": [
"javascript",
"javascriptreact",
"typescript"
]
}

"eslint.validate": [
"javascript",
"javascriptreact",
"typescript"
]
}
2 changes: 1 addition & 1 deletion .vsconfig
Original file line number Diff line number Diff line change
Expand Up @@ -68,4 +68,4 @@
"Microsoft.VisualStudio.Component.Windows10SDK.18362",
"Microsoft.VisualStudio.Workload.NativeDesktop"
]
}
}
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ FROM node:latest@sha256:b9ccc4aca32eebf124e0ca0fd573dacffba2b9236987a1d4d2625ce3

WORKDIR /app

RUN git clone https://github.com/stephenegriffin/MHA.git
RUN cd /app/MHA && npm i && npm run build --if-present
RUN git clone https://github.com/microsoft/MHA.git
RUN cd /app/MHA && npm i && npm run build --if-present
2 changes: 1 addition & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ module.exports = function (grunt) {
grunt.loadNpmTasks("grunt-contrib-qunit");

grunt.registerTask("test", ["connect", "qunit"]);
};
};
2 changes: 1 addition & 1 deletion MHA.sln.DotSettings.user
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:Boolean x:Key="/Default/CodeStyle/Naming/CSharpAutoNaming/IsNamingAutoDetectionCompleted/@EntryValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeStyle/Naming/CSharpAutoNaming/IsNotificationDisabled/@EntryValue">True</s:Boolean></wpf:ResourceDictionary>
<s:Boolean x:Key="/Default/CodeStyle/Naming/CSharpAutoNaming/IsNotificationDisabled/@EntryValue">True</s:Boolean></wpf:ResourceDictionary>
2 changes: 1 addition & 1 deletion Manifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<Description DefaultValue="Microsoft Message Header Analyzer" />
<IconUrl DefaultValue="https://mha.azurewebsites.net/Resources/mhaLogo64.jpg" />
<HighResolutionIconUrl DefaultValue="https://mha.azurewebsites.net/Resources/mhaLogo128.jpg" />
<SupportUrl DefaultValue="https://github.com/stephenegriffin/MHA/issues" />
<SupportUrl DefaultValue="https://github.com/microsoft/MHA/issues" />
<Hosts>
<Host Name="Mailbox" />
</Hosts>
Expand Down
4 changes: 2 additions & 2 deletions ManifestDebugLocal.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<Description DefaultValue="Microsoft Message Header Analyzer Debug Local" />
<IconUrl DefaultValue="https://localhost:44336/Resources/mhaLogo64.jpg" />
<HighResolutionIconUrl DefaultValue="https://localhost:44336/Resources/mhaLogo128.jpg" />
<SupportUrl DefaultValue="https://github.com/stephenegriffin/MHA/issues" />
<SupportUrl DefaultValue="https://github.com/microsoft/MHA/issues" />
<Hosts>
<Host Name="Mailbox" />
</Hosts>
Expand Down Expand Up @@ -207,4 +207,4 @@
</Resources>
</VersionOverrides>
</VersionOverrides>
</OfficeApp>
</OfficeApp>
4 changes: 2 additions & 2 deletions ManifestDebugServer.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<Description DefaultValue="Microsoft Message Header Analyzer Debug Server" />
<IconUrl DefaultValue="https://mha-test3ff4.azurewebsites.net/Resources/mhaLogo64.jpg" />
<HighResolutionIconUrl DefaultValue="https://mha-test3ff4.azurewebsites.net/Resources/mhaLogo128.jpg" />
<SupportUrl DefaultValue="https://github.com/stephenegriffin/MHA/issues" />
<SupportUrl DefaultValue="https://github.com/microsoft/MHA/issues" />
<Hosts>
<Host Name="Mailbox" />
</Hosts>
Expand Down Expand Up @@ -207,4 +207,4 @@
</Resources>
</VersionOverrides>
</VersionOverrides>
</OfficeApp>
</OfficeApp>
2 changes: 1 addition & 1 deletion Web.config
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@
<system.web>
<compilation debug="true" targetFramework="4.8"/>
</system.web>
</configuration>
</configuration>
2 changes: 1 addition & 1 deletion index.d.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
declare module "*.png";
declare module "*.jpg";
declare module "*.jpg";
2 changes: 1 addition & 1 deletion lgtm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ path_classifiers:
generated:
- exclude: Pages
queries:
- exclude: js/node/unused-npm-dependency
- exclude: js/node/unused-npm-dependency
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"version": "1.0.0",
"description": "Message Header Analyzer",
"engines": {
"node": ">=12.13.0",
"npm": ">=6.0.0"
"node": ">=18.12.0",
"npm": ">=8.19.2"
},
"private": true,
"scripts": {
Expand All @@ -22,7 +22,7 @@
"keywords": [],
"repository": {
"type": "git",
"url": "https://github.com/stephenegriffin/mha.git"
"url": "https://github.com/microsoft/MHA.git"
},
"author": "Stephen Griffin",
"license": "MIT",
Expand All @@ -32,9 +32,9 @@
"dev_server_port": 44336
},
"bugs": {
"url": "https://github.com/stephenegriffin/mha/issues"
"url": "https://github.com/microsoft/MHA/issues"
},
"homepage": "https://github.com/stephenegriffin/mha#readme",
"homepage": "https://github.com/microsoft/MHA#readme",
"devDependencies": {
"@types/jquery": "^3.5.29",
"@types/office-js": "^1.0.377",
Expand Down
2 changes: 1 addition & 1 deletion src/Content/.csslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@
"unqualified-attributes": true,
"vendor-prefix": true,
"zero-units": true
}
}
3 changes: 2 additions & 1 deletion src/Content/App.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ body {

textarea {
font-size: 1em;
resize: none;
}

input {
Expand Down Expand Up @@ -224,4 +225,4 @@ td {

.ms-Button-icon {
display: inline-block;
}
}
2 changes: 1 addition & 1 deletion src/Content/MobilePane-ios.css
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@

.content-block {
word-wrap: break-word;
}
}
2 changes: 1 addition & 1 deletion src/Content/Office.css
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@ th, td { text-align: left; vertical-align: top; padding: .4em 1.2em 1em 0; line-
/* Tiles
***************************************************************/
div.tiles div { width: 150px; height: 110px; float: left; margin: 0 1em 1em 0; overflow: hidden; }
div.tiles div p { padding:.5em; margin: 0; }
div.tiles div p { padding:.5em; margin: 0; }
2 changes: 1 addition & 1 deletion src/Content/unittest.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#qunit {
position: static;
}
}
2 changes: 1 addition & 1 deletion src/Pages/Default.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@
<body>
If you are not redirected automatically, follow this <a href='parentframe.html?default=classic'>link to example</a>.
</body>
</html>
</html>
2 changes: 1 addition & 1 deletion src/Pages/DefaultPhone.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@
<body>
If you are not redirected automatically, follow this <a href='parentframe.html?default=classic'>link to example</a>.
</body>
</html>
</html>
2 changes: 1 addition & 1 deletion src/Pages/DefaultTablet.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@
<body>
If you are not redirected automatically, follow this <a href='parentframe.html?default=classic'>link to example</a>.
</body>
</html>
</html>
2 changes: 1 addition & 1 deletion src/Pages/DesktopPane.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@
<body>
If you are not redirected automatically, follow this <a href='parentframe.html?default=new'>link to example</a>.
</body>
</html>
</html>
2 changes: 1 addition & 1 deletion src/Pages/Functions.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
</head>
<body>
</body>
</html>
</html>
2 changes: 1 addition & 1 deletion src/Pages/MobilePane.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
<body>
If you are not redirected automatically, follow this <a href='parentframe.html?default=new-mobile'>link to example</a>.
</body>
</html>
</html>
2 changes: 1 addition & 1 deletion src/Pages/mha.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ <h1 id="title">Message Header Analyzer</h1>
<span class="ms-Button-label">Copy</span>
</button>
<span id="mhaFooter">
<a href="https://github.com/stephenegriffin/mha" target="_blank">Submit feedback on github</a>
<a href="https://github.com/microsoft/MHA" target="_blank">Submit feedback on github</a>
</span>

<hr id="lineBreak" />
Expand Down
2 changes: 1 addition & 1 deletion src/Pages/newDesktopFrame.html
Original file line number Diff line number Diff line change
Expand Up @@ -83,4 +83,4 @@
</div>
</div>
</body>
</html>
</html>
2 changes: 1 addition & 1 deletion src/Pages/newMobilePaneIosFrame.html
Original file line number Diff line number Diff line change
Expand Up @@ -78,4 +78,4 @@
</div>
</div>
</body>
</html>
</html>
2 changes: 1 addition & 1 deletion src/Pages/parentframe.html
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,4 @@
</div>
</div>
</body>
</html>
</html>
2 changes: 1 addition & 1 deletion src/Pages/privacy.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ <h3>Telemetry</h3>
gathered is deleted after 90 days.

<h3>Questions</h3>
Please refer any questions to the MHA <a href="https://github.com/stephenegriffin/MHA/issues/" target="_blank">project</a> on GitHub.<br />
Please refer any questions to the MHA <a href="https://github.com/microsoft/MHA/issues/" target="_blank">project</a> on GitHub.<br />
<br />
<h2>A Note from the Developer on Permissions</h2>
In order to get the transport message headers I have to use the EWS makeEwsRequestAsync method, which requires the ReadWriteMailbox permission level. See the article
Expand Down
2 changes: 1 addition & 1 deletion src/Pages/unittests.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@
</div>
</div>
</body>
</html>
</html>
2 changes: 1 addition & 1 deletion src/Scripts/2047.ts
Original file line number Diff line number Diff line change
Expand Up @@ -221,4 +221,4 @@ export class Decoder {

return result.join("");
}
}
}
2 changes: 1 addition & 1 deletion src/Scripts/Antispam.ts
Original file line number Diff line number Diff line change
Expand Up @@ -94,4 +94,4 @@ export class AntiSpamReport {
});
return ret.join("\n");
}
}
}
2 changes: 1 addition & 1 deletion src/Scripts/Default.ts
Original file line number Diff line number Diff line change
Expand Up @@ -86,4 +86,4 @@ $(function() {
postError(e, "Failed initializing frame");
showError(e, "Failed initializing frame");
}
});
});
2 changes: 1 addition & 1 deletion src/Scripts/DesktopPane.ts
Original file line number Diff line number Diff line change
Expand Up @@ -390,4 +390,4 @@ $(function() {
postError(e, "Failed initializing frame");
showError(e, "Failed initializing frame");
}
});
});
Loading

0 comments on commit e6cba07

Please sign in to comment.