Skip to content

Commit 167a487

Browse files
committed
Merge branch 'release/0.2.0'
* release/0.2.0: (GH-3) Added Wyam Documentation (GH-2) Corrected cache invalidation (GH-2) Updated AppVeyor config file (GH-2) Refactoring to get basic build to work (GH-2) Updated gitignore file (GH-2) Added main Cake.Recipe files (GH-2) Added GRM Config file (GH-2) Removed GRM Config File (GH-2) Renamed AppVeyor file Upgrade Cake to 0.17.0
2 parents 204b6f2 + 730d9f7 commit 167a487

37 files changed

+504
-295
lines changed

.appveyor.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
#---------------------------------#
2+
# Build Script #
3+
#---------------------------------#
4+
build_script:
5+
- ps: .\build.ps1 -Target AppVeyor
6+
7+
# Tests
8+
test: off
9+
10+
#---------------------------------#
11+
# Branches to build #
12+
#---------------------------------#
13+
branches:
14+
# Whitelist
15+
only:
16+
- develop
17+
- master
18+
- /release/.*/
19+
- /hotfix/.*/
20+
21+
#---------------------------------#
22+
# Build Cache #
23+
#---------------------------------#
24+
cache:
25+
- src\packages -> src\**\packages.config
26+
- tools -> setup.cakef

.gitignore

Lines changed: 33 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
## Ignore Visual Studio temporary files, build results, and
22
## files generated by popular Visual Studio add-ons.
3-
4-
# Cake
5-
/Tools
6-
VersionAssemblyInfo.*
3+
##
4+
## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
75

86
# User-specific files
97
*.suo
@@ -44,9 +42,11 @@ TestResult.xml
4442
[Rr]eleasePS/
4543
dlldata.c
4644

47-
# DNX
45+
# .NET Core
4846
project.lock.json
47+
project.fragment.lock.json
4948
artifacts/
49+
**/Properties/launchSettings.json
5050

5151
*_i.c
5252
*_p.c
@@ -84,6 +84,8 @@ ipch/
8484
*.opensdf
8585
*.sdf
8686
*.cachefile
87+
*.VC.db
88+
*.VC.VC.opendb
8789

8890
# Visual Studio profiler
8991
*.psess
@@ -111,6 +113,10 @@ _TeamCity*
111113
# DotCover is a Code Coverage Tool
112114
*.dotCover
113115

116+
# Visual Studio code coverage results
117+
*.coverage
118+
*.coveragexml
119+
114120
# NCrunch
115121
_NCrunch_*
116122
.*crunch*.local.xml
@@ -142,11 +148,16 @@ publish/
142148
# Publish Web Output
143149
*.[Pp]ublish.xml
144150
*.azurePubxml
145-
# TODO: Comment the next line if you want to checkin your web deploy settings
151+
# TODO: Comment the next line if you want to checkin your web deploy settings
146152
# but database connection strings (with potential passwords) will be unencrypted
147153
*.pubxml
148154
*.publishproj
149155

156+
# Microsoft Azure Web App publish settings. Comment the next line if you want to
157+
# checkin your Azure Web App publish settings, but sensitive information contained
158+
# in these scripts will be unencrypted
159+
PublishScripts/
160+
150161
# NuGet Packages
151162
*.nupkg
152163
# The packages folder can be ignored because of Package Restore
@@ -167,9 +178,6 @@ csx/
167178
ecf/
168179
rcf/
169180

170-
# Microsoft Azure ApplicationInsights config file
171-
ApplicationInsights.config
172-
173181
# Windows Store app package directories and files
174182
AppPackages/
175183
BundleArtifacts/
@@ -188,12 +196,13 @@ ClientBin/
188196
*~
189197
*.dbmdl
190198
*.dbproj.schemaview
199+
*.jfm
191200
*.pfx
192201
*.publishsettings
193202
node_modules/
194203
orleans.codegen.cs
195204

196-
# Since there are multiple workflows, uncomment next line to ignore bower_components
205+
# Since there are multiple workflows, uncomment next line to ignore bower_components
197206
# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
198207
#bower_components/
199208

@@ -232,6 +241,9 @@ FakesAssemblies/
232241
# Visual Studio 6 workspace options file
233242
*.opt
234243

244+
# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
245+
*.vbw
246+
235247
# Visual Studio LightSwitch build output
236248
**/*.HTMLClient/GeneratedArtifacts
237249
**/*.DesktopClient/GeneratedArtifacts
@@ -242,6 +254,7 @@ _Pvt_Extensions
242254

243255
# Paket dependency manager
244256
.paket/paket.exe
257+
paket-files/
245258

246259
# FAKE - F# Make
247260
.fake/
@@ -250,7 +263,14 @@ _Pvt_Extensions
250263
.idea/
251264
*.sln.iml
252265

253-
/*.nupkg
266+
# CodeRush
267+
.cr/
268+
269+
# Python Tools for Visual Studio (PTVS)
270+
__pycache__/
271+
*.pyc
254272

255-
/app.js
256-
/app.bundle.js
273+
# Cake - Uncomment if you are using it
274+
tools/**
275+
!tools/packages.config
276+
BuildArtifacts/

GitReleaseManager.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
issue-labels-include:
2+
- Breaking change
3+
- Feature
4+
- Bug
5+
- Improvement
6+
- Documentation
7+
issue-labels-exclude:
8+
- Build
9+
issue-labels-alias:
10+
- name: Documentation
11+
header: Documentation
12+
plural: Documentation

GitVersionConfig.yaml

Lines changed: 0 additions & 12 deletions
This file was deleted.

README.md

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,42 @@
1-
# cake-webpack
1+
# Cake.Webpack
22

3-
[![Build status](https://ci.appveyor.com/api/projects/status/b9g04sfvnytng3nx/branch/master?svg=true)](https://ci.appveyor.com/project/Philo/cake-webpack/branch/master)
3+
Cake.Webpack is a set of aliases for Cake to help with running Webpack as part of a build.
44

5-
Aliases to assist with running Webpack from Cake build scripts
5+
[![License](http://img.shields.io/:license-mit-blue.svg)](http://cake-contrib.mit-license.org)
66

7-
## Usage
7+
## Information
88

9-
```c#
10-
#addin "Cake.Webpack"
9+
| | Stable | Pre-release |
10+
|---|---|---|
11+
|GitHub Release|-|[![GitHub release](https://img.shields.io/github/release/cake-contrib/Cake.Webpack.svg)](https://github.com/cake-contrib/Cake.Webpack/releases/latest)|
12+
|NuGet|[![NuGet](https://img.shields.io/nuget/v/Cake.Webpack.svg)](https://www.nuget.org/packages/Cake.Webpack)|[![NuGet](https://img.shields.io/nuget/vpre/Cake.Webpack.svg)](https://www.nuget.org/packages/Cake.Webpack)|
1113

12-
Task("Webpack")
13-
.Does(() =>
14-
{
15-
Webpack.Global();
16-
Webpack.FromPath(".").Global();
17-
Webpack.Global(s => s.WithBuildMode(WebpackBuildMode.Production));
18-
Webpack.Global(s => s.OutputAsJson());
19-
Webpack.Global(s => s.WithArguments("in.js out.js --verbose"));
20-
21-
Webpack.Local();
22-
Webpack.FromPath(".").Local();
23-
Webpack.Local(s => s.SetPathToWebpackJs("some-other-directory/node_modules/webpack.bin.webpack.js"));
24-
Webpack.Local(s => s.WithBuildMode(WebpackBuildMode.Production));
25-
Webpack.Local(s => s.OutputAsJson());
26-
Webpack.Local(s => s.WithArguments("in.js out.js --verbose"));
27-
});
28-
```
14+
## Build Status
2915

30-
## Documentation
16+
|Develop|Master|
17+
|:--:|:--:|
18+
|[![Build status](https://ci.appveyor.com/api/projects/status/7gs7v7drwh04h8dy/branch/develop?svg=true)](https://ci.appveyor.com/project/cakecontrib/cake-webpack/branch/develop)|[![Build status](https://ci.appveyor.com/api/projects/status/7gs7v7drwh04h8dy/branch/develop?svg=true)](https://ci.appveyor.com/project/cakecontrib/cake-webpack/branch/master)|
3119

32-
Thanks to the cakebuild.net site, documentation can be found [here](http://cakebuild.net/api/cake.webpack/)
20+
## Code Coverage
3321

34-
## Tests
22+
[![Coverage Status](https://coveralls.io/repos/github/cake-contrib/Cake.Webpack/badge.svg?branch=develop)](https://coveralls.io/github/cake-contrib/Cake.Webpack?branch=develop)
3523

36-
Cake.Webpack is covered by a set of unit tests
24+
## Quick Links
3725

38-
## I cant do _insert-option-here_
26+
- [Documentation](https://cake-contrib.github.io/Cake.Webpack)
3927

40-
If you have feature requests please submit them as issues, or better yet as pull requests :)
28+
## Chat Room
4129

30+
Come join in the conversation about Cake.Webpack in our Gitter Chat Room
31+
32+
[![Join the chat at https://gitter.im/cake-contrib/Lobby](https://badges.gitter.im/cake-contrib/Lobby.svg)](https://gitter.im/cake-contrib/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
33+
34+
## Build
35+
36+
To build this package we are using Cake.
37+
38+
On Windows PowerShell run:
39+
40+
```powershell
41+
./build
42+
```

appveyor.yml

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)