Refactor build tasks (#5719)

* Remove dts generator plugin from build core * Remove dts generator plugin from build react * Remove dts generator plugin from build knockout * Remove dts generator plugin from core presets * Remove dts generator plugin from react presets * Delete webpack dts generator
surveyjs · Jul 22, 2024 · bd51e00 · bd51e00
1 parent ceb3346
commit bd51e00
Show file tree

Hide file tree

Showing 22 changed files with 55 additions and 346 deletions.
diff --git a/packages/creator-presets-core/tsconfig.json b/packages/creator-presets-core/tsconfig.json
@@ -8,8 +8,9 @@
     "experimentalDecorators": true,
     "importHelpers": true,
     "moduleResolution": "node",
-    "jsx": "react",
     "baseUrl": ".",
+    "declaration": true,
+    "declarationDir": "build/typings/",
     "paths": {
       "survey-core": [
         "./node_modules/survey-core"
@@ -20,18 +21,12 @@
       "creator-presets-core": [
         "./src/entries/index.ts"
       ],
-      "tslib" : ["./node_modules/tslib/tslib.d.ts"]
-    }    
+      "tslib": [
+        "./node_modules/tslib/tslib.d.ts"
+      ]
+    }
   },
-  "exclude": [
-    "node_modules",
-    "build",
-    "**/node_modules",
-    "**/tests",
-    "**/*.spec.ts",
-    "**/*.test.ts"
-  ],
   "include": [
-    "src/**/*.ts"
+    "./src/entries/index.ts",
   ]
 }
diff --git a/packages/creator-presets-core/tsconfig.test.json b/packages/creator-presets-core/tsconfig.test.json
@@ -2,6 +2,8 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "allowJs": true,
+    "declaration": false,
+    "declarationDir": null
   },
   "exclude": [
     "src/entries/**/*.ts"

diff --git a/packages/creator-presets-core/tsconfig.typing.json b/packages/creator-presets-core/tsconfig.typing.json
diff --git a/packages/creator-presets-core/webpack.config.js b/packages/creator-presets-core/webpack.config.js
@@ -4,7 +4,6 @@ var webpack = require("webpack");
 var path = require("path");
 var MiniCssExtractPlugin = require("mini-css-extract-plugin");
 var FixStyleOnlyEntriesPlugin = require("webpack-fix-style-only-entries");
-const DtsGeneratorPlugin = require("../../webpack-plugins/webpack-dts-generator");
 var packageJson = require("./package.json");
 var fs = require("fs");
 
@@ -45,7 +44,7 @@ var buildPlatformJson = {
   engines: {
     node: ">=0.10.0",
   },
-  typings: packageJson.name + ".d.ts",
+  typings: "./typings/entries/index.d.ts",
   peerDependencies: {
     "ace-builds": "^1.4.12",
     "survey-core": packageJson.version
@@ -102,18 +101,6 @@ module.exports = function (options) {
           test: /\.(ts|tsx)$/,
           loader: "ts-loader",
         },
-        {
-          test: /\.css$/,
-          loader: [
-            MiniCssExtractPlugin.loader,
-            {
-              loader: "css-loader",
-              options: {
-                sourceMap: options.buildType !== "prod",
-              },
-            },
-          ],
-        },
         {
           test: /\.s(c|a)ss$/,
           loader: [
@@ -162,11 +149,6 @@ module.exports = function (options) {
     },
     plugins: [
       new webpack.ProgressPlugin(percentage_handler),
-      new DtsGeneratorPlugin({
-        webpack: webpack,
-        filePath: "build/creator-presets-core.d.ts",
-        moduleName: "creator-presets-core"
-      }),
       new webpack.DefinePlugin({
         "process.env.ENVIRONMENT": JSON.stringify(options.buildType),
         "process.env.VERSION": JSON.stringify(packageJson.version),

diff --git a/packages/creator-presets-react/tsconfig.json b/packages/creator-presets-react/tsconfig.json
@@ -10,6 +10,8 @@
     "moduleResolution": "node",
     "jsx": "react",
     "baseUrl": ".",
+    "declaration": true,
+    "declarationDir": "build/typings/",
     "paths": {
       "survey-core": [
         "./node_modules/survey-core"
@@ -28,16 +30,7 @@
       ]
     }
   },
-  "exclude": [
-    "node_modules",
-    "build",
-    "**/*.js",    
-    "**/node_modules",
-    "**/tests",
-    "**/*.spec.ts",
-    "**/*.test.ts"
-  ],
   "include": [
-    "src/**/*.ts"
-  ]
+    "./src/entries/index.ts",
+  ],
 }
diff --git a/packages/creator-presets-react/tsconfig.test.json b/packages/creator-presets-react/tsconfig.test.json
@@ -3,6 +3,8 @@
   "compilerOptions": {
     "noImplicitAny": false,
     "esModuleInterop": true,
-    "allowJs": true
+    "allowJs": true,
+    "declaration": false,
+    "declarationDir": null
   }
 }
diff --git a/packages/creator-presets-react/tsconfig.typing.json b/packages/creator-presets-react/tsconfig.typing.json
diff --git a/packages/creator-presets-react/webpack.config.js b/packages/creator-presets-react/webpack.config.js
@@ -4,7 +4,6 @@ const webpack = require("webpack");
 const path = require("path");
 const MiniCssExtractPlugin = require("mini-css-extract-plugin");
 const TsconfigPathsPlugin = require("tsconfig-paths-webpack-plugin");
-const DtsGeneratorPlugin = require("../../webpack-plugins/webpack-dts-generator");
 const packageJson = require("./package.json");
 const fs = require("fs");
 
@@ -43,7 +42,7 @@ const buildPlatformJson = {
   engines: {
     node: ">=0.10.0"
   },
-  typings: packageJson.name + ".d.ts",
+  typings: "./typings/entries/index.d.ts",
   peerDependencies: {
     "ace-builds": "^1.4.12",
     "react": "^16.5.0 || ^17.0.1 || ^18.1.0",
@@ -102,18 +101,6 @@ module.exports = function (options) {
           test: /\.(ts|tsx)$/,
           loader: "ts-loader",
         },
-        {
-          test: /\.css$/,
-          loader: [
-            MiniCssExtractPlugin.loader,
-            {
-              loader: "css-loader",
-              options: {
-                sourceMap: options.buildType !== "prod"
-              }
-            }
-          ]
-        },
         {
           test: /\.s(c|a)ss$/,
           loader: [
@@ -218,11 +205,6 @@ module.exports = function (options) {
     config.devtool = "source-map";
     config.plugins = config.plugins.concat([
       new webpack.LoaderOptionsPlugin({ debug: true }),
-      new DtsGeneratorPlugin({
-        webpack: webpack,
-        filePath: "build/creator-presets-react.d.ts",
-        moduleName: "creator-presets-react"
-      })
     ]);
     config.devServer = {
       contentBase: __dirname,

diff --git a/packages/survey-creator-core/package.json b/packages/survey-creator-core/package.json
@@ -91,4 +91,4 @@
       "tag": true
     }
   }
-}
+}
diff --git a/packages/survey-creator-core/tsconfig.i18n.json b/packages/survey-creator-core/tsconfig.i18n.json
@@ -0,0 +1,12 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "declaration": false,
+    "declarationDir": null,
+    "paths": {
+      "survey-creator-core": [
+        "./src/editorLocalization.ts"
+      ],
+    },
+  }
+}
diff --git a/packages/survey-creator-core/tsconfig.json b/packages/survey-creator-core/tsconfig.json
@@ -8,15 +8,11 @@
     "experimentalDecorators": true,
     "importHelpers": true,
     "moduleResolution": "node",
-    "jsx": "react",
     "baseUrl": ".",
-    "paths": {
-      "survey-creator-core": [
-        "./src/editorLocalization.ts"
-      ],
-    }
+    "declaration": true,
+    "declarationDir": "build/typings/"
   },
   "include": [
-    "src/**/*.ts"
+    "./src/entries/index.ts"
   ]
 }
diff --git a/packages/survey-creator-core/tsconfig.test.json b/packages/survey-creator-core/tsconfig.test.json
@@ -2,11 +2,15 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "allowJs": true,
+    "declaration": false,
+    "declarationDir": null,
     "paths": {
       "survey-creator-core": [
         "./src/editorLocalization.ts"
       ],
-      "tslib" : ["./node_modules/tslib/tslib.d.ts"]
+      "tslib": [
+        "./node_modules/tslib/tslib.d.ts"
+      ]
     }
   },
   "exclude": [

diff --git a/packages/survey-creator-core/tsconfig.typing.json b/packages/survey-creator-core/tsconfig.typing.json