From 1777bfb7dca4dcaf575293ac9cacbc284f692351 Mon Sep 17 00:00:00 2001 From: nightwing Date: Thu, 21 Jul 2022 22:27:46 +0400 Subject: [PATCH 1/2] fix: prevent race condition when creating css files in build --- Makefile.dryice.js | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/Makefile.dryice.js b/Makefile.dryice.js index b06a5252ad1..da3c5606fb2 100755 --- a/Makefile.dryice.js +++ b/Makefile.dryice.js @@ -450,14 +450,21 @@ function buildAce(options, callback) { if (options.noconflict && !options.compress) buildTypes(); - extractCss(options, function() { - if (callback) - return callback(); + // call extractCss only once during a build + if (cssUpdated) { console.log("Finished building " + getTargetDir(options)); - - }); + return; + } else { + cssUpdated = true; + extractCss(options, function() { + if (callback) + return callback(); + console.log("Finished building " + getTargetDir(options)); + }); + } } } +var cssUpdated = false; function extractCss(options, callback) { var dir = getTargetDir(options); @@ -548,6 +555,7 @@ function extractCss(options, callback) { imageCounter++; var imageName = name + "-" + imageCounter + ".png"; images[imageName] = buffer; + console.log("url(\"" + directory + "/" + imageName + "\")"); return "url(\"" + directory + "/" + imageName + "\")"; } ); From 649dd6826f6dc331ccc4818fbcc7d15fe632f476 Mon Sep 17 00:00:00 2001 From: Andrew Nester Date: Thu, 21 Jul 2022 21:23:39 +0200 Subject: [PATCH 2/2] release v1.8.1 --- CHANGELOG.md | 7 +++++++ build | 2 +- lib/ace/config.js | 2 +- package.json | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e5f36ad37e..23639084e59 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [1.8.1](https://github.com/ajaxorg/ace/compare/v1.8.0...v1.8.1) (2022-07-21) + + +### Bug Fixes + +* prevent race condition when creating css files in build ([1777bfb](https://github.com/ajaxorg/ace/commit/1777bfb7dca4dcaf575293ac9cacbc284f692351)) + ## [1.8.0](https://github.com/ajaxorg/ace/compare/v1.7.1...v1.8.0) (2022-07-20) diff --git a/build b/build index cb23d1616b6..74719e4dd46 160000 --- a/build +++ b/build @@ -1 +1 @@ -Subproject commit cb23d1616b6e20d875e1011f90b14f6c6df7bbb5 +Subproject commit 74719e4dd46f0fe8948bb3b383d58fc2348ef128 diff --git a/lib/ace/config.js b/lib/ace/config.js index 9dcf20fa50b..6c1a1d7bf75 100644 --- a/lib/ace/config.js +++ b/lib/ace/config.js @@ -172,6 +172,6 @@ var reportErrorIfPathIsNotConfigured = function() { } }; -exports.version = "1.8.0"; +exports.version = "1.8.1"; }); diff --git a/package.json b/package.json index 1836a654bb2..6d0ebd80fb5 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ace", "description": "Ajax.org Code Editor is a full featured source code highlighting editor that powers the Cloud9 IDE", - "version": "1.8.0", + "version": "1.8.1", "homepage": "http://github.com/ajaxorg/ace", "engines": { "node": ">= 0.6.0"