Skip to content

Commit

Permalink
chore(web): fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
moughxyz committed Jul 6, 2022
1 parent e6859d4 commit d315c8c
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 12 deletions.
17 changes: 9 additions & 8 deletions packages/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,23 @@
"dist"
],
"scripts": {
"start": "webpack-dev-server --config web.webpack.dev.js",
"watch": "webpack -w --config web.webpack.dev.js",
"clean": "rm -fr dist",
"prebuild": "yarn clean",
"build": "webpack --config web.webpack.prod.js && yarn tsc",
"lint": "eslint src/javascripts",
"clean": "rm -fr dist",
"format": "prettier --write src/javascripts",
"tsc": "tsc --project tsconfig.json",
"lint": "eslint src/javascripts",
"prebuild": "yarn clean",
"start": "webpack-dev-server --config web.webpack.dev.js",
"test": "jest --config jest.config.js --coverage",
"upgrade:snjs": "ncu -u '@standardnotes/*'"
"tsc": "tsc --project tsconfig.json",
"upgrade:snjs": "ncu -u '@standardnotes/*'",
"watch": "webpack -w --config web.webpack.dev.js"
},
"devDependencies": {
"@babel/core": "*",
"@babel/plugin-transform-react-jsx": "^7.17.3",
"@babel/preset-env": "*",
"@babel/preset-typescript": "^7.16.7",
"@types/jest": "^27.4.1",
"@types/jest": "^27.5.1",
"@types/react": "^17.0.42",
"@types/react-dom": "^18.0.5",
"@types/wicg-file-system-access": "^2020.9.5",
Expand All @@ -41,6 +41,7 @@
"html-webpack-plugin": "^5.5.0",
"identity-obj-proxy": "^3.0.0",
"jest": "^27.5.1",
"jest-environment-jsdom": "^27.5.1",
"lint-staged": ">=12",
"mini-css-extract-plugin": "^2.6.0",
"node-sass": "*",
Expand Down
3 changes: 2 additions & 1 deletion packages/web/src/javascripts/Services/AlertService.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { AlertService, ButtonType, sanitizeHtmlString } from '@standardnotes/snjs'
import { AlertService, ButtonType } from '@standardnotes/services'
import { sanitizeHtmlString } from '@standardnotes/utils'
import { SKAlert } from '@standardnotes/styles'

/** @returns a promise resolving to true if the user confirmed, false if they canceled */
Expand Down
2 changes: 1 addition & 1 deletion packages/web/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"declarationDir": "dist/@types",
"baseUrl": ".",
"jsx": "react-jsx",
"typeRoots": ["./src/javascripts/Types/External", "../../node_modules/@types"],
"typeRoots": ["./src/javascripts/Types/External", "../../node_modules/@types", "node_modules/@types"],
"paths": {
"@/*": ["./src/javascripts/*"],
"@Controllers/*": ["src/javascripts/Controllers/*"],
Expand Down
5 changes: 3 additions & 2 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7504,7 +7504,7 @@ __metadata:
"@standardnotes/snjs": "workspace:*"
"@standardnotes/styles": "workspace:*"
"@standardnotes/toast": "workspace:*"
"@types/jest": ^27.4.1
"@types/jest": ^27.5.1
"@types/react": ^17.0.42
"@types/react-dom": ^18.0.5
"@types/wicg-file-system-access": ^2020.9.5
Expand All @@ -7521,6 +7521,7 @@ __metadata:
html-webpack-plugin: ^5.5.0
identity-obj-proxy: ^3.0.0
jest: ^27.5.1
jest-environment-jsdom: ^27.5.1
lint-staged: ">=12"
mini-css-extract-plugin: ^2.6.0
mobx: ^6.5.0
Expand Down Expand Up @@ -8386,7 +8387,7 @@ __metadata:
languageName: node
linkType: hard

"@types/jest@npm:^27.4.1":
"@types/jest@npm:^27.4.1, @types/jest@npm:^27.5.1":
version: 27.5.2
resolution: "@types/jest@npm:27.5.2"
dependencies:
Expand Down

0 comments on commit d315c8c

Please sign in to comment.