Skip to content

Commit

Permalink
Merge pull request #82 from ShotaroMatsuya/ShotaroMatsuya/issue75
Browse files Browse the repository at this point in the history
Typescriptへの移行
  • Loading branch information
ShotaroMatsuya authored Apr 28, 2023
2 parents 9349941 + 3dba7ee commit e090591
Show file tree
Hide file tree
Showing 20 changed files with 7,629 additions and 20,601 deletions.
1 change: 1 addition & 0 deletions .browserslistrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
> 1%
last 2 versions
not dead
not ie 11
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
- npm-
- run:
name: Install dependencies
command: npm ci
command: npm install
- save_cache:
paths:
- node_modules
Expand Down
2 changes: 2 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
**/node_modules/
**/dist/
26 changes: 12 additions & 14 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,32 +1,30 @@
module.exports = {
root: true,

env: {
node: true,
node: true
},

extends: [
'extends': [
'plugin:vue/vue3-essential',
'eslint:recommended',
'prettier',
'@vue/typescript/recommended',
'prettier'
],
parserOptions: {
parser: 'babel-eslint',
ecmaVersion: 2020
},
rules: {
'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off'
},

overrides: [
{
files: [
'**/__tests__/*.{j,t}s?(x)',
'**/tests/unit/**/*.spec.{j,t}s?(x)',
'**/tests/unit/**/*.spec.{j,t}s?(x)'
],
env: {
jest: true,
},
},
],
};
jest: true
}
}
]
}
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
node_modules
/dist


# local env files
.env.local
.env.*.local
Expand All @@ -14,7 +15,7 @@ pnpm-debug.log*

# Editor directories and files
.idea
.vscode
# .vscode
*.suo
*.ntvs*
*.njsproj
Expand Down
21 changes: 21 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"configurations": [
{
"type": "aws-sam",
"request": "direct-invoke",
"name": "API ai-backend:GetStatusFunction",
"invokeTarget": {
"target": "api",
"templatePath": "${workspaceFolder}/ai-backend/template.yaml",
"logicalId": "GetStatusFunction"
},
"api": {
"path": "/",
"httpMethod": "get",
"payload": {
"json": {}
}
}
}
]
}
9 changes: 9 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"typescript.tsdk": "./node_modules/typescript/lib",
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
},
"eslint.validate": [
"typescript"
]
}
6 changes: 3 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ services:
- 8080:8080
volumes:
- ./:/app
- node_modules:/app/node_modules
- node_modules:/app/node_modules:delegated
npm:
image: shotaromatsuya/fbj:16
working_dir: /app
entrypoint: ['npm']
user: 'node:node'
volumes:
- ./:/app
- node_modules:/app/node_modules
- node_modules:/app/node_modules:delegated
cypress:
build:
context: ./cypress
Expand All @@ -35,7 +35,7 @@ services:
# - NODE_ENV=development
entrypoint: ['./node_modules/.bin/cypress']
volumes:
- node_modules:/app/node_modules
- node_modules:/app/node_modules:delegated
- ./:/app
volumes:
node_modules:
Expand Down
2 changes: 1 addition & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = {
preset: '@vue/cli-plugin-unit-jest'
preset: '@vue/cli-plugin-unit-jest/presets/typescript-and-babel'
}
3 changes: 3 additions & 0 deletions lint-staged.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module.exports = {
'*.{js,jsx,vue,ts,tsx}': 'vue-cli-service lint'
}
Loading

0 comments on commit e090591

Please sign in to comment.