Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

fix: fix deploy issue while zipping the folder #3536

Closed
Qi Kang (zidaneymar) wants to merge 8 commits into from
Closed

fix: fix deploy issue while zipping the folder #3536

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5f25a2c
fix deploy issue while zipping the folder
Jul 1, 2020
1beee1e
Revert "fix deploy issue while zipping the folder"
Jul 2, 2020
8b31c0c
fix path importing in azure publish
Jul 2, 2020
712aeb8
Revert "fix path importing in azure publish"
Jul 2, 2020
d66797d
fix deploy issue while zipping the folder
Jul 1, 2020
de1e3ff
Merge branch 'master' into qika/fixDeploy
Jul 2, 2020
126479e
Merge branch 'master' into qika/fixDeploy
cwhitten Jul 2, 2020
1886831
Merge branch 'master' into qika/fixDeploy
luhan2017 Jul 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Composer/packages/lib/bot-deploy/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"archiver": "^3.1.1",
"fs-extra": "^8.1.0",
"request": "^2.88.2",
"request-promise": "^4.2.5"
"request-promise": "^4.2.5",
"zip-folder": "^1.0.0"
}
}
19 changes: 8 additions & 11 deletions Composer/packages/lib/bot-deploy/src/botProjectDeploy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import * as rp from 'request-promise';

import { BotProjectDeployConfig } from './botProjectDeployConfig';
import { BotProjectDeployLoggerType } from './botProjectLoggerType';
import archiver = require('archiver');
import zipFolder = require('zip-folder');

const exec = util.promisify(require('child_process').exec);
const { promisify } = require('util');
Expand Down Expand Up @@ -359,17 +359,14 @@ export class BotProjectDeploy {
}

private async zipDirectory(source: string, out: string) {
const archive = archiver('zip', { zlib: { level: 9 } });
const stream = fs.createWriteStream(out);

return new Promise((resolve, reject) => {
archive
.directory(source, false)
.on('error', (err) => reject(err))
.pipe(stream);

stream.on('close', () => resolve());
archive.finalize();
zipFolder(source, out, (err) => {
if (err) {
reject(err);
} else {
resolve();
}
});
});
}

Expand Down
149 changes: 146 additions & 3 deletions Composer/plugins/azurePublish/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@
fs-extra "^8.1.0"
request "^2.88.2"
request-promise "^4.2.5"
zip-folder "^1.0.0"

"@bfc/plugin-loader@../../packages/extensions/plugin-loader":
version "1.0.0"
Expand Down Expand Up @@ -651,6 +652,20 @@ archiver-utils@^2.1.0:
normalize-path "^3.0.0"
readable-stream "^2.0.0"

archiver@^0.11.0:
version "0.11.0"
resolved "https://registry.yarnpkg.com/archiver/-/archiver-0.11.0.tgz#98177da7a6c0192b7f2798f30cd6eab8abd76690"
integrity sha1-mBd9p6bAGSt/J5jzDNbquKvXZpA=
dependencies:
async "~0.9.0"
buffer-crc32 "~0.2.1"
glob "~3.2.6"
lazystream "~0.1.0"
lodash "~2.4.1"
readable-stream "~1.0.26"
tar-stream "~0.4.0"
zip-stream "~0.4.0"

archiver@^3.1.1:
version "3.1.1"
resolved "https://botbuilder.myget.org/F/botframework-cli/npm/archiver/-/archiver-3.1.1.tgz#9db7819d4daf60aec10fe86b16cb9258ced66ea0"
Expand Down Expand Up @@ -708,6 +723,11 @@ async@^2.6.3:
dependencies:
lodash "^4.17.14"

async@~0.9.0:
version "0.9.2"
resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d"
integrity sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=

asynckit@^0.4.0:
version "0.4.0"
resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
Expand Down Expand Up @@ -752,6 +772,13 @@ bcrypt-pbkdf@^1.0.0:
dependencies:
tweetnacl "^0.14.3"

bl@^0.9.0:
version "0.9.5"
resolved "https://registry.yarnpkg.com/bl/-/bl-0.9.5.tgz#c06b797af085ea00bc527afc8efcf11de2232054"
integrity sha1-wGt5evCF6gC8Unr8jvzxHeIjIFQ=
dependencies:
readable-stream "~1.0.26"

bl@^4.0.1:
version "4.0.2"
resolved "https://botbuilder.myget.org/F/botframework-cli/npm/bl/-/bl-4.0.2.tgz#52b71e9088515d0606d9dd9cc7aa48dc1f98e73a"
Expand Down Expand Up @@ -781,7 +808,7 @@ braces@^3.0.1:
dependencies:
fill-range "^7.0.1"

buffer-crc32@^0.2.1, buffer-crc32@^0.2.13:
buffer-crc32@^0.2.1, buffer-crc32@^0.2.13, buffer-crc32@~0.2.1:
version "0.2.13"
resolved "https://botbuilder.myget.org/F/botframework-cli/npm/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=
Expand Down Expand Up @@ -959,6 +986,15 @@ compress-commons@^2.1.1:
normalize-path "^3.0.0"
readable-stream "^2.3.6"

compress-commons@~0.1.0:
version "0.1.6"
resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-0.1.6.tgz#0c740870fde58cba516f0ac0c822e33a0b85dfa3"
integrity sha1-DHQIcP3ljLpRbwrAyCLjOguF36M=
dependencies:
buffer-crc32 "~0.2.1"
crc32-stream "~0.3.1"
readable-stream "~1.0.26"

concat-map@0.0.1:
version "0.0.1"
resolved "https://botbuilder.myget.org/F/botframework-cli/npm/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
Expand Down Expand Up @@ -990,6 +1026,14 @@ crc32-stream@^3.0.1:
crc "^3.4.4"
readable-stream "^3.4.0"

crc32-stream@~0.3.1:
version "0.3.4"
resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-0.3.4.tgz#73bc25b45fac1db6632231a7bfce8927e9f06552"
integrity sha1-c7wltF+sHbZjIjGnv86JJ+nwZVI=
dependencies:
buffer-crc32 "~0.2.1"
readable-stream "~1.0.24"

crc@^3.4.4:
version "3.8.0"
resolved "https://botbuilder.myget.org/F/botframework-cli/npm/crc/-/crc-3.8.0.tgz#ad60269c2c856f8c299e2c4cc0de4556914056c6"
Expand Down Expand Up @@ -1119,7 +1163,7 @@ emoji-regex@^8.0.0:
resolved "https://botbuilder.myget.org/F/botframework-cli/npm/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
integrity sha1-6Bj9ac5cz8tARZT4QpY79TFkzDc=

end-of-stream@^1.1.0, end-of-stream@^1.4.1:
end-of-stream@^1.0.0, end-of-stream@^1.1.0, end-of-stream@^1.4.1:
version "1.4.4"
resolved "https://botbuilder.myget.org/F/botframework-cli/npm/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
integrity sha1-WuZKX0UFe682JuwU2gyl5LJDHrA=
Expand Down Expand Up @@ -1361,6 +1405,14 @@ glob@^7.1.3, glob@^7.1.4:
once "^1.3.0"
path-is-absolute "^1.0.0"

glob@~3.2.6:
version "3.2.11"
resolved "https://registry.yarnpkg.com/glob/-/glob-3.2.11.tgz#4a973f635b9190f715d10987d5c00fd2815ebe3d"
integrity sha1-Spc/Y1uRkPcV0QmH1cAP0oFevj0=
dependencies:
inherits "2"
minimatch "0.3"

globby@^10.0.1:
version "10.0.2"
resolved "https://botbuilder.myget.org/F/botframework-cli/npm/globby/-/globby-10.0.2.tgz#277593e745acaa4646c3ab411289ec47a0392543"
Expand Down Expand Up @@ -1469,7 +1521,7 @@ inflight@^1.0.4:
once "^1.3.0"
wrappy "1"

inherits@2, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3:
inherits@2, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3:
version "2.0.4"
resolved "https://botbuilder.myget.org/F/botframework-cli/npm/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
integrity sha1-D6LGT5MpF8NDOg3tVTY6rjdBa3w=
Expand Down Expand Up @@ -1562,6 +1614,11 @@ is-wsl@^1.1.0:
resolved "https://botbuilder.myget.org/F/botframework-cli/npm/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=

isarray@0.0.1:
version "0.0.1"
resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=

isarray@~1.0.0:
version "1.0.0"
resolved "https://botbuilder.myget.org/F/botframework-cli/npm/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
Expand Down Expand Up @@ -1647,6 +1704,13 @@ lazystream@^1.0.0:
dependencies:
readable-stream "^2.0.5"

lazystream@~0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-0.1.0.tgz#1b25d63c772a4c20f0a5ed0a9d77f484b6e16920"
integrity sha1-GyXWPHcqTCDwpe0KnXf0hLbhaSA=
dependencies:
readable-stream "~1.0.2"

lodash._arraycopy@^3.0.0:
version "3.0.0"
resolved "https://botbuilder.myget.org/F/botframework-cli/npm/lodash._arraycopy/-/lodash._arraycopy-3.0.0.tgz#76e7b7c1f1fb92547374878a562ed06a3e50f6e1"
Expand Down Expand Up @@ -1740,6 +1804,16 @@ lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15:
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==

lodash@~2.4.1:
version "2.4.2"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-2.4.2.tgz#fadd834b9683073da179b3eae6d9c0d15053f73e"
integrity sha1-+t2DS5aDBz2hebPq5tnA0VBT9z4=

lru-cache@2:
version "2.7.3"
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.7.3.tgz#6d4524e8b955f95d4f5b58851ce21dd72fb4e952"
integrity sha1-bUUk6LlV+V1PW1iFHOId1y+06VI=

map-age-cleaner@^0.1.1:
version "0.1.3"
resolved "https://botbuilder.myget.org/F/botframework-cli/npm/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a"
Expand Down Expand Up @@ -1795,6 +1869,14 @@ mimic-fn@^2.0.0:
resolved "https://botbuilder.myget.org/F/botframework-cli/npm/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
integrity sha1-ftLCzMyvhNP/y3pptXcR/CCDQBs=

minimatch@0.3:
version "0.3.0"
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-0.3.0.tgz#275d8edaac4f1bb3326472089e7949c8394699dd"
integrity sha1-J12O2qxPG7MyZHIInnlJyDlGmd0=
dependencies:
lru-cache "2"
sigmund "~1.0.0"

minimatch@^3.0.4:
version "3.0.4"
resolved "https://botbuilder.myget.org/F/botframework-cli/npm/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
Expand Down Expand Up @@ -1983,6 +2065,16 @@ qs@~6.5.2:
resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==

readable-stream@^1.0.27-1:
version "1.1.14"
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk=
dependencies:
core-util-is "~1.0.0"
inherits "~2.0.1"
isarray "0.0.1"
string_decoder "~0.10.x"

readable-stream@^2.0.0, readable-stream@^2.0.5, readable-stream@^2.3.6:
version "2.3.7"
resolved "https://botbuilder.myget.org/F/botframework-cli/npm/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
Expand All @@ -2005,6 +2097,16 @@ readable-stream@^3.1.1, readable-stream@^3.4.0:
string_decoder "^1.1.1"
util-deprecate "^1.0.1"

readable-stream@~1.0.2, readable-stream@~1.0.24, readable-stream@~1.0.26:
version "1.0.34"
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
integrity sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=
dependencies:
core-util-is "~1.0.0"
inherits "~2.0.1"
isarray "0.0.1"
string_decoder "~0.10.x"

redeyed@~2.1.0:
version "2.1.1"
resolved "https://botbuilder.myget.org/F/botframework-cli/npm/redeyed/-/redeyed-2.1.1.tgz#8984b5815d99cb220469c99eeeffe38913e6cc0b"
Expand Down Expand Up @@ -2115,6 +2217,11 @@ shimmer@^1.1.0, shimmer@^1.2.0:
resolved "https://botbuilder.myget.org/F/botframework-cli/npm/shimmer/-/shimmer-1.2.1.tgz#610859f7de327b587efebf501fb43117f9aff337"
integrity sha1-YQhZ994ye1h+/r9QH7QxF/mv8zc=

sigmund@~1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
integrity sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=

signal-exit@^3.0.0:
version "3.0.3"
resolved "https://botbuilder.myget.org/F/botframework-cli/npm/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
Expand Down Expand Up @@ -2199,6 +2306,11 @@ string_decoder@^1.1.1:
dependencies:
safe-buffer "~5.2.0"

string_decoder@~0.10.x:
version "0.10.31"
resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=

string_decoder@~1.1.1:
version "1.1.1"
resolved "https://botbuilder.myget.org/F/botframework-cli/npm/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
Expand Down Expand Up @@ -2258,6 +2370,16 @@ tar-stream@^2.1.0:
inherits "^2.0.3"
readable-stream "^3.1.1"

tar-stream@~0.4.0:
version "0.4.7"
resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-0.4.7.tgz#1f1d2ce9ebc7b42765243ca0e8f1b7bfda0aadcd"
integrity sha1-Hx0s6evHtCdlJDyg6PG3v9oKrc0=
dependencies:
bl "^0.9.0"
end-of-stream "^1.0.0"
readable-stream "^1.0.27-1"
xtend "^4.0.0"

to-regex-range@^5.0.1:
version "5.0.1"
resolved "https://botbuilder.myget.org/F/botframework-cli/npm/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
Expand Down Expand Up @@ -2428,6 +2550,18 @@ xpath.js@~1.1.0:
resolved "https://registry.yarnpkg.com/xpath.js/-/xpath.js-1.1.0.tgz#3816a44ed4bb352091083d002a383dd5104a5ff1"
integrity sha512-jg+qkfS4K8E7965sqaUl8mRngXiKb3WZGfONgE18pr03FUQiuSV6G+Ej4tS55B+rIQSFEIw3phdVAQ4pPqNWfQ==

xtend@^4.0.0:
version "4.0.2"
resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==

zip-folder@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/zip-folder/-/zip-folder-1.0.0.tgz#70a7744fd1789a2feb41ad3419b32e9fd87957b2"
integrity sha1-cKd0T9F4mi/rQa00GbMun9h5V7I=
dependencies:
archiver "^0.11.0"

zip-stream@^2.1.2:
version "2.1.3"
resolved "https://botbuilder.myget.org/F/botframework-cli/npm/zip-stream/-/zip-stream-2.1.3.tgz#26cc4bdb93641a8590dd07112e1f77af1758865b"
Expand All @@ -2436,3 +2570,12 @@ zip-stream@^2.1.2:
archiver-utils "^2.1.0"
compress-commons "^2.1.1"
readable-stream "^3.4.0"

zip-stream@~0.4.0:
version "0.4.1"
resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-0.4.1.tgz#4ea795a8ce19e9fab49a31d1d0877214159f03a3"
integrity sha1-TqeVqM4Z6fq0mjHR0IdyFBWfA6M=
dependencies:
compress-commons "~0.1.0"
lodash "~2.4.1"
readable-stream "~1.0.26"
Loading