@feathersjs/cli 5.0.0-pre.32 → 5.0.0-pre.33

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (11) hide show
  1. package/CHANGELOG.md +12 -0
  2. package/LICENSE +1 -2
  3. package/README.md +3 -7
  4. package/lib/app/templates/logger.tpl.js +2 -2
  5. package/lib/app/templates/logger.tpl.ts +2 -2
  6. package/lib/connection/index.js +1 -1
  7. package/lib/connection/index.js.map +1 -1
  8. package/lib/connection/index.ts +1 -1
  9. package/lib/connection/templates/mongodb.tpl.js +1 -1
  10. package/lib/connection/templates/mongodb.tpl.ts +1 -1
  11. package/package.json +22 -22
package/CHANGELOG.md CHANGED
@@ -3,6 +3,18 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
+ # [5.0.0-pre.33](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.32...v5.0.0-pre.33) (2022-11-08)
7
+
8
+ ### Bug Fixes
9
+
10
+ - **cli:** Fix MongoDB connection database name parsing ([#2845](https://github.com/feathersjs/feathers/issues/2845)) ([50e7463](https://github.com/feathersjs/feathers/commit/50e7463971ef95cb98358b70a721e67554d92eb5))
11
+ - **cli:** Use proper MSSQL client ([#2853](https://github.com/feathersjs/feathers/issues/2853)) ([bae5176](https://github.com/feathersjs/feathers/commit/bae5176488b46fc377e53719d20e0036e087aa16))
12
+ - **docs:** Add JavaScript web app frontend guide ([#2834](https://github.com/feathersjs/feathers/issues/2834)) ([68cf03f](https://github.com/feathersjs/feathers/commit/68cf03f092da38ccbec5e9fd42b95d00f5a0a9f2))
13
+
14
+ ### Features
15
+
16
+ - **mongodb:** Add ObjectId resolvers and MongoDB option in the guide ([#2847](https://github.com/feathersjs/feathers/issues/2847)) ([c5c1fba](https://github.com/feathersjs/feathers/commit/c5c1fba5718a63412075cd3838b86b889eb0bd48))
17
+
6
18
  # [5.0.0-pre.32](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.31...v5.0.0-pre.32) (2022-10-26)
7
19
 
8
20
  ### Bug Fixes
package/LICENSE CHANGED
@@ -1,6 +1,6 @@
1
1
  The MIT License (MIT)
2
2
 
3
- Copyright (c) 2021 Feathers
3
+ Copyright (c) 2022 Feathers
4
4
 
5
5
  Permission is hereby granted, free of charge, to any person obtaining a copy
6
6
  of this software and associated documentation files (the "Software"), to deal
@@ -19,4 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19
19
  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20
20
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21
21
  SOFTWARE.
22
-
package/README.md CHANGED
@@ -9,17 +9,13 @@
9
9
  ## Installation
10
10
 
11
11
  ```
12
- npm install -g @feathersjs/cli
12
+ npm install @feathersjs/cli --save-dev
13
13
  ```
14
14
 
15
15
  ## Usage
16
16
 
17
17
  ```
18
- $ mkdir myproject
19
-
20
- $ cd myproject
21
-
22
- $ feathers help
18
+ $ npx feathers help
23
19
  ```
24
20
 
25
21
  ## Documentation
@@ -28,6 +24,6 @@ Refer to the [Feathers documentation](https://docs.feathersjs.com) for more deta
28
24
 
29
25
  ## License
30
26
 
31
- Copyright (c) 2021 [Feathers contributors](https://github.com/feathersjs/feathers/graphs/contributors)
27
+ Copyright (c) 2022 [Feathers contributors](https://github.com/feathersjs/feathers/graphs/contributors)
32
28
 
33
29
  Licensed under the [MIT license](LICENSE).
package/lib/app/templates/logger.tpl.js CHANGED
@@ -26,8 +26,8 @@ export const logErrorHook = async (context: HookContext, next: NextFunction) =>
26
26
  logger.error(error.stack)
27
27
 
28
28
  // Log validation errors
29
- if (error.errors) {
30
- logger.error(error.errors)
29
+ if (error.data) {
30
+ logger.error(error.data)
31
31
  }
32
32
 
33
33
  throw error
package/lib/app/templates/logger.tpl.ts CHANGED
@@ -26,8 +26,8 @@ export const logErrorHook = async (context: HookContext, next: NextFunction) =>
26
26
  logger.error(error.stack)
27
27
 
28
28
  // Log validation errors
29
- if (error.errors) {
30
- logger.error(error.errors)
29
+ if (error.data) {
30
+ logger.error(error.data)
31
31
  }
32
32
 
33
33
  throw error
package/lib/connection/index.js CHANGED
@@ -47,7 +47,7 @@ exports.DATABASE_CLIENTS = {
47
47
  sqlite: 'sqlite3',
48
48
  postgresql: 'pg',
49
49
  mysql: 'mysql',
50
- mssql: 'tedious'
50
+ mssql: 'mssql'
51
51
  };
52
52
  const getDatabaseClient = (database) => exports.DATABASE_CLIENTS[database];
53
53
  exports.getDatabaseClient = getDatabaseClient;
package/lib/connection/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/connection/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/connection/index.ts"],"names":[],"mappings":"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"}
package/lib/connection/index.ts CHANGED
@@ -61,7 +61,7 @@ export const DATABASE_CLIENTS = {
61
61
  sqlite: 'sqlite3',
62
62
  postgresql: 'pg',
63
63
  mysql: 'mysql',
64
- mssql: 'tedious'
64
+ mssql: 'mssql'
65
65
  }
66
66
 
67
67
  export const getDatabaseClient = (database: DatabaseType) => DATABASE_CLIENTS[database]
package/lib/connection/templates/mongodb.tpl.js CHANGED
@@ -15,7 +15,7 @@ declare module './declarations' {
15
15
 
16
16
  export const mongodb = (app: Application) => {
17
17
  const connection = app.get('mongodb') as string
18
- const database = connection.substring(connection.lastIndexOf('/') + 1)
18
+ const database = new URL(connection).pathname.substring(1)
19
19
  const mongoClient = MongoClient.connect(connection)
20
20
  .then(client => client.db(database))
21
21
 
package/lib/connection/templates/mongodb.tpl.ts CHANGED
@@ -14,7 +14,7 @@ declare module './declarations' {
14
14
 
15
15
  export const mongodb = (app: Application) => {
16
16
  const connection = app.get('mongodb') as string
17
- const database = connection.substring(connection.lastIndexOf('/') + 1)
17
+ const database = new URL(connection).pathname.substring(1)
18
18
  const mongoClient = MongoClient.connect(connection)
19
19
  .then(client => client.db(database))
20
20
 
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@feathersjs/cli",
3
3
  "description": "The command line interface for creating Feathers applications",
4
- "version": "5.0.0-pre.32",
4
+ "version": "5.0.0-pre.33",
5
5
  "homepage": "https://feathersjs.com",
6
6
  "main": "lib/",
7
7
  "bin": {
@@ -58,31 +58,31 @@
58
58
  "prettier": "^2.7.1"
59
59
  },
60
60
  "devDependencies": {
61
- "@feathersjs/authentication": "^5.0.0-pre.32",
62
- "@feathersjs/authentication-client": "^5.0.0-pre.32",
63
- "@feathersjs/authentication-local": "^5.0.0-pre.32",
64
- "@feathersjs/authentication-oauth": "^5.0.0-pre.32",
65
- "@feathersjs/configuration": "^5.0.0-pre.32",
66
- "@feathersjs/errors": "^5.0.0-pre.32",
67
- "@feathersjs/express": "^5.0.0-pre.32",
68
- "@feathersjs/feathers": "^5.0.0-pre.32",
69
- "@feathersjs/knex": "^5.0.0-pre.32",
70
- "@feathersjs/koa": "^5.0.0-pre.32",
71
- "@feathersjs/mongodb": "^5.0.0-pre.32",
72
- "@feathersjs/rest-client": "^5.0.0-pre.32",
73
- "@feathersjs/schema": "^5.0.0-pre.32",
74
- "@feathersjs/socketio": "^5.0.0-pre.32",
75
- "@feathersjs/transport-commons": "^5.0.0-pre.32",
76
- "@feathersjs/typebox": "^5.0.0-pre.32",
61
+ "@feathersjs/authentication": "^5.0.0-pre.33",
62
+ "@feathersjs/authentication-client": "^5.0.0-pre.33",
63
+ "@feathersjs/authentication-local": "^5.0.0-pre.33",
64
+ "@feathersjs/authentication-oauth": "^5.0.0-pre.33",
65
+ "@feathersjs/configuration": "^5.0.0-pre.33",
66
+ "@feathersjs/errors": "^5.0.0-pre.33",
67
+ "@feathersjs/express": "^5.0.0-pre.33",
68
+ "@feathersjs/feathers": "^5.0.0-pre.33",
69
+ "@feathersjs/knex": "^5.0.0-pre.33",
70
+ "@feathersjs/koa": "^5.0.0-pre.33",
71
+ "@feathersjs/mongodb": "^5.0.0-pre.33",
72
+ "@feathersjs/rest-client": "^5.0.0-pre.33",
73
+ "@feathersjs/schema": "^5.0.0-pre.33",
74
+ "@feathersjs/socketio": "^5.0.0-pre.33",
75
+ "@feathersjs/transport-commons": "^5.0.0-pre.33",
76
+ "@feathersjs/typebox": "^5.0.0-pre.33",
77
77
  "@types/mocha": "^10.0.0",
78
- "@types/node": "^18.8.2",
78
+ "@types/node": "^18.11.9",
79
79
  "@types/prettier": "^2.7.1",
80
- "axios": "^0.27.2",
81
- "mocha": "^10.0.0",
80
+ "axios": "^1.1.3",
81
+ "mocha": "^10.1.0",
82
82
  "shx": "^0.3.4",
83
83
  "ts-node": "^10.9.1",
84
- "type-fest": "^3.0.0",
84
+ "type-fest": "^3.1.0",
85
85
  "typescript": "^4.8.4"
86
86
  },
87
- "gitHead": "b405e205fc6d9fbd42b42c7a3f30ea4bf33d121d"
87
+ "gitHead": "89f516bcb1457e23a02c6212e9cd8bacc4d267d4"
88
88
  }