Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
Dspace7 Angular
Manage
Activity
Members
Labels
Plan
Issues
42
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Operate
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
vtechworks
Dspace7 Angular
Commits
583f6e96
Commit
583f6e96
authored
7 years ago
by
William Welling
Browse files
Options
Downloads
Patches
Plain Diff
have prod, test, and dev environment config files override default
parent
8e87d3e0
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
config/environment.test.js
+1
-28
1 addition, 28 deletions
config/environment.test.js
src/config.ts
+1
-1
1 addition, 1 deletion
src/config.ts
yarn.lock
+2
-6
2 additions, 6 deletions
yarn.lock
with
4 additions
and
35 deletions
config/environment.test.js
+
1
−
28
View file @
583f6e96
module
.
exports
=
{
// Angular Universal server settings.
ui
:
{
ssl
:
false
,
host
:
'
localhost
'
,
port
:
3000
,
// NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript
nameSpace
:
'
/
'
},
// The REST API server settings.
rest
:
{
ssl
:
false
,
host
:
'
dspace7.4science.it
'
,
port
:
80
,
// NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript
nameSpace
:
'
/dspace-spring-rest/api
'
},
cache
:
{
// NOTE: how long should objects be cached for by default
msToLive
:
15
*
60
*
1000
,
// 15 minute
control
:
'
max-age=60
'
// revalidate browser
},
logDirectory
:
'
.
'
,
// NOTE: rehydrate or replay
// rehydrate will transfer prerender state to browser state, actions do not need to replay
// replay will transfer an array of actions to browser, actions replay automatically
prerenderStrategy
:
'
rehydrate
'
,
// NOTE: will log all redux actions and transfers in console
debug
:
true
};
This diff is collapsed.
Click to expand it.
src/config.ts
+
1
−
1
View file @
583f6e96
...
...
@@ -41,7 +41,7 @@ try {
// if envConfigFile set try to get configs
if
(
envConfigFile
)
{
try
{
ENV_CONFIG
=
configContext
(
envConfigFile
)
as
GlobalConfig
;
ENV_CONFIG
=
Object
.
assign
(
ENV_CONFIG
,
configContext
(
envConfigFile
)
)
as
GlobalConfig
;
}
catch
(
e
)
{
console
.
warn
(
'
Cannot find file
'
+
envConfigFile
.
substring
(
2
,
envConfigFile
.
length
),
'
Using default environment.
'
);
}
...
...
This diff is collapsed.
Click to expand it.
yarn.lock
+
2
−
6
View file @
583f6e96
...
...
@@ -196,11 +196,7 @@
version "2.0.29"
resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-2.0.29.tgz#5002e14f75e2d71e564281df0431c8c1b4a2a36a"
"@types/node@*":
version "8.0.13"
resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.13.tgz#530f0f9254209b0335bf5cc6387822594ef47093"
"@types/node@8.0.14":
"@types/node@*", "@types/node@8.0.14":
version "8.0.14"
resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.14.tgz#4a19dc6bb61d16c01cbadc7b30ac23518fff176b"
...
...
@@ -7458,7 +7454,7 @@ webpack-merge@4.1.0:
dependencies:
lodash "^4.17.4"
webpack-node-externals@
^
1.6.0:
webpack-node-externals@1.6.0:
version "1.6.0"
resolved "https://registry.yarnpkg.com/webpack-node-externals/-/webpack-node-externals-1.6.0.tgz#232c62ec6092b100635a3d29d83c1747128df9bd"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment