Merge pull request #187 from terrestris/fix-paths-and-add-dist

Build fix
terrestris · Oct 11, 2022 · f4d1774 · f4d1774
2 parents 2ffe27a + ca8d945
commit f4d1774
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 14 deletions.
diff --git a/package.json b/package.json
@@ -4,7 +4,12 @@
   "description": "A set of helper classes for working with d3 charts.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
+  "files": [
+    "src",
+    "dist"
+  ],
   "scripts": {
+    "prerelease": "npm run build:dist && npm run compile",
     "release": "np --no-yarn && git push https://github.com/terrestris/d3-util.git master --tags",
     "lint": "eslint --ext js src/",
     "test": "jest --maxWorkers=4 --coverage",
@@ -13,7 +18,8 @@
     "clean:dist": "rimraf ./dist/*",
     "build:dist": "npm run clean:dist && webpack --config browser-build.config.js",
     "build:dev": "npm run clean:dist && webpack --mode=development",
-    "start:dev": "webpack --config dev-build.config.js --watch --mode=development"
+    "start:dev": "webpack --config dev-build.config.js --watch --mode=development",
+    "compile": "tsc --project tsconfig.json"
   },
   "repository": {
     "type": "git",

diff --git a/src/AxesUtil/AxesUtil.ts b/src/AxesUtil/AxesUtil.ts
@@ -14,8 +14,8 @@ import { ScaleLinear, ScaleLogarithmic } from 'd3-scale';
 import { FormatLocaleDefinition, formatLocale } from 'd3-format';
 import { select } from 'd3-selection';
 import * as moment from 'moment';
-import { Scale } from 'src/ScaleUtil/ScaleUtil';
-import { NodeSelection } from 'src/BaseUtil/BaseUtil';
+import { Scale } from '../ScaleUtil/ScaleUtil';
+import { NodeSelection } from '../BaseUtil/BaseUtil';
 import deDE from '../locales/de-DE';
 import enUS from '../locales/en-US';
 

diff --git a/src/ChartRenderer/ChartRenderer.ts b/src/ChartRenderer/ChartRenderer.ts
@@ -1,5 +1,5 @@
 import { select } from 'd3-selection';
-import { NodeSelection } from 'src/BaseUtil/BaseUtil';
+import { NodeSelection } from '../BaseUtil/BaseUtil';
 
 export type ZoomType = 'transform' | 'rerender' | 'none';
 

diff --git a/src/LabelUtil/LabelUtil.ts b/src/LabelUtil/LabelUtil.ts
@@ -1,5 +1,5 @@
 import { select } from 'd3-selection';
-import { NodeSelection } from 'src/BaseUtil/BaseUtil';
+import { NodeSelection } from '../BaseUtil/BaseUtil';
 
 /**
  * Utilities to word wrap labels automatically.

diff --git a/src/LegendComponent/LegendComponent.ts b/src/LegendComponent/LegendComponent.ts
@@ -1,7 +1,7 @@
 import LabelUtil from '../LabelUtil/LabelUtil';
 import { event } from 'd3-selection';
-import { ChartComponent } from 'src/ChartRenderer/ChartRenderer';
-import { NodeSelection } from 'src/BaseUtil/BaseUtil';
+import { ChartComponent } from '../ChartRenderer/ChartRenderer';
+import { NodeSelection } from '../BaseUtil/BaseUtil';
 
 const SVG_DEFS = {
   LEGEND_ICON_BACKGROUND: 'M-3 -14 h 25 v 16 h -25 Z',

diff --git a/src/ScaleUtil/ScaleUtil.ts b/src/ScaleUtil/ScaleUtil.ts
@@ -9,9 +9,9 @@ import {
   ScaleLogarithmic,
   ScaleTime
 } from 'd3-scale';
-import { AxisConfiguration } from 'src/AxesUtil/AxesUtil';
-import { TimeseriesConfiguration } from 'src/TimeseriesComponent/TimeseriesComponent';
-import { BarConfiguration } from 'src/BarComponent/BarComponent';
+import { AxisConfiguration } from '../AxesUtil/AxesUtil';
+import { TimeseriesConfiguration } from '../TimeseriesComponent/TimeseriesComponent';
+import { BarConfiguration } from '../BarComponent/BarComponent';
 
 export type Scale = ScaleLinear<number, number>
   | ScaleBand<string>

diff --git a/src/TimeseriesComponent/TimeseriesComponent.ts b/src/TimeseriesComponent/TimeseriesComponent.ts
@@ -23,7 +23,7 @@ import {
   line as d3line,
   area as d3area
 } from 'd3-shape';
-import { ChartComponent, ZoomType } from 'src/ChartRenderer/ChartRenderer';
+import { ChartComponent, ZoomType } from '../ChartRenderer/ChartRenderer';
 
 export type TimeseriesDatum = [number, number, Function | undefined, any | undefined];
 

diff --git a/tsconfig.json b/tsconfig.json
@@ -1,7 +1,6 @@
 {
   "compilerOptions": {
     "allowSyntheticDefaultImports": true,
-    "baseUrl": "./",
     "checkJs": false,
     "declaration": true,
     "outDir": "dist",
@@ -12,7 +11,6 @@
     "allowJs": false,
     "jsx": "react",
     "moduleResolution": "node",
-    "rootDir": "./",
     "forceConsistentCasingInFileNames": true,
     "noImplicitReturns": true,
     "noImplicitThis": true,
@@ -23,7 +21,7 @@
     "resolveJsonModule": true
   },
   "include": [
-    "src/**/*.ts",
+    "./src/**/*.ts",
     "oltypes.d.ts"
   ],
   "exclude": [