diff --git a/.eslintrc.json b/.eslintrc.json index 1a03a5e..450d71a 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -45,8 +45,7 @@ "mocks/**/*", "src/renderer/**/*", "templates/**/*", - "buildfile.js", - "forge.config.js" + "scripts/**/*" ] } ], diff --git a/package.json b/package.json index 5ce3c53..878cc29 100644 --- a/package.json +++ b/package.json @@ -17,14 +17,14 @@ "postinstall": "npm run rebuild", "start": "electron . --enable-logging --env=dev", "rebuild": "electron-rebuild -f -b -t prod,dev,optional", - "electron-version": "electron electron-version.js", + "electron-version": "electron scripts/electron-version.js", "typeorm:migrate": "npm run typeorm:migrate:library && npm run typeorm:migrate:store", "typeorm:migrate:library": "typeorm migration:run -c library", "typeorm:migrate:store": "typeorm migration:run -c store", - "build:webpack": "webpack --config webpack.config.js", - "dev:webpack": "webpack --config webpack.config.js --mode development -w", - "build:index": "node buildfile.js", - "dev:index": "node buildfile.js --watch --dev", + "build:webpack": "webpack --config scripts/webpack.config.js", + "dev:webpack": "webpack --config scripts/webpack.config.js --mode development -w", + "build:index": "node scripts/buildfile.js", + "dev:index": "node scripts/buildfile.js --watch --dev", "build:ts": "tsc", "dev:ts": "tsc -w --pretty --preserveWatchOutput", "build": "concurrently -c green,yellow,cyan -n webpack,index,typescript \"npm run build:webpack\" \"npm run build:index\" \"npm run build:ts\"", @@ -33,7 +33,7 @@ "test": "mocha", "coverage:fast": "nyc npm run test:fast", "coverage": "nyc npm run test", - "prelint": "eslint --print-config forge.config.js | eslint-config-prettier-check", + "prelint": "eslint --print-config scripts/forge.config.js | eslint-config-prettier-check", "lint": "eslint ./**/*.* --max-warnings 1", "lint:fix": "eslint ./**/*.* --fix", "prettier": "prettier -c **/*.*", @@ -101,7 +101,7 @@ "repository": "https://git.fuwafuwa.moe/Xymorot/RenaiApp", "bugs": "https://git.fuwafuwa.moe/Xymorot/RenaiApp/issues", "config": { - "forge": "forge.config.js" + "forge": "scripts/forge.config.js" }, "husky": { "hooks": { diff --git a/buildfile.js b/scripts/buildfile.js similarity index 94% rename from buildfile.js rename to scripts/buildfile.js index ad63254..53d4fa0 100644 --- a/buildfile.js +++ b/scripts/buildfile.js @@ -3,7 +3,7 @@ const path = require('path'); const { watch } = require('chokidar'); const { debounce } = require('lodash'); const minimist = require('minimist'); -const templating = require('./templates'); +const templating = require('../templates'); const webpackConfig = require('./webpack.config'); /** @var {Object} argv */ diff --git a/electron-version.js b/scripts/electron-version.js similarity index 100% rename from electron-version.js rename to scripts/electron-version.js diff --git a/forge.config.js b/scripts/forge.config.js similarity index 89% rename from forge.config.js rename to scripts/forge.config.js index 2ee8c74..da6f07d 100644 --- a/forge.config.js +++ b/scripts/forge.config.js @@ -1,4 +1,4 @@ -const packageJson = require('./package'); +const packageJson = require('../package.json'); const ignoreList = [ /^\/\.idea($|\/)/, @@ -11,6 +11,7 @@ const ignoreList = [ /^\/test-paths($|\/)/, /^\/types($|\/)/, /^\/workspace($|\/)/, + /^\/scripts($|\/)/, /^\/\.editorconfig/, /^\/\.eslintignore/, @@ -19,14 +20,10 @@ const ignoreList = [ /^\/\.mocharc\.yml/, /^\/\.nycrc\.yml/, /^\/\.prettierrc\.yml/, - /^\/buildfile\.js/, /^\/CONTRIBUTING\.md/, - /^\/electron-version\.js/, - /^\/forge\.config\.js/, /^\/ormconfig\.yml/, /^\/package-lock\.json/, /^\/tsconfig\.json/, - /^\/webpack\.config\.js/, /^\/node_modules\/\.cache($|\/)/, // test and mock files: diff --git a/webpack.config.js b/scripts/webpack.config.js similarity index 87% rename from webpack.config.js rename to scripts/webpack.config.js index 760ad37..3b19a21 100644 --- a/webpack.config.js +++ b/scripts/webpack.config.js @@ -2,10 +2,10 @@ const path = require('path'); module.exports = { mode: 'production', - entry: path.resolve(__dirname, 'src/renderer.ts'), + entry: path.resolve(__dirname, '../src/renderer.ts'), target: 'electron-renderer', output: { - path: path.resolve(__dirname, 'frontend'), + path: path.resolve(__dirname, '../frontend'), filename: 'bundle.js', }, module: {