-
Notifications
You must be signed in to change notification settings - Fork 282
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.
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
make adaptive expression library compatible with IE #2906
Merged
joshgummersall
merged 9 commits into
microsoft:main
from
atishayv:atishayv/add_IE_support_for_adaptive_expression_library
Oct 20, 2020
Merged
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
d4e4e0b
make adaptive expression library compatible with IE
atishayverma 990afdf
rmoved changing target for normal build
atishayverma 4a5d2fc
addressed review comments
atishayverma cb370e0
add separate package for expression library ie11 supoort
atishayverma 1e9d59a
resolved review comments
atishayverma 4e41905
Merge branch 'main' into atishayv/add_IE_support_for_adaptive_express…
atishayv d89bfd8
Update libraries/adaptive-expressions-ie11/src/index.ts
stevengum fac7673
Update libraries/adaptive-expressions-ie11/package.json
stevengum fc8f16f
Merge branch 'main' into atishayv/add_IE_support_for_adaptive_express…
stevengum File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
module.exports = function (api) { | ||
api.cache(false); | ||
const presets = [ | ||
['@babel/preset-typescript'], | ||
[ | ||
'@babel/preset-env', | ||
{ | ||
corejs: { version: 3 }, | ||
useBuiltIns: 'usage', | ||
targets: { | ||
browsers: ['last 2 versions', 'ie >= 11', 'not ie < 11', 'not android > 0', 'not ios > 0'], | ||
}, | ||
}, | ||
], | ||
]; | ||
// These plugins are used to apply transformation to the compiled code, | ||
// like converting class or method decorators to appropriate js code. Please | ||
// check individual plugin documentation for more details. | ||
const plugins = [ | ||
['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }], | ||
['@babel/plugin-proposal-class-properties'], | ||
['@babel/plugin-transform-modules-commonjs'], | ||
['@babel/plugin-transform-runtime', { useESModules: false }], | ||
]; | ||
return { | ||
presets, | ||
plugins, | ||
}; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
{ | ||
"name": "adaptive-expressions-ie11", | ||
"author": "Microsoft Corp.", | ||
"description": "Common Expression Language", | ||
"version": "4.1.6", | ||
"license": "MIT", | ||
"keywords": [ | ||
"botbuilder", | ||
"botframework", | ||
"expression" | ||
], | ||
"bugs": { | ||
"url": "https://github.com/Microsoft/botbuilder-js/issues" | ||
}, | ||
"repository": { | ||
"type": "git", | ||
"url": "https://github.com/Microsoft/botbuilder-js.git" | ||
}, | ||
"main": "./dist/index.js", | ||
"typings": "./dist/index.d.ts", | ||
"dependencies": { | ||
"adaptive-expressions": "4.1.6", | ||
"core-js": "^3.3.2" | ||
}, | ||
"devDependencies": { | ||
"@babel/core": "^7.6.4", | ||
"@babel/plugin-proposal-class-properties": "^7.5.5", | ||
"@babel/plugin-proposal-decorators": "^7.6.0", | ||
"@babel/plugin-transform-runtime": "^7.6.2", | ||
"@babel/preset-env": "^7.6.3", | ||
"@babel/preset-typescript": "^7.6.0", | ||
"@babel/runtime": "^7.6.3", | ||
"@types/node": "^10.17.27", | ||
"babel-loader": "^8.0.6", | ||
"copyfiles": "2.4.0", | ||
"ts-loader": "^7.0.5", | ||
"typescript": "3.5.3", | ||
"webpack": "^4.43.0", | ||
"webpack-cli": "^3.3.12" | ||
}, | ||
"scripts": { | ||
"build": "webpack && copyfiles -u 3 node_modules/adaptive-expressions/lib/**/*.d.ts dist", | ||
"clean": "erase /q /s .\\dist", | ||
"set-version": "npm version --allow-same-version ${Version}" | ||
}, | ||
"files": [ | ||
"src", | ||
stevengum marked this conversation as resolved.
Show resolved
Hide resolved
|
||
"dist" | ||
] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
// Copyright (c) Microsoft Corporation. | ||
// Licensed under the MIT License. | ||
|
||
export * from 'adaptive-expressions'; | ||
stevengum marked this conversation as resolved.
Show resolved
Hide resolved
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
{ | ||
"extends": "../adaptive-expressions/tsconfig.json", | ||
"compilerOptions": { | ||
"target": "es5", | ||
"outDir": "./dist", | ||
"rootDir": "./src" | ||
}, | ||
"include": [ | ||
"src/**/*" | ||
] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
const path = require('path'); | ||
|
||
module.exports = (env, argv) => { | ||
return { | ||
mode: 'none', | ||
entry: path.resolve(__dirname, './src/index.ts'), | ||
output: { | ||
path: path.resolve(__dirname, './dist'), | ||
libraryTarget: 'amd', | ||
filename: 'index.js', | ||
}, | ||
devtool: 'none', | ||
resolve: { | ||
extensions: ['.ts', '.js'], | ||
}, | ||
module: { | ||
rules: [ | ||
{ | ||
test: /\.tsx?$/, | ||
loader: 'ts-loader', | ||
include: path.resolve(__dirname, './src'), | ||
}, | ||
{ | ||
test: /\.js$/, | ||
use: [ | ||
{ | ||
loader: 'babel-loader', | ||
}, | ||
], | ||
include: [ | ||
path.resolve(__dirname, './node_modules/adaptive-expressions'), | ||
path.resolve( | ||
__dirname, | ||
'./node_modules/@microsoft/recognizers-text-data-types-timex-expression' | ||
), | ||
path.resolve(__dirname, './node_modules/antlr4ts'), | ||
path.resolve(__dirname, './node_modules/lru-cache'), | ||
path.resolve(__dirname, './node_modules/yallist'), | ||
], | ||
}, | ||
], | ||
}, | ||
}; | ||
}; |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is there any benefit to us including
"src"
? If someone wanted to use the"src"
, they should likely instead useadaptive-expressions
, right?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, thanks for pushing those changes