Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/rc3.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
aleclofabbro committed Oct 11, 2023
2 parents f305fb6 + 22b7401 commit 0572910
Show file tree
Hide file tree
Showing 396 changed files with 200,257 additions and 124,565 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@ build-storybook.log*
tsconfig.tsbuildinfo
/.husky
/packages/*/dist
package.json.lerna_backup
1 change: 0 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
"**/CVS": true,
"**/.DS_Store": true,
"**/Thumbs.db": true,
"**/node_modules": true,
"**/dist": false
},
// config related to code formatting
Expand Down
31 changes: 31 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,37 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

## [Unreleased]

## [3.2.0]

### Added

- resource learning outcomes (blooms cognitives) features
- resource search filters
- user interests settings with default resoure filtering option
- user profilelink in admin user list
- user-customized landing page lists
- prompt user to fill interests
- profile publisher permissions un/set for admins
- on admin's user list section
- in profile home page

### Improvements

- query performances
- http calls
- extra validation on profile page

### Fixed

- missing checks for webapp routes
- profile page
- backed up empty avatar and background images
- fix errors styling

### Security

- upgraded project level dependencies (lerna, storybook, webpack)

## [3.1.1]

### Fixed
Expand Down
17 changes: 11 additions & 6 deletions align_pkg_mn-peer-deps_to_mn-dev-deps.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,21 @@ packagesDirs.forEach(pkgDir => {
if (pkgJson.name === 'storybook-vite') {
return
}
const hasMNDevDeps = !!Object.keys(pkgJson.devDependencies ?? {}).find(depName =>
depName.startsWith('@moodlenet/'),
)
if (!hasMNDevDeps) return
// const hasMNDevDeps = !!Object.keys(pkgJson.devDependencies ?? {}).find(depName =>
// depName.startsWith('@moodlenet/'),
// )
// if (!hasMNDevDeps) return

Object.keys(pkgJson.peerDependencies ?? {}).forEach(depName => {
if (depName.startsWith('@moodlenet/')) delete pkgJson.peerDependencies[depName]
if (depName.startsWith('@moodlenet/')) {
delete pkgJson.peerDependencies[depName]
return
}
pkgJson.devDependencies = pkgJson.devDependencies ?? {}
pkgJson.devDependencies[depName] = pkgJson.peerDependencies[depName]
})

Object.keys(pkgJson.devDependencies).forEach(depName => {
Object.keys(pkgJson.devDependencies ?? {}).forEach(depName => {
if (!depName.startsWith('@moodlenet/')) return
pkgJson.peerDependencies = pkgJson.peerDependencies ?? {}
pkgJson.peerDependencies[depName] = pkgJson.devDependencies[depName]
Expand Down
13 changes: 12 additions & 1 deletion bin/boot.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,18 @@ if (noNodeDev) {
console.log(`starting with node-dev`)
await execa(
'npx',
['-y', 'node-dev', '--notify', 'false', 'start.mjs', '--', ...fwRestOpts, ...fwRestArgs],
[
'-y',
'node-dev',
'--debounce',
'2000',
'--notify',
'false',
'start.mjs',
'--',
...fwRestOpts,
...fwRestArgs,
],
execaOpts,
)
}
29 changes: 0 additions & 29 deletions docker/nginx.conf

This file was deleted.

File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 0572910

Please sign in to comment.