powerbi-visuals-tools 3.4.1 → 4.0.2

package/.vscode/launch.json

@@ -19,10 +19,54 @@
         {
             "type": "node",
             "request": "launch",
-            "name": "Launch Program t1",
+            "name": "pbiviz-start t1",
             "cwd": "${workspaceFolder}\\testGround\\t1",
             "program": "${workspaceFolder}\\bin\\pbiviz.js",
             "args": ["start"]
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "pbiviz-start t1 Linux",
+            "cwd": "${workspaceFolder}/testGround/t1",
+            "program": "${workspaceFolder}/bin/pbiviz.js",
+            "args": ["start"]
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "pbiviz-package t1",
+            "cwd": "${workspaceFolder}\\testGround\\t1",
+            "program": "${workspaceFolder}\\bin\\pbiviz.js",
+            "args": ["package"]
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "pbiviz-new circle",
+            "cwd": "${workspaceFolder}\\testGround",
+            "program": "${workspaceFolder}\\bin\\pbiviz.js",
+            "args": [
+                "new",
+                "-t",
+                "circlecard",
+                "circlecard-sample",
+                "-f"
+            ]
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "test pbiviz-start",
+            "cwd": "${workspaceRoot}",
+            "program": "${workspaceFolder}\\bin\\pbiviz.js",
+            "args": [
+                "new",
+                "-t",
+                "circlecard",
+                "mynewsample",
+                "-f"
+            ]
         }
     ]
 }

package/Changelog.md

@@ -2,6 +2,27 @@
 
 This page contains information about changes to the PowerBI Visual Tools (pbiviz).
 
+## 4.0.2
+* Fix custom visual package upload to desktop version of PowerBI
+* Removed environment logging in this version 
+* Downgraded "powerbi-visuals-webpack-plugin"
+
+## 4.0.0
+* This release version includes changes from previous betta versions: 3.4.0, 3.4.1, 3.4.2, 3.4.3.
+
+## 3.4.3
+
+* Updated webpack assets compilation
+* Added environment logging for debugging purposes
+* Fixed certificate date verification for different regional settings
+
+## 3.4.2
+
+* Migrated from `request` lib to node `https` standard method
+* Removed `friendly-errors-webpack-plugin` usage
+* Removed or updated deprecated dependencies
+* Fixed vulnerabilities
+
 ## 3.4.1
 
 * Fixed certificate verification for 'non-english' environment

package/config.json

@@ -1 +1 @@
-{"templates":{"visuals":"templates/visuals","pbiviz":"templates/pbiviz.json.template","plugin":"templates/plugin.ts.template","package":"templates/package.json.template"},"generate":{"apiVersion":"3.8.0"},"constants":{"minAPIversion":"3.2.0"},"build":{"precompileFolder":".tmp/precompile","dropFolder":".tmp/drop","js":"tmp.visual.js","css":"visual.css","stats":"../../webpack.statistics.html"},"package":{"dropFolder":"dist"},"server":{"root":"webRoot","assetsRoute":"/assets","privateKey":"certs/PowerBICustomVisualTest_private.key","certificate":"certs/PowerBICustomVisualTest_public.crt","pfx":"certs/PowerBICustomVisualTest_public.pfx","port":"8080","passphrase":"21345751397540846"},"visualTemplates":{"circlecard":"http://github.com/microsoft/powerbi-visuals-circlecard-react/archive/master.zip"}}
+{"templates":{"visuals":"templates/visuals","pbiviz":"templates/pbiviz.json.template","plugin":"templates/plugin.ts.template","package":"templates/package.json.template"},"generate":{"apiVersion":"3.8.0"},"constants":{"minAPIversion":"3.2.0"},"build":{"precompileFolder":".tmp/precompile","dropFolder":".tmp/drop","js":"tmp.visual.js","css":"visual.css","stats":"../../webpack.statistics.html"},"package":{"dropFolder":"dist"},"server":{"root":"webRoot","assetsRoute":"/assets","privateKey":"certs/PowerBICustomVisualTest_private.key","certificate":"certs/PowerBICustomVisualTest_public.crt","pfx":"certs/PowerBICustomVisualTest_public.pfx","port":"8080","passphrase":"9877149244399557"},"visualTemplates":{"circlecard":"https://codeload.github.com/microsoft/powerbi-visuals-circlecard-react/zip/master"}}

package/lib/CertificateTools.js

@@ -56,7 +56,7 @@ async function createCertFile(config, open) {
     const subject = "localhost";
     const keyLength = 2048;
     const algorithm = "sha256";
-    const validPeriod = 180;
+    const validPeriod = 365;
 
     if (typeof open === 'undefined') {
         open = false;
@@ -383,17 +383,14 @@ async function veryfyCertFile(keyPath, certPath, pfxPath, passphrase) {
     let verifyCertDate;
     try {
         let endDateStr;
-        
+
         // For Windows OS:
         if (os.platform() === "win32") {
             if (!fs.existsSync(pfxPath) || !passphrase) {
                 return false;
             }
-            let certStr = await exec(`certutil -p ${passphrase} -dump "${pfxPath}"`);
-            let certStrSplitted = certStr.split('\r\n');
-            let regex = /(?<=: ).*/;
-            endDateStr = regex.exec(certStrSplitted[6]);
-
+            let certStr = await exec(`powershell.exe (New-Object System.Security.Cryptography.X509Certificates.X509Certificate2('${pfxPath}','${passphrase}')).NotAfter.ToString('yyyy-MM-dd HH:mm:ss')`);
+            endDateStr = certStr.trim();
         }
         // For Linux and Mac/darwin OS:
         else if (os.platform() === "linux" || os.platform() === "darwin") {
@@ -403,8 +400,8 @@ async function veryfyCertFile(keyPath, certPath, pfxPath, passphrase) {
             endDateStr = await exec(`openssl x509 -enddate -noout -in ${certPath} | cut -d = -f 2`);
         }
 
-        let endDate = new Date(Date.parse(endDateStr));
-        verifyCertDate = (endDate - new Date()) > certSafePeriod;
+        let endDate = Date.parse(endDateStr);
+        verifyCertDate = (endDate - Date.now()) > certSafePeriod;
         if (verifyCertDate) {
             ConsoleWriter.info(`Certificate is valid.`);
         } else {

package/lib/TemplateFetcher.js

@@ -2,23 +2,23 @@ const fs = require('fs-extra');
 const path = require('path');
 const config = require('../config.json');
 const JSZip = require('jszip');
-const request = require('request');
 const VisualGenerator = require("./VisualGenerator");
 const { exec } = require('child_process');
-let ConsoleWriter = require('../lib/ConsoleWriter');
+const ConsoleWriter = require('../lib/ConsoleWriter');
+const download = require('./utils').download;
+const createFolder = require('./utils').createFolder;
 
 class TemplateFetcher {
     constructor({ templateName, visualName, apiVersion }) {
         this.templateName = templateName;
         this.visualName = visualName;
-        this.folderName = `powerbi-visuals-${this.visualName}`;
+        this.folderName = `${this.visualName}`;
         this.apiVersion = apiVersion;
-        console.log();
     }
 
     fetch() {
-        this.createFolder()
-            .then(this.download.bind(this))
+        let folder = createFolder.call(this, this.folderName);
+        download.call(this, config.visualTemplates[this.templateName], path.join(folder, "template.zip"))
             .then(this.extractFiles.bind(this))
             .then(this.removeZipFile.bind(this))
             .then(this.setVisualGUID.bind(this))
@@ -27,28 +27,6 @@ class TemplateFetcher {
             .then(this.showNextSteps.bind(this));
     }
 
-    async createFolder() {
-        let folder = path.join("./", this.folderName);
-        await fs.ensureDir(folder);
-        return folder;
-    }
-
-    download(folder) {
-        return new Promise((resolve) => {
-            const templateUrl = config.visualTemplates[this.templateName];
-            const fileName = path.join(folder, "template.zip");
-            const fileStream = fs.createWriteStream(`.${path.sep}${fileName}`);
-
-            request.get(templateUrl, (err) => {
-                if (err) {
-                    reject(err);
-                }
-            })
-            .pipe(fileStream)
-            .on("close", () => resolve(fileStream));
-        });
-    }
-
     async removeZipFile() {
         const folder = path.join("./", this.folderName);
         const fileName = path.join(folder, "template.zip");
@@ -64,7 +42,7 @@ class TemplateFetcher {
         const buffer = await fs.readFile(filePath);
         const zip = await JSZip.loadAsync(buffer);
 
-        const filesList =  Object.keys(zip.files);
+        const filesList = Object.keys(zip.files);
         for (const filename of filesList) {
             if (filename[filename.length - 1] === "/") {
                 // generate folders                            for exclude parent folder

package/lib/WebPackWrap.js

@@ -1,6 +1,7 @@
 "use strict";
 
 const fs = require('fs-extra');
+const os = require('os');
 const path = require('path');
 const webpack = require('webpack');
 const config = require('../config.json');
@@ -9,12 +10,12 @@ const encoding = "utf8";
 const ConsoleWriter = require('../lib/ConsoleWriter');
 const ExtraWatchWebpackPlugin = require('extra-watch-webpack-plugin');
 const Visualizer = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
-const FriendlyErrorsWebpackPlugin = require('friendly-errors-webpack-plugin');
 const util = require('util');
 const exec = util.promisify(require('child_process').exec);
 const CertificateTools = require("../lib/CertificateTools");
 const visualPlugin = "visualPlugin.ts";
 const lodashCloneDeep = require('lodash.clonedeep');
+const npmPackage = require('../package.json');
 
 class WebPackGenerator {
 
@@ -81,11 +82,14 @@ class WebPackGenerator {
                 directory: path.join(visualPackage.basePath, config.build.dropFolder),
                 publicPath: config.server.assetsRoute
             },
-            https: {
-                key: options.key,
-                cert: options.cert,
-                pfx: options.pfx,
-                passphrase: options.passphrase
+            server: {
+                type: 'https',
+                options: {
+                    key: options.key,
+                    cert: options.cert,
+                    pfx: options.pfx,
+                    passphrase: options.passphrase
+                }
             }
         };
     }
@@ -109,6 +113,16 @@ class WebPackGenerator {
         }
     }
 
+    async getEnvironmentDetails() {
+        let env = {};
+        env.nodeVersion = process.versions.node;
+        env.osPlatform = await os.platform();
+        env.osVersion = await os.version ? os.version() : "undefined";
+        env.osReleaseVersion = await os.release();
+        env.toolsVersion = npmPackage.version;
+        return env;
+    }
+
     async configureCustomVisualsWebpackPlugin(visualPackage, options, tsconfig) {
         let pluginConfiguration = lodashCloneDeep(visualPackage.config);
         //(?=\D*$) - positive look-ahead to find last version symbols and exclude any non-digit symbols after the version.
@@ -128,6 +142,8 @@ class WebPackGenerator {
             await this.installAPIpackage();
         }
 
+        // pluginConfiguration.env = await this.getEnvironmentDetails();
+
         let api = WebPackGenerator.loadAPIPackage(visualPackage);
         pluginConfiguration.apiVersion = api.version;
         pluginConfiguration.capabilitiesSchema = api.schemas.capabilities;
@@ -168,7 +184,6 @@ class WebPackGenerator {
             new ExtraWatchWebpackPlugin({
                 files: [visualPackage.buildPath(this.pbiviz.capabilities)]
             }),
-            new FriendlyErrorsWebpackPlugin(),
             new webpack.ProvidePlugin({
                 window: 'realWindow',
                 define: 'fakeDefine',
@@ -181,7 +196,7 @@ class WebPackGenerator {
                 new webpack.SourceMapDevToolPlugin({
                     filename: '[file].map',
                     publicPath: `https://localhost:${this.webpackConfig.devServer.port}/assets/`
-                  })
+                })
             );
         }
     }

package/lib/utils.js

@@ -0,0 +1,26 @@
+const fs = require('fs-extra');
+let https = require("https");
+let path = require("path");
+
+function download(url, pathToFile) {
+    return new Promise((resolve, reject) => {
+        const fileStream = fs.createWriteStream(pathToFile);
+        https.get(url, (res) => {
+            res.pipe(fileStream);
+            fileStream.on('close', () => resolve(fileStream));
+            res.on('error', (error) => reject(error));
+        })
+            .on('error', (error) => reject(error));
+    });
+}
+
+function createFolder(folderName) {
+    let folder = path.join("./", folderName);
+    fs.ensureDirSync(folder);
+    return folder;
+}
+
+module.exports = { 
+    download,
+    createFolder
+ };

package/lib/webpack.config.js

@@ -50,7 +50,9 @@ module.exports = {
                     {
                         loader: require.resolve('less-loader'),
                         options: {
-                            paths: [path.resolve(__dirname, "..", 'node_modules')]
+                            lessOptions: {
+                                paths: [path.resolve(__dirname, "..", 'node_modules')]
+                            }
                         }
                     }
                 ]
@@ -119,7 +121,7 @@ module.exports = {
         compress: true,
         port: 8080,
         hot: false,
-        https: true,
+        server: 'https',
         headers: {
             "access-control-allow-origin": "*",
             "cache-control": "public, max-age=0"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "powerbi-visuals-tools",
-  "version": "3.4.1",
+  "version": "4.0.2",
   "description": "Command line tool for creating and publishing visuals for Power BI",
   "main": "./lib/VisualPackage.js",
   "scripts": {
@@ -34,7 +34,7 @@
     "assert": "^2.0.0",
     "async": "3.2.0",
     "babel-loader": "^8.1.0",
-    "base64-inline-loader": "^1.1.1",
+    "base64-inline-loader": "^2.0.1",
     "browserify-zlib": "^0.2.0",
     "buffer": "^6.0.3",
     "chalk": "3.0.0",
@@ -43,19 +43,18 @@
     "connect": "3.7.0",
     "console-browserify": "^1.2.0",
     "constants-browserify": "^1.0.0",
-    "core-js": "3.6.4",
+    "core-js": "^3.18.1",
     "crypto-browserify": "^3.12.0",
     "css-loader": "^5.2.7",
     "domain-browser": "^4.22.0",
     "events": "^3.3.0",
     "extra-watch-webpack-plugin": "^1.0.3",
-    "friendly-errors-webpack-plugin": "^1.7.0",
     "fs-extra": "^9.1.0",
     "https-browserify": "^1.0.0",
     "json-loader": "0.5.7",
     "jszip": "^3.7.1",
     "less": "^3.11.1",
-    "less-loader": "^5.0.0",
+    "less-loader": "^10.0.1",
     "lodash.clonedeep": "4.5.0",
     "lodash.defaults": "4.2.0",
     "lodash.isequal": "4.5.0",
@@ -67,9 +66,7 @@
     "punycode": "^2.1.1",
     "querystring-es3": "^0.2.1",
     "readable-stream": "^3.6.0",
-    "request": "^2.88.2",
     "serve-static": "1.14.1",
-    "source-map-concat": "1.0.1",
     "stream-browserify": "^3.0.0",
     "stream-http": "^3.2.0",
     "string_decoder": "^1.3.0",
@@ -86,7 +83,7 @@
     "webpack-dev-server": "^4.1.0"
   },
   "devDependencies": {
-    "eslint": "6.8.0",
+    "eslint": "^7.31.0",
     "jasmine": "3.5.0",
     "jasmine-spec-reporter": "5.0.1",
     "semver": "7.1.3",

package/templates/visuals/default/package.json

@@ -19,7 +19,7 @@
     "d3": "5.12.0",
     "powerbi-visuals-utils-dataviewutils": "2.2.1",
     "powerbi-visuals-api": "~3.8.0",
-    "core-js": "3.2.1"
+    "core-js": "^3.18.1"
   },
   "devDependencies": {
     "ts-loader": "6.1.0",

package/templates/visuals/slicer/package.json

@@ -9,7 +9,7 @@
   "dependencies": {
     "d3": "5.10.0",
     "powerbi-visuals-utils-dataviewutils": "^2.2.1",
-    "core-js": "3.2.1"
+    "core-js": "3.18.1"
   },
   "devDependencies": {
     "@babel/polyfill": "^7.4.4",

package/templates/visuals/table/package.json

@@ -9,7 +9,7 @@
   "dependencies": {
     "d3": "5.10.0",
     "powerbi-visuals-utils-dataviewutils": "^2.2.1",
-    "core-js": "3.2.1"
+    "core-js": "^3.18.1"
   },
   "devDependencies": {
     "powerbi-visuals-api": "~3.8.0",