diff --git a/docs/conventions.md b/docs/conventions.md index 376493de..c397e778 100644 --- a/docs/conventions.md +++ b/docs/conventions.md @@ -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` | | ✓ | diff --git a/generators/app/index.js b/generators/app/index.js index 6f3ab9ba..8eb2f6c6 100644 --- a/generators/app/index.js +++ b/generators/app/index.js @@ -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', @@ -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) { diff --git a/generators/app/package-json.js b/generators/app/package-json.js index 99d8feba..eff69d49 100644 --- a/generators/app/package-json.js +++ b/generators/app/package-json.js @@ -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:*', @@ -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' }); diff --git a/generators/app/templates/_jsdoc.json b/generators/app/templates/scripts/_jsdoc.json similarity index 100% rename from generators/app/templates/_jsdoc.json rename to generators/app/templates/scripts/_jsdoc.json diff --git a/generators/app/templates/test/_karma.conf.js b/generators/app/templates/scripts/_karma.conf.js similarity index 100% rename from generators/app/templates/test/_karma.conf.js rename to generators/app/templates/scripts/_karma.conf.js diff --git a/test/libs.js b/test/libs.js index 9ec9951e..238f49fc 100644 --- a/test/libs.js +++ b/test/libs.js @@ -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', @@ -35,7 +35,7 @@ const FILES = { ], docs: [ - 'jsdoc.json' + 'scripts/jsdoc.json' ], css: [