Merge pull request #34 from microsoft/remove-lerna

Remove lerna and adjust dependencies
This commit is contained in:
Tianyu You 2020-01-15 19:23:42 +08:00 коммит произвёл GitHub
Родитель f3cc46f151 1c9039fb5c
Коммит fafd42fbc0
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
13 изменённых файлов: 4605 добавлений и 369 удалений

2
.github/workflows/Adapter CI.yml поставляемый
Просмотреть файл

@ -48,7 +48,7 @@ jobs:
node-version: 12.13.1
- name: npm install
run: npm install
working-directory: libraries/typescript
working-directory: libraries/typescript/Microsoft.Bot.Builder.Adapters.WeChat
- name: Run Tests
run: npm run test
working-directory: libraries/typescript/Microsoft.Bot.Builder.Adapters.WeChat

304
libraries/typescript/.gitignore поставляемый
Просмотреть файл

@ -1,304 +0,0 @@
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.
##
## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
# User-specific files
*.suo
*.user
*.userosscache
*.sln.docstates
# User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs
# Build results
[Dd]ebug/
[Dd]ebugPublic/
[Rr]elease/
[Rr]eleases/
x64/
x86/
bld/
[Bb]in/
[Oo]bj/
[Ll]og/
# Visual Studio 2015 cache/options directory
.vs/
# Uncomment if you have tasks that create the project's static files in wwwroot
#wwwroot/
# MSTest test Results
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*
# NUNIT
*.VisualState.xml
TestResult.xml
# Build Results of an ATL Project
[Dd]ebugPS/
[Rr]eleasePS/
dlldata.c
# .NET Core
project.lock.json
project.fragment.lock.json
artifacts/
**/Properties/launchSettings.json
*_i.c
*_p.c
*_i.h
*.ilk
*.meta
*.obj
*.pch
*.pdb
*.pgc
*.pgd
*.rsp
*.sbr
*.tlb
*.tli
*.tlh
*.tmp
*.tmp_proj
*.log
*.vspscc
*.vssscc
.builds
*.pidb
*.svclog
*.scc
# Chutzpah Test files
_Chutzpah*
# Visual C++ cache files
ipch/
*.aps
*.ncb
*.opendb
*.opensdf
*.sdf
*.cachefile
*.VC.db
*.VC.VC.opendb
# Visual Studio profiler
*.psess
*.vsp
*.vspx
*.sap
# TFS 2012 Local Workspace
$tf/
# Guidance Automation Toolkit
*.gpState
# ReSharper is a .NET coding add-in
_ReSharper*/
*.[Rr]e[Ss]harper
*.DotSettings.user
# JustCode is a .NET coding add-in
.JustCode
# TeamCity is a build add-in
_TeamCity*
# DotCover is a Code Coverage Tool
*.dotCover
# Visual Studio code coverage results
*.coverage
*.coveragexml
# NCrunch
_NCrunch_*
.*crunch*.local.xml
nCrunchTemp_*
# MightyMoose
*.mm.*
AutoTest.Net/
# Web workbench (sass)
.sass-cache/
# Installshield output folder
[Ee]xpress/
# DocProject is a documentation generator add-in
DocProject/buildhelp/
DocProject/Help/*.HxT
DocProject/Help/*.HxC
DocProject/Help/*.hhc
DocProject/Help/*.hhk
DocProject/Help/*.hhp
DocProject/Help/Html2
DocProject/Help/html
# Click-Once directory
publish/
# Publish Web Output
*.[Pp]ublish.xml
*.azurePubxml
# TODO: Comment the next line if you want to checkin your web deploy settings
# but database connection strings (with potential passwords) will be unencrypted
*.pubxml
*.publishproj
# Microsoft Azure Web App publish settings. Comment the next line if you want to
# checkin your Azure Web App publish settings, but sensitive information contained
# in these scripts will be unencrypted
PublishScripts/
# NuGet Packages
*.nupkg
# The packages folder can be ignored because of Package Restore
**/packages/*
# except build/, which is used as an MSBuild target.
!**/packages/build/
# Uncomment if necessary however generally it will be regenerated when needed
#!**/packages/repositories.config
# NuGet v3's project.json files produces more ignorable files
*.nuget.props
*.nuget.targets
# Microsoft Azure Build Output
csx/
*.build.csdef
# Microsoft Azure Emulator
ecf/
rcf/
# Windows Store app package directories and files
AppPackages/
BundleArtifacts/
Package.StoreAssociation.xml
_pkginfo.txt
# Visual Studio cache files
# files ending in .cache can be ignored
*.[Cc]ache
# but keep track of directories ending in .cache
!*.[Cc]ache/
# Others
ClientBin/
~$*
*~
*.dbmdl
*.dbproj.schemaview
*.jfm
*.pfx
*.publishsettings
orleans.codegen.cs
# Since there are multiple workflows, uncomment next line to ignore bower_components
# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
#bower_components/
# RIA/Silverlight projects
Generated_Code/
# Backup & report files from converting an old project file
# to a newer Visual Studio version. Backup files are not needed,
# because we have git ;-)
_UpgradeReport_Files/
Backup*/
UpgradeLog*.XML
UpgradeLog*.htm
# SQL Server files
*.mdf
*.ldf
*.ndf
# Business Intelligence projects
*.rdl.data
*.bim.layout
*.bim_*.settings
# Microsoft Fakes
FakesAssemblies/
# GhostDoc plugin setting file
*.GhostDoc.xml
# Node.js Tools for Visual Studio
.ntvs_analysis.dat
node_modules/
# Typescript v1 declaration files
typings/
# Visual Studio 6 build log
*.plg
# Visual Studio 6 workspace options file
*.opt
# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
*.vbw
# Visual Studio LightSwitch build output
**/*.HTMLClient/GeneratedArtifacts
**/*.DesktopClient/GeneratedArtifacts
**/*.DesktopClient/ModelManifest.xml
**/*.Server/GeneratedArtifacts
**/*.Server/ModelManifest.xml
_Pvt_Extensions
# Paket dependency manager
.paket/paket.exe
paket-files/
# FAKE - F# Make
.fake/
# JetBrains Rider
.idea/
*.sln.iml
# CodeRush
.cr/
# Python Tools for Visual Studio (PTVS)
__pycache__/
*.pyc
# Cake - Uncomment if you are using it
# tools/**
# !tools/packages.config
# Telerik's JustMock configuration file
*.jmconfig
# BizTalk build output
*.btp.cs
*.btm.cs
*.odx.cs
*.xsd.cs
/**/node_modules
# Exception for including the ESLint extension in vscode
!.vscode/
.vscode/*
!.vscode/extensions.json
/**/*.VC.db
#coverage
/**/coverage
/**/.nyc_output
#derived
/test-runner/out
package-lock.json

Просмотреть файл

@ -1,5 +1,305 @@
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.
##
## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
# User-specific files
*.suo
*.user
*.userosscache
*.sln.docstates
# User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs
# Build results
[Dd]ebug/
[Dd]ebugPublic/
[Rr]elease/
[Rr]eleases/
x64/
x86/
bld/
[Bb]in/
[Oo]bj/
[Ll]og/
# Visual Studio 2015 cache/options directory
.vs/
# Uncomment if you have tasks that create the project's static files in wwwroot
#wwwroot/
# MSTest test Results
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*
# NUNIT
*.VisualState.xml
TestResult.xml
# Build Results of an ATL Project
[Dd]ebugPS/
[Rr]eleasePS/
dlldata.c
# .NET Core
project.lock.json
project.fragment.lock.json
artifacts/
**/Properties/launchSettings.json
*_i.c
*_p.c
*_i.h
*.ilk
*.meta
*.obj
*.pch
*.pdb
*.pgc
*.pgd
*.rsp
*.sbr
*.tlb
*.tli
*.tlh
*.tmp
*.tmp_proj
*.log
*.vspscc
*.vssscc
.builds
*.pidb
*.svclog
*.scc
# Chutzpah Test files
_Chutzpah*
# Visual C++ cache files
ipch/
*.aps
*.ncb
*.opendb
*.opensdf
*.sdf
*.cachefile
*.VC.db
*.VC.VC.opendb
# Visual Studio profiler
*.psess
*.vsp
*.vspx
*.sap
# TFS 2012 Local Workspace
$tf/
# Guidance Automation Toolkit
*.gpState
# ReSharper is a .NET coding add-in
_ReSharper*/
*.[Rr]e[Ss]harper
*.DotSettings.user
# JustCode is a .NET coding add-in
.JustCode
# TeamCity is a build add-in
_TeamCity*
# DotCover is a Code Coverage Tool
*.dotCover
# Visual Studio code coverage results
*.coverage
*.coveragexml
# NCrunch
_NCrunch_*
.*crunch*.local.xml
nCrunchTemp_*
# MightyMoose
*.mm.*
AutoTest.Net/
# Web workbench (sass)
.sass-cache/
# Installshield output folder
[Ee]xpress/
# DocProject is a documentation generator add-in
DocProject/buildhelp/
DocProject/Help/*.HxT
DocProject/Help/*.HxC
DocProject/Help/*.hhc
DocProject/Help/*.hhk
DocProject/Help/*.hhp
DocProject/Help/Html2
DocProject/Help/html
# Click-Once directory
publish/
# Publish Web Output
*.[Pp]ublish.xml
*.azurePubxml
# TODO: Comment the next line if you want to checkin your web deploy settings
# but database connection strings (with potential passwords) will be unencrypted
*.pubxml
*.publishproj
# Microsoft Azure Web App publish settings. Comment the next line if you want to
# checkin your Azure Web App publish settings, but sensitive information contained
# in these scripts will be unencrypted
PublishScripts/
# NuGet Packages
*.nupkg
# The packages folder can be ignored because of Package Restore
**/packages/*
# except build/, which is used as an MSBuild target.
!**/packages/build/
# Uncomment if necessary however generally it will be regenerated when needed
#!**/packages/repositories.config
# NuGet v3's project.json files produces more ignorable files
*.nuget.props
*.nuget.targets
# Microsoft Azure Build Output
csx/
*.build.csdef
# Microsoft Azure Emulator
ecf/
rcf/
# Windows Store app package directories and files
AppPackages/
BundleArtifacts/
Package.StoreAssociation.xml
_pkginfo.txt
# Visual Studio cache files
# files ending in .cache can be ignored
*.[Cc]ache
# but keep track of directories ending in .cache
!*.[Cc]ache/
# Others
ClientBin/
~$*
*~
*.dbmdl
*.dbproj.schemaview
*.jfm
*.pfx
*.publishsettings
orleans.codegen.cs
# Since there are multiple workflows, uncomment next line to ignore bower_components
# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
#bower_components/
# RIA/Silverlight projects
Generated_Code/
# Backup & report files from converting an old project file
# to a newer Visual Studio version. Backup files are not needed,
# because we have git ;-)
_UpgradeReport_Files/
Backup*/
UpgradeLog*.XML
UpgradeLog*.htm
# SQL Server files
*.mdf
*.ldf
*.ndf
# Business Intelligence projects
*.rdl.data
*.bim.layout
*.bim_*.settings
# Microsoft Fakes
FakesAssemblies/
# GhostDoc plugin setting file
*.GhostDoc.xml
# Node.js Tools for Visual Studio
.ntvs_analysis.dat
node_modules/
# Typescript v1 declaration files
typings/
# Visual Studio 6 build log
*.plg
# Visual Studio 6 workspace options file
*.opt
# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
*.vbw
# Visual Studio LightSwitch build output
**/*.HTMLClient/GeneratedArtifacts
**/*.DesktopClient/GeneratedArtifacts
**/*.DesktopClient/ModelManifest.xml
**/*.Server/GeneratedArtifacts
**/*.Server/ModelManifest.xml
_Pvt_Extensions
# Paket dependency manager
.paket/paket.exe
paket-files/
# FAKE - F# Make
.fake/
# JetBrains Rider
.idea/
*.sln.iml
# CodeRush
.cr/
# Python Tools for Visual Studio (PTVS)
__pycache__/
*.pyc
# Cake - Uncomment if you are using it
# tools/**
# !tools/packages.config
# Telerik's JustMock configuration file
*.jmconfig
# BizTalk build output
*.btp.cs
*.btm.cs
*.odx.cs
*.xsd.cs
/**/node_modules
/**/.vscode
/**/lib
coverage
.nyc_output
# Exception for including the ESLint extension in vscode
!.vscode/
.vscode/*
!.vscode/extensions.json
/**/*.VC.db
#coverage
/**/coverage
/**/.nyc_output
#derived
/test-runner/out
package-lock.json

Просмотреть файл

@ -1,6 +1,6 @@
{
"name": "botframework-wechat",
"version": "4.1.6",
"version": "4.0.0",
"description": "botframework wechat adapter",
"main": "./lib/index.js",
"typings": "./lib/index.d.ts",
@ -9,21 +9,34 @@
"clean": "erase /q /s .\\lib",
"build": "tsc"
},
"repository": {
"type": "git",
"url": "git+https://github.com/microsoft/BotFramework-WeChat.git"
},
"license": "MIT",
"dependencies": {
"@types/node": "^10.12.18",
"@azure/ms-rest-js": "1.2.6",
"adaptivecards": "1.1.0",
"botbuilder-core": "^4.7.0",
"node-fetch": "^2.2.1",
"adaptivecards": "1.1.0"
"form-data": "^3.0.0",
"node-fetch": "2.6.0",
"xml2js": "^0.4.23"
},
"devDependencies": {
"@types/node": "^10.12.18",
"@types/mocha": "^2.2.47",
"@types/form-data": "2.5.0",
"@types/node-fetch": "1.6.9",
"dotenv": "^5.0.1",
"mocha": "^5.2.0",
"nyc": "^11.4.1",
"source-map-support": "^0.5.3",
"ts-node": "^4.1.0"
"ts-node": "^4.1.0",
"@typescript-eslint/eslint-plugin": "^1.10.2",
"@typescript-eslint/parser": "^1.10.2",
"eslint-plugin-only-warn": "^1.0.1",
"eslint": "^5.16.0",
"coveralls": "^3.0.4",
"typescript": "^3.7.3"
},
"files": [
"/lib",

Просмотреть файл

@ -1,13 +0,0 @@
{
"lerna": "3.2.1",
"packages": [
"Microsoft.Bot.Builder.Adapters.WeChat",
"Microsoft.Bot.Builder.Adapters.WeChat.TestBot"
],
"version": "independent",
"command": {
"bootstrap": {
"hoist": true
}
}
}

Просмотреть файл

@ -1,39 +0,0 @@
{
"private": true,
"name": "wechat-packages",
"scripts": {
"postinstall": "lerna bootstrap --hoist && lerna run build",
"build": "lerna run build",
"clean": "lerna run clean",
"test": "lerna run build && nyc mocha \"Microsoft.Bot.Builder.Adapters.WeChat/tests/*.test.js\"",
"test-coverage": "nyc mocha \"Microsoft.Bot.Builder.Adapters.WeChat/tests/*.test.js\"",
"test:coveralls": "lerna run build && nyc mocha \"Microsoft.Bot.Builder.Adapters.WeChat/tests/*.test.js\" && nyc report --reporter=text-lcov | coveralls",
"upload-coverage": "nyc report --reporter=text-lcov | coveralls",
"eslint": "eslint ./Microsoft.Bot.Builder.Adapters.WeChat/src/*.ts",
"eslint-fix": "eslint ./Microsoft.Bot.Builder.Adapters.WeChat/src/*.ts --fix"
},
"dependencies": {
"@azure/ms-rest-js": "^1.8.13",
"@types/jsonwebtoken": "^8.3.2",
"@types/lodash": "^4.14.134",
"@typescript-eslint/eslint-plugin": "^1.10.2",
"@typescript-eslint/parser": "^1.10.2",
"coveralls": "^3.0.4",
"eslint": "^5.16.0",
"eslint-plugin-only-warn": "^1.0.1",
"lerna": "^3.2.1",
"mocha": "^6.1.4",
"ms-rest-azure": "^2.6.0",
"read-text-file": "^1.1.0",
"replace-in-file": "^4.1.0",
"sinon": "^7.3.2",
"typedoc": "^0.14.2",
"typedoc-plugin-external-module-name": "^2.1.0",
"typedoc-plugin-markdown": "^2.0.6",
"typescript": "^3.7.3",
"watershed": "^0.4.0"
},
"nyc": {
"exclude": []
}
}

Просмотреть файл

@ -1,6 +1,6 @@
Token=
EncodingAESKey=
AppId=
AppSecret=
Token=
EncodingAESKey=
UploadTemporaryMedia=true
passiveResponse=false

Разница между файлами не показана из-за своего большого размера Загрузить разницу

Просмотреть файл

@ -15,9 +15,10 @@
"watch": "nodemon --watch ./src -e ts --exec \"npm run start\""
},
"dependencies": {
"botframework-wechat": "4.1.6",
"botbuilder": "^4.5.3",
"botbuilder-dialogs": "^4.5.3",
"botframework-wechat": "file:../../../libraries/typescript/Microsoft.Bot.Builder.Adapters.WeChat",
"dotenv": "^8.2.0",
"restify": "^8.3.0"
},
"devDependencies": {