Merge branch 'get-rid-of-node-resolve' into 'master'

Remove @rollup/plugin-node-resolve

See merge request dungeonslayers/ds4!127
This commit is contained in:
Johannes Loher 2021-07-20 00:36:45 +00:00
commit 02ba524eea
3 changed files with 73 additions and 142 deletions

View file

@ -52,12 +52,11 @@
"postinstall": "husky install"
},
"devDependencies": {
"@league-of-foundry-developers/foundry-vtt-types": "^0.8.8-5",
"@rollup/plugin-node-resolve": "^13.0.0",
"@league-of-foundry-developers/foundry-vtt-types": "^0.8.8-7",
"@types/fs-extra": "^9.0.12",
"@types/jest": "^26.0.24",
"@typescript-eslint/eslint-plugin": "^4.28.2",
"@typescript-eslint/parser": "^4.28.2",
"@typescript-eslint/eslint-plugin": "^4.28.3",
"@typescript-eslint/parser": "^4.28.3",
"chalk": "^4.1.1",
"eslint": "^7.30.0",
"eslint-config-prettier": "^8.3.0",
@ -69,9 +68,9 @@
"husky": "^7.0.1",
"jest": "^27.0.6",
"jest-junit": "^12.2.0",
"lint-staged": "^11.0.0",
"lint-staged": "^11.0.1",
"prettier": "^2.3.2",
"rollup": "^2.53.1",
"rollup": "^2.53.2",
"rollup-plugin-typescript2": "^0.30.0",
"sass": "1.35.2",
"semver": "^7.3.5",

View file

@ -3,7 +3,6 @@
// SPDX-License-Identifier: MIT
const typescript = require("rollup-plugin-typescript2");
const { nodeResolve } = require("@rollup/plugin-node-resolve");
module.exports = {
input: "src/module/ds4.ts",
@ -12,5 +11,5 @@ module.exports = {
format: "es",
sourcemap: true,
},
plugins: [nodeResolve(), typescript({})],
plugins: [typescript({})],
};

201
yarn.lock
View file

@ -689,19 +689,19 @@ __metadata:
languageName: node
linkType: hard
"@league-of-foundry-developers/foundry-vtt-types@npm:^0.8.8-5":
version: 0.8.8-5
resolution: "@league-of-foundry-developers/foundry-vtt-types@npm:0.8.8-5"
"@league-of-foundry-developers/foundry-vtt-types@npm:^0.8.8-7":
version: 0.8.8-7
resolution: "@league-of-foundry-developers/foundry-vtt-types@npm:0.8.8-7"
dependencies:
"@types/jquery": ~3.5.5
"@types/simple-peer": ~9.11.0
"@types/jquery": ~3.5.6
"@types/simple-peer": ~9.11.1
handlebars: 4.7.7
pixi-particles: 4.3.1
pixi.js: 5.3.4
socket.io-client: 4.1.2
tinymce: 5.8.1
typescript: ^4.1.6
checksum: e5f06d5bd68403cf79ed367bcfcc2eade250dc00800e1ede33357515ba9cd437336e0c1388c316501087ac5bce8b36731782e2509683d9186e1387283ed83e35
typescript: ^4.3.5
checksum: b166266390a70937dad8cb440cf4cbf5bfca031efa73179bd83cee79005589c493d3e151718b192c53a86a112801a5663ea103bf5aaa078b42e35dcb9dbcb5df
languageName: node
linkType: hard
@ -1122,35 +1122,6 @@ __metadata:
languageName: node
linkType: hard
"@rollup/plugin-node-resolve@npm:^13.0.0":
version: 13.0.0
resolution: "@rollup/plugin-node-resolve@npm:13.0.0"
dependencies:
"@rollup/pluginutils": ^3.1.0
"@types/resolve": 1.17.1
builtin-modules: ^3.1.0
deepmerge: ^4.2.2
is-module: ^1.0.0
resolve: ^1.19.0
peerDependencies:
rollup: ^2.42.0
checksum: 4b323e8ad5f1245449cd44b4857ed94a8dd3b998178ce139e74542c216a5abeb5a9e44885f3809ac747296a108f0562f986f9561055e76d1b0b268cf788a5c83
languageName: node
linkType: hard
"@rollup/pluginutils@npm:^3.1.0":
version: 3.1.0
resolution: "@rollup/pluginutils@npm:3.1.0"
dependencies:
"@types/estree": 0.0.39
estree-walker: ^1.0.1
picomatch: ^2.2.2
peerDependencies:
rollup: ^1.20.0||^2.0.0
checksum: 45da6411e045d1b034242a8144f4a5e8c02ff1b68a2e0857807f5bb4b091c416f2015e075057f0f0dec200e7b35efe6ed4e301b43e365cedea09192f01a6839b
languageName: node
linkType: hard
"@rollup/pluginutils@npm:^4.1.0":
version: 4.1.0
resolution: "@rollup/pluginutils@npm:4.1.0"
@ -1236,13 +1207,6 @@ __metadata:
languageName: node
linkType: hard
"@types/estree@npm:0.0.39":
version: 0.0.39
resolution: "@types/estree@npm:0.0.39"
checksum: 43e5361de39969def145f32f4599391ab13055ec94841f1633a7cfe10f0e8a940ebf0e9a4b2770454a6bddd034b57e7e0d51a4d565cb2714ee2accf10a7718be
languageName: node
linkType: hard
"@types/fs-extra@npm:^9.0.12":
version: 9.0.12
resolution: "@types/fs-extra@npm:9.0.12"
@ -1296,7 +1260,7 @@ __metadata:
languageName: node
linkType: hard
"@types/jquery@npm:~3.5.5":
"@types/jquery@npm:~3.5.6":
version: 3.5.6
resolution: "@types/jquery@npm:3.5.6"
dependencies:
@ -1333,16 +1297,7 @@ __metadata:
languageName: node
linkType: hard
"@types/resolve@npm:1.17.1":
version: 1.17.1
resolution: "@types/resolve@npm:1.17.1"
dependencies:
"@types/node": "*"
checksum: 8e72a73574f9489760662498c1ad512a8d4084a5db15f327e0d785cb277bb0a3146cd049241a8e3268bd0ed204ad3ee7b4a6b4622ef681e70547be9af258ca6a
languageName: node
linkType: hard
"@types/simple-peer@npm:~9.11.0":
"@types/simple-peer@npm:~9.11.1":
version: 9.11.1
resolution: "@types/simple-peer@npm:9.11.1"
dependencies:
@ -1390,12 +1345,12 @@ __metadata:
languageName: node
linkType: hard
"@typescript-eslint/eslint-plugin@npm:^4.28.2":
version: 4.28.2
resolution: "@typescript-eslint/eslint-plugin@npm:4.28.2"
"@typescript-eslint/eslint-plugin@npm:^4.28.3":
version: 4.28.3
resolution: "@typescript-eslint/eslint-plugin@npm:4.28.3"
dependencies:
"@typescript-eslint/experimental-utils": 4.28.2
"@typescript-eslint/scope-manager": 4.28.2
"@typescript-eslint/experimental-utils": 4.28.3
"@typescript-eslint/scope-manager": 4.28.3
debug: ^4.3.1
functional-red-black-tree: ^1.0.1
regexpp: ^3.1.0
@ -1407,23 +1362,23 @@ __metadata:
peerDependenciesMeta:
typescript:
optional: true
checksum: 6af8ea7665d5eaf0bafe241d71e3a85df07c0c82e59f530bd6627e0371e66a2d4a517cacd00d030680fe13d423b065c53185d3f48daa174fea316f024b1ab545
checksum: 791adc8261d43d2556f367fc917a64b7fde4f735735120f0132f5007f1fe05b141314d18aa2e64bfdbbd04d33240d660216e7c8dde1b246f58f6ad2e17d0ca2c
languageName: node
linkType: hard
"@typescript-eslint/experimental-utils@npm:4.28.2":
version: 4.28.2
resolution: "@typescript-eslint/experimental-utils@npm:4.28.2"
"@typescript-eslint/experimental-utils@npm:4.28.3":
version: 4.28.3
resolution: "@typescript-eslint/experimental-utils@npm:4.28.3"
dependencies:
"@types/json-schema": ^7.0.7
"@typescript-eslint/scope-manager": 4.28.2
"@typescript-eslint/types": 4.28.2
"@typescript-eslint/typescript-estree": 4.28.2
"@typescript-eslint/scope-manager": 4.28.3
"@typescript-eslint/types": 4.28.3
"@typescript-eslint/typescript-estree": 4.28.3
eslint-scope: ^5.1.1
eslint-utils: ^3.0.0
peerDependencies:
eslint: "*"
checksum: 5b3fed818af9882ae54bf258351c2740a92aa0bb5a85478ce1d4d957e594882ece42048149b1a1a8500023c1d334d9846048bc96f309ed60715232be8ef5d1a8
checksum: 3b2a8ede773ed6929f1c2a680608a11003bfd44cf5c8f8cc7409d167374c543d876f97e67533566ec91eaf17ad514d7eee20e611e5f78b0b3ac18b5bc99af865
languageName: node
linkType: hard
@ -1443,20 +1398,20 @@ __metadata:
languageName: node
linkType: hard
"@typescript-eslint/parser@npm:^4.28.2":
version: 4.28.2
resolution: "@typescript-eslint/parser@npm:4.28.2"
"@typescript-eslint/parser@npm:^4.28.3":
version: 4.28.3
resolution: "@typescript-eslint/parser@npm:4.28.3"
dependencies:
"@typescript-eslint/scope-manager": 4.28.2
"@typescript-eslint/types": 4.28.2
"@typescript-eslint/typescript-estree": 4.28.2
"@typescript-eslint/scope-manager": 4.28.3
"@typescript-eslint/types": 4.28.3
"@typescript-eslint/typescript-estree": 4.28.3
debug: ^4.3.1
peerDependencies:
eslint: ^5.0.0 || ^6.0.0 || ^7.0.0
peerDependenciesMeta:
typescript:
optional: true
checksum: 4d71ddbe039007f366b6e9deca12183e45ea165053a29b64e8e4534451a134fe664fd3bf8ec06951e2afe8b5fd14143fb2ef3182a9ee8d2b20a89a3c0f4f2529
checksum: 107c6b6176343dc2e82a372bd240a762c1d254b7b30f91560012b68857d25fd18cc4517e4f691c67ff3bdffd4150d89bd8318e4741ca7aa70b50a3ca74e36ad6
languageName: node
linkType: hard
@ -1470,13 +1425,13 @@ __metadata:
languageName: node
linkType: hard
"@typescript-eslint/scope-manager@npm:4.28.2":
version: 4.28.2
resolution: "@typescript-eslint/scope-manager@npm:4.28.2"
"@typescript-eslint/scope-manager@npm:4.28.3":
version: 4.28.3
resolution: "@typescript-eslint/scope-manager@npm:4.28.3"
dependencies:
"@typescript-eslint/types": 4.28.2
"@typescript-eslint/visitor-keys": 4.28.2
checksum: 31c30f428ba50087fc6a8dacc00b4d007d6653f1ea261a468e0a5425d730c5bf1e87bea581494862687c294d1f2ace30813f919800a05190fa332db6cd192bef
"@typescript-eslint/types": 4.28.3
"@typescript-eslint/visitor-keys": 4.28.3
checksum: 6f6a821e595c1cb8045a6820e9553d52f1588e9c512fd74ae7b2529d2337e4e57884c77039195d51d3a62443ef940f955e13c7e15a41822ecc20b210ebe604fd
languageName: node
linkType: hard
@ -1487,10 +1442,10 @@ __metadata:
languageName: node
linkType: hard
"@typescript-eslint/types@npm:4.28.2":
version: 4.28.2
resolution: "@typescript-eslint/types@npm:4.28.2"
checksum: 9f5e6bf3df4540adf8eb1f83909bac778257f60a6ef7fcafa7df5224949839a63dba61fe4b58de538ffe17517e88ff6b29f691209f80a55df87935bac6349f69
"@typescript-eslint/types@npm:4.28.3":
version: 4.28.3
resolution: "@typescript-eslint/types@npm:4.28.3"
checksum: b5b394c68b44962a8c58406e0f4c90bad9be480e725a6c5eb7dd692ad01b1ed65eb0b69fd4f77b4b9c9221967c72e93f5a4e6ff962824d3a1faea2a32256c5af
languageName: node
linkType: hard
@ -1512,12 +1467,12 @@ __metadata:
languageName: node
linkType: hard
"@typescript-eslint/typescript-estree@npm:4.28.2":
version: 4.28.2
resolution: "@typescript-eslint/typescript-estree@npm:4.28.2"
"@typescript-eslint/typescript-estree@npm:4.28.3":
version: 4.28.3
resolution: "@typescript-eslint/typescript-estree@npm:4.28.3"
dependencies:
"@typescript-eslint/types": 4.28.2
"@typescript-eslint/visitor-keys": 4.28.2
"@typescript-eslint/types": 4.28.3
"@typescript-eslint/visitor-keys": 4.28.3
debug: ^4.3.1
globby: ^11.0.3
is-glob: ^4.0.1
@ -1526,7 +1481,7 @@ __metadata:
peerDependenciesMeta:
typescript:
optional: true
checksum: 4fe36863b8af9808ee86b3cf64d6076a8b9a3224f9e1c17650d06ea46d80225b7e94903f71e7330a682b84eb1045189f1f09dc896165e9cab36714d24992ee84
checksum: ec3b3abecef54d608921e29499f6c9cd1af45fafded47b5b5a6d32b93870ab048cb0636efb10936219b47945a17772c935df0acf1c8ff5188417cdcbf775b70c
languageName: node
linkType: hard
@ -1540,13 +1495,13 @@ __metadata:
languageName: node
linkType: hard
"@typescript-eslint/visitor-keys@npm:4.28.2":
version: 4.28.2
resolution: "@typescript-eslint/visitor-keys@npm:4.28.2"
"@typescript-eslint/visitor-keys@npm:4.28.3":
version: 4.28.3
resolution: "@typescript-eslint/visitor-keys@npm:4.28.3"
dependencies:
"@typescript-eslint/types": 4.28.2
"@typescript-eslint/types": 4.28.3
eslint-visitor-keys: ^2.0.0
checksum: cec563831f563bb057f00045104db7ed92576755065d7563607c5f3581e5588fe8b83229767cd81763136aeb663dd49b99e7ee24decfbfc5fc7bd7b36bb1a525
checksum: 37410d60074f255ac78b5af5d189c61ff219d0ff096f0d4984d7bc9ed9b42932d338b1efa97a99e0144820ef9a0fb2801c3ee6106dbc577901cc09ce02b75c9e
languageName: node
linkType: hard
@ -2217,13 +2172,6 @@ __metadata:
languageName: node
linkType: hard
"builtin-modules@npm:^3.1.0":
version: 3.2.0
resolution: "builtin-modules@npm:3.2.0"
checksum: f0e7240f70ae472a0a0167bf76d2e828c73028fe60be8cd229939c38a27527ea68c92f700553dac1316fa124af3037bc7a765ca0e029a03d2e9201dfb372ea24
languageName: node
linkType: hard
"cacache@npm:^15.0.5":
version: 15.2.0
resolution: "cacache@npm:15.2.0"
@ -2949,12 +2897,11 @@ __metadata:
version: 0.0.0-use.local
resolution: "dungeonslayers4@workspace:."
dependencies:
"@league-of-foundry-developers/foundry-vtt-types": ^0.8.8-5
"@rollup/plugin-node-resolve": ^13.0.0
"@league-of-foundry-developers/foundry-vtt-types": ^0.8.8-7
"@types/fs-extra": ^9.0.12
"@types/jest": ^26.0.24
"@typescript-eslint/eslint-plugin": ^4.28.2
"@typescript-eslint/parser": ^4.28.2
"@typescript-eslint/eslint-plugin": ^4.28.3
"@typescript-eslint/parser": ^4.28.3
chalk: ^4.1.1
eslint: ^7.30.0
eslint-config-prettier: ^8.3.0
@ -2966,9 +2913,9 @@ __metadata:
husky: ^7.0.1
jest: ^27.0.6
jest-junit: ^12.2.0
lint-staged: ^11.0.0
lint-staged: ^11.0.1
prettier: ^2.3.2
rollup: ^2.53.1
rollup: ^2.53.2
rollup-plugin-typescript2: ^0.30.0
sass: 1.35.2
semver: ^7.3.5
@ -3391,13 +3338,6 @@ __metadata:
languageName: node
linkType: hard
"estree-walker@npm:^1.0.1":
version: 1.0.1
resolution: "estree-walker@npm:1.0.1"
checksum: 85e7cee763e9125a7d8a947b3a06a8b9282873936df220dd0d791d9b3315e45e40ab096b43ba71bdc99140c11a6d23fdcf686642dc119a7b2d6181004fdb24d2
languageName: node
linkType: hard
"estree-walker@npm:^2.0.1":
version: 2.0.2
resolution: "estree-walker@npm:2.0.2"
@ -4667,13 +4607,6 @@ fsevents@^1.2.7:
languageName: node
linkType: hard
"is-module@npm:^1.0.0":
version: 1.0.0
resolution: "is-module@npm:1.0.0"
checksum: 2cbd41e2760874130b76aee84cc53120c4feef0d0f196fa665326857b444c8549909cc840f3f3a59652a7e8df46146a77f6c0f3f70a578704e03670975843e74
languageName: node
linkType: hard
"is-negated-glob@npm:^1.0.0":
version: 1.0.0
resolution: "is-negated-glob@npm:1.0.0"
@ -5678,9 +5611,9 @@ fsevents@^1.2.7:
languageName: node
linkType: hard
"lint-staged@npm:^11.0.0":
version: 11.0.0
resolution: "lint-staged@npm:11.0.0"
"lint-staged@npm:^11.0.1":
version: 11.0.1
resolution: "lint-staged@npm:11.0.1"
dependencies:
chalk: ^4.1.1
cli-truncate: ^2.1.0
@ -5699,7 +5632,7 @@ fsevents@^1.2.7:
stringify-object: ^3.3.0
bin:
lint-staged: bin/lint-staged.js
checksum: e5d9c38f468fae090939d150f8a1676ca208e50c714f20c9957a16833eeae20ca9676c8679883d0a005fda58375581c26352e18a2227d6449a29adaca650f957
checksum: 2b90d18a40acb26c61df224844040843f4533b874cf5a5b6be9d7641d60c2799b4acf7e1f73cea4ab1c3630f26ab3c4553a42935850b6a7683e0500e5af7b3ec
languageName: node
linkType: hard
@ -7140,7 +7073,7 @@ fsevents@^1.2.7:
languageName: node
linkType: hard
"resolve@1.20.0, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.4.0":
"resolve@1.20.0, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.20.0, resolve@^1.4.0":
version: 1.20.0
resolution: "resolve@npm:1.20.0"
dependencies:
@ -7150,7 +7083,7 @@ fsevents@^1.2.7:
languageName: node
linkType: hard
"resolve@patch:resolve@1.20.0#builtin<compat/resolve>, resolve@patch:resolve@^1.1.6#builtin<compat/resolve>, resolve@patch:resolve@^1.1.7#builtin<compat/resolve>, resolve@patch:resolve@^1.10.0#builtin<compat/resolve>, resolve@patch:resolve@^1.19.0#builtin<compat/resolve>, resolve@patch:resolve@^1.20.0#builtin<compat/resolve>, resolve@patch:resolve@^1.4.0#builtin<compat/resolve>":
"resolve@patch:resolve@1.20.0#builtin<compat/resolve>, resolve@patch:resolve@^1.1.6#builtin<compat/resolve>, resolve@patch:resolve@^1.1.7#builtin<compat/resolve>, resolve@patch:resolve@^1.10.0#builtin<compat/resolve>, resolve@patch:resolve@^1.20.0#builtin<compat/resolve>, resolve@patch:resolve@^1.4.0#builtin<compat/resolve>":
version: 1.20.0
resolution: "resolve@patch:resolve@npm%3A1.20.0#builtin<compat/resolve>::version=1.20.0&hash=3388aa"
dependencies:
@ -7228,9 +7161,9 @@ fsevents@^1.2.7:
languageName: node
linkType: hard
"rollup@npm:^2.53.1":
version: 2.53.1
resolution: "rollup@npm:2.53.1"
"rollup@npm:^2.53.2":
version: 2.53.2
resolution: "rollup@npm:2.53.2"
dependencies:
fsevents: ~2.3.2
dependenciesMeta:
@ -7238,7 +7171,7 @@ fsevents@^1.2.7:
optional: true
bin:
rollup: dist/bin/rollup
checksum: 7c63a7251e87715795a4141371f4f7b31ce46c7dd8273a0f4b5240977eb7ecaddd1e8d0fdaf8eabfc7cf73075cc9d83e03c67b89e56f31a2e85cf1089e9fc34f
checksum: 41d32b1d44066f3e8eeb5239013397e3df74dbb37489aaa77f8357059b5998cb4af0108fb72b048d265ae5d88de933b0732007c07e5d5687f5ee3ae44fab9eee
languageName: node
linkType: hard
@ -8190,7 +8123,7 @@ fsevents@^1.2.7:
languageName: node
linkType: hard
"typescript@^4.1.6, typescript@^4.3.5":
typescript@^4.3.5:
version: 4.3.5
resolution: "typescript@npm:4.3.5"
bin:
@ -8200,7 +8133,7 @@ fsevents@^1.2.7:
languageName: node
linkType: hard
"typescript@patch:typescript@^4.1.6#builtin<compat/typescript>, typescript@patch:typescript@^4.3.5#builtin<compat/typescript>":
"typescript@patch:typescript@^4.3.5#builtin<compat/typescript>":
version: 4.3.5
resolution: "typescript@patch:typescript@npm%3A4.3.5#builtin<compat/typescript>::version=4.3.5&hash=ddfc1b"
bin: