Merge branch 'main' into pr/1265

Author: Qianqianye

.gitattributes

@@ -3,7 +3,7 @@
 
 # prevents git from converting LF to CRLF, which causes issues
 # when assembling example pages on Windows
-data/examples/**/*.js eol=lf
+src/data/examples/**/*.js eol=lf
 
 # Denote all files that are truly binary and should not be modified.
 *.ai binary

.github/workflows/deploy.yaml

@@ -12,7 +12,7 @@ jobs:
     - name: Use Node.js
       uses: actions/setup-node@v1
       with:
-        node-version: "14.x"
+        node-version: "18.x"
     - name: Install node modules
       run: npm ci
     - name: Build
@@ -23,3 +23,5 @@ jobs:
         branch: gh-pages # The branch the action should deploy to.
         folder: dist/ # The folder the action should deploy.
         single-commit: false # "false" here means "preserve git history on the gh-pages branch"
+    - name: Update Download page
+      run: curl https://p5js.org/download/release.php

.github/workflows/test.yml

@@ -15,7 +15,7 @@ jobs:
     - name: Use Node.js
       uses: actions/setup-node@v1
       with:
-        node-version: "14.x"
+        node-version: "18.x"
     - name: Install node modules
       run: npm ci
     - name: Run tests

.github/workflows/update-documentation.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Install Node.JS 12.x
         uses: actions/setup-node@v1
         with:
-          node-version: 12.x
+          node-version: 18.x
       - name: Extract documentation and library files from the p5.js repo
         run: |
           npm install

.github/workflows/update-translation-files.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Install Node.JS 12.x
         uses: actions/setup-node@v1
         with:
-          node-version: 12.x
+          node-version: 18.x
       - name: npm install
         run: npm install
       # - name: Update json files

.gitignore

@@ -30,6 +30,6 @@ src/offline-reference
 !src/templates/pages/examples/.gitkeep
 dist/*
 !dist/git-pull.php
-!dist/download/release.php
+!dist/download/version.json
 !dist/books/media.zip
 !dist/learn/books/media.zip

.lintstagedrc.js

@@ -16,7 +16,14 @@ const pngquant = require('imagemin-pngquant');
 
 module.exports = function(grunt) {
   require('time-grunt')(grunt);
-  require('load-grunt-tasks')(grunt);
+  require('load-grunt-tasks')(grunt, {
+    pattern: [
+      'grunt-*',
+      '@*/grunt-*',
+      '!grunt-assemble-permalinks',
+      '!grunt-assemble-i18n'
+    ]
+  });
 
   // Project configuration. actual tasks
   grunt.initConfig({
@@ -37,10 +44,7 @@ module.exports = function(grunt) {
       },
       css: {
         files: '<%= config.src %>/assets/css/*.css',
-        tasks: [
-          'concat:dist',
-          'postcss'
-        ]
+        tasks: ['concat:dist', 'postcss']
       },
       imagemin: {
         files: '<%= config.src %>/assets/img/*.{png,jpg,jpeg,gif,svg,ico}',
@@ -73,9 +77,7 @@ module.exports = function(grunt) {
       livereload: {
         options: {
           open: true,
-          base: [
-            '<%= config.dist %>'
-          ]
+          base: ['<%= config.dist %>']
         }
       }
     },
@@ -94,19 +96,16 @@ module.exports = function(grunt) {
             '!<%= config.src %>/data/reference/*.json'
           ],
           partials: '<%= config.src %>/templates/partials/*.hbs',
-          plugins: [
-            'assemble-contrib-permalinks',
-            'assemble-contrib-i18n'
-          ],
+          plugins: ['grunt-assemble-permalinks', 'grunt-assemble-i18n'],
           i18n: {
             languages: pkg.languages,
-            templates: [
-              '<%= config.src %>/templates/pages/**/*.hbs',
-            ]
+            templates: ['<%= config.src %>/templates/pages/**/*.hbs']
           },
           permalinks: {
             structure: ':lang/:slug/:base:ext',
-            patterns: [
+            // Official documentation incorrectly states that this property
+            // should be "patterns" when it should be "replacements"
+            replacements: [
               {
                 pattern: ':lang',
                 replacement: function() {
@@ -311,7 +310,7 @@ module.exports = function(grunt) {
     clean: {
       assets: [
         '<%= config.dist %>/**/*.*',
-        '!<%= config.dist %>/download/release.php',
+        '!<%= config.dist %>/download/version.json',
         '!<%= config.dist %>/git-pull.php',
         '!<%= config.dist %>/books/media.zip',
         '!<%= config.dist %>/learn/books/media.zip',
@@ -411,12 +410,6 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-contrib-requirejs');
   grunt.loadNpmTasks('grunt-htmlhint');
 
-  // i18n tracking task
-  grunt.registerTask('i18n', function() {
-    var done = this.async();
-    require('./i18n.js')(done);
-  });
-
   grunt.registerTask('make_tmp_dir', function() {
     const tmp_path = 'tmp/p5.js';
     fse.mkdirpSync(tmp_path);
@@ -501,7 +494,6 @@ module.exports = function(grunt) {
     'assemble',
     'file_append',
     'compress',
-    'i18n',
     'htmlhint'
   ]);
 

Gruntfile.js

@@ -4,7 +4,7 @@
 
 ## How To Contribute
 
-Known bugs and intended new features are tracked using [GitHub issues](https://github.com/processing/p5.js-website/issues). If you'd like to start working on an existing issue, comment on the issue that you plan to work on it so other contributors know it's being handled and can offer help. Once you have completed your work on this issue, [submit a pull request (PR)](https://github.com/processing/p5.js/blob/main/contributor_docs/preparing_a_pull_request.md) against the p5.js main branch. In the description field of the PR, include "resolves #XXXX" tagging the issue you are fixing. If the PR addresses the issue but doesn't completely resolve it (ie the issue should remain open after your PR is merged), write "addresses #XXXX".
+Known bugs and intended new features are tracked using [GitHub issues](https://github.com/processing/p5.js-website/issues). If you'd like to start working on an existing issue, comment on the issue that you plan to work on it so other contributors know it's being handled and can offer help. Once you have completed your work on this issue, [submit a pull request (PR)](https://github.com/processing/p5.js/blob/main/contributor_docs/contributor_guidelines.md#pull-requests) against the p5.js main branch. In the description field of the PR, include "resolves #XXXX" tagging the issue you are fixing. If the PR addresses the issue but doesn't completely resolve it (ie the issue should remain open after your PR is merged), write "addresses #XXXX".
 
 If you discover a bug or have an idea for a new feature you'd like to add, begin by submitting an issue. Please do not simply submit a pull request containing the fix or new feature without making an issue first, we will probably not be able to accept it. Once you have gotten some feedback on the issue and a go ahead to address it, you can follow the process above to add the fix or feature.
 
@@ -15,7 +15,7 @@ We recognize all types of contributions. This project follows the [all-contribut
 If you've contributed to this website (or any other part of the p5.js project), add yourself [here](https://github.com/processing/p5.js#contributors). Instructions to do this can be found at the bottom of the section.
 
 ## Stewards
-Stewards are contributors that are particularly involved, familiar, or responsive to certain areas of the project. Their role is to help provide context and guidance to others working on p5.js website. If you have a question about contributing to a particular area, you can tag the listed steward in an issue or pull request. They may also weigh in on feature requests and guide the overall direction of their area, with the input of the community. You can read more about the organization of the project at [contributor_docs/organization.md](https://github.com/processing/p5.js/blob/main/contributor_docs/organization.md).
+Stewards are contributors that are particularly involved, familiar, or responsive to certain areas of the project. Their role is to help provide context and guidance to others working on p5.js website. If you have a question about contributing to a particular area, you can tag the listed steward in an issue or pull request. They may also weigh in on feature requests and guide the overall direction of their area, with the input of the community.You can read more about the organization of the project at [contributor_docs/organization.md](https://github.com/processing/p5.js/blob/main/contributor_docs/organization.md), p5.js [Contributor Guidelines](https://github.com/processing/p5.js/blob/main/contributor_docs/contributor_guidelines.md), and p5.js [Steward Guidelines](https://github.com/processing/p5.js/blob/main/contributor_docs/steward_guidelines.md).
 
 ✨**Anyone interested can volunteer to be a steward!** ✨There are no specific requirements for expertise, just an interest in actively learning and participating. We can start with **1-3 stewards for each area**.  If you’re familiar with one or more areas of p5.js website, please reply to [this issue](https://github.com/processing/p5.js-website/issues/1220) to volunteer as a steward!
 
@@ -40,13 +40,13 @@ Once added, a steward's username will remain in the [stewards section of the rea
 | Language | Steward(s)                |
 | -------- | ------------------------- |
 | Overall  |[@Qianqianye](https://github.com/Qianqianye), [@limzykenneth](https://github.com/limzykenneth) |
-| Spanish  |[@Guirdo](https://github.com/Guirdo), [@Andreu-G](https://github.com/Andreu-G), [@dnd-alv](https://github.com/dnd-alv)                  |
+| Spanish  |[@Guirdo](https://github.com/Guirdo), [@Andreu-G](https://github.com/Andreu-G), [@dnd-alv](https://github.com/dnd-alv), [@holomorfo](https://github.com/holomorfo) |
 | Chinese  | [@unicar9](https://github.com/unicar9), [@Gracia-zhang](https://github.com/Gracia-zhang), [@pentalei](https://github.com/pentalei)              |
 | Korean   | [@yinhwa](https://github.com/yinhwa), [@almchung](https://github.com/almchung), [@jhongover9000](https://github.com/jhongover9000), [@sssueing](https://github.com/sssueing), [@GeryGeryGery](https://github.com/GeryGeryGery), [@sosunnyproject](https://github.com/sosunnyproject) |
 | Hindi    | [@adarrssh](https://github.com/adarrssh), [@Divyansh013](https://github.com/Divyansh013), [@deepchauhan](https://github.com/deepchauhan), [@SarveshLimaye](https://github.com/SarveshLimaye)|
 
 Other Language Steward(s):
-* Portuguese: [@raphaelavelar](https://github.com/raphaelavelar)
+* Portuguese: [@raphaelavelar](https://github.com/raphaelavelar), [@mrseoliveira](https://github.com/mrseoliveira)