Permalink
Browse files

Converted to use babel for all builds

  • Loading branch information...
justinwilaby committed Sep 19, 2018
1 parent b455827 commit 5b922cf682b526068499f284953934c0f5b73c20
Showing with 15,144 additions and 47,646 deletions.
  1. +150 −118 package-lock.json
  2. +13 −16,364 packages/app/client/package-lock.json
  3. +9 −2 packages/app/client/package.json
  4. +1 −1 ...p/client/src/ui/shell/explorer/servicesExplorer/connectedServicePicker/connectedServicePicker.tsx
  5. +1 −1 packages/app/client/src/ui/shell/multiTabs/tabBar/tabBar.tsx
  6. +1 −1 packages/app/client/src/ui/shell/navBar/navBar.tsx
  7. +21 −1 packages/app/client/webpack.config.js
  8. +17 −0 packages/app/main/.babelrc
  9. +15 −92 packages/app/main/package-lock.json
  10. +9 −4 packages/app/main/package.json
  11. +1 −1 packages/app/main/src/commandLine.ts
  12. +2 −1 packages/app/main/src/commands/electronCommands.ts
  13. +5 −5 packages/app/main/src/ipc/electron.ts
  14. +1 −1 packages/app/main/src/restServer.ts
  15. +2 −2 packages/app/main/src/services/azureAuthWorkflowService.ts
  16. +16 −0 packages/app/shared/.babelrc
  17. +3 −2 packages/app/shared/package.json
  18. +126 −126 packages/app/shared/src/constants/sharedConstants.ts
  19. +2 −2 packages/app/shared/src/paymentEncoder.ts
  20. +1 −1 packages/app/shared/src/types/serverSettingsTypes.ts
  21. +17 −14,150 packages/emulator/cli/package-lock.json
  22. +7 −6 packages/emulator/cli/package.json
  23. +1 −1 packages/emulator/cli/src/index.ts
  24. +5 −3 packages/emulator/core/.babelrc
  25. +19 −0 packages/emulator/core/package-lock.json
  26. +9 −8 packages/emulator/core/package.json
  27. +1 −1 packages/emulator/core/src/utils/uniqueId.ts
  28. +18 −0 packages/extensions/debug/client/.babelrc
  29. +6 −0 packages/extensions/debug/client/package.json
  30. +22 −4 packages/extensions/debug/client/webpack.config.js
  31. +18 −0 packages/extensions/debug/main/.babelrc
  32. +1,034 −1,004 packages/extensions/debug/main/package-lock.json
  33. +9 −2 packages/extensions/debug/main/package.json
  34. +1,593 −3,104 packages/extensions/luis/client/package-lock.json
  35. +8 −2 packages/extensions/luis/client/package.json
  36. +1 −2 packages/extensions/luis/client/src/Adapters/AppStateAdapter.tsx
  37. +23 −12 packages/extensions/luis/client/webpack.config.js
  38. +1,611 −2,997 packages/extensions/qnamaker/client/package-lock.json
  39. +8 −2 packages/extensions/qnamaker/client/package.json
  40. +1 −2 packages/extensions/qnamaker/client/src/AppStateAdapter.tsx
  41. +23 −4 packages/extensions/qnamaker/client/webpack.config.js
  42. +18 −0 packages/sdk/client/.babelrc
  43. +1 −0 packages/sdk/client/lib/extensions/host.js
  44. +17 −0 packages/sdk/client/lib/extensions/index.js
  45. +17 −0 packages/sdk/client/lib/index.js
  46. +9 −2 packages/sdk/client/package.json
  47. +1 −1 packages/sdk/client/tsconfig.json
  48. +18 −0 packages/sdk/main/.babelrc
  49. +8 −2 packages/sdk/main/package.json
  50. +18 −0 packages/sdk/shared/.babelrc
  51. +9 −2 packages/sdk/shared/package.json
  52. +109 −112 packages/sdk/shared/src/types/paymentTypes.ts
  53. +1 −1 packages/sdk/shared/src/utils/misc.ts
  54. +18 −0 packages/sdk/ui-react/.babelrc
  55. +23 −0 packages/sdk/ui-react/layout/column/column.d.ts
  56. +20 −0 packages/sdk/ui-react/layout/expandCollapse/expandCollapse.d.ts
  57. +4 −0 packages/sdk/ui-react/layout/index.d.ts
  58. +23 −0 packages/sdk/ui-react/layout/row/row.d.ts
  59. +7 −0 packages/sdk/ui-react/layout/truncateText/truncateText.d.ts
  60. +9,802 −9,484 packages/sdk/ui-react/package-lock.json
  61. +17 −9 packages/sdk/ui-react/package.json
  62. +2 −0 packages/sdk/ui-react/splitter/index.d.ts
  63. +9 −0 packages/sdk/ui-react/splitter/pane.d.ts
  64. +48 −0 packages/sdk/ui-react/splitter/splitter.d.ts
  65. +3 −3 packages/sdk/ui-react/tsconfig.json
  66. +3 −0 packages/sdk/ui-react/utils/filterChildren.d.ts
  67. +1 −0 packages/sdk/ui-react/utils/index.d.ts
  68. +22 −1 packages/sdk/ui-react/webpack.config.js
  69. +3 −0 packages/sdk/ui-react/widget/button/defaultButton.d.ts
  70. +2 −0 packages/sdk/ui-react/widget/button/defaultButton.styles.d.ts
  71. +3 −0 packages/sdk/ui-react/widget/button/primaryButton.d.ts
  72. +2 −0 packages/sdk/ui-react/widget/button/primaryButton.styles.d.ts
  73. +3 −0 packages/sdk/ui-react/widget/checkbox/checkbox.d.ts
  74. +2 −0 packages/sdk/ui-react/widget/checkbox/checkbox.styles.d.ts
  75. +9 −0 packages/sdk/ui-react/widget/dialog/dialog.d.ts
  76. +2 −0 packages/sdk/ui-react/widget/dialog/dialog.styles.d.ts
  77. +2 −0 packages/sdk/ui-react/widget/dialog/dialogContent.d.ts
  78. +2 −0 packages/sdk/ui-react/widget/dialog/dialogContent.styles.d.ts
  79. +2 −0 packages/sdk/ui-react/widget/dialog/dialogFooter.d.ts
  80. +2 −0 packages/sdk/ui-react/widget/dialog/dialogFooter.styles.d.ts
  81. +3 −0 packages/sdk/ui-react/widget/dialog/index.d.ts
  82. +9 −0 packages/sdk/ui-react/widget/index.d.ts
  83. +8 −0 packages/sdk/ui-react/widget/insetShadow/insetShadow.d.ts
  84. +6 −0 packages/sdk/ui-react/widget/largeHeader/largeHeader.d.ts
  85. +6 −0 packages/sdk/ui-react/widget/mediumHeader/mediumHeader.d.ts
  86. +6 −0 packages/sdk/ui-react/widget/smallHeader/smallHeader.d.ts
  87. +3 −0 packages/sdk/ui-react/widget/textField/textField.d.ts
  88. +10 −0 packages/sdk/ui-react/widget/textField/textField.styles.d.ts
  89. +1 −0 tsconfig.json
View

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -38,12 +38,19 @@
]
},
"devDependencies": {
"@babel/cli": "^7.1.0",
"@babel/core": "^7.1.0",
"@babel/plugin-proposal-class-properties": "^7.1.0",
"@babel/plugin-proposal-object-rest-spread": "^7.0.0",
"@babel/plugin-transform-react-jsx": "^7.0.0",
"@babel/preset-env": "^7.1.0",
"@babel/preset-typescript": "^7.1.0",
"@types/enzyme": "^3.1.10",
"@types/jest": "^22.2.3",
"@types/react": "~16.3.2",
"@types/react-dom": "^16.0.4",
"@types/request": "^2.47.0",
"babel-loader": "^7.1.4",
"babel-loader": "^8.0.2",
"babel-preset-react-app": "^3.1.1",
"copy-webpack-plugin": "^4.5.1",
"coveralls": "^3.0.1",
@@ -70,7 +77,7 @@
"ts-loader": "^4.4.2",
"tslint": "^5.10.0",
"tslint-loader": "^3.6.0",
"typescript": "2.7.2",
"typescript": "3.0.3",
"typings-for-css-modules-loader": "^1.7.0",
"url-loader": "^1.0.1",
"webpack": "^4.16.4",
@@ -94,7 +94,7 @@ export class ConnectedServicePicker extends Component<ConnectedServicesPickerPro
{ this.headerElements }
{ this.selectAllCheckbox }
<ul>
{ ...this.serviceListElements }
{ this.serviceListElements }
</ul>
{ this.contentElements }
</div>
@@ -108,7 +108,7 @@ class TabBarComponent extends React.Component<TabBarProps, TabBarState> {
}
</ul>
<div className={ styles.tabBarWidgets }>
{ ...this.widgets }
{ this.widgets }
</div>
</div>
);
@@ -68,7 +68,7 @@ export class NavBarComponent extends React.Component<NavBarProps, NavBarState> {
render() {
return (
<nav className={ styles.navBar }>
{ ...this.links }
{ this.links }
</nav>
);
}
@@ -39,7 +39,27 @@ const defaultConfig = {
{
test: /\.(tsx?)|(jsx)$/,
exclude: [/node_modules/],
use: ['ts-loader']
use: {
loader: 'babel-loader',
options: {
"presets": [
[
"@babel/preset-env",
{
"targets": {
"chrome": "58",
"esmodules": true
}
}
],
"@babel/preset-typescript"
],
"plugins": [
"@babel/proposal-class-properties",
"@babel/plugin-transform-react-jsx"
]
}
}
},
{
test: /\.css$/,
View
@@ -0,0 +1,17 @@
{
"presets": [
[
"@babel/preset-env",
{
"targets": {
"node": "8"
}
}
],
"@babel/preset-typescript"
],
"plugins": [
"@babel/proposal-class-properties",
"@babel/plugin-transform-react-jsx"
]
}

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -8,7 +8,7 @@
"homepage": "https://github.com/Microsoft/BotFramework-Emulator",
"scripts": {
"build": "run-s lint build:electron",
"build:electron": "tsc -p . --outdir app/server && gulp copy-extension-stubs",
"build:electron": "babel ./src --out-dir app/server --extensions \".ts,.tsx\" --ignore \"*.spec.ts\" --delete-dir-on-start --source-maps inline && gulp copy-extension-stubs",
"lint": "tslint --project tsconfig.json",
"start": "concurrently --kill-others --names \"electron,react-app\" --success first \"npm run start:electron:dev\" \"npm run start:react-app\"",
"start:electron": "./node_modules/.bin/electron --inspect=7777 .",
@@ -49,18 +49,23 @@
},
"license": "MIT",
"devDependencies": {
"@babel/cli": "^7.1.0",
"@babel/core": "^7.1.0",
"@babel/plugin-proposal-class-properties": "^7.1.0",
"@babel/plugin-proposal-object-rest-spread": "^7.0.0",
"@babel/plugin-transform-react-jsx": "^7.0.0",
"@babel/preset-env": "^7.1.0",
"@babel/preset-typescript": "^7.1.0",
"@types/async": "^2.0.47",
"@types/chokidar": "^1.7.5",
"@types/formidable": "^1.0.30",
"@types/fs-extra": "^5.0.4",
"@types/jest": "^22.2.3",
"@types/jsonpath": "^0.2.0",
"@types/jsonwebtoken": "^7.2.8",
"@types/mkdirp": "^0.5.2",
"@types/node": "8.9.3",
"@types/request": "^2.47.0",
"@types/restify": "^5.0.7",
"@types/restify-cors-middleware": "^1.0.1",
"@types/semver": "^5.5.0",
"@types/ws": "^4.0.1",
"asar-integrity": "^0.2.4",
@@ -89,7 +94,7 @@
"through2": "^2.0.3",
"ts-jest": "^22.4.6",
"tslint": "^5.10.0",
"typescript": "2.7.2",
"typescript": "3.0.3",
"vinyl-buffer": "^1.0.1",
"vinyl-source-stream": "^2.0.0"
},
@@ -31,7 +31,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
import * as commandLineArgs from 'command-line-args';
import commandLineArgs from 'command-line-args';
import { CommandLineArgs } from '@bfemulator/app-shared';
import * as globals from './globals';
@@ -41,7 +41,8 @@ import { ContextMenuService } from '../services/contextMenuService';
import { getStore } from '../botData/store';
import { CommandRegistryImpl } from '@bfemulator/sdk-shared';
import { SharedConstants } from '@bfemulator/app-shared';
import shell = Electron.shell;
const { shell } = Electron;
const store = getStore();
@@ -35,8 +35,8 @@ import { Event, ipcMain, WebContents } from 'electron';
import { Disposable, IPC } from '@bfemulator/sdk-shared';
export class ElectronIPC extends IPC {
get id(): number {
return this._webContents.id;
get webContents(): WebContents {
return this._webContents;
}
constructor(private _webContents: WebContents) {
@@ -57,11 +57,11 @@ export class ElectronIPC extends IPC {
}
export const ElectronIPCServer = new class {
private _ipcs: { [id: number]: ElectronIPC } = {};
private _ipcs: WeakMap<WebContents, ElectronIPC> = new WeakMap<WebContents, ElectronIPC>();
private initialized = false;
registerIPC(ipc: ElectronIPC): Disposable {
this._ipcs[ipc.id] = ipc;
this._ipcs.set(ipc.webContents, ipc);
this.initialize();
return {
dispose: () => {
@@ -75,7 +75,7 @@ export const ElectronIPCServer = new class {
return;
}
ipcMain.on('ipc:message', (event: Event, ...args) => {
const ipc = this._ipcs[event.sender.id];
const ipc = this._ipcs.get(event.sender);
if (ipc) {
ipc.onMessage(event, ...args);
}
@@ -32,7 +32,7 @@
//
import { BotEmulator, Conversation } from '@bfemulator/emulator-core';
import * as CORS from 'restify-cors-middleware';
import CORS from 'restify-cors-middleware';
import * as Restify from 'restify';
import fetch from 'node-fetch';
@@ -33,8 +33,8 @@
import { BrowserWindow } from 'electron';
import fetch from 'node-fetch';
import * as uuidv4 from 'uuid/v4';
import * as jwt from 'jsonwebtoken';
import uuidv4 from 'uuid/v4';
import jwt from 'jsonwebtoken';
let getPem = require('rsa-pem-from-mod-exp');
const clientId = '4f28e5eb-6b7f-49e6-ac0e-f992b622da57';
@@ -0,0 +1,16 @@
{
"presets": [
[
"@babel/preset-env",
{
"targets": {
"node": "8"
}
}
],
"@babel/preset-typescript"
],
"plugins": [
"@babel/proposal-class-properties"
]
}
@@ -6,7 +6,8 @@
"main": "built/index.js",
"types": "built/index.d.ts",
"scripts": {
"build": "npm run lint && npm run clean && tsc --pretty",
"build": "npm run lint && npm run clean && npm run build:prod && tsc --emitDeclarationOnly --declaration",
"build:prod": "babel ./src --out-dir built --extensions \".ts,.tsx\"",
"clean": "rimraf ./built && rimraf ../../../node_modules/@types/prop-types",
"lint": "tslint --project tsconfig.json",
"prepare": "npm run clean",
@@ -20,7 +21,7 @@
"rimraf": "^2.6.2",
"ts-jest": "^22.4.6",
"tslint": "^5.10.0",
"typescript": "2.7.2"
"typescript": "3.0.3"
},
"dependencies": {
"@bfemulator/sdk-shared": "^1.0.0",
Oops, something went wrong.

0 comments on commit 5b922cf

Please sign in to comment.