From 17ad007d404ac0d1f7628db7ce97a71be4995bdf Mon Sep 17 00:00:00 2001 From: Pig Fang Date: Fri, 30 Oct 2020 10:11:50 +0800 Subject: [PATCH] scripts -> tools --- .dockerignore | 2 +- .github/CONTRIBUTING.md | 2 +- .github/workflows/Release.yml | 2 +- package.json | 6 +++--- {scripts => tools}/build.ps1 | 0 {scripts => tools}/generateUrls.ts | 0 {scripts => tools}/release.ps1 | 2 +- {scripts => tools}/version.ps1 | 0 tsconfig.eslint.json | 2 +- tsconfig.json | 2 +- 10 files changed, 9 insertions(+), 9 deletions(-) rename {scripts => tools}/build.ps1 (100%) rename {scripts => tools}/generateUrls.ts (100%) rename {scripts => tools}/release.ps1 (98%) rename {scripts => tools}/version.ps1 (100%) diff --git a/.dockerignore b/.dockerignore index bcfe104f..10e12b8f 100644 --- a/.dockerignore +++ b/.dockerignore @@ -8,7 +8,6 @@ public/app/* public/lang/* public/plugins/** resources/assets/tests/ -scripts/ storage/debugbar storage/framework/cache/** storage/framework/sessions/** @@ -18,6 +17,7 @@ storage/logs/** storage/packages/** storage/textures/* tests/ +tools/ vendor/ _ide_helper.php .dockerignore diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 58224a56..cdcb64d2 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -46,7 +46,7 @@ location ~* \w+\.hot-update\.json$ { } ``` -当 `APP_ENV` 为其它值时,您需要事先执行 `pwsh ./scripts/build.ps1`。此命令将构建并压缩前端资源。通常用于生产环境。 +当 `APP_ENV` 为其它值时,您需要事先执行 `pwsh ./tools/build.ps1`。此命令将构建并压缩前端资源。通常用于生产环境。 > 如果传递 `-Simple` 参数给 `build.ps1` 脚本,则只会运行 webpack 来编译代码,而不会复制首页背景以及生成 commit 信息。 diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml index 27480b54..343fc854 100644 --- a/.github/workflows/Release.yml +++ b/.github/workflows/Release.yml @@ -12,7 +12,7 @@ jobs: - name: Checkout code uses: actions/checkout@v2 - name: Build and create archive - run: ./scripts/release.ps1 + run: ./tools/release.ps1 shell: pwsh env: AZURE_TOKEN: ${{ secrets.AZURE_TOKEN }} diff --git a/package.json b/package.json index 44131559..d042a1c4 100644 --- a/package.json +++ b/package.json @@ -13,10 +13,10 @@ "dev": "webpack-dev-server", "build": "webpack -p --progress && webpack -p --config=webpack.meta.config.ts", "lint": "eslint --ext=ts -f=beauty .", - "fmt": "prettier --write resources/assets scripts webpack.*.ts", - "fmt:check": "prettier --check resources/assets scripts webpack.*.ts", + "fmt": "prettier --write resources/assets tools webpack.*.ts", + "fmt:check": "prettier --check resources/assets tools webpack.*.ts", "test": "jest", - "build:urls": "ts-node scripts/generateUrls.ts" + "build:urls": "ts-node tools/generateUrls.ts" }, "dependencies": { "@emotion/core": "^10.0.28", diff --git a/scripts/build.ps1 b/tools/build.ps1 similarity index 100% rename from scripts/build.ps1 rename to tools/build.ps1 diff --git a/scripts/generateUrls.ts b/tools/generateUrls.ts similarity index 100% rename from scripts/generateUrls.ts rename to tools/generateUrls.ts diff --git a/scripts/release.ps1 b/tools/release.ps1 similarity index 98% rename from scripts/release.ps1 rename to tools/release.ps1 index 20dc7c6d..c1b56044 100644 --- a/scripts/release.ps1 +++ b/tools/release.ps1 @@ -7,7 +7,7 @@ composer install --no-dev --prefer-dist --no-progress Remove-Item vendor/bin -Recurse -Force yarn Write-Host "Dependencies have been installed." -ForegroundColor Green -./scripts/build.ps1 +./tools/build.ps1 $zip = "blessing-skin-server-$current.zip" zip -9 -r $zip app bootstrap config database plugins public resources/lang resources/views resources/misc/textures routes storage vendor .env.example artisan LICENSE README.md README_EN.md index.html diff --git a/scripts/version.ps1 b/tools/version.ps1 similarity index 100% rename from scripts/version.ps1 rename to tools/version.ps1 diff --git a/tsconfig.eslint.json b/tsconfig.eslint.json index a0ffabc9..7cbc269d 100644 --- a/tsconfig.eslint.json +++ b/tsconfig.eslint.json @@ -2,7 +2,7 @@ "extends": "./tsconfig.json", "include": [ "resources/assets", - "scripts", + "tools", "webpack.config.ts", "webpack.meta.config.ts" ] diff --git a/tsconfig.json b/tsconfig.json index 7a1f4dc0..6114595f 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -13,7 +13,7 @@ "include": [ "resources/assets/src", "resources/assets/webpack.d.ts", - "scripts", + "tools", "webpack.config.ts", "webpack.meta.config.ts" ],