diff --git a/.gitignore b/.gitignore index fdda285c4..4a2b5abf8 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,5 @@ test/unit/coverage # Build assets src/**/dist/* src/**/styles/themes/* + +src/**/package-lock\.json diff --git a/.travis.yml b/.travis.yml index f8a951f50..cdbd09b76 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,6 +22,7 @@ install: before_script: - lerna run build script: + - npm run check-version - npm run lint - if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then npm run unit; diff --git a/check-version.js b/check-version.js index e1de5d18f..5fd59f6fe 100644 --- a/check-version.js +++ b/check-version.js @@ -27,7 +27,7 @@ function isPre(p1, p2) { // remove the ^ const stripped = semver.coerce(p2).raw; const diff = semver.diff(p1, stripped); - return ['premajor', 'preminor', 'prepatch', 'prerelease'].indexOf(diff); + return ['premajor', 'preminor', 'prepatch', 'prerelease'].indexOf(diff) >= 0 ? true : false; } async function main() { @@ -49,7 +49,7 @@ async function main() { // check if peerDep version resolves to local component version locs.forEach((loc) => { if (!semver.satisfies(loc.version, peerDependencies[loc.name]) - && isPre(loc.version, peerDependencies[loc.name])) { + && !isPre(loc.version, peerDependencies[loc.name])) { anyErr = true; hasErr = true; errMsg.push(`${loc.name}: "${peerDependencies[loc.name]}" doesn't resolve to the local package version of "${loc.version}"`); @@ -65,7 +65,10 @@ async function main() { }); if (anyErr) { + console.log(chalk.yellow('Update versions in each package.json and publish corrected component(s)')); process.exitCode = 1; + } else { + console.log(chalk.green('Version checking complete')); } } diff --git a/package.json b/package.json index 73865db01..656c601c1 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,7 @@ "build:archive": "node build/component-docs-archive.js", "build:transfer": "node build/component-docs-transfer.js", "create": "node generator.js", + "clean": "lerna clean", "bootstrap": "lerna bootstrap", "start": "lerna bootstrap && lerna run build", "check-version": "node check-version.js", diff --git a/templates/package.json b/templates/package.json index 3865643c6..a98ad7f0a 100644 --- a/templates/package.json +++ b/templates/package.json @@ -23,11 +23,11 @@ "build": "node build/build.js" }, "peerDependencies": { - "@rei/cdr-assets": "^0.1.0", + "@rei/cdr-assets": "^0.3.0", "vue": "^2.5.13" }, "devDependencies": { - "@rei/cdr-assets": "^0.1.0", + "@rei/cdr-assets": "^0.3.0", "pkg-ok": "^2.1.0" } } \ No newline at end of file