From f8fbc8823950dd9dc50868496004230d686c0f61 Mon Sep 17 00:00:00 2001 From: Anoop M D Date: Thu, 13 Oct 2022 22:08:36 +0530 Subject: [PATCH] chore: moved next deps to bruno-app package --- package.json | 52 +--------------------------- packages/bruno-app/package.json | 48 ++++++++++++++++++++++++- packages/bruno-electron/package.json | 3 +- packages/bruno-electron/src/index.js | 5 +-- 4 files changed, 50 insertions(+), 58 deletions(-) diff --git a/package.json b/package.json index 1e1495e2..78039b6d 100644 --- a/package.json +++ b/package.json @@ -6,55 +6,5 @@ "packages/bruno-electron", "packages/bruno-tauri", "packages/bruno-testbench" - ], - "dependencies": { - "@fortawesome/fontawesome-svg-core": "^1.2.36", - "@fortawesome/free-solid-svg-icons": "^5.15.4", - "@fortawesome/react-fontawesome": "^0.1.16", - "@reduxjs/toolkit": "^1.8.0", - "@tabler/icons": "^1.46.0", - "@tippyjs/react": "^4.2.6", - "axios": "^0.26.0", - "classnames": "^2.3.1", - "codemirror": "^5.65.2", - "codemirror-graphql": "^1.2.5", - "escape-html": "^1.0.3", - "formik": "^2.2.9", - "graphiql": "^1.5.9", - "graphql": "^16.2.0", - "graphql-request": "^3.7.0", - "idb": "^7.0.0", - "immer": "^9.0.12", - "lodash": "^4.17.21", - "mousetrap": "^1.6.5", - "nanoid": "^3.1.30", - "next": "^12.1.0", - "qs": "^6.11.0", - "react": "^17.0.2", - "react-dom": "^17.0.2", - "react-hot-toast": "^2.4.0", - "react-redux": "^7.2.6", - "react-tabs": "^3.2.3", - "sass": "^1.46.0", - "split-on-first": "^3.0.0", - "styled-components": "^5.3.3", - "tailwindcss": "^2.2.19", - "yup": "^0.32.11" - }, - "devDependencies": { - "@babel/core": "^7.16.0", - "@babel/plugin-transform-spread": "^7.16.7", - "@babel/preset-env": "^7.16.4", - "@babel/preset-react": "^7.16.0", - "@babel/runtime": "^7.16.3", - "babel-loader": "^8.2.3", - "css-loader": "^6.5.1", - "file-loader": "^6.2.0", - "html-loader": "^3.0.1", - "html-webpack-plugin": "^5.5.0", - "mini-css-extract-plugin": "^2.4.5", - "style-loader": "^3.3.1", - "webpack": "^5.64.4", - "webpack-cli": "^4.9.1" - } + ] } diff --git a/packages/bruno-app/package.json b/packages/bruno-app/package.json index d0007ccb..f3b474dd 100644 --- a/packages/bruno-app/package.json +++ b/packages/bruno-app/package.json @@ -2,13 +2,59 @@ "name": "@usebruno/app", "private": true, "scripts": { - "dev": "../../node_modules/.bin/next dev", + "dev": "next dev", "build": "next build", "start": "next start", "lint": "next lint" }, "dependencies": { + "@fortawesome/fontawesome-svg-core": "^1.2.36", + "@fortawesome/free-solid-svg-icons": "^5.15.4", + "@fortawesome/react-fontawesome": "^0.1.16", + "@reduxjs/toolkit": "^1.8.0", + "@tabler/icons": "^1.46.0", + "@tippyjs/react": "^4.2.6", + "axios": "^0.26.0", + "classnames": "^2.3.1", + "codemirror": "^5.65.2", + "codemirror-graphql": "^1.2.5", + "escape-html": "^1.0.3", + "formik": "^2.2.9", + "graphiql": "^1.5.9", + "graphql": "^16.2.0", + "graphql-request": "^3.7.0", + "idb": "^7.0.0", + "immer": "^9.0.12", + "lodash": "^4.17.21", + "mousetrap": "^1.6.5", + "nanoid": "^3.1.30", + "next": "^12.1.0", + "qs": "^6.11.0", + "react": "^17.0.2", + "react-dom": "^17.0.2", + "react-hot-toast": "^2.4.0", + "react-redux": "^7.2.6", + "react-tabs": "^3.2.3", + "sass": "^1.46.0", + "split-on-first": "^3.0.0", + "styled-components": "^5.3.3", + "tailwindcss": "^2.2.19", + "yup": "^0.32.11" }, "devDependencies": { + "@babel/core": "^7.16.0", + "@babel/plugin-transform-spread": "^7.16.7", + "@babel/preset-env": "^7.16.4", + "@babel/preset-react": "^7.16.0", + "@babel/runtime": "^7.16.3", + "babel-loader": "^8.2.3", + "css-loader": "^6.5.1", + "file-loader": "^6.2.0", + "html-loader": "^3.0.1", + "html-webpack-plugin": "^5.5.0", + "mini-css-extract-plugin": "^2.4.5", + "style-loader": "^3.3.1", + "webpack": "^5.64.4", + "webpack-cli": "^4.9.1" } } diff --git a/packages/bruno-electron/package.json b/packages/bruno-electron/package.json index 31f1a89d..bafaa480 100644 --- a/packages/bruno-electron/package.json +++ b/packages/bruno-electron/package.json @@ -4,7 +4,7 @@ "main": "src/index.js", "scripts": { "clean": "rimraf dist", - "start": "electron .", + "dev": "electron .", "build": "next build renderer && next export renderer", "pack-app": "npm run build && electron-builder --dir", "dist": "npm run build && electron-builder" @@ -19,7 +19,6 @@ "dependencies": { "axios": "^0.26.0", "electron-is-dev": "^2.0.0", - "electron-next": "^3.1.5", "electron-util": "^0.17.2", "form-data": "^4.0.0", "lodash": "^4.17.21" diff --git a/packages/bruno-electron/src/index.js b/packages/bruno-electron/src/index.js index 00424a4a..a5832696 100644 --- a/packages/bruno-electron/src/index.js +++ b/packages/bruno-electron/src/index.js @@ -1,6 +1,5 @@ const path = require('path'); const isDev = require('electron-is-dev'); -const prepareNext = require('electron-next'); const { format } = require('url'); const { BrowserWindow, app, Menu } = require('electron'); const { setContentSecurityPolicy } = require('electron-util'); @@ -24,8 +23,6 @@ let mainWindow; // Prepare the renderer once the app is ready app.on('ready', async () => { - await prepareNext('../../packages/bruno-app'); - mainWindow = new BrowserWindow({ width: 1280, height: 768, @@ -37,7 +34,7 @@ app.on('ready', async () => { }); const url = isDev - ? 'http://localhost:8000' + ? 'http://localhost:3000' : format({ pathname: path.join(__dirname, '../packages/bruno-app/out/index.html'), protocol: 'file:',