Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions configs/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@ module.exports = {
commonjs2: "monaco-editor",
amd: "monaco-editor",
},
"firebase/app": {
"firebase/compat/app": {
root: "firebase.app",
commonjs: "firebase/app",
commonjs2: "firebase/app",
amd: "firebase/app",
commonjs: "firebase/compat/app",
commonjs2: "firebase/compat/app",
amd: "firebase/compat/app",
},
"firebase/database": {
"firebase/compat/database": {
root: "firebase.database",
commonjs: "firebase/database",
commonjs2: "firebase/database",
amd: "firebase/database",
commonjs: "firebase/compat/database",
commonjs2: "firebase/compat/database",
amd: "firebase/compat/database",
},
},
module: {
Expand Down
6 changes: 3 additions & 3 deletions examples/firepad-monaco-example.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as monaco from "monaco-editor";
import firebase from "firebase/app";
import "firebase/database";
import "firebase/firestore";
import firebase from "firebase/compat/app";
import "firebase/compat/database";
import "firebase/compat/firestore";

import * as Firepad from "../src";

Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@hackerrank/firepad",
"description": "Collaborative text editing powered by Firebase",
"version": "0.8.5",
"version": "0.9.0-beta",
"author": {
"email": "[email protected]",
"name": "Progyan Bhattacharya",
Expand Down Expand Up @@ -54,7 +54,7 @@
"node": ">= 10.17.0"
},
"peerDependencies": {
"firebase": "8.10.1",
"firebase": "10.0.0",
"monaco-editor": "0.18.1"
},
"dependencies": {
Expand All @@ -73,7 +73,7 @@
"child-process-promise": "2.2.1",
"core-js": "3.11.0",
"css-loader": "5.2.4",
"firebase": "8.10.1",
"firebase": "10.0.0",
"git-format-staged": "2.1.1",
"husky": "^7.0.0",
"jest": "27.0.3",
Expand All @@ -84,7 +84,7 @@
"source-map-loader": "2.0.1",
"style-loader": "2.0.0",
"ts-jest": "27.0.3",
"typescript": "4.2.4",
"typescript": "4.9.5",
"webpack": "5.34.0",
"webpack-cli": "4.6.0",
"webpack-dev-server": "3.11.2"
Expand Down
4 changes: 2 additions & 2 deletions src/firebase-adapter.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import "firebase/database";
import "firebase/compat/database";

import firebase from "firebase/app";
import firebase from "firebase/compat/app";

import { CursorType, ICursor } from "./cursor";
import {
Expand Down
2 changes: 1 addition & 1 deletion src/firepad-classic.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import firebase from "firebase";
import firebase from "firebase/compat/app";

import * as monaco from "monaco-editor";

Expand Down
2 changes: 1 addition & 1 deletion src/firepad-monaco.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as monaco from "monaco-editor";
import { v4 as uuid } from "uuid";
import firebase from "firebase/app";
import firebase from "firebase/compat/app";

import { IDatabaseAdapter, UserIDType } from "./database-adapter";
import { FirebaseAdapter } from "./firebase-adapter";
Expand Down
4 changes: 2 additions & 2 deletions src/firestore-adapter.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import "firebase/database";
import "firebase/compat/database";

import firebase from "firebase/app";
import firebase from "firebase/compat/app";

import { CursorType, ICursor } from "./cursor";
import {
Expand Down
2 changes: 1 addition & 1 deletion test/factory/database-adapter.factory.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import firebase from "firebase/app";
import firebase from "firebase/compat/app";
import { ICursor } from "../../src/cursor";
import {
DatabaseAdapterCallbackType,
Expand Down
2 changes: 1 addition & 1 deletion test/firepad-monaco.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { editor } from "monaco-editor";
import { fromMonaco } from "../src/firepad-monaco";
import { getDatabaseAdapter, getEditorAdapter } from "./factory";
import { getMonacoEditor } from "./factory/monaco-editor.factory";
import firebase from "firebase/app";
import firebase from "firebase/compat/app";

jest.mock("../src/firebase-adapter", () => {
const { getDatabaseAdapter } = require("./factory/database-adapter.factory");
Expand Down
Loading