Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tslib v1.13.0 has breaking change #1269 #1277

Merged
merged 1 commit into from Jun 1, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -22,6 +22,7 @@
# MSTest test Results
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*
report.*.json

*_i.c
*_p.c
Expand Down
28 changes: 3 additions & 25 deletions AISKU/Tests/Selenium/Tests.html
Expand Up @@ -17,16 +17,6 @@
<div id="qunit"></div>
<div id="qunit-fixture"></div>
<script>
function getParameterByName(name, url) {
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved to module loader script

if (!url) url = window.location.href;
name = name.replace(/[\[\]]/g, '\\$&');
var regex = new RegExp('[?&]' + name + '(=([^&#]*)|&|#|$)'),
results = regex.exec(url);
if (!results) return null;
if (!results[2]) return '';
return decodeURIComponent(results[2].replace(/\+/g, ' '));
}

var modules = new ModuleLoader({
baseUrl: '../../',
paths: {
Expand All @@ -39,22 +29,10 @@
// Load qunit here instead of with tests, otherwise will not work
modules.add("qunit");

// Load whatwg-fetch
modules.add("whatwg-fetch").afterLoad = function (polyFetch) {
window.fetch = window.fetch || polyFetch.fetch;
window.Headers = window.Headers || polyFetch.Headers;
window.Response = window.Response || polyFetch.Response;
window.Request = window.Request || polyFetch.Request;
window.Promise = window.Promise || SimpleSyncPromise;
loadFetchModule(modules, "whatwg-fetch");

var usePolyFetch = getParameterByName("polyFetch");
if (usePolyFetch) {
window.fetch = polyFetch.fetch;
window.Headers = polyFetch.Headers;
window.Response = polyFetch.Response;
window.Request = polyFetch.Request;
}
};
// Load and define the app insights Shims module
modules.add("@microsoft/applicationinsights-shims", "./node_modules/@microsoft/applicationinsights-shims/browser/applicationinsights-shims");

// Load Core
modules.add("@microsoft/applicationinsights-core-js", "./node_modules/@microsoft/applicationinsights-core-js/browser/applicationinsights-core-js");
Expand Down
4 changes: 2 additions & 2 deletions AISKU/package.json
Expand Up @@ -51,13 +51,13 @@
},
"dependencies": {
"@microsoft/dynamicproto-js": "^0.5.2",
"@microsoft/applicationinsights-shims" : "1.0.0",
"@microsoft/applicationinsights-analytics-js": "2.5.4",
"@microsoft/applicationinsights-channel-js": "2.5.4",
"@microsoft/applicationinsights-common": "2.5.4",
"@microsoft/applicationinsights-core-js": "2.5.4",
"@microsoft/applicationinsights-dependencies-js": "2.5.4",
"@microsoft/applicationinsights-properties-js": "2.5.4",
"tslib": "1.11.2"
"@microsoft/applicationinsights-properties-js": "2.5.4"
},
"license": "MIT"
}
2 changes: 2 additions & 0 deletions AISKU/src/applicationinsights-web.ts
@@ -1,3 +1,5 @@
import '@microsoft/applicationinsights-shims';

export {
IApplicationInsights,
Snippet,
Expand Down
2 changes: 1 addition & 1 deletion AISKU/tsconfig.json
Expand Up @@ -9,7 +9,7 @@
"alwaysStrict": true,
"suppressImplicitAnyIndexErrors": true,
"allowSyntheticDefaultImports": true,
"importHelpers": true,
"importHelpers": false,
"noEmitHelpers": true,
"forceConsistentCasingInFileNames": true,
"declaration": true,
Expand Down
1 change: 1 addition & 0 deletions AISKULight/index.ts
@@ -1,6 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

import '@microsoft/applicationinsights-shims';
import {
IConfiguration,
AppInsightsCore,
Expand Down
2 changes: 1 addition & 1 deletion AISKULight/package.json
Expand Up @@ -28,12 +28,12 @@
},
"dependencies": {
"@microsoft/dynamicproto-js": "^0.5.2",
"@microsoft/applicationinsights-shims" : "1.0.0",
"@microsoft/applicationinsights-common": "2.5.4",
"@microsoft/applicationinsights-channel-js": "2.5.4",
"@microsoft/applicationinsights-core-js": "2.5.4"
},
"peerDependencies": {
"tslib": "1.11.2"
},
"license": "MIT"
}
2 changes: 1 addition & 1 deletion AISKULight/tsconfig.json
Expand Up @@ -9,7 +9,7 @@
"alwaysStrict": true,
"suppressImplicitAnyIndexErrors": true,
"allowSyntheticDefaultImports": true,
"importHelpers": true,
"importHelpers": false,
"noEmitHelpers": true,
"forceConsistentCasingInFileNames": true,
"declaration": true,
Expand Down