diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1d51d327..3b61b9fd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -31,7 +31,7 @@ setup: build: stage: build script: - - npm run build:web + - npm run build artifacts: paths: - www @@ -137,6 +137,7 @@ staging: production_demo: stage: deploy script: + - npm run build:prod - ./node_modules/.bin/surge -p ./www -d https://$CI_PROJECT_PATH_SLUG.surge.sh/ environment: name: production diff --git a/angular.json b/angular.json index e5742246..c0de92ac 100644 --- a/angular.json +++ b/angular.json @@ -76,11 +76,12 @@ ], "progress": false }, - "web": { - "fileReplacements": [{ - "replace": "src/environments/environment.ts", - "with": "src/environments/environment.web.ts" - } + "fake": { + "fileReplacements": [ + { + "replace": "src/environments/environment.ts", + "with": "src/environments/environment.fake.ts" + } ], "optimization": true, "outputHashing": "all", @@ -116,10 +117,10 @@ }, "ci": { "progress": false, - "browserTarget": "app:build:web" + "browserTarget": "app:build" }, - "web": { - "browserTarget": "app:build:web" + "fake": { + "browserTarget": "app:build:fake" } } }, diff --git a/package.json b/package.json index 1e1e6e44..7b58cae7 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "scripts": { "build": "ng build", "build:prod": "ng build --prod", - "build:web": "ng build --configuration=web", + "build:fake": "ng build --configuration=fake", "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0 && git add CHANGELOG.md && git commit -m 'docs: update changelog'", "check-configuration": "openstapps-configuration", "e2e": "ng e2e --no-webdriver-update", @@ -30,7 +30,7 @@ "preversion": "npm run prepublishOnly", "push": "git push && git push origin \"v$npm_package_version\"", "start": "ng serve", - "start:web": "ng serve --configuration=web", + "start:fake": "ng serve --configuration=fake", "test": "ng test", "tslint": "tslint -p tsconfig.json -c tslint.json 'src/**/*.ts'" }, diff --git a/src/environments/environment.web.ts b/src/environments/environment.fake.ts similarity index 95% rename from src/environments/environment.web.ts rename to src/environments/environment.fake.ts index 9403dafc..29f6a500 100644 --- a/src/environments/environment.web.ts +++ b/src/environments/environment.fake.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018, 2019 StApps + * Copyright (C) 2018-2020 StApps * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the Free * Software Foundation, version 3. diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 5eda30a6..9bf79286 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018, 2019 StApps + * Copyright (C) 2018-2020 StApps * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the Free * Software Foundation, version 3. diff --git a/src/environments/environment.ts b/src/environments/environment.ts index d9f74020..36ab96ae 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018, 2019 StApps + * Copyright (C) 2018-2020 StApps * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the Free * Software Foundation, version 3.