Commit 04aef03d authored by Ludan Stoecklé's avatar Ludan Stoecklé

1.5.3

parent a6c2cb73
......@@ -19,7 +19,7 @@ stages:
# variables etc.
variables:
ROSAENLG_VERSION: 1.5.2
ROSAENLG_VERSION: 1.5.3
DOCKER_REGISTRY: registry.gitlab.com/rosaenlg-projects/rosaenlg
DOCKER_CLI_ROOT: ${DOCKER_REGISTRY}/cli
DOCKER_SERVER_ROOT: ${DOCKER_REGISTRY}/server
......@@ -65,7 +65,7 @@ publish_on_npm:
- lerna publish from-package --yes
only:
- /^v[0-9]+\.[0-9]+\.[0-9]+$/
when: manual
# when: manual
publish_browser_ide_s3:
stage: code_publish
......@@ -81,7 +81,7 @@ publish_browser_ide_s3:
- node node_modules/gulp/bin/gulp.js --gulpfile packages/browser-ide-demo/gulpfile.js s3
only:
- /^v[0-9]+\.[0-9]+\.[0-9]+$/
when: manual
# when: manual
......@@ -121,7 +121,7 @@ docker_release_cli:
- docker push $DOCKER_CLI_ROOT:$ROSAENLG_VERSION
only:
- /^v[0-9]+\.[0-9]+\.[0-9]+$/
when: manual
# when: manual
# docker for server
......@@ -165,4 +165,4 @@ docker_release_server:
- docker push $DOCKER_SERVER_ROOT:$ROSAENLG_VERSION
only:
- /^v[0-9]+\.[0-9]+\.[0-9]+$/
when: manual
# when: manual
<?xml version="1.0" encoding="utf-8" standalone="yes"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="900" height="600"><rect width="900" height="600" fill="#ED2939"/><rect width="600" height="600" fill="#fff"/><rect width="300" height="600" fill="#002395"/></svg>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg xmlns="http://www.w3.org/2000/svg" width="1000" height="600" viewBox="0 0 5 3">
<desc>Flag of Germany</desc>
<rect id="black_stripe" width="5" height="3" y="0" x="0" fill="#000"/>
<rect id="red_stripe" width="5" height="2" y="1" x="0" fill="#D00"/>
<rect id="gold_stripe" width="5" height="1" y="2" x="0" fill="#FFCE00"/>
</svg>
<?xml version="1.0" encoding="UTF-8"?>
<svg xmlns="http://www.w3.org/2000/svg" width="1500" height="1000" viewBox="0 0 3 2">
<rect width="1" height="2" fill="#009246"/>
<rect width="1" height="2" x="1" fill="#fff"/>
<rect width="1" height="2" x="2" fill="#ce2b37"/>
</svg>
<?xml version="1.0" encoding="UTF-8"?>
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="1235" height="650" viewBox="0 0 7410 3900">
<rect width="7410" height="3900" fill="#b22234"/>
<path d="M0,450H7410m0,600H0m0,600H7410m0,600H0m0,600H7410m0,600H0" stroke="#fff" stroke-width="300"/>
<rect width="2964" height="2100" fill="#3c3b6e"/>
<g fill="#fff">
<g id="s18">
<g id="s9">
<g id="s5">
<g id="s4">
<path id="s" d="M247,90 317.534230,307.082039 132.873218,172.917961H361.126782L176.465770,307.082039z"/>
<use xlink:href="#s" y="420"/>
<use xlink:href="#s" y="840"/>
<use xlink:href="#s" y="1260"/>
</g>
<use xlink:href="#s" y="1680"/>
</g>
<use xlink:href="#s4" x="247" y="210"/>
</g>
<use xlink:href="#s9" x="494"/>
</g>
<use xlink:href="#s18" x="988"/>
<use xlink:href="#s9" x="1976"/>
<use xlink:href="#s5" x="2470"/>
</g>
</svg>
\ No newline at end of file
<!DOCTYPE html>
<html>
<style>
img {
height:100px
}
td {
padding: 20px
}
</style>
<head>
<meta charset="UTF-8">
<title>Title of the document</title>
</head>
<body>
<table>
<tr>
<td><img src="Flag_of_France.svg" /></td>
<td><img src="Flag_of_Germany.svg" /></td>
<td><img src="Flag_of_Italy.svg" /></td>
<td><img src="Flag_of_the_United_States.svg" /></td>
<tr>
</table>
</body>
</html>
\ No newline at end of file
{
"name": "browser-ide-demo",
"version": "1.5.2",
"version": "1.5.3",
"description": "Client side demo of NLG templates compilation and rendering using RosaeNLG",
"main": "index.js",
"scripts": {
......@@ -34,7 +34,7 @@
"gulp-inject-string": "^1.1.2",
"gulp-rename": "^1.4.0",
"merge-stream": "^2.0.0",
"rosaenlg": "1.5.2",
"rosaenlg": "1.5.3",
"tinyify": "^2.5.2",
"vue-codemirror": "^4.0.6"
}
......
{
"name": "english-determiners",
"version": "2.5.2",
"version": "2.5.3",
"description": "English determiners",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
{
"name": "french-adjectives",
"version": "2.5.2",
"version": "2.5.3",
"description": "Agreement of adjectives in French",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......@@ -45,7 +45,7 @@
},
"dependencies": {
"debug": "^4.1.1",
"french-h-muet-aspire": "2.5.2"
"french-h-muet-aspire": "2.5.3"
},
"keywords": [
"french",
......
{
"name": "french-determiners",
"version": "2.5.2",
"version": "2.5.3",
"description": "French determiners",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
{
"name": "french-h-muet-aspire",
"version": "2.5.2",
"version": "2.5.3",
"description": "List of French words that are \"aspiré\" (vs. \"muet\")\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[Dstarting with a h that is \"aspiré\" vs \"muet\"",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
{
"name": "french-ordinals",
"version": "2.5.2",
"version": "2.5.3",
"description": "Ordinal numbers in French: 12 => douzième",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
{
"name": "french-verbs",
"version": "2.5.2",
"version": "2.5.3",
"description": "French verbs: conjugation, based on the Lefff contents, and list of transitive and intransitive verbs",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......@@ -50,7 +50,7 @@
},
"dependencies": {
"debug": "^4.1.1",
"french-h-muet-aspire": "2.5.2"
"french-h-muet-aspire": "2.5.3"
},
"devDependencies": {
"copyfiles": "^2.1.1",
......
{
"name": "french-words-gender",
"version": "2.5.2",
"version": "2.5.3",
"description": "Gender of French words, based on the Lefff",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
{
"name": "german-adjectives",
"version": "2.5.2",
"version": "2.5.3",
"description": "German adjectives, based on german-pos-dict",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
{
"name": "german-determiners",
"version": "2.5.2",
"version": "2.5.3",
"description": "German determiners",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
{
"name": "german-dict-helper",
"version": "2.5.2",
"version": "2.5.3",
"description": "Helper functions on an included database derived from german-pos-dict",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
{
"name": "german-ordinals",
"version": "2.5.2",
"version": "2.5.3",
"description": "Ordinal numbers in German: 12 => zwölfte",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
{
"name": "german-verbs",
"version": "2.5.2",
"version": "2.5.3",
"description": "German verbs, based on german-pos-dict",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
{
"name": "german-words",
"version": "2.5.2",
"version": "2.5.3",
"description": "Gender and case of German words, based on german-pos-dict",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
{
"name": "gulp-rosaenlg",
"version": "2.5.2",
"version": "2.5.3",
"description": "RosaeNLG client side packaging helper",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......@@ -60,6 +60,6 @@
"browserify": "^16.5.0",
"debug": "^4.1.1",
"minify-stream": "^1.2.1",
"rosaenlg": "1.5.2"
"rosaenlg": "1.5.3"
}
}
{
"name": "italian-adjectives",
"version": "2.5.2",
"version": "2.5.3",
"description": "Italian adjectives, based on morph-it",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......@@ -58,6 +58,6 @@
"license": "MIT",
"dependencies": {
"debug": "^4.1.1",
"rosaenlg-filter": "2.5.2"
"rosaenlg-filter": "2.5.3"
}
}
{
"name": "italian-determiners",
"version": "2.5.2",
"version": "2.5.3",
"description": "Italian determiners",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
{
"name": "italian-ordinals-cardinals",
"version": "2.5.2",
"version": "2.5.3",
"description": "Ordinal and cardinal numbers in Italian",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
{
"name": "italian-verbs",
"version": "2.5.2",
"version": "2.5.3",
"description": "Italian verbs, based on morph-it",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
{
"name": "italian-words",
"version": "2.5.2",
"version": "2.5.3",
"description": "Gender and plural of Italian words, based on morph-it",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
{
"name": "lefff-helper",
"version": "2.5.2",
"version": "2.5.3",
"description": "Helper functions on an included database derived from Lefff",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
{
"name": "morph-it-helper",
"version": "2.5.2",
"version": "2.5.3",
"description": "Helper functions on an included database derived from morph-it (Free Morphological Lexicon for the Italian Language)",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
......@@ -155,6 +155,7 @@ function renderFile(path, rootPath) {
// path: foo.pug -> foo.<ext>
path = path.replace(isPug, extname);
if (program.out) {
// prepend output directory
if (rootPath) {
......@@ -168,12 +169,19 @@ function renderFile(path, rootPath) {
}
const dir = resolve(dirname(path));
mkdirp.sync(dir);
const output = options.client ? fn : fn(options);
// yseop + path => not using this write
if (!options.yseop || options.string) {
// yseop + path => not using this write
fs.writeFileSync(path, output);
if (program.out) {
// explicitly indicated a file
fs.writeFileSync(path, output);
consoleLog(' ' + chalk.gray('rendered') + ' ' + chalk.cyan('%s'), normalize(path));
} else {
// stdout
process.stdout.write(output);
}
}
consoleLog(' ' + chalk.gray('rendered') + ' ' + chalk.cyan('%s'), normalize(path));
// Found directory
} else if (stat.isDirectory()) {
const files = fs.readdirSync(path);
......
{
"name": "rosaenlg-cli",
"version": "1.5.2",
"version": "1.5.3",
"description": "RosaeNLG's CLI interface",
"bin": {
"rosaenlg": "./index.js",
......@@ -10,9 +10,9 @@
"dependencies": {
"chalk": "^3.0.0",
"commander": "^4.0.1",
"gulp-rosaenlg": "2.5.2",
"gulp-rosaenlg": "2.5.3",
"mkdirp": "^0.5.1",
"rosaenlg": "1.5.2"
"rosaenlg": "1.5.3"
},
"devDependencies": {
"mocha": "^6.2.2",
......
{
"name": "rosaenlg-filter",
"version": "2.5.2",
"version": "2.5.3",
"description": "Filtering feature of RosaeNLG",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......@@ -43,7 +43,7 @@
"better-title-case": "^1.0.1",
"compromise": "^11.14.3",
"debug": "^4.1.1",
"french-h-muet-aspire": "2.5.2",
"french-h-muet-aspire": "2.5.3",
"titlecase-french": "^1.0.1"
},
"keywords": [
......
{
"name": "rosaenlg-node-server",
"version": "1.5.2",
"version": "1.5.3",
"description": "Server for RosaeNLG, written in node.js",
"main": "dist/app.js",
"bin": {
......@@ -71,7 +71,7 @@
"eslint-config-prettier": "^6.5.0",
"eslint-plugin-prettier": "^3.1.1",
"gulp": "^4.0.2",
"gulp-rosaenlg": "2.5.2",
"gulp-rosaenlg": "2.5.3",
"json-refs": "^3.0.13",
"mocha": "^6.2.2",
"nyc": "^14.1.1",
......@@ -82,7 +82,7 @@
"@types/swagger-ui-express": "^4.1.0",
"body-parser": "^1.19.0",
"express": "^4.17.1",
"rosaenlg": "1.5.2",
"rosaenlg": "1.5.3",
"swagger-ui-express": "^4.1.2"
}
}
{
"name": "rosaenlg-pug-code-gen",
"version": "3.5.2",
"version": "3.5.3",
"description": "Default code-generator for pug. It generates HTML via a JavaScript template function. - RosaeNLG fork",
"scripts": {
"build": "tsc && cp lib/index.js dist/",
......@@ -52,13 +52,13 @@
"constantinople": "^4.0.1",
"debug": "^4.1.1",
"doctypes": "^1.1.0",
"french-verbs": "2.5.2",
"german-adjectives": "2.5.2",
"german-verbs": "2.5.2",
"german-words": "2.5.2",
"italian-adjectives": "2.5.2",
"italian-verbs": "2.5.2",
"italian-words": "2.5.2",
"french-verbs": "2.5.3",
"german-adjectives": "2.5.3",
"german-verbs": "2.5.3",
"german-words": "2.5.3",
"italian-adjectives": "2.5.3",
"italian-verbs": "2.5.3",
"italian-words": "2.5.3",
"js-stringify": "^1.0.2",
"pug-attrs": "^2.0.3",
"pug-error": "^1.3.2",
......
{
"name": "rosaenlg-pug-filters",
"version": "4.5.2",
"version": "4.5.3",
"description": "Code for processing filters in pug templates - RosaeNLG fork",
"scripts": {},
"keywords": [
......@@ -12,7 +12,7 @@
"jstransformer": "1.0.0",
"pug-error": "^1.3.2",
"resolve": "^1.1.6",
"rosaenlg-pug-walk": "2.4.2",
"rosaenlg-pug-walk": "2.4.3",
"snyk": "^1.232.0"
},
"devDependencies": {
......@@ -21,9 +21,9 @@
"jstransformer-less": "^2.3.0",
"jstransformer-markdown-it": "^2.1.0",
"jstransformer-stylus": "^1.0.0",
"rosaenlg-pug-lexer": "5.4.2",
"rosaenlg-pug-load": "3.4.2",
"rosaenlg-pug-parser": "6.4.2"
"rosaenlg-pug-lexer": "5.4.3",
"rosaenlg-pug-load": "3.4.3",
"rosaenlg-pug-parser": "6.4.3"
},
"repository": {
"type": "git",
......
This diff is collapsed.
{
"name": "rosaenlg-pug-lexer",
"version": "5.4.2",
"version": "5.4.3",
"description": "The pug lexer (takes a string and converts it to an array of tokens) - RosaeNLG fork",
"keywords": [
"pug"
......
{
"name": "rosaenlg-pug-linker",
"version": "4.4.2",
"version": "4.4.3",
"description": "Link multiple pug ASTs together using include/extends - RosaeNLG fork",
"keywords": [
"pug"
......@@ -8,12 +8,12 @@
"scripts": {},
"dependencies": {
"pug-error": "^1.3.2",
"rosaenlg-pug-walk": "2.4.2"
"rosaenlg-pug-walk": "2.4.3"
},
"devDependencies": {
"rosaenlg-pug-lexer": "5.4.2",
"rosaenlg-pug-load": "3.4.2",
"rosaenlg-pug-parser": "6.4.2"
"rosaenlg-pug-lexer": "5.4.3",
"rosaenlg-pug-load": "3.4.3",
"rosaenlg-pug-parser": "6.4.3"
},
"repository": {
"type": "git",
......
{
"name": "rosaenlg-pug-load",
"version": "3.4.2",
"version": "3.4.3",
"description": "The Pug loader is responsible for loading the depenendencies of a given Pug file. - RosaeNLG fork",
"keywords": [
"pug"
......@@ -8,11 +8,11 @@
"scripts": {},
"dependencies": {
"object-assign": "^4.1.0",
"rosaenlg-pug-walk": "2.4.2"
"rosaenlg-pug-walk": "2.4.3"
},
"devDependencies": {
"rosaenlg-pug-lexer": "5.4.2",
"rosaenlg-pug-parser": "6.4.2"
"rosaenlg-pug-lexer": "5.4.3",
"rosaenlg-pug-parser": "6.4.3"
},
"repository": {
"type": "git",
......
This diff is collapsed.