refactor: bring next in line with main branch (scullyio#1557)

* feat(platform-server): limit to version 12, as version 13 needs ESM (scullyio#1522) * chore: bump version and tag it to 2.1.7 * Bump marked to resolve security advisory (scullyio#1526) * fix(scully): upgrade marked version * fix(scully): upgrade @types/marked * chore: bump version and tag it to 2.1.8 * ci: add codeql scanning to the workflow (scullyio#1528) * chore: bump version and tag it to 2.1.9 * feat(ng-lib): use GuardsCheckEnd instead of Navigationend. see scullyio#1529 (scullyio#1533) * feat(ng-lib): use GuardsCheckEnd instead of Navigationend. see scullyio#1529 ISSUES CLOSED: scullyio#1529 * fix(monorepo): add workaround for [#22606](angular/angular-cli#22606) ISSUES CLOSED: scullyio#1529 * test(ng-lib): add test to check if tss works with route-resolvers ISSUES CLOSED: scullyio#1529 * chore: bump version and tag it to 2.1.10 * fix(scully): kill background server on exit (scullyio#1535) This will forcefully kill the background server when scully is done processing ISSUES CLOSED: scullyio#1513 * chore: bump version and tag it to 2.1.11 * chore(deps): bump nanoid from 3.1.30 to 3.2.0 (scullyio#1534) Bumps [nanoid](https://github.com/ai/nanoid) from 3.1.30 to 3.2.0. - [Release notes](https://github.com/ai/nanoid/releases) - [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md) - [Commits](ai/nanoid@3.1.30...3.2.0) --- updated-dependencies: - dependency-name: nanoid dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore: bump version and tag it to 2.1.12 * chore(deps): bump follow-redirects from 1.14.6 to 1.14.8 (scullyio#1540) Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.6 to 1.14.8. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](follow-redirects/follow-redirects@v1.14.6...v1.14.8) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore: bump version and tag it to 2.1.13 * fix(ng-lib): don't error when routing from non-Scully page to Scully-genreated page (scullyio#1541) * chore: bump version and tag it to 2.1.14 * chore(deps): bump url-parse from 1.5.4 to 1.5.7 (scullyio#1542) Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.5.4 to 1.5.7. - [Release notes](https://github.com/unshiftio/url-parse/releases) - [Commits](unshiftio/url-parse@1.5.4...1.5.7) --- updated-dependencies: - dependency-name: url-parse dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore: bump version and tag it to 2.1.15 * Added spanish translations responding to issue scullyio#1321 (scullyio#1445) * Added spanish translations responding to issue scullyio#1321 * Update docs/learn/create-a-plugin/create-a-plugin_es.md Co-authored-by: Andrés Villanueva <andresvillanuevab@gmail.com> Co-authored-by: Sander Elias <SanderElias@users.noreply.github.com> Co-authored-by: Andrés Villanueva <andresvillanuevab@gmail.com> * chore: bump version and tag it to 2.1.16 * chore(monorepo): merge in main * chore(deps): bump prismjs from 1.25.0 to 1.27.0 (scullyio#1548) Bumps [prismjs](https://github.com/PrismJS/prism) from 1.25.0 to 1.27.0. - [Release notes](https://github.com/PrismJS/prism/releases) - [Changelog](https://github.com/PrismJS/prism/blob/master/CHANGELOG.md) - [Commits](PrismJS/prism@v1.25.0...v1.27.0) --- updated-dependencies: - dependency-name: prismjs dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore: bump version and tag it to 2.1.17 * fix(schematics): Get schematic tests running and passing plus add logic for gitignore (scullyio#1547) entries * chore: bump version and tag it to 2.1.18 * chore(monorepo): update depedencies (PPT & PW) to try fixing some scuritty warings (scullyio#1551) * chore: bump version and tag it to 2.1.19 * fix(scully): update selfsigned to fix security issue when using SSL selfsigned certifiates (scullyio#1552) * chore: bump version and tag it to 2.1.20 * fix(schematics): make sure the schematics install the latest version off our playwright plugin, instead of 0.0.2 (scullyio#1554) * chore: bump version and tag it to 2.1.21 * refactor(Actions): we don't need to build after the build-artifacts, because its already there (scullyio#1555) * chore: bump version and tag it to 2.1.22 * test: updated configuration to run tests for schematics and sps, univ… (scullyio#1482) * chore: bump version and tag it to 2.1.23 * chore(monorepo): updating deps * chore(monorepo): upgrade to latest nx * chore(monorepo): bump version * fix(actions): fix on node version 16.13.2 untill next node versions are released * fix(scully): update deps for ESM use * fix(scully-plugin-puppeteer): correct depedency import, move from peerdeps to deps (it was in scully Co-authored-by: Scully-Bot <Scully-Bot@users.noreply.github.com> Co-authored-by: Zsofia Florek <58311322+zsofiaflorek@users.noreply.github.com> Co-authored-by: Jeffrey Bosch <Jefiozie@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: manueldose <71591743+manueldose@users.noreply.github.com> Co-authored-by: Andrés Villanueva <andresvillanuevab@gmail.com> Co-authored-by: Mike Brocchi <mbrocchi@gmail.com>
fredericbirke · Feb 18, 2023 · 0b27b1a · 0b27b1a
1 parent 9632f2b
commit 0b27b1a
Show file tree

Hide file tree

Showing 32 changed files with 21,110 additions and 15,830 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -1,12 +1,12 @@
-name: 'CodeQL analysis'
+name: "CodeQL analysis"
 
 on:
   push:
-    branches: [main]
+    branches: [ main ]
   pull_request:
-    branches: [main]
+    branches: [ main ]
   schedule:
-    # every wednesday ay 2.29
+  # every wednesday ay 2.29
     - cron: '29 2 * * 3'
 
 jobs:
@@ -21,30 +21,30 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: ['javascript', 'typescript']
+        language: [ 'javascript', 'typescript' ]
 
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v1
-        with:
-          languages: ${{ matrix.language }}
-      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-      # If this step fails, then you should remove it and run the build manually (see below)
-      - name: Autobuild
-        uses: github/codeql-action/autobuild@v1
-
-      # ℹ️ Command-line programs to run using the OS shell.
-      # 📚 https://git.io/JvXDl
-
-      # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-      #    and modify them (or add more) to build your code if your project
-      #    uses a compiled language
-
-      #- run: |
-      #   make bootstrap
-      #   make release
-
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v1
+    - name: Checkout repository
+      uses: actions/checkout@v2
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: [16.x, 14.x]
+        node: [16.13.2, 14.x]
     steps:
       - name: Checkout branch
         uses: actions/checkout@v2
@@ -29,7 +29,7 @@ jobs:
 
     strategy:
       matrix:
-        node: [16.x]
+        node: [16.13.2]
         renderer: [sps, ppt, pw]
 
     steps:
@@ -58,7 +58,7 @@ jobs:
 
     strategy:
       matrix:
-        node: [16.x]
+        node: [16.13.2]
         renderer: [sps, ppt, pw]
 
     steps:
@@ -88,7 +88,7 @@ jobs:
 
     strategy:
       matrix:
-        node: [16.x]
+        node: [16.13.2]
         renderer: [sps, ppt, pw]
 
     steps:
@@ -120,7 +120,7 @@ jobs:
 
     strategy:
       matrix:
-        node: [16.x]
+        node: [16.13.2]
         renderer: [sps, ppt, pw]
 
     steps:
@@ -153,8 +153,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: [16.x, 14.x]
-        angular: [12, 13]
+        node: [16.13.2, 14.x]
+        angular: [12, 13, next]
     steps:
       - name: Checkout branch
         uses: actions/checkout@v2

diff --git a/docs/Reference/plugins/built-in-plugins/criticalcss_es.md b/docs/Reference/plugins/built-in-plugins/criticalcss_es.md
@@ -33,7 +33,7 @@ export const config: ScullyConfig = {
   /** más configuración aquí */
   routes: {
     /** más configuración aquí */
-  }
+  },
 };
 ```
 
@@ -58,7 +58,7 @@ Puede configurar este plugin utilizando el ayudante setPluginConfig de esta mane
 
 ```typescript
 setPluginConfig(criticalCSS, {
-  inlineImages: false
+  inlineImages: false,
 });
 ```
 

diff --git a/docs/learn/create-a-plugin/create-a-plugin_es.md b/docs/learn/create-a-plugin/create-a-plugin_es.md
@@ -99,12 +99,12 @@ export const config: ScullyConfig = {
     '/blog/:slug': {
       type: 'contentFolder',
       slug: {
-        folder: './blog'
+        folder: './blog',
       },
-      postRenderers: [customPlugin]
-    }
+      postRenderers: [customPlugin],
+    },
   },
-  defaultPostRenderers: [customPlugin]
+  defaultPostRenderers: [customPlugin],
 };
 ```
 
@@ -138,7 +138,7 @@ const pluginName = Symbol('customPlugin');
 const customPlugin = findPlugin(pluginName);
 ```
 
-Ahora que tiene acceso al plugin, puede invocarlo pasándole los parámetros necesarios. Por ejemplo, un plugin `postProcessByHtml` generalmente necesita un string `html` y un `HandledRoute`. Un plugin `router` generalmente necesita un string `route` y un parámetro `config`.
+Ahora que tiene acceso al plugin, puede invocarlo pasándole los parámetros necesarios. Por ejemplo, un plugin  `postProcessByHtml` generalmente necesita un string `html` y un `HandledRoute`. Un plugin `router` generalmente necesita un string `route` y un parámetro `config`.
 
 ```ts
 // ./scully/plugins/custom-plugin.spec.ts

diff --git a/docs/learn/use-netlify-cms/use-netlify-cms_es.md b/docs/learn/use-netlify-cms/use-netlify-cms_es.md
@@ -107,7 +107,7 @@ Ok, ahora entrarás en los complementos a la aplicación Angular. En primer luga
 
 <script>
   if (window.netlifyIdentity) {
-    window.netlifyIdentity.on('init', user => {
+    window.netlifyIdentity.on('init', (user) => {
       if (!user) {
         window.netlifyIdentity.on('login', () => {
           document.location.href = '/admin/';
@@ -161,7 +161,12 @@ collections:
       - { label: 'Slug', name: 'slug', widget: 'string' }
       - { label: 'Publish Date', name: 'publishDate', widget: 'datetime' }
       - { label: 'Body', name: 'body', widget: 'markdown' }
-      - { label: 'Published', name: 'published', widget: 'boolean', default: true }
+      - {
+          label: 'Published',
+          name: 'published',
+          widget: 'boolean',
+          default: true,
+        }
 media_folder: 'static/img' # Carpeta donde deben ir los archivos cargados por el usuario
 ```
 

diff --git a/libs/ng-lib/package.json b/libs/ng-lib/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@scullyio/ng-lib",
-  "version": "2.1.42",
+  "version": "3.0.0-beta.1",
   "repository": {
     "type": "GIT",
     "url": "https://github.com/scullyio/scully/tree/main/libs/ng-lib"
@@ -21,4 +21,4 @@
     "scully-plugin",
     "plugin"
   ]
-}
+}
diff --git a/libs/platform-server/package.json b/libs/platform-server/package.json
@@ -1,13 +1,12 @@
 {
   "name": "@scullyio/platform-server",
-  "version": "2.1.42",
+  "version": "3.0.0-beta.1",
   "peerDependencies": {
-    "@angular/common": ">12.0.0 || <13.0.0",
-    "@angular/core": ">12.0.0 || <13.0.0",
-    "@angular/platform-server": ">12.0.0 || <13.0.0",
-    "@scullyio/ng-lib": ">2.0.0 || <3.0.0"
+    "@angular/common": ">12.2.0",
+    "@angular/core": ">12.2.0",
+    "@angular/platform-server": ">12.2.0",
+    "@scullyio/ng-lib": "x.x.x",
+    "node": ">16.0.0"
   },
-  "dependencies": {
-    "tslib": "^2.3.1"
-  }
-}
+  "type": "module"
+}
diff --git a/libs/plugins/base-href-rewrite/package.json b/libs/plugins/base-href-rewrite/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@scullyio/scully-plugin-base-href-rewrite",
-  "version": "2.1.42",
+  "version": "3.0.0-beta.1",
   "main": "./src/index.js",
   "author": "Sander Elias",
   "repository": {
@@ -11,4 +11,4 @@
   "peerDependencies": {
     "@scullyio/scully": "*"
   }
-}
+}
diff --git a/libs/plugins/docs-link-update/package.json b/libs/plugins/docs-link-update/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@scullyio/scully-plugin-docs-link-update",
-  "version": "2.1.42",
+  "version": "3.0.0-beta.1",
   "peerDependencies": {
     "@scullyio/scully": "*",
     "jsdom": "^19.0.0"
@@ -9,6 +9,7 @@
     "type": "GIT",
     "url": "https://github.com/scullyio/scully/tree/main/libs/plugins/docs-link-update"
   },
+  "type": "module",
   "dependencies": {},
   "keywords": [
     "angular",
@@ -17,4 +18,4 @@
     "scully-plugin",
     "plugin"
   ]
-}
+}
diff --git a/libs/plugins/extra/package.json b/libs/plugins/extra/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@scullyio/scully-plugin-extra",
-  "version": "2.1.42",
+  "version": "3.0.0-beta.1",
   "description": "Scully extra demo plugin",
   "main": "./src/index.js",
   "scripts": {},
@@ -21,4 +21,4 @@
     "scully-plugin",
     "plugin"
   ]
-}
+}
diff --git a/libs/plugins/from-data/package.json b/libs/plugins/from-data/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@scullyio/scully-plugin-from-data",
-  "version": "2.1.42",
+  "version": "3.0.0-beta.1",
   "description": "Scully demo data plugin",
   "main": "./src/index.js",
   "author": "",
@@ -22,4 +22,4 @@
     "scully-plugin",
     "plugin"
   ]
-}
+}
diff --git a/libs/plugins/google-analytics/package.json b/libs/plugins/google-analytics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@scullyio/scully-plugin-google-analytics",
-  "version": "2.1.42",
+  "version": "3.0.0-beta.1",
   "author": "Israel Guzman",
   "repository": {
     "type": "GIT",
@@ -18,4 +18,4 @@
     "scully-plugin",
     "plugin"
   ]
-}
+}
diff --git a/libs/plugins/logrocket/package.json b/libs/plugins/logrocket/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@scullyio/scully-plugin-logrocket",
-  "version": "2.1.42",
+  "version": "3.0.0-beta.1",
   "repository": {
     "type": "GIT",
     "url": "https://github.com/scullyio/scully/tree/main/libs/plugins/logrocket"
@@ -19,4 +19,4 @@
     "scully-plugin",
     "plugin"
   ]
-}
+}
diff --git a/libs/plugins/scully-plugin-copy-to-clipboard/package.json b/libs/plugins/scully-plugin-copy-to-clipboard/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@scullyio/scully-plugin-copy-to-clipboard",
-  "version": "2.1.42",
+  "version": "3.0.0-beta.1",
   "author": "Ankit Prajapati",
   "license": "MIT",
   "repository": {
@@ -20,4 +20,4 @@
     "scully-plugin",
     "plugin"
   ]
-}
+}
diff --git a/libs/plugins/scully-plugin-critical-css/package.json b/libs/plugins/scully-plugin-critical-css/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@scullyio/scully-plugin-critical-css",
-  "version": "2.1.42",
+  "version": "3.0.0-beta.1",
   "peerDependencies": {
     "@scullyio/scully": "*"
   },
@@ -19,4 +19,4 @@
   "dependencies": {
     "critical": "^4.0.1"
   }
-}
+}
diff --git a/libs/plugins/scully-plugin-flash-prevention/package.json b/libs/plugins/scully-plugin-flash-prevention/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@scullyio/scully-plugin-flash-prevention",
-  "version": "2.1.42",
+  "version": "3.0.0-beta.1",
   "main": "./index.js",
   "contributors": [
     "Aaron Frost <aaronfrost@gmail.com>"
@@ -22,4 +22,4 @@
     "scully-plugin",
     "plugin"
   ]
-}
+}
diff --git a/libs/plugins/scully-plugin-local-cache/package.json b/libs/plugins/scully-plugin-local-cache/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@scullyio/scully-plugin-local-cache",
-  "version": "2.1.42",
+  "version": "3.0.0-beta.1",
   "dependencies": {
     "level": "*"
   },
@@ -12,4 +12,4 @@
     "puppeteer": "*",
     "@scullyio/scully": "*"
   }
-}
+}