Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Vue 3 - Feature Branch Fold In #1642

Merged
merged 15 commits into from
Dec 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 4 additions & 0 deletions ppr-ui/.eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
node_modules/
dist/
public/
tests/
42 changes: 22 additions & 20 deletions ppr-ui/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,38 +1,40 @@
module.exports = {
root: true,
env: {
node: true
node: true,
es2022: true
},
plugins: ['vue'],
extends: [
'plugin:vue/essential',
'@vue/standard',
'@vue/typescript',
'plugin:vue/base',
'plugin:vuetify/base',
'plugin:vuetify/recommended'
'plugin:vue/vue3-recommended',
'@vue/typescript/recommended'
],
rules: {
'@typescript-eslint/no-explicit-any': 'off',
'@typescript-eslint/ban-ts-comment': 'off',
'@typescript-eslint/no-duplicate-enum-values': 'off',
'object-curly-spacing': ['error', 'always'],
'standard/computed-property-even-spacing': 'off',
'vue/multi-word-component-names': 'off',
'vue/no-side-effects-in-computed-properties': 'off',
'vue/valid-v-slot': ['error', { allowModifiers: true }],
'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
'max-len': ['warn', { code: 120, ignoreRegExpLiterals: true }]
'max-len': ['warn', { code: 120, ignoreRegExpLiterals: true }],
'vue/require-explicit-emits': 'error',
'vue/require-default-prop': 'error',
'vue/require-prop-types': 'error',
'vue/no-template-shadow': 'off',
'vue/attribute-hyphenation': 'off',
'vue/v-on-event-hyphenation': 'off',
'vue/prop-name-casing': ['error', 'camelCase'],
'vue/custom-event-name-casing': ['error', 'camelCase'],
'vue/no-v-html': 'off'
},
parser: 'vue-eslint-parser',
parserOptions: {
parser: '@typescript-eslint/parser',
plugins: ['@typescript-eslint']
},
overrides: [
{
files: [
'**/__tests__/*.{j,t}s?(x)',
'**/tests/unit/**/*.spec.{j,t}s?(x)'
],
env: {
jest: true
}
}
]
sourceType: 'module'
}
}
16 changes: 8 additions & 8 deletions ppr-ui/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
FROM node:15-buster as build-stage
FROM node:20.5.1 as build-stage
WORKDIR /app
COPY package*.json ./
RUN npm install
COPY ./ .
RUN npm run build

FROM nginx:1.18 as production-stage

ARG VCS_REF="missing"
ARG BUILD_DATE="missing"
Expand All @@ -9,13 +16,6 @@ ENV BUILD_DATE=${BUILD_DATE}
LABEL org.label-schema.vcs-ref=${VCS_REF} \
org.label-schema.build-date=${BUILD_DATE}

WORKDIR /app
COPY package*.json ./
RUN npm install
COPY ./ .
RUN npm run build

FROM nginx:1.18 as production-stage
COPY nginx.conf /etc/nginx/nginx.conf
RUN mkdir /app
COPY --from=build-stage /app/dist /app
Expand Down
5 changes: 0 additions & 5 deletions ppr-ui/babel.config.js

This file was deleted.

2 changes: 1 addition & 1 deletion ppr-ui/global.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
declare namespace jest {
declare namespace vitest {
interface Matchers<R> {
toHaveNoViolations(): R;
}
Expand Down
21 changes: 21 additions & 0 deletions ppr-ui/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<title>BC Personal Property Registry</title>
<link rel="icon" href="/favicon.png">
<link rel="stylesheet" href="/css/addresscomplete-2.30.min.css">
<script type="text/javascript" src="/js/addresscomplete-2.30.min.js" defer></script>
</head>
<body>
<noscript>
<strong>We're sorry but the BC Personal Property Registry doesn't work properly without JavaScript enabled.
Please enable it to continue.
</strong>
</noscript>
<div id="app"></div>
<script type="module" src="/src/main.ts"></script>
</body>
</html>
14 changes: 0 additions & 14 deletions ppr-ui/jest.config.js

This file was deleted.

Loading
Loading