Builds TS from RCL project #285

POPWorldMedia · Aug 29, 2022 · dac35d7 · dac35d7
1 parent 2e6da97
commit dac35d7
Show file tree

Hide file tree

Showing 47 changed files with 16 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -19,4 +19,4 @@ src/PopForums.Web/wwwroot/lib/PopForums/dist/*
 node_modules
 src/PopForums.AzureKit.Functions/Properties/ServiceDependencies
 src/PopForums.Web/package-lock.json
-src/PopForums.Web/wwwroot/lib/PopForums/src/PopForums.js
+src/PopForums.Mvc/wwwroot/PopForums.js
diff --git a/src/PopForums.Mvc/Areas/Forums/Views/Shared/PopForumsMaster.cshtml b/src/PopForums.Mvc/Areas/Forums/Views/Shared/PopForumsMaster.cshtml
@@ -5,12 +5,12 @@
 @section HeaderContent {
 	<environment include="Development">
 		<script src="~/lib/signalr/dist/signalr.js" asp-append-version="true"></script>
-		<script src="~/lib/PopForums/src/PopForums.js" asp-append-version="true"></script>
+        <script src="~/_content/PopForums.Mvc/PopForums.js" asp-append-version="true"></script>
 		<link href="~/lib/PopForums/src/PopForums.css" rel="stylesheet" asp-append-version="true" />
 	</environment>
 	<environment exclude="Development">
 		<script src="~/lib/signalr/dist/signalr.min.js" asp-append-version="true"></script>
-		<script src="~/lib/PopForums/dist/PopForums.min.js" asp-append-version="true"></script>
+        <script src="~/_content/PopForums.Mvc/PopForums.js" asp-append-version="true"></script>
 		<link href="~/lib/PopForums/dist/PopForums.min.css" rel="stylesheet" asp-append-version="true" />
 	</environment>
 	@RenderSection("HeaderContent", required: false)

diff --git a/...ums/src/Client/Components/AnswerButton.ts → ...ums.Mvc/Client/Components/AnswerButton.ts b/...ums/src/Client/Components/AnswerButton.ts → ...ums.Mvc/Client/Components/AnswerButton.ts
diff --git a/...ms/src/Client/Components/CommentButton.ts → ...ms.Mvc/Client/Components/CommentButton.ts b/...ms/src/Client/Components/CommentButton.ts → ...ms.Mvc/Client/Components/CommentButton.ts
diff --git a/...s/src/Client/Components/FavoriteButton.ts → ...s.Mvc/Client/Components/FavoriteButton.ts b/...s/src/Client/Components/FavoriteButton.ts → ...s.Mvc/Client/Components/FavoriteButton.ts
diff --git a/...ms/src/Client/Components/FormattedTime.ts → ...ms.Mvc/Client/Components/FormattedTime.ts b/...ms/src/Client/Components/FormattedTime.ts → ...ms.Mvc/Client/Components/FormattedTime.ts
diff --git a/...pForums/src/Client/Components/FullText.ts → ...pForums.Mvc/Client/Components/FullText.ts b/...pForums/src/Client/Components/FullText.ts → ...pForums.Mvc/Client/Components/FullText.ts
diff --git a/...rums/src/Client/Components/HomeUpdater.ts → ...rums.Mvc/Client/Components/HomeUpdater.ts b/...rums/src/Client/Components/HomeUpdater.ts → ...rums.Mvc/Client/Components/HomeUpdater.ts
diff --git a/...Forums/src/Client/Components/LoginForm.ts → ...Forums.Mvc/Client/Components/LoginForm.ts b/...Forums/src/Client/Components/LoginForm.ts → ...Forums.Mvc/Client/Components/LoginForm.ts
diff --git a/.../Components/MorePostsBeforeReplyButton.ts → .../Components/MorePostsBeforeReplyButton.ts b/.../Components/MorePostsBeforeReplyButton.ts → .../Components/MorePostsBeforeReplyButton.ts
diff --git a/.../src/Client/Components/MorePostsButton.ts → ....Mvc/Client/Components/MorePostsButton.ts b/.../src/Client/Components/MorePostsButton.ts → ....Mvc/Client/Components/MorePostsButton.ts
diff --git a/...src/Client/Components/NotificationItem.ts → ...Mvc/Client/Components/NotificationItem.ts b/...src/Client/Components/NotificationItem.ts → ...Mvc/Client/Components/NotificationItem.ts
diff --git a/...src/Client/Components/NotificationList.ts → ...Mvc/Client/Components/NotificationList.ts b/...src/Client/Components/NotificationList.ts → ...Mvc/Client/Components/NotificationList.ts
diff --git a/...t/Components/NotificationMarkAllButton.ts → ...t/Components/NotificationMarkAllButton.ts b/...t/Components/NotificationMarkAllButton.ts → ...t/Components/NotificationMarkAllButton.ts
diff --git a/...c/Client/Components/NotificationToggle.ts → ...c/Client/Components/NotificationToggle.ts b/...c/Client/Components/NotificationToggle.ts → ...c/Client/Components/NotificationToggle.ts
diff --git a/...opForums/src/Client/Components/PMCount.ts → ...opForums.Mvc/Client/Components/PMCount.ts b/...opForums/src/Client/Components/PMCount.ts → ...opForums.Mvc/Client/Components/PMCount.ts
diff --git a/...PopForums/src/Client/Components/PMForm.ts → ...PopForums.Mvc/Client/Components/PMForm.ts b/...PopForums/src/Client/Components/PMForm.ts → ...PopForums.Mvc/Client/Components/PMForm.ts
diff --git a/.../src/Client/Components/PostMiniProfile.ts → ....Mvc/Client/Components/PostMiniProfile.ts b/.../src/Client/Components/PostMiniProfile.ts → ....Mvc/Client/Components/PostMiniProfile.ts
diff --git a/...ent/Components/PostModerationLogButton.ts → ...ent/Components/PostModerationLogButton.ts b/...ent/Components/PostModerationLogButton.ts → ...ent/Components/PostModerationLogButton.ts
diff --git a/...ms/src/Client/Components/PreviewButton.ts → ...ms.Mvc/Client/Components/PreviewButton.ts b/...ms/src/Client/Components/PreviewButton.ts → ...ms.Mvc/Client/Components/PreviewButton.ts
diff --git a/.../Client/Components/PreviousPostsButton.ts → .../Client/Components/PreviousPostsButton.ts b/.../Client/Components/PreviousPostsButton.ts → .../Client/Components/PreviousPostsButton.ts
diff --git a/...rums/src/Client/Components/QuoteButton.ts → ...rums.Mvc/Client/Components/QuoteButton.ts b/...rums/src/Client/Components/QuoteButton.ts → ...rums.Mvc/Client/Components/QuoteButton.ts
diff --git a/...rums/src/Client/Components/ReplyButton.ts → ...rums.Mvc/Client/Components/ReplyButton.ts b/...rums/src/Client/Components/ReplyButton.ts → ...rums.Mvc/Client/Components/ReplyButton.ts
diff --git a/...Forums/src/Client/Components/ReplyForm.ts → ...Forums.Mvc/Client/Components/ReplyForm.ts b/...Forums/src/Client/Components/ReplyForm.ts → ...Forums.Mvc/Client/Components/ReplyForm.ts
diff --git a/...ms/src/Client/Components/SearchNavForm.ts → ...ms.Mvc/Client/Components/SearchNavForm.ts b/...ms/src/Client/Components/SearchNavForm.ts → ...ms.Mvc/Client/Components/SearchNavForm.ts
diff --git a/.../src/Client/Components/SubscribeButton.ts → ....Mvc/Client/Components/SubscribeButton.ts b/.../src/Client/Components/SubscribeButton.ts → ....Mvc/Client/Components/SubscribeButton.ts
diff --git a/...rums/src/Client/Components/TopicButton.ts → ...rums.Mvc/Client/Components/TopicButton.ts b/...rums/src/Client/Components/TopicButton.ts → ...rums.Mvc/Client/Components/TopicButton.ts
diff --git a/...Forums/src/Client/Components/TopicForm.ts → ...Forums.Mvc/Client/Components/TopicForm.ts b/...Forums/src/Client/Components/TopicForm.ts → ...Forums.Mvc/Client/Components/TopicForm.ts
diff --git a/...nt/Components/TopicModerationLogButton.ts → ...nt/Components/TopicModerationLogButton.ts b/...nt/Components/TopicModerationLogButton.ts → ...nt/Components/TopicModerationLogButton.ts
diff --git a/...Forums/src/Client/Components/VoteCount.ts → ...Forums.Mvc/Client/Components/VoteCount.ts b/...Forums/src/Client/Components/VoteCount.ts → ...Forums.Mvc/Client/Components/VoteCount.ts
diff --git a/.../lib/PopForums/src/Client/Declarations.ts → src/PopForums.Mvc/Client/Declarations.ts b/.../lib/PopForums/src/Client/Declarations.ts → src/PopForums.Mvc/Client/Declarations.ts
diff --git a/...t/lib/PopForums/src/Client/ElementBase.ts → src/PopForums.Mvc/Client/ElementBase.ts b/...t/lib/PopForums/src/Client/ElementBase.ts → src/PopForums.Mvc/Client/ElementBase.ts
diff --git a/...pForums/src/Client/Models/Notification.ts → ...pForums.Mvc/Client/Models/Notification.ts b/...pForums/src/Client/Models/Notification.ts → ...pForums.Mvc/Client/Models/Notification.ts
diff --git a/...orums/src/Client/Models/PrivateMessage.ts → ...orums.Mvc/Client/Models/PrivateMessage.ts b/...orums/src/Client/Models/PrivateMessage.ts → ...orums.Mvc/Client/Models/PrivateMessage.ts
diff --git a/...s/src/Client/Models/PrivateMessageUser.ts → ...s.Mvc/Client/Models/PrivateMessageUser.ts b/...s/src/Client/Models/PrivateMessageUser.ts → ...s.Mvc/Client/Models/PrivateMessageUser.ts
diff --git a/...rc/Client/Services/LocalizationService.ts → ...vc/Client/Services/LocalizationService.ts b/...rc/Client/Services/LocalizationService.ts → ...vc/Client/Services/LocalizationService.ts
diff --git a/...rc/Client/Services/NotificationService.ts → ...vc/Client/Services/NotificationService.ts b/...rc/Client/Services/NotificationService.ts → ...vc/Client/Services/NotificationService.ts
diff --git a/.../PopForums/src/Client/State/ForumState.ts → src/PopForums.Mvc/Client/State/ForumState.ts b/.../PopForums/src/Client/State/ForumState.ts → src/PopForums.Mvc/Client/State/ForumState.ts
diff --git a/...pForums/src/Client/State/Localizations.ts → ...pForums.Mvc/Client/State/Localizations.ts b/...pForums/src/Client/State/Localizations.ts → ...pForums.Mvc/Client/State/Localizations.ts
diff --git a/...s/src/Client/State/PrivateMessageState.ts → ...s.Mvc/Client/State/PrivateMessageState.ts b/...s/src/Client/State/PrivateMessageState.ts → ...s.Mvc/Client/State/PrivateMessageState.ts
diff --git a/.../PopForums/src/Client/State/TopicState.ts → src/PopForums.Mvc/Client/State/TopicState.ts b/.../PopForums/src/Client/State/TopicState.ts → src/PopForums.Mvc/Client/State/TopicState.ts
diff --git a/...b/PopForums/src/Client/State/UserState.ts → src/PopForums.Mvc/Client/State/UserState.ts b/...b/PopForums/src/Client/State/UserState.ts → src/PopForums.Mvc/Client/State/UserState.ts
diff --git a/...oot/lib/PopForums/src/Client/StateBase.ts → src/PopForums.Mvc/Client/StateBase.ts b/...oot/lib/PopForums/src/Client/StateBase.ts → src/PopForums.Mvc/Client/StateBase.ts
diff --git a/...rums/src/Client/WatchPropertyAttribute.ts → ...rums.Mvc/Client/WatchPropertyAttribute.ts b/...rums/src/Client/WatchPropertyAttribute.ts → ...rums.Mvc/Client/WatchPropertyAttribute.ts
diff --git a/...ot/lib/PopForums/src/Client/tsconfig.json → src/PopForums.Mvc/Client/tsconfig.json b/...ot/lib/PopForums/src/Client/tsconfig.json → src/PopForums.Mvc/Client/tsconfig.json
@@ -4,7 +4,7 @@
     "target": "es2018",
     "inlineSources": true,
     "inlineSourceMap": true,
-    "outFile": "../PopForums.js",
+    "outFile": "../wwwroot/PopForums.js",
     "experimentalDecorators": true,
     "noImplicitAny": true,
     "suppressImplicitAnyIndexErrors": true,

diff --git a/src/PopForums.Mvc/PopForums.Mvc.csproj b/src/PopForums.Mvc/PopForums.Mvc.csproj
@@ -13,15 +13,26 @@
 		<RepositoryUrl>https://github.com/POPWorldMedia/POPForums</RepositoryUrl>
 		<Copyright>2022, POP World Media, LLC</Copyright>
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
+		<!--This is an important line to trigger the hot reload:-->
+		<AssignTargetPathsDependsOn>CompileTypeScript;$(AssignTargetPathsDependsOn)</AssignTargetPathsDependsOn>
 	</PropertyGroup>
 
 	<ItemGroup>
 		<FrameworkReference Include="Microsoft.AspNetCore.App" />
+		<PackageReference Include="Microsoft.TypeScript.MSBuild" Version="4.8.2">
+		  <PrivateAssets>all</PrivateAssets>
+		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
 		<PackageReference Include="PopIdentity" Version="3.0.0" />
 	</ItemGroup>
 
 	<ItemGroup>
 		<ProjectReference Include="..\PopForums\PopForums.csproj" />
 	</ItemGroup>
 
+	<ItemGroup>
+	  <Folder Include="Client\" />
+	  <Folder Include="wwwroot\" />
+	</ItemGroup>
+
 </Project>
diff --git a/src/PopForums.Web/wwwroot/lib/PopForums/package.json b/src/PopForums.Web/wwwroot/lib/PopForums/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@popworldmedia/popforums",
-  "version": "19.0.0-prerelease.355",
+  "version": "19.0.0-prerelease.357",
   "description": "POP Forums client side",
   "scripts": {},
   "repository": {