Skip to content

Commit

Permalink
refactor: move project into app package
Browse files Browse the repository at this point in the history
  • Loading branch information
EricRovell committed Mar 1, 2024
1 parent 1ef8b15 commit 5be15d0
Show file tree
Hide file tree
Showing 500 changed files with 1,839 additions and 1,825 deletions.
3 changes: 2 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
**/build
svelte.config.js
mdsvex.config.js
vite.config.js
vite.config.js
40 changes: 28 additions & 12 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,23 +1,32 @@
{
"env": {
"browser": true,
"es2021": true
},
"globals": {
"$$Generic": "readonly"
"es2021": true,
"node": true
},
"extends": [
"plugin:svelte/recommended",
"eslint:recommended",
"plugin:@typescript-eslint/recommended",
"plugin:@typescript-eslint/recommended-requiring-type-checking"
"plugin:@typescript-eslint/recommended-requiring-type-checking",
"plugin:svelte/recommended"
],
"parser": "@typescript-eslint/parser",
"parserOptions": {
"ecmaVersion": 2022,
"ecmaVersion": "latest",
"sourceType": "module",
"extraFileExtensions": [ ".svelte" ],
"project": "./tsconfig.json"
"extraFileExtensions": [
".svelte"
],
"project": [
"./tsconfig.base.json",
"./src/**/tsconfig.json"
]
},
"globals": {
"__dirname": true,
"Nullable": true,
"Optional": true,
"$$Generic": true
},
"overrides": [
{
Expand All @@ -32,11 +41,16 @@
"svelte3/typescript": true
},
"plugins": [
"@typescript-eslint",
"perfectionist"
"@typescript-eslint"
],
"rules": {
"no-self-assign": "off",
"no-console": [ "error", {
"allow": [
"warn",
"error"
]
}],
"svelte/no-at-html-tags": "off",
"@typescript-eslint/no-unsafe-assignment": "off",
"@typescript-eslint/no-unsafe-call": "off",
Expand All @@ -58,6 +72,8 @@
"indent": [ "error", "tab", { "SwitchCase": 1 } ],
"linebreak-style": 0,
"quotes": [ "error","double" ],
"semi": [ "error", "always" ]
"semi": [ "error", "always" ],
"no-var": "error",
"curly": "error"
}
}
23 changes: 11 additions & 12 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,22 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [ 18.x ]
node-version: [ 20.x ]

steps:
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: setup node
uses: actions/setup-node@master
with:
node-version: ${{ matrix.node-version }}

- name: install pnpm
run: npm i pnpm -g

- name: install dependencies
run: |
npm i pnpm -g
pnpm i
run: pnpm i -r

- name: lint
run: |
Expand All @@ -40,23 +41,21 @@ jobs:
pnpm run lint:types
- name: unit testing
run: |
pnpm run test:unit:ci
run: pnpm run test:unit:ci

- name: unit test coverage report
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: coverage
path: ./coverage
if-no-files-found: error

- name: build
run: |
pnpm run build
run: pnpm run build

- name: build artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: build
path: ./build
path: ./src/apps/escapist-marginalia/build
if-no-files-found: error
35 changes: 0 additions & 35 deletions .github/workflows/deploy-vercel-prod.yaml

This file was deleted.

39 changes: 39 additions & 0 deletions .github/workflows/deploy-vercel-production.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# Deploys the production version of "Photo Companion" to vercel
name: deploy-vercel-production
env:
VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }}

on:
push:
branches:
- main
workflow_dispatch:

jobs:
build-workflow:
uses: ./.github/workflows/build.yaml

deploy-to-vercel:
needs: build-workflow
runs-on: ubuntu-latest
steps:

- name: checkout
uses: actions/checkout@v4

- uses: pnpm/[email protected]
with:
version: latest

- name: install Vercel CLI
run: pnpm i vercel -g

- name: Pull Vercel Environment Information
run: vercel pull --yes --environment=production --token=${{ secrets.VERCEL_TOKEN }}

- name: Build Project Artifacts
run: vercel build --prod --token=${{ secrets.VERCEL_TOKEN }}

- name: Deploy Project Artifacts to Vercel
run: vercel deploy --prebuilt --prod --token=${{ secrets.VERCEL_TOKEN }}
44 changes: 0 additions & 44 deletions .github/workflows/gh-pages.yaml

This file was deleted.

18 changes: 9 additions & 9 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
/.svelte-kit
/build
/node_modules
*/**/node_modules
/static/img/*
/src/data/gallery.json
/workfiles
.env
.svelte-kit
.vercel

coverage
build
node_modules
vite.config.js.timestamp*
*/**/.env
/coverage

/static/img/*
/workfiles

/image-generate/**/*.JPG
/image-generate/**/*.jpeg
Expand Down
18 changes: 12 additions & 6 deletions .stylelintrc.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,25 @@
{
"extends": [
"stylelint-config-standard",
"stylelint-stylistic/config"
"stylelint-config-standard"
],
"ignoreFiles": [
"**/dist/**/*.css",
"**/build/**/*.css"
],
"plugins": [
"@stylistic/stylelint-plugin"
],
"rules": {
"no-descending-specificity": null,
"stylistic/indentation": "tab",
"selector-pseudo-class-no-unknown": [ true, {
"ignorePseudoClasses": [ "global" ]
"ignorePseudoClasses": [ "global" ]
}],
"stylistic/color-hex-case": "upper",
"property-no-unknown": [ true, {
"ignoreProperties": [
"composes"
]
}]
}],
"@stylistic/indentation": "tab",
"@stylistic/color-hex-case": "upper"
}
}
Loading

0 comments on commit 5be15d0

Please sign in to comment.