Skip to content

Commit

Permalink
Merge pull request #624 from europeana/develop
Browse files Browse the repository at this point in the history
Merge Develop Into Master
  • Loading branch information
andyjmaclean authored Mar 2, 2022
2 parents 888b66a + b3714c7 commit 12a1826
Show file tree
Hide file tree
Showing 112 changed files with 12,503 additions and 5,957 deletions.
18 changes: 18 additions & 0 deletions .browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
# For additional information regarding the format and rule options, please see:
# https://github.com/browserslist/browserslist#queries

# For the full list of supported browsers by the Angular framework, please see:
# https://angular.io/guide/browser-support

# You can see what browsers were selected by your queries by running:
# npx browserslist

last 1 Chrome version
last 1 Firefox version
last 2 Edge major versions
last 2 Safari major versions
last 2 iOS major versions
Firefox ESR
not IE 9-10 # Angular support for IE 9-10 has been deprecated and will be removed as of Angular v11. To opt-in, remove the 'not' prefix on this line.
not IE 11 # Angular supports IE 11 only as an opt-in. To opt-in, remove the 'not' prefix on this line.
36 changes: 25 additions & 11 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"aot": true,
"outputPath": "projects/metis/dist/metis",
"index": "projects/metis/src/index.html",
"main": "projects/metis/src/main.ts",
Expand All @@ -30,29 +29,38 @@
},
"assets": ["projects/metis/src/assets", "projects/metis/src/favicon.ico"],
"styles": ["projects/metis/src/styles.scss"],
"scripts": []
"scripts": [],
"vendorChunk": true,
"extractLicenses": false,
"buildOptimizer": false,
"sourceMap": true,
"optimization": false,
"namedChunks": true
},
"configurations": {
"production": {
"aot": true,
"budgets": [
{
"type": "anyComponentStyle",
"maximumWarning": "6kb"
"maximumWarning": "100kb"
}
],
"buildOptimizer": true,
"extractLicenses": true,
"namedChunks": false,
"optimization": true,
"optimization": {
"scripts": true,
"fonts": { "inline": true },
"styles": { "minify": true, "inlineCritical": false }
},
"outputHashing": "all",
"sourceMap": false
},
"e2e": {
"budgets": [
{
"type": "anyComponentStyle",
"maximumWarning": "6kb"
"maximumWarning": "100kb"
}
],
"fileReplacements": [
Expand All @@ -62,7 +70,8 @@
}
]
}
}
},
"defaultConfiguration": ""
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
Expand Down Expand Up @@ -115,7 +124,6 @@
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"aot": true,
"outputPath": "projects/sandbox/dist/sandbox",
"index": "projects/sandbox/src/index.html",
"main": "projects/sandbox/src/main.ts",
Expand All @@ -127,11 +135,16 @@
"stylePreprocessorOptions": {
"includePaths": ["shared-styles"]
},
"scripts": []
"scripts": [],
"vendorChunk": true,
"extractLicenses": false,
"buildOptimizer": false,
"sourceMap": true,
"optimization": false,
"namedChunks": true
},
"configurations": {
"production": {
"aot": true,
"fileReplacements": [
{
"replace": "projects/sandbox/src/environments/environment.ts",
Expand Down Expand Up @@ -171,7 +184,8 @@
}
]
}
}
},
"defaultConfiguration": ""
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
Expand Down
Loading

0 comments on commit 12a1826

Please sign in to comment.