Skip to content

Commit 94b86fd

Browse files
ejballejball
committed
Support disabling ESLint.
1 parent 535882a commit 94b86fd

13 files changed

Lines changed: 430 additions & 408 deletions

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<VersionPrefix>2.0.0</VersionPrefix>
55
<Authors>Ed Ball</Authors>
66
<Copyright>Copyright $(Authors)</Copyright>
7-
<PackageLicenseUrl>https://raw.githubusercontent.com/FacilityApi/FacilityJavaScript/master/LICENSE</PackageLicenseUrl>
7+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
88
<PackageProjectUrl>https://github.com/FacilityApi/FacilityJavaScript</PackageProjectUrl>
99
<PackageReleaseNotes>https://github.com/FacilityApi/FacilityJavaScript/blob/master/VersionHistory.md#released</PackageReleaseNotes>
1010
<RepositoryUrl>https://github.com/FacilityApi/FacilityJavaScript.git</RepositoryUrl>

‎FacilityJavaScript.sln‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1313
build.cake = build.cake
1414
build.ps1 = build.ps1
1515
build.sh = build.sh
16-
src\Directory.Build.props = src\Directory.Build.props
16+
Directory.Build.props = Directory.Build.props
1717
example\ExampleApi.fsd = example\ExampleApi.fsd
1818
LICENSE = LICENSE
1919
README.md = README.md
20+
VersionHistory.md = VersionHistory.md
2021
EndProjectSection
2122
EndProject
2223
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Facility.CodeGen.JavaScript", "src\Facility.CodeGen.JavaScript\Facility.CodeGen.JavaScript.csproj", "{89B9867C-5124-49BE-B201-0F1D8E9F7738}"

‎VersionHistory.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22

33
## Pending
44

5-
Add changes here when they're committed to the `master` branch. To publish, update the version number in [Directory.Build.props](Directory.Build.props), move the pending changes below to a new [Released](#released) section, and [create a new release](https://github.com/FacilityApi/Facility/releases) using the version number, e.g. `v2.3.4`.
5+
Add changes here when they're committed to the `master` branch. To publish, update the version number in [Directory.Build.props](Directory.Build.props), move the pending changes below to a new [Released](#released) section, and [create a new release](https://github.com/FacilityApi/FacilityJavaScript/releases) using the version number, e.g. `nuget-v2.3.4`.
66

77
Prefix the description of each change with `[major]`, `[minor]`, or `[patch]` in accordance with [SemVer](http://semver.org).
88

99
* [major] Upgrade to .NET Standard 2.0 and .NET 4.6.1. Upgrade NuGet dependencies.
10+
* [minor] Support disabling ESLint.
1011

1112
## Released
1213

‎build.cake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ var buildBranch = EnvironmentVariable("APPVEYOR_REPO_BRANCH");
2525

2626
void CodeGen(bool verify)
2727
{
28-
ExecuteCodeGen("example/ExampleApi.fsd example/js/ --indent 2 --express", verify);
29-
ExecuteCodeGen("example/ExampleApi.fsd example/ts/src/ --typescript --express", verify);
28+
ExecuteCodeGen("example/ExampleApi.fsd example/js/ --indent 2 --express --disable-eslint", verify);
29+
ExecuteCodeGen("example/ExampleApi.fsd example/ts/src/ --typescript --express --disable-eslint", verify);
3030
}
3131

3232
Task("Clean")

‎example/js/exampleApi.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// DO NOT EDIT: generated by fsdgenjs
2+
/* eslint-disable */
23
'use strict';
34

45
import { HttpClientUtility } from 'facility-core';

‎example/js/exampleApiServer.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// DO NOT EDIT: generated by fsdgenjs
2+
/* eslint-disable */
23
'use strict';
34

45
import * as bodyParser from 'body-parser';

0 commit comments

Comments
 (0)