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

fix: line endings issue and missing lockfile #14

Merged
merged 8 commits into from
May 10, 2024
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
42 changes: 21 additions & 21 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
{
"files": ["README.md"],
"imageSize": 100,
"commit": false,
"contributors": [
{
"login": "nickelsh1ts",
"name": "nickelsh1ts",
"avatar_url": "https://avatars.githubusercontent.com/u/76549245?v=4",
"profile": "https://www.nickelsh1ts.com",
"contributions": ["code", "design", "ideas", "test"]
}
],
"contributorsPerLine": 7,
"projectName": "streamarr",
"projectOwner": "nickelsh1ts",
"repoType": "github",
"repoHost": "https://github.com",
"skipCi": true,
"commitType": "docs",
"commitConvention": "angular"
{
"files": ["README.md"],
"imageSize": 100,
"commit": false,
"contributors": [
{
"login": "nickelsh1ts",
"name": "nickelsh1ts",
"avatar_url": "https://avatars.githubusercontent.com/u/76549245?v=4",
"profile": "https://www.nickelsh1ts.com",
"contributions": ["code", "design", "ideas", "test"]
}
],
"contributorsPerLine": 7,
"projectName": "streamarr",
"projectOwner": "nickelsh1ts",
"repoType": "github",
"repoHost": "https://github.com",
"skipCi": true,
"commitType": "docs",
"commitConvention": "angular"
}
44 changes: 22 additions & 22 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
**/.gitkeep
**/.vscode
.all-contributorsrc
.dockerignore
.editorconfig
.eslintrc.js
.git
.gitbook.yaml
.gitconfig
.github
.gitignore
.husky
.next
.prettierignore
.yarn
Dockerfile*
docker-compose.yml
node_modules
LICENSE
public/preview.jpg
stylelint.config.js
cypress
**/.gitkeep
**/.vscode
.all-contributorsrc
.dockerignore
.editorconfig
.eslintrc.js
.git
.gitbook.yaml
.gitconfig
.github
.gitignore
.husky
.next
.prettierignore
.yarn
Dockerfile*
docker-compose.yml
node_modules
LICENSE
public/preview.jpg
stylelint.config.js
cypress
next-env.d.ts
26 changes: 13 additions & 13 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# editorconfig.org
root = true
[*]
charset = utf-8
end_of_line = lf
insert_final_newline = true
indent_style = space
indent_size = 2
trim_trailing_whitespace = true
[*.md]
# editorconfig.org

root = true

[*]
charset = utf-8
end_of_line = lf
insert_final_newline = true
indent_style = space
indent_size = 2
trim_trailing_whitespace = true

[*.md]
trim_trailing_whitespace = false
132 changes: 66 additions & 66 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,67 +1,67 @@
module.exports = {
root: true,
parser: '@typescript-eslint/parser', // Specifies the ESLint parser
extends: [
'eslint:recommended',
'plugin:@typescript-eslint/recommended', // Uses the recommended rules from the @typescript-eslint/eslint-plugin
'plugin:jsx-a11y/recommended',
'plugin:react/recommended',
'plugin:react-hooks/recommended',
'plugin:react/jsx-runtime',
'prettier',
],
parserOptions: {
ecmaVersion: 6,
sourceType: 'module',
ecmaFeatures: {
jsx: true,
},
},
rules: {
'@typescript-eslint/camelcase': 0,
'@typescript-eslint/no-use-before-define': 0,
'jsx-a11y/no-noninteractive-tabindex': 0,
'arrow-parens': 'off',
'jsx-a11y/anchor-is-valid': 'off',
'react-hooks/rules-of-hooks': 'error',
'react-hooks/exhaustive-deps': 'warn',
'@typescript-eslint/explicit-function-return-type': 'off',
'formatjs/no-offset': 'error',
'no-unused-vars': 'off',
'@typescript-eslint/no-unused-vars': ['error'],
'@typescript-eslint/array-type': ['error', { default: 'array' }],
'jsx-a11y/no-onchange': 'off',
'@typescript-eslint/consistent-type-imports': [
'error',
{
prefer: 'type-imports',
},
],
'no-relative-import-paths/no-relative-import-paths': [
'error',
{ allowSameFolder: true },
],
},
overrides: [
{
files: ['src/**/*.tsx'],
rules: {
'react/prop-types': 'off',
},
},
],
plugins: ['jsx-a11y', 'react-hooks', 'formatjs', 'no-relative-import-paths'],
settings: {
react: {
pragma: 'React',
version: '18.2',
},
},
env: {
browser: true,
node: true,
jest: true,
es6: true,
},
reportUnusedDisableDirectives: true,
module.exports = {
root: true,
parser: '@typescript-eslint/parser', // Specifies the ESLint parser
extends: [
'eslint:recommended',
'plugin:@typescript-eslint/recommended', // Uses the recommended rules from the @typescript-eslint/eslint-plugin
'plugin:jsx-a11y/recommended',
'plugin:react/recommended',
'plugin:react-hooks/recommended',
'plugin:react/jsx-runtime',
'prettier',
],
parserOptions: {
ecmaVersion: 6,
sourceType: 'module',
ecmaFeatures: {
jsx: true,
},
},
rules: {
'@typescript-eslint/camelcase': 0,
'@typescript-eslint/no-use-before-define': 0,
'jsx-a11y/no-noninteractive-tabindex': 0,
'arrow-parens': 'off',
'jsx-a11y/anchor-is-valid': 'off',
'react-hooks/rules-of-hooks': 'error',
'react-hooks/exhaustive-deps': 'warn',
'@typescript-eslint/explicit-function-return-type': 'off',
'formatjs/no-offset': 'error',
'no-unused-vars': 'off',
'@typescript-eslint/no-unused-vars': ['error'],
'@typescript-eslint/array-type': ['error', { default: 'array' }],
'jsx-a11y/no-onchange': 'off',
'@typescript-eslint/consistent-type-imports': [
'error',
{
prefer: 'type-imports',
},
],
'no-relative-import-paths/no-relative-import-paths': [
'error',
{ allowSameFolder: true },
],
},
overrides: [
{
files: ['src/**/*.tsx'],
rules: {
'react/prop-types': 'off',
},
},
],
plugins: ['jsx-a11y', 'react-hooks', 'formatjs', 'no-relative-import-paths'],
settings: {
react: {
pragma: 'React',
version: '18.2',
},
},
env: {
browser: true,
node: true,
jest: true,
es6: true,
},
reportUnusedDisableDirectives: true,
};
28 changes: 14 additions & 14 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
version: 2
updates:
- package-ecosystem: 'npm'
directory: '/'
schedule:
interval: 'weekly'
- package-ecosystem: 'github-actions'
directory: '/'
schedule:
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file

version: 2
updates:
- package-ecosystem: 'npm'
directory: '/'
schedule:
interval: 'weekly'
- package-ecosystem: 'github-actions'
directory: '/'
schedule:
interval: 'weekly'
4 changes: 2 additions & 2 deletions .github/workflows/cypress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ jobs:
with:
build: yarn build
start: yarn start
wait-on: 'http://localhost:3024'
wait-on: 'http://localhost:3000'
record: true
parallel: true # Runs test in parallel using settings above
env:
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
WITH_MIGRATIONS: tr
COMMIT_INFO_MESSAGE: ${{github.event.pull_request.title}}
COMMIT_INFO_SHA: ${{github.event.pull_request.head.sha}}
COMMIT_INFO_SHA: ${{github.event.pull_request.head.sha}}
16 changes: 8 additions & 8 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Generated files which we would not like to format
.next/
dist/
config/
# assets
src/assets/
public/*
# Generated files which we would not like to format
.next/
dist/
config/

# assets
src/assets/
public/*
!public/*.html
6 changes: 3 additions & 3 deletions .prettierrc.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module.exports = {
singleQuote: true,
trailingComma: 'es5',
module.exports = {
singleQuote: true,
trailingComma: 'es5',
};
26 changes: 13 additions & 13 deletions cypress.config.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { defineConfig } from 'cypress';
export default defineConfig({
projectId: '',
e2e: {
baseUrl: 'http://localhost:3000',
},
env: {},
retries: {
runMode: 2,
openMode: 0,
},
});
import { defineConfig } from 'cypress';

export default defineConfig({
projectId: 'ou397k',
e2e: {
baseUrl: 'http://localhost:3000',
},
env: {},
retries: {
runMode: 2,
openMode: 0,
},
});
20 changes: 10 additions & 10 deletions cypress/config/settings.cypress.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"clientId": "6919275e-142a-48d8-be6b-93594cbd4626",
"main": {
"apiKey": "testkey",
"applicationTitle": "Streamarr",
"applicationUrl": "",
"region": "",
"originalLanguage": "",
"locale": "en"
}
{
"clientId": "6919275e-142a-48d8-be6b-93594cbd4626",
"main": {
"apiKey": "testkey",
"applicationTitle": "Streamarr",
"applicationUrl": "",
"region": "",
"originalLanguage": "",
"locale": "en"
}
}
Loading