diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e1d07f05..29bf5e67 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,12 +14,12 @@ jobs: strategy: matrix: os: [ubuntu-latest] - node-version: [16.x] + node-version: [20.x] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - - uses: actions/cache@v2 + - uses: actions/cache@v4 id: npm-cache with: path: node_modules @@ -27,7 +27,7 @@ jobs: restore-keys: ${{ runner.os }}-npm - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} diff --git a/.gitignore b/.gitignore index 0711527e..cc7b1413 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -# See http://help.github.com/ignore-files/ for more about ignoring files. +# See https://docs.github.com/get-started/getting-started-with-git/ignoring-files for more about ignoring files. # Compiled output /dist diff --git a/angular.json b/angular.json index 19f2eb6a..4ab334c5 100644 --- a/angular.json +++ b/angular.json @@ -8,9 +8,6 @@ "schematics": { "@schematics/angular:component": { "style": "scss" - }, - "@schematics/angular:application": { - "strict": true } }, "root": "", @@ -18,12 +15,14 @@ "prefix": "app", "architect": { "build": { - "builder": "@angular-devkit/build-angular:browser", + "builder": "@angular-devkit/build-angular:application", "options": { "outputPath": "dist", "index": "src/index.html", - "main": "src/main.ts", - "polyfills": "src/polyfills.ts", + "browser": "src/main.ts", + "polyfills": [ + "zone.js" + ], "tsConfig": "tsconfig.app.json", "inlineStyleLanguage": "scss", "assets": [ @@ -49,21 +48,12 @@ "maximumError": "4kb" } ], - "fileReplacements": [ - { - "replace": "src/environments/environment.ts", - "with": "src/environments/environment.prod.ts" - } - ], "outputHashing": "all" }, "development": { - "buildOptimizer": false, "optimization": false, - "vendorChunk": true, "extractLicenses": false, - "sourceMap": true, - "namedChunks": true + "sourceMap": true } }, "defaultConfiguration": "production" @@ -72,10 +62,10 @@ "builder": "@angular-devkit/build-angular:dev-server", "configurations": { "production": { - "browserTarget": "ngx-img-fallback:build:production" + "buildTarget": "ngx-img-fallback:build:production" }, "development": { - "browserTarget": "ngx-img-fallback:build:development" + "buildTarget": "ngx-img-fallback:build:development" } }, "defaultConfiguration": "development" @@ -83,16 +73,17 @@ "extract-i18n": { "builder": "@angular-devkit/build-angular:extract-i18n", "options": { - "browserTarget": "ngx-img-fallback:build" + "buildTarget": "ngx-img-fallback:build" } }, "test": { "builder": "@angular-devkit/build-angular:karma", "options": { - "main": "src/test.ts", - "polyfills": "src/polyfills.ts", + "polyfills": [ + "zone.js", + "zone.js/testing" + ], "tsConfig": "tsconfig.spec.json", - "karmaConfig": "karma.conf.js", "inlineStyleLanguage": "scss", "assets": [ "src/favicon.ico", @@ -104,12 +95,10 @@ "scripts": [] } }, - "e2e": { + "cypress-run": { "builder": "@cypress/schematic:cypress", "options": { - "devServerTarget": "ngx-img-fallback:serve", - "watch": true, - "headless": false + "devServerTarget": "ngx-img-fallback:serve" }, "configurations": { "production": { @@ -117,26 +106,27 @@ } } }, - "cypress-run": { + "cypress-open": { "builder": "@cypress/schematic:cypress", "options": { - "devServerTarget": "ngx-img-fallback:serve" - }, - "configurations": { - "production": { - "devServerTarget": "ngx-img-fallback:serve:production" - } + "watch": true, + "headless": false } }, - "cypress-open": { + "e2e": { "builder": "@cypress/schematic:cypress", "options": { + "devServerTarget": "ngx-img-fallback:serve", "watch": true, "headless": false + }, + "configurations": { + "production": { + "devServerTarget": "ngx-img-fallback:serve:production" + } } } } } - }, - "defaultProject": "ngx-img-fallback" + } } \ No newline at end of file diff --git a/cypress.config.ts b/cypress.config.ts new file mode 100644 index 00000000..3a125109 --- /dev/null +++ b/cypress.config.ts @@ -0,0 +1,14 @@ +import { defineConfig } from "cypress"; + +export default defineConfig({ + videosFolder: "cypress/videos", + screenshotsFolder: "cypress/screenshots", + fixturesFolder: "cypress/fixtures", + + e2e: { + baseUrl: 'http://localhost:4200', + setupNodeEvents(on, config) { + // implement node event listeners here + }, + }, +}); diff --git a/cypress.json b/cypress.json deleted file mode 100644 index bd321dcb..00000000 --- a/cypress.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "integrationFolder": "cypress/integration", - "supportFile": "cypress/support/index.ts", - "videosFolder": "cypress/videos", - "screenshotsFolder": "cypress/screenshots", - "pluginsFile": "cypress/plugins/index.ts", - "fixturesFolder": "cypress/fixtures", - "baseUrl": "http://localhost:4200" -} \ No newline at end of file diff --git a/cypress/integration/app.e2d-spec.ts b/cypress/e2e/spec.cy.ts similarity index 100% rename from cypress/integration/app.e2d-spec.ts rename to cypress/e2e/spec.cy.ts diff --git a/cypress/support/index.ts b/cypress/support/e2e.ts similarity index 100% rename from cypress/support/index.ts rename to cypress/support/e2e.ts diff --git a/docs/3rdpartylicenses.txt b/docs/3rdpartylicenses.txt index 4ee52abd..9c101352 100644 --- a/docs/3rdpartylicenses.txt +++ b/docs/3rdpartylicenses.txt @@ -1,14 +1,13 @@ -@angular/common -MIT -@angular/core -MIT +-------------------------------------------------------------------------------- +Package: @angular/core +License: "MIT" -@angular/platform-browser -MIT -rxjs -Apache-2.0 +-------------------------------------------------------------------------------- +Package: rxjs +License: "Apache-2.0" + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -212,27 +211,23 @@ Apache-2.0 limitations under the License. +-------------------------------------------------------------------------------- +Package: @angular/common +License: "MIT" + -tslib -0BSD -Copyright (c) Microsoft Corporation. +-------------------------------------------------------------------------------- +Package: @angular/platform-browser +License: "MIT" -Permission to use, copy, modify, and/or distribute this software for any -purpose with or without fee is hereby granted. -THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH -REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY -AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, -INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM -LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR -OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -PERFORMANCE OF THIS SOFTWARE. +-------------------------------------------------------------------------------- +Package: zone.js +License: "MIT" -zone.js -MIT The MIT License -Copyright (c) 2010-2022 Google LLC. https://angular.io/license +Copyright (c) 2010-2024 Google LLC. https://angular.io/license Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -251,3 +246,5 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +-------------------------------------------------------------------------------- diff --git a/docs/404.html b/docs/404.html index b4f25577..dc4468d2 100644 --- a/docs/404.html +++ b/docs/404.html @@ -1,4 +1,7 @@ -
+ + + +