Merge pull request #1 from OrchardCMS/dev

Update from the Github on 11-04-2021

.all-contributorsrc

@@ -2307,6 +2307,15 @@
  "contributions": [
  "code"
  ]
+ },
+ {
+ "login": "kdubious",
+ "name": "Kevin Welsh",
+ "avatar_url": "https://avatars.githubusercontent.com/u/9756166?v=4",
+ "profile": "https://welshtechnologies.com/",
+ "contributions": [
+ "code"
+ ]
  }
  ],
  "skipCi": true

.github/workflows/functional_all_db.yml

@@ -10,7 +10,7 @@ jobs:
  name: Functional Tests - MVC
  runs-on: ubuntu-latest
  container:
- image: cypress/included:6.8.0
+ image: cypress/included:7.0.0
  steps:
  - uses: actions/checkout@v2
  - uses: actions/setup-node@v2
@@ -43,7 +43,7 @@ jobs:
  name: Functional Tests - CMS Sqlite
  runs-on: ubuntu-latest
  container:
- image: cypress/included:6.8.0
+ image: cypress/included:7.0.0
  steps:
  - uses: actions/checkout@v2
  - name: Setup .NET Core 3.1
@@ -75,7 +75,7 @@ jobs:
  name: Functional Tests - CMS Postgres
  runs-on: ubuntu-latest
  container:
- image: cypress/included:6.8.0
+ image: cypress/included:7.0.0
  services:
  postgres:
  image: postgres:11
@@ -123,7 +123,7 @@ jobs:
  name: Functional Tests - CMS MySql
  runs-on: ubuntu-latest
  container:
- image: cypress/included:6.8.0
+ image: cypress/included:7.0.0
  services:
  mariadb:
  image: mariadb:latest
@@ -167,7 +167,7 @@ jobs:
  name: Functional Tests - CMS SqlServer 2019
  runs-on: ubuntu-latest
  container:
- image: cypress/included:6.8.0
+ image: cypress/included:7.0.0
  services:
  mssql:
  image: mcr.microsoft.com/mssql/server:2019-latest

CONTRIBUTING.md

@@ -17,7 +17,7 @@ Our team members also monitor other discussion forums:
 
 We accept fixes and features! Here are some resources to help you get started on how to contribute code or new content.
 
-* Look at the [documentation](/docs/).
+* Look at the [documentation](/src/docs/).
 * ["Help wanted" issues](https://github.com/orchardcms/orchardcore/labels/help%20wanted) - these issues are up for grabs. Comment on an issue if you want to create a fix.
 * ["Good first issue" issues](https://github.com/orchardcms/orchardcore/labels/good%20first%20issue) - we think these are a good for newcomers.
 

Contributors.md

@@ -1,7 +1,7 @@
 # Contributors ✨
 
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-247-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-248-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
@@ -340,6 +340,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
  </tr>
  <tr>
  <td align="center"><a href="https://github.com/ropstah"><img src="https://avatars.githubusercontent.com/u/5072557?v=4" width="100px;" alt=""/><br /><sub><b>ropstah</b></sub></a><br /><a href="https://github.com/OrchardCMS/OrchardCore/commits?author=ropstah" title="Code">💻</a></td>
+ <td align="center"><a href="https://welshtechnologies.com/"><img src="https://avatars.githubusercontent.com/u/9756166?v=4" width="100px;" alt=""/><br /><sub><b>Kevin Welsh</b></sub></a><br /><a href="https://github.com/OrchardCMS/OrchardCore/commits?author=kdubious" title="Code">💻</a></td>
  </tr>
 </table>
 

gulpfile.js

@@ -22,9 +22,6 @@ var fs = require("graceful-fs"),
  postcss = require('gulp-postcss'),
  rtl = require('postcss-rtl'),
  babel = require('gulp-babel');
- // The startbootstrap theme gulpfiles do not yet support node 15 so need to be installed and built seperately.
- // blogtheme = require('./src/OrchardCore.Themes/TheBlogTheme/wwwroot/gulpfile');
- // comingsoontheme = require('./src/OrchardCore.Themes/TheComingSoonTheme/wwwroot/gulpfile');
 
 // For compat with older versions of Node.js.
 require("es6-promise").polyfill();
@@ -62,7 +59,7 @@ gulp.task("watch", function () {
  var inputWatcher;
  function createWatcher() {
  inputWatcher = gulp.watch(watchPaths);
- inputWatcher.on('change', function (watchedPath) { 
+ inputWatcher.on('change', function (watchedPath) {
  var isConcat = path.basename(assetGroup.outputFileName, path.extname(assetGroup.outputFileName)) !== "@";
  if (isConcat)
  console.log("Asset file '" + watchedPath + "' was changed, rebuilding asset group with output '" + assetGroup.outputPath + "'.");
@@ -72,68 +69,30 @@ gulp.task("watch", function () {
  var task = createAssetGroupTask(assetGroup, doRebuild);
  });
  }
- 
+
  createWatcher();
- 
+
  gulp.watch(assetGroup.manifestPath).on('change', function (watchedPath) {
- console.log("Asset manifest file '" + watchedPath + "' was changed, restarting watcher."); 
+ console.log("Asset manifest file '" + watchedPath + "' was changed, restarting watcher.");
  inputWatcher.close();
  createWatcher();
  });
  });
 });
 
-gulp.task('help', function() {
+gulp.task('help', function () {
  util.log(`
  Usage: gulp [TASK]
  Tasks:
  build Incremental build (each asset group is built only if one or more inputs are newer than the output).
  rebuild Full rebuild (all assets groups are built regardless of timestamps).
  watch Continuous watch (each asset group is built whenever one of its inputs changes).
  `);
- });
-
-gulp.task("build-blogtheme", function(done){
- return buildBlogTheme(done);
-});
-
-gulp.task("build-comingsoontheme", function(done){
- return buildComingSoonTheme(done);
 });
 
-gulp.task("build-themes", function(done){
- buildBlogTheme (() => buildComingSoonTheme(done));
-});
-
-
-// gulp.task( 'build', gulp.series([ 'build-assets', 'build-themes' ]) );
-// gulp.task( 'rebuild', gulp.series([ 'rebuild-assets', 'build-themes' ]) );
-
-gulp.task( 'build', gulp.series([ 'build-assets' ]) );
-gulp.task( 'rebuild', gulp.series([ 'rebuild-assets' ]) );
-gulp.task( 'default', gulp.series([ 'build' ]) );
-
-/*
-** Build Themes
-*/
-
-function buildBlogTheme(done){
- var cwd = process.cwd(); 
- process.chdir('./src/OrchardCore.Themes/TheBlogTheme/wwwroot'); 
- blogtheme.build( ()=> {
- process.chdir(cwd);
- done();
- });
-}
-
-function buildComingSoonTheme(done){
- var cwd = process.cwd(); 
- process.chdir('./src/OrchardCore.Themes/TheComingSoonTheme/wwwroot'); 
- comingsoontheme.build( ()=> {
- process.chdir(cwd);
- done();
- });
-}
+gulp.task('build', gulp.series(['build-assets']));
+gulp.task('rebuild', gulp.series(['rebuild-assets']));
+gulp.task('default', gulp.series(['build']));
 
 /*
 ** ASSET GROUPS
@@ -181,10 +140,10 @@ function createAssetGroupTask(assetGroup, doRebuild) {
  doRebuild = !outputStats || assetManifestStats.mtime > outputStats.mtime;
  }
 
- if(assetGroup.copy === true){
+ if (assetGroup.copy === true) {
  return buildCopyPipeline(assetGroup, doRebuild);
  }
- else{
+ else {
  switch (outputExt) {
  case ".css":
  return buildCssPipeline(assetGroup, doConcat, doRebuild);
@@ -231,23 +190,23 @@ function buildCssPipeline(assetGroup, doConcat, doRebuild) {
  .pipe(gulpif(doConcat, concat(assetGroup.outputFileName)))
  .pipe(gulpif(generateRTL, postcss([rtl()])))
  .pipe(minify({
- minify: true,
- minifyHTML: {
-  collapseWhitespace: true,
-  conservativeCollapse: true,
- },
- minifyJS: {
-  sourceMap: true
- },
- minifyCSS: true
- }))
- .pipe(rename({
- suffix: ".min"
- }))
+ minify: true,
+ minifyHTML: {
+  collapseWhitespace: true,
+  conservativeCollapse: true,
+ },
+ minifyJS: {
+  sourceMap: true
+ },
+ minifyCSS: true
+ }))
+ .pipe(rename({
+ suffix: ".min"
+ }))
  .pipe(eol())
  .pipe(gulp.dest(assetGroup.outputDir));
-  // Uncomment to copy assets to wwwroot
-  //.pipe(gulp.dest(assetGroup.webroot));
+ // Uncomment to copy assets to wwwroot
+ //.pipe(gulp.dest(assetGroup.webroot));
  var devStream = gulp.src(assetGroup.inputPaths) // Non-minified output, with source mapping
  .pipe(gulpif(!doRebuild,
  gulpif(doConcat,
@@ -272,8 +231,8 @@ function buildCssPipeline(assetGroup, doConcat, doRebuild) {
  .pipe(gulpif(generateSourceMaps, sourcemaps.write()))
  .pipe(eol())
  .pipe(gulp.dest(assetGroup.outputDir));
-  // Uncomment to copy assets to wwwroot
-  //.pipe(gulp.dest(assetGroup.webroot));
+ // Uncomment to copy assets to wwwroot
+ //.pipe(gulp.dest(assetGroup.webroot));
  return merge([minifiedStream, devStream]);
 }
 
@@ -298,7 +257,7 @@ function buildJsPipeline(assetGroup, doConcat, doRebuild) {
  ext: ".js"
  }))))
  .pipe(plumber())
- .pipe(gulpif(generateSourceMaps, sourcemaps.init())) 
+ .pipe(gulpif(generateSourceMaps, sourcemaps.init()))
  .pipe(gulpif("*.ts", typescript({
  declaration: false,
  noImplicitAny: true,
@@ -310,18 +269,18 @@ function buildJsPipeline(assetGroup, doConcat, doRebuild) {
  "es2015.iterable"
  ],
  target: "es5",
- }))) 
+ })))
  .pipe(babel({
-  "presets": [
- [
-  "@babel/preset-env",
-  {
- "modules": false
-  },
-  "@babel/preset-flow"
- ]
-  ]
- }))
+  "presets": [
+ [
+  "@babel/preset-env",
+  {
+ "modules": false
+  },
+  "@babel/preset-flow"
+ ]
+  ]
+ }))
  .pipe(gulpif(doConcat, concat(assetGroup.outputFileName)))
  .pipe(header(
  "/*\n" +
@@ -338,22 +297,22 @@ function buildJsPipeline(assetGroup, doConcat, doRebuild) {
  }))
  .pipe(eol())
  .pipe(gulp.dest(assetGroup.outputDir))
-  // Uncomment to copy assets to wwwroot
-  //.pipe(gulp.dest(assetGroup.webroot));
+ // Uncomment to copy assets to wwwroot
+ //.pipe(gulp.dest(assetGroup.webroot));
 }
 
 function buildCopyPipeline(assetGroup, doRebuild) {
  var stream = gulp.src(assetGroup.inputPaths);
 
- if(!doRebuild) {
+ if (!doRebuild) {
  stream = stream.pipe(newer(assetGroup.outputDir))
  }
- 
+
  var renameFile = assetGroup.outputFileName != "@";
 
  stream = stream
-  .pipe(gulpif(renameFile, rename(assetGroup.outputFileName)))
-  .pipe(gulp.dest(assetGroup.outputDir));
+ .pipe(gulpif(renameFile, rename(assetGroup.outputFileName)))
+ .pipe(gulp.dest(assetGroup.outputDir));
  // Uncomment to copy assets to wwwroot
  //.pipe(gulp.dest(assetGroup.webroot));