Skip to content

Commit

Permalink
Pull request #1511: Release/major 12.0.0
Browse files Browse the repository at this point in the history
Merge in OUI/oblique from release/major_12.0.0 to master

* commit '55ebc32ef6516104b9d15716bc561af0e6a7347f': (174 commits)
  chore(toolchain): release version 12.0.0
  chore(toolchain): update dependencies and refactor accordingly
  feat(sds/tabbed-page): update the base url according to the current version in the API tab
  feat(sds/side-navigation): store version info into the version service
  feat(sds/cms): add a version service to store the version data
  fix(sds/cms): add `base_url` tp the `Version` interface
  fix(sds/side-navigation): redirect to the correct page when the version changes
  fix(sds/side-navigation): make sure the selected version match the one in the URL
  feat(sds/master-layout): add documentation for version 12
  feat(sds/popover): remove event example from version 11
  feat(sds/popover): add documentation for version 12
  feat(toolchain): simplify access to projects scripts
  fix(oblique/schematics): ng-add correctly removes default Angular favicon
  fix(oblique/schematics): ng-add add `src/assets` entry to Angular.json's assets configuration
  fix(oblique/styles): add theme styling for mat-spinner
  fix(oblique/toolchain): tarball script correctly match release candidates
  fix(toolchain): correct corrupt dependencies after rebase
  chore(toolchain): remove publish instructions for version 12.0.0-rc.1
  chore(toolchain): release version 12.0.0-rc.1
  feat(toolchain): add pre-versions publish instructions in the release script
  ...
  • Loading branch information
gillerr committed Oct 8, 2024
2 parents 1953be1 + 55ebc32 commit 46fb3b8
Show file tree
Hide file tree
Showing 278 changed files with 9,836 additions and 7,585 deletions.
12 changes: 12 additions & 0 deletions .eslintrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ overrides:
"@typescript-eslint/no-require-imports": off # used by node scripts and to load some static assets
"@typescript-eslint/no-type-alias": off
"@typescript-eslint/no-unsafe-return": off # reports many false positive
"@typescript-eslint/non-nullable-type-assertion-style": off # conflicts with @typescript-eslint/no-non-null-assertion
"@typescript-eslint/parameter-properties": off # disallows declaring variables in constructor
"@typescript-eslint/prefer-enum-initializers": off
"@typescript-eslint/prefer-readonly-parameter-types": off # forces "readonly" on functions where it is not allowed
Expand Down Expand Up @@ -171,6 +172,7 @@ overrides:
"@typescript-eslint/ban-ts-comment": off
"@typescript-eslint/no-empty-function": off
"@typescript-eslint/no-floating-promises": off
"@typescript-eslint/no-non-null-assertion": off
"@typescript-eslint/unbound-method": off # because "expect" uses unbound methods
max-classes-per-file: off
max-lines: off
Expand All @@ -186,6 +188,16 @@ overrides:
"@typescript-eslint/prefer-destructuring": off
"@typescript-eslint/prefer-nullish-coalescing": off
"@typescript-eslint/strict-boolean-expressions": off
no-console:
- error

- files:
- "scripts/shared/log.ts"
rules:
no-console:
- error
- allow:
- log

- files:
- "tests/*.ts"
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
- [CLI](projects%2Fcli%2FCHANGELOG.md)
- [Design System](projects%2Fdesign-system%2FCHANGELOG.md)
- [Oblique](projects%2Foblique%2FCHANGELOG.md)
- [Sandbox](projects%2Fsandbox%2FCHANGELOG.md)
- [Sandbox-SSR](projects%2Fsandbox-ssr%2FCHANGELOG.md)
- [SDS](projects%2Fsds%2FCHANGELOG.md)
- [ServiceNavigation](projects%2Fservice-navigation-web-component%2FCHANGELOG.md)
6 changes: 6 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,11 @@ The type is mandatory and must be one of the following:

The package is mandatory and must be one of the following:

- **cli**: for changes in the CLI library
- **design-system**: for change in the Design System library
- **oblique**: for changes in the Oblique library, including the changes to the service-navigation component
- **sandbox**: for changes in the Sandbox project
- **sandbox-ssr**: for change in the Sandbox-SSR project
- **sds**: for changes in the Swiss Design System project
- **service-navigation**: for changes in the service-navigation-web-component project
- **toolchain**: for general changes about the whole repository
Expand All @@ -112,8 +115,11 @@ The package is mandatory and must be one of the following:
The scope is optional but usually present. If the scope is omitted, then the separating slash (`/`) before it is also
omitted. The list of available scopes depends on the project involved:

- [CLI](projects/cli/CONTRIBUTING.md)
- [Design System](projects/design-system/CONTRIBUTING.md)
- [Oblique](projects/oblique/CONTRIBUTING.md)
- [Sandbox](projects/sandbox/CONTRIBUTING.md)
- [Sandbox-SSR](projects/sandbox-ssr/CONTRIBUTING.md)
- [SDS](projects/sds/CONTRIBUTING.md)
- [Service Navigation](projects/service-navigation-web-component/CONTRIBUTING.md)

Expand Down
1 change: 1 addition & 0 deletions DEPENDENCIES.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
| @typescript-eslint/eslint-plugin | Angular CLI | lint | An ESLint plugin which provides lint rules for TypeScript codebases. | https://www.npmjs.com/package/@typescript-eslint/eslint-plugin | https://github.com/typescript-eslint/typescript-eslint#readme |
| @typescript-eslint/parser | Angular CLI | lint | An ESLint parser which leverages TypeScript ESTree to allow for ESLint to lint TypeScript source code. | https://www.npmjs.com/package/@typescript-eslint/parser | https://github.com/typescript-eslint/typescript-eslint#readme |
| ansi-colors | Oblique schematics | - | Easily add ANSI colors to your text and symbols in the terminal. A faster drop-in replacement for chalk, kleur and turbocolor (without the dependencies and rendering bugs). | https://www.npmjs.com/package/ansi-colors | https://www.npmjs.com/package/ansi-colors |
| chalk | Scripts | all of them | Terminal string styling done right | https://www.npmjs.com/package/chalk | https://github.com/chalk/chalk |
| eslint | Oblique | lint | ESLint is a tool for identifying and reporting on patterns found in ECMAScript/JavaScript code. | https://www.npmjs.com/package/eslint | https://eslint.org/ |
| eslint-config-prettier | Oblique | lint | Turns off all rules that are unnecessary or might conflict with Prettier. This lets you use your favorite shareable config without letting its stylistic choices get in the way when using Prettier. Note that this config only turns rules off, so it only makes sense using it together with some other config. | https://www.npmjs.com/package/eslint-config-prettier | https://github.com/prettier/eslint-config-prettier/ |
| husky | Oblique git hooks | git commit | Modern native Git hooks made easy, Husky improves your commits and more 🐶 woof! | https://www.npmjs.com/package/husky | https://typicode.github.io/husky/#/ |
Expand Down
3 changes: 3 additions & 0 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,11 @@ nodejsPipelineTemplate {
'test': 'npm run test-ci -ws',
'build': 'npm run build -ws',
'sonar': [
'./projects/design-system',
'./projects/cli',
'./projects/oblique',
'./projects/sandbox',
'./projects/sandbox-ssr',
'./projects/sds',
'./projects/service-navigation-web-component'
]
Expand Down
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@

The Oblique repository consists of multiple packages:

- [CLI](projects/cli/README.md)
- [Design System](projects/design-system/README.md)
- [Oblique](projects/oblique/README.md)
- [Sandbox](projects/sandbox/README.md)
- [Sandbox SSR](projects/sandbox-ssr/README.md)
- [SDS](projects/sds/README.md)
- [Service Navigation Web Component](projects/service-navigation-web-component/README.md)

Expand Down
144 changes: 144 additions & 0 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -423,6 +423,150 @@
"defaultConfiguration": "default"
}
}
},
"sandbox-ssr": {
"projectType": "application",
"schematics": {
"@schematics/angular:component": {
"style": "scss",
"prefix": "ssr"
},
"@schematics/angular:directive": {
"prefix": "ssr"
}
},
"root": "projects/sandbox-ssr",
"sourceRoot": "projects/sandbox-ssr/src",
"prefix": "ssr",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:application",
"options": {
"outputPath": "dist/sandbox-ssr",
"index": "projects/sandbox-ssr/src/index.html",
"browser": "projects/sandbox-ssr/src/main.ts",
"polyfills": ["zone.js"],
"tsConfig": "projects/sandbox-ssr/tsconfig.app.json",
"inlineStyleLanguage": "scss",
"assets": [
"projects/sandbox-ssr/src/assets",
{
"glob": "**/*",
"input": "projects/oblique/src/assets",
"output": "/assets"
},
{
"glob": "**/*",
"input": "projects/oblique/src/styles/fonts",
"output": "/assets/fonts"
},
"projects/sandbox-ssr/src/Staticfile"
],
"styles": ["projects/sandbox-ssr/src/styles.scss"],
"scripts": ["projects/oblique/src/ob-features.js"],
"server": "projects/sandbox-ssr/src/main.server.ts",
"prerender": true,
"ssr": {
"entry": "projects/sandbox-ssr/server.ts"
}
},
"configurations": {
"production": {
"budgets": [
{
"type": "initial",
"maximumWarning": "500kb",
"maximumError": "1mb"
},
{
"type": "anyComponentStyle",
"maximumWarning": "2kb",
"maximumError": "4kb"
}
],
"outputHashing": "all"
},
"development": {
"optimization": false,
"extractLicenses": false,
"sourceMap": true
}
},
"defaultConfiguration": "production"
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"port": 3002
},
"configurations": {
"production": {
"buildTarget": "sandbox-ssr:build:production"
},
"development": {
"buildTarget": "sandbox-ssr:build:development"
}
},
"defaultConfiguration": "development"
},
"test": {
"builder": "@angular-builders/jest:run",
"options": {
"tsConfig": "tsconfig.spec.json",
"no-cache": ["true"],
"run-in-band": ["true"]
},
"configurations": {
"default": {
"configPath": "jest.config.js"
},
"ci": {
"configPath": "jest.config.ci.js"
}
},
"defaultConfiguration": "default"
}
}
},
"design-system": {
"projectType": "library",
"root": "projects/design-system",
"sourceRoot": "projects/design-system/src",
"prefix": "ds",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:ng-packagr",
"options": {
"project": "projects/design-system/ng-package.json"
},
"configurations": {
"production": {
"tsConfig": "projects/design-system/tsconfig.lib.prod.json"
},
"development": {
"tsConfig": "projects/design-system/tsconfig.lib.json"
}
},
"defaultConfiguration": "production"
},
"test": {
"builder": "@angular-builders/jest:run",
"options": {
"tsConfig": "tsconfig.spec.json",
"no-cache": ["true"],
"run-in-band": ["true"]
},
"configurations": {
"default": {
"configPath": "jest.config.js"
},
"ci": {
"configPath": "jest.config.ci.js"
}
},
"defaultConfiguration": "default"
}
}
}
},
"schematics": {
Expand Down
Loading

0 comments on commit 46fb3b8

Please sign in to comment.