@uirouter/publish-scripts 2.6.1 → 2.6.3

package/docgen/prep_docgen.js

@@ -1,58 +1,58 @@
-#!/usr/bin/env node
-const fs = require('fs');
-const childProcess = require('child_process');
-
-const WORKDIR = process.cwd();
-const PACKAGE_DIR = `${WORKDIR}/project`;
-const SRC_DIR = `${PACKAGE_DIR}/src`;
-const PACKAGEJSON_PATH = `${PACKAGE_DIR}/package.json`;
-
-if (!fs.existsSync(SRC_DIR)) { throw new Error(`${SRC_DIR} does not exist`) }
-if (!fs.existsSync(PACKAGEJSON_PATH)) { throw new Error(`${PACKAGEJSON_PATH} does not exist`); }
-
-const PACKAGEJSON = JSON.parse(fs.readFileSync(PACKAGEJSON_PATH));
-const DOCGENCONFIG = getDocgenConfig(PACKAGEJSON);
-
-function getDocgenConfig(packageJson) {
-  const requiredKeys = ['docgen', 'docgen.navigation', 'docgen.publishDir'];
-  const missing = requiredKeys.find((key) => key.split(".").reduce((acc, k) => acc && acc[k], packageJson) === undefined);
-  if (missing) {
-    console.error(`${PACKAGEJSON_PATH} does not contain configuration key: '${missing}'`);
-    process.exit(1);
-  }
-  return packageJson.docgen;
-}
-
-// Fetch all included packages (i.e., core module)
-const CLONE_COMMANDS = ['#!/usr/bin/env bash', 'set -x'];
-
-(DOCGENCONFIG.include || []).forEach(include => {
-  const { pkg, repo, branch } = include;
-  const semver = ['peerDependencies', 'dependencies', 'devDependencies']
-    .map((key) => (PACKAGEJSON[key] || {})[pkg])
-    .find((x) => !!x);
-
-  const version = branch || findSemverPackage(pkg, semver);
-  CLONE_COMMANDS.push(`./clone.sh ${repo} ${PACKAGE_DIR}/src/includes/${pkg} ${version}`);
-});
-
-fs.writeFileSync('clone_repos.sh', CLONE_COMMANDS.join('\n'));
-
-// Finds the newest version of a package published to NPM that matches the desired semver range
-function findSemverPackage(packageName, semver) {
-  const stdout = childProcess.execSync(`npm info ${packageName}@${semver} version`).toString();
-  const lines = stdout.split(/\n/).filter(x => x.length);
-  if (lines.length === 0) {
-    throw new Error(`No published package matched ${packageName}@${semver}`)
-  } else if (lines.length === 1) {
-    return lines[ 0 ];
-  } else {
-    const line = stdout.trim().split(/\n/).pop().trim();
-    const [, version] = /.* '(.*)'$/.exec(line) || [];
-    if (!version) {
-      console.log({ stdout, line });
-      throw new Error(`Couldn't find version matching ${packageName}@${semver} in npm registry`)
-    }
-    return version;
-  }
-}
+#!/usr/bin/env node
+const fs = require('fs');
+const childProcess = require('child_process');
+
+const WORKDIR = process.cwd();
+const PACKAGE_DIR = `${WORKDIR}/project`;
+const SRC_DIR = `${PACKAGE_DIR}/src`;
+const PACKAGEJSON_PATH = `${PACKAGE_DIR}/package.json`;
+
+if (!fs.existsSync(SRC_DIR)) { throw new Error(`${SRC_DIR} does not exist`) }
+if (!fs.existsSync(PACKAGEJSON_PATH)) { throw new Error(`${PACKAGEJSON_PATH} does not exist`); }
+
+const PACKAGEJSON = JSON.parse(fs.readFileSync(PACKAGEJSON_PATH));
+const DOCGENCONFIG = getDocgenConfig(PACKAGEJSON);
+
+function getDocgenConfig(packageJson) {
+  const requiredKeys = ['docgen', 'docgen.navigation', 'docgen.publishDir'];
+  const missing = requiredKeys.find((key) => key.split(".").reduce((acc, k) => acc && acc[k], packageJson) === undefined);
+  if (missing) {
+    console.error(`${PACKAGEJSON_PATH} does not contain configuration key: '${missing}'`);
+    process.exit(1);
+  }
+  return packageJson.docgen;
+}
+
+// Fetch all included packages (i.e., core module)
+const CLONE_COMMANDS = ['#!/usr/bin/env bash', 'set -x'];
+
+(DOCGENCONFIG.include || []).forEach(include => {
+  const { pkg, repo, branch } = include;
+  const semver = ['peerDependencies', 'dependencies', 'devDependencies']
+    .map((key) => (PACKAGEJSON[key] || {})[pkg])
+    .find((x) => !!x);
+
+  const version = branch || findSemverPackage(pkg, semver);
+  CLONE_COMMANDS.push(`./clone.sh ${repo} ${PACKAGE_DIR}/src/includes/${pkg} ${version}`);
+});
+
+fs.writeFileSync('clone_repos.sh', CLONE_COMMANDS.join('\n'));
+
+// Finds the newest version of a package published to NPM that matches the desired semver range
+function findSemverPackage(packageName, semver) {
+  const stdout = childProcess.execSync(`npm info ${packageName}@${semver} version`).toString();
+  const lines = stdout.split(/\n/).filter(x => x.length);
+  if (lines.length === 0) {
+    throw new Error(`No published package matched ${packageName}@${semver}`)
+  } else if (lines.length === 1) {
+    return lines[ 0 ];
+  } else {
+    const line = stdout.trim().split(/\n/).pop().trim();
+    const [, version] = /.* '(.*)'$/.exec(line) || [];
+    if (!version) {
+      console.log({ stdout, line });
+      throw new Error(`Couldn't find version matching ${packageName}@${semver} in npm registry`)
+    }
+    return version;
+  }
+}

package/docgen_via_docker.sh

@@ -1,3 +1,3 @@
-#!/usr/bin/env bash
-set -ex
-docker run -v `pwd`:/home/node/work/project uirouter/docgen:stable
+#!/usr/bin/env bash
+set -ex
+docker run -v `pwd`:/home/node/work/project uirouter/docgen:stable

package/ensure_clean_master.js

@@ -1,10 +1,10 @@
-#!/usr/bin/env node
-
-const util = require('./util');
-util.packageDir();
-
-let branch;
-if(require.main === module && process.argv[2])
-  branch = process.argv[2];
-
-util.ensureCleanMaster(branch);
+#!/usr/bin/env node
+
+const util = require('./util');
+util.packageDir();
+
+let branch;
+if(require.main === module && process.argv[2])
+  branch = process.argv[2];
+
+util.ensureCleanMaster(branch);

package/modify_sourcemap_paths.js

@@ -1,28 +1,28 @@
-#!/usr/bin/env node
-
-require('./util').packageDir();
-require('shelljs/global');
-
-const fs = require('fs');
-const path = require('path');
-const glob = require('glob');
-const pkg = JSON.parse(fs.readFileSync('./package.json'));
-const allartifacts = JSON.parse(fs.readFileSync('./artifacts.json')).ARTIFACTS;
-
-const globs = allartifacts
-    .filter(dir => fs.lstatSync(dir).isDirectory())
-    .map(dir => `${dir}/**/*.js.map`);
-
-const files = globs
-    .map(pattern => glob.sync(pattern))
-    .reduce((acc, arr) => acc.concat(arr), []);
-
-files.forEach(file => {
-  const data = JSON.parse(fs.readFileSync(file));
-  if (Array.isArray(data.sources)) {
-    data.sources = data.sources
-      .map(source => source.replace(/^(?:\.\.\/)*src/, pkg.name))
-      .map(source => source.replace(/^(?:\.\.\/)*node_modules\/@uirouter/, '@uirouter'));
-    fs.writeFileSync(file, JSON.stringify(data));
-  }
-});
+#!/usr/bin/env node
+
+require('./util').packageDir();
+require('shelljs/global');
+
+const fs = require('fs');
+const path = require('path');
+const glob = require('glob');
+const pkg = JSON.parse(fs.readFileSync('./package.json'));
+const allartifacts = JSON.parse(fs.readFileSync('./artifacts.json')).ARTIFACTS;
+
+const globs = allartifacts
+    .filter(dir => fs.lstatSync(dir).isDirectory())
+    .map(dir => `${dir}/**/*.js.map`);
+
+const files = globs
+    .map(pattern => glob.sync(pattern))
+    .reduce((acc, arr) => acc.concat(arr), []);
+
+files.forEach(file => {
+  const data = JSON.parse(fs.readFileSync(file));
+  if (Array.isArray(data.sources)) {
+    data.sources = data.sources
+      .map(source => source.replace(/^(?:\.\.\/)*src/, pkg.name))
+      .map(source => source.replace(/^(?:\.\.\/)*node_modules\/@uirouter/, '@uirouter'));
+    fs.writeFileSync(file, JSON.stringify(data));
+  }
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uirouter/publish-scripts",
-  "version": "2.6.1",
+  "version": "2.6.3",
   "description": "Helper scripts for publishing UI-Router projects",
   "main": "x",
   "repository": {
@@ -29,7 +29,7 @@
     "util": "./util.js"
   },
   "dependencies": {
-    "check-peer-dependencies": "^4.1.0",
+    "check-peer-dependencies": "^4.3.0",
     "conventional-changelog": "^3.1.24",
     "conventional-changelog-ui-router-core": "^1.4.2",
     "find-parent-dir": "^0.3.1",

package/publish_docs.js

@@ -1,46 +1,46 @@
-#!/usr/bin/env node
-
-const publishYalcPackage = require('./publish_yalc_package');
-const util = require('./util');
-util.packageDir();
-
-const fs = require('fs');
-const path = require('path');
-const _exec = util._exec;
-const sh = require('shelljs');
-const readlineSync = require('readline-sync');
-
-const TYPEDOC_CONFIG = JSON.parse(fs.readFileSync('./typedoc.json'));
-const PKGJSON = JSON.parse(fs.readFileSync('./package.json'));
-const DOCGEN_CONFIG = PKGJSON.docgen || {};
-const version = PKGJSON.version;
-
-const GIT_URL = "git@github.com:ui-router/ui-router.github.io.git";
-const installTargetDir = path.join(".downstream_cache", "ui-router.gihub.io");
-const PAGES_DIR = path.join(installTargetDir, DOCGEN_CONFIG.publishDir);
-
-sh.rm('-rf', installTargetDir);
-_exec(`git clone ${GIT_URL} ${installTargetDir}`);
-
-util.packageDir();
-
-sh.rm('-rf', path.join(PAGES_DIR, 'latest'));
-sh.cp('-r', TYPEDOC_CONFIG.out, path.join(PAGES_DIR, 'latest'));
-
-sh.rm('-rf', path.join(PAGES_DIR, version));
-sh.cp('-r', TYPEDOC_CONFIG.out, path.join(PAGES_DIR, version));
-
-sh.cd(PAGES_DIR);
-_exec("./process_docs.sh");
-_exec("git add .");
-
-sh.echo("\n\nSpot check the docs, then run these commands to publish:\n\n");
-sh.echo("cd " + PAGES_DIR);
-sh.echo(`git commit -m 'publish docs for ${version}'`);
-sh.echo(`git push`);
-
-if (readlineSync.keyInYN('Publish docs?')) {
-  sh.cd(PAGES_DIR);
-  _exec(`git commit -m 'publish docs for ${version}'`);
-  _exec(`git push`);
-}
+#!/usr/bin/env node
+
+const publishYalcPackage = require('./publish_yalc_package');
+const util = require('./util');
+util.packageDir();
+
+const fs = require('fs');
+const path = require('path');
+const _exec = util._exec;
+const sh = require('shelljs');
+const readlineSync = require('readline-sync');
+
+const TYPEDOC_CONFIG = JSON.parse(fs.readFileSync('./typedoc.json'));
+const PKGJSON = JSON.parse(fs.readFileSync('./package.json'));
+const DOCGEN_CONFIG = PKGJSON.docgen || {};
+const version = PKGJSON.version;
+
+const GIT_URL = "git@github.com:ui-router/ui-router.github.io.git";
+const installTargetDir = path.join(".downstream_cache", "ui-router.gihub.io");
+const PAGES_DIR = path.join(installTargetDir, DOCGEN_CONFIG.publishDir);
+
+sh.rm('-rf', installTargetDir);
+_exec(`git clone ${GIT_URL} ${installTargetDir}`);
+
+util.packageDir();
+
+sh.rm('-rf', path.join(PAGES_DIR, 'latest'));
+sh.cp('-r', TYPEDOC_CONFIG.out, path.join(PAGES_DIR, 'latest'));
+
+sh.rm('-rf', path.join(PAGES_DIR, version));
+sh.cp('-r', TYPEDOC_CONFIG.out, path.join(PAGES_DIR, version));
+
+sh.cd(PAGES_DIR);
+_exec("./process_docs.sh");
+_exec("git add .");
+
+sh.echo("\n\nSpot check the docs, then run these commands to publish:\n\n");
+sh.echo("cd " + PAGES_DIR);
+sh.echo(`git commit -m 'publish docs for ${version}'`);
+sh.echo(`git push`);
+
+if (readlineSync.keyInYN('Publish docs?')) {
+  sh.cd(PAGES_DIR);
+  _exec(`git commit -m 'publish docs for ${version}'`);
+  _exec(`git push`);
+}

package/publish_yalc_package.js

@@ -1,117 +1,117 @@
-#!/usr/bin/env node
-
-// This script is intended to fetch a package from a git url and publish it locally using the npm package `yalc`.
-// That package can then be installed from the local yalc registry an tested against by some downstream project.
-// This script can optionally fetch from a local directory instead of a git repository.
-
-// The script leaves the files in place after publishing.
-// This can be handy in Travis which can cache the directory contents.
-// After caching, subsequent re-runs of this script won't have to fetch the git repository (or do much for `yarn install`).
-const fs = require('fs');
-const path = require('path');
-const shelljs = require('shelljs');
-const tmp = require('tmp');
-const util = require('./util');
-
-const ORIG_DIR = process.cwd();
-
-function publishYalcPackage(installTargetDir, installSource, flags) {
-  flags = flags || {};
-  const branch = flags.branch || 'origin/master';
-
-  if (!installTargetDir || !installSource) {
-    throw new Error('Usage: publish_yalc_package [INSTALL_DIR] [GITHUB_URL|LOCAL_DIR]');
-  }
-
-  installTargetDir = path.resolve(installTargetDir);
-  const isRemoteSource = !/^\./.exec(installSource);
-  const installTargetDirTmp = path.join(installTargetDir, ".tmp");
-  const installSourceDir = isRemoteSource ? null : path.resolve(installSource);
-
-  // Create directory and clone git repo
-  if (!fs.existsSync(path.join(installTargetDir, '.git'))) {
-    if (isRemoteSource) {
-      util._exec(`git clone ${installSource} ${installTargetDir}`);
-    } else {
-      shelljs.rm('-rf', installTargetDir);
-      shelljs.cp('-r', installSourceDir, installTargetDir);
-      process.chdir(installTargetDir);
-      util._exec(`git init && git add . && git commit -m "initial commit"`);
-      process.chdir(ORIG_DIR);
-    }
-  }
-
-  // Update git repo from source and make working copy match exactly
-  if (isRemoteSource) {
-    process.chdir(installTargetDir);
-    util._exec('git fetch origin');
-    util._exec(`git checkout ${branch}`);
-    util._exec(`git reset --hard ${branch}`);
-    util._exec('git clean --force -d');
-  } else {
-    // Create a tmp dir with a copy of the current package contents
-    shelljs.rm('-rf', installTargetDirTmp);
-    shelljs.cp('-r', installSourceDir, installTargetDirTmp);
-
-    // Copy the current .git metadata from the cache dir into the tmp dir
-    shelljs.cp('-r', path.join(installTargetDir, ".git"), installTargetDirTmp);
-    process.chdir(installTargetDirTmp);
-
-    // Commit the changes from the current package (if any)
-    util._exec('git add . && git diff --staged --quiet || git commit -m "update from source directory"');
-
-    process.chdir(installTargetDir);
-
-    // Move the new .git metadata back into the cache dir
-    shelljs.rm('-rf', '.git');
-    shelljs.mv(path.join('.tmp', '.git'), ".");
-    shelljs.rm('-rf', installTargetDirTmp);
-
-    // Update the cache to match the current package contents
-    util._exec('git reset --hard master');
-    util._exec('git clean --force -d');
-  }
-
-  // Update dependencies
-  if (!flags.noInstall) {
-    util._exec('yarn install --check-files');
-  }
-
-  const TEMP = tmp.dirSync();
-  const TEMP_DIR = TEMP.name;
-  const BUILD_TEMP_DIR = path.resolve(TEMP_DIR, path.basename(installTargetDir));
-  if (!flags.noBuild || !flags.noPublish) {
-    try {
-      shelljs.mv(installTargetDir, TEMP_DIR);
-      process.chdir(BUILD_TEMP_DIR);
-
-      const pkgJson = JSON.parse(fs.readFileSync('package.json'));
-      if (!flags.noBuild) {
-        // Build package
-        if (pkgJson.scripts && pkgJson.scripts.build) {
-          util._exec('npm run build');
-        }
-      }
-
-      // If ngPackage is found in package.json, the directory to be published is actually ./dist
-      const distDir = pkgJson.distDir || '.';
-      if (!flags.noPublish) {
-        shelljs.pushd(distDir);
-        // Publish to local yalc registry
-        util._exec('npx yalc publish');
-        shelljs.popd();
-      }
-    } finally {
-      shelljs.mv(BUILD_TEMP_DIR, installTargetDir);
-      shelljs.rm('-rf', TEMP_DIR);
-    }
-  }
-
-  process.chdir(ORIG_DIR);
-}
-
-if (require.main === module) {
-  publishYalcPackage(process.argv[2], process.argv[3])
-}
-
-module.exports = publishYalcPackage;
+#!/usr/bin/env node
+
+// This script is intended to fetch a package from a git url and publish it locally using the npm package `yalc`.
+// That package can then be installed from the local yalc registry an tested against by some downstream project.
+// This script can optionally fetch from a local directory instead of a git repository.
+
+// The script leaves the files in place after publishing.
+// This can be handy in Travis which can cache the directory contents.
+// After caching, subsequent re-runs of this script won't have to fetch the git repository (or do much for `yarn install`).
+const fs = require('fs');
+const path = require('path');
+const shelljs = require('shelljs');
+const tmp = require('tmp');
+const util = require('./util');
+
+const ORIG_DIR = process.cwd();
+
+function publishYalcPackage(installTargetDir, installSource, flags) {
+  flags = flags || {};
+  const branch = flags.branch || 'origin/master';
+
+  if (!installTargetDir || !installSource) {
+    throw new Error('Usage: publish_yalc_package [INSTALL_DIR] [GITHUB_URL|LOCAL_DIR]');
+  }
+
+  installTargetDir = path.resolve(installTargetDir);
+  const isRemoteSource = !/^\./.exec(installSource);
+  const installTargetDirTmp = path.join(installTargetDir, ".tmp");
+  const installSourceDir = isRemoteSource ? null : path.resolve(installSource);
+
+  // Create directory and clone git repo
+  if (!fs.existsSync(path.join(installTargetDir, '.git'))) {
+    if (isRemoteSource) {
+      util._exec(`git clone ${installSource} ${installTargetDir}`);
+    } else {
+      shelljs.rm('-rf', installTargetDir);
+      shelljs.cp('-r', installSourceDir, installTargetDir);
+      process.chdir(installTargetDir);
+      util._exec(`git init && git add . && git commit -m "initial commit"`);
+      process.chdir(ORIG_DIR);
+    }
+  }
+
+  // Update git repo from source and make working copy match exactly
+  if (isRemoteSource) {
+    process.chdir(installTargetDir);
+    util._exec('git fetch origin');
+    util._exec(`git checkout ${branch}`);
+    util._exec(`git reset --hard ${branch}`);
+    util._exec('git clean --force -d');
+  } else {
+    // Create a tmp dir with a copy of the current package contents
+    shelljs.rm('-rf', installTargetDirTmp);
+    shelljs.cp('-r', installSourceDir, installTargetDirTmp);
+
+    // Copy the current .git metadata from the cache dir into the tmp dir
+    shelljs.cp('-r', path.join(installTargetDir, ".git"), installTargetDirTmp);
+    process.chdir(installTargetDirTmp);
+
+    // Commit the changes from the current package (if any)
+    util._exec('git add . && git diff --staged --quiet || git commit -m "update from source directory"');
+
+    process.chdir(installTargetDir);
+
+    // Move the new .git metadata back into the cache dir
+    shelljs.rm('-rf', '.git');
+    shelljs.mv(path.join('.tmp', '.git'), ".");
+    shelljs.rm('-rf', installTargetDirTmp);
+
+    // Update the cache to match the current package contents
+    util._exec('git reset --hard master');
+    util._exec('git clean --force -d');
+  }
+
+  // Update dependencies
+  if (!flags.noInstall) {
+    util._exec('yarn install --check-files');
+  }
+
+  const TEMP = tmp.dirSync();
+  const TEMP_DIR = TEMP.name;
+  const BUILD_TEMP_DIR = path.resolve(TEMP_DIR, path.basename(installTargetDir));
+  if (!flags.noBuild || !flags.noPublish) {
+    try {
+      shelljs.mv(installTargetDir, TEMP_DIR);
+      process.chdir(BUILD_TEMP_DIR);
+
+      const pkgJson = JSON.parse(fs.readFileSync('package.json'));
+      if (!flags.noBuild) {
+        // Build package
+        if (pkgJson.scripts && pkgJson.scripts.build) {
+          util._exec('npm run build');
+        }
+      }
+
+      // If ngPackage is found in package.json, the directory to be published is actually ./dist
+      const distDir = pkgJson.distDir || '.';
+      if (!flags.noPublish) {
+        shelljs.pushd(distDir);
+        // Publish to local yalc registry
+        util._exec('npx yalc publish');
+        shelljs.popd();
+      }
+    } finally {
+      shelljs.mv(BUILD_TEMP_DIR, installTargetDir);
+      shelljs.rm('-rf', TEMP_DIR);
+    }
+  }
+
+  process.chdir(ORIG_DIR);
+}
+
+if (require.main === module) {
+  publishYalcPackage(process.argv[2], process.argv[3])
+}
+
+module.exports = publishYalcPackage;