Skip to content

Commit

Permalink
Working yarn workspace build
Browse files Browse the repository at this point in the history
  • Loading branch information
rathboma committed Jun 11, 2021
1 parent 4870119 commit 18ccc5a
Show file tree
Hide file tree
Showing 6 changed files with 15,320 additions and 38 deletions.
6 changes: 1 addition & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
"license": "MIT",
"private": true,
"workspaces": {
"packages": ["packages/*"],
"nohoist": [
"**/**",
"**/**/**"
]
"packages": ["packages/*"]
}
}
24 changes: 12 additions & 12 deletions packages/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -103,14 +103,14 @@
"@types/pg": "^7.14.7",
"@types/sql-formatter": "^2.3.0",
"@types/tabulator-tables": "^4.7.2",
"@typescript-eslint/eslint-plugin": "^4.1.0",
"@typescript-eslint/parser": "^4.1.0",
"@vue/cli-plugin-babel": "^4.1.2",
"@vue/cli-plugin-eslint": "^4.1.2",
"@vue/cli-plugin-typescript": "~4.5.4",
"@vue/cli-plugin-unit-jest": "~4.4.0",
"@vue/cli-service": "^4.1.2",
"@vue/eslint-config-typescript": "^5.0.2",
"@typescript-eslint/eslint-plugin": "^4.18.0",
"@typescript-eslint/parser": "^4.18.0",
"@vue/cli-plugin-babel": "~4.5.0",
"@vue/cli-plugin-eslint": "~4.5.0",
"@vue/cli-plugin-typescript": "~4.5.0",
"@vue/cli-plugin-unit-jest": "~4.5.0",
"@vue/cli-service": "~4.5.0",
"@vue/eslint-config-typescript": "^7.0.0",
"@vue/test-utils": "^1.0.3",
"aws-sdk": "^2.645.0",
"babel-eslint": "^10.0.1",
Expand All @@ -120,13 +120,13 @@
"electron-download": "^4.1.1",
"electron-rebuild": "^1.8.5",
"electron-updater": "^4.2.5",
"eslint": "^5.16.0",
"eslint-plugin-vue": "^5.0.0",
"eslint": "^6.7.2",
"eslint-plugin-vue": "^6.2.2",
"sqlite3": "^5.0.2",
"testcontainers": "^4.6.0",
"typescript": "^3.9.7",
"typescript": "~4.1.5",
"vue-cli-plugin-electron-builder": "^2.0.0",
"vue-template-compiler": "^2.6.10",
"vue-template-compiler": "^2.6.11",
"vuepress": "^1.5.0"
},
"eslintConfig": {
Expand Down
21 changes: 0 additions & 21 deletions packages/app/src/common/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,9 @@ import fs from 'fs';
import {homedir} from 'os';
import path from 'path';
import mkdirp from 'mkdirp';
import envPaths from 'env-paths';
import { Error as CustomError } from '../lib/errors'


let configPath = '';

export function getConfigPath() {
if (configPath) {
return configPath;
}

const configName = 'sqlectron.json';
const oldConfigPath = path.join(homedir(), `.${configName}`);

if (fileExistsSync(oldConfigPath)) {
configPath = oldConfigPath;
} else {
const newConfigDir = envPaths('Sqlectron', { suffix: '' }).config;
configPath = path.join(newConfigDir, configName);
}

return configPath;
}

export function fileExists(filename: string) {
return new Promise((resolve) => {
fs.stat(filename, (err, stats) => {
Expand Down
3 changes: 3 additions & 0 deletions packages/app/vue.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ const externals = ['better-sqlite3', 'sequelize', 'typeorm', 'reflect-metadata',
module.exports = {
pluginOptions: {
electronBuilder: {
nodeModulesPath: ['./node_modules', '../../node_modules'],
chainWebpackMainProcess: config => {
config.module
.rule('babel')
Expand All @@ -32,6 +33,8 @@ module.exports = {
plugins: [
['@babel/plugin-proposal-decorators', {legacy: true}],
['@babel/plugin-proposal-class-properties', {loose: true}],
['@babel/plugin-proposal-private-methods', { loose: true }],
['@babel/plugin-proposal-private-property-in-object', { loose: true }],
]
})
},
Expand Down
1 change: 1 addition & 0 deletions postcss.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = {}
Loading

0 comments on commit 18ccc5a

Please sign in to comment.