Skip to content

Commit

Permalink
Update dist/front/ to dist/
Browse files Browse the repository at this point in the history
  • Loading branch information
willybrauner committed Jul 4, 2023
1 parent a1450f0 commit c9ad1e1
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 16 deletions.
5 changes: 2 additions & 3 deletions apps/front/.gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# Output application depend of project
dist/front
dist/api/web/app/.cache
dist

vendor
.env.local
Expand All @@ -13,4 +12,4 @@ dist-ssr
*.local
.cache
vite.config.ts.timestamp*
build-stats.html
build-stats.html
2 changes: 1 addition & 1 deletion apps/front/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ Once a new file is composed, it is copied to the selected folder(s).
.env out directory(ies) array is defined from [config/config.js](config/config.js):

```js
buildDotenvOutDir: [resolve("dist/front/www/")]
buildDotenvOutDir: [resolve("dist/www/")]
```

This plugin is mandatory for the use of the default cher-site config with the PHP micro framework.
Expand Down
14 changes: 7 additions & 7 deletions apps/front/config/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ export default {
// outDir: where files are built
// If this value is change, add this new path in .gitignore
distDir: resolve("dist"),
outDir: resolve("dist/front"),
outDirScripts: resolve("dist/front/_scripts"),
outDirClient: resolve("dist/front/client"),
outDirServer: resolve("dist/front/server"),
outDirStatic: resolve("dist/front/static"),
outDir: resolve("dist"),
outDirScripts: resolve("dist/_scripts"),
outDirClient: resolve("dist/client"),
outDirServer: resolve("dist/server"),
outDirStatic: resolve("dist/static"),

// TODO uniquement pour version PHP
// Directory name of the build folder (will be cleaned before build)
Expand All @@ -27,7 +27,7 @@ export default {
// outDir: where files are built
// last folder need to be sync with `buildDirname`
// If this value is change, add this new path in .gitignore
// outDir: resolve("dist/front/www/static/"),
// outDir: resolve("dist/www/static/"),

// Input entry files array
// Set the relative paths, don't resolve them.
Expand All @@ -41,7 +41,7 @@ export default {
// Build dotenv outDir array
// This task can build the same dotenv files in different directories
buildDotenvOutDir: [
// resolve("dist/front/")
// resolve("dist/")
],

// Build htaccess
Expand Down
10 changes: 5 additions & 5 deletions apps/front/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
"type": "module",
"scripts": {
"dev": "node server.js",
"build:client": "vite build --outDir dist/front/client",
"build:server": "vite build --ssr src/server/index-server.tsx --outDir dist/front/server",
"build:client": "vite build --outDir dist/client",
"build:server": "vite build --ssr src/server/index-server.tsx --outDir dist/server",
"build:scripts": "vite build -c vite.scripts.config.ts",
"build:static": "vite build --outDir dist/front/static",
"build:static": "vite build --outDir dist/static",
"build": "npm run build:server && npm run build:scripts && npm run build:static && npm run generate",
"generate": "node dist/front/_scripts/exe-prerender.js",
"preview": "serve dist/front/static",
"generate": "node dist/_scripts/exe-prerender.js",
"preview": "serve dist/static",
"setup": "node config/tasks/setup/setup.js && npm run prepare",
"scaffold": "node config/tasks/scaffold-component/scaffold-component.js",
"scaffold-wp": "node config/tasks/scaffold-wp/scaffold-wp.js",
Expand Down

0 comments on commit c9ad1e1

Please sign in to comment.