Skip to content

Commit 76c257f

Browse files
authored
chore: change to ECMAScript modules (#52)
* chore: change to ECMAScript modules BREAKING CHANGE: This package won't support CJS anymore.
1 parent 3c7303b commit 76c257f

21 files changed

+13195
-12852
lines changed

.eslintrc.json

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,23 @@
22
"env": {
33
"browser": true,
44
"es6": true,
5-
"node": true,
6-
"jest": true
5+
"node": true
76
},
87
"parser": "@typescript-eslint/parser",
8+
"parserOptions": {
9+
"ecmaVersion": 2020,
10+
"sourceType": "module"
11+
},
912
"plugins": [
1013
"@typescript-eslint",
1114
"prefer-arrow",
1215
"jsdoc",
13-
"jest",
1416
"import"
1517
],
1618
"extends": [
1719
"eslint:recommended",
1820
"plugin:@typescript-eslint/eslint-recommended",
19-
"plugin:@typescript-eslint/recommended",
20-
"plugin:jest/recommended"
21+
"plugin:@typescript-eslint/recommended"
2122
],
2223
"settings": {
2324
"import/core-modules": [
@@ -112,12 +113,6 @@
112113
"always"
113114
],
114115
"guard-for-in": "error",
115-
"jest/expect-expect": [
116-
"error",
117-
{
118-
"assertFunctionNames": ["expect", "request.*.expect", "request.**.expect", "request.*.expect*"]
119-
}
120-
],
121116
"max-classes-per-file": "off",
122117
"new-parens": "error",
123118
"no-bitwise": "error",
@@ -204,14 +199,6 @@
204199
"rules": {
205200
"spaced-comment": "off"
206201
}
207-
},
208-
{
209-
"files": [
210-
"*/cypress/**/*.spec.ts"
211-
],
212-
"rules": {
213-
"jest/expect-expect": "off"
214-
}
215202
}
216203
]
217204
}

.github/workflows/push.yml

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ jobs:
88
- name: Checkout
99
uses: actions/checkout@v2
1010
- name: Setup
11-
uses: actions/setup-node@v1
11+
uses: actions/setup-node@v2
1212
with:
13-
node-version: '12.x'
14-
- uses: actions/cache@v1
13+
node-version: '18.x'
14+
- uses: actions/cache@v2
1515
id: yarn-cache
1616
with:
1717
path: node_modules
@@ -31,20 +31,3 @@ jobs:
3131
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
3232
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3333
run: yarn release
34-
35-
notify:
36-
name: Notify
37-
runs-on: ubuntu-latest
38-
if: failure()
39-
needs:
40-
- test
41-
steps:
42-
- uses: technote-space/workflow-conclusion-action@v1
43-
- uses: 8398a7/action-slack@v3
44-
with:
45-
status: ${{ env.WORKFLOW_CONCLUSION }}
46-
fields: repo,message,commit,author,action,eventName,ref,workflow
47-
env:
48-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
49-
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
50-
if: always()

.releaserc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"semantic-release-slack-bot",
2020
{
2121
"notifyOnSuccess": true,
22-
"notifyOnFail": true
22+
"notifyOnFail": false
2323
}
2424
]
2525
]
File renamed without changes.

example-app/package.json

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -18,47 +18,47 @@
1818
"test:e2e": "NODE_ENV=test jest --config ./test/jest-e2e.json"
1919
},
2020
"dependencies": {
21-
"@adminjs/express": "^5.0.0",
22-
"@adminjs/mongoose": "^3.0.0",
23-
"@nestjs/common": "^9.0.5",
24-
"@nestjs/core": "^9.0.5",
25-
"@nestjs/mongoose": "^9.2.0",
26-
"@nestjs/platform-express": "^9.0.5",
27-
"adminjs": "^6.0.0",
28-
"class-transformer": "^0.3.1",
29-
"class-validator": "^0.12.2",
30-
"express": "^4.18.1",
21+
"@adminjs/express": "^5.1.0",
22+
"@adminjs/mongoose": "^3.0.3",
23+
"@nestjs/common": "^9.3.12",
24+
"@nestjs/core": "^9.3.12",
25+
"@nestjs/mongoose": "^9.2.2",
26+
"@nestjs/platform-express": "^9.3.12",
27+
"adminjs": "^7.0.0-beta-v7.5",
28+
"class-transformer": "^0.5.1",
29+
"class-validator": "^0.14.0",
30+
"express": "^4.18.2",
3131
"express-formidable": "^1.2.0",
32-
"express-session": "^1.17.1",
33-
"mongoose": "^5.13.14",
32+
"express-session": "^1.17.3",
33+
"mongoose": "^7.0.3",
3434
"reflect-metadata": "^0.1.13",
35-
"rimraf": "^3.0.0",
36-
"rxjs": "^7.2.0"
35+
"rimraf": "^4.4.1",
36+
"rxjs": "^7.8.0"
3737
},
3838
"devDependencies": {
39-
"@nestjs/cli": "^9.0.0",
40-
"@nestjs/schematics": "^9.0.1",
41-
"@nestjs/testing": "^9.0.5",
42-
"@types/express": "^4.17.13",
43-
"@types/jest": "^26.0.9",
39+
"@nestjs/cli": "^9.3.0",
40+
"@nestjs/schematics": "^9.1.0",
41+
"@nestjs/testing": "^9.3.12",
42+
"@types/express": "^4.17.17",
43+
"@types/jest": "^29.5.0",
4444
"@types/mongoose": "^5.11.97",
45-
"@types/node": "^12.7.5",
46-
"@types/supertest": "^2.0.8",
47-
"cypress": "^4.11.0",
48-
"eslint": "^7.1.0",
49-
"eslint-plugin-import": "^2.20.2",
50-
"eslint-plugin-jest": "^23.13.1",
51-
"eslint-plugin-jsdoc": "^25.4.2",
45+
"@types/node": "^18.15.11",
46+
"@types/supertest": "^2.0.12",
47+
"cypress": "^12.9.0",
48+
"eslint": "^8.37.0",
49+
"eslint-plugin-import": "^2.27.5",
50+
"eslint-plugin-jest": "^27.2.1",
51+
"eslint-plugin-jsdoc": "^40.1.1",
5252
"eslint-plugin-prefer-arrow": "^1.2.1",
53-
"jest": "^24.9.0",
54-
"prettier": "^1.18.2",
55-
"supertest": "^4.0.2",
56-
"ts-jest": "^24.1.0",
57-
"ts-loader": "^6.1.1",
58-
"ts-node": "^8.4.1",
59-
"tsc-watch": "^2.4.0",
60-
"tsconfig-paths": "^3.9.0",
61-
"typescript": "^4.3.5"
53+
"jest": "^29.5.0",
54+
"prettier": "^2.8.7",
55+
"supertest": "^6.3.3",
56+
"ts-jest": "^29.1.0",
57+
"ts-loader": "^9.4.2",
58+
"ts-node": "^10.9.1",
59+
"tsc-watch": "^6.0.0",
60+
"tsconfig-paths": "^4.2.0",
61+
"typescript": "^5.0.3"
6262
},
6363
"jest": {
6464
"moduleFileExtensions": [

example-app/src/app.module.ts

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -16,32 +16,32 @@ AdminJS.registerAdapter(AdminJSMongoose);
1616

1717
@Module({
1818
imports: [
19-
MongooseModule.forRoot('mongodb://localhost:27017/nest'),
20-
AdminModule.createAdminAsync({
21-
imports: [
22-
MongooseSchemasModule,
23-
],
24-
inject: [
25-
getModelToken('Admin'),
19+
MongooseModule.forRoot('mongodb://localhost:27017/nest'),
20+
AdminModule.createAdminAsync({
21+
imports: [
22+
MongooseSchemasModule,
23+
],
24+
inject: [
25+
getModelToken('Admin'),
26+
],
27+
useFactory: (adminModel: Model<Admin>) => ({
28+
adminJsOptions: {
29+
rootPath: '/admin',
30+
resources: [
31+
{ resource: adminModel },
2632
],
27-
useFactory: (adminModel: Model<Admin>) => ({
28-
adminJsOptions: {
29-
rootPath: '/admin',
30-
resources: [
31-
{ resource: adminModel },
32-
],
33-
},
34-
auth: {
35-
authenticate: async (email, password) => Promise.resolve({ email: 'test' }),
36-
cookieName: 'test',
37-
cookiePassword: 'testPass',
38-
},
33+
},
34+
auth: {
35+
authenticate: async (email, password) => Promise.resolve({ email: 'test' }),
36+
cookieName: 'test',
37+
cookiePassword: 'testPass',
38+
},
3939
}),
40-
customLoader: ExpressCustomLoader,
40+
customLoader: ExpressCustomLoader,
4141
}),
42-
MongooseSchemasModule,
42+
MongooseSchemasModule,
4343
],
4444
controllers: [AppController],
4545
providers: [AppService],
46-
})
46+
})
4747
export class AppModule { }

example-app/src/mongoose/mongoose.module.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import { AdminSchema } from './admin-model';
55

66
@Module({
77
imports: [
8-
MongooseModule.forFeature([{ name: 'Admin', schema: AdminSchema }]),
8+
MongooseModule.forFeature([{ name: 'Admin', schema: AdminSchema }]),
99
],
1010
exports: [MongooseModule],
11-
})
11+
})
1212
export class MongooseSchemasModule {}

0 commit comments

Comments
 (0)