Skip to content

Commit

Permalink
build: update to latest version of gts and typescript (#1725)
Browse files Browse the repository at this point in the history
Co-authored-by: F. Hinkelmann <franziska.hinkelmann@gmail.com>
  • Loading branch information
sofisl and fhinkel authored Apr 19, 2020
1 parent 5d9675d commit 0fbd74d
Show file tree
Hide file tree
Showing 10 changed files with 38 additions and 47 deletions.
10 changes: 10 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"parserOptions": {
"ecmaVersion": 2018,
"sourceType": "module"
},

"env": {
"es6": true
}
}
33 changes: 0 additions & 33 deletions .eslintrc.yml

This file was deleted.

4 changes: 4 additions & 0 deletions .estlintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"extends": "./node_modules/gts"
}

3 changes: 1 addition & 2 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
**/node_modules
**/coverage
test/fixtures
**/.coverage
build/
docs/
protos/
8 changes: 0 additions & 8 deletions .prettierrc

This file was deleted.

17 changes: 17 additions & 0 deletions .prettierrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// Copyright 2020 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

module.exports = {
...require('gts/.prettierrc.json')
}
1 change: 1 addition & 0 deletions appengine/typescript/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

import express = require('express');

const PORT = Number(process.env.PORT) || 8080;
Expand Down
3 changes: 2 additions & 1 deletion appengine/typescript/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
"wait-port": "^0.2.7",
"@types/express": "^4.16.0",
"chai": "^4.2.0",
"tslint": "^6.0.0"
"tslint": "^6.0.0",
"typescript": "^3.8.3"
}
}
2 changes: 0 additions & 2 deletions appengine/websockets/test/index.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@

'use strict';

/* eslint node/no-extraneous-require: "off" */

const assert = require('assert');
const puppeteer = require('puppeteer');
/* global document */
Expand Down
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@
"eslint-plugin-node": "^11.0.0",
"eslint-plugin-prettier": "^3.1.0",
"eslint-plugin-promise": "^4.1.1",
"gts": "^2.0.0",
"prettier": "^2.0.0",
"requestretry": "^4.0.0"
"requestretry": "^4.0.0",
"typescript": "^3.8.3"
}
}

0 comments on commit 0fbd74d

Please sign in to comment.