Merge branch 'master' into feature/vue3

surveyjs · Dec 27, 2022 · 3169983 · 3169983
2 parents f9f7f4e + 5f95328
commit 3169983
Show file tree

Hide file tree

Showing 169 changed files with 5,487 additions and 2,448 deletions.
diff --git a/build-scripts/survey-core/tsconfig.plugins.bootstrap.theme.typing.json b/build-scripts/survey-core/tsconfig.plugins.bootstrap.theme.typing.json
@@ -0,0 +1,31 @@
+{
+  "compilerOptions": {
+    "target": "es5",
+    "module": "es2015",
+    "lib": [
+      "DOM",
+      "ES5",
+      "ES2015.Promise",
+      "es6"
+    ],
+    "baseUrl": ".",
+    "paths": {
+      "survey-core": [
+        "../../build/survey-core"
+      ]
+    },
+    "sourceMap": false,
+    "noImplicitAny": false,
+    "importHelpers": false,
+    "experimentalDecorators": true,
+    "moduleResolution": "node",
+    "allowSyntheticDefaultImports": true,
+    "declaration": true,
+    "emitDeclarationOnly": true,
+    "skipLibCheck": true,
+    "outFile": "../../build/survey-core/plugins/bootstrap-integration.d.ts"
+  },
+  "include": [
+    "../../src/plugins/themes/bootstrap/index.ts"
+  ]
+}
diff --git a/build-scripts/survey-core/tsconfig.plugins.bootstrapmaterial.theme.typing.json b/build-scripts/survey-core/tsconfig.plugins.bootstrapmaterial.theme.typing.json
@@ -0,0 +1,31 @@
+{
+  "compilerOptions": {
+    "target": "es5",
+    "module": "es2015",
+    "lib": [
+      "DOM",
+      "ES5",
+      "ES2015.Promise",
+      "es6"
+    ],
+    "baseUrl": ".",
+    "paths": {
+      "survey-core": [
+        "../../build/survey-core"
+      ]
+    },
+    "sourceMap": false,
+    "noImplicitAny": false,
+    "importHelpers": false,
+    "experimentalDecorators": true,
+    "moduleResolution": "node",
+    "allowSyntheticDefaultImports": true,
+    "declaration": true,
+    "emitDeclarationOnly": true,
+    "skipLibCheck": true,
+    "outFile": "../../build/survey-core/plugins/bootstrap-material-integration.d.ts"
+  },
+  "include": [
+    "../../src/plugins/themes/bootstrapmaterial/index.ts"
+  ]
+}
diff --git a/build-scripts/survey-core/webpack.plugins.bootstrap.config.js b/build-scripts/survey-core/webpack.plugins.bootstrap.config.js
@@ -0,0 +1,38 @@
+"use strict";
+
+const webpackCommonConfigCreator = require("../webpack.common");
+const { merge } = require("webpack-merge");
+var FixStyleOnlyEntriesPlugin = require("webpack-fix-style-only-entries");
+const DtsGeneratorPlugin = require("../webpack-dts-generator");
+// const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
+var path = require("path");
+
+const config = {
+  entry: {
+    ["bootstrap-integration"]: path.resolve(__dirname, "../../src/plugins/themes/bootstrap/index.ts"),
+  },
+  plugins: [new FixStyleOnlyEntriesPlugin()],
+  externals: {
+    "survey-core": {
+      root: "Survey",
+      commonjs2: "survey-core",
+      commonjs: "survey-core",
+      amd: "survey-core"
+    }
+  }
+};
+
+module.exports = function (options) {
+  options.platform = "";
+  options.libraryName = "SurveyBootstrap";
+  if (options.buildType !== "prod") {
+    config.plugins.push(new DtsGeneratorPlugin({
+      tsConfigPath: "./build-scripts/survey-core/tsconfig.plugins.bootstrap.theme.typing.json",
+      filePath: "build/survey-core/plugins/bootstrap-integration.d.ts",
+      moduleName: "survey-core/plugins/bootstrap-integration",
+      importName: "bootstrap/index"
+    }));
+  }
+
+  return merge(webpackCommonConfigCreator(options, { "name": "survey-plugins" }, "survey.plugins", "survey-core/plugins"), config);
+};
diff --git a/build-scripts/survey-core/webpack.plugins.bootstrap.material.config.js b/build-scripts/survey-core/webpack.plugins.bootstrap.material.config.js
@@ -0,0 +1,38 @@
+"use strict";
+
+const webpackCommonConfigCreator = require("../webpack.common");
+const { merge } = require("webpack-merge");
+var FixStyleOnlyEntriesPlugin = require("webpack-fix-style-only-entries");
+const DtsGeneratorPlugin = require("../webpack-dts-generator");
+// const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
+var path = require("path");
+
+const config = {
+  entry: {
+    ["bootstrap-material-integration"]: path.resolve(__dirname, "../../src/plugins/themes/bootstrapmaterial/index.ts"),
+  },
+  plugins: [new FixStyleOnlyEntriesPlugin()],
+  externals: {
+    "survey-core": {
+      root: "Survey",
+      commonjs2: "survey-core",
+      commonjs: "survey-core",
+      amd: "survey-core"
+    }
+  }
+};
+
+module.exports = function (options) {
+  options.platform = "";
+  options.libraryName = "SurveyBootstrapMaterial";
+  if (options.buildType !== "prod") {
+    config.plugins.push(new DtsGeneratorPlugin({
+      tsConfigPath: "./build-scripts/survey-core/tsconfig.plugins.bootstrapmaterial.theme.typing.json",
+      filePath: "build/survey-core/plugins/bootstrap-material-integration.d.ts",
+      moduleName: "survey-core/plugins/bootstrap-material-integration",
+      importName: "bootstrapmaterial/index"
+    }));
+  }
+
+  return merge(webpackCommonConfigCreator(options, { "name": "survey-plugins" }, "survey.plugins", "survey-core/plugins"), config);
+};
diff --git a/build-scripts/webpack-camel-name.js b/build-scripts/webpack-camel-name.js
@@ -0,0 +1,32 @@
+function CamelCaseNamePlugin(options) {}
+
+function capitalizeFirstLetter(string) {
+  return string.charAt(0).toUpperCase() + string.slice(1);
+}
+
+CamelCaseNamePlugin.prototype.apply = function (compiler) {
+  const REGEXP_NAME = /\[camelname\]/gi;
+
+  compiler.hooks.compilation.tap("RemoveCoreFromNamePlugin", (compilation) => {
+    const mainTemplate = compilation.mainTemplate;
+
+    mainTemplate.hooks.assetPath.tap(
+      "CamelCaseNamePlugin",
+      (path, data) => {
+        const chunk = data.chunk;
+        const chunkName = chunk && (chunk.name || chunk.id);
+
+        if (typeof path === "function") {
+          path = path(data);
+        }
+
+        return path.replace(REGEXP_NAME, (match, ...args) => {
+          const parts = chunkName.split("-");
+          return parts.map(function(part) { return capitalizeFirstLetter(part) }).join("");
+        });
+      }
+    );
+  });
+};
+
+module.exports = CamelCaseNamePlugin;
diff --git a/build-scripts/webpack.common.js b/build-scripts/webpack.common.js
@@ -9,6 +9,7 @@ var TsconfigPathsPlugin = require("tsconfig-paths-webpack-plugin");
 const VueLoaderPlugin = require("vue-loader/lib/plugin");
 var GenerateJsonPlugin = require("generate-json-webpack-plugin");
 var DashedNamePlugin = require("./webpack-dashed-name");
+var CamelCaseNamePlugin = require("./webpack-camel-name");
 
 var packageJsonWithVersion = require("../package.json");
 var fs = require("fs");
@@ -18,7 +19,7 @@ var svgStoreUtils = require(path.resolve(
   "../node_modules/webpack-svgstore-plugin/src/helpers/utils.js"
 ));
 
-module.exports = function (options, packageJson, chunkName) {
+module.exports = function (options, packageJson, chunkName, buildFolderName) {
   packageJson.version = packageJsonWithVersion.version;
   const today = new Date();
   const year = today.getFullYear();
@@ -28,7 +29,7 @@ module.exports = function (options, packageJson, chunkName) {
     "License: MIT (http://www.opensource.org/licenses/mit-license.php)",
   ].join("\n");
 
-  var buildPath = __dirname + "/../build/" + packageJson.name + "/";
+  var buildPath = __dirname + "/../build/" + (buildFolderName || packageJson.name) + "/";
   var isProductionBuild = options.buildType === "prod";
 
   function createSVGBundle() {
@@ -115,12 +116,6 @@ module.exports = function (options, packageJson, chunkName) {
 
   var config = {
     mode: isProductionBuild ? "production" : "development",
-    entry: {
-      [packageName]: path.resolve(
-        __dirname,
-        "../src/entries/" + options.platform + ".ts"
-      ),
-    },
     resolve: {
       extensions: [".ts", ".js", ".tsx", ".scss"],
       plugins: [new TsconfigPathsPlugin({ configFile: "./tsconfig.json" })],
@@ -203,7 +198,6 @@ module.exports = function (options, packageJson, chunkName) {
       umdNamedDefine: true,
     },
     plugins: [
-      new webpack.ProgressPlugin(percentage_handler),
       new webpack.DefinePlugin({
         "process.env.ENVIRONMENT": JSON.stringify(options.buildType),
         "process.env.VERSION": JSON.stringify(packageJson.version),
@@ -218,19 +212,32 @@ module.exports = function (options, packageJson, chunkName) {
       }),
       new RemoveCoreFromName(),
       new FixStyleOnlyEntriesPlugin(),
-      new DashedNamePlugin()
+      new DashedNamePlugin(),
+      new CamelCaseNamePlugin()
     ],
   };
 
+  if(!!options.platform) {
+    config.plugins.unshift(new webpack.ProgressPlugin(percentage_handler));
+    config.entry = {
+      [packageName]: path.resolve(
+        __dirname,
+        "../src/entries/" + options.platform + ".ts"
+      ),
+    };
+  }
+
   if (isProductionBuild) {
-    config.plugins.push(
-      new GenerateJsonPlugin(
-        /*buildPath +*/ "package.json",
-        packageJson,
-        undefined,
-        2
-      )
-    );
+    if(!!options.platform) {
+      config.plugins.push(
+        new GenerateJsonPlugin(
+          /*buildPath +*/ "package.json",
+          packageJson,
+          undefined,
+          2
+        )
+      );
+    }
   } else {
     config.devtool = "inline-source-map";
     config.plugins = config.plugins.concat([

diff --git a/examples/angular-ui/src/app/components/test/bootstrap.component.ts b/examples/angular-ui/src/app/components/test/bootstrap.component.ts
@@ -1,6 +1,7 @@
 import {  ChangeDetectorRef, Component, ViewEncapsulation } from "@angular/core";
 import {  StylesManager } from "survey-core";
 import { TestComponent } from "./test.component";
+import "survey-core/plugins/bootstrap-integration";
 
 @Component({
   selector: "test-bootstap",
@@ -11,6 +12,6 @@ import { TestComponent } from "./test.component";
 export class TestBootstrapComponent extends TestComponent {
   constructor(changeDetectorRef: ChangeDetectorRef) {
     super(changeDetectorRef);
-    StylesManager.applyTheme("default");
+    StylesManager.applyTheme("bootstrap");
   }
 }
diff --git a/examples/angular-ui/src/app/components/test/customwidget.component.ts b/examples/angular-ui/src/app/components/test/customwidget.component.ts
@@ -15,6 +15,6 @@ export class TestCustomWidgetComponent extends TestComponent {
     super(changeDetectorRef);
     StylesManager.applyTheme("default");
     widgets.sortablejs(SurveyCore);
-    widgets.icheck(SurveyCore, window.jQuery);
+    widgets.icheck(SurveyCore, (<any>window).jQuery);
   }
 }
diff --git a/examples/angular-ui/src/app/components/test/test.component.html b/examples/angular-ui/src/app/components/test/test.component.html
@@ -1,4 +1,4 @@
 <div id="surveyElement">
-  <popup-survey *ngIf="!!model && isPopup" [model]="model"></popup-survey>
-  <survey *ngIf="!!model && !isPopup" [model]="model"></survey></div>
+  <popup-survey *ngIf="!!model && isPopup" [model]="$any(model)"></popup-survey>
+  <survey *ngIf="!!model && !isPopup" [model]="$any(model)"></survey></div>
 <div id="surveyResultElement"></div>
diff --git a/examples/angular-ui/src/app/components/test/test.component.ts b/examples/angular-ui/src/app/components/test/test.component.ts
@@ -1,6 +1,7 @@
 import { ChangeDetectorRef, Component } from "@angular/core";
 import { SurveyModel } from "survey-core";
 import * as Survey from "survey-core";
+import { defaultCss } from "survey-core/plugins/bootstrap-integration";
 import "survey-core/survey.i18n";
 
 @Component({
@@ -9,13 +10,14 @@ import "survey-core/survey.i18n";
 })
 export class TestComponent {
   public model?: SurveyModel | Survey.PopupSurveyModel;
-  public isPopup: boolean;
+  public isPopup: boolean = true;
   constructor(private changeDetectorRef: ChangeDetectorRef) {
     (window as any).Survey = Survey;
     (<any>window).setSurvey = (survey: SurveyModel | Survey.PopupSurveyModel, isPopup: boolean) => {
       this.model = survey;
       this.isPopup = isPopup;
       this.changeDetectorRef.detectChanges();
     }
+    (window as any).Survey.defaultBootstrapCss = defaultCss;
   }
 }
diff --git a/examples/angular-ui/tsconfig.app.json b/examples/angular-ui/tsconfig.app.json
diff --git a/examples/knockout/index.html b/examples/knockout/index.html
@@ -7,14 +7,19 @@
     <script src="https://cdnjs.cloudflare.com/ajax/libs/knockout/3.5.0/knockout-debug.js"></script>
 
     <!-- <link rel="stylesheet" href="https://unpkg.com/bootstrap@3.3.7/dist/css/bootstrap.min.css"> -->
-    <!-- <link rel="stylesheet" href="../../build/survey-knockout/survey.css" /> -->
+    <!-- <script src="../../build/survey-core/plugins/bootstrap-integration.js"></script> -->
+    <link rel="stylesheet" href="../../build/survey-knockout/survey.css" />
     <!-- <link rel="stylesheet" href="../../build/survey-knockout/modern.css" /> -->
-    <link rel="stylesheet" href="../../build/survey-knockout/defaultV2.css" />
+    <!-- <link rel="stylesheet" href="../../build/survey-knockout/defaultV2.css" /> -->
+    <script src="../../build/survey-core/survey.core.js"></script>
     <script src="../../build/survey-knockout/survey.ko.js"></script>
-  </head>
+    <!-- <script src="../../build/survey-knockout-ui/survey-knockout-ui.js"></script> -->
+</head>
 
   <body>
-    <div id="surveyElement"></div>
+    <div id="surveyElement">
+      <survey params="survey: model"/>
+    </div>
     <div id="surveyResultElement"></div>
     <script src="./index.js"></script>
   </body>

diff --git a/examples/knockout/index.js b/examples/knockout/index.js
@@ -1031,7 +1031,7 @@ function init() {
 
   //Survey.StylesManager.applyTheme("default");
   //Survey.StylesManager.applyTheme("modern");
-  Survey.StylesManager.applyTheme("defaultV2");
+  // Survey.StylesManager.applyTheme("defaultV2");
 
   var model = new Survey.Model(json);
   //model.setDesignMode(true);
@@ -1047,7 +1047,8 @@ function init() {
       }));
     });
 
-  model.render("surveyElement");
+  //model.render("surveyElement");
+  ko.applyBindings({model});
 }
 
 if (!window["%hammerhead%"]) {

diff --git a/examples_test/customWidget/index.js b/examples_test/customWidget/index.js
@@ -0,0 +1,4 @@
+function init() {
+  Survey.StylesManager.applyTheme("default");
+}
+document.addEventListener("DOMContentLoaded", init);