Skip to content

Commit

Permalink
Task 9901543: Remediate security vulnerabilities
Browse files Browse the repository at this point in the history 
Task 9901523: Open Source Security Review
- Remove Legacy Code from master
  • Loading branch information
@MSNev
MSNev committed Jun 22, 2021
1 parent c729655 commit 99b9dc4
Show file tree
Hide file tree
Showing 246 changed files with 226 additions and 54,022 deletions.
4 changes: 0 additions & 4 deletions .travis/test_legacy.sh
View file

This file was deleted.

1 change: 0 additions & 1 deletion AISKU/Tests/tsconfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
"target": "es5",
"alwaysStrict": true,
"declaration": true,
"rootDir": "AISKU",
"out": "Tests/Selenium/appinsights-sdk.tests.js"
},
"include": [
Expand Down
2 changes: 1 addition & 1 deletion AISKU/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"grunt": "^1.3.0",
"grunt-cli": "^1.3.2",
"grunt-contrib-qunit": "^3.1.0",
"grunt-ts": "^6.0.0-beta.22",
"@nevware21/grunt-ts-plugin": "^0.2.2",
"grunt-tslint": "^5.0.2",
"globby": "^11.0.0",
"magic-string": "^0.25.7",
Expand Down
2 changes: 1 addition & 1 deletion AISKULight/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"grunt-cli": "^1.3.2",
"grunt-contrib-qunit": "^3.1.0",
"grunt-run": "^0.8.1",
"grunt-ts": "^6.0.0-beta.22",
"@nevware21/grunt-ts-plugin": "^0.2.2",
"globby": "^11.0.0",
"magic-string": "^0.25.7",
"@rollup/plugin-commonjs": "^15.1.0",
Expand Down
2 changes: 1 addition & 1 deletion channels/applicationinsights-channel-js/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"grunt-cli": "^1.3.2",
"grunt-contrib-qunit": "^3.1.0",
"grunt-run": "^0.8.1",
"grunt-ts": "^6.0.0-beta.22",
"@nevware21/grunt-ts-plugin": "^0.2.2",
"globby": "^11.0.0",
"magic-string": "^0.25.7",
"@rollup/plugin-commonjs": "^15.1.0",
Expand Down
2 changes: 1 addition & 1 deletion common/Tests/Framework/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"@types/sinon": "4.3.3",
"grunt": "^1.3.0",
"grunt-contrib-qunit": "^3.1.0",
"grunt-ts": "^6.0.0-beta.22",
"@nevware21/grunt-ts-plugin": "^0.2.2",
"tslint": "^5.19.0",
"tslint-config-prettier": "^1.18.0",
"tslint-microsoft-contrib": "^5.2.1",
Expand Down
3,177 changes: 168 additions & 3,009 deletions common/config/rush/npm-shrinkwrap.json
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion extensions/applicationinsights-analytics-js/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"grunt-cli": "^1.3.2",
"grunt-contrib-qunit": "^3.1.0",
"grunt-run": "^0.8.1",
"grunt-ts": "^6.0.0-beta.22",
"@nevware21/grunt-ts-plugin": "^0.2.2",
"tslint": "^5.19.0",
"tslint-config-prettier": "^1.18.0",
"qunit": "^2.9.1",
Expand Down
2 changes: 1 addition & 1 deletion extensions/applicationinsights-clickanalytics-js/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"grunt-cli": "^1.3.2",
"grunt-contrib-qunit": "^3.1.0",
"grunt-run": "^0.8.1",
"grunt-ts": "^6.0.0-beta.22",
"@nevware21/grunt-ts-plugin": "^0.2.2",
"tslint": "^5.19.0",
"tslint-config-prettier": "^1.18.0"
},
Expand Down
2 changes: 1 addition & 1 deletion extensions/applicationinsights-debugplugin-js/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"grunt-cli": "^1.3.2",
"grunt-contrib-qunit": "^3.1.0",
"grunt-run": "^0.8.1",
"grunt-ts": "^6.0.0-beta.22",
"@nevware21/grunt-ts-plugin": "^0.2.2",
"globby": "^11.0.0",
"magic-string": "^0.25.7",
"@rollup/plugin-commonjs": "^15.1.0",
Expand Down
2 changes: 1 addition & 1 deletion extensions/applicationinsights-dependencies-js/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"grunt-cli": "^1.3.2",
"grunt-contrib-qunit": "^3.1.0",
"grunt-run": "^0.8.1",
"grunt-ts": "^6.0.0-beta.22",
"@nevware21/grunt-ts-plugin": "^0.2.2",
"globby": "^11.0.0",
"magic-string": "^0.25.7",
"@rollup/plugin-commonjs": "^15.1.0",
Expand Down
2 changes: 1 addition & 1 deletion extensions/applicationinsights-properties-js/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"grunt-cli": "^1.3.2",
"grunt-contrib-qunit": "^3.1.0",
"grunt-run": "^0.8.1",
"grunt-ts": "^6.0.0-beta.22",
"@nevware21/grunt-ts-plugin": "^0.2.2",
"globby": "^11.0.0",
"magic-string": "^0.25.7",
"pako":"^2.0.3",
Expand Down
2 changes: 1 addition & 1 deletion extensions/applicationinsights-react-native/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"grunt-contrib-qunit": "^3.1.0",
"grunt-contrib-uglify": "3.1.0",
"grunt-run": "^0.8.1",
"grunt-ts": "^6.0.0-beta.22",
"@nevware21/grunt-ts-plugin": "^0.2.2",
"grunt-tslint": "^5.0.2",
"qunit": "^2.11.2",
"react": "16.13.1",
Expand Down
109 changes: 5 additions & 104 deletions gruntfile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,11 @@ module.exports = function (grunt) {
},
ts: {
options: {
comments: true
comments: true,
debug: true
},
default: {
tsconfig: './tsconfig.json',
src: [
'legacy/JavaScript/JavaScriptSDK.Interfaces/*.ts',
'legacy/JavaScript/JavaScriptSDK/*.ts',
],
out: 'legacy/bundle/ai.js',
},
core: {
tsconfig: './shared/AppInsightsCore/tsconfig.json'
Expand Down Expand Up @@ -108,7 +104,7 @@ module.exports = function (grunt) {
},
propertiestests: {
tsconfig: './extensions/applicationinsights-properties-js/Tests/tsconfig.json',
src: './extensions/applicationinsights-properties-js/Tests/**/*.ts',
src: [ './extensions/applicationinsights-properties-js/Tests/**/*.ts' ],
out: './extensions/applicationinsights-properties-js/Tests/Selenium/prop.tests.js'
},
reactnative: {
Expand All @@ -119,7 +115,7 @@ module.exports = function (grunt) {
},
reactnativetests: {
tsconfig: './extensions/applicationinsights-react-native/Tests/tsconfig.json',
src: './extensions/applicationinsights-react-native/Tests/**/*.ts',
src: [ './extensions/applicationinsights-react-native/Tests/**/*.ts' ],
out: './extensions/applicationinsights-react-native/Tests/Selenium/reactnativeplugin.tests.js'
},
deps: {
Expand Down Expand Up @@ -189,89 +185,8 @@ module.exports = function (grunt) {
'./common/Tests/Framework/src/*.ts'
]
},
module: {
// Use a different tsconfig for building module in order to not generate a declaration file for module, while keeping declaration for other modules
tsconfig: './tsconfigmodule.json',
src: [
'legacy/JavaScript/JavaScriptSDK.Interfaces/*.ts',
'legacy/JavaScript/JavaScriptSDK.Module/*.ts',
],
out: 'legacy/bundle/ai.module.js'
},
types: {
tsconfig: './tsconfig.json',
src: [
'legacy/JavaScript/JavaScriptSDK.Tests/DefinitionTypes/*.ts'
],
out: 'legacy/bundle/test/ai.types.js'
},
test: {
tsconfig: './tsconfig.json',
src: [
'legacy/JavaScript/JavaScriptSDK.Tests/Selenium/*.ts'
],
out: 'legacy/JavaScript/JavaScriptSDK.Tests/Selenium/ai.tests.js'
},
testSchema: {
tsconfig: './tsconfig.json',
src: [
'legacy/JavaScript/JavaScriptSDK.Tests/Contracts/Generated/*.ts'
],
out: 'legacy/bundle/test/ai.schema.tests.js'
},
testE2E: {
tsconfig: './tsconfig.json',
files: [
{
src: 'legacy/JavaScript/JavaScriptSDK.Tests/E2ETests/DisableTelemetry.tests.ts',
dest: 'legacy/bundle/test/e2e/DisableTelemetry.tests.js'
},
{
src: 'legacy/JavaScript/JavaScriptSDK.Tests/E2ETests/PublicApi.tests.ts',
dest: 'legacy/bundle/test/e2e/PublicApiTests.tests.js'
},
{
src: 'legacy/JavaScript/JavaScriptSDK.Tests/E2ETests/SanitizerE2E.tests.ts',
dest: 'legacy/bundle/test/e2e/SanitizerE2E.tests.js'
},
{
src: 'legacy/JavaScript/JavaScriptSDK.Tests/E2ETests/SenderE2E.tests.ts',
dest: 'legacy/bundle/test/e2e/SenderE2E.tests.js'
},
{
src: 'legacy/JavaScript/JavaScriptSDK.Tests/E2ETests/Snippet.tests.ts',
dest: 'legacy/bundle/test/e2e/Snippet.tests.js'
},
{
src: 'legacy/JavaScript/JavaScriptSDK.Tests/E2ETests/ValidateApi.tests.ts',
dest: 'legacy/bundle/test/e2e/ValidateApi.tests.js'
}
],
outDir: 'legacy/bundle/test/e2e'
}
},
uglify: {
ai: {
files: {
'legacy/bundle/ai.0.js': ['legacy/bundle/ai.js'],
},
options: {
sourceMap: true,
sourceMapIncludeSources: true,
sourceMapIn: 'legacy/bundle/ai.js.map',
compress: {
ie8: true
},
mangle: {
ie8: true
}
},
},
snippet: {
files: {
'legacy/bundle/snippet/snippet.min.js': ['legacy/JavaScript/JavaScriptSDK/snippet.js']
}
},
snippetvNext: {
files: {
'AISKU/snippet/snippet.min.js': ['AISKU/snippet/snippet.js']
Expand All @@ -292,20 +207,6 @@ module.exports = function (grunt) {
qunit: {
all: {
options: {
urls: [
'legacy/JavaScript/JavaScriptSDK.Tests/Selenium/Tests.html',
'legacy/JavaScript/JavaScriptSDK.Tests/Contracts/Schema.tests.htm',
'legacy/JavaScript/JavaScriptSDK.Tests/E2ETests/E2E.DisableTelemetry.tests.htm',
'legacy/JavaScript/JavaScriptSDK.Tests/E2ETests/E2E.PublicApi.tests.htm',
'legacy/JavaScript/JavaScriptSDK.Tests/E2ETests/E2E.SanitizerE2E.tests.htm',
'legacy/JavaScript/JavaScriptSDK.Tests/E2ETests/E2E.Sender.tests.htm',
'legacy/JavaScript/JavaScriptSDK.Tests/E2ETests/E2E.snippetTests.htm',
'legacy/JavaScript/JavaScriptSDK.Tests/E2ETests/E2E.ValidateApi.tests.htm'
],
timeout: 300 * 1000, // 5 min
console: false,
summaryOnly: true,
'--web-security': 'false' // we need this to allow CORS requests in PhantomJS
}
},
core: {
Expand Down Expand Up @@ -444,7 +345,7 @@ module.exports = function (grunt) {
grunt.log.ok('Running test: ' + name);
});

grunt.loadNpmTasks("grunt-ts");
grunt.loadNpmTasks("@nevware21/grunt-ts-plugin");
grunt.loadNpmTasks('grunt-tslint');
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-qunit');
Expand Down
Loading

0 comments on commit 99b9dc4

Please sign in to comment.