From 275b43e507ab1ac6b64f2107fece054db09a1ac0 Mon Sep 17 00:00:00 2001 From: solufa Date: Fri, 26 Jun 2020 21:44:00 +0900 Subject: [PATCH 01/10] chore: create dependabot.yml --- .dependabot/config.yml | 19 ------------------- .github/dependabot.yml | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 19 deletions(-) delete mode 100644 .dependabot/config.yml create mode 100644 .github/dependabot.yml diff --git a/.dependabot/config.yml b/.dependabot/config.yml deleted file mode 100644 index c7d4c698..00000000 --- a/.dependabot/config.yml +++ /dev/null @@ -1,19 +0,0 @@ -version: 1 - -update_configs: - - package_manager: "javascript" - directory: "/" - update_schedule: "live" - target_branch: "develop" - version_requirement_updates: "increase_versions" - commit_message: - prefix: "fix" - prefix_development: "chore" - include_scope: true - automerged_updates: - - match: - dependency_type: "development" - update_type: "semver:minor" - - match: - dependency_type: "production" - update_type: "semver:patch" diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..fec87921 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,16 @@ +# 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://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates + +version: 2 +updates: + - package-ecosystem: "npm" # See documentation for possible values + directory: "/" # Location of package manifests + schedule: + interval: "weekly" + target-branch: "develop" + versioning-strategy: "increase" + commit-message: + prefix: "fix" + prefix-development: "chore" From cbb049af4b061dc6431e1236c102032ccb2a38be Mon Sep 17 00:00:00 2001 From: solufa Date: Sat, 27 Jun 2020 14:55:50 +0900 Subject: [PATCH 02/10] feat: update frourio@0.10.2 --- templates/aspida/next/axios/package.json | 2 +- .../aspida/next/axios/utils/apiClient.ts | 5 - templates/aspida/next/fetch/package.json | 2 +- .../aspida/next/fetch/utils/apiClient.ts | 4 - templates/aspida/nuxt/axios/nuxt.config.ts | 5 +- templates/aspida/nuxt/axios/package.json | 4 +- templates/aspida/nuxt/fetch/nuxt.config.ts | 6 - templates/aspida/nuxt/fetch/package.json | 2 +- templates/aspida/nuxt/fetch/plugins/api.ts | 3 +- templates/common/{ => server}/.env | 1 + templates/common/server/aspida.config.js | 5 + templates/common/server/service/envValues.ts | 2 +- templates/front/next/_package.json | 8 +- templates/front/next/next.config.js | 7 - templates/front/next/utils/apiClient.ts | 4 + templates/front/none/_package.json | 8 +- templates/front/nuxt/_package.json | 8 +- test/snapshots/index.test.js.md | 223 +++++++++--------- test/snapshots/index.test.js.snap | Bin 5610 -> 5799 bytes 19 files changed, 140 insertions(+), 159 deletions(-) delete mode 100644 templates/aspida/next/axios/utils/apiClient.ts delete mode 100644 templates/aspida/next/fetch/utils/apiClient.ts rename templates/common/{ => server}/.env (63%) create mode 100644 templates/common/server/aspida.config.js delete mode 100644 templates/front/next/next.config.js create mode 100644 templates/front/next/utils/apiClient.ts diff --git a/templates/aspida/next/axios/package.json b/templates/aspida/next/axios/package.json index f308a28d..bbc76ba2 100644 --- a/templates/aspida/next/axios/package.json +++ b/templates/aspida/next/axios/package.json @@ -1,6 +1,6 @@ { "dependencies": { - "@aspida/axios": "^0.8.0", + "@aspida/axios": "^0.9.3", "axios": "^0.19.2" } } diff --git a/templates/aspida/next/axios/utils/apiClient.ts b/templates/aspida/next/axios/utils/apiClient.ts deleted file mode 100644 index 0f00bc95..00000000 --- a/templates/aspida/next/axios/utils/apiClient.ts +++ /dev/null @@ -1,5 +0,0 @@ -import axios from 'axios' -import aspida from '@aspida/axios' -import api from '~/server/api/$api' - -export const apiClient = api(aspida(axios, { baseURL: process.env.BASE_URL })) diff --git a/templates/aspida/next/fetch/package.json b/templates/aspida/next/fetch/package.json index 8f0d9570..88b04abf 100644 --- a/templates/aspida/next/fetch/package.json +++ b/templates/aspida/next/fetch/package.json @@ -1,5 +1,5 @@ { "dependencies": { - "@aspida/fetch": "^0.6.0" + "@aspida/fetch": "^0.7.3" } } diff --git a/templates/aspida/next/fetch/utils/apiClient.ts b/templates/aspida/next/fetch/utils/apiClient.ts deleted file mode 100644 index 4ff5dfd9..00000000 --- a/templates/aspida/next/fetch/utils/apiClient.ts +++ /dev/null @@ -1,4 +0,0 @@ -import aspida from '@aspida/fetch' -import api from '~/server/api/$api' - -export const apiClient = api(aspida(fetch, { baseURL: process.env.BASE_URL })) diff --git a/templates/aspida/nuxt/axios/nuxt.config.ts b/templates/aspida/nuxt/axios/nuxt.config.ts index f13a1a94..d68a1bfe 100644 --- a/templates/aspida/nuxt/axios/nuxt.config.ts +++ b/templates/aspida/nuxt/axios/nuxt.config.ts @@ -1,7 +1,4 @@ import { Configuration } from '@nuxt/types' -import dotenv from 'dotenv' - -dotenv.config() const config: Configuration = { mode: '<%= mode %>', @@ -56,7 +53,7 @@ const config: Configuration = { ** See https://axios.nuxtjs.org/options */ axios: { - baseURL: `http://localhost:${process.env.SERVER_PORT}${process.env.BASE_PATH}` + baseURL: require('./server/aspida.config').baseURL }, /* ** Build configuration diff --git a/templates/aspida/nuxt/axios/package.json b/templates/aspida/nuxt/axios/package.json index f308a28d..18f52d95 100644 --- a/templates/aspida/nuxt/axios/package.json +++ b/templates/aspida/nuxt/axios/package.json @@ -1,6 +1,6 @@ { "dependencies": { - "@aspida/axios": "^0.8.0", - "axios": "^0.19.2" + "@aspida/axios": "^0.9.3", + "@nuxtjs/axios": "^5.3.6" } } diff --git a/templates/aspida/nuxt/fetch/nuxt.config.ts b/templates/aspida/nuxt/fetch/nuxt.config.ts index 9a8ed050..5707190d 100644 --- a/templates/aspida/nuxt/fetch/nuxt.config.ts +++ b/templates/aspida/nuxt/fetch/nuxt.config.ts @@ -1,13 +1,7 @@ import { Configuration } from '@nuxt/types' -import dotenv from 'dotenv' - -dotenv.config() const config: Configuration = { mode: 'universal', - env: { - BASE_URL: `http://localhost:${process.env.SERVER_PORT}${process.env.BASE_PATH}` - }, /* ** Headers of the page */ diff --git a/templates/aspida/nuxt/fetch/package.json b/templates/aspida/nuxt/fetch/package.json index 8f0d9570..88b04abf 100644 --- a/templates/aspida/nuxt/fetch/package.json +++ b/templates/aspida/nuxt/fetch/package.json @@ -1,5 +1,5 @@ { "dependencies": { - "@aspida/fetch": "^0.6.0" + "@aspida/fetch": "^0.7.3" } } diff --git a/templates/aspida/nuxt/fetch/plugins/api.ts b/templates/aspida/nuxt/fetch/plugins/api.ts index 259efc12..24e9fe10 100644 --- a/templates/aspida/nuxt/fetch/plugins/api.ts +++ b/templates/aspida/nuxt/fetch/plugins/api.ts @@ -20,7 +20,6 @@ declare module 'vuex/types/index' { } } -const plugin: Plugin = (_, inject) => - inject('api', api(aspida(fetch, { baseURL: process.env.BASE_URL }))) +const plugin: Plugin = (_, inject) => inject('api', api(aspida(fetch))) export default plugin diff --git a/templates/common/.env b/templates/common/server/.env similarity index 63% rename from templates/common/.env rename to templates/common/server/.env index e555cf72..0e72db5a 100644 --- a/templates/common/.env +++ b/templates/common/server/.env @@ -1,4 +1,5 @@ SERVER_PORT=8080 BASE_PATH=/api +API_ORIGIN=http://localhost:8080 USER_ID=id USER_PASS=pass diff --git a/templates/common/server/aspida.config.js b/templates/common/server/aspida.config.js new file mode 100644 index 00000000..7ece320d --- /dev/null +++ b/templates/common/server/aspida.config.js @@ -0,0 +1,5 @@ +require('dotenv').config({ path: 'server/.env' }) + +module.exports = { + baseURL: `${process.env.API_ORIGIN}${process.env.BASE_PATH}` +} diff --git a/templates/common/server/service/envValues.ts b/templates/common/server/service/envValues.ts index 0b9dc08b..f5da8d51 100644 --- a/templates/common/server/service/envValues.ts +++ b/templates/common/server/service/envValues.ts @@ -1,6 +1,6 @@ import dotenv from 'dotenv' -dotenv.config() +dotenv.config({ path: 'server/.env' }) const USER_ID = process.env.USER_ID ?? '' const USER_PASS = process.env.USER_PASS ?? '' diff --git a/templates/front/next/_package.json b/templates/front/next/_package.json index 12bd8e6c..5b5cd1d0 100644 --- a/templates/front/next/_package.json +++ b/templates/front/next/_package.json @@ -6,13 +6,13 @@ "dev": "run-p dev:*", "dev:front": "next dev", "dev:server": "webpack --watch --mode=development --config server/webpack.config.js", - "dev:aspida": "aspida --watch", + "dev:aspida": "aspida --watch --config server/aspida.config.js", "dev:frourio": "frourio --watch", "build": "npm run build:apis && run-p build:front build:server", "build:front": "next build", "build:server": "webpack --mode=production --config server/webpack.config.js", "build:apis": "cross-env NODE_ENV=production run-p build:aspida build:frourio", - "build:aspida": "aspida --build", + "build:aspida": "aspida --build --config server/aspida.config.js", "build:frourio": "frourio --build", "lint": "eslint --ext .ts,.js,.tsx --ignore-path .gitignore .", "lint:fix": "npm run lint -- --fix", @@ -22,10 +22,8 @@ "typecheck": "npm run build:apis && tsc --noEmit" }, "dependencies": { - "@aspida/axios": "^0.8.0", - "axios": "^0.19.2", "dotenv": "^8.2.0", - "frourio": "^0.10.1", + "frourio": "^0.10.2", "next": "9.4.4", "passport": "^0.4.1", "passport-trusted-header": "^1.1.0", diff --git a/templates/front/next/next.config.js b/templates/front/next/next.config.js deleted file mode 100644 index 494dbda3..00000000 --- a/templates/front/next/next.config.js +++ /dev/null @@ -1,7 +0,0 @@ -require('dotenv').config() - -module.exports = { - env: { - BASE_URL: `http://localhost:${process.env.SERVER_PORT}${process.env.BASE_PATH}` - } -} diff --git a/templates/front/next/utils/apiClient.ts b/templates/front/next/utils/apiClient.ts new file mode 100644 index 00000000..5aa72546 --- /dev/null +++ b/templates/front/next/utils/apiClient.ts @@ -0,0 +1,4 @@ +import aspida from '@aspida/<%= aspida %>' +import api from '~/server/api/$api' + +export const apiClient = api(aspida()) diff --git a/templates/front/none/_package.json b/templates/front/none/_package.json index c204d29b..0a4f39de 100644 --- a/templates/front/none/_package.json +++ b/templates/front/none/_package.json @@ -5,12 +5,12 @@ "scripts": { "dev": "run-p dev:*", "dev:server": "webpack --watch --mode=development --config server/webpack.config.js", - "dev:aspida": "aspida --watch", + "dev:aspida": "aspida --watch --config server/aspida.config.js", "dev:frourio": "frourio --watch", "build": "npm run build:apis && npm run build:server", "build:server": "webpack --mode=production --config server/webpack.config.js", "build:apis": "cross-env NODE_ENV=production run-p build:aspida build:frourio", - "build:aspida": "aspida --build", + "build:aspida": "aspida --build --config server/aspida.config.js", "build:frourio": "frourio --build", "lint": "eslint --ext .ts,.js,.tsx --ignore-path .gitignore .", "lint:fix": "npm run lint -- --fix", @@ -26,10 +26,8 @@ } }, "dependencies": { - "@aspida/axios": "^0.8.0", - "axios": "^0.19.2", "dotenv": "^8.2.0", - "frourio": "^0.10.1", + "frourio": "^0.10.2", "passport": "^0.4.1", "passport-trusted-header": "^1.1.0" }, diff --git a/templates/front/nuxt/_package.json b/templates/front/nuxt/_package.json index 106c6640..c4651c57 100644 --- a/templates/front/nuxt/_package.json +++ b/templates/front/nuxt/_package.json @@ -6,13 +6,13 @@ "dev": "run-p dev:*", "dev:front": "nuxt-ts", "dev:server": "webpack --watch --mode=development --config server/webpack.config.js", - "dev:aspida": "aspida --watch", + "dev:aspida": "aspida --watch --config server/aspida.config.js", "dev:frourio": "frourio --watch", "build": "npm run build:apis && run-p build:front build:server", "build:front": "nuxt-ts build", "build:server": "webpack --mode=production --config server/webpack.config.js", "build:apis": "cross-env NODE_ENV=production run-p build:aspida build:frourio", - "build:aspida": "aspida --build", + "build:aspida": "aspida --build --config server/aspida.config.js", "build:frourio": "frourio --build", "lint": "npm run lint:script && npm run lint:style", "lint:script": "eslint --ext .ts,.js,.vue --ignore-path .gitignore .", @@ -33,11 +33,9 @@ } }, "dependencies": { - "@aspida/axios": "^0.8.0", "@nuxt/typescript-runtime": "^0.4.8", - "@nuxtjs/axios": "^5.3.6", "dotenv": "^8.2.0", - "frourio": "^0.10.1", + "frourio": "^0.10.2", "nuxt": "2.12.2", "passport": "^0.4.1", "passport-trusted-header": "^1.1.0" diff --git a/test/snapshots/index.test.js.md b/test/snapshots/index.test.js.md index 0bd7c610..3bd87464 100644 --- a/test/snapshots/index.test.js.md +++ b/test/snapshots/index.test.js.md @@ -9,7 +9,6 @@ Generated by [AVA](https://avajs.dev). > Generated files [ - '.env', '.eslintrc.js', '.gitignore', '.prettierrc', @@ -18,11 +17,11 @@ Generated by [AVA](https://avajs.dev). 'README.md', 'components/UserBanner.tsx', 'next-env.d.ts', - 'next.config.js', 'package.json', 'pages/index.tsx', 'public/favicon.ico', 'public/vercel.svg', + 'server/.env', 'server/api/@controller.ts', 'server/api/index.ts', 'server/api/tasks/@controller.ts', @@ -34,6 +33,7 @@ Generated by [AVA](https://avajs.dev). 'server/api/user/@controller.ts', 'server/api/user/@middleware.ts', 'server/api/user/index.ts', + 'server/aspida.config.js', 'server/index.ts', 'server/public/icons/dammy.svg', 'server/service/envValues.ts', @@ -50,10 +50,10 @@ Generated by [AVA](https://avajs.dev). { dependencies: { - '@aspida/axios': '^0.8.0', + '@aspida/axios': '^0.9.3', axios: '^0.19.2', dotenv: '^8.2.0', - frourio: '^0.10.1', + frourio: '^0.10.2', next: '9.4.4', passport: '^0.4.1', 'passport-trusted-header': '^1.1.0', @@ -84,12 +84,12 @@ Generated by [AVA](https://avajs.dev). scripts: { build: 'npm run build:apis && run-p build:front build:server', 'build:apis': 'cross-env NODE_ENV=production run-p build:aspida build:frourio', - 'build:aspida': 'aspida --build', + 'build:aspida': 'aspida --build --config server/aspida.config.js', 'build:front': 'next build', 'build:frourio': 'frourio --build', 'build:server': 'webpack --mode=production --config server/webpack.config.js', dev: 'run-p dev:*', - 'dev:aspida': 'aspida --watch', + 'dev:aspida': 'aspida --watch --config server/aspida.config.js', 'dev:front': 'next dev', 'dev:frourio': 'frourio --watch', 'dev:server': 'webpack --watch --mode=development --config server/webpack.config.js', @@ -107,7 +107,6 @@ Generated by [AVA](https://avajs.dev). > Generated files [ - '.env', '.eslintrc.js', '.gitignore', '.prettierrc', @@ -116,11 +115,11 @@ Generated by [AVA](https://avajs.dev). 'README.md', 'components/UserBanner.tsx', 'next-env.d.ts', - 'next.config.js', 'package.json', 'pages/index.tsx', 'public/favicon.ico', 'public/vercel.svg', + 'server/.env', 'server/api/@controller.ts', 'server/api/index.ts', 'server/api/tasks/@controller.ts', @@ -132,6 +131,7 @@ Generated by [AVA](https://avajs.dev). 'server/api/user/@controller.ts', 'server/api/user/@middleware.ts', 'server/api/user/index.ts', + 'server/aspida.config.js', 'server/index.ts', 'server/public/icons/dammy.svg', 'server/service/envValues.ts', @@ -148,11 +148,9 @@ Generated by [AVA](https://avajs.dev). { dependencies: { - '@aspida/axios': '^0.8.0', - '@aspida/fetch': '^0.6.0', - axios: '^0.19.2', + '@aspida/fetch': '^0.7.3', dotenv: '^8.2.0', - frourio: '^0.10.1', + frourio: '^0.10.2', next: '9.4.4', passport: '^0.4.1', 'passport-trusted-header': '^1.1.0', @@ -183,12 +181,12 @@ Generated by [AVA](https://avajs.dev). scripts: { build: 'npm run build:apis && run-p build:front build:server', 'build:apis': 'cross-env NODE_ENV=production run-p build:aspida build:frourio', - 'build:aspida': 'aspida --build', + 'build:aspida': 'aspida --build --config server/aspida.config.js', 'build:front': 'next build', 'build:frourio': 'frourio --build', 'build:server': 'webpack --mode=production --config server/webpack.config.js', dev: 'run-p dev:*', - 'dev:aspida': 'aspida --watch', + 'dev:aspida': 'aspida --watch --config server/aspida.config.js', 'dev:front': 'next dev', 'dev:frourio': 'frourio --watch', 'dev:server': 'webpack --watch --mode=development --config server/webpack.config.js', @@ -206,7 +204,6 @@ Generated by [AVA](https://avajs.dev). > Generated files [ - '.env', '.eslintrc.js', '.gitignore', '.prettierrc', @@ -215,11 +212,11 @@ Generated by [AVA](https://avajs.dev). 'README.md', 'components/UserBanner.tsx', 'next-env.d.ts', - 'next.config.js', 'package.json', 'pages/index.tsx', 'public/favicon.ico', 'public/vercel.svg', + 'server/.env', 'server/api/@controller.ts', 'server/api/index.ts', 'server/api/tasks/@controller.ts', @@ -231,6 +228,7 @@ Generated by [AVA](https://avajs.dev). 'server/api/user/@controller.ts', 'server/api/user/@middleware.ts', 'server/api/user/index.ts', + 'server/aspida.config.js', 'server/index.ts', 'server/public/icons/dammy.svg', 'server/service/envValues.ts', @@ -247,10 +245,10 @@ Generated by [AVA](https://avajs.dev). { dependencies: { - '@aspida/axios': '^0.8.0', + '@aspida/axios': '^0.9.3', axios: '^0.19.2', dotenv: '^8.2.0', - frourio: '^0.10.1', + frourio: '^0.10.2', next: '9.4.4', passport: '^0.4.1', 'passport-trusted-header': '^1.1.0', @@ -281,12 +279,12 @@ Generated by [AVA](https://avajs.dev). scripts: { build: 'npm run build:apis && run-p build:front build:server', 'build:apis': 'cross-env NODE_ENV=production run-p build:aspida build:frourio', - 'build:aspida': 'aspida --build', + 'build:aspida': 'aspida --build --config server/aspida.config.js', 'build:front': 'next build', 'build:frourio': 'frourio --build', 'build:server': 'webpack --mode=production --config server/webpack.config.js', dev: 'run-p dev:*', - 'dev:aspida': 'aspida --watch', + 'dev:aspida': 'aspida --watch --config server/aspida.config.js', 'dev:front': 'next dev', 'dev:frourio': 'frourio --watch', 'dev:server': 'webpack --watch --mode=development --config server/webpack.config.js', @@ -304,7 +302,6 @@ Generated by [AVA](https://avajs.dev). > Generated files [ - '.env', '.eslintrc.js', '.gitignore', '.prettierrc', @@ -313,11 +310,11 @@ Generated by [AVA](https://avajs.dev). 'README.md', 'components/UserBanner.tsx', 'next-env.d.ts', - 'next.config.js', 'package.json', 'pages/index.tsx', 'public/favicon.ico', 'public/vercel.svg', + 'server/.env', 'server/api/@controller.ts', 'server/api/index.ts', 'server/api/tasks/@controller.ts', @@ -329,6 +326,7 @@ Generated by [AVA](https://avajs.dev). 'server/api/user/@controller.ts', 'server/api/user/@middleware.ts', 'server/api/user/index.ts', + 'server/aspida.config.js', 'server/index.ts', 'server/pm2.config.json', 'server/public/icons/dammy.svg', @@ -346,10 +344,10 @@ Generated by [AVA](https://avajs.dev). { dependencies: { - '@aspida/axios': '^0.8.0', + '@aspida/axios': '^0.9.3', axios: '^0.19.2', dotenv: '^8.2.0', - frourio: '^0.10.1', + frourio: '^0.10.2', next: '9.4.4', passport: '^0.4.1', 'passport-trusted-header': '^1.1.0', @@ -381,12 +379,12 @@ Generated by [AVA](https://avajs.dev). scripts: { build: 'npm run build:apis && run-p build:front build:server', 'build:apis': 'cross-env NODE_ENV=production run-p build:aspida build:frourio', - 'build:aspida': 'aspida --build', + 'build:aspida': 'aspida --build --config server/aspida.config.js', 'build:front': 'next build', 'build:frourio': 'frourio --build', 'build:server': 'webpack --mode=production --config server/webpack.config.js', dev: 'run-p dev:*', - 'dev:aspida': 'aspida --watch', + 'dev:aspida': 'aspida --watch --config server/aspida.config.js', 'dev:front': 'next dev', 'dev:frourio': 'frourio --watch', 'dev:server': 'webpack --watch --mode=development --config server/webpack.config.js', @@ -418,11 +416,11 @@ Generated by [AVA](https://avajs.dev). 'README.md', 'components/UserBanner.tsx', 'next-env.d.ts', - 'next.config.js', 'package.json', 'pages/index.tsx', 'public/favicon.ico', 'public/vercel.svg', + 'server/.env', 'server/api/@controller.ts', 'server/api/index.ts', 'server/api/tasks/@controller.ts', @@ -434,6 +432,7 @@ Generated by [AVA](https://avajs.dev). 'server/api/user/@controller.ts', 'server/api/user/@middleware.ts', 'server/api/user/index.ts', + 'server/aspida.config.js', 'server/entity/Task.ts', 'server/index.ts', 'server/migration/1591970905411-Task.ts', @@ -454,10 +453,10 @@ Generated by [AVA](https://avajs.dev). { dependencies: { - '@aspida/axios': '^0.8.0', + '@aspida/axios': '^0.9.3', axios: '^0.19.2', dotenv: '^8.2.0', - frourio: '^0.10.1', + frourio: '^0.10.2', next: '9.4.4', passport: '^0.4.1', 'passport-trusted-header': '^1.1.0', @@ -489,12 +488,12 @@ Generated by [AVA](https://avajs.dev). scripts: { build: 'npm run build:apis && run-p build:front build:server', 'build:apis': 'cross-env NODE_ENV=production run-p build:aspida build:frourio', - 'build:aspida': 'aspida --build', + 'build:aspida': 'aspida --build --config server/aspida.config.js', 'build:front': 'next build', 'build:frourio': 'frourio --build', 'build:server': 'webpack --mode=production --config server/webpack.config.js', dev: 'run-p dev:*', - 'dev:aspida': 'aspida --watch', + 'dev:aspida': 'aspida --watch --config server/aspida.config.js', 'dev:front': 'next dev', 'dev:frourio': 'frourio --watch', 'dev:server': 'webpack --watch --mode=development --config server/webpack.config.js', @@ -524,11 +523,11 @@ Generated by [AVA](https://avajs.dev). 'README.md', 'components/UserBanner.tsx', 'next-env.d.ts', - 'next.config.js', 'package.json', 'pages/index.tsx', 'public/favicon.ico', 'public/vercel.svg', + 'server/.env', 'server/api/@controller.ts', 'server/api/index.ts', 'server/api/tasks/@controller.ts', @@ -540,6 +539,7 @@ Generated by [AVA](https://avajs.dev). 'server/api/user/@controller.ts', 'server/api/user/@middleware.ts', 'server/api/user/index.ts', + 'server/aspida.config.js', 'server/entity/Task.ts', 'server/index.ts', 'server/migration/1591970905411-Task.ts', @@ -560,10 +560,10 @@ Generated by [AVA](https://avajs.dev). { dependencies: { - '@aspida/axios': '^0.8.0', + '@aspida/axios': '^0.9.3', axios: '^0.19.2', dotenv: '^8.2.0', - frourio: '^0.10.1', + frourio: '^0.10.2', mariadb: '^2.4.0', next: '9.4.4', passport: '^0.4.1', @@ -595,12 +595,12 @@ Generated by [AVA](https://avajs.dev). scripts: { build: 'npm run build:apis && run-p build:front build:server', 'build:apis': 'cross-env NODE_ENV=production run-p build:aspida build:frourio', - 'build:aspida': 'aspida --build', + 'build:aspida': 'aspida --build --config server/aspida.config.js', 'build:front': 'next build', 'build:frourio': 'frourio --build', 'build:server': 'webpack --mode=production --config server/webpack.config.js', dev: 'run-p dev:*', - 'dev:aspida': 'aspida --watch', + 'dev:aspida': 'aspida --watch --config server/aspida.config.js', 'dev:front': 'next dev', 'dev:frourio': 'frourio --watch', 'dev:server': 'webpack --watch --mode=development --config server/webpack.config.js', @@ -630,11 +630,11 @@ Generated by [AVA](https://avajs.dev). 'README.md', 'components/UserBanner.tsx', 'next-env.d.ts', - 'next.config.js', 'package.json', 'pages/index.tsx', 'public/favicon.ico', 'public/vercel.svg', + 'server/.env', 'server/api/@controller.ts', 'server/api/index.ts', 'server/api/tasks/@controller.ts', @@ -646,6 +646,7 @@ Generated by [AVA](https://avajs.dev). 'server/api/user/@controller.ts', 'server/api/user/@middleware.ts', 'server/api/user/index.ts', + 'server/aspida.config.js', 'server/entity/Task.ts', 'server/index.ts', 'server/migration/1591970905411-Task.ts', @@ -666,10 +667,10 @@ Generated by [AVA](https://avajs.dev). { dependencies: { - '@aspida/axios': '^0.8.0', + '@aspida/axios': '^0.9.3', axios: '^0.19.2', dotenv: '^8.2.0', - frourio: '^0.10.1', + frourio: '^0.10.2', mongodb: '^3.5.9', next: '9.4.4', passport: '^0.4.1', @@ -701,12 +702,12 @@ Generated by [AVA](https://avajs.dev). scripts: { build: 'npm run build:apis && run-p build:front build:server', 'build:apis': 'cross-env NODE_ENV=production run-p build:aspida build:frourio', - 'build:aspida': 'aspida --build', + 'build:aspida': 'aspida --build --config server/aspida.config.js', 'build:front': 'next build', 'build:frourio': 'frourio --build', 'build:server': 'webpack --mode=production --config server/webpack.config.js', dev: 'run-p dev:*', - 'dev:aspida': 'aspida --watch', + 'dev:aspida': 'aspida --watch --config server/aspida.config.js', 'dev:front': 'next dev', 'dev:frourio': 'frourio --watch', 'dev:server': 'webpack --watch --mode=development --config server/webpack.config.js', @@ -736,11 +737,11 @@ Generated by [AVA](https://avajs.dev). 'README.md', 'components/UserBanner.tsx', 'next-env.d.ts', - 'next.config.js', 'package.json', 'pages/index.tsx', 'public/favicon.ico', 'public/vercel.svg', + 'server/.env', 'server/api/@controller.ts', 'server/api/index.ts', 'server/api/tasks/@controller.ts', @@ -752,6 +753,7 @@ Generated by [AVA](https://avajs.dev). 'server/api/user/@controller.ts', 'server/api/user/@middleware.ts', 'server/api/user/index.ts', + 'server/aspida.config.js', 'server/entity/Task.ts', 'server/index.ts', 'server/migration/1591970905411-Task.ts', @@ -772,10 +774,10 @@ Generated by [AVA](https://avajs.dev). { dependencies: { - '@aspida/axios': '^0.8.0', + '@aspida/axios': '^0.9.3', axios: '^0.19.2', dotenv: '^8.2.0', - frourio: '^0.10.1', + frourio: '^0.10.2', mysql: '^2.18.1', next: '9.4.4', passport: '^0.4.1', @@ -807,12 +809,12 @@ Generated by [AVA](https://avajs.dev). scripts: { build: 'npm run build:apis && run-p build:front build:server', 'build:apis': 'cross-env NODE_ENV=production run-p build:aspida build:frourio', - 'build:aspida': 'aspida --build', + 'build:aspida': 'aspida --build --config server/aspida.config.js', 'build:front': 'next build', 'build:frourio': 'frourio --build', 'build:server': 'webpack --mode=production --config server/webpack.config.js', dev: 'run-p dev:*', - 'dev:aspida': 'aspida --watch', + 'dev:aspida': 'aspida --watch --config server/aspida.config.js', 'dev:front': 'next dev', 'dev:frourio': 'frourio --watch', 'dev:server': 'webpack --watch --mode=development --config server/webpack.config.js', @@ -833,7 +835,6 @@ Generated by [AVA](https://avajs.dev). > Generated files [ - '.env', '.eslintrc.js', '.gitignore', '.prettierrc', @@ -842,11 +843,11 @@ Generated by [AVA](https://avajs.dev). 'README.md', 'components/UserBanner.tsx', 'next-env.d.ts', - 'next.config.js', 'package.json', 'pages/index.tsx', 'public/favicon.ico', 'public/vercel.svg', + 'server/.env', 'server/api/@controller.ts', 'server/api/index.ts', 'server/api/tasks/@controller.ts', @@ -858,6 +859,7 @@ Generated by [AVA](https://avajs.dev). 'server/api/user/@controller.ts', 'server/api/user/@middleware.ts', 'server/api/user/index.ts', + 'server/aspida.config.js', 'server/index.ts', 'server/public/icons/dammy.svg', 'server/service/envValues.ts', @@ -874,10 +876,10 @@ Generated by [AVA](https://avajs.dev). { dependencies: { - '@aspida/axios': '^0.8.0', + '@aspida/axios': '^0.9.3', axios: '^0.19.2', dotenv: '^8.2.0', - frourio: '^0.10.1', + frourio: '^0.10.2', next: '9.4.4', passport: '^0.4.1', 'passport-trusted-header': '^1.1.0', @@ -908,12 +910,12 @@ Generated by [AVA](https://avajs.dev). scripts: { build: 'npm run build:apis && run-p build:front build:server', 'build:apis': 'cross-env NODE_ENV=production run-p build:aspida build:frourio', - 'build:aspida': 'aspida --build', + 'build:aspida': 'aspida --build --config server/aspida.config.js', 'build:front': 'next build', 'build:frourio': 'frourio --build', 'build:server': 'webpack --mode=production --config server/webpack.config.js', dev: 'run-p dev:*', - 'dev:aspida': 'aspida --watch', + 'dev:aspida': 'aspida --watch --config server/aspida.config.js', 'dev:front': 'next dev', 'dev:frourio': 'frourio --watch', 'dev:server': 'webpack --watch --mode=development --config server/webpack.config.js', @@ -940,11 +942,11 @@ Generated by [AVA](https://avajs.dev). 'README.md', 'components/UserBanner.tsx', 'next-env.d.ts', - 'next.config.js', 'package.json', 'pages/index.tsx', 'public/favicon.ico', 'public/vercel.svg', + 'server/.env', 'server/api/@controller.ts', 'server/api/index.ts', 'server/api/tasks/@controller.ts', @@ -956,6 +958,7 @@ Generated by [AVA](https://avajs.dev). 'server/api/user/@controller.ts', 'server/api/user/@middleware.ts', 'server/api/user/index.ts', + 'server/aspida.config.js', 'server/entity/Task.ts', 'server/index.ts', 'server/migration/1591970905411-Task.ts', @@ -976,10 +979,10 @@ Generated by [AVA](https://avajs.dev). { dependencies: { - '@aspida/axios': '^0.8.0', + '@aspida/axios': '^0.9.3', axios: '^0.19.2', dotenv: '^8.2.0', - frourio: '^0.10.1', + frourio: '^0.10.2', next: '9.4.4', passport: '^0.4.1', 'passport-trusted-header': '^1.1.0', @@ -1011,12 +1014,12 @@ Generated by [AVA](https://avajs.dev). scripts: { build: 'npm run build:apis && run-p build:front build:server', 'build:apis': 'cross-env NODE_ENV=production run-p build:aspida build:frourio', - 'build:aspida': 'aspida --build', + 'build:aspida': 'aspida --build --config server/aspida.config.js', 'build:front': 'next build', 'build:frourio': 'frourio --build', 'build:server': 'webpack --mode=production --config server/webpack.config.js', dev: 'run-p dev:*', - 'dev:aspida': 'aspida --watch', + 'dev:aspida': 'aspida --watch --config server/aspida.config.js', 'dev:front': 'next dev', 'dev:frourio': 'frourio --watch', 'dev:server': 'webpack --watch --mode=development --config server/webpack.config.js', @@ -1046,11 +1049,11 @@ Generated by [AVA](https://avajs.dev). 'README.md', 'components/UserBanner.tsx', 'next-env.d.ts', - 'next.config.js', 'package.json', 'pages/index.tsx', 'public/favicon.ico', 'public/vercel.svg', + 'server/.env', 'server/api/@controller.ts', 'server/api/index.ts', 'server/api/tasks/@controller.ts', @@ -1062,6 +1065,7 @@ Generated by [AVA](https://avajs.dev). 'server/api/user/@controller.ts', 'server/api/user/@middleware.ts', 'server/api/user/index.ts', + 'server/aspida.config.js', 'server/entity/Task.ts', 'server/index.ts', 'server/migration/1591970905411-Task.ts', @@ -1082,10 +1086,10 @@ Generated by [AVA](https://avajs.dev). { dependencies: { - '@aspida/axios': '^0.8.0', + '@aspida/axios': '^0.9.3', axios: '^0.19.2', dotenv: '^8.2.0', - frourio: '^0.10.1', + frourio: '^0.10.2', mssql: '^6.2.0', next: '9.4.4', passport: '^0.4.1', @@ -1117,12 +1121,12 @@ Generated by [AVA](https://avajs.dev). scripts: { build: 'npm run build:apis && run-p build:front build:server', 'build:apis': 'cross-env NODE_ENV=production run-p build:aspida build:frourio', - 'build:aspida': 'aspida --build', + 'build:aspida': 'aspida --build --config server/aspida.config.js', 'build:front': 'next build', 'build:frourio': 'frourio --build', 'build:server': 'webpack --mode=production --config server/webpack.config.js', dev: 'run-p dev:*', - 'dev:aspida': 'aspida --watch', + 'dev:aspida': 'aspida --watch --config server/aspida.config.js', 'dev:front': 'next dev', 'dev:frourio': 'frourio --watch', 'dev:server': 'webpack --watch --mode=development --config server/webpack.config.js', @@ -1143,7 +1147,6 @@ Generated by [AVA](https://avajs.dev). > Generated files [ - '.env', '.eslintrc.js', '.gitignore', '.prettierrc', @@ -1152,11 +1155,11 @@ Generated by [AVA](https://avajs.dev). 'README.md', 'components/UserBanner.tsx', 'next-env.d.ts', - 'next.config.js', 'package.json', 'pages/index.tsx', 'public/favicon.ico', 'public/vercel.svg', + 'server/.env', 'server/api/@controller.ts', 'server/api/index.ts', 'server/api/tasks/@controller.ts', @@ -1168,6 +1171,7 @@ Generated by [AVA](https://avajs.dev). 'server/api/user/@controller.ts', 'server/api/user/@middleware.ts', 'server/api/user/index.ts', + 'server/aspida.config.js', 'server/index.ts', 'server/public/icons/dammy.svg', 'server/service/envValues.ts', @@ -1184,10 +1188,10 @@ Generated by [AVA](https://avajs.dev). { dependencies: { - '@aspida/axios': '^0.8.0', + '@aspida/axios': '^0.9.3', axios: '^0.19.2', dotenv: '^8.2.0', - frourio: '^0.10.1', + frourio: '^0.10.2', next: '9.4.4', passport: '^0.4.1', 'passport-trusted-header': '^1.1.0', @@ -1218,12 +1222,12 @@ Generated by [AVA](https://avajs.dev). scripts: { build: 'npm run build:apis && run-p build:front build:server', 'build:apis': 'cross-env NODE_ENV=production run-p build:aspida build:frourio', - 'build:aspida': 'aspida --build', + 'build:aspida': 'aspida --build --config server/aspida.config.js', 'build:front': 'next build', 'build:frourio': 'frourio --build', 'build:server': 'webpack --mode=production --config server/webpack.config.js', dev: 'run-p dev:*', - 'dev:aspida': 'aspida --watch', + 'dev:aspida': 'aspida --watch --config server/aspida.config.js', 'dev:front': 'next dev', 'dev:frourio': 'frourio --watch', 'dev:server': 'webpack --watch --mode=development --config server/webpack.config.js', @@ -1241,7 +1245,6 @@ Generated by [AVA](https://avajs.dev). > Generated files [ - '.env', '.eslintrc.js', '.gitignore', '.prettierrc', @@ -1250,11 +1253,11 @@ Generated by [AVA](https://avajs.dev). 'README.md', 'components/UserBanner.tsx', 'next-env.d.ts', - 'next.config.js', 'package.json', 'pages/index.tsx', 'public/favicon.ico', 'public/vercel.svg', + 'server/.env', 'server/api/@controller.ts', 'server/api/index.ts', 'server/api/tasks/@controller.ts', @@ -1266,6 +1269,7 @@ Generated by [AVA](https://avajs.dev). 'server/api/user/@controller.ts', 'server/api/user/@middleware.ts', 'server/api/user/index.ts', + 'server/aspida.config.js', 'server/index.ts', 'server/public/icons/dammy.svg', 'server/service/envValues.ts', @@ -1282,10 +1286,10 @@ Generated by [AVA](https://avajs.dev). { dependencies: { - '@aspida/axios': '^0.8.0', + '@aspida/axios': '^0.9.3', axios: '^0.19.2', dotenv: '^8.2.0', - frourio: '^0.10.1', + frourio: '^0.10.2', next: '9.4.4', passport: '^0.4.1', 'passport-trusted-header': '^1.1.0', @@ -1316,12 +1320,12 @@ Generated by [AVA](https://avajs.dev). scripts: { build: 'npm run build:apis && run-p build:front build:server', 'build:apis': 'cross-env NODE_ENV=production run-p build:aspida build:frourio', - 'build:aspida': 'aspida --build', + 'build:aspida': 'aspida --build --config server/aspida.config.js', 'build:front': 'next build', 'build:frourio': 'frourio --build', 'build:server': 'webpack --mode=production --config server/webpack.config.js', dev: 'run-p dev:*', - 'dev:aspida': 'aspida --watch', + 'dev:aspida': 'aspida --watch --config server/aspida.config.js', 'dev:front': 'next dev', 'dev:frourio': 'frourio --watch', 'dev:server': 'webpack --watch --mode=development --config server/webpack.config.js', @@ -1340,13 +1344,13 @@ Generated by [AVA](https://avajs.dev). [ '.editorconfig', - '.env', '.eslintrc.js', '.gitignore', '.prettierrc', '.vscode/extensions.json', '.vscode/settings.json', 'package.json', + 'server/.env', 'server/api/@controller.ts', 'server/api/index.ts', 'server/api/tasks/@controller.ts', @@ -1358,6 +1362,7 @@ Generated by [AVA](https://avajs.dev). 'server/api/user/@controller.ts', 'server/api/user/@middleware.ts', 'server/api/user/index.ts', + 'server/aspida.config.js', 'server/index.ts', 'server/public/icons/dammy.svg', 'server/service/envValues.ts', @@ -1372,10 +1377,8 @@ Generated by [AVA](https://avajs.dev). { dependencies: { - '@aspida/axios': '^0.8.0', - axios: '^0.19.2', dotenv: '^8.2.0', - frourio: '^0.10.1', + frourio: '^0.10.2', passport: '^0.4.1', 'passport-trusted-header': '^1.1.0', }, @@ -1411,11 +1414,11 @@ Generated by [AVA](https://avajs.dev). scripts: { build: 'npm run build:apis && npm run build:server', 'build:apis': 'cross-env NODE_ENV=production run-p build:aspida build:frourio', - 'build:aspida': 'aspida --build', + 'build:aspida': 'aspida --build --config server/aspida.config.js', 'build:frourio': 'frourio --build', 'build:server': 'webpack --mode=production --config server/webpack.config.js', dev: 'run-p dev:*', - 'dev:aspida': 'aspida --watch', + 'dev:aspida': 'aspida --watch --config server/aspida.config.js', 'dev:frourio': 'frourio --watch', 'dev:server': 'webpack --watch --mode=development --config server/webpack.config.js', lint: 'eslint --ext .ts,.js,.tsx --ignore-path .gitignore .', @@ -1431,7 +1434,6 @@ Generated by [AVA](https://avajs.dev). [ '.editorconfig', - '.env', '.eslintrc.js', '.gitignore', '.prettierrc', @@ -1446,6 +1448,7 @@ Generated by [AVA](https://avajs.dev). 'package.json', 'pages/index.vue', 'plugins/api.ts', + 'server/.env', 'server/api/@controller.ts', 'server/api/index.ts', 'server/api/tasks/@controller.ts', @@ -1457,6 +1460,7 @@ Generated by [AVA](https://avajs.dev). 'server/api/user/@controller.ts', 'server/api/user/@middleware.ts', 'server/api/user/index.ts', + 'server/aspida.config.js', 'server/index.ts', 'server/public/icons/dammy.svg', 'server/service/envValues.ts', @@ -1475,12 +1479,11 @@ Generated by [AVA](https://avajs.dev). { dependencies: { - '@aspida/axios': '^0.8.0', + '@aspida/axios': '^0.9.3', '@nuxt/typescript-runtime': '^0.4.8', '@nuxtjs/axios': '^5.3.6', - axios: '^0.19.2', dotenv: '^8.2.0', - frourio: '^0.10.1', + frourio: '^0.10.2', nuxt: '2.12.2', passport: '^0.4.1', 'passport-trusted-header': '^1.1.0', @@ -1523,12 +1526,12 @@ Generated by [AVA](https://avajs.dev). scripts: { build: 'npm run build:apis && run-p build:front build:server', 'build:apis': 'cross-env NODE_ENV=production run-p build:aspida build:frourio', - 'build:aspida': 'aspida --build', + 'build:aspida': 'aspida --build --config server/aspida.config.js', 'build:front': 'nuxt-ts build', 'build:frourio': 'frourio --build', 'build:server': 'webpack --mode=production --config server/webpack.config.js', dev: 'run-p dev:*', - 'dev:aspida': 'aspida --watch', + 'dev:aspida': 'aspida --watch --config server/aspida.config.js', 'dev:front': 'nuxt-ts', 'dev:frourio': 'frourio --watch', 'dev:server': 'webpack --watch --mode=development --config server/webpack.config.js', @@ -1548,7 +1551,6 @@ Generated by [AVA](https://avajs.dev). > Generated files [ - '.env', '.eslintrc.js', '.gitignore', '.prettierrc', @@ -1557,11 +1559,11 @@ Generated by [AVA](https://avajs.dev). 'README.md', 'components/UserBanner.tsx', 'next-env.d.ts', - 'next.config.js', 'package.json', 'pages/index.tsx', 'public/favicon.ico', 'public/vercel.svg', + 'server/.env', 'server/api/@controller.ts', 'server/api/index.ts', 'server/api/tasks/@controller.ts', @@ -1573,6 +1575,7 @@ Generated by [AVA](https://avajs.dev). 'server/api/user/@controller.ts', 'server/api/user/@middleware.ts', 'server/api/user/index.ts', + 'server/aspida.config.js', 'server/index.ts', 'server/public/icons/dammy.svg', 'server/service/envValues.ts', @@ -1589,10 +1592,10 @@ Generated by [AVA](https://avajs.dev). { dependencies: { - '@aspida/axios': '^0.8.0', + '@aspida/axios': '^0.9.3', axios: '^0.19.2', dotenv: '^8.2.0', - frourio: '^0.10.1', + frourio: '^0.10.2', next: '9.4.4', passport: '^0.4.1', 'passport-trusted-header': '^1.1.0', @@ -1623,12 +1626,12 @@ Generated by [AVA](https://avajs.dev). scripts: { build: 'npm run build:apis && run-p build:front build:server', 'build:apis': 'cross-env NODE_ENV=production run-p build:aspida build:frourio', - 'build:aspida': 'aspida --build', + 'build:aspida': 'aspida --build --config server/aspida.config.js', 'build:front': 'next build', 'build:frourio': 'frourio --build', 'build:server': 'webpack --mode=production --config server/webpack.config.js', dev: 'run-p dev:*', - 'dev:aspida': 'aspida --watch', + 'dev:aspida': 'aspida --watch --config server/aspida.config.js', 'dev:front': 'next dev', 'dev:frourio': 'frourio --watch', 'dev:server': 'webpack --watch --mode=development --config server/webpack.config.js', @@ -1646,7 +1649,6 @@ Generated by [AVA](https://avajs.dev). > Generated files [ - '.env', '.eslintrc.js', '.gitignore', '.prettierrc', @@ -1655,11 +1657,11 @@ Generated by [AVA](https://avajs.dev). 'README.md', 'components/UserBanner.tsx', 'next-env.d.ts', - 'next.config.js', 'package.json', 'pages/index.tsx', 'public/favicon.ico', 'public/vercel.svg', + 'server/.env', 'server/api/@controller.ts', 'server/api/index.ts', 'server/api/tasks/@controller.ts', @@ -1671,6 +1673,7 @@ Generated by [AVA](https://avajs.dev). 'server/api/user/@controller.ts', 'server/api/user/@middleware.ts', 'server/api/user/index.ts', + 'server/aspida.config.js', 'server/index.ts', 'server/public/icons/dammy.svg', 'server/service/envValues.ts', @@ -1687,10 +1690,10 @@ Generated by [AVA](https://avajs.dev). { dependencies: { - '@aspida/axios': '^0.8.0', + '@aspida/axios': '^0.9.3', axios: '^0.19.2', dotenv: '^8.2.0', - frourio: '^0.10.1', + frourio: '^0.10.2', next: '9.4.4', passport: '^0.4.1', 'passport-trusted-header': '^1.1.0', @@ -1721,12 +1724,12 @@ Generated by [AVA](https://avajs.dev). scripts: { build: 'npm run build:apis && run-p build:front build:server', 'build:apis': 'cross-env NODE_ENV=production run-p build:aspida build:frourio', - 'build:aspida': 'aspida --build', + 'build:aspida': 'aspida --build --config server/aspida.config.js', 'build:front': 'next build', 'build:frourio': 'frourio --build', 'build:server': 'webpack --mode=production --config server/webpack.config.js', dev: 'run-p dev:*', - 'dev:aspida': 'aspida --watch', + 'dev:aspida': 'aspida --watch --config server/aspida.config.js', 'dev:front': 'next dev', 'dev:frourio': 'frourio --watch', 'dev:server': 'webpack --watch --mode=development --config server/webpack.config.js', @@ -1744,7 +1747,6 @@ Generated by [AVA](https://avajs.dev). > Generated files [ - '.env', '.eslintrc.js', '.gitignore', '.prettierrc', @@ -1753,11 +1755,11 @@ Generated by [AVA](https://avajs.dev). 'README.md', 'components/UserBanner.tsx', 'next-env.d.ts', - 'next.config.js', 'package.json', 'pages/index.tsx', 'public/favicon.ico', 'public/vercel.svg', + 'server/.env', 'server/api/@controller.ts', 'server/api/index.ts', 'server/api/tasks/@controller.ts', @@ -1769,6 +1771,7 @@ Generated by [AVA](https://avajs.dev). 'server/api/user/@controller.ts', 'server/api/user/@middleware.ts', 'server/api/user/index.ts', + 'server/aspida.config.js', 'server/index.ts', 'server/public/icons/dammy.svg', 'server/service/envValues.ts', @@ -1785,10 +1788,10 @@ Generated by [AVA](https://avajs.dev). { dependencies: { - '@aspida/axios': '^0.8.0', + '@aspida/axios': '^0.9.3', axios: '^0.19.2', dotenv: '^8.2.0', - frourio: '^0.10.1', + frourio: '^0.10.2', next: '9.4.4', passport: '^0.4.1', 'passport-trusted-header': '^1.1.0', @@ -1819,12 +1822,12 @@ Generated by [AVA](https://avajs.dev). scripts: { build: 'npm run build:apis && run-p build:front build:server', 'build:apis': 'cross-env NODE_ENV=production run-p build:aspida build:frourio', - 'build:aspida': 'aspida --build', + 'build:aspida': 'aspida --build --config server/aspida.config.js', 'build:front': 'next build', 'build:frourio': 'frourio --build', 'build:server': 'webpack --mode=production --config server/webpack.config.js', dev: 'run-p dev:*', - 'dev:aspida': 'aspida --watch', + 'dev:aspida': 'aspida --watch --config server/aspida.config.js', 'dev:front': 'next dev', 'dev:frourio': 'frourio --watch', 'dev:server': 'webpack --watch --mode=development --config server/webpack.config.js', @@ -1842,7 +1845,6 @@ Generated by [AVA](https://avajs.dev). > Generated files [ - '.env', '.eslintrc.js', '.gitignore', '.prettierrc', @@ -1851,11 +1853,11 @@ Generated by [AVA](https://avajs.dev). 'README.md', 'components/UserBanner.tsx', 'next-env.d.ts', - 'next.config.js', 'package.json', 'pages/index.tsx', 'public/favicon.ico', 'public/vercel.svg', + 'server/.env', 'server/api/@controller.ts', 'server/api/index.ts', 'server/api/tasks/@controller.ts', @@ -1867,6 +1869,7 @@ Generated by [AVA](https://avajs.dev). 'server/api/user/@controller.ts', 'server/api/user/@middleware.ts', 'server/api/user/index.ts', + 'server/aspida.config.js', 'server/index.ts', 'server/public/icons/dammy.svg', 'server/service/envValues.ts', @@ -1883,10 +1886,10 @@ Generated by [AVA](https://avajs.dev). { dependencies: { - '@aspida/axios': '^0.8.0', + '@aspida/axios': '^0.9.3', axios: '^0.19.2', dotenv: '^8.2.0', - frourio: '^0.10.1', + frourio: '^0.10.2', next: '9.4.4', passport: '^0.4.1', 'passport-trusted-header': '^1.1.0', @@ -1917,12 +1920,12 @@ Generated by [AVA](https://avajs.dev). scripts: { build: 'npm run build:apis && run-p build:front build:server', 'build:apis': 'cross-env NODE_ENV=production run-p build:aspida build:frourio', - 'build:aspida': 'aspida --build', + 'build:aspida': 'aspida --build --config server/aspida.config.js', 'build:front': 'next build', 'build:frourio': 'frourio --build', 'build:server': 'webpack --mode=production --config server/webpack.config.js', dev: 'run-p dev:*', - 'dev:aspida': 'aspida --watch', + 'dev:aspida': 'aspida --watch --config server/aspida.config.js', 'dev:front': 'next dev', 'dev:frourio': 'frourio --watch', 'dev:server': 'webpack --watch --mode=development --config server/webpack.config.js', diff --git a/test/snapshots/index.test.js.snap b/test/snapshots/index.test.js.snap index d01bb93fd2858aba14348b856aa8e2cb35e0ce38..1b92f88a8954649bebe93e7256e4e3760c6cb38a 100644 GIT binary patch literal 5799 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 VcSkE)QyXr9sK-=4e;ecC{2$>+Eq4F_ literal 5610 zcmcguXEYpKwADv1Bg*Jql;|aTi#{P4y@b(;64Ck8AzJjP!AP_rh#E#W(Mu3Si!g|Z zIz$;E#FOv6AMgEof8Kic$G-dQd)B&popaV*SHoO`%f!dQ*WdkF09TL{IRV~O14)1O zQ>ufMlUnj?up8!hNU|&UdNhja@$_9nVzG;!y)HQrK%o zWG3FM3Y%G(^)K$mTIigo_1sJ{#izI{*PoasnCN%cw2hsq4h^Y^U`rzQFk@L3lb5HM ze+0aIg{uqWt8GEhTCXQZCws1^-+Zf`3eM*<^A3WAtM`VhMN2*|wtVBCB|sE)UsQ;& z20!~Me-nVn3Y(oW&Hd!KkKK96%3%|H^chvJaz6NVDoEyj&Rot-7&Ja%FZm{a-dk+2%V22cm?zna+4WrY zBnB{DXIs(ql)=gV&(o2frP+bV@!7J-P}h3E`&*OJ3-7Kr#D)a2 zTi&;qxqUxjXJ=ZA7|t318S%>omW;KhO9nlgJ+}IaYwhv7I#yC+>yW$fM`W=?7;NqL zO5pnDJ?kSkmbcX=Q*4!1I)f$0co3@%CN5KjDIczWgU`|NOPp-m;opAmt1%t;3s
  • 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 sPBMK+b+>GdRed)Fka;^iuI@K~$L259+1(#` Date: Sun, 28 Jun 2020 22:26:22 +0900 Subject: [PATCH 03/10] feat(none): separete package.json --- lib/package.js | 2 + lib/saofile.js | 5 +- templates/aspida/nuxt/axios/plugins/api.ts | 2 +- templates/aspida/nuxt/fetch/plugins/api.ts | 2 +- templates/database/server/service/tasks.ts | 2 +- .../front/next/components/UserBanner.tsx | 2 +- templates/front/next/pages/index.tsx | 2 +- templates/front/next/utils/apiClient.ts | 2 +- templates/front/none/_package.json | 36 +++------ templates/front/nuxt/_package.json | 14 ++-- .../front/nuxt/components/UserBanner.vue | 2 +- templates/front/nuxt/pages/index.vue | 2 +- templates/{common => }/server/.env | 0 .../{common => }/server/api/@controller.ts | 0 templates/{common => }/server/api/index.ts | 0 .../server/api/tasks/@controller.ts | 2 +- .../api/tasks/_taskId@number/@controller.ts | 2 +- .../server/api/tasks/_taskId@number/index.ts | 2 +- .../{common => }/server/api/tasks/index.ts | 2 +- .../server/api/token/@controller.ts | 2 +- .../{common => }/server/api/token/index.ts | 2 +- .../server/api/user/@controller.ts | 2 +- .../server/api/user/@middleware.ts | 2 +- .../{common => }/server/api/user/index.ts | 2 +- .../{common => }/server/aspida.config.js | 2 +- templates/{common => }/server/index.ts | 0 templates/server/package.json | 32 ++++++++ .../server/public/icons/dammy.svg | 0 .../{common => }/server/service/envValues.ts | 2 +- .../{common => }/server/service/tasks.ts | 4 +- templates/{common => }/server/service/user.ts | 2 +- templates/{common => }/server/tsconfig.json | 4 +- templates/{common => }/server/types/index.ts | 0 .../{common => }/server/webpack.config.js | 16 +--- test/snapshots/index.test.js.md | 69 +++++++++--------- test/snapshots/index.test.js.snap | Bin 5799 -> 5899 bytes 36 files changed, 117 insertions(+), 105 deletions(-) rename templates/{common => }/server/.env (100%) rename templates/{common => }/server/api/@controller.ts (100%) rename templates/{common => }/server/api/index.ts (100%) rename templates/{common => }/server/api/tasks/@controller.ts (78%) rename templates/{common => }/server/api/tasks/_taskId@number/@controller.ts (82%) rename templates/{common => }/server/api/tasks/_taskId@number/index.ts (78%) rename templates/{common => }/server/api/tasks/index.ts (76%) rename templates/{common => }/server/api/token/@controller.ts (79%) rename templates/{common => }/server/api/token/index.ts (70%) rename templates/{common => }/server/api/user/@controller.ts (79%) rename templates/{common => }/server/api/user/@middleware.ts (89%) rename templates/{common => }/server/api/user/index.ts (78%) rename templates/{common => }/server/aspida.config.js (62%) rename templates/{common => }/server/index.ts (100%) create mode 100644 templates/server/package.json rename templates/{common => }/server/public/icons/dammy.svg (100%) rename templates/{common => }/server/service/envValues.ts (87%) rename templates/{common => }/server/service/tasks.ts (94%) rename templates/{common => }/server/service/user.ts (97%) rename templates/{common => }/server/tsconfig.json (89%) rename templates/{common => }/server/types/index.ts (100%) rename templates/{common => }/server/webpack.config.js (61%) diff --git a/lib/package.js b/lib/package.js index 3705f3d4..b4cf5e25 100644 --- a/lib/package.js +++ b/lib/package.js @@ -28,6 +28,8 @@ module.exports = { }) } + if (pkgs.length === 1) return pkgs[0] + const pkg = merge(...pkgs) pkg.dependencies = sortByKey(pkg.dependencies) pkg.devDependencies = sortByKey(pkg.devDependencies) diff --git a/lib/saofile.js b/lib/saofile.js index 7d1ed4d3..64d83db5 100644 --- a/lib/saofile.js +++ b/lib/saofile.js @@ -60,8 +60,8 @@ module.exports = { }, { type: 'add', - files: '**', - templateDir: resolve(__dirname, '../templates/common') + files: 'server/**', + templateDir: resolve(__dirname, '../templates') }, ...addedList, { @@ -84,6 +84,7 @@ module.exports = { this.gitInit() await this.npmInstall({ npmClient: this.answers.pm }) + await this.npmInstall({ npmClient: this.answers.pm, cwd: `${this.outDir}/server` }) spawn.sync(this.answers.pm, ['run', 'build:apis'], { cwd: this.outDir, diff --git a/templates/aspida/nuxt/axios/plugins/api.ts b/templates/aspida/nuxt/axios/plugins/api.ts index ef852c02..a394c1a4 100644 --- a/templates/aspida/nuxt/axios/plugins/api.ts +++ b/templates/aspida/nuxt/axios/plugins/api.ts @@ -1,6 +1,6 @@ import { Plugin } from '@nuxt/types' import aspida from '@aspida/axios' -import api, { ApiInstance } from '~/server/api/$api' +import api, { ApiInstance } from '$/api/$api' declare module 'vue/types/vue' { interface Vue { diff --git a/templates/aspida/nuxt/fetch/plugins/api.ts b/templates/aspida/nuxt/fetch/plugins/api.ts index 24e9fe10..8e50d645 100644 --- a/templates/aspida/nuxt/fetch/plugins/api.ts +++ b/templates/aspida/nuxt/fetch/plugins/api.ts @@ -1,6 +1,6 @@ import { Plugin } from '@nuxt/types' import aspida from '@aspida/fetch' -import api, { ApiInstance } from '~/server/api/$api' +import api, { ApiInstance } from '$/api/$api' declare module 'vue/types/vue' { interface Vue { diff --git a/templates/database/server/service/tasks.ts b/templates/database/server/service/tasks.ts index 5e3d43ba..1e0cf7db 100644 --- a/templates/database/server/service/tasks.ts +++ b/templates/database/server/service/tasks.ts @@ -1,5 +1,5 @@ import { getRepository } from 'typeorm' -import { Task } from '~/server/entity/Task' +import { Task } from '$/entity/Task' const taskRepository = () => getRepository(Task) diff --git a/templates/front/next/components/UserBanner.tsx b/templates/front/next/components/UserBanner.tsx index 08b01b8e..d50e6b2e 100644 --- a/templates/front/next/components/UserBanner.tsx +++ b/templates/front/next/components/UserBanner.tsx @@ -1,6 +1,6 @@ import { useState, useCallback, ChangeEvent } from 'react' import { apiClient } from '~/utils/apiClient' -import { UserInfo } from '~/server/types' +import { UserInfo } from '$/types' const UserBanner = () => { const [isLoggedIn, setIsLoggedIn] = useState(false) diff --git a/templates/front/next/pages/index.tsx b/templates/front/next/pages/index.tsx index e09a5623..c8c77d36 100644 --- a/templates/front/next/pages/index.tsx +++ b/templates/front/next/pages/index.tsx @@ -1,7 +1,7 @@ import Head from 'next/head' import { useCallback, useState, FormEvent, ChangeEvent } from 'react' import { apiClient } from '~/utils/apiClient' -import { Task } from '~/server/types' +import { Task } from '$/types' import UserBanner from '~/components/UserBanner' type Props = { diff --git a/templates/front/next/utils/apiClient.ts b/templates/front/next/utils/apiClient.ts index 5aa72546..7e5cbd8f 100644 --- a/templates/front/next/utils/apiClient.ts +++ b/templates/front/next/utils/apiClient.ts @@ -1,4 +1,4 @@ import aspida from '@aspida/<%= aspida %>' -import api from '~/server/api/$api' +import api from '$/api/$api' export const apiClient = api(aspida()) diff --git a/templates/front/none/_package.json b/templates/front/none/_package.json index 0a4f39de..27b18811 100644 --- a/templates/front/none/_package.json +++ b/templates/front/none/_package.json @@ -4,51 +4,35 @@ "private": true, "scripts": { "dev": "run-p dev:*", - "dev:server": "webpack --watch --mode=development --config server/webpack.config.js", - "dev:aspida": "aspida --watch --config server/aspida.config.js", - "dev:frourio": "frourio --watch", - "build": "npm run build:apis && npm run build:server", - "build:server": "webpack --mode=production --config server/webpack.config.js", - "build:apis": "cross-env NODE_ENV=production run-p build:aspida build:frourio", - "build:aspida": "aspida --build --config server/aspida.config.js", - "build:frourio": "frourio --build", - "lint": "eslint --ext .ts,.js,.tsx --ignore-path .gitignore .", + "dev:server": "cd server && node_modules/.bin/webpack --watch --mode=development", + "dev:frourio": "cd server && node_modules/.bin/frourio --watch", + "build": "npm run build:frourio && npm run build:server", + "build:server": "cd server && node_modules/.bin/webpack --mode=production", + "build:frourio": "cd server && node_modules/.bin/frourio --build", + "lint": "eslint --ext .ts,.js --ignore-path .gitignore .", "lint:fix": "npm run lint -- --fix", - "start": "cross-env NODE_ENV=production node server/index.js", - "typecheck": "npm run build:apis && tsc --noEmit" + "start": "cd server && cross-env NODE_ENV=production node index.js", + "typecheck": "npm run build:frourio && tsc --noEmit" }, "lint-staged": { - "*.js": "npm run lint" + "*.{js,ts}": "npm run lint" }, "husky": { "hooks": { "pre-commit": "lint-staged" } }, - "dependencies": { - "dotenv": "^8.2.0", - "frourio": "^0.10.2", - "passport": "^0.4.1", - "passport-trusted-header": "^1.1.0" - }, "devDependencies": { "@typescript-eslint/eslint-plugin": "^3.2.0", "@typescript-eslint/parser": "^3.2.0", - "@types/passport": "^1.0.3", "cross-env": "^7.0.2", "eslint": "^6.1.0", "eslint-config-prettier": "^6.10.0", "eslint-plugin-prettier": "^3.1.2", "husky": "^4.0.0", "lint-staged": "^10.0.0", - "nodemon-webpack-plugin": "^4.3.1", "npm-run-all": "^4.1.5", "prettier": "^1.19.1", - "ts-loader": "^7.0.5", - "ts-node": "^8.10.2", - "tsconfig-paths-webpack-plugin": "^3.2.0", - "webpack": "^4.43.0", - "webpack-cli": "^3.3.11", - "webpack-node-externals": "^1.7.2" + "typescript": "^3.9.5" } } diff --git a/templates/front/nuxt/_package.json b/templates/front/nuxt/_package.json index c4651c57..3f739ad2 100644 --- a/templates/front/nuxt/_package.json +++ b/templates/front/nuxt/_package.json @@ -5,15 +5,15 @@ "scripts": { "dev": "run-p dev:*", "dev:front": "nuxt-ts", - "dev:server": "webpack --watch --mode=development --config server/webpack.config.js", - "dev:aspida": "aspida --watch --config server/aspida.config.js", - "dev:frourio": "frourio --watch", + "dev:server": "cd server && webpack --watch --mode=development", + "dev:aspida": "cd server && aspida --watch", + "dev:frourio": "cd server && frourio --watch", "build": "npm run build:apis && run-p build:front build:server", "build:front": "nuxt-ts build", - "build:server": "webpack --mode=production --config server/webpack.config.js", + "build:server": "cd server && webpack --mode=production", "build:apis": "cross-env NODE_ENV=production run-p build:aspida build:frourio", - "build:aspida": "aspida --build --config server/aspida.config.js", - "build:frourio": "frourio --build", + "build:aspida": "cd server && aspida --build", + "build:frourio": "cd server && frourio --build", "lint": "npm run lint:script && npm run lint:style", "lint:script": "eslint --ext .ts,.js,.vue --ignore-path .gitignore .", "lint:style": "stylelint \"**/*.{*(s)css,vue}\"", @@ -35,7 +35,7 @@ "dependencies": { "@nuxt/typescript-runtime": "^0.4.8", "dotenv": "^8.2.0", - "frourio": "^0.10.2", + "frourio": "^0.10.3", "nuxt": "2.12.2", "passport": "^0.4.1", "passport-trusted-header": "^1.1.0" diff --git a/templates/front/nuxt/components/UserBanner.vue b/templates/front/nuxt/components/UserBanner.vue index 4a617002..8f266c8c 100644 --- a/templates/front/nuxt/components/UserBanner.vue +++ b/templates/front/nuxt/components/UserBanner.vue @@ -12,7 +12,7 @@