Skip to content

Commit 1759074

Browse files
klishevichklishevich
committed
revert erroneous merge commit
1 parent e7c3e20 commit 1759074

133 files changed

Lines changed: 8087 additions & 16919 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎BoilerPlates/angular/angular.json‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,5 @@
8989
}
9090
}
9191
}
92-
},
93-
"cli": {
94-
"analytics": false
9592
}
9693
}

‎BoilerPlates/angular/package-lock.json‎

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

‎BoilerPlates/angular/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"@angular/platform-browser": "^22.1.0-next.0",
2929
"@angular/router": "^22.1.0-next.0",
3030
"rxjs": "~7.8.0",
31-
"scichart": "6.0.0-alpha.145",
31+
"scichart": "^5.0.0-alpha.135",
3232
"tslib": "^2.3.0",
3333
"zone.js": "~0.15.0"
3434
},

‎BoilerPlates/electron/package-lock.json‎

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

‎BoilerPlates/electron/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"dependencies": {
4040
"copy-webpack-plugin": "^14.0.0",
4141
"electron-squirrel-startup": "^1.0.0",
42-
"scichart": "6.0.0-alpha.145"
42+
"scichart": "^5.2.62"
4343
},
4444
"overrides": {
4545
"cross-spawn": "^7.0.6"

‎BoilerPlates/javascript/package-lock.json‎

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

‎BoilerPlates/javascript/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616
"webpack-dev-server": "^5.2.5"
1717
},
1818
"dependencies": {
19-
"scichart": "6.0.0-alpha.145"
19+
"scichart": "^5.0.0-alpha.135"
2020
}
2121
}

‎BoilerPlates/next/next-env.d.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/// <reference types="next" />
22
/// <reference types="next/image-types/global" />
3-
import "./.next/types/routes.d.ts";
43

54
// NOTE: This file should not be edited
6-
// see https://nextjs.org/docs/pages/api-reference/config/typescript for more information.
5+
// see https://nextjs.org/docs/pages/building-your-application/configuring/typescript for more information.

‎BoilerPlates/next/package-lock.json‎

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

‎BoilerPlates/next/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"next": "^16.2.9",
1313
"react": "^18.2.0",
1414
"react-dom": "^18.2.0",
15-
"scichart": "6.0.0-alpha.145"
15+
"scichart": "^5.0.0-alpha.135"
1616
},
1717
"devDependencies": {
1818
"@types/node": "^18.15.10",

0 commit comments

Comments
 (0)