Skip to content

Commit 76ea42d

Browse files
committed
Update webpack process and JSDoc header comment pass-through
1 parent ef1c65c commit 76ea42d

File tree

4 files changed

+19
-23
lines changed

4 files changed

+19
-23
lines changed

karma.conf.js

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
11
// Karma configuration
22
// Generated on Fri Feb 07 2014 08:31:06 GMT+0100 (CET)
3-
43
module.exports = function(config) {
54
config.set({
6-
75
// base path, that will be used to resolve files and exclude
86
basePath: '.',
97

10-
118
// frameworks to use
129
frameworks: ['mocha', 'chai-sinon'],
1310

14-
1511
// list of files / patterns to load in the browser
1612
files: [
1713
'bower_components/jquery/dist/jquery.min.js',
@@ -32,10 +28,7 @@ module.exports = function(config) {
3228
],
3329

3430
// list of files to exclude
35-
exclude: [
36-
37-
],
38-
31+
exclude: [],
3932

4033
// test results reporter to use
4134
// possible values: 'dots', 'progress', 'junit', 'growl', 'coverage'
@@ -47,27 +40,25 @@ module.exports = function(config) {
4740

4841
// optionally, configure the reporter
4942
coverageReporter: {
50-
type : 'lcov',
51-
dir : 'coverage/'
43+
type: 'lcov',
44+
dir: 'coverage/'
5245
},
5346

5447
// web server port
5548
port: 9876,
5649

57-
5850
// enable / disable colors in the output (reporters and logs)
5951
colors: true,
6052

61-
6253
// level of logging
63-
// possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
54+
// possible values:
55+
// config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN ||
56+
// config.LOG_INFO || config.LOG_DEBUG
6457
logLevel: config.LOG_INFO,
6558

66-
6759
// enable / disable watching file and executing tests whenever any file changes
6860
autoWatch: true,
6961

70-
7162
// Start these browsers, currently available:
7263
// - Chrome
7364
// - ChromeCanary
@@ -78,11 +69,9 @@ module.exports = function(config) {
7869
// - IE (only Windows; has to be installed with `npm install karma-ie-launcher`)
7970
browsers: ['PhantomJS'],
8071

81-
8272
// If browser does not capture in given timeout [ms], kill it
8373
captureTimeout: 60000,
8474

85-
8675
// Continuous Integration mode
8776
// if true, it capture browsers, run tests and exit
8877
singleRun: false

package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,14 @@
99
"scripts": {
1010
"build": "webpack",
1111
"watch": "webpack --watch",
12-
"minify": "uglifyjs dist/schema-form.js --output=dist/schema-form.min.js",
12+
"minify": "uglifyjs dist/schema-form.js --comments --output=dist/schema-form.min.js",
1313
"dist": "npm run build && npm run minify",
1414
"test": "rm -fr coverage && ./node_modules/karma/bin/karma start --single-run --browsers PhantomJS karma.conf.js && find coverage/ -name lcov.info -print0 | xargs -0 cat | ./node_modules/coveralls/bin/coveralls.js"
1515
},
1616
"author": "Textalk",
1717
"contributors": [
1818
"David Jensen <[email protected]> (https://github.com/davidlgj)",
19+
"Marcel J Bennett <[email protected]> (https://github.com/Anthropic)",
1920
"Denis Dervisevic <[email protected]> (https://github.com/Dervisevic)",
2021
"Cameron Edwards (https://github.com/cameronprattedwards)",
2122
"Mike Marcacci (https://github.com/mike-marcacci)"
@@ -35,7 +36,6 @@
3536
"schema"
3637
],
3738
"devDependencies": {
38-
"json-schema-form-core": "git+https://github.com/json-schema-form/json-schema-form-core.git#develop",
3939
"babel-core": "^6.5.2",
4040
"babel-loader": "^6.2.4",
4141
"babel-preset-es2015": "^6.5.0",
@@ -50,6 +50,7 @@
5050
"gulp-rename": "^1.2.0",
5151
"gulp-uglify": "^0.2.1",
5252
"gulp-umd": "^0.1.3",
53+
"json-schema-form-core": "git+https://github.com/json-schema-form/json-schema-form-core.git#develop",
5354
"karma": "^0.12.0",
5455
"karma-chai-sinon": "^0.1.3",
5556
"karma-coverage": "^0.2.1",
@@ -74,7 +75,7 @@
7475
],
7576
"autoupdate": {
7677
"source": "git",
77-
"target": "git://github.com/Textalk/angular-schema-form.git",
78+
"target": "git://github.com/json-schema-form/angular-schema-form.git",
7879
"basePath": "/dist/",
7980
"files": [
8081
"schema-form.min.js",

src/services/builder.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ export default function(sfPathProvider) {
169169
];
170170
this.stdBuilders = stdBuilders;
171171

172-
this.$get = ['$templateCache', 'schemaFormDecorators', 'sfPath',
172+
this.$get = [ '$templateCache', 'schemaFormDecorators', 'sfPath',
173173
function($templateCache, schemaFormDecorators, sfPath) {
174174
var checkForSlot = function(form, slots) {
175175
// Finally append this field to the frag.
@@ -202,7 +202,7 @@ export default function(sfPathProvider) {
202202
// Backwards compatability build
203203
var n = document.createElement(snakeCase(decorator.__name, '-'));
204204
if (state.arrayCompatFlag) {
205-
n.setAttribute('form','copyWithIndex($index)');
205+
n.setAttribute('form', 'copyWithIndex($index)');
206206
} else {
207207
n.setAttribute('form', path + '[' + index + ']');
208208
}

webpack.config.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,12 @@ module.exports = {
2626
'tv4': 'var tv4',
2727
},
2828
plugins: [
29-
new webpack.BannerPlugin('angular-schema-form\n@version ' + pjson.version + '\nCopyright (c) 2016 JSON Schema Form')
29+
new webpack.BannerPlugin(
30+
'angular-schema-form\n' +
31+
'@version ' +
32+
pjson.version + '\n' +
33+
'@link https://github.com/json-schema-form/angular-schema-form\n' +
34+
'@license MIT\n' +
35+
'Copyright (c) 2016 JSON Schema Form')
3036
]
3137
};

0 commit comments

Comments
 (0)