Skip to content

Commit

Permalink
Merge pull request #166 from AzureAD/dev
Browse files Browse the repository at this point in the history
Release msal version 0.1.3
  • Loading branch information
rohitnarula7176 committed Oct 27, 2017
2 parents cf1d33b + 3cd8172 commit c362d1b
Show file tree
Hide file tree
Showing 271 changed files with 15,982 additions and 19,702 deletions.
13 changes: 6 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -252,10 +252,9 @@ paket-files/
*.sln.iml

# MSAL specific ignore files
lib/*.js
lib/*.js.map
*.spec.js
*.spec.js.map
out/packages
#tests/unit/*.js # TODO add these once the unit tests are in TS
#tests/unit/*.js.map
node_modules/
docs/**/*
typings/
lib-commonjs/
lib-es6/
dist/
16 changes: 2 additions & 14 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -252,19 +252,7 @@ paket-files/
*.sln.iml

# MSAL specific ignore files
out/spec
docs/
devApps/
node_modules/
tests/
.travis.yml
Gruntfile.js
karma.conf.js
tsconfig*
lib/
lib/*.js
lib/*.js.map
*.spec.js
*.spec.js.map
out/packages
#tests/unit/*.js # TODO add these once the unit tests are in TS
#tests/unit/*.js.map
typings/
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@ before_install:

install:
- npm install
- npm install -g karma
- npm install -g karma
- npm install -g typings
66 changes: 28 additions & 38 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,47 +4,23 @@ module.exports = function (grunt) {
grunt.initConfig({
pkg: grunt.file.readJSON('package.json'),

typedoc: {
build: {
options: {
module: 'amd',
out: './docs',
target: 'es5'
},
src: ['./lib/**/*']
}
},

uglify: {
static_mappings: {
// Because these src-dest file mappings are manually specified, every
// time a new file is added or removed, the Gruntfile has to be updated.
files: [
{ src: 'out/msal.js', dest: 'out/msal.min.js' }
],
}
},

file_append: {
default_options: {
files: [
{
prepend: "'use strict';\n",
input: 'out/msal.js',
output: 'out/msal.js'
input: 'dist/msal.js',
output: 'dist/msal.js'
},
{
prepend: "'use strict';\n",
input: 'dist/msal.min.js',
output: 'dist/msal.min.js'
}
]
}
},

exec: {
tsc: {
command: 'tsc',
stdout: false,
stderr: false
},
},

usebanner: {
taskName: {
options: {
Expand All @@ -53,20 +29,34 @@ module.exports = function (grunt) {
linebreak: true
},
files: {
src: ['out/msal.js', 'out/msal.min.js']
src: ['dist/msal.js', 'dist/msal.min.js']
}
}
},

tslint: {
options: {
// can be a configuration object or a filepath to tslint.json
configuration: "tslint.json",
// If set to true, tslint errors will be reported, but not fail the task
// If set to false, tslint errors will be reported, and the task will fail
force: true,
fix: false
},
files: {
src: [
"src/*.ts",
]
}
}
});

// Load the plugin that provides the "uglify" task.
grunt.loadNpmTasks('grunt-typedoc');
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-exec');
grunt.loadNpmTasks('grunt-file-append');
grunt.loadNpmTasks('grunt-banner');
grunt.loadNpmTasks("grunt-tslint");
// uglify task is producing invalid js file
grunt.registerTask('doc', ['typedoc']);
grunt.registerTask('minify', ['uglify']);
grunt.registerTask('build', ['exec', 'file_append', 'uglify', 'usebanner']);
grunt.registerTask('append', ['file_append']);
grunt.registerTask('ts-lint', ['tslint']);
grunt.registerTask('default', ['append', 'usebanner', 'ts-lint']);
};
42 changes: 21 additions & 21 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
MIT License
Copyright (c) Microsoft Corporation. All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE
MIT License

Copyright (c) Microsoft Corporation. All rights reserved.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE
Loading

0 comments on commit c362d1b

Please sign in to comment.