Beautiful Open-Source Form Builder
Resolve conflicts
JhumanJ679e61d59e0b
diff --cc package-lock.jsonindex 0745e673c,33a2ddc52..6df1eb123--- a/package-lock.json+++ b/package-lock.json@@@ -10,7 -10,7 +10,6 @@@"@sentry/vue": "^6.11.0","axios": "^0.21.1","chart.js": "^3.7.1",-- "cleave.js": "^1.6.0","clone-deep": "^4.0.1","date-fns": "^2.28.0","debounce": "^1.2.1",@@@ -4407,52 -4091,11 +4090,6 @@@"node": ">=0.10.0"}},- "node_modules/clean-css": {- "version": "5.3.1",- "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.1.tgz",- "integrity": "sha512-lCr8OHhiWCTw4v8POJovCoh4T7I9U11yVsPjMWWnnMmp9ZowCxyad1Pathle/9HjaDp+fdQKjO9fQydE6RHTZg==",- "dev": true,- "dependencies": {- "source-map": "~0.6.0"- },- "engines": {- "node": ">= 10.0"- }- },-- "node_modules/cleave.js": {-- "version": "1.6.0",-- "resolved": "https://registry.npmjs.org/cleave.js/-/cleave.js-1.6.0.tgz",-- "integrity": "sha512-ivqesy3j5hQVG3gywPfwKPbi/7ZSftY/UNp5uphnqjr25yI2CP8FS2ODQPzuLXXnNLi29e2+PgPkkiKUXLs/Nw=="- },- "node_modules/cli-table3": {- "version": "0.6.3",- "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.3.tgz",- "integrity": "sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg==",- "dev": true,- "dependencies": {- "string-width": "^4.2.0"- },- "engines": {- "node": "10.* || >= 12.*"- },- "optionalDependencies": {- "@colors/colors": "1.5.0"- }- },- "node_modules/cliui": {- "version": "8.0.1",- "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",- "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",- "dev": true,- "dependencies": {- "string-width": "^4.2.0",- "strip-ansi": "^6.0.1",- "wrap-ansi": "^7.0.0"- },- "engines": {- "node": ">=12"- }-- },"node_modules/clone": {"version": "2.1.2","resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",@@@ -20710,41 -15773,11 +15767,6 @@@}}},- "clean-css": {- "version": "5.3.1",- "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.1.tgz",- "integrity": "sha512-lCr8OHhiWCTw4v8POJovCoh4T7I9U11yVsPjMWWnnMmp9ZowCxyad1Pathle/9HjaDp+fdQKjO9fQydE6RHTZg==",- "dev": true,- "requires": {- "source-map": "~0.6.0"- }- },-- "cleave.js": {-- "version": "1.6.0",-- "resolved": "https://registry.npmjs.org/cleave.js/-/cleave.js-1.6.0.tgz",-- "integrity": "sha512-ivqesy3j5hQVG3gywPfwKPbi/7ZSftY/UNp5uphnqjr25yI2CP8FS2ODQPzuLXXnNLi29e2+PgPkkiKUXLs/Nw=="- },- "cli-table3": {- "version": "0.6.3",- "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.3.tgz",- "integrity": "sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg==",- "dev": true,- "requires": {- "@colors/colors": "1.5.0",- "string-width": "^4.2.0"- }- },- "cliui": {- "version": "8.0.1",- "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",- "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",- "dev": true,- "requires": {- "string-width": "^4.2.0",- "strip-ansi": "^6.0.1",- "wrap-ansi": "^7.0.0"- }-- },"clone": {"version": "2.1.2","resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",diff --cc resources/js/store/index.jsindex e56906e81,0e14b6574..baa637ffd--- a/resources/js/store/index.js+++ b/resources/js/store/index.js@@@ -4,10 -4,11 +4,11 @@@ import Vuex from 'vuexVue.use(Vuex)// Load store modules dynamically.- const requireContext = require.context('./modules', true, /.*\.js$/)- const modules = requireContext.keys()+ const requireContext = import.meta.glob('./modules/**/*.js', {eager: true})-+ const modules = Object.keys(requireContext)++.map(file =>- [file.replace(/(^.\/)|(\.js$)/g, ''), requireContext(file)]+ [file.replace(/(^.\/)|(\.js$)/g, '').replace('modules/',''), requireContext[file]]).reduce((modules, [name, module]) => {if (module.namespaced === undefined) {