/public --> /static for simpler Pleroma installation

This commit is contained in:
Alex Gleason 2020-04-26 14:41:04 -05:00
parent 53ac6a8ea6
commit 06a335961d
No known key found for this signature in database
GPG Key ID: 7211D1F99744FBB7
11 changed files with 9 additions and 10 deletions

View File

@ -1,5 +1,5 @@
/node_modules/**
/public/packs/**
/static/**
/tmp/**
/coverage/**
!.eslintrc.js

3
.gitignore vendored
View File

@ -1,9 +1,8 @@
/node_modules/
/public/packs/
/static/
/tmp/
/build/
/coverage/
/.eslintcache
/.env
/public/instance
/deploy.sh

View File

@ -37,7 +37,7 @@ build-development:
NODE_ENV: development
artifacts:
paths:
- public
- static
build-production:
stage: build
@ -46,7 +46,7 @@ build-production:
NODE_ENV: production
artifacts:
paths:
- public
- static
i18n:
stage: build

View File

@ -125,7 +125,7 @@ For https, be sure to also set `PROXY_HTTPS_INSECURE=true`.
URL to the [Soapbox Patron](https://gitlab.com/soapbox-pub/soapbox-patron) server, if you have one.
This setting is not useful unless `"extensions": { "patron": true }` is also set in `public/instance/soapbox.json`.
This setting is not useful unless `"extensions": { "patron": true }` is also set in `static/instance/soapbox.json`.
**Default:** `http://localhost:5000`
@ -154,7 +154,7 @@ NODE_ENV=development
- `yarn dev` - Exact same as above, aliased to `yarn start` for convenience.
#### Building
- `yarn build` - Compile without a dev server, into `/public` directory.
- `yarn build` - Compile without a dev server, into `/static` directory.
#### Translations
- `yarn manage:translations` - Normalizes translation files. Should always be run after editing i18n strings.

View File

@ -7,7 +7,7 @@ module.exports = {
'<rootDir>/vendor/',
'<rootDir>/config/',
'<rootDir>/log/',
'<rootDir>/public/',
'<rootDir>/static/',
'<rootDir>/tmp/',
'<rootDir>/webpack/',

View File

@ -3,7 +3,7 @@
default: &default
source_path: app
source_entry_path: packs
public_root_path: public
public_root_path: static
public_output_path: packs
cache_path: tmp/cache/webpacker
check_yarn_integrity: false

View File

@ -25,7 +25,7 @@ function formatPublicPath(host = '', path = '') {
}
const output = {
path: join(__dirname, '..', 'public', settings.public_output_path),
path: join(__dirname, '..', 'static', settings.public_output_path),
publicPath: formatPublicPath(env.CDN_HOST, settings.public_output_path),
};