Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions .eslintrc.node9.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
const base = require('./.eslintrc.js');

module.exports = {
...base,
plugins: [...new Set([...(base.plugins || []), 'node'])],
rules: {
...base.rules,
'node/no-unsupported-features/es-syntax': ['error', {
version: '>=9.0.0',
ignores: ['modules']
}]
}
};
37 changes: 19 additions & 18 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,29 +11,30 @@
},
"main": "cloudinary.js",
"dependencies": {
"lodash": "^4.17.21"
"lodash": "^4.17.23"
},
"devDependencies": {
"@types/expect.js": "^0.3.29",
"@types/mocha": "^7.0.2",
"@types/node": "^13.5.0",
"date-fns": "^2.16.1",
"dotenv": "4.x",
"dtslint": "^0.9.1",
"@types/expect.js": "^0.3.32",
"@types/mocha": "^10.0.10",
"@types/node": "^22.9.3",
"date-fns": "^2.30.0",
"dotenv": "^8.2.0",
"dtslint": "^2.0.6",
"eslint": "^6.8.0",
"eslint-config-airbnb-base": "^14.2.1",
"eslint-plugin-import": "^2.20.2",
"expect.js": "0.3.x",
"glob": "^7.1.6",
"eslint-plugin-import": "^2.32.0",
"eslint-plugin-node": "^11.1.0",
"expect.js": "^0.3.1",
"glob": "^7.2.3",
"jsdoc": "^4.0.4",
"jsdom": "^9.12.0",
"jsdom-global": "2.1.1",
"mocha": "^6.2.3",
"nyc": "^14.1.1",
"rimraf": "^3.0.0",
"sinon": "^6.1.4",
"typescript": "^3.7.5",
"webpack-cli": "^3.2.1"
"jsdom": "^15.2.1",
"jsdom-global": "^3.0.2",
"mocha": "^7.2.0",
"nyc": "^15.1.0",
"rimraf": "^3.0.2",
"sinon": "^9.2.4",
"typescript": "^4.9.5",
"webpack-cli": "^3.3.12"
},
"files": [
"lib/**/*",
Expand Down
4 changes: 3 additions & 1 deletion test/setup.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
require('dotenv').load({
const dotenv = require('dotenv');
const dotenvInit = typeof dotenv.config === 'function' ? dotenv.config : dotenv.load;
dotenvInit({
silent: true
});

Expand Down
4 changes: 3 additions & 1 deletion test/testUtils/testConstants.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
require('dotenv').load({
const dotenv = require('dotenv');
const dotenvInit = typeof dotenv.config === 'function' ? dotenv.config : dotenv.load;
dotenvInit({
silent: true
});
const UNIQUE_JOB_SUFFIX_ID = process.env.TRAVIS_JOB_ID || Math.floor(Math.random() * 999999);
Expand Down
5 changes: 3 additions & 2 deletions tools/createTestCloud.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ function setup() {
fs.writeFileSync(`tools/cloudinary_url.sh`, URL); // This is needed for Travis
fs.writeFileSync(ENV_FILE_PATH, URL); // This is needed for local develoepr tests

require('dotenv').load();
const dotenv = require('dotenv');
const dotenvInit = typeof dotenv.config === 'function' ? dotenv.config : dotenv.load;
dotenvInit();

cloudinary.config(true);

Expand All @@ -58,4 +60,3 @@ function setup() {
}
setup();


2 changes: 2 additions & 0 deletions tools/scripts/lint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@
set -e;

eslint ./test ./lib
# Enforce source syntax compatibility with the oldest supported runtime.
eslint --config .eslintrc.node9.js ./cloudinary.js ./lib
4 changes: 2 additions & 2 deletions types/cloudinary_ts_spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -900,7 +900,7 @@ cloudinary.v2.uploader.upload("ftp://user1:mypass@ftp.example.com/sample.jpg",
console.log(result, error);
});

// $ExpectType Promise<UploadApiResponse> | UploadStream
// $ExpectType UploadStream | Promise<UploadApiResponse>
cloudinary.v2.uploader.upload_large("my_large_video.mp4",
{
resource_type: "video",
Expand All @@ -910,7 +910,7 @@ cloudinary.v2.uploader.upload_large("my_large_video.mp4",
console.log(result, error);
});

// $ExpectType Promise<UploadApiResponse> | UploadStream
// $ExpectType UploadStream | Promise<UploadApiResponse>
cloudinary.v2.uploader.upload_large("my_large_video.mp4",
{resource_type: "video"},
function (error, result) {
Expand Down