From 805cb777d4b07a58951fe50f0831d2e4cb667c19 Mon Sep 17 00:00:00 2001 From: anandamarsh Date: Mon, 16 Oct 2023 21:30:13 -0700 Subject: [PATCH] no brainer :) (#38) --- scripthaus.md | 20 +++++++++---------- src/app/common/themes/themes.less | 5 +++-- version.js | 2 +- .../webpack.common.js | 0 webpack.dev.js => webpack/webpack.dev.js | 2 +- .../webpack.electron.js | 0 .../webpack.electron.prod.js | 2 +- webpack.prod.js => webpack/webpack.prod.js | 2 +- .../webpack.share.dev.js | 2 +- webpack.share.js => webpack/webpack.share.js | 0 .../webpack.share.prod.js | 2 +- 11 files changed, 19 insertions(+), 18 deletions(-) rename webpack.common.js => webpack/webpack.common.js (100%) rename webpack.dev.js => webpack/webpack.dev.js (95%) rename webpack.electron.js => webpack/webpack.electron.js (100%) rename webpack.electron.prod.js => webpack/webpack.electron.prod.js (95%) rename webpack.prod.js => webpack/webpack.prod.js (96%) rename webpack.share.dev.js => webpack/webpack.share.dev.js (96%) rename webpack.share.js => webpack/webpack.share.js (100%) rename webpack.share.prod.js => webpack/webpack.share.prod.js (96%) diff --git a/scripthaus.md b/scripthaus.md index 9d1b52d02..32457750f 100644 --- a/scripthaus.md +++ b/scripthaus.md @@ -3,25 +3,25 @@ ```bash # @scripthaus command webpack-watch # @scripthaus cd :playbook -node_modules/.bin/webpack --watch --config webpack.dev.js +node_modules/.bin/webpack --watch --config webpack/webpack.dev.js ``` ```bash # @scripthaus command webpack-build # @scripthaus cd :playbook -node_modules/.bin/webpack --config webpack.dev.js +node_modules/.bin/webpack --config webpack/webpack.dev.js ``` ```bash # @scripthaus command webpack-electron-watch # @scripthaus cd :playbook -node_modules/.bin/webpack --watch --config webpack.electron.js +node_modules/.bin/webpack --watch --config webpack/webpack.electron.js ``` ```bash # @scripthaus command webpack-electron-build # @scripthaus cd :playbook -node_modules/.bin/webpack --config webpack.electron.js +node_modules/.bin/webpack --config webpack/webpack.electron.js ``` ```bash @@ -39,25 +39,25 @@ PROMPT_DEV=1 PCLOUD_ENDPOINT="https://ot2e112zx5.execute-api.us-west-2.amazonaws ```bash # @scripthaus command devserver # @scripthaus cd :playbook -node_modules/.bin/webpack-dev-server --config webpack.dev.js --host 0.0.0.0 +node_modules/.bin/webpack-dev-server --config webpack/webpack.dev.js --host 0.0.0.0 ``` ```bash # @scripthaus command webshare-devserver # @scripthaus cd :playbook -node_modules/.bin/webpack-dev-server --config webpack.share.dev.js --host 127.0.0.1 +node_modules/.bin/webpack-dev-server --config webpack/webpack.share.dev.js --host 127.0.0.1 ``` ```bash # @scripthaus command webshare-build # @scripthaus cd :playbook -node_modules/.bin/webpack --config webpack.share.dev.js +node_modules/.bin/webpack --config webpack/webpack.share.dev.js ``` ```bash # @scripthaus command webshare-build-prod # @scripthaus cd :playbook -node_modules/.bin/webpack --config webpack.share.prod.js +node_modules/.bin/webpack --config webpack/webpack.share.prod.js ``` ```bash @@ -78,8 +78,8 @@ node_modules/.bin/tsc --jsx preserve --noEmit --esModuleInterop --target ES5 --e rm -rf dist/ rm -rf bin/ rm -rf build/ -node_modules/.bin/webpack --config webpack.prod.js -node_modules/.bin/webpack --config webpack.electron.prod.js +node_modules/.bin/webpack --config webpack/webpack.prod.js +node_modules/.bin/webpack --config webpack/webpack.electron.prod.js GO_LDFLAGS="-s -w -X main.BuildTime=$(date +'%Y%m%d%H%M')" (cd ../apishell; GOOS=darwin GOARCH=amd64 go build -ldflags="$GO_LDFLAGS" -o ../prompt-client/bin/mshell/mshell-v0.3-darwin.amd64 main-mshell.go) (cd ../apishell; GOOS=darwin GOARCH=arm64 go build -ldflags="$GO_LDFLAGS" -o ../prompt-client/bin/mshell/mshell-v0.3-darwin.arm64 main-mshell.go) diff --git a/src/app/common/themes/themes.less b/src/app/common/themes/themes.less index 46affbd5c..ba4337e74 100644 --- a/src/app/common/themes/themes.less +++ b/src/app/common/themes/themes.less @@ -1,7 +1,7 @@ @base-color: #eceeec; @base-background: rgba(21, 23, 21, 1); @base-background-transparent: rgba(21, 23, 21, 0.7); -@base-background-dev: rgba(21, 23, 21, 0.7); +@base-background-dev: rgba(57, 0, 78, 0.7); @base-border: rgba(241, 246, 243, 0.08); @background-session: rgba(13, 13, 13, 0.85); @background-session-components: rgba(48, 49, 48, 0.6); @@ -57,5 +57,6 @@ @terminal-font: "JetBrains Mono", sans-serif; // to match Github -@markdown-font: -apple-system, BlinkMacSystemFont, "Segoe UI", "Noto Sans", Helvetica, Arial,sans-serif, "Apple Color Emoji", "Segoe UI Emoji"; +@markdown-font: -apple-system, BlinkMacSystemFont, "Segoe UI", "Noto Sans", Helvetica, Arial, sans-serif, + "Apple Color Emoji", "Segoe UI Emoji"; @markdown-highlight: rgb(35, 35, 35); diff --git a/version.js b/version.js index c73424dd8..2f7a35810 100644 --- a/version.js +++ b/version.js @@ -1,2 +1,2 @@ -const VERSION = "v0.4.0"; +const VERSION = "v0.5.0"; module.exports = VERSION; diff --git a/webpack.common.js b/webpack/webpack.common.js similarity index 100% rename from webpack.common.js rename to webpack/webpack.common.js diff --git a/webpack.dev.js b/webpack/webpack.dev.js similarity index 95% rename from webpack.dev.js rename to webpack/webpack.dev.js index 56cd10f6d..e88f2bf88 100644 --- a/webpack.dev.js +++ b/webpack/webpack.dev.js @@ -3,7 +3,7 @@ const merge = require("webpack-merge"); const common = require("./webpack.common.js"); const path = require("path"); const CopyPlugin = require("copy-webpack-plugin"); -const VERSION = require("./version.js"); +const VERSION = require("../version.js"); var merged = merge.merge(common, { mode: "development", diff --git a/webpack.electron.js b/webpack/webpack.electron.js similarity index 100% rename from webpack.electron.js rename to webpack/webpack.electron.js diff --git a/webpack.electron.prod.js b/webpack/webpack.electron.prod.js similarity index 95% rename from webpack.electron.prod.js rename to webpack/webpack.electron.prod.js index 66ea4ab98..6e79d0232 100644 --- a/webpack.electron.prod.js +++ b/webpack/webpack.electron.prod.js @@ -2,7 +2,7 @@ const webpack = require("webpack"); const merge = require("webpack-merge"); const common = require("./webpack.electron.js"); const moment = require("dayjs"); -const VERSION = require("./version.js"); +const VERSION = require("../version.js"); const path = require("path"); function makeBuildStr() { diff --git a/webpack.prod.js b/webpack/webpack.prod.js similarity index 96% rename from webpack.prod.js rename to webpack/webpack.prod.js index 1eb63d3ed..16fafedcf 100644 --- a/webpack.prod.js +++ b/webpack/webpack.prod.js @@ -3,7 +3,7 @@ const merge = require("webpack-merge"); const common = require("./webpack.common.js"); const moment = require("dayjs"); const path = require("path"); -const VERSION = require("./version.js"); +const VERSION = require("../version.js"); function makeBuildStr() { let buildStr = moment().format("YYYYMMDD-HHmmss"); diff --git a/webpack.share.dev.js b/webpack/webpack.share.dev.js similarity index 96% rename from webpack.share.dev.js rename to webpack/webpack.share.dev.js index ac7aa019c..2eb5015dd 100644 --- a/webpack.share.dev.js +++ b/webpack/webpack.share.dev.js @@ -3,7 +3,7 @@ const merge = require("webpack-merge"); const common = require("./webpack.share.js"); const path = require("path"); const CopyPlugin = require("copy-webpack-plugin"); -const VERSION = require("./version.js"); +const VERSION = require("../version.js"); var merged = merge.merge(common, { mode: "development", diff --git a/webpack.share.js b/webpack/webpack.share.js similarity index 100% rename from webpack.share.js rename to webpack/webpack.share.js diff --git a/webpack.share.prod.js b/webpack/webpack.share.prod.js similarity index 96% rename from webpack.share.prod.js rename to webpack/webpack.share.prod.js index 62d03ee05..8bbbeba0c 100644 --- a/webpack.share.prod.js +++ b/webpack/webpack.share.prod.js @@ -3,7 +3,7 @@ const merge = require("webpack-merge"); const common = require("./webpack.share.js"); const moment = require("dayjs"); const path = require("path"); -const VERSION = require("./version.js"); +const VERSION = require("../version.js"); function makeBuildStr() { let buildStr = moment().format("YYYYMMDD-HHmmss");