Skip to content
This repository has been archived by the owner on Oct 6, 2019. It is now read-only.

replace jre based yui compressor with .net msbuild version #649

Merged
merged 5 commits into from
Apr 9, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 21 additions & 10 deletions Build/BuildScripts/Package.targets
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,14 @@
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<DotNetNukeMSBuildTasksLib>$(BuildScriptsPath)\DotNetNuke.MSBuild.Tasks.dll</DotNetNukeMSBuildTasksLib>
<YuiLib>$(BuildScriptsPath)\Yahoo.Yui.Compressor.MsBuild.dll</YuiLib>
</PropertyGroup>

<Import Project="MSBuild.Community.Tasks.Targets" />
<UsingTask AssemblyFile="$(DotNetNukeMSBuildTasksLib)" TaskName="DotNetNuke.MSBuild.Tasks.ExtensionPackager" />
<UsingTask AssemblyFile="$(YuiLib)" TaskName="CssCompressorTask" />
<!--<UsingTask AssemblyFile="$(YuiLib)" TaskName="JavaScriptCompressorTask" />-->

<Target Name="Package" Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
<XmlRead Prefix="n"
Namespace="http://schemas.microsoft.com/developer/msbuild/2003"
Expand Down Expand Up @@ -42,32 +47,38 @@
</Target>

<Target Name="Minification">
<PropertyGroup>
<yuicompressor>java -jar "$(BuildScriptsPath)\yuicompressor.jar"</yuicompressor>
</PropertyGroup>

<MakeDir Directories="$(MSBuildProjectDirectory)\Package"/>
<Zip Files="@(Resources)" WorkingDirectory="$(MSBuildProjectDirectory)" ZipFileName="$(MSBuildProjectDirectory)\Package\Resources.zip" />
<Unzip ZipFileName="$(MSBuildProjectDirectory)\Package\Resources.zip" TargetDirectory="$(MSBuildProjectDirectory)\Package\Resources" />
<Delete Files="$(MSBuildProjectDirectory)\Package\Resources.zip" />
<ItemGroup>
<_JSFilesToMinify Include="$(MSBuildProjectDirectory)\Package\Resources\**\*.js" Exclude="$(MSBuildProjectDirectory)\Package\Resources\**\*.min.js" />
<!--<_JSFilesToMinify Include="$(MSBuildProjectDirectory)\Package\Resources\**\*.js" Exclude="$(MSBuildProjectDirectory)\Package\Resources\**\*.min.js" />-->
<_Step2FilesToZip Include="$(MSBuildProjectDirectory)\Package\Resources\**\*" />
</ItemGroup>
<!--
<Message Text="Compressing Javascript files" Importance="high" />
<!--
<JSCompress Files="@(_JSFilesToMinify)" ContinueOnError="WarnAndContinue" />
-->
<JavaScriptCompressorTask Files="@(_JSFilesToMinify)" ContinueOnError="WarnAndContinue" />
-->

<ItemGroup>
<_CSSFilesToCompress Include="$(MSBuildProjectDirectory)\**\*.css" Exclude="$(MSBuildProjectDirectory)\Package\**\*;$(MSBuildProjectDirectory)\**\node_modules\**\*" />
</ItemGroup>
<Message Text="Compressing CSS files" Importance="high" />
<Exec Command="$(yuicompressor) -v &quot;%(_CSSFilesToCompress.FullPath)&quot; &gt; &quot;$(MSBuildProjectDirectory)\Package\Resources\%(_CSSFilesToCompress.RecursiveDir)%(_CSSFilesToCompress.Filename)%(_CSSFilesToCompress.Extension)&quot;"
Condition="Exists(%(_CSSFilesToCompress.FullPath))" ContinueOnError="false" />

<CssCompressorTask
SourceFiles="@(_CSSFilesToCompress)"
DeleteSourceFiles="false"
OutputFile="$(MSBuildProjectDirectory)\Package\Resources\%(_CSSFilesToCompress.RecursiveDir)%(_CSSFilesToCompress.Filename)%(_CSSFilesToCompress.Extension)"
CompressionType="Standard"
LoggingType="Info"
PreserveComments="false"
LineBreakPosition="-1"
Condition="@(_CSSFilesToCompress->Count())!=0"
/>

<Zip Files="@(_Step2FilesToZip)" WorkingDirectory="$(ResourceZipWorkingDirectory)"
ZipFileName="$(MSBuildProjectDirectory)\Package\Resources.zip" />
<RemoveDir Directories ="$(MSBuildProjectDirectory)\Package\Resources" ContinueOnError="WarnAndContinue" />
</Target>
</Project>
</Project>
Binary file not shown.
Binary file added Build/BuildScripts/Yahoo.Yui.Compressor.dll
Binary file not shown.
Binary file removed Build/BuildScripts/yuicompressor.jar
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@
<Compile Include="Services\RolesController.cs" />
</ItemGroup>
<ItemGroup>
<Content Include="admin\personaBar\css\Roles.css" />
<Content Include="admin\personaBar\scripts\bundles\roles-bundle.js" />
<Content Include="admin\personaBar\scripts\Roles.js" />
<Content Include="admin\personaBar\Roles.html" />
Expand Down Expand Up @@ -154,4 +153,4 @@
</VisualStudio>
</ProjectExtensions>
<Import Project="Module.build" />
</Project>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ const boilerPlate = {
utilities.init(options.utility);
utilities.moduleName = options.moduleName;
utilities.settings = options.settings;
// delay the styles loading after the __webpack_public_path__ is set
// this allows the fonts associated to be loaded properly in production
require("../less/style.less");
},
dispatch() {
throw new Error("dispatch method needs to be overwritten from the Redux store");
Expand Down

This file was deleted.