Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade Antlr to 4.9.2 #1254

Merged
merged 6 commits into from
Jun 28, 2021
Merged

Upgrade Antlr to 4.9.2 #1254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1d210de
Upgrade to antlr 4.9 import changes
munozemilio Jun 27, 2021
712a525
Fixing ErrorListener
munozemilio Jun 28, 2021
5379e94
Upgrading engine reqs in build and cli package.json
munozemilio Jun 28, 2021
ea789d2
Setting engine reqs for bf-lu
munozemilio Jun 28, 2021
d7178f8
Adding generated files to gitignore file
munozemilio Jun 28, 2021
bd51d02
Merge branch 'main' into emimunoz/upgrade-antlr-4.9
munozemilio Jun 28, 2021
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
4 changes: 2 additions & 2 deletions build/bf-cli-build-test-steps.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ steps:
continueOnError: true

- task: NodeTool@0
displayName: 'Use Node 12.x'
displayName: 'Use Node 14.x'
inputs:
versionSpec: 12.x
versionSpec: 14.x

- task: Npm@1
displayName: 'npm install --global @microsoft/rush'
Expand Down
33 changes: 0 additions & 33 deletions build/botframework-cli-beta.yml
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions build/botframework-cli.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ jobs:
continueOnError: true

- task: NodeTool@0
displayName: 'Use Node 12.x'
displayName: 'Use Node 14.x'
inputs:
versionSpec: 12.x
versionSpec: 14.x

- task: Npm@1
displayName: 'npm install --global @microsoft/rush'
Expand Down
78 changes: 53 additions & 25 deletions common/config/rush/pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"bugs": "https://github.com/microsoft/botframework-cli",
"engines": {
"node": ">=8.0.0 <14"
"node": ">=14.0.0"
},
"files": [
"/bin",
Expand Down
1 change: 1 addition & 0 deletions packages/lu/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@
node_modules
**/.antlr
**/java_generated
src/parser/lufile/generated/* linguist-generated=true

results
4 changes: 2 additions & 2 deletions packages/lu/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"main": "lib/parser/index.js",
"browser": "lib/parser/composerindex.js",
"engines": {
"node": ">=8.0.0"
"node": ">=14.0.0"
},
"files": [
"/lib",
Expand Down Expand Up @@ -34,7 +34,7 @@
},
"dependencies": {
"@types/node-fetch": "~2.5.5",
"antlr4": "~4.8.0",
"antlr4": "4.9.2",
"axios": "~0.21.1",
"https-proxy-agent": "^5.0.0",
"chalk": "2.4.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/lu/src/parser/lufile/entitySection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const EntitySectionContext = require('./generated/LUFileParser').LUFileParser.EntitySectionContext;
import EntitySectionContext from './generated/LUFileParser.js'
joshgummersall marked this conversation as resolved.
Show resolved Hide resolved
const DiagnosticSeverity = require('./diagnostic').DiagnosticSeverity;
const BuildDiagnostic = require('./diagnostic').BuildDiagnostic;
const LUSectionTypes = require('./../utils/enums/lusectiontypes');
Expand Down
Loading