Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a MSBuild task for running yarn build #1110

Merged
merged 1 commit into from
Aug 25, 2021
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
28 changes: 28 additions & 0 deletions src/DotVVM.Framework/DotVVM.Framework.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -128,4 +128,32 @@
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
</PropertyGroup>

<ItemGroup>
<!-- the wildcard would not work in Target.Inputs, it only works in Include -->
<TypescriptFile Include="Resources/Scripts/**/*.ts" />
</ItemGroup>

<!-- DispatchToInnerBuilds is there to run it just once for all TargetFrameworks -->
<Target Name="CompileJS" Inputs="@(TypescriptFile)" Outputs="obj/javascript/root-only/dotvvm-root.js;obj/javascript/root-only-debug/dotvvm-root.js;obj/javascript/root-spa/dotvvm-root.js;obj/javascript/root-spa-debug/dotvvm-root.js"
BeforeTargets="DispatchToInnerBuilds">

<!-- Check if yarn exists, so we can fallback to npm otherwise -->
<!-- Some Linux distros use yarnpkg as name for -->
<Exec Command="yarnpkg --version" IgnoreExitCode="True" ConsoleToMsBuild="True" ContinueOnError="true">
<Output TaskParameter="ExitCode" PropertyName="YarnVersionExitCode" />
</Exec>

<Exec Command="yarnpkg install --frozen-lockfile" Condition="'$(YarnVersionExitCode)' == '0'" ContinueOnError="true"/>
<Exec Command="npm ci" Condition="'$(YarnVersionExitCode)' != '0'" ContinueOnError="true"/>

<Exec Command="yarnpkg build-production" Condition="'$(YarnVersionExitCode)' == '0'" ContinueOnError="true" YieldDuringToolExecution="True" ConsoleToMSBuild="true"/>
<Exec Command="yarnpkg build-development" Condition="'$(YarnVersionExitCode)' == '0'" ContinueOnError="true" YieldDuringToolExecution="True" ConsoleToMSBuild="true"/>
<Exec Command="yarnpkg build-polyfills" Condition="'$(YarnVersionExitCode)' == '0'" ContinueOnError="true" YieldDuringToolExecution="True" ConsoleToMSBuild="true"/>

<Exec Command="npm run build-production" Condition="'$(YarnVersionExitCode)' != '0'" ContinueOnError="true" YieldDuringToolExecution="True" />
<Exec Command="npm run build-development" Condition="'$(YarnVersionExitCode)' != '0'" ContinueOnError="true" YieldDuringToolExecution="True" />
<Exec Command="npm run build-polyfills" Condition="'$(YarnVersionExitCode)' != '0'" ContinueOnError="true" YieldDuringToolExecution="True" />
</Target>

</Project>
2 changes: 0 additions & 2 deletions src/DotVVM.Framework/rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import typescript from '@rollup/plugin-typescript'
import resolve from 'rollup-plugin-node-resolve';
import commonjs from 'rollup-plugin-commonjs';
import livereload from 'rollup-plugin-livereload';
import { terser } from 'rollup-plugin-terser'
import replace from '@rollup/plugin-replace';

Expand Down Expand Up @@ -79,7 +78,6 @@ const config = ({ minify, input, output, spa, legacy }) => ({
ascii_only: true
}
}),
//!production && livereload('public')
]
})

Expand Down