Skip to content

Commit

Permalink
Merge master (#1073)
Browse files Browse the repository at this point in the history 
* chore(deps): update dependency aws-sdk to v2.820.0

* chore(deps): lock file maintenance

* chore(deps): update dependency aws-sdk to v2.821.0

* chore(deps): update dependency aws-sdk to v2.822.0

* chore(deps): update dependency aws-sdk to v2.823.0

* chore(deps): update dependency husky to v4.3.7

* chore(deps): update dependency aws-sdk to v2.824.0

* chore(deps): lock file maintenance

* chore(deps): update dependency aws-sdk to v2.825.0

* chore(deps): update dependency @types/jest to v26.0.20

* chore(deps): update dependency @types/express to v4.17.10

* chore(deps): update dependency express-fileupload to v1.2.1

* chore(deps): update dependency aws-sdk to v2.826.0

* chore(deps): update dependency @types/express to v4.17.11

* chore(deps): update dependency semantic-release to v17.3.2

* chore(deps): update dependency aws-sdk to v2.827.0

* chore(deps): update dependency aws-sdk to v2.828.0

* chore(deps): update dependency husky to v4.3.8

* chore(deps): update dependency semantic-release to v17.3.3

* chore(deps): update dependency supertest to v6.1.1

* chore(deps): update dependency semantic-release to v17.3.4

* chore(deps): update dependency semantic-release to v17.3.5

* chore(deps): update dependency aws-sdk to v2.829.0

* chore(deps): update dependency i18next-fs-backend to v1.0.8

* chore(deps): update dependency semantic-release to v17.3.6

* chore(deps): update dependency aws-sdk to v2.831.0

* chore(deps): update dependency @types/sanitize-html to v1.27.1

* chore(deps): update dependency semantic-release to v17.3.7

* chore(deps): update dependency supertest to v6.1.2

* chore(deps): update dependency aws-sdk to v2.832.0

* chore(deps): lock file maintenance

* chore(deps): update dependency supertest to v6.1.3

* chore(deps): update dependency aws-sdk to v2.833.0

* chore(deps): update dependency aws-sdk to v2.834.0

* chore(deps): update dependency ts-jest to v26.5.0

* chore(deps): update dependency i18next to v19.8.5

* chore(deps): lock file maintenance

* chore(deps): update dependency mongodb to v3.6.4

* chore(deps): update dependency i18next to v19.8.7

* chore(deps): update dependency @types/react to v17.0.1

* chore(deps): update dependency aws-sdk to v2.835.0

* chore(deps): update dependency start-server-and-test to v1.12.0

* chore(deps): update dependency aws-sdk to v2.836.0

* refactor(monorepo) (#1040)

* refactor(ajax endpoint): moved Ajax endpoint logic to own class

* refactor(ajax endpoint): moved POST Ajax endpoint logic

* test(ajax endpoint): added tests

* refactor(ajax endpoint): moved get file logic to own class

* refactor(ajax endpoint): moved get library file to new class

* refactor(ajax endpoint): added parameter checks

* docs(ajax endpoint): improved documentation

* docs(ajax endpoint): improved documentation

* feat(customization): improved customization options

* feat(customization): added alterLibraryFiles

* feat(customization): added alterLibrarySemantics

* refactor(customization): the LibraryManager is constructed with hook

* refactor(customization): added options to instanciation of H5PEditor

* feat(customization): added alterLibraryLanguageFile and docs

* fix(customization): fixed error in language getter

* refactor(customization): improved consistency

* docs(customization): extended documentation and improved consistency

* refactor(library storage): converted streams to readables

* feat(caching): added CachedLibraryStorage

* fix(caching): correct CachedLibraryStorage

* test(caching): added and improved tests

* test(caching): added and improved tests

* test(caching): extended tests

* refactor(caching)!: changed getInstalledLibraryNames to allow caching

The array parameter was taken over from the structure of the PHP
implementation and was never used anyway.

* refactor(caching): now caches all files

* feat(caching): added more methods to caching

* docs(caching): added docs; example uses cache

* fix(caching): disabled cache for e2e tests

* feat(file uploads): file uploads can also be stored in the file system

* test(package validator): corrected tests

* refactor(merge): merged upstream

* test(e2e): e2e test cache now set with cross-env

* docs(documentation): restructed documentation

* fix(xss): checked H5PAjaxEndpoint for xss weaknesses

* test(ajax router): corrected test for upstream change

* refactor(ajax router): exported H5PAjaxEndpoint

* feat(caching): added cached key-value storage

* fix(caching): added support for Redis caching

* feat(example): added cluster mode

* docs(example): corrected cluster docs

* feat(browser caching): added resource caching support

* test(browser caching): corrected tests

* feat(browser caching): added cache buster to integration

* fix(browser caching): removed cache buster from generated libraryUrl

* fix(html exporter): query strings removed from filenames

* test(package exporter): increased test timeout

* refactor(merge): added missing packages

* test(e2e): added caching

* fix(merge): fixed merge errors

* fix(merge): corrected merge errors

* test(e2e): improved test robustness

* fix(xss): remove overeager escaping of plain text (#17)

* fix(xss): removed overeager escaping of plain text

* test(xss): removed old tests

* chore(deps): install lerna

* refactor(monorepo): run lerna init

* refactor(h5p-server): move h5p-server to packages

* refactor(monorepo): adjust scripts

* refactor(h5p-examples): separate h5p-examples from h5p-server

* test(h5p-server): repair broken paths

* refactor(h5p-test-server): rename h5p-examples to h5p-test-server

* refactor(monorepo): move e2e tests to h5p-examples

* test(e2e): fix import

* chore(deps): update packages

* chore(deps): remove package dependencies from root

* refactor(h5p-express-adapter): extract h5p-express-adapter

* test(h5p-express-adapter): get tests running again

* refactor(h5p-express-adapter): make h5p-express-adapter releaseable

* refactor(h5p-express): rename h5p-express-adapter to h5p-express

* refactor(h5p-mongos3): extract h5p-mongos3 from h5p-server

* ci(tests): run tests only on refactor/monorepo branch

* ci(tests): revert branch filter

* fix(exports): added export for IUrlGenerator (#29)

* chore(deps): updated package-lock

* refactor(h5p-html-exporter): extract h5p-html-exporter

* refactor(h5p-express): use @lumieducation/h5p-mongos3

* v7.0.0-alpha.0

* v7.0.0-alpha.1

* refactor(h5p-server): remove unneeded dependencies

* refactor(h5p-examples): move dockerfile

* test(common): share common test data across packages

* test(h5p-examples): move test data

* fix(install): fix install scripts

* docs(gitbook): add gitbook config

* GitBook: [master] 30 pages and 2 assets modified

* GitBook: [refactor/monorepo] 17 pages and 2 assets modified

* fix(deps): downgrade i18next-http-middleware to 3.0.6 in h5p-examples

* fix(monorep): corrected paths for scripts and assets

* refactor(db): moved docker compose and updated db test

* test(e2e): fixed e2e puppeteer type dependency

* test(e2e): made puppeteer tests headful

* test(h5p-html-exporter): fix wrong paths

* test(husky): add special husky prepush command

* ci(cache): add packages to cache

* ci(workspace): add packages to workspace

* ci(puppeteer): add NODE_ENV=development env

the NODE_ENV=development env should be set

* ci(install): run npm ci instead of npm install

npm ci fails if package.json and package-lock.json are not in sync, so we get an extra check

* ci(puppeteer): add puppeteer orb for chrome headless mode

* ci(install): revert to npm install

* ci(unittests): use browser image

* test(jest): run unit tests from root

* test(jest): add logHeapUsage and maxWorkers flags

* test(integration): fix integration tests

* test(db): fix db tests

* test(e2e): fix h5p-examples build

* ci(puppeteer): remove orb

* refactor(git): add h5p-html-exporter test files to gitignore

* refactor(db): filter with root prefix for temporary storage lifecycle

* test(example): e2e tests now headless

* feat(webcomponents): add webcomponents

* feat(react): add h5p-react package

* chore(deps): update deps

* test(lint): make tslint happy

* ci(release): release only from release-branch

* ci(db-tests): disable db-tests

* ci(db-tests): remove db-test from requirements for release

* ci(e2e-tests): disable e2e-tests

Co-authored-by: JPSchellenberg <jps@Lumi.education>

* chore(deps): update package-lock.json

* chore(deps): pin dependencies

* chore(deps): update dependency @types/react to v16.14.4

* chore(deps): update dependency @types/resize-observer-browser to v0.1.5

* chore(deps): update dependency cross-env to v7.0.3

* chore(deps): update dependency fs-extra to v9.1.0

* fix(deps): update dependency aws-sdk to v2.845.0

* fix(deps): update dependency mongodb to v3.6.4 (#1056)

Co-authored-by: Renovate Bot <bot@renovateapp.com>

* chore(deps): update dependency puppeteer to v7.1.0 (#1058)

Co-authored-by: Renovate Bot <bot@renovateapp.com>

* fix(deps): update dependency react to v16.14.0 (#1057)

Co-authored-by: Renovate Bot <bot@renovateapp.com>

* fix(h5p-server): missing translations when language was not found (#1063)

* ci(release): use lerna for release-process

* fix(deps): update dependency aws-sdk to v2.846.0

* chore(deps): update dependency i18next to v19.8.9

* Pull back release info from release branch (#1067)

* ci(release): fix wrong command

* ci(release): add git email and username

* v7.0.0

* ci(cache): add webcomponents and react to cache

* v7.0.1

Co-authored-by: Lumi <c@Lumi.education>

* fix(deps): update dependency react to v17 (#1059)

Co-authored-by: Renovate Bot <bot@renovateapp.com>

* fix(deps): update dependency aws-sdk to v2.847.0

* fix(dependencies): removed package locks

* refactor(h5p-rest-example): corrected internal package references

* fix(h5p-examples): corrected server-side example

* fix(h5p-rest-example): dependencies

* chore(deps): update package-lock.json

* feat(webcomponents): filter statements by contentId

* fix(h5p-rest-example): added missing deps

* fix(deps): corrected dependencies of root

* chore(deps): updated package-lock

* chore(deps): aligned express types version

* fix(deps): reverted i18next-http-middleware

Co-authored-by: Renovate Bot <bot@renovateapp.com>
Co-authored-by: JPSchellenberg <jps@Lumi.education>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Lumi <c@Lumi.education>
  • Loading branch information
@sr258 @renovate-bot
@JPSchellenberg @renovate
5 people committed Feb 19, 2021
1 parent cc0015f commit d84ceaa
Show file tree
Hide file tree
Showing 41 changed files with 48,771 additions and 24,351 deletions.
36 changes: 27 additions & 9 deletions .circleci/config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,14 @@ jobs:
key: h5p-server-modules-cache-{{ checksum "packages/h5p-server/package-lock.json" }}
paths:
- ./packages/h5p-server/node_modules
- save_cache:
key: h5p-webcomponents-modules-cache-{{ checksum "packages/h5p-webcomponents/package-lock.json" }}
paths:
- ./packages/h5p-webcomponents/node_modules
- save_cache:
key: h5p-react-modules-cache-{{ checksum "packages/h5p-react/package-lock.json" }}
paths:
- ./packages/h5p-react/node_modules
- save_cache:
key: h5p-core-cache-{{ checksum "scripts/install.sh" }}
paths:
Expand All @@ -65,6 +73,10 @@ jobs:
- packages/h5p-mongos3/build
- packages/h5p-server/node_modules
- packages/h5p-server/build
- packages/h5p-webcomponents/node_modules
- packages/h5p-webcomponents/build
- packages/h5p-react/node_modules
- packages/h5p-react/build

lint:
docker:
Expand Down Expand Up @@ -150,9 +162,12 @@ jobs:
at: .
- coveralls/upload:
parallel_finished: true
- run:
name: config git
command: git config --global user.email "c@Lumi.education" && git config --global user.name "Lumi"
- run:
name: release
command: npm run semantic-release || true
command: npx lerna version -y --conventional-commits --create-release github && npx lerna publish -y from-package

workflows:
version: 2
Expand All @@ -168,21 +183,24 @@ workflows:
- unit-tests:
requires:
- install-build
- e2e-tests:
requires:
- install-build
# - e2e-tests:
# requires:
# - install-build
- integration-tests:
requires:
- install-build
- db-tests:
requires:
- install-build
# - db-tests:
# requires:
# - install-build
- release:
filters:
branches:
only: release
requires:
- install-build
- lint
- format
- unit-tests
- e2e-tests
# - e2e-tests
- integration-tests
- db-tests
# - db-tests
22 changes: 22 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Change Log

All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [7.0.1](https://github.com/Lumieducation/H5P-Nodejs-library/compare/v7.0.0...v7.0.1) (2021-02-18)

**Note:** Version bump only for package @lumieducation/h5p-monorepo





# [7.0.0](https://github.com/Lumieducation/H5P-Nodejs-library/compare/v6.2.0...v7.0.0) (2021-02-18)


### Bug Fixes

* **deps:** update dependency aws-sdk to v2.845.0 ([7688aea](https://github.com/Lumieducation/H5P-Nodejs-library/commit/7688aea73f56c4f7ade36596e02b341f71badeec))
* **deps:** update dependency mongodb to v3.6.4 ([#1056](https://github.com/Lumieducation/H5P-Nodejs-library/issues/1056)) ([412c00a](https://github.com/Lumieducation/H5P-Nodejs-library/commit/412c00ad37d4b48cc0a58ee17d43f0bf42f07344))
* **deps:** update dependency react to v16.14.0 ([#1057](https://github.com/Lumieducation/H5P-Nodejs-library/issues/1057)) ([09cec79](https://github.com/Lumieducation/H5P-Nodejs-library/commit/09cec79d2e575ed38c9dec284cefd5003306d04f))
* **h5p-server:** missing translations when language was not found ([#1063](https://github.com/Lumieducation/H5P-Nodejs-library/issues/1063)) ([5bc9976](https://github.com/Lumieducation/H5P-Nodejs-library/commit/5bc9976928cdba441f32c4392b2dfe3642b95abc))
2 changes: 1 addition & 1 deletion lerna.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"packages": [
"packages/*"
],
"version": "7.0.0-alpha.1"
"version": "7.0.1"
}
Loading

0 comments on commit d84ceaa

Please sign in to comment.