Skip to content
This repository has been archived by the owner on Nov 25, 2020. It is now read-only.

Dep update aurelia-rc1 #204

Merged
merged 6 commits into from
Jul 12, 2016
Merged
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
6 changes: 0 additions & 6 deletions .eslintrc

This file was deleted.

6 changes: 6 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"extends": "./node_modules/aurelia-tools/.eslintrc.json",
"rules": {
"no-new-func": 0
}
}
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ jspm_packages
bower_components
.idea
.DS_STORE
build/reports
build/reports
69 changes: 51 additions & 18 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
23 changes: 12 additions & 11 deletions bower.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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"
}
}
6 changes: 0 additions & 6 deletions build/.eslintrc

This file was deleted.

11 changes: 5 additions & 6 deletions build/args.js
Original file line number Diff line number Diff line change
@@ -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
};
37 changes: 21 additions & 16 deletions build/babel-options.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ var path = require('path');
var paths = require('./paths');

exports.base = function() {
return {
var config = {
filename: '',
filenameRelative: '',
sourceMap: true,
Expand All @@ -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();
Expand All @@ -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;
};
}
35 changes: 23 additions & 12 deletions build/paths.js
Original file line number Diff line number Diff line change
@@ -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;
Loading