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'; + Scully demo blog app! rendering inside scully🏠

Overview of blog posts

Deeply embedded

11/27/19

This is the deep folder demo page in this sample.

This is my post in Russian

blog description

My first page

11/26/19

This is the first demo page in this sample.

My third page

11/28/19

At this point, I should write something different in here.

The Rainbow Cat, A free book out of the Guttenberg library

12/16/19

/blog/page-5

My sixth page

1/1/20

This is the sixth demo page in this sample.

My test sub page

11/27/19

This is the second demo page in this sample.

diff --git a/tests/jest/src/__tests__/__snapshots__/contentText.spec.ts.snap b/tests/jest/src/__tests__/__snapshots__/contentText.spec.ts.snap index 22dcd5353..db79f51d4 100644 --- a/tests/jest/src/__tests__/__snapshots__/contentText.spec.ts.snap +++ b/tests/jest/src/__tests__/__snapshots__/contentText.spec.ts.snap @@ -8,7 +8,7 @@ exports[`customText plugin Check content generated form function 1`] = ` - + Scully demo blog app! rendering inside scully🏠

All routes in application

Top level routes onlyUnpublished routes
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🏠

Users

IdUsername
1 Leanne \\"Graham o'neil\\"
2 Ervin \`Howell\`
3 Clementine Bauch
4 Patricia Lebsack
5 Chelsey Dietrich
6 Mrs. Dennis Schulist
7 Kurtis Weissnat
8 Nicholas Runolfsdottir V
9 Glenna Reichert
10 Clementina DuBuque
diff --git a/tests/jest/src/__tests__/flash-prevention.spec.ts b/tests/jest/src/__tests__/flash-prevention.spec.ts index 77dbd2dac..ea912201e 100644 --- a/tests/jest/src/__tests__/flash-prevention.spec.ts +++ b/tests/jest/src/__tests__/flash-prevention.spec.ts @@ -1,3 +1,6 @@ +import { TextEncoder, TextDecoder } from 'util' +global.TextEncoder = TextEncoder +global.TextDecoder = TextDecoder import { DOMWindow, JSDOM } from 'jsdom'; import { readPage, replaceIndexNG } from '../test-config.helper'; diff --git a/tools/releaseChecksums.release.json b/tools/releaseChecksums.release.json index 34aa23644..e1aa70dcb 100644 --- a/tools/releaseChecksums.release.json +++ b/tools/releaseChecksums.release.json @@ -1,122 +1,122 @@ [ { - "name": "scully", - "root": "libs/scully", - "dist": "dist/libs/scully", - "pkg": "@scullyio/scully", - "version": "1.1.1", - "hash": "22b5a0ba2d769f1c1b52eca8c2369dd0" + "name": "local-cache", + "root": "libs/plugins/scully-plugin-local-cache", + "dist": "dist/libs/scully-plugin-local-cache", + "pkg": "@scullyio/scully-plugin-local-cache", + "version": "2.0.0", + "hash": "b559fa3f87f949f8a859c83146569951" }, { "name": "ng-lib", "root": "libs/ng-lib", "dist": "dist/libs/ng-lib", "pkg": "@scullyio/ng-lib", - "version": "1.1.1", - "hash": "ba2a4275e3e59260534ca6d6e1364c01" + "version": "2.0.0", + "hash": "7dbc02ee3ff4b43aede13dde3758d59d" }, { - "name": "scully-schematics", - "root": "libs/scully-schematics", - "dist": "dist/libs/scully-schematics", - "pkg": "@scullyio/init", - "version": "1.1.4", - "hash": "a141dd00a35a763dd06ff2158c1b2321" + "name": "plugins-base-href-rewrite", + "root": "libs/plugins/base-href-rewrite", + "dist": "dist/libs/scully-plugin-base-href-rewrite", + "pkg": "@scullyio/scully-plugin-base-href-rewrite", + "version": "2.0.0", + "hash": "5b4543e148a4ba5b6d8f61fd9d297085" + }, + { + "name": "plugins-docs-link-update", + "root": "libs/plugins/docs-link-update", + "dist": "dist/libs/scully-plugin-docs-link-update", + "pkg": "@scullyio/scully-plugin-docs-link-update", + "version": "2.0.0", + "hash": "15ad964828617d7b14d0617615fcfed2" }, { "name": "plugins-extra", "root": "libs/plugins/extra", "dist": "dist/libs/scully-plugin-extra", "pkg": "@scullyio/scully-plugin-extra", - "version": "1.1.1", - "hash": "bd5b274f39a38b6debabf20d341c8ecc" + "version": "2.0.0", + "hash": "9c13f6180ed66768d5d51c77a5118999" }, { "name": "plugins-from-data", "root": "libs/plugins/from-data", "dist": "dist/libs/scully-plugin-from-data", "pkg": "@scullyio/scully-plugin-from-data", - "version": "1.1.1", - "hash": "db353e59b80181484c3b44edcab7f84a" + "version": "2.0.0", + "hash": "66693f9428f4ee8e9e844a60d1f52527" }, { - "name": "plugins-base-href-rewrite", - "root": "libs/plugins/base-href-rewrite", - "dist": "dist/libs/scully-plugin-base-href-rewrite", - "pkg": "@scullyio/scully-plugin-base-href-rewrite", - "version": "1.1.1", - "hash": "1181b67ddf92d270bc1c8b5cfc347c0d" - }, - { - "name": "plugins-scully-plugin-flash-prevention", - "root": "libs/plugins/scully-plugin-flash-prevention", - "dist": "dist/libs/scully-plugin-flash-prevention", - "pkg": "@scullyio/scully-plugin-flash-prevention", - "version": "1.1.1", - "hash": "2137c55328ce9049d0ec2170cd5b9eb2" + "name": "plugins-google-analytics", + "root": "libs/plugins/google-analytics", + "dist": "dist/libs/scully-plugin-google-analytics", + "pkg": "@scullyio/scully-plugin-google-analytics", + "version": "2.0.0", + "hash": "23b005fb89e34393fac5a996b26d8c9e" }, { "name": "plugins-logrocket", "root": "libs/plugins/logrocket", "dist": "dist/libs/scully-plugin-logrocket", "pkg": "@scullyio/scully-plugin-logrocket", - "version": "1.1.1", - "hash": "0703a6e5db77f35d2820b5eb2d82c192" + "version": "2.0.0", + "hash": "0d75b2f33afb9a0c569633d7166f1bbf" }, { - "name": "plugins-sentry", - "root": "libs/plugins/sentry", - "dist": "dist/libs/scully-plugin-sentry", - "pkg": "@scullyio/scully-plugin-sentry", - "version": "1.1.1", - "hash": "c004294116cbb62894a7fbab80e3ebcb" + "name": "plugins-scully-plugin-copy-to-clipboard", + "root": "libs/plugins/scully-plugin-copy-to-clipboard", + "dist": "dist/libs/scully-plugin-copy-to-clipboard", + "pkg": "@scullyio/scully-plugin-copy-to-clipboard", + "version": "1.0.0", + "hash": "8f79f82ad8c79b528be3b92242676d6a" }, { - "name": "plugins-google-analytics", - "root": "libs/plugins/google-analytics", - "dist": "dist/libs/scully-plugin-google-analytics", - "pkg": "@scullyio/scully-plugin-google-analytics", - "version": "1.1.1", - "hash": "0d4f93e31e56babbc9c895bc01706c29" + "name": "plugins-scully-plugin-critical-css", + "root": "libs/plugins/scully-plugin-critical-css", + "dist": "dist/libs/scully-plugin-critical-css", + "pkg": "@scullyio/scully-plugin-critical-css", + "version": "1.0.0", + "hash": "24b4f89ffaffbaca34c638a6f7fea08f" }, { - "name": "plugins-docs-link-update", - "root": "libs/plugins/docs-link-update", - "dist": "dist/libs/scully-plugin-docs-link-update", - "pkg": "@scullyio/scully-plugin-docs-link-update", - "version": "1.1.1", - "hash": "1c9fdde9206b628f7047149e2c50371b" + "name": "plugins-scully-plugin-flash-prevention", + "root": "libs/plugins/scully-plugin-flash-prevention", + "dist": "dist/libs/scully-plugin-flash-prevention", + "pkg": "@scullyio/scully-plugin-flash-prevention", + "version": "2.0.0", + "hash": "35e7c2869542a08f02e8bc02f8c089d2" }, { "name": "plugins-scully-plugin-remove-scripts", "root": "libs/plugins/scully-plugin-remove-scripts", "dist": "dist/libs/scully-plugin-remove-scripts", "pkg": "@scullyio/scully-plugin-remove-scripts", - "version": "1.1.1", - "hash": "8d9f2b5bd28811a1b11ab8124cabd7df" + "version": "2.0.0", + "hash": "31131d39ecf891fb801892b0b30e6ac6" }, { - "name": "plugins-scully-plugin-critical-css", - "root": "libs/plugins/scully-plugin-critical-css", - "dist": "dist/libs/scully-plugin-critical-css", - "pkg": "@scullyio/scully-plugin-critical-css", - "version": "0.1.1", - "hash": "5b89993e3c1930940021c7b119cef90b" + "name": "plugins-sentry", + "root": "libs/plugins/sentry", + "dist": "dist/libs/scully-plugin-sentry", + "pkg": "@scullyio/scully-plugin-sentry", + "version": "2.0.0", + "hash": "a822e94af8fec028c367d3aec9dd95eb" }, { - "name": "plugins-scully-plugin-copy-to-clipboard", - "root": "libs/plugins/scully-plugin-copy-to-clipboard", - "dist": "dist/libs/scully-plugin-copy-to-clipboard", - "pkg": "@scullyio/scully-plugin-copy-to-clipboard", - "version": "0.1.1", - "hash": "72d084fb379878412f0c4b4d83e2c0fb" + "name": "scully", + "root": "libs/scully", + "dist": "dist/libs/scully", + "pkg": "@scullyio/scully", + "version": "2.0.0", + "hash": "0470adb0b049e158ac48f9e5cc4456ba" }, { - "name": "local-cache", - "root": "libs/plugins/scully-plugin-local-cache", - "dist": "dist/libs/scully-plugin-local-cache", - "pkg": "@scullyio/scully-plugin-local-cache", - "version": "0.1.1", - "hash": "7a3b00be2bec353d8ea74da88ce0d20b" + "name": "scully-schematics", + "root": "libs/scully-schematics", + "dist": "dist/libs/scully-schematics", + "pkg": "@scullyio/init", + "version": "2.0.0", + "hash": "576c426ca101bc9573b47c1b0bba74a0" } -] +] \ No newline at end of file