Skip to content

Commit

Permalink
Merge branch 'release-2.33.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
jsconan committed Dec 9, 2022
2 parents 3f7163d + cf2874e commit 607460d
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 21 deletions.
5 changes: 3 additions & 2 deletions build/rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ Handlebars.Visitor.prototype.accept = function() {
};
/* --------------------------------------------------------- */

const inputs = glob.sync(path.join(srcDir, '**', '*.js'));
const globPath = p => p.replace(/\\/g, '/');
const inputs = glob.sync(globPath(path.join(srcDir, '**', '*.js')));

/**
* Define all modules as external, so rollup won't bundle them together.
Expand Down Expand Up @@ -131,7 +132,7 @@ export default inputs.map(input => {
* It is asyncronous and it was made with purpose to run parallely with build,
* because they do not effect each other
*/
glob(path.join(srcDir, '**', '*.tpl')).then(files => {
glob(globPath(path.join(srcDir, '**', '*.tpl'))).then(files => {
files.forEach(async (file) => {
const targetFile = path.resolve(outputDir, path.relative(srcDir, file));
await mkdirp(path.dirname(targetFile));
Expand Down
3 changes: 2 additions & 1 deletion build/scss.js
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,9 @@ const writeOutResult = async result => {
*/
const scssDirectories = [scssMainDir, srcDir];

const globPath = p => p.replace(/\\/g, '/');
glob(
path.join(rootPath, `+(${scssDirectories.map(dir => path.relative(rootPath, dir)).join('|')})`, '**', '[^_]*.scss'),
globPath(path.join(rootPath, `+(${scssDirectories.map(dir => path.relative(rootPath, dir)).join('|')})`, '**', '[^_]*.scss')),
(err, files) => {
if (err) {
throw err;
Expand Down
26 changes: 13 additions & 13 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@oat-sa/tao-test-runner-qti",
"version": "2.33.0",
"version": "2.33.1",
"description": "TAO Test Runner QTI implementation",
"files": [
"dist",
Expand Down Expand Up @@ -56,11 +56,11 @@
"@oat-sa/expr-eval": "1.3.1",
"@oat-sa/prettier-config": "^0.1.1",
"@oat-sa/rollup-plugin-wildcard-external": "^0.1.0",
"@oat-sa/tao-core-libs": "^0.5.0",
"@oat-sa/tao-core-sdk": "^1.21.0",
"@oat-sa/tao-core-ui": "^1.64.0",
"@oat-sa/tao-core-libs": "^0.5.1",
"@oat-sa/tao-core-sdk": "^1.21.1",
"@oat-sa/tao-core-ui": "^1.64.1",
"@oat-sa/tao-item-runner": "^0.8.1",
"@oat-sa/tao-item-runner-qti": "^1.7.0",
"@oat-sa/tao-item-runner-qti": "^1.7.2",
"@oat-sa/tao-qunit-testrunner": "^1.0.3",
"@oat-sa/tao-test-runner": "^0.9.0",
"async": "0.2.10",
Expand Down

0 comments on commit 607460d

Please sign in to comment.