Merge branch 'next' into FOUR-12447

# Conflicts: # .github/workflows/ci.yml # babel.config.js # cypress.json # package-lock.json # package.json # tests/e2e/specs/DeviceVisivilityInspector.spec.js # tests/e2e/specs/FileUpload.spec.js # tests/e2e/specs/RecordList.spec.js
ProcessMaker · Jan 28, 2024 · 45b00e7 · 45b00e7
2 parents 922f1c4 + f727624
commit 45b00e7
Show file tree

Hide file tree

Showing 37 changed files with 2,244 additions and 1,677 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Setup node env 🏗
         uses: actions/setup-node@master
         with:
-          node-version: 16
+          node-version: 20
           check-latest: true
           cache: 'npm'
 
@@ -37,8 +37,8 @@ jobs:
         with:
           browser: chrome
           install: false
-          start: npm run serve
-          wait-on: http://localhost:8080/
+          start: npm run dev
+          wait-on: http://localhost:5173/
           config-file: cypress.config.js
           spec: "tests/e2e/**/*"
           record: true
@@ -74,5 +74,5 @@ jobs:
           name: code-coverage-report
           path: combined-coverage
 
-      - name: Run build bundle 📦
-        run: npm run build-bundle
+      - name: Run build 📦
+        run: npm run build
diff --git a/babel.config.js b/babel.config.js
diff --git a/babel.config.json b/babel.config.json
@@ -0,0 +1,17 @@
+{
+  "presets": [
+    [
+      "@babel/preset-env",
+      {
+        "targets": {
+          "node": "current"
+        }
+      }
+    ]
+  ],
+  "env": {
+    "test": {
+      "plugins": ["istanbul"]
+    }
+  }
+}
diff --git a/public/favicon.ico → favicon.ico b/public/favicon.ico → favicon.ico
diff --git a/public/index.html → index.html b/public/index.html → index.html
@@ -4,14 +4,15 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+    <link rel="icon" href="favicon.ico">
     <title>vue-form-builder</title>
   </head>
   <body>
     <noscript>
       <strong>We're sorry but vue-form-builder doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
     </noscript>
     <div id="app"></div>
+    <script type="module" src="/src/main.js"></script>
     <!-- built files will be auto injected -->
   </body>
 </html>
diff --git a/package.json b/package.json
@@ -1,35 +1,48 @@
 {
   "name": "@processmaker/screen-builder",
-  "version": "2.79.2",
+  "version": "2.81.0",
   "scripts": {
+    "dev": "vite",
     "serve": "vue-cli-service serve",
-    "build": "vue-cli-service build",
+    "build": "vite build",
+    "preview": "vite preview",
     "test:unit": "vue-cli-service test:unit",
     "lint": "vue-cli-service lint",
-    "build-bundle": "vue-cli-service build --target lib --name vue-form-builder ./src/components/index.js",
+    "build-bundle": "npm run build",
     "lint-fix": "vue-cli-service lint",
-    "open-cypress": "TZ=UTC nyc cypress open",
-    "run-cypress": "TZ=UTC nyc cypress run",
+    "open-cypress": "NODE_ENV=test TZ=UTC nyc cypress open",
+    "run-cypress": "NODE_ENV=test TZ=UTC nyc cypress run",
     "test": "vue-cli-service test:unit"
   },
-  "main": "./dist/vue-form-builder.common.js",
+  "main": "./dist/vue-form-builder.umd.js",
+  "module": "./dist/vue-form-builder.es.js",
+  "exports": {
+    ".": {
+      "import": "./dist/vue-form-builder.es.js",
+      "require": "./dist/vue-form-builder.umd.js"
+    },
+    "./dist/vue-form-builder.css": {
+      "import": "./dist/vue-form-builder.css",
+      "require": "./dist/vue-form-builder.css"
+    }
+  },
   "files": [
-    "dist/*",
-    "src/*",
-    "public/*",
-    "*.json",
-    "*.js"
+    "dist/**",
+    "src/**"
   ],
   "dependencies": {
-    "axios-extensions": "^2.0.3",
+    "@chantouchsek/validatorjs": "1.2.3",
+    "axios-extensions": "^3.1.6",
     "core-js": "^3.8.3",
     "lodash": "^4.17.21",
-    "lru-cache": "^7.14.0",
+    "lru-cache": "^10.0.1",
     "moment": "^2.29.1",
     "moment-timezone": "^0.5.27",
+    "monaco-editor": "^0.34.0",
     "scrollparent": "^2.0.1",
     "util": "^0.12.5",
     "vue-loader": "^15.9.2",
+    "vue-monaco": "^0.3.2",
     "vue-simple-uploader": "^0.7.4",
     "vue-the-mask": "^0.11.1",
     "vuelidate": "^0.7.5"
@@ -40,18 +53,15 @@
     "@babel/eslint-parser": "^7.12.16",
     "@cypress/code-coverage": "^3.12.15",
     "@fortawesome/fontawesome-free": "^5.6.1",
+    "@originjs/vite-plugin-commonjs": "^1.0.3",
     "@panter/vue-i18next": "^0.15.2",
-    "@processmaker/vue-form-elements": "0.49.4",
-    "@processmaker/vue-multiselect": "^2.2.0",
-    "@vue/cli-plugin-babel": "~5.0.0",
-    "@vue/cli-plugin-e2e-cypress": "^5.0.8",
-    "@vue/cli-plugin-eslint": "~5.0.0",
-    "@vue/cli-plugin-unit-jest": "~5.0.0",
-    "@vue/cli-service": "~5.0.8",
-    "@vue/test-utils": "^1.1.3",
-    "@vue/vue2-jest": "^27.0.0-alpha.2",
-    "axios": "^0.21.2",
+    "@processmaker/vue-form-elements": "0.51.0",
+    "@processmaker/vue-multiselect": "2.3.0",
+    "@vitejs/plugin-vue2": "^2.3.1",
+    "@vue/test-utils": "^1.1.1",
+    "axios": "^1.6.0",
     "babel-core": "7.0.0-bridge.0",
+    "babel-plugin-istanbul": "^6.1.1",
     "babel-jest": "^27.0.6",
     "bootstrap": "^4.5.3",
     "bootstrap-vue": "^2.19.0",
@@ -72,17 +82,17 @@
     "identity-obj-proxy": "^3.0.0",
     "inputmask": "^5.0.7",
     "jest": "^27.0.5",
-    "monaco-editor-webpack-plugin": "^7.0.1",
     "mustache": "^3.0.1",
     "nyc": "^15.1.0",
     "prettier": "2.7.1",
     "sass": "^1.53.0",
-    "sass-loader": "^10.3.1",
     "v-calendar": "^0.9.7",
     "validatorjs": "^3.14.2",
+    "vite": "^4.0.4",
+    "vite-plugin-monaco-editor": "^1.1.0",
     "vue": "^2.6.12",
     "vue-deepset": "^0.6.3",
-    "vue-monaco": "^1.2.2",
+    "vue-monaco": "^0.3.1",
     "vue-template-compiler": "^2.6.14",
     "vue-uniq-ids": "^1.0.0",
     "vue-upload-component": "^2.8.14",
@@ -93,16 +103,11 @@
   },
   "peerDependencies": {
     "@panter/vue-i18next": "^0.15.0",
-    "@processmaker/vue-form-elements": "0.49.4",
+    "@processmaker/vue-form-elements": "0.51.0",
     "i18next": "^15.0.8",
     "vue": "^2.6.12",
     "vuex": "^3.1.1"
   },
-  "postcss": {
-    "plugins": {
-      "autoprefixer": {}
-    }
-  },
   "browserslist": [
     "> 1%",
     "last 2 versions",