/public --> /static for simpler Pleroma installation
This commit is contained in:
parent
53ac6a8ea6
commit
06a335961d
11 changed files with 9 additions and 10 deletions
|
@ -1,5 +1,5 @@
|
||||||
/node_modules/**
|
/node_modules/**
|
||||||
/public/packs/**
|
/static/**
|
||||||
/tmp/**
|
/tmp/**
|
||||||
/coverage/**
|
/coverage/**
|
||||||
!.eslintrc.js
|
!.eslintrc.js
|
||||||
|
|
3
.gitignore
vendored
3
.gitignore
vendored
|
@ -1,9 +1,8 @@
|
||||||
/node_modules/
|
/node_modules/
|
||||||
/public/packs/
|
/static/
|
||||||
/tmp/
|
/tmp/
|
||||||
/build/
|
/build/
|
||||||
/coverage/
|
/coverage/
|
||||||
/.eslintcache
|
/.eslintcache
|
||||||
/.env
|
/.env
|
||||||
/public/instance
|
|
||||||
/deploy.sh
|
/deploy.sh
|
||||||
|
|
|
@ -37,7 +37,7 @@ build-development:
|
||||||
NODE_ENV: development
|
NODE_ENV: development
|
||||||
artifacts:
|
artifacts:
|
||||||
paths:
|
paths:
|
||||||
- public
|
- static
|
||||||
|
|
||||||
build-production:
|
build-production:
|
||||||
stage: build
|
stage: build
|
||||||
|
@ -46,7 +46,7 @@ build-production:
|
||||||
NODE_ENV: production
|
NODE_ENV: production
|
||||||
artifacts:
|
artifacts:
|
||||||
paths:
|
paths:
|
||||||
- public
|
- static
|
||||||
|
|
||||||
i18n:
|
i18n:
|
||||||
stage: build
|
stage: build
|
||||||
|
|
|
@ -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.
|
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`
|
**Default:** `http://localhost:5000`
|
||||||
|
|
||||||
|
@ -154,7 +154,7 @@ NODE_ENV=development
|
||||||
- `yarn dev` - Exact same as above, aliased to `yarn start` for convenience.
|
- `yarn dev` - Exact same as above, aliased to `yarn start` for convenience.
|
||||||
|
|
||||||
#### Building
|
#### Building
|
||||||
- `yarn build` - Compile without a dev server, into `/public` directory.
|
- `yarn build` - Compile without a dev server, into `/static` directory.
|
||||||
|
|
||||||
#### Translations
|
#### Translations
|
||||||
- `yarn manage:translations` - Normalizes translation files. Should always be run after editing i18n strings.
|
- `yarn manage:translations` - Normalizes translation files. Should always be run after editing i18n strings.
|
||||||
|
|
|
@ -7,7 +7,7 @@ module.exports = {
|
||||||
'<rootDir>/vendor/',
|
'<rootDir>/vendor/',
|
||||||
'<rootDir>/config/',
|
'<rootDir>/config/',
|
||||||
'<rootDir>/log/',
|
'<rootDir>/log/',
|
||||||
'<rootDir>/public/',
|
'<rootDir>/static/',
|
||||||
'<rootDir>/tmp/',
|
'<rootDir>/tmp/',
|
||||||
'<rootDir>/webpack/',
|
'<rootDir>/webpack/',
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
default: &default
|
default: &default
|
||||||
source_path: app
|
source_path: app
|
||||||
source_entry_path: packs
|
source_entry_path: packs
|
||||||
public_root_path: public
|
public_root_path: static
|
||||||
public_output_path: packs
|
public_output_path: packs
|
||||||
cache_path: tmp/cache/webpacker
|
cache_path: tmp/cache/webpacker
|
||||||
check_yarn_integrity: false
|
check_yarn_integrity: false
|
||||||
|
|
|
@ -25,7 +25,7 @@ function formatPublicPath(host = '', path = '') {
|
||||||
}
|
}
|
||||||
|
|
||||||
const output = {
|
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),
|
publicPath: formatPublicPath(env.CDN_HOST, settings.public_output_path),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue