Skip to content
This repository has been archived by the owner on Mar 13, 2018. It is now read-only.

Commit

Permalink
update HTMLImports grunt and karma configs
Browse files Browse the repository at this point in the history
  • Loading branch information
dfreedm committed Aug 12, 2014
1 parent 5cbad89 commit 014c080
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 8 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
node_modules
html-imports.min.*
9 changes: 9 additions & 0 deletions banner.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
/**
* @license
* Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
* This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
* The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
* The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
* Code distributed by Google as part of the polymer project is also
* subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
*/
2 changes: 1 addition & 1 deletion conf/karma.conf.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module.exports = function(karma) {
var common = require('../../tools/test/karma-common.conf.js');
karma.configure(common.mixin_common_opts(karma, {
karma.set(common.mixin_common_opts(karma, {
// base path, that will be used to resolve files and exclude
basePath: '../../',

Expand Down
6 changes: 4 additions & 2 deletions gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
* license that can be found in the LICENSE file.
*/
module.exports = function(grunt) {
HTMLComponents = grunt.file.readJSON('build.json');
var readManifest = require('../tools/loader/readManifest.js');

HTMLComponents = readManifest('build.json');
grunt.initConfig({
karma: {
options: {
Expand All @@ -22,7 +24,7 @@ module.exports = function(grunt) {
HTMLComponents: {
options: {
sourceMap: 'html-components.min.source-map.js',
banner: grunt.file.read('LICENSE')
banner: grunt.file.read('banner.txt')
},
files: {
'html-imports.min.js': HTMLComponents
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@
"description": "Polyfill for W3C HTMLImports Specification",
"version": "0.0.1",
"devDependencies": {
"mocha": "*",
"chai": "*",
"grunt": "*",
"grunt-contrib-uglify": "*",
"grunt-contrib-yuidoc": "~0.4.0",
"grunt-karma": "*",
"karma": "~0.12.0",
"karma-mocha": "*",
"karma-firefox-launcher": "*",
"karma-crbot-reporter": "*",
"karma-firefox-launcher": "^0.1.3",
"karma-ie-launcher": "*",
"karma-safari-launcher": "*",
"karma-mocha": "*",
"karma-safari-launcher": "*",
"karma-script-launcher": "*",
"karma-crbot-reporter": "*"
"mocha": "*"
}
}

0 comments on commit 014c080

Please sign in to comment.