diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index 75f10fe09..18ea5204b 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -16,7 +16,7 @@ jobs:
strategy:
matrix:
- node: [12.x, 14.x]
+ node: [14.x, 16.x]
steps:
- name: Checkout branch
@@ -276,13 +276,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
- prop:
- [
- { node: 12, angular: 10 },
- { node: 12, angular: 11 },
- { node: 14, angular: 10 },
- { node: 14, angular: 11 },
- ]
+ prop: [{ node: 14, angular: 12 }, { node: 16, angular: 12 }]
steps:
- name: Setup angular project and run all tests
uses: actions/setup-node@v2
@@ -291,11 +285,11 @@ jobs:
env:
CI: true
- run: export NG_CLI_ANALYTICS=false false
- - run: npm i @angular/cli@${{ matrix.prop.angular }} @scullyio/scully@develop @scullyio/ng-lib@develop
+ - run: npm i @angular/cli@${{ matrix.prop.angular }} @scullyio/scully@develop @scullyio/ng-lib@develop --force
- run: npx ng new demo --skipGit --routing --style css --minimal --strict
- run: cd demo && npx ng g m home --route home --module app.module
- run: cd demo && npx ng g m about --route about --module app.module
- - run: cd demo && npx ng add @scullyio/init@develop
+ - run: cd demo && npx ng add @scullyio/init@develop --skip-confirmation
- run: cd demo && npx ng g @scullyio/init:blog
- run: cd demo && npx ng build
- run: cd demo && npx scully --noPrompt
diff --git a/README.md b/README.md
index cf9a0682f..316b645d5 100644
--- a/README.md
+++ b/README.md
@@ -44,6 +44,10 @@ those who want to know more about the theory behind pre-rendering JavaScript SPA
wrote a [free book about the Jamstack](https://www.netlify.com/pdf/oreilly-modern-web-development-on-the-jamstack.pdf).
Check that out today.
+> ### NOTE!
+> Please notice that with the release of Scully version 2, support for Angular versions lower as 12 is deprecated.
+> for older versions, you can keep on using the existing 1.1.1 version, which will only receive security updates from now on.
+
#### GET A HOLD OF US 24/7
The Scully core team wants to help you any time you need us. We don’t want you to get stuck without help. To make this possible, you have the following ways to get a hold of our team:
diff --git a/apps/scully-docs/src/app/app-routing.module.ts b/apps/scully-docs/src/app/app-routing.module.ts
index cfc660a31..2e78656a1 100644
--- a/apps/scully-docs/src/app/app-routing.module.ts
+++ b/apps/scully-docs/src/app/app-routing.module.ts
@@ -15,6 +15,14 @@ const routes: Routes = [
path: 'ngconf',
loadChildren: () => import('./pages/extraPages/extra-page.module').then((m) => m.ExtraPageModule),
},
+ {
+ path: 'scully-user',
+ loadChildren: () => import('./pages/extraPages/extra-page.module').then((m) => m.ExtraPageModule),
+ },
+ {
+ path: 'consultancy',
+ loadChildren: () => import('./pages/extraPages/extra-page.module').then((m) => m.ExtraPageModule),
+ },
{
path: '404',
component: PageNotFoundComponent,
diff --git a/apps/scully-docs/src/app/app.component.ts b/apps/scully-docs/src/app/app.component.ts
index de80adcdc..3fc2ffc5c 100644
--- a/apps/scully-docs/src/app/app.component.ts
+++ b/apps/scully-docs/src/app/app.component.ts
@@ -26,6 +26,7 @@ import { NavListService } from './components/nav-list/nav-list.service';
export class AppComponent {
constructor(private router: Router, public nl: NavListService) {}
get isLandingPage() {
- return this.router.url === '/' || this.router.url === '/ngconf';
+ return !this.router.url.toLowerCase().includes('/docs')
+ // return this.router.url === '/' || this.router.url === '/ngconf';
}
}
diff --git a/apps/scully-docs/src/app/pages/extraPages/extra-page.module.ts b/apps/scully-docs/src/app/pages/extraPages/extra-page.module.ts
index 35c624194..51552005a 100644
--- a/apps/scully-docs/src/app/pages/extraPages/extra-page.module.ts
+++ b/apps/scully-docs/src/app/pages/extraPages/extra-page.module.ts
@@ -11,8 +11,12 @@ import { ScullyLibModule } from '@scullyio/ng-lib';
+
diff --git a/tests/jest/src/__tests__/__snapshots__/users.spec.ts.snap b/tests/jest/src/__tests__/__snapshots__/users.spec.ts.snap
index c28d7b610..bf06f55d2 100644
--- a/tests/jest/src/__tests__/__snapshots__/users.spec.ts.snap
+++ b/tests/jest/src/__tests__/__snapshots__/users.spec.ts.snap
@@ -8,7 +8,7 @@ exports[`JsonPlugin: test user List Check clean blog index by scully 1`] = `
-
+
Scully demo blog app! rendering inside scully🏠