NO-ISSUE: Monorepo cleanup & improvements (apache#2224)

kubesmarts · Apr 4, 2024 · a8a8320 · a8a8320
1 parent 781013e
commit a8a8320
Show file tree

Hide file tree

Showing 50 changed files with 1,532 additions and 1,044 deletions.
diff --git a/.build-env-root b/.build-env-root
@@ -0,0 +1 @@
+This file is a marker file. Its content doesn't mean anything. It's purpose is to prevent `build-env` from recursing out of `kie-tools` onto people's machines.
diff --git a/.github/workflows/ci_build.yml b/.github/workflows/ci_build.yml
@@ -16,7 +16,6 @@ env:
 
 jobs:
   run:
-    environment: ci
     if: github.event.pull_request.draft == false
     strategy:
       fail-fast: false

diff --git a/.npmrc b/.npmrc
@@ -0,0 +1 @@
+dedupe-peer-dependents=false # Without this, pnpm will always install all packages when `pnpm booststrap:root` runs. See https://github.com/pnpm/pnpm/issues/6300.
diff --git a/package.json b/package.json
@@ -22,7 +22,6 @@
     "@nice-move/prettier-plugin-package-json": "^0.6.1",
     "@prettier/plugin-xml": "^2",
     "@types/node": "^18.13.0",
-    "filemanager-webpack-plugin": "^7.0.0",
     "husky": "^6.0.0",
     "postinstall-postinstall": "^2.1.0",
     "prettier": "^2.8.8",
@@ -46,6 +45,7 @@
     },
     "patchedDependencies": {
       "[email protected]": "patches/[email protected]",
+      "[email protected]": "patches/[email protected]",
       "[email protected]": "patches/[email protected]",
       "[email protected]": "patches/[email protected]",
       "[email protected]": "patches/[email protected]"

diff --git a/packages/.gitignore b/packages/.gitignore
diff --git a/packages/boxed-expression-component/.storybook/main.ts b/packages/boxed-expression-component/.storybook/main.ts
@@ -17,10 +17,15 @@
  * under the License.
  */
 
-import { config as baseConfig } from "@kie-tools/storybook-base/main";
+import { baseConfig } from "@kie-tools/storybook-base/dist/config/baseConfig";
+
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore
+import { env } from "../env";
+const buildEnv: any = env; // build-env is not typed
 
 const config = {
-  ...baseConfig,
+  ...baseConfig(buildEnv.webpack.dev),
   staticDirs: ["../stories/__assets__"],
 };
 

diff --git a/packages/boxed-expression-component/.storybook/manager.ts b/packages/boxed-expression-component/.storybook/manager.ts
@@ -18,7 +18,7 @@
  */
 
 import { addons } from "@storybook/manager-api";
-import { KieToolsTheme } from "@kie-tools/storybook-base/KieToolsTheme";
+import { KieToolsTheme } from "@kie-tools/storybook-base/dist/config/theme";
 
 addons.setConfig({
   theme: KieToolsTheme,

diff --git a/packages/boxed-expression-component/env/index.js b/packages/boxed-expression-component/env/index.js
@@ -19,7 +19,7 @@
 
 const { varsWithName, composeEnv } = require("@kie-tools-scripts/build-env");
 
-module.exports = composeEnv([require("@kie-tools/root-env/env")], {
+module.exports = composeEnv([require("@kie-tools/root-env/env"), require("@kie-tools-core/webpack-base/env")], {
   vars: varsWithName({}),
   get env() {
     return {

diff --git a/packages/chrome-extension-test-helper/tsconfig.json b/packages/chrome-extension-test-helper/tsconfig.json
@@ -3,6 +3,5 @@
   "compilerOptions": {
     "outDir": "dist"
   },
-  "include": ["src"],
-  "exclude": ["node_modules"]
+  "include": ["src"]
 }
diff --git a/packages/dashbuilder/package.json b/packages/dashbuilder/package.json
@@ -36,10 +36,8 @@
     "lint": "echo 'Linting'",
     "powershell": "@powershell -NoProfile -ExecutionPolicy Unrestricted -Command"
   },
-  "dependencies": {
-    "@kie-tools/dashbuilder-component-assembler": "workspace:*"
-  },
   "devDependencies": {
+    "@kie-tools/dashbuilder-component-assembler": "workspace:*",
     "@kie-tools/maven-config-setup-helper": "workspace:*",
     "@kie-tools/root-env": "workspace:*",
     "copyfiles": "^2.4.1",

diff --git a/packages/dev-deployment-base-image/package.json b/packages/dev-deployment-base-image/package.json
@@ -31,10 +31,8 @@
     "install:mvnw:win32": "pnpm powershell \"mvn wrapper:wrapper\"",
     "powershell": "@powershell -NoProfile -ExecutionPolicy Unrestricted -Command"
   },
-  "dependencies": {
-    "@kie-tools/dev-deployment-upload-service": "workspace:*"
-  },
   "devDependencies": {
+    "@kie-tools/dev-deployment-upload-service": "workspace:*",
     "@kie-tools/image-builder": "workspace:*",
     "@kie-tools/maven-config-setup-helper": "workspace:*",
     "@kie-tools/root-env": "workspace:*",

diff --git a/packages/dmn-editor/.storybook/main.ts b/packages/dmn-editor/.storybook/main.ts
@@ -17,10 +17,15 @@
  * under the License.
  */
 
-import { config as baseConfig } from "@kie-tools/storybook-base/main";
+import { baseConfig } from "@kie-tools/storybook-base/dist/config/baseConfig";
+
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore
+import { env } from "../env";
+const buildEnv: any = env; // build-env is not typed
 
 const config = {
-  ...baseConfig,
+  ...baseConfig(buildEnv.webpack.dev),
 };
 
 export default config;
diff --git a/packages/dmn-editor/.storybook/manager.ts b/packages/dmn-editor/.storybook/manager.ts
@@ -18,7 +18,7 @@
  */
 
 import { addons } from "@storybook/manager-api";
-import { KieToolsTheme } from "@kie-tools/storybook-base/KieToolsTheme";
+import { KieToolsTheme } from "@kie-tools/storybook-base/dist/config/theme";
 
 addons.setConfig({
   theme: KieToolsTheme,

diff --git a/packages/dmn-editor/env/index.js b/packages/dmn-editor/env/index.js
@@ -19,7 +19,7 @@
 
 const { varsWithName, composeEnv } = require("@kie-tools-scripts/build-env");
 
-module.exports = composeEnv([require("@kie-tools/root-env/env")], {
+module.exports = composeEnv([require("@kie-tools/root-env/env"), require("@kie-tools-core/webpack-base/env")], {
   vars: varsWithName({}),
   get env() {
     return {

diff --git a/packages/envelope-bus/tests/common/index.ts → ...-bus/src-tests/messageBusClientApiMock.ts b/packages/envelope-bus/tests/common/index.ts → ...-bus/src-tests/messageBusClientApiMock.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { ApiDefinition, MessageBusClientApi } from "../../dist/api";
+import { ApiDefinition, MessageBusClientApi } from "@kie-tools-core/envelope-bus/dist/api";
 
 export function messageBusClientApiMock<T extends ApiDefinition<T>>(): MessageBusClientApi<T> {
   const mocks = new Map<any, any>();

diff --git a/packages/envelope-bus/tests/channel/EnvelopeServer.test.ts b/packages/envelope-bus/tests/channel/EnvelopeServer.test.ts
@@ -22,8 +22,8 @@ import {
   EnvelopeBusMessageDirectSender,
   EnvelopeBusMessagePurpose,
   FunctionPropertyNames,
-} from "../../dist/api";
-import { EnvelopeServer } from "../../dist/channel";
+} from "@kie-tools-core/envelope-bus/dist/api";
+import { EnvelopeServer } from "@kie-tools-core/envelope-bus/dist/channel";
 
 interface ApiToProvide {
   setText(text: string): void;

diff --git a/packages/envelope-bus/tests/common/EnvelopeBusMessageManager.test.ts b/packages/envelope-bus/tests/common/EnvelopeBusMessageManager.test.ts
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-import { EnvelopeBusMessageManager } from "../../dist/common";
-import { EnvelopeBusMessagePurpose, SharedValueProvider } from "../../dist/api";
+import { EnvelopeBusMessageManager } from "@kie-tools-core/envelope-bus/dist/common";
+import { EnvelopeBusMessagePurpose, SharedValueProvider } from "@kie-tools-core/envelope-bus/dist/api";
 
 interface ApiToProvide {
   setText(text: string): void;

diff --git a/...lope-bus/tests/envelope/EnvelopeClient.ts → ...bus/tests/envelope/EnvelopeClient.test.ts b/...lope-bus/tests/envelope/EnvelopeClient.ts → ...bus/tests/envelope/EnvelopeClient.test.ts
@@ -17,8 +17,12 @@
  * under the License.
  */
 
-import { EnvelopeClient } from "../../dist/envelope";
-import { EnvelopeBusMessage, EnvelopeBusMessageDirectSender, EnvelopeBusMessagePurpose } from "../../dist/api";
+import { EnvelopeClient } from "@kie-tools-core/envelope-bus/dist/envelope";
+import {
+  EnvelopeBusMessage,
+  EnvelopeBusMessageDirectSender,
+  EnvelopeBusMessagePurpose,
+} from "@kie-tools-core/envelope-bus/dist/api";
 
 interface ApiToConsume {
   setText(text: string): void;

diff --git a/packages/envelope-bus/tsconfig.tests.json b/packages/envelope-bus/tsconfig.tests.json
@@ -1,9 +1,9 @@
 {
   "extends": "@kie-tools/tsconfig/tsconfig.json",
   "compilerOptions": {
-    "rootDir": "./tests",
+    "rootDir": "./src-tests",
     "outDir": "dist-tests"
   },
   "exclude": ["**/*.test.*"],
-  "include": ["tests"]
+  "include": ["src-tests"]
 }
diff --git a/packages/kie-bc-editors/tests/GwtEditorWrapper.test.ts b/packages/kie-bc-editors/tests/GwtEditorWrapper.test.ts
@@ -20,7 +20,7 @@
 import { GwtEditorWrapper } from "@kie-tools/kie-bc-editors/dist/common/GwtEditorWrapper";
 import { GwtStateControlService } from "@kie-tools/kie-bc-editors/dist/common/gwtStateControl";
 import { EditorTheme, KogitoEditorChannelApi } from "@kie-tools-core/editor/dist/api";
-import { messageBusClientApiMock } from "@kie-tools-core/envelope-bus/dist-tests/common";
+import { messageBusClientApiMock } from "@kie-tools-core/envelope-bus/dist-tests/messageBusClientApiMock";
 import { I18n } from "@kie-tools-core/i18n/dist/core";
 import { kieBcEditorsI18nDefaults, kieBcEditorsI18nDictionaries } from "@kie-tools/kie-bc-editors/dist/common/i18n";
 

diff --git a/packages/kie-bc-editors/tests/GwtEditorWrapperFactory.test.ts b/packages/kie-bc-editors/tests/GwtEditorWrapperFactory.test.ts
@@ -20,7 +20,7 @@
 import { GwtEditorWrapperFactory } from "@kie-tools/kie-bc-editors/dist/common/GwtEditorWrapperFactory";
 import { GwtLanguageData, Resource } from "@kie-tools/kie-bc-editors/dist/common/GwtLanguageData";
 import { GwtStateControlService } from "@kie-tools/kie-bc-editors/dist/common/gwtStateControl";
-import { messageBusClientApiMock } from "@kie-tools-core/envelope-bus/dist-tests/common";
+import { messageBusClientApiMock } from "@kie-tools-core/envelope-bus/dist-tests/messageBusClientApiMock";
 import { I18nService } from "@kie-tools-core/i18n/dist/envelope";
 import {
   ChannelType,

diff --git a/packages/kie-bc-editors/tests/gwtStateControl/GwtCommandRegistry.test.ts b/packages/kie-bc-editors/tests/gwtStateControl/GwtCommandRegistry.test.ts
@@ -20,7 +20,7 @@
 import { DefaultStateControlCommandRegistry } from "@kie-tools/kie-bc-editors/dist/common/gwtStateControl";
 import { KogitoEditorChannelApi } from "@kie-tools-core/editor/dist/api";
 import { MessageBusClientApi } from "@kie-tools-core/envelope-bus/dist/api";
-import { messageBusClientApiMock } from "@kie-tools-core/envelope-bus/dist-tests/common";
+import { messageBusClientApiMock } from "@kie-tools-core/envelope-bus/dist-tests/messageBusClientApiMock";
 
 class Command {
   private id: string;

diff --git a/packages/pmml-editor/tests/editor/PMMLEditorFactory.test.ts b/packages/pmml-editor/tests/editor/PMMLEditorFactory.test.ts
@@ -27,7 +27,7 @@ import {
 import { PMMLEditorFactory, PMMLEditorInterface } from "@kie-tools/pmml-editor";
 import { DefaultKeyboardShortcutsService } from "@kie-tools-core/keyboard-shortcuts/dist/envelope";
 import { OperatingSystem } from "@kie-tools-core/operating-system";
-import { messageBusClientApiMock } from "@kie-tools-core/envelope-bus/dist-tests/common";
+import { messageBusClientApiMock } from "@kie-tools-core/envelope-bus/dist-tests/messageBusClientApiMock";
 import { I18nService } from "@kie-tools-core/i18n/dist/envelope";
 
 const channelApi = messageBusClientApiMock<KogitoEditorChannelApi>();

diff --git a/packages/pmml-editor/tests/editor/PMMLEditorInterface.test.ts b/packages/pmml-editor/tests/editor/PMMLEditorInterface.test.ts
@@ -23,7 +23,7 @@ import { ReactElement } from "react";
 import { PMMLEditor, PMMLEditorInterface } from "@kie-tools/pmml-editor";
 import { DefaultKeyboardShortcutsService } from "@kie-tools-core/keyboard-shortcuts/dist/envelope";
 import { OperatingSystem } from "@kie-tools-core/operating-system";
-import { messageBusClientApiMock } from "@kie-tools-core/envelope-bus/dist-tests/common";
+import { messageBusClientApiMock } from "@kie-tools-core/envelope-bus/dist-tests/messageBusClientApiMock";
 import { I18nService } from "@kie-tools-core/i18n/dist/envelope";
 
 const channelApi = messageBusClientApiMock<KogitoEditorChannelApi>();

diff --git a/packages/runtime-tools-management-console-webapp/tsconfig.json b/packages/runtime-tools-management-console-webapp/tsconfig.json
@@ -14,6 +14,5 @@
     "strictNullChecks": false
   },
   "include": ["src"],
-  "exclude": ["node_modules"],
   "preserveSymlinks": true
 }
diff --git a/packages/runtime-tools-process-dev-ui-webapp/tsconfig.json b/packages/runtime-tools-process-dev-ui-webapp/tsconfig.json
@@ -14,6 +14,5 @@
     "strictNullChecks": false
   },
   "include": ["src"],
-  "exclude": ["node_modules"],
   "preserveSymlinks": true
 }
diff --git a/packages/runtime-tools-process-webapp-components/tsconfig.json b/packages/runtime-tools-process-webapp-components/tsconfig.json
@@ -8,6 +8,5 @@
     "target": "es6",
     "moduleResolution": "node"
   },
-  "include": ["src"],
-  "exclude": ["node_modules"]
+  "include": ["src"]
 }
diff --git a/packages/runtime-tools-task-console-webapp/tsconfig.json b/packages/runtime-tools-task-console-webapp/tsconfig.json
@@ -14,6 +14,5 @@
     "strictNullChecks": false
   },
   "include": ["src"],
-  "exclude": ["node_modules"],
   "preserveSymlinks": true
 }
diff --git a/packages/serverless-workflow-standalone-editor/package.json b/packages/serverless-workflow-standalone-editor/package.json
@@ -53,6 +53,7 @@
     "@types/react-router-dom": "^5.3.3",
     "@types/underscore": "^1.11.2",
     "copy-webpack-plugin": "^11.0.0",
+    "filemanager-webpack-plugin": "^7.0.0",
     "html-webpack-plugin": "^5.3.2",
     "jest": "^26.6.3",
     "jest-junit": "^14.0.0",

diff --git a/packages/storybook-base/bin.js b/packages/storybook-base/bin.js
@@ -17,4 +17,4 @@
  * under the License.
  */
 
-require("./dist/bin");
+require("./dist/cli/bin");
diff --git a/packages/storybook-base/main.ts b/packages/storybook-base/main.ts
diff --git a/packages/storybook-base/package.json b/packages/storybook-base/package.json
@@ -21,10 +21,17 @@
     "src"
   ],
   "scripts": {
-    "install": "rimraf dist && tsc"
+    "build:dev": "rimraf dist && tsc -p tsconfig.json",
+    "build:prod": "pnpm lint && rimraf dist && tsc -p tsconfig.json && pnpm test",
+    "lint": "run-script-if --bool \"$(build-env linters.run)\" --then \"kie-tools--eslint ./src\"",
+    "test": "run-script-if --ignore-errors \"$(build-env tests.ignoreFailures)\" --bool \"$(build-env tests.run)\" --then \"jest --silent --verbose --passWithNoTests\""
   },
   "devDependencies": {
+    "@babel/core": "^7.16.0",
+    "@babel/preset-env": "^7.16.0",
+    "@babel/preset-react": "^7.16.0",
     "@kie-tools-core/webpack-base": "workspace:*",
+    "@kie-tools/eslint": "workspace:*",
     "@kie-tools/root-env": "workspace:*",
     "@kie-tools/tsconfig": "workspace:*",
     "@storybook/addon-controls": "^7.3.2",
@@ -37,8 +44,15 @@
     "@storybook/addon-viewport": "^7.3.2",
     "@storybook/react-webpack5": "^7.3.2",
     "@storybook/theming": "^7.3.2",
+    "@types/jest": "^26.0.23",
+    "@types/jest-when": "^2.7.4",
+    "@types/vscode": "1.67.0",
+    "jest": "^26.6.3",
+    "jest-junit": "^14.0.0",
+    "jest-when": "^3.5.0",
     "rimraf": "^3.0.2",
     "storybook": "^7.3.2",
+    "ts-jest": "^26.5.6",
     "typescript": "^4.6.2"
   }
 }
diff --git a/packages/storybook-base/src/bin.ts → packages/storybook-base/src/cli/bin.ts b/packages/storybook-base/src/bin.ts → packages/storybook-base/src/cli/bin.ts
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		This file is a marker file. Its content doesn't mean anything. It's purpose is to prevent `build-env` from recursing out of `kie-tools` onto people's machines.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		dedupe-peer-dependents=false # Without this, pnpm will always install all packages when `pnpm booststrap:root` runs. See https://github.com/pnpm/pnpm/issues/6300.