Merge pull request #8573 from surveyjs/feature/survey-js-ui

Introduce survey-js-ui package
surveyjs · Jul 19, 2024 · 094f0e5 · 094f0e5
2 parents 43ea8ed + eaad94c
commit 094f0e5
Show file tree

Hide file tree

Showing 22 changed files with 49 additions and 50 deletions.
diff --git a/build-packages.yml b/build-packages.yml
@@ -953,18 +953,18 @@ jobs:
 
     - script: |
         cd $(Build.SourcesDirectory)/survey-library
-        npm run build_ui
-      displayName: "Build survey-ui"
+        npm run build_js_ui
+      displayName: "Build survey-js-ui"
 
     - script: |
         cd $(Build.SourcesDirectory)/survey-library
-        npm run testcafe:survey-ui:ci
+        npm run testcafe:survey-js-ui:ci
       displayName: "run functional tests"
 
     - task: CopyFiles@2
       inputs:
-        SourceFolder: "$(Build.SourcesDirectory)/survey-library/build/survey-ui"
-        TargetFolder: "$(Build.ArtifactStagingDirectory)/SurveyJSLibraryBuild/packages/survey-ui"
+        SourceFolder: "$(Build.SourcesDirectory)/survey-library/build/survey-js-ui"
+        TargetFolder: "$(Build.ArtifactStagingDirectory)/SurveyJSLibraryBuild/packages/survey-js-ui"
 
     - task: PublishBuildArtifacts@1
       inputs:

diff --git a/build-scripts/survey-ui/README.md → build-scripts/survey-js-ui/README.md b/build-scripts/survey-ui/README.md → build-scripts/survey-js-ui/README.md
diff --git a/build-scripts/survey-ui/package.json → build-scripts/survey-js-ui/package.json b/build-scripts/survey-ui/package.json → build-scripts/survey-js-ui/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "survey-ui",
-  "version": "1.8.33",
+  "name": "survey-js-ui",
+  "version": "1.11.7",
   "description": "survey.js is a JavaScript Survey Library. It is a modern way to add a survey to your website. It uses JSON for survey metadata and results.",
   "keywords": [
     "Survey",
@@ -15,14 +15,13 @@
   "files": [
     "**/*"
   ],
-  "main": "survey-ui.js",
+  "main": "survey-js-ui.js",
   "repository": {
     "type": "git",
     "url": "https://github.com/surveyjs/surveyjs.git"
   },
-  "typings": "survey-ui.d.ts",
-  "dependencies": {
-  },
+  "typings": "survey-js-ui.d.ts",
+  "dependencies": {},
   "peerDependencies": {
     "survey-core": "*"
   }

diff --git a/build-scripts/survey-ui/tsconfig.json → build-scripts/survey-js-ui/tsconfig.json b/build-scripts/survey-ui/tsconfig.json → build-scripts/survey-js-ui/tsconfig.json
diff --git a/...scripts/survey-ui/tsconfig.typing.ui.json → ...ipts/survey-js-ui/tsconfig.typing.ui.json b/...scripts/survey-ui/tsconfig.typing.ui.json → ...ipts/survey-js-ui/tsconfig.typing.ui.json
@@ -27,7 +27,7 @@
     "skipLibCheck": true
   },
   "include": [
-    "../../src/entries/ui.ts",
+    "../../src/entries/js-ui.ts",
     "../../src/entries/react-ui-model.ts"
   ],
 }
diff --git a/build-scripts/survey-ui/webpack.config.js → build-scripts/survey-js-ui/webpack.config.js b/build-scripts/survey-ui/webpack.config.js → build-scripts/survey-js-ui/webpack.config.js
@@ -32,16 +32,16 @@ const config = {
   },
   plugins: [
     new DtsGeneratorPlugin({
-      tsConfigPath: "./build-scripts/survey-ui/tsconfig.typing.ui.json",
-      filePath: "build/survey-ui/survey-ui.d.ts",
-      moduleName: "survey-ui",
-      importName: "entries/ui"
+      tsConfigPath: "./build-scripts/survey-js-ui/tsconfig.typing.ui.json",
+      filePath: "build/survey-js-ui/survey-js-ui.d.ts",
+      moduleName: "survey-js-ui",
+      importName: "entries/js-ui"
     }),
   ],
 };
 
 module.exports = function (options) {
-  options.platform = "ui";
+  options.platform = "js-ui";
   options.libraryName = "SurveyUI";
-  return merge(webpackCommonConfigCreator(options, packageJson, "survey-ui"), config);
+  return merge(webpackCommonConfigCreator(options, packageJson, "survey-js-ui"), config);
 }
diff --git a/devops-pull-requests-parallel-jobs.yml b/devops-pull-requests-parallel-jobs.yml
@@ -394,9 +394,9 @@ jobs:
       displayName: "Build Core"
 
     - script: |
-        npm run build_ui_prod
-      displayName: "Build survey-ui"
+        npm run build_js_ui_prod
+      displayName: "Build survey-js-ui"
 
     - script: |
-        npm run testcafe:survey-ui:ci
+        npm run testcafe:survey-js-ui:ci
       displayName: "run functional tests"
diff --git a/devops-visual-regression-tests.yml b/devops-visual-regression-tests.yml
@@ -486,11 +486,11 @@ jobs:
     displayName: "Build Core"
 
   - script: |
-      npm run build_ui_prod
-    displayName: "Build survey-ui"
+      npm run build_js_ui_prod
+    displayName: "Build survey-js-ui"
 
   - script: |
-      npm run vrt:survey-ui:ci
+      npm run vrt:survey-js-ui:ci
     displayName: "Visual Regression Tests"
 
   - task: CopyFiles@2

diff --git a/examples/survey-ui/index.html → examples/survey-js-ui/index.html b/examples/survey-ui/index.html → examples/survey-js-ui/index.html
@@ -12,7 +12,7 @@
     <!-- <link rel="stylesheet" href="../../build/survey-core/modern.css" /> -->
     <link rel="stylesheet" href="../../build/survey-core/defaultV2.css" />
     <script src="../../build/survey-core/survey.core.js"></script>
-    <script src="../../build/survey-ui/survey-ui.js"></script>
+    <script src="../../build/survey-js-ui/survey-js-ui.js"></script>
   </head>
 
   <body>

diff --git a/examples/survey-ui/index.js → examples/survey-js-ui/index.js b/examples/survey-ui/index.js → examples/survey-js-ui/index.js
diff --git a/examples_test/bootstrap/survey-ui.html → examples_test/bootstrap/survey-js-ui.html b/examples_test/bootstrap/survey-ui.html → examples_test/bootstrap/survey-js-ui.html
@@ -11,7 +11,7 @@
     <script src="../../build/survey-core/survey.core.min.js"></script>
     <script src="../../build/survey-core/i18n/index.min.js"></script>
     <script src="../../build/survey-core/plugins/bootstrap-integration.min.js"></script>
-    <script src="../../build/survey-ui/survey-ui.min.js"></script>
+    <script src="../../build/survey-js-ui/survey-js-ui.min.js"></script>
   </head>
   <body>
     <div id="surveyElement"></div>

diff --git a/examples_test/customWidget/survey-ui.html → examples_test/customWidget/survey-js-ui.html b/examples_test/customWidget/survey-ui.html → examples_test/customWidget/survey-js-ui.html
@@ -13,7 +13,7 @@
 
   <script src="../../build/survey-core/survey.core.min.js"></script>
   <script src="../../build/survey-core/i18n/index.min.js"></script>
-  <script src="../../build/survey-ui/survey-ui.min.js"></script>
+  <script src="../../build/survey-js-ui/survey-js-ui.min.js"></script>
 
   <!-- <link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/css/bootstrap.min.css"> -->
   <!-- custom widgets -->

diff --git a/examples_test/default/survey-ui.html → examples_test/default/survey-js-ui.html b/examples_test/default/survey-ui.html → examples_test/default/survey-js-ui.html
@@ -11,7 +11,7 @@
     <script src="../../build/survey-core/survey.core.min.js"></script>
     <script src="../../build/survey-core/i18n/index.min.js"></script>
     <script src="../../build/survey-core/plugins/bootstrap-integration.js"></script>
-    <script src="../../build/survey-ui/survey-ui.min.js"></script>
+    <script src="../../build/survey-js-ui/survey-js-ui.min.js"></script>
     <script src="./index.js"></script>
   </head>
   <body>

diff --git a/examples_test/defaultV2/survey-ui.html → examples_test/defaultV2/survey-js-ui.html b/examples_test/defaultV2/survey-ui.html → examples_test/defaultV2/survey-js-ui.html
@@ -10,7 +10,7 @@
 
     <script src="../../build/survey-core/survey.core.min.js"></script>
     <script src="../../build/survey-core/i18n/index.min.js"></script>
-    <script src="../../build/survey-ui/survey-ui.min.js"></script>
+    <script src="../../build/survey-js-ui/survey-js-ui.min.js"></script>
   </head>
   <body>
     <div id="surveyElement"></div>

diff --git a/examples_test/modern/survey-ui.html → examples_test/modern/survey-js-ui.html b/examples_test/modern/survey-ui.html → examples_test/modern/survey-js-ui.html
@@ -10,7 +10,7 @@
 
     <script src="../../build/survey-core/survey.core.min.js"></script>
     <script src="../../build/survey-core/i18n/index.min.js"></script>
-    <script src="../../build/survey-ui/survey-ui.min.js"></script>
+    <script src="../../build/survey-js-ui/survey-js-ui.min.js"></script>
   </head>
   <body>
     <div id="surveyElement"></div>

diff --git a/package.json b/package.json
@@ -11,10 +11,10 @@
     "testcafe:ko": "http-server --silent & testcafe -c 4 -q attemptLimit=5,successThreshold=1 chrome:headless testCafe/ --reporter minimal --env=knockout",
     "testcafe:jquery-ui": "testcafe -c 4 -q attemptLimit=5,successThreshold=1 chrome testCafe/ --app \"http-server --silent\" --env=jquery-ui",
     "testcafe:jquery-ui:ci": "http-server --silent & testcafe -c 4 -q attemptLimit=5,successThreshold=1 chrome:headless testCafe/ --reporter minimal --env=jquery-ui",
-    "testcafe:survey-ui": "testcafe -c 4 -q attemptLimit=5,successThreshold=1 chrome testCafe/ --app \"http-server --silent\" --env=survey-ui",
-    "testcafe:survey-ui:ci": "http-server --silent & testcafe -c 4 -q attemptLimit=5,successThreshold=1 chrome:headless testCafe/ --reporter minimal --env=survey-ui",
+    "testcafe:survey-js-ui": "testcafe -c 4 -q attemptLimit=5,successThreshold=1 chrome testCafe/ --app \"http-server --silent\" --env=survey-js-ui",
+    "testcafe:survey-js-ui:ci": "http-server --silent & testcafe -c 4 -q attemptLimit=5,successThreshold=1 chrome:headless testCafe/ --reporter minimal --env=survey-js-ui",
     "vrt:jquery-ui:ci": "testcafe -c 4 -q attemptLimit=5,successThreshold=1 chrome:headless ./visualRegressionTests/ --app \"http-server\" --screenshots ./ --selector-timeout 1500 --reporter minimal --env=jquery-ui",
-    "vrt:survey-ui:ci": "testcafe -c 4 -q attemptLimit=5,successThreshold=1 chrome:headless ./visualRegressionTests/ --app \"http-server\" --screenshots ./ --selector-timeout 1500 --reporter minimal --env=survey-ui",
+    "vrt:survey-js-ui:ci": "testcafe -c 4 -q attemptLimit=5,successThreshold=1 chrome:headless ./visualRegressionTests/ --app \"http-server\" --screenshots ./ --selector-timeout 1500 --reporter minimal --env=survey-js-ui",
     "testcafe:react": "http-server --silent & testcafe -c 4 -q attemptLimit=5,successThreshold=1 chrome:headless testCafe/ --reporter minimal --env=react",
     "testcafe:vue": "http-server --silent & testcafe -c 4 -q attemptLimit=5,successThreshold=1 chrome:headless testCafe/ --reporter minimal --env=vue",
     "release": "commit-and-tag-version --message \"Release: %s [azurepipelines skip]\" ",
@@ -30,8 +30,8 @@
     "build_jquery_prod": "webpack --config ./build-scripts/survey-jquery/webpack.config.js --env.buildType prod && webpack --config ./build-scripts/survey-jquery/webpack.themes.config.js --env.buildType prod",
     "build_jquery_ui_dev": "webpack --config ./build-scripts/survey-jquery-ui/webpack.config.js --env.buildType dev",
     "build_jquery_ui_prod": "webpack --config ./build-scripts/survey-jquery-ui/webpack.config.js --env.buildType prod",
-    "build_ui_dev": "webpack --config ./build-scripts/survey-ui/webpack.config.js --env.buildType dev",
-    "build_ui_prod": "webpack --config ./build-scripts/survey-ui/webpack.config.js --env.buildType prod",
+    "build_js_ui_dev": "webpack --config ./build-scripts/survey-js-ui/webpack.config.js --env.buildType dev",
+    "build_js_ui_prod": "webpack --config ./build-scripts/survey-js-ui/webpack.config.js --env.buildType prod",
     "build_angular_dev": "webpack --config ./build-scripts/survey-angular/webpack.config.js --env.buildType dev",
     "build_angular_prod": "webpack --config ./build-scripts/survey-angular/webpack.config.js --env.buildType prod",
     "build_i18n_dev": "webpack --config ./build-scripts/survey-core/webpack.i18n.js --env.buildType dev",
@@ -64,7 +64,7 @@
     "build_i18n": "npm run build_i18n_dev && npm run build_i18n_prod",
     "build_jquery": "npm run build_jquery_dev && npm run build_jquery_prod",
     "build_jquery_ui": "npm run build_jquery_ui_dev && npm run build_jquery_ui_prod",
-    "build_ui": "npm run build_ui_dev && npm run build_ui_prod",
+    "build_js_ui": "npm run build_js_ui_dev && npm run build_js_ui_prod",
     "build_angular": "npm run build_angular_dev && npm run build_angular_prod && rimraf build/survey-angular/ts3.4 && downlevel-dts build/survey-angular build/survey-angular/ts3.4",
     "watch:core:dev": "webpack --config ./build-scripts/survey-core/webpack.config.js --env.buildType dev --watch",
     "watch:core:prod": "webpack --config ./build-scripts/survey-core/webpack.config.js --env.buildType prod --watch",
@@ -228,4 +228,4 @@
     "signature_pad": "^4.1.5",
     "vite": "^3.1.8"
   }
-}
+}
diff --git a/src/entries/ui.ts → src/entries/js-ui.ts b/src/entries/ui.ts → src/entries/js-ui.ts
@@ -35,7 +35,7 @@ if (!!jQuery) {
   });
 }
 
-SurveyModel.platform = "ui";
+SurveyModel.platform = "js-ui";
 SurveyModel.prototype["render"] = function (element: any = null) {
   if (this.renderCallback) {
     this.renderCallback();
@@ -53,4 +53,4 @@ export { SurveyModel as Model } from "survey-core";
 
 import { checkLibraryVersion } from "survey-core";
 
-checkLibraryVersion(`${process.env.VERSION}`, "survey-ui");
+checkLibraryVersion(`${process.env.VERSION}`, "survey-js-ui");
diff --git a/testCafe/helper.js b/testCafe/helper.js
@@ -61,7 +61,7 @@ export const initSurvey = ClientFunction(
       window["$"]("#surveyElement").Survey({
         model: model
       });
-    } else if (framework === "survey-ui") {
+    } else if (framework === "survey-js-ui") {
       document.getElementById("surveyElement").innerHTML = "";
       SurveyUI.renderSurvey(model, document.getElementById("surveyElement"));
     } else if (framework === "react") {
@@ -120,7 +120,7 @@ export const initSurveyPopup = ClientFunction(
         allowClose: true,
         allowFullScreen: true
       });
-    } else if (framework === "survey-ui") {
+    } else if (framework === "survey-js-ui") {
       document.getElementById("surveyElement").innerHTML = "";
       SurveyUI.renderPopupSurvey(model, document.getElementById("surveyElement"), {
         isExpanded: true,
@@ -190,7 +190,7 @@ export const registerCustomToolboxComponent = ClientFunction(
           return window["React"].createElement(CustomActionButton, props);
         }
       );
-    } else if (framework === "jquery-ui" || framework === "survey-ui") {
+    } else if (framework === "jquery-ui" || framework === "survey-js-ui") {
       const preact = (window["SurveyJquery"] || window["SurveyUI"])["preact"];
       window.React = { createElement: preact.createElement };
 
@@ -277,7 +277,7 @@ export const registerCustomItemComponent = ClientFunction(
           return window["React"].createElement(ItemTemplateComponent, props);
         }
       );
-    } else if (framework === "jquery-ui" || framework === "survey-ui") {
+    } else if (framework === "jquery-ui" || framework === "survey-js-ui") {
       const preact = (window["SurveyJquery"] || window["SurveyUI"])["preact"];
       window.React = { createElement: preact.createElement };
       class ItemTemplateComponent extends preact.Component {
@@ -397,7 +397,7 @@ export const registerCustomItemContentComponent = ClientFunction(
           return preact.createElement(ItemContentTemplateComponent, props);
         }
       );
-    } else if (framework === "survey-ui") {
+    } else if (framework === "survey-js-ui") {
       const preact = window["SurveyUI"]["preact"];
       window.React = { createElement: preact.createElement };
       class ItemContentTemplateComponent extends preact.Component {

diff --git a/testCafe/survey/customCss.js b/testCafe/survey/customCss.js
@@ -48,7 +48,7 @@ const initSurvey = ClientFunction((framework, json) => {
     window["$"]("#surveyElement").Survey({
       model: model
     });
-  } else if (framework === "survey-ui") {
+  } else if (framework === "survey-js-ui") {
     model.css = myCss;
     document.getElementById("surveyElement").innerHTML = "";
     window["SurveyUI"].renderSurvey(model, document.getElementById("surveyElement"));

diff --git a/testCafe/survey/popup.js b/testCafe/survey/popup.js
@@ -48,7 +48,7 @@ const initPopupSurvey = ClientFunction(
       window["$"]("#surveyElement").PopupSurvey({
         model: model
       });
-    } else if (framework === "survey-ui") {
+    } else if (framework === "survey-js-ui") {
       document.getElementById("surveyElement").innerHTML = "";
       window["SurveyUI"].renderPopupSurvey(model, document.getElementById("surveyElement"));
     }

diff --git a/visual-regression-tests.yml b/visual-regression-tests.yml
@@ -487,11 +487,11 @@ jobs:
     displayName: "Build Core"
 
   - script: |
-      npm run build_ui_prod
-    displayName: "Build survey-ui"
+      npm run build_js_ui_prod
+    displayName: "Build survey-js-ui"
 
   - script: |
-      npm run vrt:survey-ui:ci
+      npm run vrt:survey-js-ui:ci
     displayName: "Visual Regression Tests"
 
   - task: CopyFiles@2

diff --git a/visualRegressionTests/tests/defaultV2/buttongroup.ts b/visualRegressionTests/tests/defaultV2/buttongroup.ts
@@ -30,7 +30,7 @@ const registerButtongroup = ClientFunction((framework) => {
       return preact.createElement(SurveyJquery.SurveyQuestionButtonGroup, props);
     });
   }
-  if (framework === "survey-ui") {
+  if (framework === "survey-js-ui") {
     const SurveyUI = (<any>window).SurveyUI;
     const preact = SurveyUI["preact"];
     SurveyUI.ReactQuestionFactory.Instance.registerQuestion("buttongroup", props => {