Skip to content

Commit

Permalink
deps(components): update @scion/components to Angular 17
Browse files Browse the repository at this point in the history
closes #174

BREAKING CHANGE: Updating `@scion/components` to Angular 17 introduced a breaking change.

To migrate:
- Update your application to Angular 17; for detailed migration instructions, refer to https://v17.angular.io/guide/update-to-latest-version;
- Scrollbar-related mixins have been moved to the `@scion/components/scrollbar` SCSS module; migrate as follows:
  Before migration:
  ```
  @use '@scion/components' as sci-components;
  @include sci-components.scrollbar-hide-when-inactive();
  @include sci-components.scrollbar-position();
  ```
  After migration:
  ```
  @use '@scion/components/scrollbar' as sci-scrollbar;
  @include sci-scrollbar.scrollbar-hide-when-inactive();
  @include sci-scrollbar.scrollbar-position();
  ```
  • Loading branch information
Marcarrian authored and danielwiehl committed Nov 15, 2023
1 parent f00686c commit ac7f284
Show file tree
Hide file tree
Showing 26 changed files with 129,858 additions and 23,134 deletions.
23,695 changes: 23,399 additions & 296 deletions .github/actions/equality-checker/dist/index.js

Large diffs are not rendered by default.

23,749 changes: 23,422 additions & 327 deletions .github/actions/npm-publish/dist/index.js

Large diffs are not rendered by default.

23,693 changes: 23,398 additions & 295 deletions .github/actions/package-json/dist/index.js

Large diffs are not rendered by default.

34,581 changes: 25,873 additions & 8,708 deletions .github/actions/tag-release-commit/dist/index.js

Large diffs are not rendered by default.

23,749 changes: 23,422 additions & 327 deletions .github/actions/vercel-deploy/dist/index.js

Large diffs are not rendered by default.

82 changes: 41 additions & 41 deletions .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
name: Continuous Integration and Delivery
on: [push, pull_request]
env:
NODE_VERSION: 18.16.0
NODE_VERSION: 20.9.0
jobs:
install:
name: 'Installing NPM modules'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: ${{ env.NODE_VERSION }}
- name: 'Caching NPM modules if necessary'
uses: actions/cache@v2
uses: actions/cache@v3
id: node-modules-cache
with:
path: ./node_modules
Expand All @@ -24,12 +24,12 @@ jobs:
needs: install
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: ${{ env.NODE_VERSION }}
- name: 'Restoring NPM modules from cache'
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ./node_modules
key: node_modules-${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}
Expand All @@ -43,8 +43,8 @@ jobs:
components-version: ${{ steps.components-package-json.outputs.version }}
components-internal-version: ${{ steps.components-internal-package-json.outputs.version }}
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: ${{ env.NODE_VERSION }}
- name: 'Reading package.json version of scion/toolkit'
Expand All @@ -63,28 +63,28 @@ jobs:
with:
path: projects/scion/components.internal/package.json
- name: 'Restoring NPM modules from cache'
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ./node_modules
key: node_modules-${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}
- name: 'Building @scion/toolkit'
run: npm run toolkit:build
- name: 'Uploading dist/scion/toolkit'
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: toolkit-dist
path: dist/scion/toolkit
- name: 'Building @scion/components'
run: npm run components:build
- name: 'Uploading dist/scion/components'
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: components-dist
path: dist/scion/components
- name: 'Building @scion/components.internal'
run: npm run components.internal:build
- name: 'Uploading dist/scion/components.internal'
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: components-internal-dist
path: dist/scion/components.internal
Expand All @@ -100,33 +100,33 @@ jobs:
- name: components-testing-app
cmd: npm run components-testing-app:build
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: ${{ env.NODE_VERSION }}
- name: 'Restoring NPM modules from cache'
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ./node_modules
key: node_modules-${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}
- name: 'Downloading dist/scion/toolkit'
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
name: toolkit-dist
path: dist/scion/toolkit
- name: 'Downloading dist/scion/components'
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
name: components-dist
path: dist/scion/components
- name: 'Downloading dist/scion/components.internal'
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
name: components-internal-dist
path: dist/scion/components.internal
- name: 'Building ${{ matrix.app.name }}'
run: ${{ matrix.app.cmd }}
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
with:
name: ${{ matrix.app.name }}
path: dist/${{ matrix.app.name }}
Expand All @@ -135,27 +135,27 @@ jobs:
needs: build-libs
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: ${{ env.NODE_VERSION }}
- name: 'Restoring NPM modules from cache'
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ./node_modules
key: node_modules-${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}
- name: 'Downloading dist/scion/toolkit'
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
name: toolkit-dist
path: dist/scion/toolkit
- name: 'Downloading dist/scion/components'
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
name: components-dist
path: dist/scion/components
- name: 'Downloading dist/scion/components.internal'
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
name: components-internal-dist
path: dist/scion/components.internal
Expand All @@ -168,17 +168,17 @@ jobs:
matrix:
shard: [1/1]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: ${{ env.NODE_VERSION }}
- name: 'Restoring NPM modules from cache'
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ./node_modules
key: node_modules-${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}
- name: 'Downloading dist/components-testing-app'
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
name: components-testing-app
path: dist/components-testing-app
Expand All @@ -196,7 +196,7 @@ jobs:
outputs:
should-release: ${{ steps.tag-release-commit.outputs.is-release-commit }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: 'If release commit present, add release tag'
uses: SchweizerischeBundesbahnen/scion-toolkit/.github/actions/tag-release-commit@master
id: tag-release-commit
Expand All @@ -217,7 +217,7 @@ jobs:
outputs:
should-release: ${{ steps.tag-release-commit.outputs.is-release-commit }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: 'If release commit present, add release tag'
uses: SchweizerischeBundesbahnen/scion-toolkit/.github/actions/tag-release-commit@master
id: tag-release-commit
Expand All @@ -238,7 +238,7 @@ jobs:
outputs:
should-release: ${{ steps.tag-release-commit.outputs.is-release-commit }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: 'If release commit present, add release tag'
uses: SchweizerischeBundesbahnen/scion-toolkit/.github/actions/tag-release-commit@master
id: tag-release-commit
Expand All @@ -257,9 +257,9 @@ jobs:
- e2e
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: 'Downloading dist/components-app'
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
name: components-app
path: dist/components-app
Expand All @@ -282,9 +282,9 @@ jobs:
- toolkit-release-guard
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: 'Downloading dist/scion/toolkit'
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
name: toolkit-dist
path: dist/scion/toolkit
Expand All @@ -307,9 +307,9 @@ jobs:
- components-release-guard
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: 'Downloading dist/scion/components'
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
name: components-dist
path: dist/scion/components
Expand All @@ -330,9 +330,9 @@ jobs:
needs: components-internal-release-guard
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: 'Downloading dist/scion/components.internal'
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
name: components-internal-dist
path: dist/scion/components.internal
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ This section explains how to submit a pull request.
<summary><strong>Development</strong></summary>
<br>

Make sure to use Node.js version 18.16.0 for contributing to SCION. We suggest using [Node Version Manager](https://github.com/nvm-sh/nvm) if you need different Node.js versions for other projects.
Make sure to use Node.js version 20.9.0 for contributing to SCION. We suggest using [Node Version Manager](https://github.com/nvm-sh/nvm) if you need different Node.js versions for other projects.

For development, you can uncomment the section `PATH-OVERRIDE-FOR-DEVELOPMENT` in `tsconfig.json`. This allows running tests or serving applications without having to build dependent modules first.

Expand Down
42 changes: 10 additions & 32 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,21 +165,18 @@
"schematics": {
"@schematics/angular:component": {
"style": "scss"
},
"@schematics/angular:application": {
"strict": true
}
},
"root": "apps/components",
"sourceRoot": "apps/components/src",
"prefix": "sci",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"builder": "@angular-devkit/build-angular:application",
"options": {
"outputPath": "dist/components-app",
"index": "apps/components/src/index.html",
"main": "apps/components/src/main.ts",
"browser": "apps/components/src/main.ts",
"polyfills": [
"zone.js"
],
Expand Down Expand Up @@ -221,12 +218,9 @@
"outputHashing": "all"
},
"development": {
"buildOptimizer": false,
"optimization": false,
"vendorChunk": true,
"extractLicenses": false,
"sourceMap": true,
"namedChunks": true
"sourceMap": true
}
},
"defaultConfiguration": "production"
Expand All @@ -235,10 +229,10 @@
"builder": "@angular-devkit/build-angular:dev-server",
"configurations": {
"production": {
"browserTarget": "components-app:build:production"
"buildTarget": "components-app:build:production"
},
"development": {
"browserTarget": "components-app:build:development"
"buildTarget": "components-app:build:development"
}
},
"defaultConfiguration": "development"
Expand Down Expand Up @@ -266,11 +260,11 @@
"prefix": "e2e",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"builder": "@angular-devkit/build-angular:application",
"options": {
"outputPath": "dist/components-testing-app",
"index": "apps/components-testing-app/src/index.html",
"main": "apps/components-testing-app/src/main.ts",
"browser": "apps/components-testing-app/src/main.ts",
"polyfills": [
"zone.js"
],
Expand Down Expand Up @@ -307,12 +301,9 @@
"outputHashing": "all"
},
"development": {
"buildOptimizer": false,
"optimization": false,
"vendorChunk": true,
"extractLicenses": false,
"sourceMap": true,
"namedChunks": true
"sourceMap": true
}
},
"defaultConfiguration": "production"
Expand All @@ -321,10 +312,10 @@
"builder": "@angular-devkit/build-angular:dev-server",
"configurations": {
"production": {
"browserTarget": "components-testing-app:build:production"
"buildTarget": "components-testing-app:build:production"
},
"development": {
"browserTarget": "components-testing-app:build:development"
"buildTarget": "components-testing-app:build:development"
}
},
"defaultConfiguration": "development"
Expand All @@ -340,18 +331,5 @@
}
}
}
},
"cli": {
"schematicCollections": [
"@angular-eslint/schematics"
]
},
"schematics": {
"@angular-eslint/schematics:application": {
"setParserOptionsProject": true
},
"@angular-eslint/schematics:library": {
"setParserOptionsProject": true
}
}
}
3 changes: 1 addition & 2 deletions apps/components/tsconfig.app.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
"compilerOptions": {
"outDir": "../../out-tsc/apps/components",
"types": [],
"resolveJsonModule": true,
"allowSyntheticDefaultImports": true
"resolveJsonModule": true
},
"files": [
"src/main.ts"
Expand Down
Loading

0 comments on commit ac7f284

Please sign in to comment.