Skip to content

Commit d6de4d0

Browse files
author
Alon Yeshurun
committed
Merge remote-tracking branch 'powerbi/master' into release-2.23.10
2 parents 61e8ba0 + d3f4840 commit d6de4d0

11 files changed

Lines changed: 13379 additions & 13456 deletions

File tree

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
name: powerbi-javascript inventory config
2+
description: Inventory-as-code configuration for the powerbi-javascript repository
3+
resource: repository
4+
configuration:
5+
inventoryConfig:
6+
schemaVersion: 0
7+
publishInventory: false
8+
areasOnly: true

.config/merlinbot/nitpicker.yaml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
branches:
2+
- name: master
3+
comments:
4+
- markdown: |
5+
## Validation
6+
Your changes might be relevant for other embed repositories.
7+
Please check out the following [wiki](https://dev.azure.com/powerbi/Embedded/_wiki/wikis/Embedded.wiki/90314/Public-SDKs) to learn which repositories we own and which files are usually unified for all.
8+
For any question please contact [email protected]
9+
id: "CommonFilesValidation"
10+
pathFilter:
11+
- /.config/**
12+
- /.pipelines/**
13+
- /.npmrc
14+
- /.gitignore
15+
- /.eslintrc.js
16+
- /.eslintIgnore
17+
- /CONTRIBUTING.md
18+
- /LICENSE.txt
19+
- /owners.txt

README.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,10 @@ This project welcomes contributions and suggestions. Most contributions require
5858

5959
When you submit a pull request, a CLA bot will automatically determine whether you need to provide a CLA and decorate the PR appropriately (e.g., status check, comment). Simply follow the instructions provided by the bot. You will only need to do this once across all repos using our CLA.
6060

61-
This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [[email protected]](mailto:[email protected]) with any additional questions or comments
61+
This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [[email protected]](mailto:[email protected]) with any additional questions or comments
62+
63+
## Support
64+
65+
- **Feature Requests:** Submit your ideas and suggestions to the [Fabric Ideas Portal](https://ideas.fabric.microsoft.com/), where you can also vote on ideas from other developers.
66+
- **Bug Reports and Technical Assistance:** Visit the [Fabric Developer Community Forum](https://community.fabric.microsoft.com/t5/Developer/bd-p/Developer). Our team and community experts are ready to assist you.
67+
- **Additional Support:** Contact your account manager or reach out to the [Fabric Support Team](https://support.fabric.microsoft.com/en-us/support/).

dist/powerbi-client.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// powerbi-client v2.23.1
1+
// powerbi-client v2.23.10
22
// Copyright (c) Microsoft Corporation.
33
// Licensed under the MIT License.
44
declare module "config" {

dist/powerbi.js

Lines changed: 13269 additions & 13424 deletions
Large diffs are not rendered by default.

dist/powerbi.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

karma.conf.js

Lines changed: 38 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
var argv = require('yargs').argv;
22

3-
var browserName = 'Chrome_headless';
3+
process.env.CHROME_BIN = require('puppeteer').executablePath();
4+
5+
var browserName = 'ChromeHeadlessCustom';
46
if (argv.chrome) {
5-
browserName = 'Chrome_headless'
7+
browserName = 'ChromeHeadlessCustom'
68
}
79
else if (argv.firefox) {
810
browserName = 'Firefox'
@@ -12,18 +14,27 @@ const flags = [
1214
'--no-proxy-server',
1315
'--js-flags="--max_old_space_size=6500"',
1416
'--high-dpi-support=1',
17+
'--no-sandbox',
18+
'--headless',
19+
'--disable-gpu',
20+
'--window-size=800,800',
1521
];
1622
module.exports = function (config) {
1723
config.set({
18-
frameworks: ['jasmine'],
24+
frameworks: ['jasmine','karma-typescript'],
1925
files: [
2026
'./node_modules/jquery/dist/jquery.js',
2127
'./node_modules/es6-promise/dist/es6-promise.js',
22-
'./tmp/**/*.js',
28+
{ pattern: './src/**/*.ts' },
29+
{ pattern: './test/**/*.ts' },
2330
{ pattern: './test/**/*.html', served: true, included: false }
2431
],
2532
exclude: [],
26-
reporters: argv.chrome ? ['kjhtml'] : ['spec', 'junit'],
33+
preprocessors: {
34+
'./src/**/*.ts': ['karma-typescript'],
35+
'./test/**/*.ts': ['karma-typescript']
36+
},
37+
reporters: argv.chrome ? ['kjhtml'] : ['spec', 'karma-typescript', 'progress', 'junit', 'coverage'],
2738
autoWatch: true,
2839
browsers: [browserName],
2940
browserNoActivityTimeout: 300000,
@@ -33,19 +44,38 @@ module.exports = function (config) {
3344
'karma-jasmine',
3445
'karma-spec-reporter',
3546
'karma-jasmine-html-reporter',
36-
'karma-junit-reporter'
47+
'karma-junit-reporter',
48+
'karma-coverage',
49+
'karma-typescript'
3750
],
3851
customLaunchers: {
39-
'Chrome_headless': {
52+
'ChromeHeadlessCustom': {
4053
base: 'Chrome',
4154
flags: flags.concat("--no-sandbox", "--window-size=800,800"),
4255
},
4356
},
4457
junitReporter: {
45-
outputDir: 'tmp',
58+
outputDir: 'test-results',
4659
outputFile: 'testresults.xml',
4760
useBrowserName: false
4861
},
62+
coverageReporter: {
63+
dir: 'coverage',
64+
reporters: [
65+
{ type: 'cobertura', subdir: '.', file: 'cobertura-coverage.xml' },
66+
{ type: 'html', subdir: 'html' }
67+
]
68+
},
69+
karmaTypescriptConfig: {
70+
tsconfig: './tsconfig.test.json',
71+
reports: {
72+
"cobertura": {
73+
"directory": "coverage",
74+
"filename": "cobertura-coverage.xml"
75+
},
76+
"html": "coverage/html"
77+
}
78+
},
4979
retryLimit: 0,
5080
logLevel: argv.debug ? config.LOG_DEBUG : config.LOG_INFO,
5181
client: {

package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "powerbi-client",
3-
"version": "2.23.1",
3+
"version": "2.23.10",
44
"description": "JavaScript library for embedding Power BI into your apps. Provides service which makes it easy to embed different types of components and an object model which allows easy interaction with these components such as changing pages, applying filters, and responding to data selection.",
55
"main": "dist/powerbi.js",
66
"types": "dist/powerbi-client.d.ts",
@@ -46,8 +46,8 @@
4646
"gulp": "^4.0.2",
4747
"gulp-eslint": "^6.0.0",
4848
"gulp-flatten": "^0.4.0",
49-
"gulp-prepend": "^0.3.0",
5049
"gulp-help-four": "^0.2.3",
50+
"gulp-prepend": "^0.3.0",
5151
"gulp-rename": "^1.2.2",
5252
"gulp-replace": "^0.5.4",
5353
"gulp-typedoc": "^2.0.0",
@@ -59,13 +59,16 @@
5959
"jasmine-core": "3.10.1",
6060
"jquery": "^3.3.1",
6161
"json-loader": "^0.5.4",
62-
"karma": "^6.3.5",
62+
"karma": "^6.4.4",
6363
"karma-chrome-launcher": "^3.1.0",
64+
"karma-coverage": "~2.0.3",
6465
"karma-firefox-launcher": "^1.2.0",
6566
"karma-jasmine": "4.0.1",
6667
"karma-jasmine-html-reporter": "1.7.0",
6768
"karma-junit-reporter": "^2.0.1",
6869
"karma-spec-reporter": "0.0.32",
70+
"karma-typescript": "^5.5.4",
71+
"puppeteer": "^24.26.0",
6972
"ts-loader": "^6.2.2",
7073
"typedoc": "^0.23.23",
7174
"typescript": "~4.6.0",
@@ -74,13 +77,10 @@
7477
"yargs": "^16.1.0"
7578
},
7679
"dependencies": {
77-
"http-post-message": "^0.2",
78-
"powerbi-models": "^1.14.0",
80+
"http-post-message": "^0.3.0",
81+
"powerbi-models": "^2.0.1",
7982
"powerbi-router": "^0.1",
80-
"window-post-message-proxy": "^0.2.7"
81-
},
82-
"publishConfig": {
83-
"tag": "beta"
83+
"window-post-message-proxy": "^0.3.0"
8484
},
8585
"overrides": {
8686
"glob-parent": "^6.0.2",

src/config.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
// Copyright (c) Microsoft Corporation.
2-
// Licensed under the MIT License.
3-
4-
/** @ignore *//** */
5-
const config = {
6-
version: '2.23.1',
7-
type: 'js'
8-
};
9-
10-
export default config;
1+
// Copyright (c) Microsoft Corporation.
2+
// Licensed under the MIT License.
3+
4+
/** @ignore *//** */
5+
const config = {
6+
version: '2.23.10',
7+
type: 'js'
8+
};
9+
10+
export default config;

src/util.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const allowedPowerBiHostsRegex =
1212
/**
1313
* @hidden
1414
*/
15-
const allowedPowerBiHostsSovRegex = new RegExp(/^app\.powerbi\.cn$|^app(\.mil\.|\.high\.|\.)powerbigov\.us$|^app\.powerbi\.eaglex\.ic\.gov$|^app\.powerbi\.microsoft\.scloud$/);
15+
const allowedPowerBiHostsSovRegex = new RegExp(/^app\.powerbi\.cn$|^app(\.mil\.|\.canaryhigh\.|\.high\.|\.)powerbigov\.us$|^app\.powerbi\.eaglex\.ic\.gov$|^app\.powerbi\.microsoft\.scloud$/);
1616

1717
/**
1818
* @hidden

0 commit comments

Comments
 (0)