-
Notifications
You must be signed in to change notification settings - Fork 369
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' of https://github.com/microsoft/BotFramework-Comp…
…oser into srravich/botproject-file-handler Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> # Conflicts: # Composer/packages/client/src/recoilModel/persistence/FilePersistence.ts # Composer/packages/types/src/indexers.ts
- Loading branch information
Showing
127 changed files
with
843 additions
and
3,351 deletions.
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
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
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
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
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
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
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
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
6 changes: 2 additions & 4 deletions
6
Composer/packages/adaptive-form/src/utils/resolvePropSchema.ts
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
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
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 |
|---|---|---|
| @@ -1,2 +1,3 @@ | ||
| build/ | ||
| public/*-bundle.js | ||
| public/plugin-host-preload.js |
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,103 @@ | ||
| const path = require('path'); | ||
|
|
||
| const PnpWebpackPlugin = require('pnp-webpack-plugin'); | ||
| const TerserPlugin = require('terser-webpack-plugin'); | ||
|
|
||
| const paths = require('./paths'); | ||
|
|
||
| module.exports = (webpackEnv) => { | ||
| const isEnvDevelopment = webpackEnv === 'development'; | ||
| const isEnvProduction = webpackEnv === 'production'; | ||
|
|
||
| return [ | ||
| { | ||
| entry: { | ||
| 'react-bundle': 'react', | ||
| }, | ||
| mode: isEnvProduction ? 'production' : 'development', | ||
| // export react globally under a variable named React | ||
| output: { | ||
| path: path.resolve(__dirname, '../public'), | ||
| library: 'React', | ||
| libraryTarget: 'var', | ||
| }, | ||
| resolve: { | ||
| extensions: ['.js'], | ||
| }, | ||
| optimization: { | ||
| minimize: isEnvProduction, | ||
| minimizer: [ | ||
| new TerserPlugin({ | ||
| extractComments: false, | ||
| }), | ||
| ], | ||
| }, | ||
| }, | ||
| { | ||
| entry: { | ||
| 'react-dom-bundle': 'react-dom', | ||
| }, | ||
| mode: isEnvProduction ? 'production' : 'development', | ||
| // export react-dom globally under a variable named ReactDOM | ||
| output: { | ||
| path: path.resolve(__dirname, '../public'), | ||
| library: 'ReactDOM', | ||
| libraryTarget: 'var', | ||
| }, | ||
| externals: { | ||
| // ReactDOM depends on React, but we need this to resolve to the globally-exposed React variable in react-bundle.js (created by extensions.config.js). | ||
| // If we don't do this, ReactDom will bundle its own copy of React and we will have 2 copies which breaks hooks. | ||
| react: 'React', | ||
| }, | ||
| resolve: { | ||
| extensions: ['.js'], | ||
| }, | ||
| optimization: { | ||
| minimize: isEnvProduction, | ||
| minimizer: [ | ||
| new TerserPlugin({ | ||
| extractComments: false, | ||
| }), | ||
| ], | ||
| }, | ||
| }, | ||
| { | ||
| mode: isEnvProduction ? 'production' : 'development', | ||
| entry: { | ||
| 'plugin-host-preload': path.resolve(__dirname, '../extension-container/plugin-host-preload.tsx'), | ||
| }, | ||
| output: { | ||
| path: path.resolve(__dirname, '../public'), | ||
| }, | ||
| externals: { | ||
| // expect react & react-dom to be available in the extension host iframe globally under "React" and "ReactDOM" variables | ||
| react: 'React', | ||
| 'react-dom': 'ReactDOM', | ||
| }, | ||
| resolve: { | ||
| extensions: ['.js'], | ||
| plugins: [PnpWebpackPlugin], | ||
| }, | ||
| resolveLoader: { | ||
| plugins: [ | ||
| // Also related to Plug'n'Play, but this time it tells Webpack to load its loaders | ||
| // from the current package. | ||
| PnpWebpackPlugin.moduleLoader(module), | ||
| ], | ||
| }, | ||
| module: { | ||
| rules: [ | ||
| { | ||
| test: /\.tsx?$/, | ||
| loader: require.resolve('ts-loader'), | ||
| include: [path.resolve(__dirname, '../extension-container')], | ||
| options: PnpWebpackPlugin.tsLoaderOptions({ | ||
| transpileOnly: true, | ||
| configFile: path.resolve(__dirname, '../tsconfig.build.json'), | ||
| }), | ||
| }, | ||
| ], | ||
| }, | ||
| }, | ||
| ]; | ||
| }; |
Oops, something went wrong.