From fc4f0d7501962229c46d05fbda8857d6c87db40f Mon Sep 17 00:00:00 2001 From: Deep Panchal Date: Tue, 9 Aug 2022 12:35:02 -0500 Subject: [PATCH] --wip-- [skip ci] --- .eslintrc.js | 7 +- public/index.html => index.html | 5 +- package.json | 17 +- postcss.config.js | 1 + src/App.vue | 243 +- src/components/FormSelect.vue | 4 +- src/components/OverlayMap.vue | 2 +- src/components/WorkTypeMap.vue | 2 +- src/components/WorksiteSearchInput.vue | 2 +- .../admin/incidents/IncidentForm.vue | 6 +- src/index.css | 4 + src/layouts/Authenticated.vue | 73 +- src/main.ts | 296 +- src/pages/phone/PhoneSystem.vue | 20 +- .../phone_legacy/{routes.js => routes.jsx} | 6 +- src/use/useCan.ts | 6 +- vite.config.ts | 31 + yarn.lock | 6743 ++--------------- 18 files changed, 1234 insertions(+), 6234 deletions(-) rename public/index.html => index.html (99%) create mode 100644 src/index.css rename src/pages/phone_legacy/{routes.js => routes.jsx} (89%) create mode 100644 vite.config.ts diff --git a/.eslintrc.js b/.eslintrc.js index 558b1672d1..699402c456 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -72,9 +72,12 @@ module.exports = { settings: { 'import/resolver': { - webpack: { - config: './node_modules/@vue/cli-service/webpack.config.js', + node: { + paths: ['src'], + extensions: ['.js', '.jsx', '.ts', '.tsx'], + moduleDirectory: ['node_modules', 'src/'], }, + typescript: {}, }, }, }; diff --git a/public/index.html b/index.html similarity index 99% rename from public/index.html rename to index.html index bc24c8f070..eee35748b2 100644 --- a/public/index.html +++ b/index.html @@ -10,7 +10,7 @@ ;NREUM.info={beacon:"bam.nr-data.net",errorBeacon:"bam.nr-data.net",licenseKey:"NRJS-15c5a88c5d87c10da34",applicationID:"1046769301",sa:1} - + @@ -34,6 +34,7 @@ We're sorry but crisiscleanup doesn't work properly without JavaScript enabled. Please enable it to continue.
- + + diff --git a/package.json b/package.json index a6a9a04a6e..9641a2c9b2 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,8 @@ "lint-staged": "lint-staged", "postinstall": "yarn cache clean", "prettify": "prettier --write {.,**}/*.js **/*.vue **/**/*.{vue,js}", - "serve-dev": "cross-env NODE_ENV=development NODE_IS_WATCH=1 vue-cli-service serve --mode development", + "dev": "vite --port 8080", + "serve-dev": "cross-env NODE_ENV=development NODE_IS_WATCH=1 vite", "serve-prod": "cross-env NODE_ENV=production NODE_IS_WATCH=1 vue-cli-service serve --mode production", "serve-staging": "cross-env NODE_ENV=staging NODE_IS_WATCH=1 vue-cli-service serve --mode staging", "storybook": "cross-env NODE_ENV=storybook start-storybook -p 6006", @@ -57,7 +58,6 @@ "@turf/turf": "^5.1.6", "@vue/babel-helper-vue-jsx-merge-props": "^1.2.1", "@vue/babel-preset-jsx": "^1.2.4", - "@vue/cli": "4.5.17", "@vue/compat": "^3.1.0", "@vuex-orm/core": "^0.36.3", "@vuex-orm/plugin-axios": "^0.9.4", @@ -188,13 +188,9 @@ "@types/lodash": "^4.14.182", "@typescript-eslint/eslint-plugin": "^4.18.0", "@typescript-eslint/parser": "^4.18.0", + "@vitejs/plugin-vue": "^3.0.1", + "@vitejs/plugin-vue-jsx": "^2.0.0", "@vue/babel-preset-app": "^4.5.4", - "@vue/cli-plugin-babel": "^4.5.11", - "@vue/cli-plugin-e2e-cypress": "^4.5.6", - "@vue/cli-plugin-eslint": "^4.5.6", - "@vue/cli-plugin-typescript": "~4.5.17", - "@vue/cli-plugin-unit-jest": "^5.0.4", - "@vue/cli-service": "^4.5.4", "@vue/compiler-sfc": "^3.1.0", "@vue/eslint-config-typescript": "^7.0.0", "@vue/test-utils": "^1.1.0", @@ -220,12 +216,13 @@ "eslint": "7.32.0", "eslint-config-airbnb-base": "^14.2.0", "eslint-config-prettier": "^6.12.0", + "eslint-import-resolver-typescript": "^3.4.0", "eslint-import-resolver-webpack": "^0.12.2", "eslint-plugin-babel": "^5.3.1", "eslint-plugin-cypress": "^2.11.2", "eslint-plugin-import": "^2.22.0", "eslint-plugin-prettier": "^3.1.4", - "eslint-plugin-vue": "^6.2.2", + "eslint-plugin-vue": "^9.3.0", "eslint-plugin-vue-types": "^2.0.0", "husky": "^8.0.1", "is-ci": "^3.0.1", @@ -246,6 +243,7 @@ "postcss-atroot": "^0.1.3", "postcss-easings": "^2.0.0", "postcss-extend-rule": "^3.0.0", + "postcss-import": "^14.1.0", "postcss-nested": "^4.2.3", "postcss-nested-ancestors": "^2.0.0", "postcss-preset-env": "^6.7.0", @@ -267,6 +265,7 @@ "tailwindcss": "npm:@tailwindcss/postcss7-compat", "thread-loader": "^3.0.4", "typescript": "~4.1.5", + "vite": "^3.0.4", "vue-cli-plugin-cypress-experimental": "~1.1.0", "vue-docgen-api": "^4.32.4", "vue-docgen-loader": "^1.5.0", diff --git a/postcss.config.js b/postcss.config.js index f030757476..d0b0b5d219 100644 --- a/postcss.config.js +++ b/postcss.config.js @@ -12,6 +12,7 @@ module.exports = { require('postcss-preset-env')({ stage: 1, }), + require('postcss-import'), require('postcss-atroot'), require('postcss-property-lookup'), require('postcss-nested-ancestors'), diff --git a/src/App.vue b/src/App.vue index 69b490e822..a83d415e45 100644 --- a/src/App.vue +++ b/src/App.vue @@ -13,139 +13,138 @@ -