build-strap 5.0.4 → 5.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "build-strap",
-  "version": "5.0.4",
+  "version": "5.0.6",
   "description": "Node scripts for building things",
   "license": "MIT",
   "authors": [

package/src/docker.js

@@ -93,7 +93,7 @@ export async function getDockerTags(id, repo, fullName = false, filter = null) {
 export async function getDockerDigest(imageId, repo) {
     return (await dockerImages(repo, (m) => m.id === imageId)).map((m) => m.digest)[0];
 }
-export async function dockerLogin({ password = process.env.DOCKER_PASSWORD, registry = process.env.DOCKER_REGISTRY, user = process.env.DOCKER_PASSWORD, } = {}) {
+export async function dockerLogin({ password = process.env.DOCKER_PASSWORD, registry = process.env.DOCKER_REGISTRY, user = process.env.DOCKER_USER, } = {}) {
     const reg = registry || getDockerConfig().registry;
     await spawn('docker', ['login', '-u', user || '', '-p', password || '', ...(reg ? [reg] : [])], { stdio: 'inherit' });
 }

package/src/npm.js

@@ -60,7 +60,7 @@ email=${creds.email}`
 export async function npmPublish({ npmAuthToken, npmConfig, npmCreds, npmPath, publishPath = '.', skipExisting = false, tag, workDir: passedWorkDir, } = {}) {
     const creds = npmCreds || envNpmCreds;
     const authToken = npmAuthToken || process.env.NPM_TOKEN;
-    const name = getPkgName();
+    const name = getPkgName(true);
     const { access, dryRun, publish, registry } = npmConfig || getNpmConfig();
     if (!publish) {
         buildLog('npm publish info missing from package.json, skipping npm publish');

package/src/pkg.d.ts

@@ -36,3 +36,4 @@ export declare function getCfg(): BuildStrapConfig;
 export declare function setPkg(p: PackageJson): void;
 export declare function getPkgName(includeScope?: boolean): string;
 export declare function getPkgScope(): null | string;
+export declare function getPkgSafeName(): null | string;

package/src/pkg.js

@@ -31,3 +31,13 @@ export function getPkgScope() {
     const pkgName = getPkgName(true);
     return pkgName.match(pkgNameRegex)?.[1] || null;
 }
+export function getPkgSafeName() {
+    const pkgName = getPkgName(true);
+    const match = pkgName.match(pkgNameRegex);
+    if (!match) {
+        return null;
+    }
+    const [, scope, name] = match;
+    const safeScope = scope?.slice(1);
+    return safeScope ? `${safeScope}-${name}` : name;
+}

package/src/publish.js

@@ -1,14 +1,14 @@
 import fs from 'fs-extra';
 import path from 'path';
 import { npmPublish } from './npm.js';
-import { getPkgName } from './pkg.js';
+import { getPkgSafeName } from './pkg.js';
 import { buildLog, run } from './run.js';
 import { tgzDir } from './tgz.js';
 import { getVersion } from './version.js';
 // create tgz from distDir in outDir
 export async function createArtifact({ distDir, fileName, outDir, }) {
     const version = await getVersion();
-    const name = getPkgName();
+    const name = getPkgSafeName() || '';
     buildLog(`gzipping ${name} v${version.info}...`);
     const tgzFileName = fileName || `${name}-${version.info}.tgz`;
     const tgzFilePath = path.join(outDir, tgzFileName);

package/src/yarn.js

@@ -3,7 +3,7 @@ import path from 'path';
 import { spawn } from './cp.js';
 import { readDir } from './fs.js';
 import { envNpmCreds, getNpmConfig, npmGetVersions, npmWriteRc, } from './npm.js';
-import { getPkg, getPkgName } from './pkg.js';
+import { getPkg, getPkgName, getPkgSafeName } from './pkg.js';
 import { buildLog } from './run.js';
 import { generateFileHash } from './tgz.js';
 import { getDevBranch, getVersion } from './version.js';
@@ -78,7 +78,6 @@ export async function yarnUpgrade({ all = false, outdated = false, } = {}) {
 export async function yarnPublish({ npmAuthToken, npmConfig, npmCreds, npmPath, publishPath = '.', skipExisting = false, tag, workDir: passedWorkDir, } = {}) {
     const creds = npmCreds || envNpmCreds;
     const authToken = npmAuthToken || process.env.NPM_TOKEN;
-    const name = getPkgName();
     const { access, publish, registry } = npmConfig || getNpmConfig();
     if (!publish) {
         buildLog('npm publish info missing from package.json, skipping npm publish');
@@ -102,7 +101,7 @@ export async function yarnPublish({ npmAuthToken, npmConfig, npmCreds, npmPath,
             registry,
         });
     }
-    const existing = await npmGetVersions(name, npmPath);
+    const existing = await npmGetVersions(getPkgName(true), npmPath);
     const { branch, isRelease, npm: npmVersion } = await getVersion();
     if (existing.includes(npmVersion)) {
         if (skipExisting) {
@@ -142,7 +141,7 @@ export async function yarnPublish({ npmAuthToken, npmConfig, npmCreds, npmPath,
 export async function yarnPack({ destination, workDir = '.', }) {
     await fs.ensureDir(destination);
     const version = await getVersion();
-    const name = getPkgName();
+    const name = getPkgSafeName();
     const filename = path.resolve(destination, `${name}-${version.npm}.tgz`);
     await yarn({
         args: ['pack', ...(destination ? ['--filename', filename] : [])],