diff --git a/package.json b/package.json index 0e758e0..81d1e23 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "dev": "nodemon", "watch": "babel-node src/main.ts --extensions \".ts\"", "clean:dist": "rm -rf ./dist", - "build": "pnpm clean:dist && rollup -c", + "build": "pnpm clean:dist && rollup --c --configPlugin @rollup/plugin-typescript", "tsbuild": "pnpm clean:dist && tsc && tsc-alias", "start": "pm2 start ecosystem.config.js --env production", "restart": "pm2 restart ecosystem.config.js --env production", @@ -44,6 +44,7 @@ "@rollup/plugin-commonjs": "^21.0.1", "@rollup/plugin-json": "^4.1.0", "@rollup/plugin-node-resolve": "^13.1.1", + "@rollup/plugin-typescript": "^8.3.0", "@types/koa": "^2.13.4", "@types/koa-bodyparser": "4.3.4", "@types/koa-router": "^7.4.4", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1b75e79..6e0daf0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -10,6 +10,7 @@ specifiers: '@rollup/plugin-commonjs': ^21.0.1 '@rollup/plugin-json': ^4.1.0 '@rollup/plugin-node-resolve': ^13.1.1 + '@rollup/plugin-typescript': ^8.3.0 '@types/koa': ^2.13.4 '@types/koa-bodyparser': 4.3.4 '@types/koa-router': ^7.4.4 @@ -55,6 +56,7 @@ devDependencies: '@rollup/plugin-commonjs': 21.0.1_rollup@2.61.1 '@rollup/plugin-json': 4.1.0_rollup@2.61.1 '@rollup/plugin-node-resolve': 13.1.1_rollup@2.61.1 + '@rollup/plugin-typescript': 8.3.0_3bb347879280457c0420527ae9f527b5 '@types/koa': 2.13.4 '@types/koa-bodyparser': 4.3.4 '@types/koa-router': 7.4.4 @@ -1509,6 +1511,21 @@ packages: rollup: 2.61.1 dev: true + /@rollup/plugin-typescript/8.3.0_3bb347879280457c0420527ae9f527b5: + resolution: {integrity: sha512-I5FpSvLbtAdwJ+naznv+B4sjXZUcIvLLceYpITAn7wAP8W0wqc5noLdGIp9HGVntNhRWXctwPYrSSFQxtl0FPA==} + engines: {node: '>=8.0.0'} + peerDependencies: + rollup: ^2.14.0 + tslib: '*' + typescript: '>=3.7.0' + dependencies: + '@rollup/pluginutils': 3.1.0_rollup@2.61.1 + resolve: 1.20.0 + rollup: 2.61.1 + tslib: 2.3.1 + typescript: 4.5.4 + dev: true + /@rollup/pluginutils/3.1.0_rollup@2.61.1: resolution: {integrity: sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==} engines: {node: '>= 8.0.0'} diff --git a/rollup.config.ts b/rollup.config.ts index a414e29..c2edf11 100644 --- a/rollup.config.ts +++ b/rollup.config.ts @@ -1,3 +1,4 @@ +import { RollupOptions, ModuleFormat, OutputOptions } from 'rollup' import { nodeResolve } from '@rollup/plugin-node-resolve' import { getBabelOutputPlugin } from '@rollup/plugin-babel' import ts from 'rollup-plugin-typescript2' @@ -8,13 +9,13 @@ import path from 'path' const { getPresetsEnv } = require('./babel.presets') const pkg = require(path.resolve('package.json')) -const formats = [ +const formats: Array = [ 'cjs', 'esm' ] -const output = formats.map((format) => { +const output: Array = formats.map((format) => { const fileName = `bundle.${format}.js` - return { + const result: OutputOptions = { file: `dist/${fileName}`, format, banner: ` @@ -27,9 +28,10 @@ const output = formats.map((format) => { `, sourcemap: false } + return result }) -export default { +const rollupConfig: RollupOptions = { input: 'src/main.ts', output, external: [ @@ -57,3 +59,5 @@ export default { }) ] } + +export default rollupConfig diff --git a/src/services/home.ts b/src/services/home.ts index 3bca8a4..79f3ec6 100644 --- a/src/services/home.ts +++ b/src/services/home.ts @@ -2,7 +2,7 @@ export default class HomeService { hello = (): Promise => { return new Promise(resolve => resolve({ say: { - hello: 'Hello, Koa + TypeScript', + hello: 'Hello, Puppeteer Server', date: new Date() } })) diff --git a/tsconfig.json b/tsconfig.json index ed1e888..e1ba20f 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,6 +1,6 @@ { "compilerOptions": { - "module": "commonjs", + "module": "esnext", "moduleResolution": "node", "declaration": false, "resolveJsonModule": true, @@ -17,7 +17,7 @@ "sourceMap": false, "outDir": "./dist", "baseUrl": "./", - "lib": ["dom", "ES2020"], + "lib": ["dom", "esnext"], "types": ["puppeteer", "node"], "paths": { "@/*": [ @@ -27,7 +27,6 @@ }, "exclude": [ "dist", - "node_modules", - "rollup.config.ts" + "node_modules" ] }