add no-imports-from-entries rule (#8548)

* add no-imports-from-entries rule * Fixed react-ui build and moved tests to react-ui * Fixed lint * Re-fixed lint * Try to fix react-ui tests * update package.json * add <script src="../../build/survey-core/survey.i18n.min.js"></script> * Try to fix f-tests * Try to fix tests * Try to fix builds * Try to fix builds --------- Co-authored-by: OlgaLarina <[email protected]> Co-authored-by: tsv2013 <[email protected]>
surveyjs · Jul 15, 2024 · b3c5ec7 · b3c5ec7
1 parent 78d2a67
commit b3c5ec7
Show file tree

Hide file tree

Showing 28 changed files with 76 additions and 269 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -16,6 +16,7 @@
 	"rules": {
 		"surveyjs/no-test-only": 2,
 		"surveyjs/no-test-debug": 2,
+		"surveyjs/no-imports-from-entries": 2,
 		"no-console": 2, // Remember, this means error!
 		"indent": [
 			"error",

diff --git a/accessibilityTests/helper.ts b/accessibilityTests/helper.ts
@@ -57,7 +57,7 @@ export const initSurvey = ClientFunction(
     } else if (framework === "react") {
       document.getElementById("surveyElement").innerHTML = "";
       window["ReactDOM"].render(
-        window["React"].createElement(window["Survey"].Survey, {
+        window["React"].createElement(window["SurveyReact"].Survey, {
           model: model,
           onComplete: surveyComplete,
         }),

diff --git a/build-scripts/survey-jquery-ui/tsconfig.typing.jquery-ui.json b/build-scripts/survey-jquery-ui/tsconfig.typing.jquery-ui.json
@@ -27,6 +27,6 @@
     "skipLibCheck": true
   },
   "include": [
-    "../../src/entries/jquery-ui-model.ts"
+    "../../src/entries/react-ui-model.ts"
   ],
 }
diff --git a/build-scripts/survey-ui/tsconfig.typing.ui.json b/build-scripts/survey-ui/tsconfig.typing.ui.json
@@ -27,6 +27,6 @@
     "skipLibCheck": true
   },
   "include": [
-    "../../src/entries/jquery-ui-model.ts"
+    "../../src/entries/react-ui-model.ts"
   ],
 }
diff --git a/eslint-surveyjs/index.js b/eslint-surveyjs/index.js
@@ -1,5 +1,6 @@
 const testOnlyMessage = " :( please don't forget to remove 'test.only' testcafe statement it will disable all other tests :( ";
 const debugMessage = " :( please don't forget to remove 'debug()'  :( ";
+const entriesMessage = "import from 'entries' folder needs to be replaced. Use another path."
 
 module.exports = {
   rules: {
@@ -25,5 +26,13 @@ module.exports = {
         }
       }
     }),
+    "no-imports-from-entries": context =>
+      ({
+        ImportDeclaration: function (node) {
+          if (node.source.value.includes("\/entries\/")) {
+            context.report(node, entriesMessage);
+          }
+        }
+      }),
   }
 };
diff --git a/examples_test/bootstrap/react.html b/examples_test/bootstrap/react.html
@@ -5,7 +5,13 @@
     <script src="https://unpkg.com/react@latest/umd/react.production.min.js"></script>
     <script src="https://unpkg.com/react-dom@latest/umd/react-dom.production.min.js"></script>
     <link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/css/bootstrap.min.css"/>
-    <script src="../../build/survey-react/survey.react.min.js"></script>
+    <!-- <link rel="stylesheet" href="../../build/survey-core/survey.min.css" /> -->
+    <!-- <link rel="stylesheet" href="../../build/survey-core/modern.min.css" /> -->
+    <!-- <link rel="stylesheet" href="../../build/survey-core/defaultV2.min.css" /> -->
+    <script src="../../build/survey-core/survey.core.min.js"></script>
+    <script src="../../build/survey-core/survey.i18n.min.js"></script>
+    <script src="../../build/survey-core/plugins/bootstrap-integration.min.js"></script>
+    <script src="../../build/survey-react-ui/survey-react-ui.min.js"></script>
   </head>
   <body>
     <div id="surveyElement"></div>

diff --git a/examples_test/bootstrap/survey-ui.html b/examples_test/bootstrap/survey-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-core/plugins/bootstrap-integration.js"></script>
+    <script src="../../build/survey-core/plugins/bootstrap-integration.min.js"></script>
     <script src="../../build/survey-ui/survey-ui.min.js"></script>
   </head>
   <body>

diff --git a/examples_test/customWidget/react.html b/examples_test/customWidget/react.html
@@ -12,8 +12,12 @@
   <script type="text/javascript" src="http://ajax.aspnetcdn.com/ajax/globalize/0.1.1/globalize.min.js"></script>
   <script type="text/javascript" src="http://cdn3.devexpress.com/jslib/15.1.5/js/dx.chartjs.js"></script>
 
-  <script src="../../build/survey-react/survey.react.min.js"></script>
-  <link rel="stylesheet" href="../../build/survey-react/survey.min.css" />
+    <link rel="stylesheet" href="../../build/survey-core/survey.min.css" />
+    <!-- <link rel="stylesheet" href="../../build/survey-core/modern.min.css" /> -->
+    <!-- <link rel="stylesheet" href="../../build/survey-core/defaultV2.min.css" /> -->
+    <script src="../../build/survey-core/survey.core.min.js"></script>
+    <script src="../../build/survey-core/survey.i18n.min.js"></script>
+    <script src="../../build/survey-react-ui/survey-react-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/react.html b/examples_test/default/react.html
@@ -5,8 +5,12 @@
     <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
     <script src="https://unpkg.com/react@latest/umd/react.production.min.js"></script>
     <script src="https://unpkg.com/react-dom@latest/umd/react-dom.production.min.js"></script>
-    <link rel="stylesheet" href="../../build/survey-react/survey.min.css"/>
-    <script src="../../build/survey-react/survey.react.min.js"></script>
+    <link rel="stylesheet" href="../../build/survey-core/survey.min.css" />
+    <!-- <link rel="stylesheet" href="../../build/survey-core/modern.min.css" /> -->
+    <!-- <link rel="stylesheet" href="../../build/survey-core/defaultV2.min.css" /> -->
+    <script src="../../build/survey-core/survey.core.min.js"></script>
+    <script src="../../build/survey-core/survey.i18n.min.js"></script>
+    <script src="../../build/survey-react-ui/survey-react-ui.min.js"></script>
     <script src="./index.js"></script>
   </head>
   <body>

diff --git a/examples_test/defaultV2/react.html b/examples_test/defaultV2/react.html
@@ -6,8 +6,12 @@
     <script src="https://cdnjs.cloudflare.com/ajax/libs/showdown/1.6.4/showdown.min.js"></script>
     <script src="https://unpkg.com/react@latest/umd/react.production.min.js"></script>
     <script src="https://unpkg.com/react-dom@latest/umd/react-dom.production.min.js"></script>
-    <link rel="stylesheet" href="../../build/survey-react/defaultV2.min.css" />
-    <script src="../../build/survey-react/survey.react.min.js"></script>
+    <!-- <link rel="stylesheet" href="../../build/survey-core/survey.min.css" /> -->
+    <!-- <link rel="stylesheet" href="../../build/survey-core/modern.min.css" /> -->
+    <link rel="stylesheet" href="../../build/survey-core/defaultV2.min.css" />
+    <script src="../../build/survey-core/survey.core.min.js"></script>
+    <script src="../../build/survey-core/survey.i18n.min.js"></script>
+    <script src="../../build/survey-react-ui/survey-react-ui.min.js"></script>
   </head>
   <body>
     <div id="surveyElement"></div>

diff --git a/examples_test/modern/react.html b/examples_test/modern/react.html
@@ -4,8 +4,12 @@
     <meta name="viewport" content="width=device-width, initial-scale=1"/>
     <script src="https://unpkg.com/react@latest/umd/react.production.min.js"></script>
     <script src="https://unpkg.com/react-dom@latest/umd/react-dom.production.min.js"></script>
-    <link rel="stylesheet" href="../../build/survey-react/modern.min.css"/>
-    <script src="../../build/survey-react/survey.react.min.js"></script>
+    <!-- <link rel="stylesheet" href="../../build/survey-core/survey.min.css" /> -->
+    <link rel="stylesheet" href="../../build/survey-core/modern.min.css" />
+    <!-- <link rel="stylesheet" href="../../build/survey-core/defaultV2.min.css" /> -->
+    <script src="../../build/survey-core/survey.core.min.js"></script>
+    <script src="../../build/survey-core/survey.i18n.min.js"></script>
+    <script src="../../build/survey-react-ui/survey-react-ui.min.js"></script>
     <script src="./index.js"></script>
   </head>
   <body>

diff --git a/package.json b/package.json
@@ -145,8 +145,8 @@
     "eslint": "^7.32.0",
     "eslint-cli": "^1.1.1",
     "eslint-plugin-react": "7.30.1",
-    "eslint-plugin-surveyjs": "file:eslint-surveyjs",
     "eslint-plugin-vue": "^9.3.0",
+    "eslint-plugin-surveyjs": "file:eslint-surveyjs",
     "file-loader": "0.10.0",
     "generate-json-webpack-plugin": "^1.0.0",
     "get-func-name": "2.0.0",

diff --git a/src/entries/jquery-ui-model.ts b/src/entries/jquery-ui-model.ts
diff --git a/src/entries/jquery-ui.ts b/src/entries/jquery-ui.ts
@@ -2,7 +2,7 @@ import * as React from "react";
 import * as ReactDOM from "react-dom";
 import jQuery from "jquery";
 
-import { Survey, PopupSurvey } from "./jquery-ui-model";
+import { Survey, PopupSurvey } from "./react-ui-model";
 
 import { SurveyModel, checkLibraryVersion } from "survey-core";
 
@@ -29,7 +29,7 @@ SurveyModel.platform = "jquery";
 
 export const preact: any = React;
 
-export * from "./jquery-ui-model";
+export * from "./react-ui-model";
 export * from "./core-export";
 
 export { SurveyModel as Model } from "survey-core";

diff --git a/src/entries/react-ui.ts b/src/entries/react-ui.ts
@@ -2,9 +2,6 @@ export * from "./react-ui-model";
 export * from "./core-export";
 export { SurveyModel as Model } from "survey-core";
 
-export * from "../utils/responsivity-manager";
-export { unwrap } from "../utils/utils";
-
 import { checkLibraryVersion } from "survey-core";
 
 checkLibraryVersion(`${process.env.VERSION}`, "survey-react-ui");