Skip to content

Commit b03c764

Browse files
committed
Merge branch 'main' into framebuffer-library-rename
2 parents 05f5116 + 3dba79b commit b03c764

File tree

10 files changed

+14694
-16777
lines changed

10 files changed

+14694
-16777
lines changed

.github/workflows/deploy.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- name: Use Node.js
1313
uses: actions/setup-node@v1
1414
with:
15-
node-version: "14.x"
15+
node-version: "18.x"
1616
- name: Install node modules
1717
run: npm ci
1818
- name: Build

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Use Node.js
1616
uses: actions/setup-node@v1
1717
with:
18-
node-version: "14.x"
18+
node-version: "18.x"
1919
- name: Install node modules
2020
run: npm ci
2121
- name: Run tests

.github/workflows/update-documentation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Install Node.JS 12.x
2020
uses: actions/setup-node@v1
2121
with:
22-
node-version: 12.x
22+
node-version: 18.x
2323
- name: Extract documentation and library files from the p5.js repo
2424
run: |
2525
npm install

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Install Node.JS 12.x
1818
uses: actions/setup-node@v1
1919
with:
20-
node-version: 12.x
20+
node-version: 18.x
2121
- name: npm install
2222
run: npm install
2323
# - name: Update json files

Gruntfile.js

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,14 @@ const pngquant = require('imagemin-pngquant');
1616

1717
module.exports = function(grunt) {
1818
require('time-grunt')(grunt);
19-
require('load-grunt-tasks')(grunt);
19+
require('load-grunt-tasks')(grunt, {
20+
pattern: [
21+
'grunt-*',
22+
'@*/grunt-*',
23+
'!grunt-assemble-permalinks',
24+
'!grunt-assemble-i18n'
25+
]
26+
});
2027

2128
// Project configuration. actual tasks
2229
grunt.initConfig({
@@ -37,10 +44,7 @@ module.exports = function(grunt) {
3744
},
3845
css: {
3946
files: '<%= config.src %>/assets/css/*.css',
40-
tasks: [
41-
'concat:dist',
42-
'postcss'
43-
]
47+
tasks: ['concat:dist', 'postcss']
4448
},
4549
imagemin: {
4650
files: '<%= config.src %>/assets/img/*.{png,jpg,jpeg,gif,svg,ico}',
@@ -73,9 +77,7 @@ module.exports = function(grunt) {
7377
livereload: {
7478
options: {
7579
open: true,
76-
base: [
77-
'<%= config.dist %>'
78-
]
80+
base: ['<%= config.dist %>']
7981
}
8082
}
8183
},
@@ -94,19 +96,16 @@ module.exports = function(grunt) {
9496
'!<%= config.src %>/data/reference/*.json'
9597
],
9698
partials: '<%= config.src %>/templates/partials/*.hbs',
97-
plugins: [
98-
'assemble-contrib-permalinks',
99-
'assemble-contrib-i18n'
100-
],
99+
plugins: ['grunt-assemble-permalinks', 'grunt-assemble-i18n'],
101100
i18n: {
102101
languages: pkg.languages,
103-
templates: [
104-
'<%= config.src %>/templates/pages/**/*.hbs',
105-
]
102+
templates: ['<%= config.src %>/templates/pages/**/*.hbs']
106103
},
107104
permalinks: {
108105
structure: ':lang/:slug/:base:ext',
109-
patterns: [
106+
// Official documentation incorrectly states that this property
107+
// should be "patterns" when it should be "replacements"
108+
replacements: [
110109
{
111110
pattern: ':lang',
112111
replacement: function() {

0 commit comments

Comments
 (0)