Merge pull request #388 from frouriojs/feat

feat: update deps and fix npm scripts

.github/workflows/nodejs.yml

@@ -4,15 +4,15 @@ on:
   push:
   pull_request:
   schedule:
-    - cron:  '0 10 * * *'
+    - cron: '0 10 * * *'
 
 jobs:
   test:
-    name: "Test on Node:${{ matrix.node-version }} OS:ubuntu-latest"
+    name: 'Test on Node:${{ matrix.node-version }} OS:ubuntu-latest'
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [12, 14]
+        node-version: [14, 16]
     services:
       postgres:
         image: postgres
@@ -36,7 +36,7 @@ jobs:
       - uses: actions/cache@v2
         id: yarn-cache
         with:
-          path: "node_modules"
+          path: 'node_modules'
           key: ${{ runner.os }}-node-v${{ matrix.node-version }}-yarn-${{ hashFiles('yarn.lock') }}-3
       - run: yarn --frozen-lockfile
         if: steps.yarn-cache.outputs.cache-hit != 'true'
@@ -66,11 +66,11 @@ jobs:
           TEST_CFA_RANDOM_NUM: 5
 
   test-win:
-    name: "Test on Node:${{ matrix.node-version }} OS:windows-latest"
+    name: 'Test on Node:${{ matrix.node-version }} OS:windows-latest'
     runs-on: windows-latest
     strategy:
       matrix:
-        node-version: [14]
+        node-version: [16]
     steps:
       - uses: actions/checkout@v2
       - name: setup Node.js ${{ matrix.node-version }}
@@ -80,7 +80,7 @@ jobs:
       - uses: actions/cache@v2
         id: yarn-cache
         with:
-          path: "node_modules"
+          path: 'node_modules'
           key: ${{ runner.os }}-node-v${{ matrix.node-version }}-yarn-${{ hashFiles('yarn.lock') }}-3
       - run: echo 'network-timeout 1000000' >> ~/.yarnrc
       - run: yarn --frozen-lockfile --network-timeout 1000000
@@ -106,13 +106,13 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v1
         with:
-          node-version: "14.x"
-          registry-url: "https://registry.npmjs.org"
+          node-version: '16.x'
+          registry-url: 'https://registry.npmjs.org'
       - uses: actions/cache@v2
         id: yarn-cache
         with:
-          path: "node_modules"
-          key: ${{ runner.os }}-node-v14-yarn-${{ hashFiles('yarn.lock') }}
+          path: 'node_modules'
+          key: ${{ runner.os }}-node-v16-yarn-${{ hashFiles('yarn.lock') }}
       - run: echo 'network-timeout 1000000' >> ~/.yarnrc
       - run: yarn --frozen-lockfile --network-timeout 1000000
         if: steps.yarn-cache.outputs.cache-hit != 'true'

package.json

@@ -45,13 +45,13 @@
     "typescript"
   ],
   "dependencies": {
-    "@aspida/axios": "^1.10.3",
-    "@aspida/swr": "^1.10.3",
+    "@aspida/axios": "^1.11.0",
+    "@aspida/swr": "^1.11.0",
     "@fastify/cors": "^7.0.0",
     "@fastify/static": "^5.0.2",
     "@fastify/websocket": "^5.0.0",
     "ansi_up": "^5.1.0",
-    "axios": "^0.26.0",
+    "axios": "^0.27.2",
     "commander": "^9.0.0",
     "cross-spawn": "^7.0.3",
     "ejs": "^3.1.7",
@@ -60,7 +60,7 @@
     "github-buttons": "^2.21.1",
     "is-binary-path": "^2.1.0",
     "mariadb": "^2.5.5",
-    "next": "^12.2.3",
+    "next": "^12.2.5",
     "object-hash": "^3.0.0",
     "open": "^8.4.0",
     "pg": "^8.7.3",
@@ -71,7 +71,7 @@
     "react-markdown": "^8.0.0",
     "react-query": "^3.34.16",
     "real-executable-path": "^3.0.0",
-    "swr": "^1.2.2"
+    "swr": "^1.3.0"
   },
   "devDependencies": {
     "@fastify/nextjs": "^8.0.0",
@@ -111,9 +111,9 @@
     "tcp-port-used": "^1.0.2",
     "ts-jest": "^27.1.3",
     "ts-loader": "^9.3.0",
-    "ts-node": "^10.4.0",
+    "ts-node": "^10.9.1",
     "tsconfig-paths-webpack-plugin": "^3.5.2",
-    "typescript": "~4.5.5",
+    "typescript": "^4.7.4",
     "wait-for-expect": "^3.0.2",
     "webpack": "^5.74.0",
     "webpack-cli": "^4.10.0",

server/pretense/package.json

@@ -6,11 +6,11 @@
     "upgrade-frourio": "npx ncu frourio frourio-express aspida @aspida/axios @aspida/fetch @aspida/node-fetch @aspida/react-query @aspida/swr pathpida -u"
   },
   "dependencies": {
-    "@aspida/axios": "^1.10.3",
-    "@aspida/fetch": "^1.10.3",
-    "@aspida/node-fetch": "^1.10.3",
-    "@aspida/react-query": "^1.10.3",
-    "@aspida/swr": "^1.10.3",
+    "@aspida/axios": "^1.11.0",
+    "@aspida/fetch": "^1.11.0",
+    "@aspida/node-fetch": "^1.11.0",
+    "@aspida/react-query": "^1.11.0",
+    "@aspida/swr": "^1.11.0",
     "@babel/core": "^7.17.0",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@babel/plugin-transform-runtime": "^7.17.0",
@@ -28,7 +28,7 @@
     "@nuxt/typescript-runtime": "^2.1.0",
     "@nuxtjs/axios": "^5.13.6",
     "@nuxtjs/eslint-config": "^8.0.0",
-    "@nuxtjs/eslint-config-typescript": "^8.0.0",
+    "@nuxtjs/eslint-config-typescript": "^10.0.0",
     "@nuxtjs/eslint-module": "^3.0.2",
     "@nuxtjs/stylelint-module": "^4.1.0",
     "@prisma/client": "^3.9.1",
@@ -39,7 +39,7 @@
     "@rollup/plugin-replace": "^3.0.1",
     "@rollup/plugin-typescript": "^8.3.0",
     "@rollup/plugin-url": "^6.1.0",
-    "@testing-library/react": "^12.1.2",
+    "@testing-library/react": "^13.3.0",
     "@testing-library/vue": "^5.8.2",
     "@tsconfig/svelte": "^3.0.0",
     "@types/aws-lambda": "^8.10.92",
@@ -59,7 +59,7 @@
     "@vendia/serverless-express": "^4.5.3",
     "@vue/test-utils": "^1.3.0",
     "aspida": "^1.10.3",
-    "axios": "^0.25.0",
+    "axios": "^0.27.2",
     "babel-core": "7.0.0-bridge.0",
     "babel-eslint": "^10.1.0",
     "babel-jest": "^27.5.0",
@@ -72,12 +72,12 @@
     "dotenv": "^16.0.0",
     "esbuild": "^0.14.19",
     "esbuild-node-externals": "^1.4.1",
-    "eslint": "^7.24.0",
+    "eslint": "^8.22.0",
     "eslint-config-prettier": "^8.3.0",
-    "eslint-config-standard": "^16.0.3",
+    "eslint-config-standard": "^17.0.0",
     "eslint-plugin-import": "^2.25.4",
     "eslint-plugin-jest": "^26.1.0",
-    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-n": "^15.2.4",
     "eslint-plugin-nuxt": "^3.1.0",
     "eslint-plugin-promise": "^6.0.0",
     "eslint-plugin-react": "^7.28.0",
@@ -93,7 +93,7 @@
     "lint-staged": "^12.3.3",
     "multer": "^1.4.4",
     "mysql2": "^2.3.3",
-    "next": "^12.2.3",
+    "next": "^12.2.5",
     "node-dev": "^7.1.0",
     "node-fetch": "^2.6.1",
     "nodemon-webpack-plugin": "^4.7.1",
@@ -123,15 +123,15 @@
     "svelte-check": "^2.4.2",
     "svelte-loader": "^3.1.2",
     "svelte-preprocess": "^4.10.2",
-    "swr": "^1.2.1",
+    "swr": "^1.3.0",
     "ts-jest": "^27.1.3",
-    "ts-loader": "~8.2.0",
-    "ts-node": "^10.4.0",
+    "ts-loader": "^8.4.0",
+    "ts-node": "^10.9.1",
     "tsconfig-paths-webpack-plugin": "^3.5.2",
     "tslib": "^2.3.1",
     "typeorm": "^0.2.41",
     "typeormer": "^0.1.3",
-    "typescript": "~4.5",
+    "typescript": "^4.7.4",
     "vue-jest": "^3.0.7",
     "wait-on": "^6.0.1",
     "webpack": "^5.68.0",

server/templates/@client=next/tsconfig.json

@@ -21,7 +21,8 @@
     "moduleResolution": "node",
     "resolveJsonModule": true,
     "isolatedModules": true,
-    "jsx": "preserve"
+    "jsx": "preserve",
+    "incremental": true
   },
   "exclude": ["node_modules", "server"],
   "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"]

server/templates/@client=sapper/@dev-dep

@@ -20,7 +20,7 @@ eslint
 eslint-config-prettier
 eslint-config-standard
 eslint-plugin-import
-eslint-plugin-node
+eslint-plugin-n
 eslint-plugin-promise
 npm-run-all
 prettier

server/templates/server/@orm=none/scripts/config.common.js

@@ -5,7 +5,7 @@ module.exports = {
   entryPoints: [path.resolve(__dirname, '../entrypoints/index.ts')],
   outdir: path.resolve(__dirname, '../'),
   platform: 'node',
-  target: 'node12',
+  target: 'node16',
   bundle: true,
   plugins: [nodeExternalsPlugin()],
   logLevel: 'info'

server/templates/server/@orm=prisma/scripts/config.common.js

@@ -7,7 +7,7 @@ module.exports = {
     path.resolve(__dirname, '../entrypoints/lambda_migration.ts')<% } %>],
   outdir: path.resolve(__dirname, '../'),
   platform: 'node',
-  target: 'node12',
+  target: 'node16',
   bundle: true,
   plugins: [nodeExternalsPlugin()],
   logLevel: 'info'

server/templates/server/index.js

@@ -0,0 +1 @@
+// empty js file for first build

server/templates/server/package.json

@@ -4,7 +4,8 @@
   "private": true,
   "scripts": {
     "dev": "npm run generate && <% if (orm === 'prisma') { %>npm run migrate:dev && <% } %>run-p dev:*",
-    "dev:server": "<% if (orm === 'typeorm') { %>webpack --watch --mode=development<% } else { %>node ./scripts/build.dev.js && node-dev --respawn index.js<% } %>",
+    "dev:server": "<% if (orm === 'typeorm') { %>webpack --watch --mode=development<% } else { %>node-dev --respawn index.js",
+    "dev:build": "node ./scripts/build.dev.js<% } %>",
     "dev:frourio": "frourio<% if (server === 'express') { %>-express<% } %> --watch<% if (orm === 'prisma') { %>",
     "dev:prisma": "prisma generate --watch<% } else if (orm === 'typeorm') { %>",
     "dev:typeormer": "typeormer --watch<% } %>",
@@ -14,7 +15,7 @@
     "generate:prisma": "prisma generate<% } else if (orm === 'typeorm') { %>",
     "generate:typeormer": "typeormer<% } %><% if (orm === 'prisma') { %>",
     "migrate:dev": "prisma migrate dev",
-    "migrate:dev:createonly":"prisma migrate dev --create-only",
+    "migrate:dev:createonly": "prisma migrate dev --create-only",
     "migrate:reset": "prisma migrate reset<% } else if (orm === 'typeorm') { %>",
     "typeorm": "ts-node ./node_modules/typeorm/cli.js",
     "migration:generate": "npm run typeorm -- migration:generate -n generate",
@@ -25,7 +26,7 @@
     "pm2:delete": "pm2 delete pm2.config.json",
     "pm2:logs": "pm2 logs",
     "pm2:monit": "pm2 monit<% } %><% if (orm === 'prisma'){ %>",
-    "seed":"prisma db seed --preview-feature",
+    "seed": "prisma db seed --preview-feature",
     "ts-node": "ts-node --compiler-options \"{\\\"module\\\":\\\"commonjs\\\"}\"<% } %>",
     "start": "cross-env NODE_ENV=production node index.js"
   }