Skip to content
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: '20'
cache: 'yarn'
node-version: '24'
cache: 'npm'

- name: Install dependencies
run: yarn
run: npm i

- name: Store Playwright's Version
run: |
Expand All @@ -29,10 +29,10 @@ jobs:
path: ~/.cache/ms-playwright
key: playwright-browsers-${{ env.PLAYWRIGHT_VERSION }}

- run: yarn playwright install
- run: npm playwright install
if: steps.cache-playwright-browsers.outputs.cache-hit != 'true'

- name: Lint and Test
run: |
yarn lint
yarn e2e
npm run lint
npm run e2e
10 changes: 0 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
# Node
/node_modules
npm-debug.log
yarn-error.log

# IDEs and editors
.idea/
Expand Down Expand Up @@ -40,12 +39,3 @@ testem.log
# System files
.DS_Store
Thumbs.db

# from https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored
.pnp.*
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v20.17.0
24
925 changes: 0 additions & 925 deletions .yarn/releases/yarn-4.4.1.cjs

This file was deleted.

7 changes: 0 additions & 7 deletions .yarnrc.yml

This file was deleted.

7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,10 @@ This is a web page for displaying the order of comics in the Uncanny X-Men serie

## Developer notes

To run it locally, you need to have `yarn` installed. See instructions for installing it at https://yarnpkg.com/en/docs/install
You can then install the dependencies by running `yarn`, then launch the server locally with `yarn dev`. It will open itself in your default web browser.
You can install the dependencies by running `npm i`, then launch the server locally with `npm dev`. It will open itself in your default web browser.

Each push will trigger a Travis build which will run ESLint and stylelint. If either of them report errors, any Pull Request related to the branch will be prevented from being merged. A Heroku Review App is created for each Pull Request. To check linting run `yarn lint`.
Each push will trigger a Travis build which will run ESLint and stylelint. If either of them report errors, any Pull Request related to the branch will be prevented from being merged. A Heroku Review App is created for each Pull Request. To check linting run `npm lint`.

To run tests locally run `yarn e2e`
To run tests locally run `npm e2e`

There is a garbage collection functionality built-in to check the database for orphans. It can be run by adding `gc=1` to the URL, e.g. `http://localhost:4200/?gc=1` and looking in the browser console.
46 changes: 36 additions & 10 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,16 @@
"prefix": "app",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"builder": "@angular-devkit/build-angular:application",
"options": {
"outputPath": "dist/timeline-tools",
"outputPath": {
"base": "dist/timeline-tools"
},
"index": "src/index.html",
"inlineStyleLanguage": "scss",
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
"polyfills": [
"src/polyfills.ts"
],
"tsConfig": "tsconfig.app.json",
"assets": [
"src/favicon.ico",
Expand All @@ -35,12 +38,11 @@
"allowedCommonJsDependencies": [
"jquery"
],
"vendorChunk": true,
"extractLicenses": false,
"buildOptimizer": false,
"sourceMap": true,
"optimization": false,
"namedChunks": true
"namedChunks": true,
"browser": "src/main.ts"
},
"configurations": {
"production": {
Expand All @@ -55,8 +57,6 @@
"sourceMap": false,
"namedChunks": false,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
"budgets": [
{
"type": "initial",
Expand Down Expand Up @@ -140,10 +140,36 @@
}
},
"cli": {
"packageManager": "yarn",
"packageManager": "npm",
"analytics": "4548fde3-7ce7-43ba-8fd4-4cc0bf8c4630",
"schematicCollections": [
"@angular-eslint/schematics"
]
},
"schematics": {
"@schematics/angular:component": {
"type": "component"
},
"@schematics/angular:directive": {
"type": "directive"
},
"@schematics/angular:service": {
"type": "service"
},
"@schematics/angular:guard": {
"typeSeparator": "."
},
"@schematics/angular:interceptor": {
"typeSeparator": "."
},
"@schematics/angular:module": {
"typeSeparator": "."
},
"@schematics/angular:pipe": {
"typeSeparator": "."
},
"@schematics/angular:resolver": {
"typeSeparator": "."
}
}
}
Loading