3.1.16

npmextra.json

@@ -6,7 +6,8 @@
     },
     "npmci": {
         "npmGlobalTools": [],
-        "npmAccessLevel": "public"
+        "npmAccessLevel": "public",
+        "npmRegistryUrl": "registry.npmjs.org"
     },
     "npmdocker":{
         "baseImage":"hosttoday/ht-docker-node:npmci",

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@shipzone/npmci",
-  "version": "3.1.5",
+  "version": "3.1.16",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shipzone/npmci",
-  "version": "3.1.5",
+  "version": "3.1.16",
   "description": "node and docker in gitlab ci on steroids",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

ts/mod_npm/index.ts

@@ -37,15 +37,25 @@ export let handleCli = async argvArg => {
  * authenticates npm with token from env var
  */
 const prepare = async () => {
-  const npmrcPrefix: string = '//registry.npmjs.org/:_authToken=';
+  const config = await configModule.getConfig();
-  const npmToken: string = process.env.NPMCI_TOKEN_NPM;
+  let npmrcFileString: string = '';
-  const npmrcFileString: string = npmrcPrefix + npmToken;
+  await plugins.smartparam.forEachMinimatch(process.env, 'NPMCI_TOKEN_NPM*', npmEnvArg => {
-  if (npmToken) {
+    const npmRegistryUrl = npmEnvArg.split('|')[0];
-    logger.log('info', 'found access token');
+    const npmToken = npmEnvArg.split('|')[1];
+    npmrcFileString += `//${npmRegistryUrl}/:_authToken="${plugins.smartstring.base64.decode(npmToken)}"\n`;
+  });
+  logger.log('info', `setting default npm registry to ${config.npmRegistryUrl}`);
+  npmrcFileString += `registry=https://${config.npmRegistryUrl}\n`;
+
+  // final check
+  if (npmrcFileString.length > 0) {
+    logger.log('info', 'found one or more access tokens');
   } else {
     logger.log('error', 'no access token found! Exiting!');
     process.exit(1);
   }
+
+  // lets save it to disk
   plugins.smartfile.memory.toFsSync(npmrcFileString, '/root/.npmrc');
   return;
 };
@@ -55,6 +65,7 @@ const prepare = async () => {
  */
 const publish = async () => {
   let npmAccessCliString = ``;
+  let npmRegistryCliString = ``;
   const config = await configModule.getConfig();
 
   // -> configure package access level
@@ -65,6 +76,14 @@ const publish = async () => {
     npmAccessCliString = `--access=${config.npmAccessLevel}`;
   }
 
+  // -> configure registry url
+  if (config.npmRegistryUrl) {
+    npmRegistryCliString = `--registry=https://${config.npmRegistryUrl}`;
+  } else {
+    logger.log('error', `no registry url specified. Can't publish!`);
+    process.exit(1);
+  }
+
   // -> preparing
   logger.log('info', `now preparing environment:`);
   prepare();
@@ -84,7 +103,7 @@ const publish = async () => {
 
   // -> publish it
   logger.log('info', `now invoking npm to publish the package!`);
-  await bash(`npm publish ${npmAccessCliString}`);
+  await bash(`npm publish ${npmAccessCliString} ${npmRegistryCliString}`);
   logger.log('success', `Package was successfully published!`);
 };
 

ts/mod_trigger/index.ts

@@ -6,7 +6,7 @@ const triggerValueRegex = /^([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)
 
 export let trigger = async () => {
   logger.log('info', 'now running triggers');
-  plugins.smartparam.forEachMinimatch(process.env, 'NPMCI_TRIGGER_*', evaluateTrigger);
+  await plugins.smartparam.forEachMinimatch(process.env, 'NPMCI_TRIGGER_*', evaluateTrigger);
 };
 
 const evaluateTrigger = async triggerEnvVarArg => {

ts/npmci.config.ts

@@ -8,6 +8,7 @@ import { KeyValueStore } from '@pushrocks/npmextra';
 export interface INpmciOptions {
   npmGlobalTools: string[];
   npmAccessLevel?: 'private' | 'public';
+  npmRegistryUrl: string;
   dockerRegistryRepoMap: any;
   dockerBuildargEnvMap: any;
 }
@@ -20,6 +21,8 @@ const npmciNpmextra = new plugins.npmextra.Npmextra(paths.cwd);
 const defaultConfig: INpmciOptions = {
   npmGlobalTools: [],
   dockerRegistryRepoMap: {},
+  npmAccessLevel: 'private',
+  npmRegistryUrl: 'registry.npmjs.org',
   dockerBuildargEnvMap: {}
 };
 export let configObject = npmciNpmextra.dataFor<INpmciOptions>('npmci', defaultConfig);