@wireapp/copy-config 2.2.2 → 2.2.3-hotfix-1.2

package/lib/CopyConfig.d.ts

@@ -1,12 +1,11 @@
-import logdown from 'logdown';
 import { CopyConfigOptions } from './CopyConfigOptions';
 export declare class CopyConfig {
-    private readonly logger?;
     private readonly options;
+    private readonly logger;
     private readonly noClone;
     private readonly noCleanup;
     private readonly filterFiles;
-    constructor(options: CopyConfigOptions | undefined, logger?: logdown.Logger | undefined);
+    constructor(options: CopyConfigOptions);
     private readEnvVars;
     private getFilesFromString;
     private resolveFiles;

package/lib/CopyConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CopyConfig.d.ts","sourceRoot":"","sources":["../src/CopyConfig.ts"],"names":[],"mappings":"AAoBA,OAAO,OAAO,MAAM,SAAS,CAAC;AAI9B,OAAO,EAAC,iBAAiB,EAAC,MAAM,qBAAqB,CAAC;AAYtD,qBAAa,UAAU;IAQnB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC;IAP1B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA8B;IACtD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAkB;IAC1C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAkB;IAC5C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA2B;gBAGrD,OAAO,EAAE,iBAAiB,GAAG,SAAS,EACrB,MAAM,CAAC,4BAAgB;IAiB1C,OAAO,CAAC,WAAW;IAmBnB,OAAO,CAAC,kBAAkB;IAkB1B,OAAO,CAAC,YAAY;IAmBP,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;YA2CpE,KAAK;YAkCL,aAAa;IAKd,IAAI,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;CA0BvC"}
+{"version":3,"file":"CopyConfig.d.ts","sourceRoot":"","sources":["../src/CopyConfig.ts"],"names":[],"mappings":"AAwBA,OAAO,EAAC,iBAAiB,EAAC,MAAM,qBAAqB,CAAC;AAWtD,qBAAa,UAAU;IACrB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA8B;IACtD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAiB;IACxC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAkB;IAC1C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAkB;IAC5C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA2B;gBAE3C,OAAO,EAAE,iBAAiB;IAqBtC,OAAO,CAAC,WAAW;IAmBnB,OAAO,CAAC,kBAAkB;IAkB1B,OAAO,CAAC,YAAY;IAmBP,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;YA0CpE,KAAK;YAkCL,aAAa;IAKd,IAAI,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;CA0BvC"}

package/lib/CopyConfig.js

@@ -46,19 +46,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CopyConfig = void 0;
 const fs = __importStar(require("fs-extra"));
+const logdown_1 = __importDefault(require("logdown"));
 const path_1 = __importDefault(require("path"));
 const utils = __importStar(require("./utils"));
 const defaultOptions = {
     baseDir: 'config',
     externalDir: '',
     files: {},
-    logLevel: 'info',
     forceDownload: false,
     repositoryUrl: 'https://github.com/wireapp/wire-web-config-default#master',
 };
 class CopyConfig {
-    constructor(options, logger) {
-        this.logger = logger;
+    constructor(options) {
         this.noClone = false;
         this.noCleanup = false;
         this.filterFiles = ['.DS_Store'];
@@ -73,6 +72,10 @@ class CopyConfig {
             this.options.baseDir = this.options.externalDir;
         }
         this.options.baseDir = path_1.default.resolve(this.options.baseDir);
+        this.logger = (0, logdown_1.default)('@wireapp/copy-config/CopyConfig', {
+            markdown: false,
+        });
+        this.logger.state.isEnabled = true;
     }
     readEnvVars() {
         const externalDir = process.env.WIRE_CONFIGURATION_EXTERNAL_DIR;
@@ -118,7 +121,6 @@ class CopyConfig {
         });
     }
     async copyDirOrFile(source, destination) {
-        var _a, _b, _c;
         const filter = (src) => {
             for (const fileName in this.filterFiles) {
                 if (src.endsWith(fileName)) {
@@ -132,26 +134,24 @@ class CopyConfig {
             throw new Error('Cannot copy a directory into a file.');
         }
         if (isGlob(source)) {
-            (_a = this.logger) === null || _a === void 0 ? void 0 : _a.info(`Resolving "${source}"`);
+            this.logger.info(`Resolving "${source}"`);
             const copiedFiles = await utils.copyAsync(source, destination);
             for (const copiedFile of copiedFiles) {
                 const [copiedFrom, copiedTo] = copiedFile.history;
-                (_b = this.logger) === null || _b === void 0 ? void 0 : _b.debug(`Copying "${copiedFrom}" -> "${copiedTo}"`);
+                this.logger.info(`Copying "${copiedFrom}" -> "${copiedTo}"`);
             }
             return copiedFiles.map(file => file.path);
         }
         if (utils.isFile(source) && !utils.isFile(destination)) {
             destination = path_1.default.join(destination, path_1.default.basename(source));
         }
-        (_c = this.logger) === null || _c === void 0 ? void 0 : _c.debug(`Copying "${source}" -> "${destination}"`);
+        this.logger.info(`Copying "${source}" -> "${destination}"`);
         // Info: "fs.copy" creates all sub-folders which are needed along the way:
         // see https://github.com/jprichardson/node-fs-extra/blob/7.0.1/lib/copy/copy.js#L43
-        // by default, fs.copy() copies folders recursively
-        await fs.copy(source, destination, { filter, overwrite: true });
+        await fs.copy(source, destination, { filter, overwrite: true, recursive: true });
         return [destination];
     }
     async clone() {
-        var _a, _b, _c;
         const repositoryData = this.options.repositoryUrl.split('#');
         let bareUrl = repositoryData[0];
         const branch = repositoryData[1] || 'master';
@@ -160,7 +160,7 @@ class CopyConfig {
             await this.removeBasedir();
         }
         if (stderrVersion) {
-            (_a = this.logger) === null || _a === void 0 ? void 0 : _a.error(`No git installation found: (error: "${stderrVersion}"). Trying to download the zip file ...`);
+            this.logger.error(`No git installation found: (error: "${stderrVersion}"). Trying to download the zip file ...`);
         }
         if (stderrVersion || this.options.forceDownload) {
             if (bareUrl.startsWith('git')) {
@@ -168,11 +168,11 @@ class CopyConfig {
                 bareUrl = bareUrl.replace(gitProtocolRegex, 'https://$1$2/$3');
             }
             const url = `${bareUrl}/archive/${branch}.zip`;
-            (_b = this.logger) === null || _b === void 0 ? void 0 : _b.info(`Downloading "${url}" ...`);
+            this.logger.info(`Downloading "${url}" ...`);
             await utils.downloadFileAsync(url, this.options.baseDir);
         }
         else {
-            (_c = this.logger) === null || _c === void 0 ? void 0 : _c.info(`Cloning "${bareUrl}" (branch "${branch}") ...`);
+            this.logger.info(`Cloning "${bareUrl}" (branch "${branch}") ...`);
             const command = `git clone --depth 1 -b ${branch} ${bareUrl} ${this.options.baseDir}`;
             const { stderr: stderrClone } = await utils.execAsync(command);
             if (stderrClone.includes('fatal')) {
@@ -181,8 +181,7 @@ class CopyConfig {
         }
     }
     async removeBasedir() {
-        var _a;
-        (_a = this.logger) === null || _a === void 0 ? void 0 : _a.debug(`Cleaning up "${this.options.baseDir}" ...`);
+        this.logger.info(`Cleaning up "${this.options.baseDir}" ...`);
         await utils.rimrafAsync(this.options.baseDir);
     }
     async copy() {

package/lib/CopyConfigOptions.d.ts

@@ -33,6 +33,5 @@ export interface CopyConfigOptions {
      * @example `https://github.com/wireapp/wire-web-config-default#v0.7.1`
      */
     repositoryUrl: string;
-    logLevel?: 'verbose' | 'info' | 'silent';
 }
 //# sourceMappingURL=CopyConfigOptions.d.ts.map

package/lib/CopyConfigOptions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CopyConfigOptions.d.ts","sourceRoot":"","sources":["../src/CopyConfigOptions.ts"],"names":[],"mappings":"AAmBA,MAAM,WAAW,iBAAiB;IAChC;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;;;OAKG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;;;;;;;;OAWG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC;IAC1C,kDAAkD;IAClD,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB;;;;OAIG;IACH,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,SAAS,GAAG,MAAM,GAAG,QAAQ,CAAC;CAC1C"}
+{"version":3,"file":"CopyConfigOptions.d.ts","sourceRoot":"","sources":["../src/CopyConfigOptions.ts"],"names":[],"mappings":"AAmBA,MAAM,WAAW,iBAAiB;IAChC;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;;;OAKG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;;;;;;;;OAWG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC;IAC1C,kDAAkD;IAClD,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB;;;;OAIG;IACH,aAAa,EAAE,MAAM,CAAC;CACvB"}

package/lib/cli.js

@@ -26,25 +26,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const cosmiconfig_1 = require("cosmiconfig");
 const logdown_1 = __importDefault(require("logdown"));
 const _1 = require("./");
+const configExplorer = (0, cosmiconfig_1.cosmiconfig)('copyconfig');
+const logger = (0, logdown_1.default)('@wireapp/copy-config/cli', {
+    markdown: false,
+});
+logger.state.isEnabled = true;
 (async () => {
-    const configExplorer = (0, cosmiconfig_1.cosmiconfig)('copyconfig');
     const configFile = await configExplorer.search();
-    const config = configFile ? configFile.config : undefined;
-    const logLevel = (config === null || config === void 0 ? void 0 : config.logLevel) || 'info';
-    const logger = logLevel !== 'silent' ? (0, logdown_1.default)('@wireapp/copy-config', { markdown: false }) : undefined;
-    if (logger) {
-        logger.state.isEnabled = true;
-        if (configFile) {
-            logger.info(`Found configuration file "${configFile.filepath}".`);
-        }
-        if (logLevel !== 'verbose') {
-            // Disable debug logging when not in verbose mode
-            logger.debug = () => { };
-        }
+    if (configFile) {
+        logger.info(`Found configuration file "${configFile.filepath}".`);
     }
-    const copiedFiles = await new _1.CopyConfig(config, logger).copy();
+    const config = configFile ? configFile.config : undefined;
+    const copiedFiles = await new _1.CopyConfig(config).copy();
     const copyMessage = copiedFiles.length ? `Copied ${copiedFiles.length}` : "Didn't copy any";
-    logger === null || logger === void 0 ? void 0 : logger.info(`${copyMessage} file${copiedFiles.length === 1 ? '' : 's'}.`);
+    logger.info(`${copyMessage} file${copiedFiles.length === 1 ? '' : 's'}.`);
 })().catch(error => {
     console.error(error);
     process.exit(1);

package/lib/utils.d.ts

@@ -5,30 +5,6 @@ export declare function copyAsync(source: string, destination: string): Promise<
 export declare function downloadFileAsync(url: string, baseDir: string): Promise<void>;
 export declare function extractAsync(zipFile: string, destination: string): Promise<void>;
 export declare const isFile: (path: string) => boolean;
-export declare const rimrafAsync: ((path: string | string[], opt?: import("rimraf").RimrafAsyncOptions | undefined) => Promise<boolean>) & {
-    rimraf: (path: string | string[], opt?: import("rimraf").RimrafAsyncOptions | undefined) => Promise<boolean>;
-    sync: (path: string | string[], opt?: import("rimraf").RimrafSyncOptions | undefined) => boolean;
-    rimrafSync: (path: string | string[], opt?: import("rimraf").RimrafSyncOptions | undefined) => boolean;
-    manual: ((path: string | string[], opt?: import("rimraf").RimrafAsyncOptions | undefined) => Promise<boolean>) & {
-        sync: (path: string | string[], opt?: import("rimraf").RimrafSyncOptions | undefined) => boolean;
-    };
-    manualSync: (path: string | string[], opt?: import("rimraf").RimrafSyncOptions | undefined) => boolean;
-    native: ((path: string | string[], opt?: import("rimraf").RimrafAsyncOptions | undefined) => Promise<boolean>) & {
-        sync: (path: string | string[], opt?: import("rimraf").RimrafSyncOptions | undefined) => boolean;
-    };
-    nativeSync: (path: string | string[], opt?: import("rimraf").RimrafSyncOptions | undefined) => boolean;
-    posix: ((path: string | string[], opt?: import("rimraf").RimrafAsyncOptions | undefined) => Promise<boolean>) & {
-        sync: (path: string | string[], opt?: import("rimraf").RimrafSyncOptions | undefined) => boolean;
-    };
-    posixSync: (path: string | string[], opt?: import("rimraf").RimrafSyncOptions | undefined) => boolean;
-    windows: ((path: string | string[], opt?: import("rimraf").RimrafAsyncOptions | undefined) => Promise<boolean>) & {
-        sync: (path: string | string[], opt?: import("rimraf").RimrafSyncOptions | undefined) => boolean;
-    };
-    windowsSync: (path: string | string[], opt?: import("rimraf").RimrafSyncOptions | undefined) => boolean;
-    moveRemove: ((path: string | string[], opt?: import("rimraf").RimrafAsyncOptions | undefined) => Promise<boolean>) & {
-        sync: (path: string | string[], opt?: import("rimraf").RimrafSyncOptions | undefined) => boolean;
-    };
-    moveRemoveSync: (path: string | string[], opt?: import("rimraf").RimrafSyncOptions | undefined) => boolean;
-};
+export declare const rimrafAsync: (arg1: string) => Promise<void>;
 export declare const execAsync: typeof exec.__promisify__;
 //# sourceMappingURL=utils.d.ts.map

package/lib/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";AAwBA,OAAO,IAAI,MAAM,OAAO,CAAC;AAEzB,OAAO,EAAC,IAAI,EAAC,MAAM,eAAe,CAAC;AAInC,wBAAsB,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC,CAUpF;AAED,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAoBnF;AAED,wBAAsB,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAsBtF;AAED,eAAO,MAAM,MAAM,SAAU,MAAM,YAA0B,CAAC;AAC9D,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;CAAS,CAAC;AAClC,eAAO,MAAM,SAAS,2BAAkB,CAAC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";AAwBA,OAAO,IAAI,MAAM,OAAO,CAAC;AAEzB,OAAO,EAAC,IAAI,EAAC,MAAM,eAAe,CAAC;AAInC,wBAAsB,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC,CAUpF;AAED,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAoBnF;AAED,wBAAsB,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAsBtF;AAED,eAAO,MAAM,MAAM,SAAU,MAAM,YAAgC,CAAC;AACpE,eAAO,MAAM,WAAW,iCAAoB,CAAC;AAC7C,eAAO,MAAM,SAAS,2BAAkB,CAAC"}

package/lib/utils.js

@@ -26,7 +26,7 @@ const axios_1 = __importDefault(require("axios"));
 const copy_1 = __importDefault(require("copy"));
 const fs_extra_1 = require("fs-extra");
 const jszip_1 = __importDefault(require("jszip"));
-const rimraf_1 = require("rimraf");
+const rimraf_1 = __importDefault(require("rimraf"));
 const child_process_1 = require("child_process");
 const path_1 = __importDefault(require("path"));
 const util_1 = require("util");
@@ -79,7 +79,7 @@ async function extractAsync(zipFile, destination) {
     }));
 }
 exports.extractAsync = extractAsync;
-const isFile = (path) => /\w\.\w+$/.test(path);
+const isFile = (path) => /[^.\/\\]+\..+$/.test(path);
 exports.isFile = isFile;
-exports.rimrafAsync = rimraf_1.rimraf;
+exports.rimrafAsync = (0, util_1.promisify)(rimraf_1.default);
 exports.execAsync = (0, util_1.promisify)(child_process_1.exec);

package/package.json

@@ -35,6 +35,6 @@
     "test": "jest",
     "test:coverage": "jest --coverage"
   },
-  "version": "2.2.2",
-  "gitHead": "a106d98232b52392791c21fc90591bcb24347216"
+  "version": "2.2.3-hotfix-1.2",
+  "gitHead": "ed9fc82dffbcf03fe6ac1ec613b24a4330df26f4"
 }