Skip to content

Commit

Permalink
chore: move jsdoc and karma config
Browse files Browse the repository at this point in the history
  • Loading branch information
brandonocasey committed Jun 7, 2018
1 parent 4afd6c2 commit 0d00864
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 10 deletions.
3 changes: 1 addition & 2 deletions docs/conventions.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,7 @@ Folder/Filename | Optional? | Generated? | Description
`src/js/` | ✓ | | JavaScript source code.
`src/plugin.js` | | ✓ | Plugin entry point.
`test/` | | ✓ | Unit tests.
`test/dist/` | | | Created during test builds, ignored by Git.
`test/karma.conf.js` | | ✓ | Karma configuration file.
`scripts/karma.conf.js` | | ✓ | Karma configuration file.
`test/plugin.test.js` | | ✓ | Default plugin test module.
`.editorconfig` | | ✓ |
`.gitignore` | | ✓ |
Expand Down
4 changes: 2 additions & 2 deletions generators/app/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ module.exports = yeoman.generators.Base.extend({

this._templatesToCopy = [
'scripts/_rollup.config.js',
'test/_karma.conf.js',
'scripts/_karma.conf.js',
'test/_plugin.test.js',
'_index.html',
'_CONTRIBUTING.md',
Expand Down Expand Up @@ -281,7 +281,7 @@ module.exports = yeoman.generators.Base.extend({
}

if (this.context.docs) {
this._filesToCopy.push('_jsdoc.json');
this._filesToCopy.push('scripts/_jsdoc.json');
}

if (this.context.lang) {
Expand Down
6 changes: 3 additions & 3 deletions generators/app/package-json.js
Original file line number Diff line number Diff line change
Expand Up @@ -157,9 +157,9 @@ const packageJSON = (current, context) => {
'lint': 'vjsstandard',
'prepublish': 'not-in-install && npm run build || in-install',
'start': 'npm-run-all -p server watch',
'server': 'karma start test/karma.conf.js --singleRun=false --auto-watch --no-browsers',
'server': 'karma start scripts/karma.conf.js --singleRun=false --auto-watch --no-browsers',
'pretest': 'npm run all lint',
'test': 'karma start test/karma.conf.js',
'test': 'karma start scripts/karma.conf.js',
'preversion': 'npm test',
'version': 'node scripts/version.js',
'watch': 'npm-run-all -p watch:*',
Expand Down Expand Up @@ -214,7 +214,7 @@ const packageJSON = (current, context) => {

_.assign(result.scripts, {
'docs': 'npm-run-all docs:*',
'docs:api': 'jsdoc src -r -c jsdoc.json -d docs/api',
'docs:api': 'jsdoc src -r -c scripts/jsdoc.json -d docs/api',
'docs:toc': 'doctoc README.md'
});

Expand Down
File renamed without changes.
6 changes: 3 additions & 3 deletions test/libs.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ const FILES = {
'scripts/primed-rollup-plugins.js',
'src/plugin.js',
'test/index.html',
'test/karma.conf.js',
'scripts/karma.conf.js',
'test/plugin.test.js',
'.editorconfig',
'.gitignore',
'.npmignore',
'.nvmrc',
'jsdoc.json',
'scripts/jsdoc.json',
'CHANGELOG.md',
'CONTRIBUTING.md',
'index.html',
Expand All @@ -35,7 +35,7 @@ const FILES = {
],

docs: [
'jsdoc.json'
'scripts/jsdoc.json'
],

css: [
Expand Down

0 comments on commit 0d00864

Please sign in to comment.