简柏林 / thingskit · Commits

Commit e31052bc39f11d076c0223777cb0400413dc96ab

Authored by Igor Kulikov
1 parent 09ca198f

Fix packaging configuration for js-executor and web-ui microservices.

Inline Side-by-side
Showing 4 changed files with 62 additions and 24 deletions
@@ -777,9 +777,9 @@ @@ -777,9 +777,9 @@
777 "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" 777 "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
778 }, 778 },
779 "config": { 779 "config": {
780 - "version": "1.31.0",  
781 - "resolved": "https://registry.npmjs.org/config/-/config-1.31.0.tgz",  
782 - "integrity": "sha512-Ep/l9Rd1J9IPueztJfpbOqVzuKHQh4ZODMNt9xqTYdBBNRXbV4oTu34kCkkfdRVcDq0ohtpaeXGgb+c0LQxFRA==", 780 + "version": "3.2.2",
  781 + "resolved": "https://registry.npmjs.org/config/-/config-3.2.2.tgz",
  782 + "integrity": "sha512-rOsfIOAcG82AWouK4/vBS/OKz3UPl2T/kP0irExmXJJOoWg2CmdfPLdx56bCoMUMFNh+7soQkQWCUC8DyemiwQ==",
783 "requires": { 783 "requires": {
784 "json5": "^1.0.1" 784 "json5": "^1.0.1"
785 } 785 }
@@ -1407,12 +1407,14 @@ @@ -1407,12 +1407,14 @@
1407 "balanced-match": { 1407 "balanced-match": {
1408 "version": "1.0.0", 1408 "version": "1.0.0",
1409 "bundled": true, 1409 "bundled": true,
1410 - "dev": true 1410 + "dev": true,
  1411 + "optional": true
1411 }, 1412 },
1412 "brace-expansion": { 1413 "brace-expansion": {
1413 "version": "1.1.11", 1414 "version": "1.1.11",
1414 "bundled": true, 1415 "bundled": true,
1415 "dev": true, 1416 "dev": true,
  1417 + "optional": true,
1416 "requires": { 1418 "requires": {
1417 "balanced-match": "^1.0.0", 1419 "balanced-match": "^1.0.0",
1418 "concat-map": "0.0.1" 1420 "concat-map": "0.0.1"
@@ -1427,17 +1429,20 @@ @@ -1427,17 +1429,20 @@
1427 "code-point-at": { 1429 "code-point-at": {
1428 "version": "1.1.0", 1430 "version": "1.1.0",
1429 "bundled": true, 1431 "bundled": true,
1430 - "dev": true 1432 + "dev": true,
  1433 + "optional": true
1431 }, 1434 },
1432 "concat-map": { 1435 "concat-map": {
1433 "version": "0.0.1", 1436 "version": "0.0.1",
1434 "bundled": true, 1437 "bundled": true,
1435 - "dev": true 1438 + "dev": true,
  1439 + "optional": true
1436 }, 1440 },
1437 "console-control-strings": { 1441 "console-control-strings": {
1438 "version": "1.1.0", 1442 "version": "1.1.0",
1439 "bundled": true, 1443 "bundled": true,
1440 - "dev": true 1444 + "dev": true,
  1445 + "optional": true
1441 }, 1446 },
1442 "core-util-is": { 1447 "core-util-is": {
1443 "version": "1.0.2", 1448 "version": "1.0.2",
@@ -1554,7 +1559,8 @@ @@ -1554,7 +1559,8 @@
1554 "inherits": { 1559 "inherits": {
1555 "version": "2.0.3", 1560 "version": "2.0.3",
1556 "bundled": true, 1561 "bundled": true,
1557 - "dev": true 1562 + "dev": true,
  1563 + "optional": true
1558 }, 1564 },
1559 "ini": { 1565 "ini": {
1560 "version": "1.3.5", 1566 "version": "1.3.5",
@@ -1566,6 +1572,7 @@ @@ -1566,6 +1572,7 @@
1566 "version": "1.0.0", 1572 "version": "1.0.0",
1567 "bundled": true, 1573 "bundled": true,
1568 "dev": true, 1574 "dev": true,
  1575 + "optional": true,
1569 "requires": { 1576 "requires": {
1570 "number-is-nan": "^1.0.0" 1577 "number-is-nan": "^1.0.0"
1571 } 1578 }
@@ -1580,6 +1587,7 @@ @@ -1580,6 +1587,7 @@
1580 "version": "3.0.4", 1587 "version": "3.0.4",
1581 "bundled": true, 1588 "bundled": true,
1582 "dev": true, 1589 "dev": true,
  1590 + "optional": true,
1583 "requires": { 1591 "requires": {
1584 "brace-expansion": "^1.1.7" 1592 "brace-expansion": "^1.1.7"
1585 } 1593 }
@@ -1587,12 +1595,14 @@ @@ -1587,12 +1595,14 @@
1587 "minimist": { 1595 "minimist": {
1588 "version": "0.0.8", 1596 "version": "0.0.8",
1589 "bundled": true, 1597 "bundled": true,
1590 - "dev": true 1598 + "dev": true,
  1599 + "optional": true
1591 }, 1600 },
1592 "minipass": { 1601 "minipass": {
1593 "version": "2.2.4", 1602 "version": "2.2.4",
1594 "bundled": true, 1603 "bundled": true,
1595 "dev": true, 1604 "dev": true,
  1605 + "optional": true,
1596 "requires": { 1606 "requires": {
1597 "safe-buffer": "^5.1.1", 1607 "safe-buffer": "^5.1.1",
1598 "yallist": "^3.0.0" 1608 "yallist": "^3.0.0"
@@ -1611,6 +1621,7 @@ @@ -1611,6 +1621,7 @@
1611 "version": "0.5.1", 1621 "version": "0.5.1",
1612 "bundled": true, 1622 "bundled": true,
1613 "dev": true, 1623 "dev": true,
  1624 + "optional": true,
1614 "requires": { 1625 "requires": {
1615 "minimist": "0.0.8" 1626 "minimist": "0.0.8"
1616 } 1627 }
@@ -1691,7 +1702,8 @@ @@ -1691,7 +1702,8 @@
1691 "number-is-nan": { 1702 "number-is-nan": {
1692 "version": "1.0.1", 1703 "version": "1.0.1",
1693 "bundled": true, 1704 "bundled": true,
1694 - "dev": true 1705 + "dev": true,
  1706 + "optional": true
1695 }, 1707 },
1696 "object-assign": { 1708 "object-assign": {
1697 "version": "4.1.1", 1709 "version": "4.1.1",
@@ -1703,6 +1715,7 @@ @@ -1703,6 +1715,7 @@
1703 "version": "1.4.0", 1715 "version": "1.4.0",
1704 "bundled": true, 1716 "bundled": true,
1705 "dev": true, 1717 "dev": true,
  1718 + "optional": true,
1706 "requires": { 1719 "requires": {
1707 "wrappy": "1" 1720 "wrappy": "1"
1708 } 1721 }
@@ -1824,6 +1837,7 @@ @@ -1824,6 +1837,7 @@
1824 "version": "1.0.2", 1837 "version": "1.0.2",
1825 "bundled": true, 1838 "bundled": true,
1826 "dev": true, 1839 "dev": true,
  1840 + "optional": true,
1827 "requires": { 1841 "requires": {
1828 "code-point-at": "^1.0.0", 1842 "code-point-at": "^1.0.0",
1829 "is-fullwidth-code-point": "^1.0.0", 1843 "is-fullwidth-code-point": "^1.0.0",
@@ -2426,7 +2440,7 @@ @@ -2426,7 +2440,7 @@
2426 }, 2440 },
2427 "json5": { 2441 "json5": {
2428 "version": "1.0.1", 2442 "version": "1.0.1",
2429 - "resolved": "http://registry.npmjs.org/json5/-/json5-1.0.1.tgz", 2443 + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
2430 "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", 2444 "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
2431 "requires": { 2445 "requires": {
2432 "minimist": "^1.2.0" 2446 "minimist": "^1.2.0"
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
13 "start-prod": "npm run build-proto && NODE_ENV=production nodemon server.js" 13 "start-prod": "npm run build-proto && NODE_ENV=production nodemon server.js"
14 }, 14 },
15 "dependencies": { 15 "dependencies": {
16 - "config": "^1.30.0", 16 + "config": "^3.2.2",
17 "js-yaml": "^3.12.0", 17 "js-yaml": "^3.12.0",
18 "kafka-node": "^4.1.3", 18 "kafka-node": "^4.1.3",
19 "long": "^4.0.0", 19 "long": "^4.0.0",
@@ -37,5 +37,10 @@ @@ -37,5 +37,10 @@
37 "fs-extra": "^6.0.1", 37 "fs-extra": "^6.0.1",
38 "nodemon": "^1.17.5", 38 "nodemon": "^1.17.5",
39 "pkg": "^4.4.0" 39 "pkg": "^4.4.0"
  40 + },
  41 + "pkg": {
  42 + "assets": [
  43 + "node_modules/config/**/*.*"
  44 + ]
40 } 45 }
41 } 46 }
@@ -606,9 +606,9 @@ @@ -606,9 +606,9 @@
606 "dev": true 606 "dev": true
607 }, 607 },
608 "config": { 608 "config": {
609 - "version": "1.31.0",  
610 - "resolved": "https://registry.npmjs.org/config/-/config-1.31.0.tgz",  
611 - "integrity": "sha512-Ep/l9Rd1J9IPueztJfpbOqVzuKHQh4ZODMNt9xqTYdBBNRXbV4oTu34kCkkfdRVcDq0ohtpaeXGgb+c0LQxFRA==", 609 + "version": "3.2.2",
  610 + "resolved": "https://registry.npmjs.org/config/-/config-3.2.2.tgz",
  611 + "integrity": "sha512-rOsfIOAcG82AWouK4/vBS/OKz3UPl2T/kP0irExmXJJOoWg2CmdfPLdx56bCoMUMFNh+7soQkQWCUC8DyemiwQ==",
612 "requires": { 612 "requires": {
613 "json5": "^1.0.1" 613 "json5": "^1.0.1"
614 } 614 }
@@ -1325,12 +1325,14 @@ @@ -1325,12 +1325,14 @@
1325 "balanced-match": { 1325 "balanced-match": {
1326 "version": "1.0.0", 1326 "version": "1.0.0",
1327 "bundled": true, 1327 "bundled": true,
1328 - "dev": true 1328 + "dev": true,
  1329 + "optional": true
1329 }, 1330 },
1330 "brace-expansion": { 1331 "brace-expansion": {
1331 "version": "1.1.11", 1332 "version": "1.1.11",
1332 "bundled": true, 1333 "bundled": true,
1333 "dev": true, 1334 "dev": true,
  1335 + "optional": true,
1334 "requires": { 1336 "requires": {
1335 "balanced-match": "^1.0.0", 1337 "balanced-match": "^1.0.0",
1336 "concat-map": "0.0.1" 1338 "concat-map": "0.0.1"
@@ -1345,17 +1347,20 @@ @@ -1345,17 +1347,20 @@
1345 "code-point-at": { 1347 "code-point-at": {
1346 "version": "1.1.0", 1348 "version": "1.1.0",
1347 "bundled": true, 1349 "bundled": true,
1348 - "dev": true 1350 + "dev": true,
  1351 + "optional": true
1349 }, 1352 },
1350 "concat-map": { 1353 "concat-map": {
1351 "version": "0.0.1", 1354 "version": "0.0.1",
1352 "bundled": true, 1355 "bundled": true,
1353 - "dev": true 1356 + "dev": true,
  1357 + "optional": true
1354 }, 1358 },
1355 "console-control-strings": { 1359 "console-control-strings": {
1356 "version": "1.1.0", 1360 "version": "1.1.0",
1357 "bundled": true, 1361 "bundled": true,
1358 - "dev": true 1362 + "dev": true,
  1363 + "optional": true
1359 }, 1364 },
1360 "core-util-is": { 1365 "core-util-is": {
1361 "version": "1.0.2", 1366 "version": "1.0.2",
@@ -1472,7 +1477,8 @@ @@ -1472,7 +1477,8 @@
1472 "inherits": { 1477 "inherits": {
1473 "version": "2.0.3", 1478 "version": "2.0.3",
1474 "bundled": true, 1479 "bundled": true,
1475 - "dev": true 1480 + "dev": true,
  1481 + "optional": true
1476 }, 1482 },
1477 "ini": { 1483 "ini": {
1478 "version": "1.3.5", 1484 "version": "1.3.5",
@@ -1484,6 +1490,7 @@ @@ -1484,6 +1490,7 @@
1484 "version": "1.0.0", 1490 "version": "1.0.0",
1485 "bundled": true, 1491 "bundled": true,
1486 "dev": true, 1492 "dev": true,
  1493 + "optional": true,
1487 "requires": { 1494 "requires": {
1488 "number-is-nan": "^1.0.0" 1495 "number-is-nan": "^1.0.0"
1489 } 1496 }
@@ -1498,6 +1505,7 @@ @@ -1498,6 +1505,7 @@
1498 "version": "3.0.4", 1505 "version": "3.0.4",
1499 "bundled": true, 1506 "bundled": true,
1500 "dev": true, 1507 "dev": true,
  1508 + "optional": true,
1501 "requires": { 1509 "requires": {
1502 "brace-expansion": "^1.1.7" 1510 "brace-expansion": "^1.1.7"
1503 } 1511 }
@@ -1505,12 +1513,14 @@ @@ -1505,12 +1513,14 @@
1505 "minimist": { 1513 "minimist": {
1506 "version": "0.0.8", 1514 "version": "0.0.8",
1507 "bundled": true, 1515 "bundled": true,
1508 - "dev": true 1516 + "dev": true,
  1517 + "optional": true
1509 }, 1518 },
1510 "minipass": { 1519 "minipass": {
1511 "version": "2.2.4", 1520 "version": "2.2.4",
1512 "bundled": true, 1521 "bundled": true,
1513 "dev": true, 1522 "dev": true,
  1523 + "optional": true,
1514 "requires": { 1524 "requires": {
1515 "safe-buffer": "^5.1.1", 1525 "safe-buffer": "^5.1.1",
1516 "yallist": "^3.0.0" 1526 "yallist": "^3.0.0"
@@ -1529,6 +1539,7 @@ @@ -1529,6 +1539,7 @@
1529 "version": "0.5.1", 1539 "version": "0.5.1",
1530 "bundled": true, 1540 "bundled": true,
1531 "dev": true, 1541 "dev": true,
  1542 + "optional": true,
1532 "requires": { 1543 "requires": {
1533 "minimist": "0.0.8" 1544 "minimist": "0.0.8"
1534 } 1545 }
@@ -1609,7 +1620,8 @@ @@ -1609,7 +1620,8 @@
1609 "number-is-nan": { 1620 "number-is-nan": {
1610 "version": "1.0.1", 1621 "version": "1.0.1",
1611 "bundled": true, 1622 "bundled": true,
1612 - "dev": true 1623 + "dev": true,
  1624 + "optional": true
1613 }, 1625 },
1614 "object-assign": { 1626 "object-assign": {
1615 "version": "4.1.1", 1627 "version": "4.1.1",
@@ -1621,6 +1633,7 @@ @@ -1621,6 +1633,7 @@
1621 "version": "1.4.0", 1633 "version": "1.4.0",
1622 "bundled": true, 1634 "bundled": true,
1623 "dev": true, 1635 "dev": true,
  1636 + "optional": true,
1624 "requires": { 1637 "requires": {
1625 "wrappy": "1" 1638 "wrappy": "1"
1626 } 1639 }
@@ -1742,6 +1755,7 @@ @@ -1742,6 +1755,7 @@
1742 "version": "1.0.2", 1755 "version": "1.0.2",
1743 "bundled": true, 1756 "bundled": true,
1744 "dev": true, 1757 "dev": true,
  1758 + "optional": true,
1745 "requires": { 1759 "requires": {
1746 "code-point-at": "^1.0.0", 1760 "code-point-at": "^1.0.0",
1747 "is-fullwidth-code-point": "^1.0.0", 1761 "is-fullwidth-code-point": "^1.0.0",
@@ -2354,7 +2368,7 @@ @@ -2354,7 +2368,7 @@
2354 }, 2368 },
2355 "json5": { 2369 "json5": {
2356 "version": "1.0.1", 2370 "version": "1.0.1",
2357 - "resolved": "http://registry.npmjs.org/json5/-/json5-1.0.1.tgz", 2371 + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
2358 "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", 2372 "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
2359 "requires": { 2373 "requires": {
2360 "minimist": "^1.2.0" 2374 "minimist": "^1.2.0"
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
13 }, 13 },
14 "dependencies": { 14 "dependencies": {
15 "compression": "^1.7.3", 15 "compression": "^1.7.3",
16 - "config": "^1.30.0", 16 + "config": "^3.2.2",
17 "connect-history-api-fallback": "^1.5.0", 17 "connect-history-api-fallback": "^1.5.0",
18 "express": "^4.16.3", 18 "express": "^4.16.3",
19 "http": "0.0.0", 19 "http": "0.0.0",
@@ -37,5 +37,10 @@ @@ -37,5 +37,10 @@
37 "fs-extra": "^6.0.1", 37 "fs-extra": "^6.0.1",
38 "nodemon": "^1.17.5", 38 "nodemon": "^1.17.5",
39 "pkg": "^4.4.0" 39 "pkg": "^4.4.0"
  40 + },
  41 + "pkg": {
  42 + "assets": [
  43 + "node_modules/config/**/*.*"
  44 + ]
40 } 45 }
41 } 46 }