Skip to content

Commit

Permalink
Merge pull request #15 from simonsobs:dev
Browse files Browse the repository at this point in the history
Update package dependencies
  • Loading branch information
TaiSakuma authored Feb 12, 2024
2 parents 8a01170 + fe8fe21 commit 7a2f25b
Show file tree
Hide file tree
Showing 6 changed files with 1,171 additions and 879 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:18.18-alpine as build
FROM node:20.11-alpine as build

# https://github.com/docker/getting-started/issues/124
RUN apk add --no-cache python3 g++ make
Expand Down Expand Up @@ -29,8 +29,8 @@ COPY docker/env.local .env.local
RUN yarn build


# https://github.com/nginxinc/docker-nginx/tree/1.22.1
FROM nginx:1.22.1
# https://github.com/nginxinc/docker-nginx/tree/1.25.3
FROM nginx:1.25.3

RUN apt-get update && apt-get install -y jq

Expand Down
55 changes: 28 additions & 27 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"name": "nextline-web",
"version": "0.8.15",
"private": true,
"type": "module",
"scripts": {
"dev": "vite",
"serve": "vite preview",
Expand All @@ -13,47 +14,47 @@
"dependencies": {
"@material/material-color-utilities": "^0.2.7",
"@urql/vue": "^1.1.2",
"@vueuse/core": "^10.5.0",
"@vueuse/integrations": "^10.5.0",
"@vueuse/core": "^10.7.2",
"@vueuse/integrations": "^10.7.2",
"canvas": "^2.11.2",
"graphql": "^16.8.1",
"graphql-ws": "^5.14.1",
"monaco-editor": "^0.44.0",
"graphql-ws": "^5.14.3",
"monaco-editor": "^0.46.0",
"path-browserify": "^1.0.1",
"pinia": "^2.1.6",
"vue": "^3.3.4",
"pinia": "^2.1.7",
"vue": "~3.4.18",
"vue-router": "^4.2.5",
"vuetify": "^3.3.21"
"vuetify": "~3.5.3"
},
"devDependencies": {
"@babel/core": "^7.23.0",
"@babel/core": "^7.23.9",
"@graphql-codegen/cli": "5.0.0",
"@graphql-codegen/typescript": "4.0.1",
"@graphql-codegen/typescript-operations": "^4.0.1",
"@graphql-codegen/typescript-vue-urql": "^2.3.6",
"@rollup/plugin-graphql": "^2.0.4",
"@types/node": "~18.18.4",
"@types/path-browserify": "^1.0.0",
"@typescript-eslint/eslint-plugin": "^6.7.4",
"@typescript-eslint/parser": "^6.7.4",
"@vitejs/plugin-vue": "^4.4.0",
"@types/node": "~20.11.17",
"@types/path-browserify": "^1.0.2",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^6.21.0",
"@vitejs/plugin-vue": "^5.0.4",
"@vue/eslint-config-typescript": "^12.0.0",
"@vue/test-utils": "^2.4.1",
"eslint": "^8.51.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-prettier": "^5.0.0",
"eslint-plugin-vue": "^9.17.0",
"@vue/test-utils": "^2.4.4",
"eslint": "^8.56.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-vue": "^9.21.1",
"graphql-tag": "^2.12.6",
"jsdom": "^22.1.0",
"prettier": "^3.0.3",
"rollup": "^4.0.2",
"sass": "^1.69.0",
"ts-node": "^10.9.1",
"type-fest": "^4.4.0",
"jsdom": "^24.0.0",
"prettier": "^3.2.5",
"rollup": "^4.10.0",
"sass": "^1.70.0",
"ts-node": "^10.9.2",
"type-fest": "^4.10.2",
"typescript": "~5.2.2",
"vite": "^4.4.11",
"vite": "~5.1.1",
"vite-plugin-monaco-editor": "^1.1.0",
"vite-plugin-package-version": "^1.0.2",
"vitest": "^0.34.6"
"vite-plugin-package-version": "^1.1.0",
"vitest": "~1.2.2"
}
}
1 change: 1 addition & 0 deletions src/tests/__tests__/example/use-fetch.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ describe("useFetch", () => {
// @ts-expect-error
const createResponse = (data: any): Response => ({
json: () => new Promise((resolve) => resolve(data)),
clone: () => createResponse(data),
ok: true, // https://github.com/vueuse/vueuse/blob/v10.4.1/packages/core/useFetch/index.ts#L471
});

Expand Down
2 changes: 2 additions & 0 deletions src/utils/config/__tests__/load-config.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@ globalThis.fetch = vi.fn();
const createResponse = (data: any) =>
({
json: () => new Promise((resolve) => resolve(data)),
clone: () => createResponse(data),
ok: true,
status: 200,
statusText: "OK",
}) as Response;

const response404 = {
json: () => new Promise((resolve) => resolve({})),
clone: () => response404,
ok: false,
status: 404,
statusText: "Not Found",
Expand Down
18 changes: 17 additions & 1 deletion vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,23 @@ import { defineConfig, loadEnv } from "vite";
import vue from "@vitejs/plugin-vue";
import loadVersion from "vite-plugin-package-version";
import graphql from "@rollup/plugin-graphql";
import monacoEditorPlugin from "vite-plugin-monaco-editor";
// import monacoEditorPlugin from "vite-plugin-monaco-editor";
import monacoEditorPluginModule from "vite-plugin-monaco-editor";

// A temporary fix for the issue on vite-plugin-monaco-editor:
// https://github.com/vdesjs/vite-plugin-monaco-editor/issues/21#issuecomment-1827562674
const isObjectWithDefaultFunction = (
module: unknown
): module is { default: typeof monacoEditorPluginModule } =>
module != null &&
typeof module === "object" &&
"default" in module &&
typeof module.default === "function";

const monacoEditorPlugin = isObjectWithDefaultFunction(monacoEditorPluginModule)
? monacoEditorPluginModule.default
: monacoEditorPluginModule;
//

export default ({ mode }) => {
// loadEnv: https://stackoverflow.com/a/66389044/7309855
Expand Down
Loading

0 comments on commit 7a2f25b

Please sign in to comment.