Skip to content

Commit 0362640

Browse files
committed
--wip-- [skip ci]
1 parent 57f2e71 commit 0362640

27 files changed

+1227
-6262
lines changed

.eslintrc.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,12 @@ module.exports = {
7070

7171
settings: {
7272
'import/resolver': {
73-
webpack: {
74-
config: './node_modules/@vue/cli-service/webpack.config.js',
73+
node: {
74+
paths: ['src'],
75+
extensions: ['.js', '.jsx', '.ts', '.tsx'],
76+
moduleDirectory: ['node_modules', 'src/'],
7577
},
78+
typescript: {},
7679
},
7780
},
7881
};

.storybook/preview.js

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
import '@/assets/css/tailwind.css';
2-
import Autocomplete from '@/components/Autocomplete';
3-
import Badge from '@/components/Badge';
4-
import BaseButton from '@/components/BaseButton';
5-
import BaseCheckbox from '@/components/BaseCheckbox';
6-
import BaseIcon from '@/components/BaseIcon';
7-
import BaseInput from '@/components/BaseInput';
8-
import BaseLink from '@/components/BaseLink';
9-
import BaseRadio from '@/components/BaseRadio';
10-
import BaseText from '@/components/BaseText';
11-
import FormSelect from '@/components/FormSelect';
12-
import Modal from '@/components/Modal';
13-
import Spinner from '@/components/Spinner';
14-
import Tag from '@/components/Tag';
2+
import Autocomplete from '@/components/Autocomplete.vue';
3+
import Badge from '@/components/Badge.vue';
4+
import BaseButton from '@/components/BaseButton.vue';
5+
import BaseCheckbox from '@/components/BaseCheckbox.vue';
6+
import BaseIcon from '@/components/BaseIcon.vue';
7+
import BaseInput from '@/components/BaseInput.vue';
8+
import BaseLink from '@/components/BaseLink.vue';
9+
import BaseRadio from '@/components/BaseRadio.vue';
10+
import BaseText from '@/components/BaseText.vue';
11+
import FormSelect from '@/components/FormSelect.vue';
12+
import Modal from '@/components/Modal.vue';
13+
import Spinner from '@/components/Spinner.vue';
14+
import Tag from '@/components/Tag.vue';
1515
import VueCompositionApi from '@vue/composition-api';
1616
import VueI18n from 'vue-i18n';
1717
import {
@@ -22,8 +22,8 @@ import {
2222
secondsToHm,
2323
snakeToTitleCase,
2424
} from '@/filters';
25-
import Authenticated from '@/layouts/Authenticated';
26-
import Unauthenticated from '@/layouts/Unauthenticated';
25+
import Authenticated from '@/layouts/Authenticated.vue';
26+
import Unauthenticated from '@/layouts/Unauthenticated.vue';
2727
import { library } from '@fortawesome/fontawesome-svg-core';
2828
import { fas } from '@fortawesome/free-solid-svg-icons';
2929
import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
@@ -42,7 +42,6 @@ import Vue from 'vue';
4242
import VueAutosuggest from 'vue-autosuggest';
4343
import VueAxios from 'vue-axios';
4444
import Popover from 'vue-js-popover';
45-
import * as ModalDialogs from 'vue-modal-dialogs';
4645
import vSelect from 'vue-select';
4746
import Toasted from 'vue-toasted';
4847
// Import Vue plugins
@@ -80,7 +79,6 @@ Vue.config.productionTip = false;
8079
Vue.use(VueResize);
8180
Vue.use(VueAutosuggest);
8281
Vue.use(VTooltip);
83-
Vue.use(ModalDialogs);
8482
Vue.use(VueAxios, axios);
8583
Vue.use(require('vue-moment'), { moment });
8684

public/index.html renamed to index.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
;NREUM.info={beacon:"bam.nr-data.net",errorBeacon:"bam.nr-data.net",licenseKey:"NRJS-15c5a88c5d87c10da34",applicationID:"1046769301",sa:1}
1111
</script>
1212
<meta name="viewport" content="width=device-width,initial-scale=1.0, viewport-fit=cover">
13-
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
13+
<link rel="icon" href="favicon.ico">
1414
<link href="https://fonts.googleapis.com/css?family=Nunito+Sans:100, 300,400,500,600,700&display=swap" rel="stylesheet">
1515
<link href="https://fonts.googleapis.com/css?family=Montserrat:300,400,600,700&display=swap" rel="stylesheet">
1616
<script src="https://maps.googleapis.com/maps/api/js?key=<%= VUE_APP_GOOGLE_MAPS_API_KEY %>&libraries=places"></script>
@@ -34,6 +34,7 @@
3434
<strong>We're sorry but crisiscleanup doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
3535
</noscript>
3636
<div id="app"></div>
37-
<!-- built files will be auto injected -->
37+
<script type="module" src="/src/main.ts"></script>
3838
</body>
3939
</html>
40+

package.json

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
"lint-staged": "lint-staged",
2323
"postinstall": "yarn cache clean",
2424
"prettify": "prettier --write {.,**}/*.js **/*.vue **/**/*.{vue,js}",
25-
"serve-dev": "cross-env NODE_ENV=development NODE_IS_WATCH=1 vue-cli-service serve --mode development",
25+
"dev": "vite --port 8080",
26+
"serve-dev": "cross-env NODE_ENV=development NODE_IS_WATCH=1 vite",
2627
"serve-prod": "cross-env NODE_ENV=production NODE_IS_WATCH=1 vue-cli-service serve --mode production",
2728
"serve-staging": "cross-env NODE_ENV=staging NODE_IS_WATCH=1 vue-cli-service serve --mode staging",
2829
"storybook": "cross-env NODE_ENV=storybook start-storybook -p 6006",
@@ -57,7 +58,6 @@
5758
"@turf/turf": "^5.1.6",
5859
"@vue/babel-helper-vue-jsx-merge-props": "^1.2.1",
5960
"@vue/babel-preset-jsx": "^1.2.4",
60-
"@vue/cli": "4.5.17",
6161
"@vue/compat": "^3.1.0",
6262
"@vuex-orm/core": "^0.36.3",
6363
"@vuex-orm/plugin-axios": "^0.9.4",
@@ -188,13 +188,9 @@
188188
"@types/lodash": "^4.14.182",
189189
"@typescript-eslint/eslint-plugin": "^4.18.0",
190190
"@typescript-eslint/parser": "^4.18.0",
191+
"@vitejs/plugin-vue": "^3.0.1",
192+
"@vitejs/plugin-vue-jsx": "^2.0.0",
191193
"@vue/babel-preset-app": "^4.5.4",
192-
"@vue/cli-plugin-babel": "^4.5.11",
193-
"@vue/cli-plugin-e2e-cypress": "^4.5.6",
194-
"@vue/cli-plugin-eslint": "^4.5.6",
195-
"@vue/cli-plugin-typescript": "~4.5.17",
196-
"@vue/cli-plugin-unit-jest": "^5.0.4",
197-
"@vue/cli-service": "^4.5.4",
198194
"@vue/compiler-sfc": "^3.1.0",
199195
"@vue/eslint-config-typescript": "^7.0.0",
200196
"@vue/test-utils": "^1.1.0",
@@ -220,12 +216,13 @@
220216
"eslint": "7.32.0",
221217
"eslint-config-airbnb-base": "^14.2.0",
222218
"eslint-config-prettier": "^6.12.0",
219+
"eslint-import-resolver-typescript": "^3.4.0",
223220
"eslint-import-resolver-webpack": "^0.12.2",
224221
"eslint-plugin-babel": "^5.3.1",
225222
"eslint-plugin-cypress": "^2.11.2",
226223
"eslint-plugin-import": "^2.22.0",
227224
"eslint-plugin-prettier": "^3.1.4",
228-
"eslint-plugin-vue": "^6.2.2",
225+
"eslint-plugin-vue": "^9.3.0",
229226
"eslint-plugin-vue-types": "^2.0.0",
230227
"husky": "^8.0.1",
231228
"is-ci": "^3.0.1",
@@ -267,6 +264,7 @@
267264
"tailwindcss": "npm:@tailwindcss/postcss7-compat",
268265
"thread-loader": "^3.0.4",
269266
"typescript": "~4.1.5",
267+
"vite": "^3.0.4",
270268
"vue-cli-plugin-cypress-experimental": "~1.1.0",
271269
"vue-docgen-api": "^4.32.4",
272270
"vue-docgen-loader": "^1.5.0",

0 commit comments

Comments
 (0)