Skip to content

Commit

Permalink
Remove yarn, disable package-lock, and handle prettier update
Browse files Browse the repository at this point in the history
We'd like to find a nice way to manage package locking, but right now it
doesn't exist, afaict, so this way at least we'll reproduce the same
problems that our end users do.

Connects-To: #326
Signed-off-by: Tim Perry <tim@resin.io>
  • Loading branch information
pimterry committed Aug 1, 2018
1 parent a83923d commit 48046c7
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 5,614 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Expand Up @@ -30,3 +30,6 @@ node_modules

# Ignore all build output
build/

# Ignore package-lock.json, since our end users will
package-lock.json
1 change: 1 addition & 0 deletions .npmrc
@@ -0,0 +1 @@
package-lock=false
8 changes: 4 additions & 4 deletions .prettierrc
@@ -1,6 +1,6 @@
{
"single-quote": true,
"trailing-comma": "all",
"use-tabs": true,
"print-width": 120
"singleQuote": true,
"trailingComma": "all",
"useTabs": true,
"printWidth": 120
}
4 changes: 2 additions & 2 deletions appveyor.yml
Expand Up @@ -22,9 +22,9 @@ environment:

install:
- ps: Install-Product node $env:nodejs_version x64
- npm install -g npm@4 yarn
- npm install -g npm@4
- set PATH=%APPDATA%\npm;%PATH%
- yarn install
- npm install

build: off

Expand Down
1 change: 1 addition & 0 deletions package.json
Expand Up @@ -83,6 +83,7 @@
"tmp": "^0.0.31",
"ts-node": "^3.3.0",
"tslint": "^5.8.0",
"tslint-config-prettier": "^1.10.0",
"typescript": "2.6.2",
"uglify-es": "^3.3.9",
"vinyl-source-buffer": "^1.1.1",
Expand Down
5 changes: 4 additions & 1 deletion tslint.json
@@ -1,5 +1,8 @@
{
"extends": "tslint:recommended",
"extends": [
"tslint:recommended",
"tslint-config-prettier"
],
"rules": {
"indent": [ true, "tabs" ],
"jsdoc-format": true,
Expand Down
15 changes: 2 additions & 13 deletions typings/pinejs-client-core.d.ts
@@ -1,24 +1,13 @@
// based on https://github.com/resin-io/pinejs-client-js/blob/master/core.d.ts

type RawFilter =
| string
| Array<string | Filter<any>>
| {
$string: string;
[index: string]: Filter<any> | string;
};
type RawFilter = string | Array<string | Filter<any>> | { $string: string; [index: string]: Filter<any> | string };
type Lambda<T> = {
$alias: string;
$expr: Filter<T>;
};

type OrderByValues = 'asc' | 'desc';
type OrderBy =
| string
| string[]
| {
[index: string]: OrderByValues;
};
type OrderBy = string | string[] | { [index: string]: OrderByValues };

type ResourceObjFilter<T> = { [k in keyof T]?: object | number | string };

Expand Down

0 comments on commit 48046c7

Please sign in to comment.