Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good
Details
gitea/salix/pipeline/pr-dev This commit looks good
Details
This commit is contained in:
commit
b783a9cdfc
|
|
@ -13,7 +13,7 @@
|
|||
"AuthCode": {
|
||||
"dataSource": "vn"
|
||||
},
|
||||
"Bank": {
|
||||
"Accounting": {
|
||||
"dataSource": "vn"
|
||||
},
|
||||
"Buyer": {
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"name": "Bank",
|
||||
"name": "Accounting",
|
||||
"base": "VnModel",
|
||||
"options": {
|
||||
"mysql": {
|
||||
"table": "bank"
|
||||
"table": "accounting"
|
||||
}
|
||||
},
|
||||
"properties": {
|
||||
|
|
@ -22,10 +22,7 @@
|
|||
},
|
||||
"accountingTypeFk": {
|
||||
"type": "number",
|
||||
"required": true,
|
||||
"mysql": {
|
||||
"columnName": "cash"
|
||||
}
|
||||
"required": true
|
||||
},
|
||||
"entityFk": {
|
||||
"type": "number",
|
||||
|
|
@ -47,7 +47,7 @@
|
|||
},
|
||||
"bank": {
|
||||
"type": "belongsTo",
|
||||
"model": "Bank",
|
||||
"model": "Accounting",
|
||||
"foreignKey": "bankFk"
|
||||
},
|
||||
"payMethod": {
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ BEGIN
|
|||
FROM vn.component WHERE code = 'manaClaim';
|
||||
|
||||
SELECT id INTO vManaBankId
|
||||
FROM vn.bank WHERE code = 'mana';
|
||||
FROM vn.accounting WHERE code = 'mana';
|
||||
|
||||
SELECT id INTO vManaGreugeTypeId
|
||||
FROM vn.greugeType WHERE code = 'mana';
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ p: BEGIN
|
|||
FROM vn.`client` WHERE id = vCustomer;
|
||||
|
||||
SELECT account INTO vAccount
|
||||
FROM vn.bank WHERE id = vBank;
|
||||
FROM vn.accounting WHERE id = vBank;
|
||||
|
||||
DELETE FROM vn.XDiario
|
||||
WHERE SUBCTA = vSubaccount
|
||||
|
|
|
|||
|
|
@ -253,9 +253,9 @@ BEGIN
|
|||
LIMIT 10000000000000000000
|
||||
) sub GROUP BY ASIEN
|
||||
)sub2 ON sub2.ASIEN = x.ASIEN
|
||||
LEFT JOIN ( SELECT DISTINCT(account),cu.code
|
||||
FROM vn.bank b
|
||||
JOIN vn.currency cu ON cu.id = b.currencyFk
|
||||
LEFT JOIN ( SELECT DISTINCT(a.account),cu.code
|
||||
FROM vn.accounting a
|
||||
JOIN vn.currency cu ON cu.id = a.currencyFk
|
||||
WHERE cu.code <> 'EUR' -- no se informa cuando la divisa en EUR
|
||||
)sub3 ON sub3.account = x.SUBCTA
|
||||
WHERE x.enlazadoSage = FALSE
|
||||
|
|
|
|||
|
|
@ -17,15 +17,15 @@ BEGIN
|
|||
e.id accountFk,
|
||||
UCASE(e.name),
|
||||
''
|
||||
FROM vn.expense e
|
||||
FROM expense e
|
||||
UNION
|
||||
SELECT company_getCode(vCompanyFk),
|
||||
b.account,
|
||||
UCASE(b.bank),
|
||||
a.account,
|
||||
UCASE(a.bank),
|
||||
''
|
||||
FROM vn.bank b
|
||||
WHERE b.isActive
|
||||
AND b.`account`
|
||||
FROM accounting a
|
||||
WHERE a.isActive
|
||||
AND a.`account`
|
||||
UNION
|
||||
SELECT CodigoEmpresa,
|
||||
CodigoCuenta,
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ BEGIN
|
|||
-- Inserta los asientos contables
|
||||
|
||||
SELECT account INTO vAccount
|
||||
FROM bank WHERE id = vBank;
|
||||
FROM accounting WHERE id = vBank;
|
||||
|
||||
SELECT accountingAccount INTO vSubaccount
|
||||
FROM `client` WHERE id = vClient;
|
||||
|
|
|
|||
|
|
@ -10,13 +10,11 @@ BEGIN
|
|||
INSERT INTO mail (receiver,replyTo,subject,body)
|
||||
SELECT 'administracion@verdnatura.es' receiver,
|
||||
'noreply@verdnatura.es' replyTo,
|
||||
CONCAT('El seguro de la poliza ',b.id,' ',b.bank,' ha finalizado.') subject,
|
||||
CONCAT('El seguro de la poliza ',b.id,' ',b.bank,' ha finalizado.') body
|
||||
FROM vn.bankPolicy bp
|
||||
LEFT JOIN vn.supplier s
|
||||
ON s.id = bp.supplierFk
|
||||
LEFT JOIN vn.bank b
|
||||
ON b.id = bp.accountingFk
|
||||
CONCAT('El seguro de la poliza ',a.id,' ',a.bank,' ha finalizado.') subject,
|
||||
CONCAT('El seguro de la poliza ',a.id,' ',a.bank,' ha finalizado.') body
|
||||
FROM bankPolicy bp
|
||||
LEFT JOIN supplier s ON s.id = bp.supplierFk
|
||||
LEFT JOIN accounting a ON a.id = bp.accountingFk
|
||||
WHERE bp.insuranceExpired = util.VN_CURDATE();
|
||||
END$$
|
||||
DELIMITER ;
|
||||
|
|
|
|||
|
|
@ -39,11 +39,11 @@ BEGIN
|
|||
WHERE t.landed BETWEEN vStarted AND vEnded
|
||||
AND (vWarehouseFk IS NULL OR t.warehouseInFk = vWarehouseFk)
|
||||
AND b.price2 > 0
|
||||
AND b.quantity > 0
|
||||
ORDER BY NOT b.isIgnored DESC, t.landed DESC, b.id DESC
|
||||
LIMIT 10000000000000000000) sub
|
||||
GROUP BY itemFk, warehouseFk;
|
||||
|
||||
|
||||
INSERT IGNORE INTO tmp.buyUltimateFromInterval(itemFk, warehouseFk, buyFk, landed, isIgnored)
|
||||
SELECT
|
||||
b.itemFk,
|
||||
|
|
|
|||
|
|
@ -39,7 +39,8 @@ BEGIN
|
|||
FROM receipt r
|
||||
JOIN `client` c ON c.id = r.clientFk
|
||||
JOIN tmp.client tc ON tc.id = c.id
|
||||
JOIN bank b ON r.bankFk = b.id AND b.code = 'mana'
|
||||
JOIN accounting a ON r.bankFk = a.id
|
||||
AND a.code = 'mana'
|
||||
WHERE r.payed > vFromDated
|
||||
AND r.payed <= util.VN_CURDATE()
|
||||
UNION ALL
|
||||
|
|
|
|||
|
|
@ -30,10 +30,11 @@ BEGIN
|
|||
ish.visible,
|
||||
p.sectorFk,
|
||||
it.workerFk buyer,
|
||||
CONCAT('http:',ic.url, '/catalog/1600x900/',i.image) urlImage,
|
||||
ic.url,
|
||||
i.image,
|
||||
ish.isChecked,
|
||||
CASE
|
||||
WHEN s.notPrepared > sm.parked THEN 0
|
||||
WHEN IFNULL (s.notPrepared, 0) > sm.parked THEN 0
|
||||
WHEN sm.visible > sm.parked THEN 1
|
||||
ELSE 2
|
||||
END priority
|
||||
|
|
@ -43,7 +44,7 @@ BEGIN
|
|||
JOIN tmp.stockMisfit sm ON sm.itemFk = ish.itemFk
|
||||
JOIN shelving sh ON sh.code = ish.shelvingFk
|
||||
JOIN parking p ON p.id = sh.parkingFk
|
||||
JOIN (
|
||||
LEFT JOIN (
|
||||
SELECT s.itemFk, sum(s.quantity) notPrepared
|
||||
FROM sale s
|
||||
JOIN ticket t ON t.id = s.ticketFk
|
||||
|
|
|
|||
|
|
@ -79,7 +79,10 @@ DECLARE vIsCollection BOOL;
|
|||
IF(SUM(iss.quantity) IS NULL, 0, SUM(iss.quantity)) pickedQuantity,
|
||||
MIN(iss.created) picked,
|
||||
IF(sm.id, TRUE, FALSE) hasMistake,
|
||||
sg.sectorFk
|
||||
sg.sectorFk,
|
||||
b.packing,
|
||||
b.grouping,
|
||||
o.code
|
||||
FROM tmp.ticket t
|
||||
JOIN sale s ON s.ticketFk = t.id
|
||||
JOIN ticket tt ON tt.id = t.id
|
||||
|
|
|
|||
|
|
@ -94,7 +94,7 @@ BEGIN
|
|||
'payment'
|
||||
FROM payment p
|
||||
LEFT JOIN currency c ON c.id = p.currencyFk
|
||||
LEFT JOIN bank b ON b.id = p.bankFk
|
||||
LEFT JOIN accounting a ON a.id = p.bankFk
|
||||
LEFT JOIN payMethod pm ON pm.id = p.payMethodFk
|
||||
LEFT JOIN promissoryNote pn ON pn.paymentFk = p.id
|
||||
WHERE p.received > '2014-12-31'
|
||||
|
|
|
|||
|
|
@ -10,21 +10,21 @@ BEGIN
|
|||
|
||||
-- PAK 10/02/15 No se asientan los pagos directamente, salvo en el caso de las cajas de CASH
|
||||
SELECT (at2.code = 'cash') INTO bolCASH
|
||||
FROM vn.bank b
|
||||
JOIN vn.accountingType at2 ON at2.id = b.cash
|
||||
WHERE b.id = NEW.bankFk;
|
||||
FROM accounting a
|
||||
JOIN accountingType at2 ON at2.id = a.accountingTypeFk
|
||||
WHERE a.id = NEW.bankFk;
|
||||
|
||||
IF bolCASH THEN
|
||||
|
||||
SELECT account INTO cuenta_banco
|
||||
FROM bank
|
||||
FROM accounting
|
||||
WHERE id = NEW.bankFk;
|
||||
|
||||
SELECT account INTO cuenta_proveedor
|
||||
FROM supplier
|
||||
WHERE id = NEW.supplierFk;
|
||||
|
||||
CALL vn.ledger_next(vNewBookEntry);
|
||||
CALL ledger_next(vNewBookEntry);
|
||||
|
||||
INSERT INTO XDiario ( ASIEN,
|
||||
FECHA,
|
||||
|
|
|
|||
|
|
@ -1,12 +0,0 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn`.`bank`
|
||||
AS SELECT `a`.`id` AS `id`,
|
||||
`a`.`bank` AS `bank`,
|
||||
`a`.`account` AS `account`,
|
||||
`a`.`accountingTypeFk` AS `cash`,
|
||||
`a`.`entityFk` AS `entityFk`,
|
||||
`a`.`isActive` AS `isActive`,
|
||||
`a`.`currencyFk` AS `currencyFk`,
|
||||
`a`.`code` AS `code`
|
||||
FROM `vn`.`accounting` `a`
|
||||
|
|
@ -7,9 +7,9 @@ AS SELECT `p`.`received` AS `received`,
|
|||
FROM (
|
||||
(
|
||||
`vn`.`payment` `p`
|
||||
JOIN `vn`.`bank` `b` ON(`b`.`id` = `p`.`bankFk`)
|
||||
JOIN `vn`.`accounting` `a` ON(`a`.`id` = `p`.`bankFk`)
|
||||
)
|
||||
JOIN `vn`.`accountingType` `at2` ON(`at2`.`id` = `b`.`cash`)
|
||||
JOIN `vn`.`accountingType` `at2` ON(`at2`.`id` = `a`.`accountingTypeFk`)
|
||||
)
|
||||
WHERE `p`.`currencyFk` = 2
|
||||
AND `at2`.`code` = 'wireTransfer'
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`Bancos`
|
||||
AS SELECT `b`.`id` AS `Id_Banco`,
|
||||
`b`.`bank` AS `Banco`,
|
||||
`b`.`account` AS `Cuenta`,
|
||||
`b`.`cash` AS `cash`,
|
||||
`b`.`entityFk` AS `entity_id`,
|
||||
`b`.`isActive` AS `activo`,
|
||||
`b`.`currencyFk` AS `currencyFk`
|
||||
FROM `vn`.`bank` `b`
|
||||
AS SELECT `a`.`id` AS `Id_Banco`,
|
||||
`a`.`bank` AS `Banco`,
|
||||
`a`.`account` AS `Cuenta`,
|
||||
`a`.`accountingTypeFk` AS `cash`,
|
||||
`a`.`entityFk` AS `entity_id`,
|
||||
`a`.`isActive` AS `activo`,
|
||||
`a`.`currencyFk` AS `currencyFk`
|
||||
FROM `vn`.`accounting` `a`
|
||||
|
|
|
|||
|
|
@ -0,0 +1,5 @@
|
|||
REVOKE SELECT ON TABLE vn.bank FROM administrative, hr;
|
||||
GRANT SELECT ON TABLE vn.accounting TO administrative, hr;
|
||||
UPDATE salix.ACL
|
||||
SET model = 'Accounting'
|
||||
WHERE model = 'Bank';
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
|
||||
ALTER TABLE vn.department
|
||||
ADD COLUMN pbxQueue varchar(128) CHARACTER
|
||||
SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL NULL;
|
||||
|
||||
ALTER TABLE vn.department
|
||||
ADD CONSTRAINT department_queue_FK
|
||||
FOREIGN KEY (pbxQueue) REFERENCES pbx.queue(name) ON DELETE RESTRICT ON UPDATE CASCADE;
|
||||
|
|
@ -58,7 +58,7 @@
|
|||
label="Local bank"
|
||||
id="localBank"
|
||||
ng-model="$ctrl.localBankFk"
|
||||
url="Banks"
|
||||
url="Accountings"
|
||||
select-fields="['id','bank']"
|
||||
show-field="bank"
|
||||
order="id"
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@ module.exports = function(Self) {
|
|||
delete args.ctx; // Remove unwanted properties
|
||||
|
||||
const originalClient = await models.Client.findById(args.clientFk, null, myOptions);
|
||||
const bank = await models.Bank.findById(args.bankFk, null, myOptions);
|
||||
const bank = await models.Accounting.findById(args.bankFk, null, myOptions);
|
||||
const accountingType = await models.AccountingType.findById(bank.accountingTypeFk, null, myOptions);
|
||||
|
||||
if (accountingType.code == 'compensation') {
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ module.exports = Self => {
|
|||
const models = Self.app.models;
|
||||
const receipt = await models.Receipt.findById(id, {fields: ['clientFk', 'bankFk']});
|
||||
|
||||
const bank = await models.Bank.findById(receipt.bankFk);
|
||||
const bank = await models.Accounting.findById(receipt.bankFk);
|
||||
if (!bank)
|
||||
throw new UserError(`Receipt's bank was not found`);
|
||||
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@
|
|||
},
|
||||
"bank": {
|
||||
"type": "belongsTo",
|
||||
"model": "Bank",
|
||||
"model": "Accounting",
|
||||
"foreignKey": "bankFk"
|
||||
},
|
||||
"supplier": {
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@
|
|||
"relations": {
|
||||
"bank": {
|
||||
"type": "belongsTo",
|
||||
"model": "Bank",
|
||||
"model": "Accounting",
|
||||
"foreignKey": "bankFk"
|
||||
},
|
||||
"worker": {
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
<vn-horizontal>
|
||||
<vn-autocomplete
|
||||
label="Bank"
|
||||
url="Banks"
|
||||
url="Accountings"
|
||||
show-field="bank"
|
||||
value-field="id"
|
||||
fields="['accountingTypeFk']"
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
"relations": {
|
||||
"bank": {
|
||||
"type": "belongsTo",
|
||||
"model": "Bank",
|
||||
"model": "Accounting",
|
||||
"foreignKey": "bankFk"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<vn-autocomplete vn-three
|
||||
label="Bank"
|
||||
ng-model="invoiceInDueDay.bankFk"
|
||||
url="Banks"
|
||||
url="Accountings"
|
||||
show-field="bank"
|
||||
select-fields="['id','bank']"
|
||||
order="id"
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@
|
|||
"mysql": "2.18.1",
|
||||
"node-ssh": "^11.0.0",
|
||||
"object.pick": "^1.3.0",
|
||||
"puppeteer": "^21.11.0",
|
||||
"puppeteer": "21.11.0",
|
||||
"read-chunk": "^3.2.0",
|
||||
"require-yaml": "0.0.1",
|
||||
"smbhash": "0.0.1",
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@ dependencies:
|
|||
specifier: ^1.3.0
|
||||
version: 1.3.0
|
||||
puppeteer:
|
||||
specifier: ^21.11.0
|
||||
specifier: 21.11.0
|
||||
version: 21.11.0
|
||||
read-chunk:
|
||||
specifier: ^3.2.0
|
||||
|
|
|
|||
|
|
@ -1,34 +1,34 @@
|
|||
{
|
||||
"name": "vn-print",
|
||||
"version": "2.0.0",
|
||||
"description": "Print service",
|
||||
"scripts": {
|
||||
"start": "node server/server.js",
|
||||
"test": "echo \"Error: no test specified\" && exit 1"
|
||||
},
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "https://git.verdnatura.es/salix"
|
||||
},
|
||||
"license": "GPL-3.0",
|
||||
"packageManager": "pnpm@8.15.1",
|
||||
"dependencies": {
|
||||
"express": "4.14.0",
|
||||
"fs-extra": "^7.0.1",
|
||||
"intl": "^1.2.5",
|
||||
"js-yaml": "^3.13.1",
|
||||
"jsbarcode": "^3.11.5",
|
||||
"juice": "^5.2.0",
|
||||
"log4js": "^6.7.0",
|
||||
"mysql2": "^1.7.0",
|
||||
"nodemailer": "^4.7.0",
|
||||
"puppeteer": "^22.4.0",
|
||||
"puppeteer-cluster": "^0.23.0",
|
||||
"qrcode": "^1.4.2",
|
||||
"strftime": "^0.10.0",
|
||||
"vue": "^2.6.10",
|
||||
"vue-i18n": "^8.15.0",
|
||||
"vue-server-renderer": "^2.6.10",
|
||||
"xmldom": "^0.6.0"
|
||||
}
|
||||
"name": "vn-print",
|
||||
"version": "2.0.0",
|
||||
"description": "Print service",
|
||||
"scripts": {
|
||||
"start": "node server/server.js",
|
||||
"test": "echo \"Error: no test specified\" && exit 1"
|
||||
},
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "https://git.verdnatura.es/salix"
|
||||
},
|
||||
"license": "GPL-3.0",
|
||||
"packageManager": "pnpm@8.15.1",
|
||||
"dependencies": {
|
||||
"express": "4.14.0",
|
||||
"fs-extra": "^7.0.1",
|
||||
"intl": "^1.2.5",
|
||||
"js-yaml": "^3.13.1",
|
||||
"jsbarcode": "^3.11.5",
|
||||
"juice": "^5.2.0",
|
||||
"log4js": "^6.7.0",
|
||||
"mysql2": "^1.7.0",
|
||||
"nodemailer": "^4.7.0",
|
||||
"puppeteer": "21.11.0",
|
||||
"puppeteer-cluster": "0.23.0",
|
||||
"qrcode": "^1.4.2",
|
||||
"strftime": "^0.10.0",
|
||||
"vue": "^2.6.10",
|
||||
"vue-i18n": "^8.15.0",
|
||||
"vue-server-renderer": "^2.6.10",
|
||||
"xmldom": "^0.6.0"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,11 +33,11 @@ dependencies:
|
|||
specifier: ^4.7.0
|
||||
version: 4.7.0
|
||||
puppeteer:
|
||||
specifier: ^22.4.0
|
||||
version: 22.4.0
|
||||
specifier: 21.11.0
|
||||
version: 21.11.0
|
||||
puppeteer-cluster:
|
||||
specifier: ^0.23.0
|
||||
version: 0.23.0(puppeteer@22.4.0)
|
||||
specifier: 0.23.0
|
||||
version: 0.23.0(puppeteer@21.11.0)
|
||||
qrcode:
|
||||
specifier: ^1.4.2
|
||||
version: 1.5.3
|
||||
|
|
@ -103,17 +103,16 @@ packages:
|
|||
to-fast-properties: 2.0.0
|
||||
dev: false
|
||||
|
||||
/@puppeteer/browsers@2.1.0:
|
||||
resolution: {integrity: sha512-xloWvocjvryHdUjDam/ZuGMh7zn4Sn3ZAaV4Ah2e2EwEt90N3XphZlSsU3n0VDc1F7kggCjMuH0UuxfPQ5mD9w==}
|
||||
engines: {node: '>=18'}
|
||||
/@puppeteer/browsers@1.9.1:
|
||||
resolution: {integrity: sha512-PuvK6xZzGhKPvlx3fpfdM2kYY3P/hB1URtK8wA7XUJ6prn6pp22zvJHu48th0SGcHL9SutbPHrFuQgfXTFobWA==}
|
||||
engines: {node: '>=16.3.0'}
|
||||
hasBin: true
|
||||
dependencies:
|
||||
debug: 4.3.4
|
||||
extract-zip: 2.0.1
|
||||
progress: 2.0.3
|
||||
proxy-agent: 6.4.0
|
||||
semver: 7.6.0
|
||||
tar-fs: 3.0.5
|
||||
proxy-agent: 6.3.1
|
||||
tar-fs: 3.0.4
|
||||
unbzip2-stream: 1.4.3
|
||||
yargs: 17.7.2
|
||||
transitivePeerDependencies:
|
||||
|
|
@ -247,37 +246,6 @@ packages:
|
|||
resolution: {integrity: sha512-fpWrvyVHEKyeEvbKZTVOeZF3VSKKWtJxFIxX/jaVPf+cLbGUSitjb49pHLqPV2BUNNZ0LcoeEGfE/YCpyDYHIw==}
|
||||
dev: false
|
||||
|
||||
/bare-events@2.2.1:
|
||||
resolution: {integrity: sha512-9GYPpsPFvrWBkelIhOhTWtkeZxVxZOdb3VnFTCzlOo3OjvmTvzLoZFUT8kNFACx0vJej6QPney1Cf9BvzCNE/A==}
|
||||
requiresBuild: true
|
||||
dev: false
|
||||
optional: true
|
||||
|
||||
/bare-fs@2.2.1:
|
||||
resolution: {integrity: sha512-+CjmZANQDFZWy4PGbVdmALIwmt33aJg8qTkVjClU6X4WmZkTPBDxRHiBn7fpqEWEfF3AC2io++erpViAIQbSjg==}
|
||||
requiresBuild: true
|
||||
dependencies:
|
||||
bare-events: 2.2.1
|
||||
bare-os: 2.2.0
|
||||
bare-path: 2.1.0
|
||||
streamx: 2.15.6
|
||||
dev: false
|
||||
optional: true
|
||||
|
||||
/bare-os@2.2.0:
|
||||
resolution: {integrity: sha512-hD0rOPfYWOMpVirTACt4/nK8mC55La12K5fY1ij8HAdfQakD62M+H4o4tpfKzVGLgRDTuk3vjA4GqGXXCeFbag==}
|
||||
requiresBuild: true
|
||||
dev: false
|
||||
optional: true
|
||||
|
||||
/bare-path@2.1.0:
|
||||
resolution: {integrity: sha512-DIIg7ts8bdRKwJRJrUMy/PICEaQZaPGZ26lsSx9MJSwIhSrcdHn7/C8W+XmnG/rKi6BaRcz+JO00CjZteybDtw==}
|
||||
requiresBuild: true
|
||||
dependencies:
|
||||
bare-os: 2.2.0
|
||||
dev: false
|
||||
optional: true
|
||||
|
||||
/base64-js@1.5.1:
|
||||
resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
|
||||
dev: false
|
||||
|
|
@ -361,12 +329,12 @@ packages:
|
|||
lodash.some: 4.6.0
|
||||
dev: false
|
||||
|
||||
/chromium-bidi@0.5.12(devtools-protocol@0.0.1249869):
|
||||
resolution: {integrity: sha512-sZMgEBWKbupD0Q7lyFu8AWkrE+rs5ycE12jFkGwIgD/VS8lDPtelPlXM7LYaq4zrkZ/O2L3f4afHUHL0ICdKog==}
|
||||
/chromium-bidi@0.5.8(devtools-protocol@0.0.1232444):
|
||||
resolution: {integrity: sha512-blqh+1cEQbHBKmok3rVJkBlBxt9beKBgOsxbFgs7UJcoVbbeZ+K7+6liAsjgpc8l1Xd55cQUy14fXZdGSb4zIw==}
|
||||
peerDependencies:
|
||||
devtools-protocol: '*'
|
||||
dependencies:
|
||||
devtools-protocol: 0.0.1249869
|
||||
devtools-protocol: 0.0.1232444
|
||||
mitt: 3.0.1
|
||||
urlpattern-polyfill: 10.0.0
|
||||
dev: false
|
||||
|
|
@ -580,8 +548,8 @@ packages:
|
|||
resolution: {integrity: sha512-3NdhDuEXnfun/z7x9GOElY49LoqVHoGScmOKwmxhsS8N5Y+Z8KyPPDnaSzqWgYt/ji4mqwfTS34Htrk0zPIXVg==}
|
||||
dev: false
|
||||
|
||||
/devtools-protocol@0.0.1249869:
|
||||
resolution: {integrity: sha512-Ctp4hInA0BEavlUoRy9mhGq0i+JSo/AwVyX2EFgZmV1kYB+Zq+EMBAn52QWu6FbRr10hRb6pBl420upbp4++vg==}
|
||||
/devtools-protocol@0.0.1232444:
|
||||
resolution: {integrity: sha512-pM27vqEfxSxRkTMnF+XCmxSEb6duO5R+t8A9DEEJgy4Wz2RVanje2mmj99B6A3zv2r/qGfYlOvYznUhuokizmg==}
|
||||
dev: false
|
||||
|
||||
/dijkstrajs@1.0.3:
|
||||
|
|
@ -1293,13 +1261,6 @@ packages:
|
|||
yallist: 3.1.1
|
||||
dev: false
|
||||
|
||||
/lru-cache@6.0.0:
|
||||
resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==}
|
||||
engines: {node: '>=10'}
|
||||
dependencies:
|
||||
yallist: 4.0.0
|
||||
dev: false
|
||||
|
||||
/lru-cache@7.18.3:
|
||||
resolution: {integrity: sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==}
|
||||
engines: {node: '>=12'}
|
||||
|
|
@ -1350,6 +1311,10 @@ packages:
|
|||
resolution: {integrity: sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==}
|
||||
dev: false
|
||||
|
||||
/mkdirp-classic@0.5.3:
|
||||
resolution: {integrity: sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==}
|
||||
dev: false
|
||||
|
||||
/ms@0.7.1:
|
||||
resolution: {integrity: sha512-lRLiIR9fSNpnP6TC4v8+4OU7oStC01esuNowdQ34L+Gk8e5Puoc88IqJ+XAY/B3Mn2ZKis8l8HX90oU8ivzUHg==}
|
||||
dev: false
|
||||
|
|
@ -1574,8 +1539,8 @@ packages:
|
|||
ipaddr.js: 1.4.0
|
||||
dev: false
|
||||
|
||||
/proxy-agent@6.4.0:
|
||||
resolution: {integrity: sha512-u0piLU+nCOHMgGjRbimiXmA9kM/L9EHh3zL81xCdp7m+Y2pHIsnmbdDoEDoAz5geaonNR6q6+yOPQs6n4T6sBQ==}
|
||||
/proxy-agent@6.3.1:
|
||||
resolution: {integrity: sha512-Rb5RVBy1iyqOtNl15Cw/llpeLH8bsb37gM1FUfKQ+Wck6xHlbAhWGUFiTRHtkjqGTA5pSHz6+0hrPW/oECihPQ==}
|
||||
engines: {node: '>= 14'}
|
||||
dependencies:
|
||||
agent-base: 7.1.0
|
||||
|
|
@ -1610,26 +1575,26 @@ packages:
|
|||
engines: {node: '>=6'}
|
||||
dev: false
|
||||
|
||||
/puppeteer-cluster@0.23.0(puppeteer@22.4.0):
|
||||
/puppeteer-cluster@0.23.0(puppeteer@21.11.0):
|
||||
resolution: {integrity: sha512-108terIWDzPrQopmoYSPd5yDoy3FGJ2dNnoGMkGYPs6xtkdhgaECwpfZkzaRToMQPZibUOz0/dSSGgPEdXEhkQ==}
|
||||
peerDependencies:
|
||||
puppeteer: '>=1.5.0'
|
||||
dependencies:
|
||||
debug: 4.3.4
|
||||
puppeteer: 22.4.0
|
||||
puppeteer: 21.11.0
|
||||
transitivePeerDependencies:
|
||||
- supports-color
|
||||
dev: false
|
||||
|
||||
/puppeteer-core@22.4.0:
|
||||
resolution: {integrity: sha512-MZttAbttrxi6O/B//rY6zQihjFe/vXeCLb5YvKH2xG6yrcVESo0Hc5/Cv49omwZyZzAJ1BK8BnDeatDsj+3hMw==}
|
||||
engines: {node: '>=18'}
|
||||
/puppeteer-core@21.11.0:
|
||||
resolution: {integrity: sha512-ArbnyA3U5SGHokEvkfWjW+O8hOxV1RSJxOgriX/3A4xZRqixt9ZFHD0yPgZQF05Qj0oAqi8H/7stDorjoHY90Q==}
|
||||
engines: {node: '>=16.13.2'}
|
||||
dependencies:
|
||||
'@puppeteer/browsers': 2.1.0
|
||||
chromium-bidi: 0.5.12(devtools-protocol@0.0.1249869)
|
||||
'@puppeteer/browsers': 1.9.1
|
||||
chromium-bidi: 0.5.8(devtools-protocol@0.0.1232444)
|
||||
cross-fetch: 4.0.0
|
||||
debug: 4.3.4
|
||||
devtools-protocol: 0.0.1249869
|
||||
devtools-protocol: 0.0.1232444
|
||||
ws: 8.16.0
|
||||
transitivePeerDependencies:
|
||||
- bufferutil
|
||||
|
|
@ -1638,15 +1603,15 @@ packages:
|
|||
- utf-8-validate
|
||||
dev: false
|
||||
|
||||
/puppeteer@22.4.0:
|
||||
resolution: {integrity: sha512-tR+JsDbA2qD1DqRX4F9k9SxQhk6UzcaCN+Qux7+WrDceS7wcR7tlFmMNB8+g8zE4Fmr/iRTOtf5wNnTW9cGUFQ==}
|
||||
engines: {node: '>=18'}
|
||||
/puppeteer@21.11.0:
|
||||
resolution: {integrity: sha512-9jTHuYe22TD3sNxy0nEIzC7ZrlRnDgeX3xPkbS7PnbdwYjl2o/z/YuCrRBwezdKpbTDTJ4VqIggzNyeRcKq3cg==}
|
||||
engines: {node: '>=16.13.2'}
|
||||
hasBin: true
|
||||
requiresBuild: true
|
||||
dependencies:
|
||||
'@puppeteer/browsers': 2.1.0
|
||||
'@puppeteer/browsers': 1.9.1
|
||||
cosmiconfig: 9.0.0
|
||||
puppeteer-core: 22.4.0
|
||||
puppeteer-core: 21.11.0
|
||||
transitivePeerDependencies:
|
||||
- bufferutil
|
||||
- encoding
|
||||
|
|
@ -1768,14 +1733,6 @@ packages:
|
|||
hasBin: true
|
||||
dev: false
|
||||
|
||||
/semver@7.6.0:
|
||||
resolution: {integrity: sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==}
|
||||
engines: {node: '>=10'}
|
||||
hasBin: true
|
||||
dependencies:
|
||||
lru-cache: 6.0.0
|
||||
dev: false
|
||||
|
||||
/send@0.14.1:
|
||||
resolution: {integrity: sha512-1Ru269QpUVUgD32Y9jdyBXiX+pHYuYnTzR17w+DhyOWvGMPjJILrnLhl9c4LQjtIy2BSAa6Ykq0ZdGcAjaXlwQ==}
|
||||
engines: {node: '>= 0.8.0'}
|
||||
|
|
@ -1997,14 +1954,12 @@ packages:
|
|||
engines: {node: '>= 0.4'}
|
||||
dev: false
|
||||
|
||||
/tar-fs@3.0.5:
|
||||
resolution: {integrity: sha512-JOgGAmZyMgbqpLwct7ZV8VzkEB6pxXFBVErLtb+XCOqzc6w1xiWKI9GVd6bwk68EX7eJ4DWmfXVmq8K2ziZTGg==}
|
||||
/tar-fs@3.0.4:
|
||||
resolution: {integrity: sha512-5AFQU8b9qLfZCX9zp2duONhPmZv0hGYiBPJsyUdqMjzq/mqVpy/rEUSeHk1+YitmxugaptgBh5oDGU3VsAJq4w==}
|
||||
dependencies:
|
||||
mkdirp-classic: 0.5.3
|
||||
pump: 3.0.0
|
||||
tar-stream: 3.1.7
|
||||
optionalDependencies:
|
||||
bare-fs: 2.2.1
|
||||
bare-path: 2.1.0
|
||||
dev: false
|
||||
|
||||
/tar-stream@3.1.7:
|
||||
|
|
@ -2249,10 +2204,6 @@ packages:
|
|||
resolution: {integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==}
|
||||
dev: false
|
||||
|
||||
/yallist@4.0.0:
|
||||
resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==}
|
||||
dev: false
|
||||
|
||||
/yargs-parser@18.1.3:
|
||||
resolution: {integrity: sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==}
|
||||
engines: {node: '>=6'}
|
||||
|
|
|
|||
Loading…
Reference in New Issue