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

Commit 014c080

Browse files
committed
update HTMLImports grunt and karma configs
1 parent 5cbad89 commit 014c080

File tree

5 files changed

+20
-8
lines changed

5 files changed

+20
-8
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
node_modules
2+
html-imports.min.*

banner.txt

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
/**
2+
* @license
3+
* Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
4+
* This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
5+
* The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
6+
* The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
7+
* Code distributed by Google as part of the polymer project is also
8+
* subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
9+
*/

conf/karma.conf.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module.exports = function(karma) {
22
var common = require('../../tools/test/karma-common.conf.js');
3-
karma.configure(common.mixin_common_opts(karma, {
3+
karma.set(common.mixin_common_opts(karma, {
44
// base path, that will be used to resolve files and exclude
55
basePath: '../../',
66

gruntfile.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44
* license that can be found in the LICENSE file.
55
*/
66
module.exports = function(grunt) {
7-
HTMLComponents = grunt.file.readJSON('build.json');
7+
var readManifest = require('../tools/loader/readManifest.js');
8+
9+
HTMLComponents = readManifest('build.json');
810
grunt.initConfig({
911
karma: {
1012
options: {
@@ -22,7 +24,7 @@ module.exports = function(grunt) {
2224
HTMLComponents: {
2325
options: {
2426
sourceMap: 'html-components.min.source-map.js',
25-
banner: grunt.file.read('LICENSE')
27+
banner: grunt.file.read('banner.txt')
2628
},
2729
files: {
2830
'html-imports.min.js': HTMLComponents

package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33
"description": "Polyfill for W3C HTMLImports Specification",
44
"version": "0.0.1",
55
"devDependencies": {
6-
"mocha": "*",
76
"chai": "*",
87
"grunt": "*",
98
"grunt-contrib-uglify": "*",
109
"grunt-contrib-yuidoc": "~0.4.0",
1110
"grunt-karma": "*",
1211
"karma": "~0.12.0",
13-
"karma-mocha": "*",
14-
"karma-firefox-launcher": "*",
12+
"karma-crbot-reporter": "*",
13+
"karma-firefox-launcher": "^0.1.3",
1514
"karma-ie-launcher": "*",
16-
"karma-safari-launcher": "*",
15+
"karma-mocha": "*",
16+
"karma-safari-launcher": "*",
1717
"karma-script-launcher": "*",
18-
"karma-crbot-reporter": "*"
18+
"mocha": "*"
1919
}
2020
}

0 commit comments

Comments
 (0)