diff --git a/packages/xo-server-auth-google/.babelrc b/packages/xo-server-auth-google/.babelrc deleted file mode 100644 index 5e9978a41..000000000 --- a/packages/xo-server-auth-google/.babelrc +++ /dev/null @@ -1,15 +0,0 @@ -{ - "comments": false, - "compact": true, - "optional": [ - // Experimental features. - // "minification.constantFolding", - // "minification.deadCodeElimination", - - "es7.asyncFunctions", - "es7.decorators", - "es7.exportExtensions", - "es7.functionBind", - "runtime" - ] -} diff --git a/packages/xo-server-auth-google/.editorconfig b/packages/xo-server-auth-google/.editorconfig index da21ef4c5..b6db0112a 100644 --- a/packages/xo-server-auth-google/.editorconfig +++ b/packages/xo-server-auth-google/.editorconfig @@ -41,7 +41,7 @@ indent_style = space # # Two spaces seems to be the standard most common style, at least in # Node.js (http://nodeguide.com/style.html#tabs-vs-spaces). -[*.js] +[*.{js,jsx,ts,tsx}] indent_size = 2 indent_style = space diff --git a/packages/xo-server-auth-google/.gitignore b/packages/xo-server-auth-google/.gitignore index 384949d8a..fa69f37f1 100644 --- a/packages/xo-server-auth-google/.gitignore +++ b/packages/xo-server-auth-google/.gitignore @@ -1,8 +1,5 @@ -/bower_components/ /dist/ +/node_modules/ npm-debug.log npm-debug.log.* - -!node_modules/* -node_modules/*/ diff --git a/packages/xo-server-auth-google/.mocha.js b/packages/xo-server-auth-google/.mocha.js index b888fb4d5..e6d84e403 100644 --- a/packages/xo-server-auth-google/.mocha.js +++ b/packages/xo-server-auth-google/.mocha.js @@ -1,3 +1,5 @@ -try { require('clarify') } catch (_) {} +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/.travis.yml b/packages/xo-server-auth-google/.travis.yml index 1be09b389..fb5d91729 100644 --- a/packages/xo-server-auth-google/.travis.yml +++ b/packages/xo-server-auth-google/.travis.yml @@ -1,11 +1,7 @@ language: node_js node_js: + - 'stable' - '4' - - 'iojs-v3' - - 'iojs-v2' - - 'iojs-v1' - - '0.12' - - '0.10' # 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 73c6493b9..3c0bbdc39 100644 --- a/packages/xo-server-auth-google/README.md +++ b/packages/xo-server-auth-google/README.md @@ -39,21 +39,8 @@ Add OAuth 2.0 credentials: ### Add the plugin to XO-Server config -```yaml -plugins: - - auth-google: - - # Both these values will be given to you when your instance of XO - # is registered in Google - # (https://google.com/settings/developers). - clientID: 326211154583-nt2s112d3t7f4f1hh49oo9164nivvbnu.apps.googleusercontent.com - clientSecret: -HTDb8I4jXiLRMaRL15qCffQ - - # Must be exactly the same as specified on the Google developer - # console. - callbackURL: 'http://xo.company.net/signin/google/callback' -``` +Like all other xo-server plugins, it can be configured directly via +the web iterface, see [the plugin documentation](https://xen-orchestra.com/docs/plugins.html). ## Development diff --git a/packages/xo-server-auth-google/package.json b/packages/xo-server-auth-google/package.json index 864fa7d6b..cb637c1a8 100644 --- a/packages/xo-server-auth-google/package.json +++ b/packages/xo-server-auth-google/package.json @@ -25,32 +25,58 @@ "files": [ "dist/" ], + "engines": { + "node": ">=4" + }, "dependencies": { - "babel-runtime": "^5.8.20", - "passport-google-oauth": "^0.2.0" + "babel-runtime": "^6.11.6", + "passport-google-oauth": "^1.0.0" }, "devDependencies": { - "babel": "^5.8.23", - "babel-eslint": "^4.1.1", - "clarify": "^1.0.5", - "mocha": "^2.3.1", - "must": "^0.12.0", - "source-map-support": "^0.3.2", - "standard": "^5.2.1", - "trace": "^1.2.0" + "babel-cli": "^6.16.0", + "babel-eslint": "^7.0.0", + "babel-plugin-lodash": "^3.2.9", + "babel-plugin-transform-runtime": "^6.15.0", + "babel-preset-es2015": "^6.16.0", + "babel-preset-stage-0": "^6.16.0", + "clarify": "^2.0.0", + "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" }, "scripts": { - "build": "babel --source-maps --out-dir=dist/ src/", - "dev": "babel --watch --source-maps --out-dir=dist/ src/", + "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", "prepublish": "npm run build", - "test": "npm run lint && mocha --opts .mocha.opts \"dist/**/*.spec.js\"", - "test-dev": "mocha --opts .mocha.opts --watch --reporter=min \"dist/**/*.spec.js\"" + "test": "mocha --opts .mocha.opts \"dist/**/*.spec.js\"" + }, + "babel": { + "plugins": [ + "transform-runtime", + "lodash" + ], + "presets": [ + "es2015", + "stage-0" + ] }, "standard": { "ignore": [ - "dist/**" + "dist" ], "parser": "babel-eslint" + }, + "config": { + "ghooks": { + "commit-msg": "npm test" + } } }