From 302696f3a2bce24a559cabc74e37f3816ab5dd23 Mon Sep 17 00:00:00 2001 From: Luk Lu Date: Sat, 10 Dec 2022 19:14:42 +0800 Subject: [PATCH 1/5] update to standard .gitignore --- .gitignore | 105 +++++++++++++++++++++++++++++++++-------------------- server.js | 14 +++---- 2 files changed, 72 insertions(+), 47 deletions(-) diff --git a/.gitignore b/.gitignore index dc3e90b..46bb0da 100644 --- a/.gitignore +++ b/.gitignore @@ -1,63 +1,88 @@ # See https://help.github.com/articles/ignoring-files/ for more about ignoring files. -node_modules/ -/test/unit/coverage/ -/test/e2e/reports/ +### 目录 ################################################################# + +# 通用 .svn/ +.deploy_git/ .idea/ .sass-cache/ -.deploy_git/ +/test/unit/coverage/ +/test/e2e/reports/ +node_modules/ +*.apk +*.min.js +*.min.css +*.min.html +*.iml +*.njsproj +*.ntvs* +*.sw* +*.sln +*.suo .gitattributes -_desktop.ini -.DS_Store -.thumbnails -Thumbs.db -thumbs.db .umi .umi-production npm-debug.log* yarn-debug.log* yarn-error.log* +yarn.lock selenium-debug.log -package-lock.json -*.iml -*.njsproj -*.ntvs* -*.sln -*.suo -._* -.$* -~$* +Thumbs.db +thumbs.db +_desktop.ini -.bashrc_custom +# vue-cli 项目 +/dist/ + +# 来自 vue-cli 创建项目的 .gitignore +.project # hexo -db.json +/public/ -# 客户端 uniapp 项目 -/unpackage/* -!/unpackage/res/ +# Hardhat +/artifacts/ +/cache/ +# seafile 临时文件 +._* + +.$* + +# office 暂存文件 +~$* + +# 用户shell配置脚本 +.bashrc_custom + +# 苹果系统临时文件 +.DS_Store + +# 安卓缓存文件夹 +.thumbnails + +# local env files +.env.local +.env.*.local + +# hexo +/db.json + +# wo +envar-*.gitignore.js +# 服务端 /_archive/* /_datastore/* -/_logstore/* /_filestore/* +/_logstore/* /_webroot/* -/dist/ -*.apk -*.min.js -*.min.css -*.min.html -/pages4loader.json5 -envar-web-custom.js -envar-deploy-secret.js - -# hexo 项目 -public/ - -# 服务端(server or uniapp-uniCloud)项目 -envar-base-custom.js -envar-base-dynamic.js -envar-base-secret.js +/_ssl/* +# uniapp 客户端 +/unpackage/* +!/unpackage/res/ +package-lock.json +pages4loader.json5 +# 保留 !.gitkeep diff --git a/server.js b/server.js index 8362912..cd0796a 100644 --- a/server.js +++ b/server.js @@ -13,15 +13,15 @@ function config () { Config = require('./envar-base-basic.js') console.info('envar-base-basic.js loaded') } - if (fs.existsSync('./envar-base-custom.js')) { + if (fs.existsSync('./envar-base-basic.gitignore.js')) { // 如果存在，覆盖掉 envar-base-basic.js 里的默认参数 - Config = deepmerge(Config, require('./envar-base-custom.js')) // 注意，objectMerge后，产生了一个新的对象，而不是在原来的Config里添加 - console.info('envar-base-custom.js loaded') + Config = deepmerge(Config, require('./envar-base-basic.gitignore.js')) // 注意，objectMerge后，产生了一个新的对象，而不是在原来的Config里添加 + console.info('envar-base-basic.gitignore.js loaded') } - if (fs.existsSync('./envar-base-secret.js')) { - // 如果存在，覆盖掉 envar-base-basic.js 和 envar-base-custom.js 里的参数 - Config = deepmerge(Config, require('./envar-base-secret.js')) - console.info('envar-base-secret.js loaded') + if (fs.existsSync('./envar-base-secret.gitignore.js')) { + // 如果存在，覆盖掉 envar-base-basic.js 和 envar-base-basic.gitignore.js 里的参数 + Config = deepmerge(Config, require('./envar-base-secret.gitignore.js')) + console.info('envar-base-secret.gitignore.js loaded') } } catch (err) { console.error('Loading config files failed: ' + err.message) From b2bb6fcaeabe60213abd8985e03d3c8d497ec3a0 Mon Sep 17 00:00:00 2001 From: Luk Lu Date: Wed, 4 Jan 2023 19:48:41 +0800 Subject: [PATCH 2/5] rename "demo" to "serve-dev", "serve" to "serve-prod" --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 8a5bd87..9ddc857 100644 --- a/package.json +++ b/package.json @@ -6,9 +6,9 @@ "check": "vue-cli-service serve", "create": "vue-cli-service build", "deploy": "node ./node_modules/deployer/deploy.js", - "serve": "cross-env NODE_ENV=production node server.js", - "serve-sup": "cross-env NODE_ENV=production supervisor -i data.log,node_modules,dist -- server.js", - "serve-pm2": "cross-env NODE_ENV=production pm2 start server.js --name vic.admin", + "serve-prod": "cross-env NODE_ENV=production node server.js", + "serve-prod-pm2": "cross-env NODE_ENV=production pm2 start server.js --name vic.admin", + "serve-prod-sup": "cross-env NODE_ENV=production supervisor -i data.log,node_modules,dist -- server.js", "lint": "vue-cli-service lint", "test-unit": "vue-cli-service test:unit" }, From bf6b436ff97fbb989c13fb82f92ed45f6ba877d3 Mon Sep 17 00:00:00 2001 From: Luk Lu Date: Thu, 12 Jan 2023 20:08:06 +0800 Subject: [PATCH 3/5] 'add seafile-ignore.txt to every git repo' --- seafile-ignore.txt | 58 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 seafile-ignore.txt diff --git a/seafile-ignore.txt b/seafile-ignore.txt new file mode 100644 index 0000000..5423f0f --- /dev/null +++ b/seafile-ignore.txt @@ -0,0 +1,58 @@ +# https://help.seafile.com/syncing_client/excluding_files/ +# 注释。通配符：* 匹配0到若干个字符，包括代表目录的/。? 匹配1个字符，包括/。 +# seafile-ignore.txt 只能控制在客户端需要忽略哪些文件。你依然可以在 seahub 的 web 界面创建这些被客户端忽略的文件。 +# 在这种情况下， +# 这些文件会被同步到客户端，但是用户在客户端对这些文件的后续修改会被忽略，不会被同步回服务器。 +# 文件在服务器端的后续更改会被同步到客户端，如果客户端也同时修改了这些文件，系统会生成冲突文件。 +# seafile-ignore.txt 只能忽略还没有被同步的文件。对于已经被同步的文件，如果后来把它添加到 seafile-ignore.txt 中，系统只会忽略后续更改，已经上传的版本不会受影响。 + +# 自定义的后缀名，凡有 sfignore 后缀的都不进行同步 +*.sfignore +*.sfignore/ + +.DS_Store +*/.DS_Store + +.thumbnails +*/.thumbnails + +Thumbs.db +*/Thumbs.db +thumbs.db +*/thumbs.db + +_desktop.ini +*/_desktop.ini + +._* +*/._* + +.$* +*/.$* + +~$* +*/~$* + +node_modules/ +*/node_modules/ +package-lock.json + +pages4loader.json5 + +.svn/ +*/.svn/ + +.deploy_git/ +*/.deploy_git/ + +unpackage/dist/ +*/unpackage/dist/ + +unpackage/release/ +*/unpackage/release/ + +unpackage/cache/ +*/unpackage/cache/ + +Icon +OneDrive/Icon From 3327811b5bec522c00da7ba1718f1af560272ade Mon Sep 17 00:00:00 2001 From: Luk Lu Date: Wed, 8 Mar 2023 21:12:00 +0800 Subject: [PATCH 4/5] rename serve-dev to deving or preping, serve-prod to proding --- package.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 9ddc857..184c49d 100644 --- a/package.json +++ b/package.json @@ -3,12 +3,12 @@ "version": "0.1.0", "private": true, "scripts": { - "check": "vue-cli-service serve", - "create": "vue-cli-service build", + "deving": "vue-cli-service serve", + "make": "vue-cli-service build", "deploy": "node ./node_modules/deployer/deploy.js", - "serve-prod": "cross-env NODE_ENV=production node server.js", - "serve-prod-pm2": "cross-env NODE_ENV=production pm2 start server.js --name vic.admin", - "serve-prod-sup": "cross-env NODE_ENV=production supervisor -i data.log,node_modules,dist -- server.js", + "proding": "cross-env NODE_ENV=production node server.js", + "proding-pm2": "cross-env NODE_ENV=production pm2 start server.js --name vic.admin", + "proding-sup": "cross-env NODE_ENV=production supervisor -i data.log,node_modules,dist -- server.js", "lint": "vue-cli-service lint", "test-unit": "vue-cli-service test:unit" }, From 5e1aeada96f681d9c62b65d3bfda34a1a4c83da4 Mon Sep 17 00:00:00 2001 From: Luk Lu Date: Sat, 11 Mar 2023 08:25:44 +0800 Subject: [PATCH 5/5] update .gitignore to ignore *.gitignore.* instead of envar-*.gitignore.js --- .gitignore | 2 +- seafile-ignore.txt | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 46bb0da..cb4fce5 100644 --- a/.gitignore +++ b/.gitignore @@ -70,7 +70,7 @@ _desktop.ini /db.json # wo -envar-*.gitignore.js +*.gitignore.* # 服务端 /_archive/* /_datastore/* diff --git a/seafile-ignore.txt b/seafile-ignore.txt index 5423f0f..16e5988 100644 --- a/seafile-ignore.txt +++ b/seafile-ignore.txt @@ -8,7 +8,9 @@ # 自定义的后缀名，凡有 sfignore 后缀的都不进行同步 *.sfignore +*.sfignore.* *.sfignore/ +*.sfignore.*/ .DS_Store */.DS_Store