Skip to content
This repository was archived by the owner on Jan 10, 2023. It is now read-only.

Commit 44f3977

Browse files
committed
Move NPM and Composer packges into root directory, mainly to avoid Webpack related issues with transpiling loaders.
1 parent 5df7c26 commit 44f3977

File tree

8 files changed

+15
-6309
lines changed

8 files changed

+15
-6309
lines changed

.dockerignore

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
.git
2-
dev/node_modules
3-
dev/vendor
2+
node_modules
3+
vendor
44
build

.gitignore

+5-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ app/locale/*/LC_MESSAGES/webpack.mo
33
etc/dev.json
44
etc/dist.json
55
build/
6-
dev/node_modules/
7-
dev/vendor/
8-
dev/npm-debug.log
9-
dev/composer.lock
6+
node_modules/
7+
vendor/
8+
npm-debug.log
9+
composer.lock
10+
package-lock.json

app/phalcon/config/config_dev.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
$etcDir = $projectDir . 'etc/';
88
$devDir = $projectDir . 'dev/';
99
$buildDir = $projectDir . 'build/';
10-
$composerDir = $devDir . 'vendor/';
10+
$composerDir = $projectDir . 'vendor/';
1111
$cacheDir = $tmpDir . 'cache/';
1212

1313
// Clear cache for gettext and other extensions
File renamed without changes.

0 commit comments

Comments
 (0)