Skip to content

Commit

Permalink
Merge pull request #48 from dabapps/update-packages#1
Browse files Browse the repository at this point in the history
Update npm packages
  • Loading branch information
Nikolaev Tomov authored Mar 26, 2020
2 parents 9b49099 + 62a5884 commit 5ccb243
Show file tree
Hide file tree
Showing 14 changed files with 3,049 additions and 1,960 deletions.
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.5.0
12.13.0
4,962 changes: 3,021 additions & 1,941 deletions package-lock.json

Large diffs are not rendered by default.

30 changes: 15 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dabapps/redux-api-collections",
"version": "0.4.5",
"version": "0.4.6",
"description": "Type-safe helpers for dealing with Rest-Framework backed collections in Typescript",
"main": "dist/index.js",
"types": "dist/index.d.ts",
Expand All @@ -16,27 +16,27 @@
},
"dependencies": {
"@dabapps/redux-requests": "^0.5.5",
"@types/js-cookie": "^2.0.28",
"@types/node": "^7.0.18",
"@types/underscore": "^1.8.0",
"axios": "^0.18.0",
"@types/js-cookie": "^2.2.4",
"@types/node": "^10.5.0",
"@types/underscore": "^1.9.3",
"axios": "^0.18.1",
"flux-standard-action": "^1.2.0",
"js-cookie": "^2.1.4",
"js-cookie": "^2.2.1",
"path": "^0.12.7",
"path-to-regexp": "^2.1.0",
"path-to-regexp": "^4.0.4",
"redux": "*",
"redux-thunk": "*",
"underscore": "^1.8.3"
"underscore": "^1.9.1"
},
"devDependencies": {
"@types/jest": "^24.0.11",
"jest": "^24.5.0",
"prettier": "^1.16.4",
"@types/jest": "^25.1.4",
"jest": "^25.2.2",
"prettier": "^1.19.1",
"request": "^2.88.0",
"ts-jest": "^24.0.0",
"tslint": "^5.14.0",
"tslint-config-dabapps": "github:dabapps/tslint-config-dabapps#v0.5.3",
"typescript": "^3.3.3333"
"ts-jest": "^25.2.1",
"tslint": "^5.20.1",
"tslint-config-dabapps": "^0.6.2",
"typescript": "^3.3.4000"
},
"peerDependencies": {
"redux": "*",
Expand Down
1 change: 1 addition & 0 deletions src/collections/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export * from './utils';
import { request } from '@dabapps/redux-requests';
import * as pathToRegexp from 'path-to-regexp';
import { AnyAction } from 'redux';

import {
buildSubgroup,
IdKeyedMap,
Expand Down
1 change: 1 addition & 0 deletions src/collections/reducers.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { isFSA } from 'flux-standard-action';
import { AnyAction } from 'redux';
import * as _ from 'underscore';

import {
Dict,
IdKeyed,
Expand Down
3 changes: 2 additions & 1 deletion src/collections/types.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { FluxStandardAction } from 'flux-standard-action';
import { AnyAction } from 'redux';

import {
Dict,
IdKeyed,
Expand Down Expand Up @@ -37,7 +38,7 @@ export type Collection<T extends IdKeyed> = Readonly<{

export type CollectionGroup<T extends IdKeyed> = Dict<Collection<T>>;
export type CollectionStoreMutable<T extends IdKeyedMap<T>> = {
[K in keyof T]: CollectionGroup<T[K]>
[K in keyof T]: CollectionGroup<T[K]>;
};
export type CollectionStore<T extends IdKeyedMap<T>> = Readonly<
CollectionStoreMutable<T>
Expand Down
1 change: 1 addition & 0 deletions src/collections/utils.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { formatQueryParams } from '@dabapps/redux-requests';

import { IdKeyedMap, TypeToRecordMapping } from '../utils';
import {
Collection,
Expand Down
2 changes: 1 addition & 1 deletion src/items/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ export * from './types';
export * from './utils';

import { request, UrlMethod } from '@dabapps/redux-requests';

import * as pathToRegexp from 'path-to-regexp';
import { AnyAction } from 'redux';

import {
buildSubgroup,
Dict,
Expand Down
1 change: 1 addition & 0 deletions src/items/reducers.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { isFSA } from 'flux-standard-action';
import { AnyAction } from 'redux';
import * as _ from 'underscore';

import {
Dict,
IdKeyedMap,
Expand Down
1 change: 1 addition & 0 deletions src/items/types.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { FluxStandardAction } from 'flux-standard-action';
import { AnyAction } from 'redux';

import { Dict, SubpathParams, ThunkResponse } from '../utils';

export type ItemGroup<T> = Dict<T>;
Expand Down
2 changes: 1 addition & 1 deletion src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export type ThunkResponse = ThunkAction<
>;

export type TypeToRecordMapping<T, U extends { [key: string]: any } = {}> = {
[K in keyof T]: RecordConstructor<U, T[K]>
[K in keyof T]: RecordConstructor<U, T[K]>;
};
export interface TypeToRecordMappingLoose {
[K: string]: (input: any) => any;
Expand Down
1 change: 1 addition & 0 deletions tests/collections.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import * as requests from '@dabapps/redux-requests';
import { AnyAction } from 'redux';

import {
ADD_TO_COLLECTION,
CLEAR_COLLECTION,
Expand Down
1 change: 1 addition & 0 deletions tests/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { applyMiddleware, combineReducers, createStore } from 'redux';

import {
Collections,
CollectionStore,
Expand Down
1 change: 1 addition & 0 deletions tests/items.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import * as requests from '@dabapps/redux-requests';
import { AnyAction } from 'redux';

import {
CLEAR_ITEM,
Collections,
Expand Down

0 comments on commit 5ccb243

Please sign in to comment.