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

Vue3 upgrade #296

Open
wants to merge 26 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
80d4b3e
Initial changes for vue3 upgrade
vvi230714 Jan 17, 2024
ac6747d
Updated webpack vue loader config
vvi230714 Jan 31, 2024
4e4f736
First no error Vite Build
vvi230714 Feb 1, 2024
bf32656
Vite testing updates
vvi230714 Feb 6, 2024
fb91c9c
Updates to try to get something to render
pwolanin Feb 21, 2024
5e5c648
Merge remote-tracking branch 'origin/master' into vue3-upgrade
pwolanin Feb 21, 2024
e869255
add back bulma scss
pwolanin Mar 13, 2024
ce1ad61
update leaflet use
pwolanin Mar 13, 2024
56b999d
vue-leaflet fixes
vvi230714 Apr 14, 2024
c1e1902
Trying to get zoomToWard to work again
pwolanin Apr 17, 2024
a8d6cbe
removed all vue filters
vvi230714 Apr 18, 2024
367a3f0
Quick fix for hover tips
pwolanin May 8, 2024
6fb754b
rm mapzen and update node version for actions
pwolanin May 14, 2024
54ad9ab
try to get action to run
pwolanin May 14, 2024
ca7445a
color fix
pwolanin May 15, 2024
3918cb5
deploy action fix
pwolanin May 15, 2024
df98caa
First working test
vvi230714 Jul 4, 2024
514b00e
Commit to resolve issues caused by last merge
vvi230714 Jul 29, 2024
a05da70
Fixed committe person and added verbose mode to jest
vvi230714 Aug 3, 2024
c75dac8
Fixed content-page test
vvi230714 Aug 13, 2024
b7b8fed
updated package lock
vvi230714 Aug 21, 2024
74f64d8
update CI action versions
pwolanin Sep 11, 2024
281a013
Unit Test Fixes
vvi230714 Sep 16, 2024
2f919fe
trying to get jest to work
pwolanin Sep 25, 2024
b2a9a2d
See if we can do test builds
pwolanin Dec 11, 2024
e943f31
removed buefy from test
vvi230714 Dec 13, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 6 additions & 20 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,28 +1,14 @@
{
"presets": [
["env", {
modules: false,
useBuiltIns: true,
targets: {
browsers: [
'> 1%',
'last 2 versions'
]
["@babel/preset-env", {
"useBuiltIns": "entry",
"targets": {
"node": "current"
}
}]
],
"plugins": [
'@babel/plugin-transform-modules-commonjs',
"transform-object-rest-spread"
],
"env": {
"test": {
"presets": [
["env", {
targets: {
"node": "current"
}
}]
]
}
}
]
}
10 changes: 5 additions & 5 deletions .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,20 @@ jobs:

strategy:
matrix:
node-version: [14.x]
node-version: [20.x]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'
- run: npm ci
- run: npm run lint
# - run: npm run lint
- run: npm run build
- run: npm test
# - run: npm test
- run: npm run e2e-ci
- name: Upload E2E Test Report
uses: actions/upload-artifact@v3
Expand Down
14 changes: 11 additions & 3 deletions .github/workflows/pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,22 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v3
with:
node-version: 14.x
node-version: 20.x
cache: 'npm'
- run: npm ci
- run: npm run build

# Deployment job
- name: Deploy 🚀
if: ${{ github.ref_name == 'master' }}
uses: JamesIves/[email protected]
with:
with:
BRANCH: gh-pages # The branch the action should deploy to.
FOLDER: public # The folder the action should deploy.
FOLDER: build # The folder the action should deploy.
- name: Test build
if: ${{ github.ref_name != 'master' }}
uses: JamesIves/[email protected]
with:
BRANCH: gh-pages-test # The branch the action should deploy to.
FOLDER: build # The folder the action should deploy.

5 changes: 3 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
.DS_Store
node_modules/
build/
public/build.js
public/build.js.map
public/assets
Expand All @@ -8,7 +9,7 @@ yarn-error.log
data-scripts/venv
data-scripts/__pycache__
data-scripts/*.pyc

public/build
# Editor directories and files
.idea
*.suo
Expand All @@ -17,4 +18,4 @@ data-scripts/*.pyc
*.sln
/test-results/
/playwright-report/
/playwright/.cache/
/playwright/.cache/
12 changes: 0 additions & 12 deletions .travis.yml

This file was deleted.

4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM node:14-alpine3.15
RUN apk update && apk add --no-cache bash
FROM node:20-alpine3.18
RUN apk update && apk add --no-cache bash && apk add --no-cache python3
ENTRYPOINT ["bash"]
14 changes: 14 additions & 0 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
module.exports = {
"presets": [
["@babel/preset-env", {
"useBuiltIns": "entry",
"targets": {
"node": "current"
}
}]
],
"plugins": [
'@babel/plugin-transform-modules-commonjs',
"transform-object-rest-spread"
]
}
34 changes: 34 additions & 0 deletions index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>Philly Ward Leaders</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<!-- Handle redirects from the 404.html page -->
<script>
(function(){
let redirect = sessionStorage.getItem("redirect");
sessionStorage.removeItem("redirect");
if (redirect && redirect != window.location.href) {
history.replaceState(null, '', redirect);
}
})();
</script>
<!-- Google tag (gtag.js) -->
<script async src="https://www.googletagmanager.com/gtag/js?id=G-HRS8RKQCQB"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());

gtag('config', 'G-HRS8RKQCQB');
</script>
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
</head>
<body>
<div id="app"></div>
<script type="module" src="/src/main.js"></script>
</body>
</html>
35 changes: 35 additions & 0 deletions jest.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
module.exports = {
testPathIgnorePatterns: [
"/node_modules/",
"<rootDir>/tests/app.spec.js"
],
testMatch: [
'**/tests/**/*.spec.[jt]s?(x)',
'**/__tests__/*.[jt]s?(x)'
],
moduleFileExtensions: [
"js",
"json",
"vue"
],
transformIgnorePatterns: ['node_modules/(?!(nanoid)/)'],
transform: {
".*\\.(vue)$": "@vue/vue3-jest",
"^.+\\.js$": "babel-jest"
},
snapshotSerializers: [
"jest-serializer-vue"
],
collectCoverageFrom: [
"src/**/*.{js,vue}"
],
testEnvironment: 'jsdom',
testEnvironmentOptions: {
customExportConditions: ["node", "node-addons"],
setupFiles: ['jest.setup.js'],
verbose: true
},
moduleNameMapper: {
'\\.(css|less)$': '<rootDir>/tests/testMocks.js'
}
}
10 changes: 10 additions & 0 deletions jest.setup.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { config } from '@vue/test-utils';

config.global.stubs = {
'router-link': {
template: '<a><slot /></a>'
},
'router-view': {
template: '<div><slot /></div>'
}
};
Loading
Loading