From d31784c7da21ab9db257b9e814c4b39b9903395f Mon Sep 17 00:00:00 2001 From: Volker Schukai <volker.schukai@schukai.com> Date: Wed, 10 Aug 2022 16:53:14 +0200 Subject: [PATCH] chore: commit save point --- deployment/web/index.html | 26 +++---------- development/makefiles/project.mk | 9 ++++- development/script/build-doc.sh | 5 ++- .../script/replace-codepen-skypack.cjs | 37 +++++++++++++++++++ 4 files changed, 55 insertions(+), 22 deletions(-) create mode 100755 development/script/replace-codepen-skypack.cjs diff --git a/deployment/web/index.html b/deployment/web/index.html index 4a2321d89..81880a14f 100644 --- a/deployment/web/index.html +++ b/deployment/web/index.html @@ -16,12 +16,9 @@ font-weight: 400; src: url('/assets/maven-pro-v32-latin-ext_latin-regular.eot'); /* IE9 Compat Modes */ src: local(''), - url('/assets/maven-pro-v32-latin-ext_latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url('/assets/maven-pro-v32-latin-ext_latin-regular.woff2') format('woff2'), /* Super Modern Browsers */ - url('/assets/maven-pro-v32-latin-ext_latin-regular.woff') format('woff'), /* Modern Browsers */ - url('/assets/maven-pro-v32-latin-ext_latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */ - url('/assets/maven-pro-v32-latin-ext_latin-regular.svg#MavenPro') format('svg'); /* Legacy iOS */ + url('/assets/maven-pro-v32-latin-ext_latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('/assets/maven-pro-v32-latin-ext_latin-regular.woff2') format('woff2'), /* Super Modern Browsers */ url('/assets/maven-pro-v32-latin-ext_latin-regular.woff') format('woff'), /* Modern Browsers */ url('/assets/maven-pro-v32-latin-ext_latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */ url('/assets/maven-pro-v32-latin-ext_latin-regular.svg#MavenPro') format('svg'); /* Legacy iOS */ } + /* maven-pro-900 - latin-ext_latin */ @font-face { font-family: 'Maven Pro'; @@ -29,22 +26,12 @@ font-weight: 900; src: url('/assets/maven-pro-v32-latin-ext_latin-900.eot'); /* IE9 Compat Modes */ src: local(''), - url('/assets/maven-pro-v32-latin-ext_latin-900.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url('/assets/maven-pro-v32-latin-ext_latin-900.woff2') format('woff2'), /* Super Modern Browsers */ - url('/assets/maven-pro-v32-latin-ext_latin-900.woff') format('woff'), /* Modern Browsers */ - url('/assets/maven-pro-v32-latin-ext_latin-900.ttf') format('truetype'), /* Safari, Android, iOS */ - url('/assets/maven-pro-v32-latin-ext_latin-900.svg#MavenPro') format('svg'); /* Legacy iOS */ + url('/assets/maven-pro-v32-latin-ext_latin-900.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('/assets/maven-pro-v32-latin-ext_latin-900.woff2') format('woff2'), /* Super Modern Browsers */ url('/assets/maven-pro-v32-latin-ext_latin-900.woff') format('woff'), /* Modern Browsers */ url('/assets/maven-pro-v32-latin-ext_latin-900.ttf') format('truetype'), /* Safari, Android, iOS */ url('/assets/maven-pro-v32-latin-ext_latin-900.svg#MavenPro') format('svg'); /* Legacy iOS */ } </style> <link type="text/css" rel="stylesheet" href="style.css"> - - - <!--[if lt IE 9]> - <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js" crossorigin="anonymous"></script> - <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js" crossorigin="anonymous"></script> - <![endif]--> <meta name="robots" content="index, follow"> </head> <body> @@ -59,15 +46,15 @@ </div> <div> <p> - <a class="button" href="https://monsterjs.org/en/doc/latest/" id="getting-started">Getting + <a class="button" href="https://monsterjs.org/en/doc/monster/" id="getting-started">Getting Started</a> </p> </div> <div style="margin-top:80px"> <p> - <strong></strong>Components:</strong> <a href="https://monsterjs.org/en/doc/components/form/latest/" + <strong></strong>Components:</strong> <a href="https://monsterjs.org/en/doc/form/" id="form-getting-started">Form</a>, <a - href="https://monsterjs.org/en/doc/components/notify/latest/" + href="https://monsterjs.org/en/doc/notify/" id="notify-getting-started">Notification</a> </p> </div> @@ -95,6 +82,5 @@ </div> </div> - </body> </html> diff --git a/development/makefiles/project.mk b/development/makefiles/project.mk index 782be5e17..8c9403639 100644 --- a/development/makefiles/project.mk +++ b/development/makefiles/project.mk @@ -28,7 +28,6 @@ test-browser-monster: create-polyfill-monster #$(QUIET) if $(OPENBROWSER) ; then google-chrome --profile-directory="Default" $(TEST_PATH)web/test.html ; fi - .PHONY: web-to-s3 ## transfer web to s3 web-to-s3: @@ -37,3 +36,11 @@ web-to-s3: $(QUIET) $(AWS) s3 --recursive --only-show-errors cp $(DEPLOYMENT_PATH)web/vendor/ s3://monsterjs.org/vendor/ $(QUIET) $(AWS) s3 --only-show-errors cp $(DEPLOYMENT_PATH)web/index.html s3://monsterjs.org/index.html $(QUIET) $(AWS) s3 --only-show-errors cp $(DEPLOYMENT_PATH)web/error.html s3://monsterjs.org/error.html + + +.PHONY: doc-to-s3 +## transfer doc to s3 +doc-to-s3: jsdoc-build + $(ECHOMARKER) "transfer doc to s3" + $(QUIET) $(AWS) s3 --recursive --only-show-errors cp $(BUILD_PATH)docs s3://monsterjs.org/en/doc/monster/ + diff --git a/development/script/build-doc.sh b/development/script/build-doc.sh index 219afa31d..18f66d5b3 100755 --- a/development/script/build-doc.sh +++ b/development/script/build-doc.sh @@ -4,10 +4,13 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )/" PROJECT_ROOT="$(realpath $SCRIPT_DIR'../../')/" TUTORIALS_PATH=${PROJECT_ROOT}documentation/tutorial/ +BUILD_PATH=${PROJECT_ROOT}deployment/build/docs/ DOCUMENTATION_CONFIG_PATH=${PROJECT_ROOT}documentation/config/jsdoc.json - npx jsdoc --tutorials ${TUTORIALS_PATH} \ --readme ${PROJECT_ROOT}documentation/README.md \ --configure ${DOCUMENTATION_CONFIG_PATH} \ + + +${SCRIPT_DIR}replace-codepen-skypack.cjs \ No newline at end of file diff --git a/development/script/replace-codepen-skypack.cjs b/development/script/replace-codepen-skypack.cjs new file mode 100755 index 000000000..292bd80a6 --- /dev/null +++ b/development/script/replace-codepen-skypack.cjs @@ -0,0 +1,37 @@ +#!/usr/bin/env node + +const regex = /<form action=\"https:\/\/codepen.*<\/form>/gm; +const fs = require('fs'); +var path = require('path') + + +const docPath = path.normalize(__dirname + '/../../deployment/build/docs/') +const dir = fs.opendirSync(docPath); + +while ((f = dir.readSync()) !== null) { + if (!f.isFile()) { + continue; + } + + if ((path.extname(f.name) !== ".html")) { + continue; + } + + const fn = docPath + f.name; + let content = fs.readFileSync(fn, 'utf8'); + + while ((m = regex.exec(content)) !== null) { + m.forEach((match, groupIndex) => { + const s=match.replaceAll(";@schukai/monster", ";https://cdn.skypack.dev/@schukai/monster@latest"); + content=content.replace(match+"", s); + }); + } + + fs.writeFileSync(fn, content, 'utf8') + +} + + + + + -- GitLab