Skip to content

Commit bd550df

Browse files
author
Gery Hirschfeld
authored
Merge pull request #22 from w3tecch/feat/peer
feat: #11 Add typeorm as a peer dependency
2 parents fc83f3e + 9ecbfda commit bd550df

File tree

3 files changed

+59
-30
lines changed

3 files changed

+59
-30
lines changed

.circleci/config.yml

+3
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ jobs:
1818
key: yarn-packages-{{ checksum "yarn.lock" }}
1919
paths:
2020
- ~/.cache/yarn
21+
- run:
22+
name: peer
23+
command: yarn add typeorm --peer
2124
- run:
2225
name: lint
2326
command: yarn run lint

package.json

+10-9
Original file line numberDiff line numberDiff line change
@@ -52,17 +52,18 @@
5252
"typescript": "^3.0.3"
5353
},
5454
"dependencies": {
55-
"@types/glob": "^7.1.1",
56-
"@types/node": "^12.0.4",
57-
"chalk": "^2.4.2",
58-
"faker": "^4.1.0",
59-
"glob": "^7.1.3",
55+
"@types/glob": "7.1.1",
56+
"@types/node": "12.0.4",
57+
"chalk": "2.4.2",
58+
"faker": "4.1.0",
59+
"glob": "7.1.3",
6060
"ora": "3.4.0",
61-
"reflect-metadata": "^0.1.13",
62-
"typeorm": "^0.2.7",
63-
"yargs": "^13.2.4"
61+
"reflect-metadata": "0.1.13",
62+
"yargs": "13.2.4"
63+
},
64+
"peerDependencies": {
65+
"typeorm": "^0.2.20"
6466
},
65-
"peerDependencies": {},
6667
"jest": {
6768
"moduleFileExtensions": [
6869
"js",

yarn.lock

+46-21
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@
474474
resolved "https://registry.yarnpkg.com/@types/faker/-/faker-4.1.6.tgz#e931064b1d50333044c28668c13033334cf67c71"
475475
integrity sha512-Tp4xHecf4UX8VOvSfsL1QlMbOfukGbbAhQbHvPIcX56NmNql4MAamV7E/K5zdYfxlk8FTcxwsaCZTxM79zJzPQ==
476476

477-
"@types/glob@^7.1.1":
477+
"@types/glob@7.1.1", "@types/glob@^7.1.1":
478478
version "7.1.1"
479479
resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz#aa59a1c6e3fbc421e07ccd31a944c30eba521575"
480480
integrity sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==
@@ -520,16 +520,11 @@
520520
resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
521521
integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
522522

523-
"@types/node@*":
523+
"@types/node@*", "@types/[email protected]":
524524
version "12.0.4"
525525
resolved "https://registry.yarnpkg.com/@types/node/-/node-12.0.4.tgz#46832183115c904410c275e34cf9403992999c32"
526526
integrity sha512-j8YL2C0fXq7IONwl/Ud5Kt0PeXw22zGERt+HSSnwbKOJVsAGkEz3sFCYwaF9IOuoG1HOtE0vKCj6sXF7Q0+Vaw==
527527

528-
"@types/node@^12.0.4":
529-
version "12.11.1"
530-
resolved "https://registry.yarnpkg.com/@types/node/-/node-12.11.1.tgz#1fd7b821f798b7fa29f667a1be8f3442bb8922a3"
531-
integrity sha512-TJtwsqZ39pqcljJpajeoofYRfeZ7/I/OMUQ5pR4q5wOKf2ocrUvBAZUMhWsOvKx3dVc/aaV5GluBivt0sWqA5A==
532-
533528
"@types/normalize-package-data@^2.4.0":
534529
version "2.4.0"
535530
resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e"
@@ -1272,6 +1267,15 @@ caseless@~0.12.0:
12721267
resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
12731268
integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
12741269

1270+
[email protected], chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.3.2, chalk@^2.4.1, chalk@^2.4.2:
1271+
version "2.4.2"
1272+
resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
1273+
integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
1274+
dependencies:
1275+
ansi-styles "^3.2.1"
1276+
escape-string-regexp "^1.0.5"
1277+
supports-color "^5.3.0"
1278+
12751279
chalk@^1.1.1:
12761280
version "1.1.3"
12771281
resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
@@ -1283,15 +1287,6 @@ chalk@^1.1.1:
12831287
strip-ansi "^3.0.0"
12841288
supports-color "^2.0.0"
12851289

1286-
chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.3.2, chalk@^2.4.1, chalk@^2.4.2:
1287-
version "2.4.2"
1288-
resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
1289-
integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
1290-
dependencies:
1291-
ansi-styles "^3.2.1"
1292-
escape-string-regexp "^1.0.5"
1293-
supports-color "^5.3.0"
1294-
12951290
chownr@^1.1.1, chownr@^1.1.2:
12961291
version "1.1.3"
12971292
resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.3.tgz#42d837d5239688d55f303003a508230fa6727142"
@@ -2291,9 +2286,10 @@ extsprintf@^1.2.0:
22912286
resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
22922287
integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
22932288

2294-
faker@^4.1.0:
2289+
22952290
version "4.1.0"
22962291
resolved "https://registry.yarnpkg.com/faker/-/faker-4.1.0.tgz#1e45bbbecc6774b3c195fad2835109c6d748cc3f"
2292+
integrity sha1-HkW7vsxndLPBlfrSg1EJxtdIzD8=
22972293

22982294
fast-deep-equal@^2.0.1:
22992295
version "2.0.1"
@@ -2671,6 +2667,18 @@ glob-parent@^5.1.0:
26712667
dependencies:
26722668
is-glob "^4.0.1"
26732669

2670+
2671+
version "7.1.3"
2672+
resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
2673+
integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
2674+
dependencies:
2675+
fs.realpath "^1.0.0"
2676+
inflight "^1.0.4"
2677+
inherits "2"
2678+
minimatch "^3.0.4"
2679+
once "^1.3.0"
2680+
path-is-absolute "^1.0.0"
2681+
26742682
glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
26752683
version "7.1.4"
26762684
resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
@@ -6080,7 +6088,7 @@ redeyed@~2.1.0:
60806088
dependencies:
60816089
esprima "~4.0.0"
60826090

6083-
reflect-metadata@^0.1.13:
6091+
reflect-metadata@0.1.13, reflect-metadata@^0.1.13:
60846092
version "0.1.13"
60856093
resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.13.tgz#67ae3ca57c972a2aa1642b10fe363fe32d49dc08"
60866094
integrity sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==
@@ -7281,7 +7289,7 @@ typedarray@^0.0.6:
72817289
version "0.0.6"
72827290
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
72837291

7284-
typeorm@^0.2.7:
7292+
typeorm@^0.2.20:
72857293
version "0.2.20"
72867294
resolved "https://registry.yarnpkg.com/typeorm/-/typeorm-0.2.20.tgz#efb60f2e55a7d08fc365f281ec2a71c87a9ebba5"
72877295
integrity sha512-VxB+9qH8D+PM19MIx18Zs3Fqv/ZINnnQvUGmBEiLYDrB9etdSdamgSTCIhWdFNndeJ6ldH4jbD0Z6HWsepMPlA==
@@ -7735,7 +7743,7 @@ [email protected]:
77357743
dependencies:
77367744
camelcase "^4.1.0"
77377745

7738-
yargs-parser@^13.1.1:
7746+
yargs-parser@^13.1.0, yargs-parser@^13.1.1:
77397747
version "13.1.1"
77407748
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.1.tgz#d26058532aa06d365fe091f6a1fc06b2f7e5eca0"
77417749
integrity sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==
@@ -7758,6 +7766,23 @@ yargs-parser@^9.0.2:
77587766
dependencies:
77597767
camelcase "^4.1.0"
77607768

7769+
7770+
version "13.2.4"
7771+
resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.4.tgz#0b562b794016eb9651b98bd37acf364aa5d6dc83"
7772+
integrity sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg==
7773+
dependencies:
7774+
cliui "^5.0.0"
7775+
find-up "^3.0.0"
7776+
get-caller-file "^2.0.1"
7777+
os-locale "^3.1.0"
7778+
require-directory "^2.1.1"
7779+
require-main-filename "^2.0.0"
7780+
set-blocking "^2.0.0"
7781+
string-width "^3.0.0"
7782+
which-module "^2.0.0"
7783+
y18n "^4.0.0"
7784+
yargs-parser "^13.1.0"
7785+
77617786
yargs@^11.0.0:
77627787
version "11.1.1"
77637788
resolved "https://registry.yarnpkg.com/yargs/-/yargs-11.1.1.tgz#5052efe3446a4df5ed669c995886cc0f13702766"
@@ -7776,7 +7801,7 @@ yargs@^11.0.0:
77767801
y18n "^3.2.1"
77777802
yargs-parser "^9.0.2"
77787803

7779-
yargs@^13.0.0, yargs@^13.2.1, yargs@^13.2.4, yargs@^13.3.0:
7804+
yargs@^13.0.0, yargs@^13.2.1, yargs@^13.3.0:
77807805
version "13.3.0"
77817806
resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.0.tgz#4c657a55e07e5f2cf947f8a366567c04a0dedc83"
77827807
integrity sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==

0 commit comments

Comments
 (0)