Skip to content

Commit d83e8d2

Browse files
author
Lukáš Horák
committed
🐛 Resolve plugin source path for case of globa lokse usage
1 parent e7a3a3c commit d83e8d2

File tree

3 files changed

+103
-6
lines changed

3 files changed

+103
-6
lines changed

packages/core/package.json

+2
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,14 @@
1010
"dependencies": {
1111
"@types/bluebird": "^3.5.32",
1212
"@types/dedent": "^0.7.0",
13+
"@types/find-node-modules": "^2.1.0",
1314
"@types/google-spreadsheet": "^3.0.1",
1415
"@types/mkdirp": "^1.0.1",
1516
"bluebird": "^3.7.2",
1617
"cosmiconfig": "^7.0.0",
1718
"cosmiconfig-ts-loader": "^0.1.1",
1819
"dedent": "^0.7.0",
20+
"find-node-modules": "^2.1.3",
1921
"google-spreadsheet": "^3.2.0",
2022
"lodash": "^4.17.20",
2123
"mkdirp": "^1.0.4"

packages/core/src/plugins/load.ts

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import * as findNodeModules from "find-node-modules";
12
import { getErrorMessage } from "../errors";
23
import type {
34
NamedLoksePlugin,
@@ -10,7 +11,9 @@ import { PluginsRunner } from "./runner";
1011
export class PluginError extends Error {}
1112

1213
function interopRequire(path: string) {
13-
const obj = require(path);
14+
const lookupPaths = findNodeModules({ cwd: process.cwd() });
15+
const obj = require(require.resolve(path, { paths: lookupPaths }));
16+
1417
return obj && obj.__esModule ? obj.default : obj;
1518
}
1619

yarn.lock

+97-5
Original file line numberDiff line numberDiff line change
@@ -2215,7 +2215,7 @@
22152215
resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.1.tgz#e2c6e73e0bdeb2521d00756d099218e9f5d90a04"
22162216
integrity sha512-/zPMqDkzSZ8t3VtxOa4KPq7uzzW978M9Tvh+j7GHKuo6k6GTLxPJ4J5gE5cjfJ26pnXst0N5Hax8Sr0T2Mi9zQ==
22172217

2218-
"@types/configstore@*", "@types/configstore@5":
2218+
"@types/configstore@*":
22192219
version "5.0.1"
22202220
resolved "https://registry.yarnpkg.com/@types/configstore/-/configstore-5.0.1.tgz#7be34d28ce29a408c98e717ada0488664eaf6173"
22212221
integrity sha512-c/QCznvk7bLKGhHETj29rqKufui3jaAxjBhK4R2zUrMG5UG0qTwfWYxBoUbH8JCyDjdCWMIxPJ7/Fdz1UcAnWg==
@@ -2251,6 +2251,11 @@
22512251
resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.0.tgz#5fb2e536c1ae9bf35366eed879e827fa59ca41c2"
22522252
integrity sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==
22532253

2254+
"@types/find-node-modules@^2.1.0":
2255+
version "2.1.0"
2256+
resolved "https://registry.yarnpkg.com/@types/find-node-modules/-/find-node-modules-2.1.0.tgz#9d4c99df8f7a13dc22ca8e7d6a84eeb200d8613c"
2257+
integrity sha512-rnh1kFUbwp5xEu54GhGDnzxm5/iJC3irypLO9+YECIal+XXKU5ki4I1h0Sm43KNpvKzFfyYFeGOm7o6tGI9Bgw==
2258+
22542259
"@types/glob@^7.1.1":
22552260
version "7.2.0"
22562261
resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb"
@@ -2419,7 +2424,7 @@
24192424
resolved "https://registry.yarnpkg.com/@types/parse5/-/parse5-6.0.3.tgz#705bb349e789efa06f43f128cef51240753424cb"
24202425
integrity sha512-SuT16Q1K51EAVPz1K29DJ/sXjhSQ0zjvsypYJ6tlwVsRV9jwW5Adq2ch8Dq8kDBCkYnELS7N7VNCSB5nC56t/g==
24212426

2422-
"@types/prettier@2.6.0", "@types/prettier@^2.0.0":
2427+
"@types/prettier@^2.0.0":
24232428
version "2.6.0"
24242429
resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.6.0.tgz#efcbd41937f9ae7434c714ab698604822d890759"
24252430
integrity sha512-G/AdOadiZhnJp0jXCaBQU449W2h716OW/EoXeYkCytxKL06X1WCXB4DZpp8TpZ8eyIJVS1cw4lrlkkSYU21cDw==
@@ -4221,6 +4226,11 @@ dequal@^2.0.0:
42214226
resolved "https://registry.yarnpkg.com/dequal/-/dequal-2.0.3.tgz#2644214f1997d39ed0ee0ece72335490a7ac67be"
42224227
integrity sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==
42234228

4229+
detect-file@^1.0.0:
4230+
version "1.0.0"
4231+
resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
4232+
integrity sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q==
4233+
42244234
detect-indent@^5.0.0:
42254235
version "5.0.0"
42264236
resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"
@@ -5000,6 +5010,13 @@ expand-brackets@^2.1.4:
50005010
snapdragon "^0.8.1"
50015011
to-regex "^3.0.1"
50025012

5013+
expand-tilde@^2.0.0, expand-tilde@^2.0.2:
5014+
version "2.0.2"
5015+
resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502"
5016+
integrity sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==
5017+
dependencies:
5018+
homedir-polyfill "^1.0.1"
5019+
50035020
expect@^26.6.2:
50045021
version "26.6.2"
50055022
resolved "https://registry.yarnpkg.com/expect/-/expect-26.6.2.tgz#c6b996bf26bf3fe18b67b2d0f51fc981ba934417"
@@ -5181,6 +5198,14 @@ find-babel-config@^1.2.0:
51815198
json5 "^0.5.1"
51825199
path-exists "^3.0.0"
51835200

5201+
find-node-modules@^2.1.3:
5202+
version "2.1.3"
5203+
resolved "https://registry.yarnpkg.com/find-node-modules/-/find-node-modules-2.1.3.tgz#3c976cff2ca29ee94b4f9eafc613987fc4c0ee44"
5204+
integrity sha512-UC2I2+nx1ZuOBclWVNdcnbDR5dlrOdVb7xNjmT/lHE+LsgztWks3dG7boJ37yTS/venXw84B/mAW9uHVoC5QRg==
5205+
dependencies:
5206+
findup-sync "^4.0.0"
5207+
merge "^2.1.1"
5208+
51845209
find-up@^2.0.0:
51855210
version "2.1.0"
51865211
resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
@@ -5233,6 +5258,16 @@ find-yarn-workspace-root@^2.0.0:
52335258
dependencies:
52345259
micromatch "^4.0.2"
52355260

5261+
findup-sync@^4.0.0:
5262+
version "4.0.0"
5263+
resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-4.0.0.tgz#956c9cdde804052b881b428512905c4a5f2cdef0"
5264+
integrity sha512-6jvvn/12IC4quLBL1KNokxC7wWTvYncaVUYSoxWw7YykPLuRrnv4qdHcSOywOI5RpkOVGeQRtWM8/q+G6W6qfQ==
5265+
dependencies:
5266+
detect-file "^1.0.0"
5267+
is-glob "^4.0.0"
5268+
micromatch "^4.0.2"
5269+
resolve-dir "^1.0.1"
5270+
52365271
flat-cache@^3.0.4:
52375272
version "3.0.4"
52385273
resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11"
@@ -5581,6 +5616,26 @@ global-dirs@^3.0.0:
55815616
dependencies:
55825617
ini "2.0.0"
55835618

5619+
global-modules@^1.0.0:
5620+
version "1.0.0"
5621+
resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
5622+
integrity sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==
5623+
dependencies:
5624+
global-prefix "^1.0.1"
5625+
is-windows "^1.0.1"
5626+
resolve-dir "^1.0.0"
5627+
5628+
global-prefix@^1.0.1:
5629+
version "1.0.2"
5630+
resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe"
5631+
integrity sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg==
5632+
dependencies:
5633+
expand-tilde "^2.0.2"
5634+
homedir-polyfill "^1.0.1"
5635+
ini "^1.3.4"
5636+
is-windows "^1.0.1"
5637+
which "^1.2.14"
5638+
55845639
globals@^11.1.0:
55855640
version "11.12.0"
55865641
resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
@@ -5928,6 +5983,13 @@ hastscript@^7.0.0:
59285983
property-information "^6.0.0"
59295984
space-separated-tokens "^2.0.0"
59305985

5986+
homedir-polyfill@^1.0.1:
5987+
version "1.0.3"
5988+
resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
5989+
integrity sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==
5990+
dependencies:
5991+
parse-passwd "^1.0.0"
5992+
59315993
hosted-git-info@^2.1.4:
59325994
version "2.8.9"
59335995
resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
@@ -6599,7 +6661,7 @@ is-weakref@^1.0.2:
65996661
dependencies:
66006662
call-bind "^1.0.2"
66016663

6602-
is-windows@^1.0.2:
6664+
is-windows@^1.0.1, is-windows@^1.0.2:
66036665
version "1.0.2"
66046666
resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
66056667
integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
@@ -7889,6 +7951,11 @@ merge2@^1.2.3, merge2@^1.3.0, merge2@^1.4.1:
78897951
resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
78907952
integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
78917953

7954+
merge@^2.1.1:
7955+
version "2.1.1"
7956+
resolved "https://registry.yarnpkg.com/merge/-/merge-2.1.1.tgz#59ef4bf7e0b3e879186436e8481c06a6c162ca98"
7957+
integrity sha512-jz+Cfrg9GWOZbQAnDQ4hlVnQky+341Yk5ru8bZSe6sIDTCIg8n9i/u7hSQGSVOF3C7lH6mGtqjkiT9G4wFLL0w==
7958+
78927959
micromark-core-commonmark@^1.0.0, micromark-core-commonmark@^1.0.1:
78937960
version "1.0.6"
78947961
resolved "https://registry.yarnpkg.com/micromark-core-commonmark/-/micromark-core-commonmark-1.0.6.tgz#edff4c72e5993d93724a3c206970f5a15b0585ad"
@@ -9183,6 +9250,11 @@ parse-latin@^5.0.0:
91839250
unist-util-modify-children "^2.0.0"
91849251
unist-util-visit-children "^1.0.0"
91859252

9253+
parse-passwd@^1.0.0:
9254+
version "1.0.0"
9255+
resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
9256+
integrity sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==
9257+
91869258
parse-path@^4.0.0:
91879259
version "4.0.4"
91889260
resolved "https://registry.yarnpkg.com/parse-path/-/parse-path-4.0.4.tgz#4bf424e6b743fb080831f03b536af9fc43f0ffea"
@@ -9980,6 +10052,14 @@ resolve-cwd@^3.0.0:
998010052
dependencies:
998110053
resolve-from "^5.0.0"
998210054

10055+
resolve-dir@^1.0.0, resolve-dir@^1.0.1:
10056+
version "1.0.1"
10057+
resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43"
10058+
integrity sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==
10059+
dependencies:
10060+
expand-tilde "^2.0.0"
10061+
global-modules "^1.0.0"
10062+
998310063
resolve-from@^4.0.0:
998410064
version "4.0.0"
998510065
resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
@@ -10133,13 +10213,20 @@ run-parallel@^1.1.9:
1013310213
dependencies:
1013410214
queue-microtask "^1.2.2"
1013510215

10136-
rxjs@6, rxjs@^6.6.0, rxjs@^7.2.0, rxjs@^7.5.1, rxjs@^7.5.5:
10216+
rxjs@^6.6.0:
1013710217
version "6.6.7"
1013810218
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
1013910219
integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==
1014010220
dependencies:
1014110221
tslib "^1.9.0"
1014210222

10223+
rxjs@^7.2.0, rxjs@^7.5.1, rxjs@^7.5.5:
10224+
version "7.8.0"
10225+
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.0.tgz#90a938862a82888ff4c7359811a595e14e1e09a4"
10226+
integrity sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg==
10227+
dependencies:
10228+
tslib "^2.1.0"
10229+
1014310230
1014410231
version "0.0.15"
1014510232
resolved "https://registry.yarnpkg.com/s.color/-/s.color-0.0.15.tgz#6b32cd22d8dba95703a5122ddede2020a1560186"
@@ -11163,6 +11250,11 @@ tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.3.1, tslib@^2.4.0:
1116311250
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3"
1116411251
integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==
1116511252

11253+
tslib@^2.1.0:
11254+
version "2.5.0"
11255+
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf"
11256+
integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==
11257+
1116611258
tsm@^2.1.4:
1116711259
version "2.2.2"
1116811260
resolved "https://registry.yarnpkg.com/tsm/-/tsm-2.2.2.tgz#0edacd62bbe53a87e8fc9c260ab65a7dbac5de06"
@@ -11787,7 +11879,7 @@ [email protected]:
1178711879
load-yaml-file "^0.2.0"
1178811880
path-exists "^4.0.0"
1178911881

11790-
which@^1.2.9, which@^1.3.1:
11882+
which@^1.2.14, which@^1.2.9, which@^1.3.1:
1179111883
version "1.3.1"
1179211884
resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
1179311885
integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==

0 commit comments

Comments
 (0)