From 1345d5ca5c3747ae4b388b5cd3281d04c1a6631b Mon Sep 17 00:00:00 2001 From: Luke Butler Date: Fri, 17 Jan 2020 13:20:32 -0500 Subject: [PATCH 1/3] update enum ref --- packages/epanet-js/src/Project/functions/DataCurve.ts | 2 +- packages/epanet-js/src/Project/functions/NetworkLink.ts | 2 +- packages/epanet-js/src/Project/functions/NetworkNode.ts | 2 +- packages/epanet-js/src/Project/functions/NodalDemand.ts | 2 +- .../epanet-js/src/Project/functions/RuleBasedControl.ts | 7 ++++++- packages/epanet-js/src/Project/functions/SimpleControl.ts | 2 +- 6 files changed, 11 insertions(+), 6 deletions(-) diff --git a/packages/epanet-js/src/Project/functions/DataCurve.ts b/packages/epanet-js/src/Project/functions/DataCurve.ts index 32ddd6e..3073310 100644 --- a/packages/epanet-js/src/Project/functions/DataCurve.ts +++ b/packages/epanet-js/src/Project/functions/DataCurve.ts @@ -1,5 +1,5 @@ import Project from '../Project'; -import { CurveType } from 'enum'; +import { CurveType } from '../../index'; class DataCurveFunctions { addCurve(this: Project, id: string) { diff --git a/packages/epanet-js/src/Project/functions/NetworkLink.ts b/packages/epanet-js/src/Project/functions/NetworkLink.ts index fa46696..bca8506 100644 --- a/packages/epanet-js/src/Project/functions/NetworkLink.ts +++ b/packages/epanet-js/src/Project/functions/NetworkLink.ts @@ -1,5 +1,5 @@ import Project from '../Project'; -import { LinkType, ActionCodeType, LinkProperty, PumpType } from 'enum'; +import { LinkType, ActionCodeType, LinkProperty, PumpType } from '../../index'; class NetworkLinkFunctions { addLink( diff --git a/packages/epanet-js/src/Project/functions/NetworkNode.ts b/packages/epanet-js/src/Project/functions/NetworkNode.ts index e4d677d..e4654f1 100644 --- a/packages/epanet-js/src/Project/functions/NetworkNode.ts +++ b/packages/epanet-js/src/Project/functions/NetworkNode.ts @@ -1,5 +1,5 @@ import Project from '../Project'; -import { NodeType, NodeProperty, ActionCodeType } from 'enum'; +import { NodeType, NodeProperty, ActionCodeType } from '../../index'; class NetworkNodeFunctions { addNode(this: Project, id: string, nodeType: NodeType) { diff --git a/packages/epanet-js/src/Project/functions/NodalDemand.ts b/packages/epanet-js/src/Project/functions/NodalDemand.ts index 6821266..cf07f03 100644 --- a/packages/epanet-js/src/Project/functions/NodalDemand.ts +++ b/packages/epanet-js/src/Project/functions/NodalDemand.ts @@ -1,5 +1,5 @@ import Project from '../Project'; -import { DemandModel } from 'enum'; +import { DemandModel } from '../../index'; class NodalDemandFunctions { addDemand( diff --git a/packages/epanet-js/src/Project/functions/RuleBasedControl.ts b/packages/epanet-js/src/Project/functions/RuleBasedControl.ts index 9e49137..b9f53bf 100644 --- a/packages/epanet-js/src/Project/functions/RuleBasedControl.ts +++ b/packages/epanet-js/src/Project/functions/RuleBasedControl.ts @@ -1,5 +1,10 @@ import Project from '../Project'; -import { RuleStatus, RuleObject, RuleVariable, RuleOperator } from 'enum'; +import { + RuleStatus, + RuleObject, + RuleVariable, + RuleOperator, +} from '../../index'; class RuleBasedControlFunctions { addRule(this: Project, rule: string) { diff --git a/packages/epanet-js/src/Project/functions/SimpleControl.ts b/packages/epanet-js/src/Project/functions/SimpleControl.ts index 039ddb4..15383db 100644 --- a/packages/epanet-js/src/Project/functions/SimpleControl.ts +++ b/packages/epanet-js/src/Project/functions/SimpleControl.ts @@ -1,5 +1,5 @@ import Project from '../Project'; -import { ControlType } from 'enum'; +import { ControlType } from '../../index'; class SimpleControlFunctions { addControl( From 1862b2d14382249ae3a6fff843255b77f2ecf545 Mon Sep 17 00:00:00 2001 From: Luke Butler Date: Fri, 17 Jan 2020 13:21:16 -0500 Subject: [PATCH 2/3] bumping versions --- packages/epanet-engine/package.json | 2 +- packages/epanet-js/package.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/epanet-engine/package.json b/packages/epanet-engine/package.json index 550d676..331a66e 100644 --- a/packages/epanet-engine/package.json +++ b/packages/epanet-engine/package.json @@ -1,6 +1,6 @@ { "name": "@model-create/epanet-engine", - "version": "0.1.0", + "version": "0.2.0", "description": "", "main": "dist/index.js", "module": "dist/index.es6.js", diff --git a/packages/epanet-js/package.json b/packages/epanet-js/package.json index d77b236..bf59246 100644 --- a/packages/epanet-js/package.json +++ b/packages/epanet-js/package.json @@ -1,5 +1,5 @@ { - "version": "0.1.0", + "version": "0.2.0", "license": "MIT", "main": "dist/index.js", "typings": "dist/index.d.ts", @@ -20,7 +20,7 @@ "doc": "tsdx build && yarn api-extractor run --local --verbose && mv ./temp/epanet-js.api.json ./input/ && yarn api-documenter markdown" }, "dependencies": { - "@model-create/epanet-engine": "0.1.0" + "@model-create/epanet-engine": "0.2.0" }, "peerDependencies": {}, "husky": { From 0a740faf614c60cff2188e02e31241668d903f75 Mon Sep 17 00:00:00 2001 From: Luke Butler Date: Fri, 17 Jan 2020 13:39:29 -0500 Subject: [PATCH 3/3] include spreadarrays in build --- packages/epanet-js/tsdx.config.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/epanet-js/tsdx.config.js b/packages/epanet-js/tsdx.config.js index d0f6de9..aed03f3 100644 --- a/packages/epanet-js/tsdx.config.js +++ b/packages/epanet-js/tsdx.config.js @@ -5,6 +5,7 @@ module.exports = { rollup(config, options) { if(options.format !== 'umd') { + config.external = ['@model-create/epanet-engine'] return config }