chore(*)!: remove support for Nest v6 and Node <12

Also removes the UMD bundle since this is only used in Node.js. It has been replaced by a commonjs bundle.
willsoto · Aug 27, 2020 · d7506e8 · d7506e8
1 parent 937e023
commit d7506e8
Show file tree

Hide file tree

Showing 6 changed files with 1,258 additions and 3,385 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -4,8 +4,8 @@
     "project": "./tsconfig.json"
   },
   "extends": [
+    "eslint:recommended",
     "plugin:@typescript-eslint/recommended",
-    "@willsoto/eslint-config-base/typescript",
     "prettier",
     "prettier/@typescript-eslint"
   ],

diff --git a/lib/core.ts b/lib/core.ts
@@ -2,6 +2,7 @@ import {
   BeforeApplicationShutdown,
   DynamicModule,
   FactoryProvider,
+  Global,
   Inject,
   Module,
   Provider,
@@ -22,6 +23,7 @@ import {
   ObjectionModuleOptionsFactory,
 } from "./interfaces";
 
+@Global()
 @Module({})
 export class ObjectionCoreModule implements BeforeApplicationShutdown {
   constructor(

diff --git a/package.json b/package.json
@@ -10,8 +10,8 @@
   ],
   "license": "Apache-2.0",
   "author": "Will Soto <willsoto@users.noreply.github.com> (https://github.com/willsoto)",
-  "main": "dist/nestjs-objection.umd.js",
-  "module": "dist/nestjs-objection.esm.js",
+  "main": "./dist/nestjs-objection.cjs.js",
+  "module": "./dist/nestjs-objection.esm.js",
   "typings": "./typings/index.d.ts",
   "files": [
     "dist",
@@ -23,7 +23,7 @@
     "build": "rollup --config rollup.config.js",
     "postbuild": "yarn typings",
     "clean": "rimraf dist",
-    "lint": "eslint lib --ext ts --fix",
+    "lint": "eslint lib tests --ext ts --fix",
     "prerelease": "yarn build",
     "release": "standard-version --sign",
     "postrelease": "conventional-github-releaser -p angular",
@@ -51,46 +51,43 @@
     ]
   },
   "devDependencies": {
-    "@commitlint/cli": "9.1.2",
-    "@commitlint/config-conventional": "9.1.2",
-    "@godaddy/terminus": "4.4.1",
-    "@nestjs/common": "6.11.11",
-    "@nestjs/core": "6.11.11",
-    "@nestjs/terminus": "6.5.6",
-    "@nestjs/testing": "7.0.0",
-    "@types/jest": "~26.0.0",
-    "@typescript-eslint/eslint-plugin": "2.34.0",
-    "@typescript-eslint/parser": "2.34.0",
-    "@willsoto/eslint-config-base": "2.0.0",
-    "conventional-github-releaser": "3.1.5",
-    "eslint": "6.8.0",
-    "eslint-config-prettier": "6.11.0",
-    "husky": "4.2.5",
-    "jest": "26.4.2",
-    "knex": "0.21.5",
-    "lint-staged": "10.2.13",
+    "@commitlint/cli": "~9.1.2",
+    "@commitlint/config-conventional": "~9.1.2",
+    "@nestjs/common": "~7.4.2",
+    "@nestjs/core": "~7.4.2",
+    "@nestjs/testing": "~7.4.2",
+    "@rollup/plugin-typescript": "~5.0.2",
+    "@types/jest": "~26.0.10",
+    "@typescript-eslint/eslint-plugin": "~3.10.1",
+    "@typescript-eslint/parser": "~3.10.1",
+    "conventional-github-releaser": "~3.1.5",
+    "eslint": "~7.7.0",
+    "eslint-config-prettier": "~6.11.0",
+    "husky": "~4.2.5",
+    "jest": "~26.4.2",
+    "knex": "~0.21.5",
+    "lint-staged": "~10.2.13",
     "markdown-toc": "~1.2.0",
-    "objection": "2.2.3",
-    "prettier": "2.1.1",
-    "prettier-plugin-organize-imports": "~1.1.0",
-    "prettier-plugin-packagejson": "~2.2.3",
-    "reflect-metadata": "0.1.13",
-    "rimraf": "3.0.2",
-    "rollup": "2.26.5",
-    "rollup-plugin-eslint": "7.0.0",
-    "rollup-plugin-filesize": "9.0.2",
-    "rollup-plugin-typescript": "1.0.1",
-    "rxjs": "6.6.2",
-    "sqlite3": "5.0.0",
-    "standard-version": "9.0.0",
+    "objection": "~2.2.3",
+    "prettier": "~2.1.1",
+    "prettier-plugin-organize-imports": "~1.1.1",
+    "prettier-plugin-packagejson": "~2.2.5",
+    "reflect-metadata": "~0.1.13",
+    "rimraf": "~3.0.2",
+    "rollup": "~2.26.6",
+    "rollup-plugin-filesize": "~9.0.2",
+    "rxjs": "~6.6.2",
+    "sqlite3": "~5.0.0",
+    "standard-version": "~9.0.0",
     "ts-jest": "~26.3.0",
-    "typescript": "3.9.7"
+    "tslib": "~2.0.1",
+    "typescript": "~4.0.2"
   },
   "peerDependencies": {
-    "@nestjs/common": ">=6.2.0",
-    "@nestjs/core": ">=6.2.0",
-    "knex": ">=0.16.5",
-    "objection": ">=1.6.8"
+    "@nestjs/common": "^7.0.0",
+    "@nestjs/core": "^7.0.0",
+    "knex": "^0.16.0",
+    "objection": "^1.6.0 || ^2.0.0"
   },
   "volta": {
     "node": "12.12.0",

diff --git a/rollup.config.js b/rollup.config.js
@@ -1,14 +1,8 @@
-import { eslint } from "rollup-plugin-eslint";
+import typescript from "@rollup/plugin-typescript";
 import filesize from "rollup-plugin-filesize";
-import typescript from "rollup-plugin-typescript";
 import pkg from "./package.json";
 
-const formats = ["umd", "esm"];
-const globals = {
-  "@nestjs/common": "nestjsCommon",
-  knex: "Knex",
-  objection: "Objection"
-};
+const formats = ["cjs", "esm"];
 
 export default {
   input: "lib/index.ts",
@@ -17,24 +11,12 @@ export default {
     format,
     name: "NestJSObjection",
     sourcemap: true,
-    globals,
-    banner: `
-      /**
-       *
-       * ${pkg.name}@${pkg.version}
-       * ${pkg.license}
-       *
-       */`
   })),
-  external: Object.keys(globals),
+  external: Object.keys(pkg.peerDependencies),
   plugins: [
-    eslint({
-      throwOnWarning: true,
-      throwOnError: true
-    }),
     typescript({
-      tsconfig: "./tsconfig.build.json"
+      tsconfig: "./tsconfig.build.json",
     }),
-    filesize()
-  ]
+    filesize(),
+  ],
 };
diff --git a/tsconfig.json b/tsconfig.json
@@ -5,12 +5,13 @@
     "esModuleInterop": true,
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
-    "lib": ["esnext"],
+    "lib": ["ES2019"],
     "module": "es2015",
     "moduleResolution": "node",
     "skipLibCheck": true,
     "sourceMap": true,
-    "strict": true
+    "strict": true,
+    "target": "ES2019"
   },
   "exclude": ["node_modules"],
   "include": ["lib/**/*.ts", "tests/**/*.ts"]