Merge pull request #204 from doktordirk/dep-update

Dep update aurelia-rc1

.eslintrc.json

@@ -0,0 +1,6 @@
+{
+  "extends": "./node_modules/aurelia-tools/.eslintrc.json",
+  "rules": {
+    "no-new-func": 0
+  }
+}

.gitignore

@@ -3,4 +3,4 @@ jspm_packages
 bower_components
 .idea
 .DS_STORE
-build/reports
+build/reports

README.md

@@ -28,40 +28,73 @@ We've simplified installation and usage! This plugin should now be installed usi
 
 ## Installation
 
-### Jspm/SytemJs
+### Aureli-Cli
 
-Run `jspm i aurelia-authentication` from your project root.
+Run `npm i aurelia-authentication --save` from your project root.
 
-If install breaks your application, try resolving jspm forks:
+Add `aurelia-authentication` to the `build/bundles/dependencies` section of `aurelia-project/aurelia.json`.
 
-```
-$ jspm inspect --forks
-$ jspm resolve --only registry:package-name@version
+Aurelia-authentication has submodules (currently only the authFilter). You need to add it to the aurelia build resources in your package.json.
+
+```js
+"aurelia": {
+  "build": {
+    "resources": ["aurelia-authentication/authFilterValueConverter"]
+  }
+},
 ```
 
-E.g.
+### Jspm
+
+Run `jspm i aurelia-authentication`
 
+If the installation results in having forks, try resolving them by running:
+
+```sh
+jspm inspect --forks
+jspm resolve --only registry:package-name@version
 ```
-$ jspm inspect --forks
-     Installed Forks
 
-         npm:aurelia-dependency-injection 1.0.0-beta.1.2.3 1.0.0-beta.2.1.0
+E.g.
+
+```sh
+jspm inspect --forks
+>     Installed Forks
+>         npm:aurelia-dependency-injection 1.0.0-beta.1.2.3 1.0.0-beta.2.1.0
 
-$ jspm resolve --only npm:[email protected]
+jspm resolve --only npm:[email protected]
 ```
 
 ### Webpack
 
-Run `npm i aurelia-authentication` from your project root.
+Run `npm i aurelia-authentication --save` from your project root.
+
+Add `'aurelia-authentication'` in the `coreBundles.aurelia section` of your `webpack.config.js`.
 
-Aurelia-authentication has submodules (currently only the authFilter). So you need to add it to the AureliaWebpackPlugin includeSubModules list.
+Aurelia-authentication has submodules (currently only the authFilter). You need to add it to the aurelia build resources in your package.json.
 
 ```js
-AureliaWebpackPlugin({
-    includeSubModules: [
-      { moduleId: 'aurelia-authentication' }
-    ]
-  }),
+"aurelia": {
+  "build": {
+    "resources": ["aurelia-authentication/authFilterValueConverter"]
+  }
+},
+```
+
+### Typescript
+
+Add to your `typings.json`
+
+```js
+"aurelia-authentication": "github:spoonx/aurelia-authentication",
+```
+
+and run `typings i`
+
+or run
+
+```sh
+typings i github:spoonx/aurelia-authentication
 ```
 
 ## Documentation

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "aurelia-authentication",
-  "version": "3.0.0-rc5",
+  "version": "3.0.0-rc6",
   "description": "Plugin for social media authentication and local authentication together with other authentication utilities.",
   "keywords": [
     "aurelia",
@@ -19,15 +19,16 @@
     "url": "https://github.com/SpoonX/aurelia-authentication"
   },
   "dependencies": {
-      "aurelia-api": "^3.0.0-rc4",
-      "aurelia-dependency-injection": "^1.0.0-beta.1.2.3",
-      "aurelia-fetch-client": "^1.0.0-beta.1.2.5",
-      "aurelia-logging": "^1.0.0-beta.1.2.1",
-      "aurelia-metadata": "^1.0.0-beta.1.2.1",
-      "aurelia-pal": "^1.0.0-beta.1.2.2",
-      "aurelia-path": "^1.0.0-beta.1.2.2",
-      "aurelia-router": "^1.0.0-beta.1.2.4",
-      "extend": "^3.0.0",
-      "jwt-decode": "^2.0.1"
+    "aurelia-api": "^3.0.0-rc4",
+    "aurelia-dependency-injection": "^1.0.0-rc.1.0.0",
+    "aurelia-fetch-client": "^1.0.0-rc.1.0.0",
+    "aurelia-logging": "^1.0.0-rc.1.0.0",
+    "aurelia-metadata": "^1.0.0-rc.1.0.0",
+    "aurelia-pal": "^1.0.0-rc.1.0.0",
+    "aurelia-path": "^1.0.0-rc.1.0.0",
+    "aurelia-router": "^1.0.0-rc.1.0.0",
+    "aurelia-templating": "^1.0.0-rc.1.0.0",
+    "extend": "^3.0.0",
+    "jwt-decode": "^2.0.1"
   }
 }

build/args.js

@@ -1,14 +1,13 @@
 var yargs = require('yargs');
 
-var argv = yargs.argv;
-var validBumpTypes = 'major|minor|patch|prerelease'.split('|');
-var bump = (argv.bump || 'patch').toLowerCase();
+var argv = yargs.argv,
+    validBumpTypes = "major|minor|patch|prerelease".split("|"),
+    bump = (argv.bump || 'patch').toLowerCase();
 
-if (validBumpTypes.indexOf(bump) === -1) {
+if(validBumpTypes.indexOf(bump) === -1) {
   throw new Error('Unrecognized bump "' + bump + '".');
 }
 
 module.exports = {
-  bump: bump,
-  depth: parseInt(argv.depth || '0')
+  bump: bump
 };

build/babel-options.js

@@ -2,7 +2,7 @@ var path = require('path');
 var paths = require('./paths');
 
 exports.base = function() {
-  return {
+  var config = {
     filename: '',
     filenameRelative: '',
     sourceMap: true,
@@ -12,22 +12,27 @@ exports.base = function() {
     comments: false,
     compact: false,
     code: true,
-    presets: [ 'es2015-loose', 'stage-1'],
+    presets: [ 'es2015-loose', 'stage-1' ],
     plugins: [
       'syntax-flow',
       'transform-decorators-legacy',
-      'transform-flow-strip-types'
     ]
   };
-};
-
-exports['plugin-dts'] = ['babel-dts-generator', {
-  packageName: paths.packageName,
-  typings: '',
-  suppressModulePath: true,
-  suppressComments: false,
-  memberOutputFilter: /^_.*/
-}];
+  if (!paths.useTypeScriptForDTS) {
+    config.plugins.push(
+      ['babel-dts-generator', {
+          packageName: paths.packageName,
+          typings: '',
+          suppressModulePath: true,
+          suppressComments: false,
+          memberOutputFilter: /^_.*/,
+          suppressAmbientDeclaration: true
+      }]
+    );
+  };
+  config.plugins.push('transform-flow-strip-types');
+  return config;
+}
 
 exports.commonjs = function() {
   var options = exports.base();
@@ -49,12 +54,12 @@ exports.system = function() {
 
 exports.es2015 = function() {
   var options = exports.base();
-  options.presets = ['stage-1'];
+  options.presets = ['stage-1']
   return options;
 };
 
-exports.dts = function() {
+exports['native-modules'] = function() {
   var options = exports.base();
-  options.plugins.push(exports['plugin-dts']);
+  options.presets[0] = 'es2015-loose-native-modules';
   return options;
-};
+}

build/paths.js

@@ -1,24 +1,35 @@
 var path = require('path');
 var fs = require('fs');
 
+// hide warning //
+var emitter = require('events');
+emitter.defaultMaxListeners = 20;
+
 var appRoot = 'src/';
 var pkg = JSON.parse(fs.readFileSync('./package.json', 'utf-8'));
-// your main file which exports only configure and other modules.
-// usually packageName or 'index.js'
-var entryFileName = pkg.name + '.js';
 
-module.exports = {
+var paths = {
   root: appRoot,
   source: appRoot + '**/*.js',
-  tsSource: [
-    appRoot + '**/*.js',          // list files to parse for d.ts
-    '!' + appRoot + entryFileName  // exclude entry file
-  ],
-  resources: '*ValueConverter.js',  // relative to root, resources can not that easily be bundled into a single file (due to naming conventions)
+  resources: '*ValueConverter.*',  // relative to root, resources can not that easily be bundled into a single file (due to naming conventions)
   html: appRoot + '**/*.html',
   style: 'styles/**/*.css',
   output: 'dist/',
-  doc: './doc',
-  test: './test/**/*.js',
-  packageName: pkg.name
+  doc:'./doc',
+  test: 'test/**/*.js',
+  exampleSource: 'doc/example/',
+  exampleOutput: 'doc/example-dist/',
+  packageName: pkg.name,
+  ignore: [],
+  useTypeScriptForDTS: false,
+  importsToAdd: [],
+  importsToIgnoreForDts: ['extend', 'jwt-decode'],
+  sort: false
 };
+
+paths.files = [
+  paths.source,
+  '!' + paths.root + paths.resources
+];
+
+module.exports = paths;