Skip to content

Commit

Permalink
Build
Browse files Browse the repository at this point in the history
  • Loading branch information
@balbatross
balbatross committed Aug 25, 2023
1 parent ffcc278 commit bff94f5
Show file tree
Hide file tree
Showing 9 changed files with 38 additions and 38 deletions.
2 changes: 1 addition & 1 deletion packages/app/hivecommand-api/tsconfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */

/* Language and Environment */
"target": "ES2016",
"target": "es5",
// "lib": [], /* Specify a set of bundled library declaration files that describe the target runtime environment. */
// "jsx": "preserve", /* Specify what JSX code is generated. */
// "experimentalDecorators": true, /* Enable experimental support for TC39 stage 2 draft decorators. */
Expand Down
1 change: 0 additions & 1 deletion packages/app/hivecommand-frontend/src/components/template-input/extensions.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import { Prec } from "@codemirror/state";
import { basicSetup } from 'codemirror'
import { bracketMatching, syntaxTree } from '@codemirror/language'


const compartments: Compartment[] = [];

export const useExtensions = (props: any) => {
Expand Down
1 change: 1 addition & 0 deletions packages/app/hivecommand-frontend/src/views/Editor/pages/types/views/properties.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { useCreateTypeField, useDeleteTypeField, useUpdateTypeField } from '../a
import { useCommandEditor } from '../../../context';
import { DataTypes } from '@hive-command/scripting';


export const Properties = (props: {
types: any[],
active: any
Expand Down
5 changes: 3 additions & 2 deletions packages/app/hivecommand-frontend/tsconfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"extends": "../../../tsconfig.json",
"compilerOptions": {
"jsx": "react-jsx",
// "target": "es5",
"esModuleInterop": true,
"lib": ["ES2021", "DOM"],
"outDir": "dist/",
Expand All @@ -13,9 +14,9 @@
"exclude": ["src/**/*.test*"],
"references": [
{"path": "../hivecommand-api"},
{"path": "../../core/command-scripting"},
{"path": "../../core-ui/command-electrical-editor"},
{"path": "../../core-ui/command-remote-components"},
{"path": "../../core-ui/command-surface"},
{"path": "../../core/command-scripting"}
{"path": "../../core-ui/command-surface"}
]
}
19 changes: 10 additions & 9 deletions packages/app/hivecommand-frontend/webpack.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ module.exports = (webpackConfigEnv, argv) => {
},

resolve: {
alias: {
typescript: path.resolve(__dirname, 'node_modules/typescript'),
// },
// alias: {
// typescript: path.resolve(__dirname, 'node_modules/typescript'),
// // },
// // alias: {
// 'react-resize-aware': path.resolve(__dirname, '../../../node_modules/react-resize-aware'),
'react-resize-aware': path.resolve(__dirname, '../../../node_modules/react-resize-aware'),
// // '@mui/material': path.resolve(__dirname, 'node_modules/@mui/material'),
// // "@mui/x-date-pickers": path.resolve(__dirname, 'node_modules/@mui/x-date-pickers'),
// // '@mui/icons-material': path.resolve(__dirname, 'node_modules/@mui/icons-material'),
Expand All @@ -54,7 +54,7 @@ module.exports = (webpackConfigEnv, argv) => {
// 'styled-components': path.resolve(__dirname, '../../../node_modules/styled-components'),
// 'react-router-dom': path.resolve(__dirname, '../../../node_modules/react-router-dom'),
// '@emotion/react': path.resolve(__dirname, '../../../node_modules/@emotion/react')
// },
},
plugins: [
new TsconfigPathsPlugin(),
],
Expand All @@ -77,14 +77,15 @@ module.exports = (webpackConfigEnv, argv) => {
fullySpecified: false,
},
},
{
test: /\.ttf$/,
use: ['file-loader']
},
{
test: /\.tsx?$/,
exclude: /src/,
loader: 'ts-loader',
options: { projectReferences: true },
},
{
test: /\.ttf$/,
use: ['file-loader']
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion packages/core-ui/command-canvas-nodes/tsconfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */

/* Language and Environment */
"target": "es2016", /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
"target": "es5", /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
// "lib": [], /* Specify a set of bundled library declaration files that describe the target runtime environment. */
"jsx": "react", /* Specify what JSX code is generated. */
// "experimentalDecorators": true, /* Enable experimental support for TC39 stage 2 draft decorators. */
Expand Down
2 changes: 0 additions & 2 deletions packages/core-ui/command-electrical-editor/src/canvas/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ import { SymbolTool } from "../tools/symbol";
import { WireTool, BoxOutlineTool, BoxTool, TextTool } from "../tools";
import { CanvasProvider } from "./context";

const cursorImport = require('./cursor.svg');

export const rendererPointToPoint = ({ x, y }: XYPosition, [tx, ty, tScale]: Transform): XYPosition => {
return {
x: x * tScale + tx,
Expand Down
6 changes: 3 additions & 3 deletions packages/core/command-scripting/tsconfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */

/* Language and Environment */
"target": "es2016", /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
"target": "ES2015", /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
// "lib": [], /* Specify a set of bundled library declaration files that describe the target runtime environment. */
// "jsx": "preserve", /* Specify what JSX code is generated. */
// "experimentalDecorators": true, /* Enable experimental support for TC39 stage 2 draft decorators. */
Expand All @@ -26,9 +26,9 @@
// "moduleDetection": "auto", /* Control what method is used to detect module-format JS files. */

/* Modules */
"module": "commonjs", /* Specify what module code is generated. */
// "module": "commonjs", /* Specify what module code is generated. */
"rootDir": "./src", /* Specify the root folder within your source files. */
// "moduleResolution": "node", /* Specify how TypeScript looks up a file from a given module specifier. */
"moduleResolution": "node", /* Specify how TypeScript looks up a file from a given module specifier. */
// "baseUrl": "./", /* Specify the base directory to resolve non-relative module names. */
// "paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */
// "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */
Expand Down
38 changes: 19 additions & 19 deletions tsconfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,40 +19,40 @@
"@hive-command/threads": ["../node_modules/@hive-command/threads"],
// "node-opcua": ["../node_modules/node-opcua"],

"@hive-command/remote-components": ["./core-ui/command-remote-components/src"],
"@hive-command/remote-components": ["./core-ui/command-remote-components"],

"@hexhive/ui": ["../node_modules/@hexhive/ui"],
"@hexhive/utils": ["../node_modules/@hexhive/utils"],
"@hive-command/api": ["./app/hivecommand-api/src"],
"@hive-command/api": ["./app/hivecommand-api"],

// "@hive-command/export-page": ["./core-ui/command-export-page/src"],


"@hive-command/rabbitmq-auth": ["./communication/rabbitmq-auth/src"],
"@hive-command/amqp-hub": ["./communication/amqp-hub/src"],
"@hive-command/opcua-amqp-bridge": ["./communication/opc-amqp-bridge/src"],
"@hive-command/amqp-client": ["./communication/amqp-client/src"],
"@hive-command/rabbitmq-auth": ["./communication/rabbitmq-auth"],
"@hive-command/amqp-hub": ["./communication/amqp-hub"],
"@hive-command/opcua-amqp-bridge": ["./communication/opc-amqp-bridge"],
"@hive-command/amqp-client": ["./communication/amqp-client"],

"@hive-command/command-surface": ["./core-ui/command-surface/src"],
"@hive-command/electrical-editor": ["./core-ui/command-electrical-editor/src"],
"@hive-command/schematic-viewer": ["./core-ui/command-schematic-viewer/src"],
"@hive-command/export-page": ["./core-ui/command-export-page/src"],
"@hive-command/command-surface": ["./core-ui/command-surface"],
"@hive-command/electrical-editor": ["./core-ui/command-electrical-editor"],
"@hive-command/schematic-viewer": ["./core-ui/command-schematic-viewer"],
"@hive-command/export-page": ["./core-ui/command-export-page"],

"@hive-command/canvas-nodes": ["./core-ui/command-canvas-nodes/src"],
"@hive-command/canvas-nodes": ["./core-ui/command-canvas-nodes"],

"@hive-command/data": ["./core/command-data/src"],
"@hive-command/data": ["./core/command-data"],

"@hive-command/evented-values": ["./core/evented-values/src"],
"@hive-command/drivers-base": ["./drivers/command-driver/src"],
"@hive-command/evented-values": ["./core/evented-values"],
"@hive-command/drivers-base": ["./drivers/command-driver"],

"@hive-command/scripting": ["./core/command-scripting/src"],

"@hive-command/subscription-lock": ["./core/command-subscription-lock/src"],
"@hive-command/sms": ["./communication/sms-utils/src"],
"@hive-command/subscription-lock": ["./core/command-subscription-lock"],
"@hive-command/sms": ["./communication/sms-utils"],

"@hive-command/opcua-server": ["./communication/opc-server/src"],
"@hive-command/opcua-client": ["./communication/opc-client/src"],
"@hive-command/opcua-utils": ["./communication/opc-utils/src"]
"@hive-command/opcua-server": ["./communication/opc-server"],
"@hive-command/opcua-client": ["./communication/opc-client"],
"@hive-command/opcua-utils": ["./communication/opc-utils"]

}
}
Expand Down

0 comments on commit bff94f5

Please sign in to comment.