Skip to content

Commit

Permalink
Merge branch 'main' into liamdebeasi-patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
liamdebeasi authored Nov 27, 2023
2 parents f5008f5 + 0dbbebf commit 599d468
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 9 deletions.
2 changes: 1 addition & 1 deletion angular-standalone/base/src/main.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { enableProdMode, importProvidersFrom } from '@angular/core';
import { enableProdMode } from '@angular/core';
import { bootstrapApplication } from '@angular/platform-browser';
import { RouteReuseStrategy, provideRouter } from '@angular/router';
import { IonicRouteStrategy, provideIonicAngular } from '@ionic/angular/standalone';
Expand Down
2 changes: 2 additions & 0 deletions react-vite/base/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
"react-router-dom": "^5.3.4"
},
"devDependencies": {
"@testing-library/dom": ">=7.21.4",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^14.0.0",
"@testing-library/user-event": "^14.4.3",
Expand All @@ -34,6 +35,7 @@
"eslint": "^8.35.0",
"eslint-plugin-react": "^7.32.2",
"jsdom": "^22.1.0",
"terser": "^5.4.0",
"typescript": "^5.1.6",
"vite": "^4.3.9",
"vitest": "^0.32.2"
Expand Down
27 changes: 27 additions & 0 deletions vue-vite/base/.eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
.DS_Store
node_modules
/coverage
/dist
/ios
/android


# local env files
.env.local
.env.*.local

# Log files
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*

# Editor directories and files
.idea
.vscode
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw?

File renamed without changes.
13 changes: 7 additions & 6 deletions vue-vite/base/cypress.config.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import { defineConfig } from "cypress";
import { defineConfig } from 'cypress';

export default defineConfig({
e2e: {
supportFile: "tests/e2e/support/e2e.{js,jsx,ts,tsx}",
specPattern: "tests/e2e/specs/**/*.cy.{js,jsx,ts,tsx}",
videosFolder: "tests/e2e/videos",
screenshotsFolder: "tests/e2e/screenshots",
baseUrl: "http://localhost:5173",
supportFile: 'tests/e2e/support/e2e.{js,jsx,ts,tsx}',
specPattern: 'tests/e2e/specs/**/*.cy.{js,jsx,ts,tsx}',
videosFolder: 'tests/e2e/videos',
screenshotsFolder: 'tests/e2e/screenshots',
baseUrl: 'http://localhost:5173',
// eslint-disable-next-line @typescript-eslint/no-unused-vars
setupNodeEvents(on, config) {
// implement node event listeners here
},
Expand Down
4 changes: 2 additions & 2 deletions vue-vite/base/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"preview": "vite preview",
"test:e2e": "cypress run",
"test:unit": "vitest",
"lint": "eslint"
"lint": "eslint ."
},
"dependencies": {
"@ionic/vue": "^7.0.0",
Expand All @@ -21,7 +21,7 @@
"devDependencies": {
"@vitejs/plugin-legacy": "^4.0.2",
"@vitejs/plugin-vue": "^4.0.0",
"@vue/eslint-config-typescript": "^11.0.2",
"@vue/eslint-config-typescript": "^12.0.0",
"@vue/test-utils": "^2.3.0",
"cypress": "^12.7.0",
"eslint": "^8.35.0",
Expand Down

0 comments on commit 599d468

Please sign in to comment.