From 9b93a47e4560747b14b13d50d289a55ea6c17ec3 Mon Sep 17 00:00:00 2001 From: Julien Fontanet Date: Fri, 16 Dec 2016 09:47:26 +0100 Subject: [PATCH] chore(package): update all dependencies --- packages/xo-server-auth-google/.gitignore | 4 ++ packages/xo-server-auth-google/.mocha.js | 5 -- packages/xo-server-auth-google/.mocha.opts | 1 - packages/xo-server-auth-google/.npmignore | 14 ++++ packages/xo-server-auth-google/.travis.yml | 5 +- packages/xo-server-auth-google/README.md | 19 +++--- packages/xo-server-auth-google/package.json | 71 ++++++++++++--------- 7 files changed, 71 insertions(+), 48 deletions(-) delete mode 100644 packages/xo-server-auth-google/.mocha.js delete mode 100644 packages/xo-server-auth-google/.mocha.opts diff --git a/packages/xo-server-auth-google/.gitignore b/packages/xo-server-auth-google/.gitignore index fa69f37f1..44c2154c1 100644 --- a/packages/xo-server-auth-google/.gitignore +++ b/packages/xo-server-auth-google/.gitignore @@ -1,5 +1,9 @@ +/coverage/ /dist/ /node_modules/ npm-debug.log npm-debug.log.* +pnpm-debug.log +pnpm-debug.log.* +yarn-error.log diff --git a/packages/xo-server-auth-google/.mocha.js b/packages/xo-server-auth-google/.mocha.js deleted file mode 100644 index e6d84e403..000000000 --- a/packages/xo-server-auth-google/.mocha.js +++ /dev/null @@ -1,5 +0,0 @@ -Error.stackTraceLimit = 100 - -try { require('trace') } catch (_) {} -try { require('clarify') } catch (_) {} -try { require('source-map-support/register') } catch (_) {} diff --git a/packages/xo-server-auth-google/.mocha.opts b/packages/xo-server-auth-google/.mocha.opts deleted file mode 100644 index 6cfd94898..000000000 --- a/packages/xo-server-auth-google/.mocha.opts +++ /dev/null @@ -1 +0,0 @@ ---require ./.mocha.js diff --git a/packages/xo-server-auth-google/.npmignore b/packages/xo-server-auth-google/.npmignore index c31ee82cb..e058b6bc1 100644 --- a/packages/xo-server-auth-google/.npmignore +++ b/packages/xo-server-auth-google/.npmignore @@ -1,10 +1,24 @@ +/benchmark/ +/benchmarks/ +*.bench.js +*.bench.js.map + /examples/ example.js example.js.map *.example.js *.example.js.map +/fixture/ +/fixtures/ +*.fixture.js +*.fixture.js.map +*.fixtures.js +*.fixtures.js.map + /test/ /tests/ *.spec.js *.spec.js.map + +__snapshots__/ diff --git a/packages/xo-server-auth-google/.travis.yml b/packages/xo-server-auth-google/.travis.yml index fb5d91729..1a582c426 100644 --- a/packages/xo-server-auth-google/.travis.yml +++ b/packages/xo-server-auth-google/.travis.yml @@ -1,7 +1,8 @@ language: node_js node_js: - - 'stable' - - '4' + - stable + - 6 + - 4 # Use containers. # http://docs.travis-ci.com/user/workers/container-based-infrastructure/ diff --git a/packages/xo-server-auth-google/README.md b/packages/xo-server-auth-google/README.md index 3c0bbdc39..38777d2f0 100644 --- a/packages/xo-server-auth-google/README.md +++ b/packages/xo-server-auth-google/README.md @@ -44,24 +44,21 @@ the web iterface, see [the plugin documentation](https://xen-orchestra.com/docs/ ## Development -### Installing dependencies - ``` +# Install dependencies > npm install -``` -### Compilation +# Run the tests +> npm test -The sources files are watched and automatically recompiled on changes. - -``` +# Continuously compile > npm run dev -``` -### Tests +# Continuously run the tests +> npm run dev-test -``` -> npm run test-dev +# Build for production (automatically called by npm install) +> npm run build ``` ## Contributions diff --git a/packages/xo-server-auth-google/package.json b/packages/xo-server-auth-google/package.json index cb637c1a8..f097e5991 100644 --- a/packages/xo-server-auth-google/package.json +++ b/packages/xo-server-auth-google/package.json @@ -4,16 +4,19 @@ "license": "AGPL-3.0", "description": "Google authentication plugin for XO-Server", "keywords": [ - "xo-server", - "xo-server", "authentication", - "google" + "google", + "orchestra", + "plugin", + "xen", + "xen-orchestra", + "xo-server" ], "homepage": "https://google.com/vatesfr/xo-server-auth-google", "bugs": "https://google.com/vatesfr/xo-server-auth-google/issues", "repository": { "type": "git", - "url": "https://google.com/vatesfr/xo-server-auth-google" + "url": "https://google.com/vatesfr/xo-server-auth-google.git" }, "author": { "name": "Julien Fontanet", @@ -33,30 +36,28 @@ "passport-google-oauth": "^1.0.0" }, "devDependencies": { - "babel-cli": "^6.16.0", - "babel-eslint": "^7.0.0", - "babel-plugin-lodash": "^3.2.9", + "babel-cli": "^6.18.0", + "babel-eslint": "^7.1.1", + "babel-plugin-lodash": "^3.2.11", "babel-plugin-transform-runtime": "^6.15.0", - "babel-preset-es2015": "^6.16.0", - "babel-preset-stage-0": "^6.16.0", - "clarify": "^2.0.0", + "babel-preset-env": "^1.1.1", + "babel-preset-stage-3": "^6.17.0", + "cross-env": "^3.1.3", "dependency-check": "^2.6.0", "ghooks": "^1.3.2", - "mocha": "^3.1.0", - "must": "^0.13.2", - "source-map-support": "^0.4.3", - "standard": "^8.2.0", - "trace": "^2.3.3" + "jest": "^18.0.0", + "rimraf": "^2.5.4", + "standard": "^8.6.0" }, "scripts": { - "build": "NODE_ENV=production babel --source-maps --out-dir=dist/ src/", - "depcheck": "dependency-check ./package.json", - "dev": "NODE_DEV=development babel --watch --source-maps --out-dir=dist/ src/", - "dev-test": "mocha --opts .mocha.opts --watch --reporter=min \"dist/**/*.spec.js\"", - "lint": "standard", - "posttest": "npm run lint && npm run depcheck", + "build": "cross-env NODE_ENV=production babel --source-maps --out-dir=dist/ src/", + "dev": "cross-env NODE_ENV=development babel --watch --source-maps --out-dir=dist/ src/", + "dev-test": "jest --bail --watch", + "posttest": "standard && dependency-check ./package.json", + "prebuild": "rimraf dist/", + "predev": "npm run prebuild", "prepublish": "npm run build", - "test": "mocha --opts .mocha.opts \"dist/**/*.spec.js\"" + "test": "jest" }, "babel": { "plugins": [ @@ -64,8 +65,25 @@ "lodash" ], "presets": [ - "es2015", - "stage-0" + [ + "env", + { + "targets": { + "node": 4 + } + } + ], + "stage-3" + ] + }, + "config": { + "ghooks": { + "commit-msg": "npm test" + } + }, + "jest": { + "testPathDirs": [ + "/src" ] }, "standard": { @@ -73,10 +91,5 @@ "dist" ], "parser": "babel-eslint" - }, - "config": { - "ghooks": { - "commit-msg": "npm test" - } } }