From 8d2219a8201ee6879abe1743f62376ad9cea1d79 Mon Sep 17 00:00:00 2001 From: Michael Sharpe Date: Wed, 6 Oct 2021 11:44:13 -0700 Subject: [PATCH 1/6] Remove console log --- client/webpack.common.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/client/webpack.common.js b/client/webpack.common.js index f549e6e79..f90eebef0 100644 --- a/client/webpack.common.js +++ b/client/webpack.common.js @@ -7,8 +7,6 @@ const webpack = require('webpack') const prod = process.env.NODE_ENV === 'production' -console.log('WEBPACK ENV', process.env.NODE_ENV) - const babelOptions = { presets: [ '@babel/env', From f99349d346c38a7f7e468fa75fcc64d569e84a92 Mon Sep 17 00:00:00 2001 From: Michael Sharpe Date: Wed, 6 Oct 2021 11:44:47 -0700 Subject: [PATCH 2/6] Add server.ts root entry --- core/server.ts | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 core/server.ts diff --git a/core/server.ts b/core/server.ts new file mode 100644 index 000000000..0f9108f08 --- /dev/null +++ b/core/server.ts @@ -0,0 +1,16 @@ +import { getComponents, components } from './src/components/components' +import { initSharedEngine } from './src/engine' +import { Task } from './src/plugins/taskPlugin/task' +import { ThothComponent } from './src/thoth-component' + +export { getComponents } from './src/components/components' +export type { EngineContext } from './src/engine' +export { Task } from './src/plugins/taskPlugin/task' + +export default { + components, + getComponents, + initSharedEngine, + Task, + ThothComponent, +} From 135be5be8acf21a0de643db818fd30e581fc10c9 Mon Sep 17 00:00:00 2001 From: Michael Sharpe Date: Wed, 6 Oct 2021 11:45:02 -0700 Subject: [PATCH 3/6] Add multiple build entry points --- core/webpack.common.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/core/webpack.common.js b/core/webpack.common.js index cecfcf61e..48556dfd7 100644 --- a/core/webpack.common.js +++ b/core/webpack.common.js @@ -5,10 +5,13 @@ const TerserPlugin = require('terser-webpack-plugin') module.exports = () => { const config = { - entry: './index.ts', + entry: { + index: './index.ts', + server: './server.ts', + }, output: { path: path.join(__dirname, 'dist'), - filename: 'index.js', + filename: '[name].js', library: { name: 'thothCore', type: 'umd', From dfcdbcf987a9ba4abba607d7d595b2f72f6b2ed3 Mon Sep 17 00:00:00 2001 From: Michael Sharpe Date: Wed, 6 Oct 2021 11:46:11 -0700 Subject: [PATCH 4/6] Bump thoth core to 0.0.45 --- client/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/package.json b/client/package.json index 17ae97863..720ad33e3 100644 --- a/client/package.json +++ b/client/package.json @@ -13,7 +13,7 @@ "install:canary": "yarn add @latitudegames/thoth-core@canary" }, "dependencies": { - "@latitudegames/thoth-core": "^0.0.44", + "@latitudegames/thoth-core": "0.0.45", "@material-ui/core": "^4.12.1", "@material-ui/icons": "^4.11.2", "@monaco-editor/react": "^4.2.1", From 3e70ca0c651894c1271b2d54409f91f877f4c088 Mon Sep 17 00:00:00 2001 From: Michael Sharpe Date: Wed, 6 Oct 2021 11:46:26 -0700 Subject: [PATCH 5/6] Update yarn lock --- yarn.lock | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/yarn.lock b/yarn.lock index 1172f9da9..b8b48a347 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1476,6 +1476,23 @@ "@types/yargs" "^16.0.0" chalk "^4.0.0" +"@latitudegames/thoth-core@0.0.45": + version "0.0.45" + resolved "https://npm.pkg.github.com/download/@latitudegames/thoth-core/0.0.45/0a06c87eec4125da9e855acd79827e7ab52841c84c63de25cb15f9c239cfc07c#f649536ca6d9a168b41b35c97dfd15d1d63439af" + integrity sha512-vHAxDK8BbltdozrMsZLYz9tDSkU/X4rCvbZg71L3V3LtffIOdz3DrEz/VbxVKVra14pKE+Lp0A2diOVEV+V3Ew== + dependencies: + deep-equal "^2.0.5" + handlebars "^4.7.7" + path "^0.12.7" + react "^17.0.2" + rete "https://github.com/latitudegames/rete.git#master" + rete-area-plugin "^0.2.1" + rete-connection-plugin "^0.9.0" + rete-context-menu-plugin "^0.6.0-rc.1" + rete-module-plugin "^0.4.1" + rete-react-render-plugin "^0.2.1" + uuid "^8.3.2" + "@lerna/add@4.0.0": version "4.0.0" resolved "https://registry.yarnpkg.com/@lerna/add/-/add-4.0.0.tgz#c36f57d132502a57b9e7058d1548b7a565ef183f" From 80c5830087db8a3c2a3f5c64d21b4833203590c4 Mon Sep 17 00:00:00 2001 From: Sean Gillespie Date: Wed, 6 Oct 2021 14:52:29 -0400 Subject: [PATCH 6/6] Update yarn.lock --- yarn.lock | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/yarn.lock b/yarn.lock index a5ef84a16..e96fd4fc2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1476,11 +1476,7 @@ "@types/yargs" "^16.0.0" chalk "^4.0.0" -<<<<<<< HEAD -"@latitudegames/thoth-core@0.0.45": -======= "@latitudegames/thoth-core@^0.0.45": ->>>>>>> main version "0.0.45" resolved "https://npm.pkg.github.com/download/@latitudegames/thoth-core/0.0.45/0a06c87eec4125da9e855acd79827e7ab52841c84c63de25cb15f9c239cfc07c#f649536ca6d9a168b41b35c97dfd15d1d63439af" integrity sha512-vHAxDK8BbltdozrMsZLYz9tDSkU/X4rCvbZg71L3V3LtffIOdz3DrEz/VbxVKVra14pKE+Lp0A2diOVEV+V3Ew== @@ -12239,14 +12235,6 @@ rete-react-render-plugin@^0.2.1: resolved "https://registry.yarnpkg.com/rete-react-render-plugin/-/rete-react-render-plugin-0.2.1.tgz#71a6d73f18f850b85262563f678b40080a7b0e32" integrity sha512-2ZMXUP0v+EiejHVMqdrOmUwyDBHC2UDOJ/pFkElaZL1Kn/E40JZA5yzdBXi6ajYZI2DCzoW5ZBcA2Ihjtur8MQ== -"rete@git+https://github.com/latitudegames/rete.git#master": - version "1.4.5" - uid "24565a81a2bbcdd4cd73b0a725977550cc8ff988" - resolved "git+https://github.com/latitudegames/rete.git#24565a81a2bbcdd4cd73b0a725977550cc8ff988" - dependencies: - lodash "^4.17.21" - watch "^1.0.2" - "rete@https://github.com/latitudegames/rete.git#master": version "1.4.5" resolved "https://github.com/latitudegames/rete.git#24565a81a2bbcdd4cd73b0a725977550cc8ff988"