lybenson 3 лет назад
Родитель
Сommit
ff945c478e

+ 1 - 8
.babelrc

@@ -11,13 +11,6 @@
     ]
   ],
   "plugins": [
-    "@babel/plugin-transform-runtime",
-    ["import",
-      {
-        "libraryName": "vant",
-        "libraryDirectory": "es",
-        "style": true
-      }
-    ]
+    "@babel/plugin-transform-runtime"
   ]
 }

+ 14 - 2
bilibili-api/.babelrc

@@ -1,4 +1,16 @@
 {
-  "presets": ["es2015", "stage-2"],
-  "plugins": ["transform-runtime"]
+  "presets": [
+    [
+      "@babel/preset-env",
+      {
+        "modules": false,
+        "targets": {
+          "browsers": ["> 1%", "last 2 versions", "not ie <= 8"]
+        }
+      }
+    ]
+  ],
+  "plugins": [
+    "@babel/plugin-transform-runtime"
+  ]
 }

+ 1 - 1
bilibili-api/app/routes/banner.js

@@ -1,6 +1,6 @@
 import Router from 'koa-router'
 import axios from 'axios'
-import { banner } from './urlConfig'
+import { banner } from './urlConfig.js'
 
 const router = Router()
 

+ 1 - 1
bilibili-api/app/routes/ding.js

@@ -1,6 +1,6 @@
 import Router from 'koa-router'
 import axios from 'axios'
-import { ding } from './urlConfig'
+import { ding } from './urlConfig.js'
 
 const router = Router()
 

+ 1 - 1
bilibili-api/app/routes/extra.js

@@ -1,6 +1,6 @@
 import Router from 'koa-router'
 import axios from 'axios'
-import { getSearchDefaultWords, topbg, hot, slideshow, season, recommend } from './urlConfig'
+import { getSearchDefaultWords, topbg, hot, slideshow, season, recommend } from './urlConfig.js'
 
 const router = Router()
 

+ 6 - 6
bilibili-api/app/routes/index.js

@@ -1,10 +1,10 @@
 import Router from 'koa-router'
-import banner from './banner'
-import ding from './ding'
-import extra from './extra'
-import live from './live'
-import promote from './promote'
-import rank from './rank'
+import banner from './banner.js'
+import ding from './ding.js'
+import extra from './extra.js'
+import live from './live.js'
+import promote from './promote.js'
+import rank from './rank.js'
 
 const router = Router()
 

+ 1 - 1
bilibili-api/app/routes/live.js

@@ -1,6 +1,6 @@
 import Router from 'koa-router'
 import axios from 'axios'
-import { liveXhr } from './urlConfig'
+import { liveXhr } from './urlConfig.js'
 
 const router = Router()
 

+ 1 - 1
bilibili-api/app/routes/promote.js

@@ -1,6 +1,6 @@
 import Router from 'koa-router'
 import axios from 'axios'
-import { promote, promoteAd } from './urlConfig'
+import { promote, promoteAd } from './urlConfig.js'
 
 const router = Router()
 

+ 1 - 1
bilibili-api/app/routes/rank.js

@@ -1,6 +1,6 @@
 import Router from 'koa-router'
 import axios from 'axios'
-import { ranking3, ranking7, randking, rankbase } from './urlConfig'
+import { ranking3, ranking7, randking, rankbase } from './urlConfig.js'
 
 const router = Router()
 

+ 8 - 3
bilibili-api/app/server.js

@@ -14,10 +14,15 @@ import resource from 'koa-static' //静态资源托管
 
 import path from 'path'
 
-import routes from './routes'
-import config from '../config/config';
+import routes from './routes/index.js'
+import config from '../config/config.js'
+
+import { fileURLToPath } from 'url';
+import { dirname } from 'path';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
 
- 
 const app = new Koa();
 
 onerror(app)

+ 4 - 4
bilibili-api/config/config.js

@@ -1,7 +1,7 @@
 import _ from 'lodash'
-import development from './development'
-import production from './production'
-import test from './test'
+import development from './development.js'
+import production from './production.js'
+import test from './test.js'
 
 export const env = process.env.NODE_ENV || 'development'
 
@@ -17,4 +17,4 @@ const defaultConfig = {
 
 const config = _.merge(defaultConfig, configs[env])
 
-export default config
+export default config

+ 1 - 1
bilibili-api/config/test.js

@@ -1,6 +1,6 @@
 const port = Number.parseInt(process.env.PORT) || 9050;
 
-module.exports = {
+export default {
   port: port,
   hostName: '',
   assetHost: '',

+ 4 - 3
bilibili-api/index.js

@@ -1,5 +1,6 @@
 // process.env.NODE_ENV="test"
 
-require('babel-core/register');
-require('babel-polyfill');
-require('./app/server.js');
+// require('@babel/register')
+// require('@babel/polyfill')
+// require('./app/server.js')
+import './app/server.js'

+ 21 - 18
bilibili-api/package.json

@@ -2,30 +2,33 @@
   "name": "bilibili-api",
   "version": "1.0.0",
   "description": "",
+  "type": "module",
   "scripts": {
-    "start": "cross-env NODE_ENV=production ./node_modules/.bin/nodemon ./index.js",
+    "start": "cross-env NODE_ENV=production ./node_modules/.bin/nodemon babel-node ./server.js",
     "dev": "cross-env NODE_ENV=development ./node_modules/.bin/nodemon ./index.js",
     "test": "cross-env NODE_ENV=test ./node_modules/.bin/nodemon ./index.js"
   },
   "dependencies": {
-    "axios": "^0.19.0",
-    "koa": "^2.0.0",
-    "koa-bodyparser": "^3.2.0",
-    "koa-convert": "^1.2.0",
-    "koa-cors": "0.0.16",
-    "koa-logger": "^2.0.0",
-    "koa-onerror": "^3.0.1",
-    "koa-response-time": "^1.0.2",
-    "koa-router": "^7.1.0",
-    "koa-static": "^2.1.0"
+    "axios": "^0.22.0",
+    "koa": "^2.13.3",
+    "koa-bodyparser": "^4.3.0",
+    "koa-convert": "^2.0.0",
+    "koa-cors": "^0.0.16",
+    "koa-logger": "^3.2.1",
+    "koa-onerror": "^4.1.0",
+    "koa-response-time": "^2.1.0",
+    "koa-router": "^10.1.1",
+    "koa-static": "^5.0.0"
   },
   "devDependencies": {
-    "babel-core": "^6.21.0",
-    "babel-plugin-transform-runtime": "^6.15.0",
-    "babel-polyfill": "^6.20.0",
-    "babel-preset-es2015": "^6.18.0",
-    "babel-preset-stage-2": "^6.18.0",
-    "cross-env": "^3.1.4",
-    "nodemon": "^1.11.0"
+    "@babel/core": "^7.15.8",
+    "@babel/node": "^7.15.8",
+    "@babel/plugin-transform-runtime": "^7.15.8",
+    "@babel/polyfill": "^7.12.1",
+    "@babel/preset-env": "^7.15.8",
+    "@babel/register": "^7.15.3",
+    "@babel/runtime": "^7.15.4",
+    "cross-env": "^7.0.3",
+    "nodemon": "^2.0.13"
   }
 }

Разница между файлами не показана из-за своего большого размера
+ 990 - 730
bilibili-api/yarn.lock


Некоторые файлы не были показаны из-за большого количества измененных файлов