Skip to content

Commit

Permalink
Merge pull request #439 from viktor44/feature/typescript4
Browse files Browse the repository at this point in the history
Typescript 4.9
  • Loading branch information
viktor44 authored Oct 14, 2024
2 parents 2a65231 + 78ead2e commit aaf367b
Show file tree
Hide file tree
Showing 8 changed files with 3,130 additions and 2,511 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,9 @@ dist/
.cache/
.tsnode-cache/
release/
app/theme/css
packages/app/src/theme/css/
/graphql.config.json
.yarn/install-state.gz

# Yalc (https://github.com/whitecolor/yalc)
.yalc/
Expand Down
Binary file removed .yarn/install-state.gz
Binary file not shown.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "station-project",
"private": true,
"productName": "Station",
"version": "3.1.0-b3",
"version": "3.2.0-b3",
"description": "Station",
"homepage": "https://getstation.com",
"author": {
Expand All @@ -28,7 +28,7 @@
"electron": "./node_modules/.bin/electron"
},
"devDependencies": {
"rimraf": "^3.0.0"
"rimraf": "^5.0.10"
},
"devEngines": {
"node": ">=18.0.0",
Expand Down
23 changes: 11 additions & 12 deletions packages/app/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "station-desktop-app",
"productName": "Station",
"version": "3.1.0-b3",
"version": "3.2.0-b3",
"description": "Station",
"homepage": "https://getstation.com",
"author": {
Expand Down Expand Up @@ -37,7 +37,7 @@
"1password-node": "^3.0.0",
"@babel/plugin-proposal-decorators": "^7.4.4",
"@babel/runtime": "^7.4.3",
"@electron/remote": "^2.0.9",
"@electron/remote": "^2.1.2",
"@getstation/apollo-link-reactive-schema": "^1.0.0",
"@getstation/electron-google-oauth2": "^14.0.0",
"@getstation/fetch-favicon": "^0.0.4-rc.2",
Expand Down Expand Up @@ -69,9 +69,8 @@
"electron-chrome-extension": "https://github.com/viktor44/electron-chrome-extension/releases/download/v6.0.3/release.tar.gz",
"electron-debug": "^3.2.0",
"electron-log": "^2.2.14",
"electron-process-manager": "^1.0.0",
"electron-process-reporter": "1.4.0",
"electron-updater": "^6.1.7",
"electron-process-manager": "https://github.com/viktor44/electron-process-manager/releases/download/v1.1.0/release.tar.gz",
"electron-updater": "^6.2.1",
"electron-window-state": "5.0.3",
"emoji-js": "^3.4.1",
"end-of-stream": "^1.4.1",
Expand Down Expand Up @@ -179,7 +178,7 @@
"transit-js": "^0.8.846",
"ts-assert-exists": "^1.0.5",
"ts-optchain": "^0.1.6",
"tslib": "^2.5.0",
"tslib": "^2.7.0",
"umzug": "^3.2.1",
"umzug-cli": "^3.1.1",
"unused-filename": "^1.0.0",
Expand Down Expand Up @@ -244,7 +243,7 @@
"@types/moment": "^2.13.0",
"@types/mousetrap": "^1.6.11",
"@types/ms": "^0.7.31",
"@types/node": "^14.18.42",
"@types/node": "^18.19.55",
"@types/node-fetch": "^2.6.4",
"@types/node-localstorage": "^1.3.0",
"@types/pluralize": "0.0.27",
Expand Down Expand Up @@ -287,7 +286,7 @@
"css-loader": "^3.2.1",
"electron": "27.3.11",
"electron-builder": "^24.9.1",
"electron-mocha": "^8.1.0",
"electron-mocha": "^12.1.0",
"electron-webpack": "^2.8.2",
"eslint": "^4.18.2",
"eslint-config-airbnb": "^16.1.0",
Expand All @@ -306,7 +305,7 @@
"graphql-import-loader": "^0.2.1",
"html-webpack-plugin": "^4.5.2",
"inquirer": "^6.2.2",
"jest": "^24.9.0",
"jest": "^26.6.3",
"jest-svg-transformer": "^1.0.0",
"jsdom": "^9.8.3",
"kuler": "^2.0.0",
Expand All @@ -323,20 +322,20 @@
"redux-saga-test-plan": "^3.7.0",
"remote-redux-devtools": "0.5.0",
"replace-in-file": "^4.1.3",
"rimraf": "^3.0.0",
"rimraf": "^5.0.10",
"sass": "^1.34.1",
"simple-git": "^1.107.0",
"sinon": "^7.1.1",
"style-loader": "^0.23.1",
"terser-webpack-plugin": "^4.2.3",
"tmp": "0.0.31",
"ts-jest": "^24.3.0",
"ts-jest": "^26.5.6",
"ts-loader": "^6.2.1",
"ts-node": "^8.1.0",
"tslint": "^5.11.0",
"tslint-config-station": "^0.6.0",
"tslint-react": "^3.6.0",
"typescript": "^3.9.4",
"typescript": "^4.9.5",
"webpack": "^4.46.0",
"webpack-cli": "^3.3.12",
"webpack-merge": "^4.2.2",
Expand Down
4 changes: 3 additions & 1 deletion packages/app/src/static/preload/dev-preload.js
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
require('electron-chrome-extension/preload');
if (!process.env.STATION_DISABLE_ECX) {
require('electron-chrome-extension/preload');
}
12 changes: 6 additions & 6 deletions packages/appstore/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"redux": "^4.2.1",
"redux-saga": "^1.2.3",
"string-to-color": "^2.2.2",
"tslib": "^2.5.0",
"tslib": "^2.7.0",
"uuid": "^3.3.3",
"yup": "^0.28.0"
},
Expand Down Expand Up @@ -79,7 +79,7 @@
"@types/jest": "^24.9.1",
"@types/lodash": "^4.14.194",
"@types/memoizee": "^0.4.3",
"@types/node": "^14.18.42",
"@types/node": "^18.19.55",
"@types/prop-types": "^15.7.2",
"@types/ramda": "^0.26.39",
"@types/react": "^16.14.40",
Expand All @@ -102,18 +102,18 @@
"css-loader": "^3.2.1",
"file-loader": "^4.1.0",
"html-webpack-plugin": "^4.5.2",
"jest": "^24.9.0",
"jest": "^26.6.3",
"redux-devtools": "^3.5.0",
"rimraf": "^3.0.0",
"rimraf": "^5.0.10",
"storybook-react-router": "^1.0.8",
"svg-inline-loader": "^0.8.2",
"terser-webpack-plugin": "^4.2.3",
"ts-jest": "^24.3.0",
"ts-jest": "^26.5.6",
"ts-loader": "^6.2.1",
"tslint": "^5.11.0",
"tslint-config-station": "^0.6.0",
"tslint-react": "^3.6.0",
"typescript": "^3.9.4",
"typescript": "^4.9.5",
"webpack": "^4.46.0",
"webpack-cli": "^3.3.12",
"webpack-dev-server": "^3.11.3"
Expand Down
10 changes: 5 additions & 5 deletions packages/sdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,19 @@
"test": "jest --passWithNoTests"
},
"dependencies": {
"tslib": "^2.5.0"
"tslib": "^2.7.0"
},
"devDependencies": {
"@types/jest": "^24.9.1",
"@types/react": "^16.14.40",
"@types/react-dom": "^16.9.18",
"jest": "^24.9.0",
"rimraf": "^3.0.0",
"jest": "^26.6.3",
"rimraf": "^5.0.10",
"rxjs": "^6.6.7",
"ts-jest": "^24.3.0",
"ts-jest": "^26.5.6",
"tslint": "^5.12.1",
"tslint-config-station": "^0.6.0",
"typescript": "^3.9.4"
"typescript": "^4.9.5"
},
"jest": {
"preset": "ts-jest"
Expand Down
Loading

0 comments on commit aaf367b

Please sign in to comment.