diff --git a/.gitignore b/.gitignore index 43cd1cc31..9e3a02434 100644 --- a/.gitignore +++ b/.gitignore @@ -14,7 +14,7 @@ venv __pycache__ *.pyc -packages/dm-core/build.css -packages/dm-core-plugins/build.css +packages/dm-core/src/build.css +packages/dm-core-plugins/src/build.css *.tsbuildinfo \ No newline at end of file diff --git a/example/tsconfig.json b/example/tsconfig.json index 65b43419d..d9a0c4ae1 100644 --- a/example/tsconfig.json +++ b/example/tsconfig.json @@ -40,6 +40,7 @@ "src" ], "exclude": [ - "node_modules" + "node_modules", + "tsconfig.tsbuildinfo" ] } diff --git a/packages/dm-core-plugins/package.json b/packages/dm-core-plugins/package.json index 4decf80ac..19f080c5d 100644 --- a/packages/dm-core-plugins/package.json +++ b/packages/dm-core-plugins/package.json @@ -48,15 +48,12 @@ "react-dom": "^18.2.0", "styled-components": ">=5.1.0" }, - "files": [ - "blueprints", - "dist" - ], + "files": ["blueprints", "dist"], "types": "dist/index.d.ts", "scripts": { "prebuild": "shx rm -rf dist", - "build": "tsc && npx tailwindcss -o build.css --minify && yarn copy-css-file", - "copy-css-file": "cp ./build.css ./dist/", + "build": "tsc && npx tailwindcss -o ./src/build.css --minify && yarn copy-css-file", + "copy-css-file": "cp ./src/build.css ./dist/", "test": "jest test", "test-watch": "jest test --watchAll" } diff --git a/packages/dm-core-plugins/src/index.tsx b/packages/dm-core-plugins/src/index.tsx index ebf104d5f..b760e1418 100644 --- a/packages/dm-core-plugins/src/index.tsx +++ b/packages/dm-core-plugins/src/index.tsx @@ -1,6 +1,6 @@ import { TUiPluginMap } from '@development-framework/dm-core' import { lazy } from 'react' -import '../build.css' +import './build.css' export { WidgetProvider } from './form/context/WidgetContext' diff --git a/packages/dm-core/package.json b/packages/dm-core/package.json index d236d27a0..9e00b1cd4 100755 --- a/packages/dm-core/package.json +++ b/packages/dm-core/package.json @@ -44,17 +44,13 @@ "ts-loader": "^9.3.1", "typescript": "^5.1.6" }, - "files": [ - "dist", - "src", - "tsconfig.json" - ], + "files": ["dist", "src", "tsconfig.json"], "main": "dist/index.js", "types": "dist/index.d.ts", "scripts": { "prebuild": "shx rm -rf dist", - "build": "tsc && npx tailwindcss -o build.css && yarn copy-css-file", - "copy-css-file": "cp ./build.css ./dist/ && cp ./src/styles/main.css ./dist/", + "build": "tsc && npx tailwindcss -o ./src/build.css --minify && yarn copy-css-file", + "copy-css-file": "cp ./src/build.css ./dist/ && cp ./src/styles/main.css ./dist/", "test": "jest test" } } diff --git a/packages/dm-core/src/index.tsx b/packages/dm-core/src/index.tsx index 477c09cd7..d6886bdde 100644 --- a/packages/dm-core/src/index.tsx +++ b/packages/dm-core/src/index.tsx @@ -1,4 +1,4 @@ -import '../build.css' +import './build.css' export * from './hooks' diff --git a/packages/dm-core/tsconfig.json b/packages/dm-core/tsconfig.json index db97a9faa..6a9604c2a 100644 --- a/packages/dm-core/tsconfig.json +++ b/packages/dm-core/tsconfig.json @@ -7,7 +7,7 @@ "dom.iterable", "esnext" ], - "incremental": true, + "allowSyntheticDefaultImports": true, "forceConsistentCasingInFileNames": true, "resolveJsonModule": true, @@ -35,6 +35,7 @@ "exclude": [ "node_modules", "src/**/*.spec.ts", - "dist" + "dist", + "tsconfig.tsbuildinfo" ] }