diff --git a/.npmrc b/.npmrc
deleted file mode 100644
index 38f11c64..00000000
--- a/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-registry=https://registry.npmjs.org
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 64455906..ecd15387 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
# Changelog
+### [1.2.1](https://github.com/UnSetSoft/Ryunixjs/compare/v1.2.0-canary.74...v1.2.1) (2025-07-25)
### [1.2.1](https://github.com/UnSetSoft/Ryunixjs/compare/v1.2.0-canary.74...v1.2.1) (2025-07-25)
diff --git a/extensions/ryunix/.gitattributes b/extensions/ryunix/.gitattributes
deleted file mode 100644
index 70e63fff..00000000
--- a/extensions/ryunix/.gitattributes
+++ /dev/null
@@ -1,2 +0,0 @@
-# Set default behavior to automatically normalize line endings.
-* text=auto
diff --git a/extensions/ryunix/.gitignore b/extensions/ryunix/.gitignore
deleted file mode 100644
index aeee7322..00000000
--- a/extensions/ryunix/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-node_modules
-*.vsix
diff --git a/extensions/ryunix/.vscode/launch.json b/extensions/ryunix/.vscode/launch.json
deleted file mode 100644
index 7c83ea6b..00000000
--- a/extensions/ryunix/.vscode/launch.json
+++ /dev/null
@@ -1,16 +0,0 @@
-// A launch configuration that launches the extension inside a new window
-// Use IntelliSense to learn about possible attributes.
-// Hover to view descriptions of existing attributes.
-// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-{
- "version": "0.2.0",
- "configurations": [
- {
- "name": "Extension",
- "type": "extensionHost",
- "request": "launch",
- "runtimeExecutable": "${execPath}",
- "args": ["--extensionDevelopmentPath=${workspaceFolder}"]
- }
- ]
-}
diff --git a/extensions/ryunix/.vscodeignore b/extensions/ryunix/.vscodeignore
deleted file mode 100644
index fc5f1e19..00000000
--- a/extensions/ryunix/.vscodeignore
+++ /dev/null
@@ -1,8 +0,0 @@
-# .vscodeignore
-
-.vscode/
-.git/
-node_modules/
-out/
-*.log
-*.tmp
\ No newline at end of file
diff --git a/extensions/ryunix/CHANGELOG.md b/extensions/ryunix/CHANGELOG.md
deleted file mode 100644
index c71d9886..00000000
--- a/extensions/ryunix/CHANGELOG.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Change Log
-
-## [1.1.4]
-
-- fixed minor bug
-
-## [1.1.3]
-
-- fixed Readme.md
-
-## [1.0.0]
-
-- Initial release
diff --git a/extensions/ryunix/README.md b/extensions/ryunix/README.md
deleted file mode 100644
index e69de29b..00000000
diff --git a/extensions/ryunix/eslint.config.mjs b/extensions/ryunix/eslint.config.mjs
deleted file mode 100644
index 10919a22..00000000
--- a/extensions/ryunix/eslint.config.mjs
+++ /dev/null
@@ -1,60 +0,0 @@
-import globals from 'globals'
-import path from 'node:path'
-import { fileURLToPath } from 'node:url'
-import js from '@eslint/js'
-import { FlatCompat } from '@eslint/eslintrc'
-
-const __filename = fileURLToPath(import.meta.url)
-const __dirname = path.dirname(__filename)
-const compat = new FlatCompat({
- baseDirectory: __dirname,
- recommendedConfig: js.configs.recommended,
- allConfig: js.configs.all,
-})
-
-export default [
- ...compat.extends('eslint:recommended'),
- {
- plugins: {},
-
- languageOptions: {
- globals: {
- ...globals.browser,
- ...globals.node,
- },
-
- ecmaVersion: 2021,
- sourceType: 'module',
-
- parserOptions: {
- ecmaFeatures: {
- jsx: true,
- },
- },
- },
-
- rules: {},
- },
- ...compat.extends('eslint:recommended').map((config) => ({
- ...config,
- files: ['**/*.ryx'],
- })),
- {
- files: ['**/*.ryx'],
-
- languageOptions: {
- ecmaVersion: 2021,
- sourceType: 'module',
-
- parserOptions: {
- ecmaFeatures: {
- jsx: true,
- },
- },
- },
-
- rules: {
- 'no-unused-vars': 'off',
- },
- },
-]
diff --git a/extensions/ryunix/icon.png b/extensions/ryunix/icon.png
deleted file mode 100644
index b8ec312c..00000000
Binary files a/extensions/ryunix/icon.png and /dev/null differ
diff --git a/extensions/ryunix/jsconfig.json b/extensions/ryunix/jsconfig.json
deleted file mode 100644
index 2f58685a..00000000
--- a/extensions/ryunix/jsconfig.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "compilerOptions": {
- "module": "commonjs",
- "target": "ES6",
- "outDir": "out",
- "noLib": true,
- "sourceMap": true
- },
- "exclude": ["node_modules"]
-}
diff --git a/extensions/ryunix/language-configuration.json b/extensions/ryunix/language-configuration.json
deleted file mode 100644
index ddf95d17..00000000
--- a/extensions/ryunix/language-configuration.json
+++ /dev/null
@@ -1,148 +0,0 @@
-{
- "comments": {
- "lineComment": "//",
- "blockComment": ["/*", "*/"]
- },
- "brackets": [
- ["${", "}"],
- ["{", "}"],
- ["[", "]"],
- ["(", ")"]
- ],
- "autoClosingPairs": [
- {
- "open": "{",
- "close": "}"
- },
- {
- "open": "[",
- "close": "]"
- },
- {
- "open": "(",
- "close": ")"
- },
- {
- "open": "'",
- "close": "'",
- "notIn": ["string", "comment"]
- },
- {
- "open": "\"",
- "close": "\"",
- "notIn": ["string"]
- },
- {
- "open": "`",
- "close": "`",
- "notIn": ["string", "comment"]
- },
- {
- "open": "/**",
- "close": " */",
- "notIn": ["string"]
- }
- ],
- "surroundingPairs": [
- ["{", "}"],
- ["[", "]"],
- ["(", ")"],
- ["'", "'"],
- ["\"", "\""],
- ["`", "`"],
- ["<", ">"]
- ],
- "autoCloseBefore": ";:.,=}])>` \n\t",
- "folding": {
- "markers": {
- "start": "^\\s*//\\s*#?region\\b",
- "end": "^\\s*//\\s*#?endregion\\b"
- }
- },
- "wordPattern": {
- "pattern": "(-?\\d*\\.\\d\\w*)|([^\\`\\~\\@\\!\\%\\^\\&\\*\\(\\)\\-\\=\\+\\[\\{\\]\\}\\\\\\|\\;\\:\\'\\\"\\,\\.\\<\\>/\\?\\s]+)"
- },
- "indentationRules": {
- "decreaseIndentPattern": {
- "pattern": "^((?!.*?/\\*).*\\*/)?\\s*[\\}\\]].*$"
- },
- "increaseIndentPattern": {
- "pattern": "^((?!//).)*(\\{([^}\"'`/]*|(\\t|[ ])*//.*)|\\([^)\"'`/]*|\\[[^\\]\"'`/]*)$"
- },
-
- "unIndentedLinePattern": {
- "pattern": "^(\\t|[ ])*[ ]\\*[^/]*\\*/\\s*$|^(\\t|[ ])*[ ]\\*/\\s*$|^(\\t|[ ])*[ ]\\*([ ]([^\\*]|\\*(?!/))*)?$"
- }
- },
- "onEnterRules": [
- {
- "beforeText": {
- "pattern": "^\\s*/\\*\\*(?!/)([^\\*]|\\*(?!/))*$"
- },
- "afterText": {
- "pattern": "^\\s*\\*/$"
- },
- "action": {
- "indent": "indentOutdent",
- "appendText": " * "
- }
- },
- {
- "beforeText": {
- "pattern": "^\\s*/\\*\\*(?!/)([^\\*]|\\*(?!/))*$"
- },
- "action": {
- "indent": "none",
- "appendText": " * "
- }
- },
- {
- "beforeText": {
- "pattern": "^(\\t|[ ])*[ ]\\*([ ]([^\\*]|\\*(?!/))*)?$"
- },
- "previousLineText": {
- "pattern": "(?=^(\\s*(/\\*\\*|\\*)).*)(?=(?!(\\s*\\*/)))"
- },
- "action": {
- "indent": "none",
- "appendText": "* "
- }
- },
- {
- "beforeText": {
- "pattern": "^(\\t|[ ])*[ ]\\*/\\s*$"
- },
- "action": {
- "indent": "none",
- "removeText": 1
- }
- },
- {
- "beforeText": {
- "pattern": "^(\\t|[ ])*[ ]\\*[^/]*\\*/\\s*$"
- },
- "action": {
- "indent": "none",
- "removeText": 1
- }
- },
- {
- "beforeText": {
- "pattern": "^\\s*(\\bcase\\s.+:|\\bdefault:)$"
- },
- "afterText": {
- "pattern": "^(?!\\s*(\\bcase\\b|\\bdefault\\b))"
- },
- "action": {
- "indent": "indent"
- }
- },
- {
- "previousLineText": "^\\s*(((else ?)?if|for|while)\\s*\\(.*\\)\\s*|else\\s*)$",
- "beforeText": "^\\s+([^{i\\s]|i(?!f\\b))",
- "action": {
- "indent": "outdent"
- }
- }
- ]
-}
diff --git a/extensions/ryunix/logo-dark.svg b/extensions/ryunix/logo-dark.svg
deleted file mode 100644
index bf92ff6e..00000000
--- a/extensions/ryunix/logo-dark.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/extensions/ryunix/logo-light.svg b/extensions/ryunix/logo-light.svg
deleted file mode 100644
index 7c600980..00000000
--- a/extensions/ryunix/logo-light.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/extensions/ryunix/package.json b/extensions/ryunix/package.json
deleted file mode 100644
index 397a1b7c..00000000
--- a/extensions/ryunix/package.json
+++ /dev/null
@@ -1,149 +0,0 @@
-{
- "name": "ryunixjs",
- "displayName": "RyunixJS",
- "description": "Ryunix language support",
- "publisher": "unsetsoft",
- "version": "1.0.4",
- "license": "MIT",
- "homepage": "https://github.com/UnSetSoft/Ryunixjs",
- "bugs": {
- "url": "https://github.com/UnSetSoft/Ryunixjs/issues/new/choose"
- },
- "repository": {
- "type": "git",
- "url": "https://github.com/UnSetSoft/Ryunixjs"
- },
- "icon": "icon.png",
- "engines": {
- "vscode": "^1.60.0"
- },
- "categories": [
- "Programming Languages",
- "Snippets"
- ],
- "scripts": {
- "build": "vsce package",
- "pb": "vsce publish"
- },
- "contributes": {
- "configurationDefaults": {
- "[ryx]": {
- "editor.maxTokenizationLineLength": 2500,
- "editor.formatOnSave": true,
- "editor.defaultFormatter": "esbenp.prettier-vscode",
- "editor.codeActionsOnSave": {
- "source.fixAll.eslint": true
- }
- }
- },
- "languages": [
- {
- "id": "ryx",
- "aliases": [
- "JavaScript RYX",
- "JavaScript Ryunix",
- "ryx"
- ],
- "extensions": [
- ".ryx",
- "ryunix.config.js"
- ],
- "configuration": "./language-configuration.json",
- "firstLine": "^#!\\s*/?.*\\bryunix\\b",
- "icon": {
- "light": "./logo-light.svg",
- "dark": "./logo-dark.svg"
- }
- },
- {
- "id": "ryx-tags",
- "aliases": [],
- "configuration": "./tags-language-configuration.json"
- }
- ],
- "grammars": [
- {
- "language": "ryx",
- "scopeName": "source.js.ryx",
- "path": "./syntaxes/ryx.tmLanguage.json",
- "embeddedLanguages": {
- "meta.tag.js": "ryx-tags",
- "meta.tag.without-attributes.js": "ryx-tags",
- "meta.tag.attributes.js.ryx": "ryx",
- "meta.embedded.expression.js": "ryx"
- },
- "tokenTypes": {
- "meta.template.expression": "other",
- "meta.template.expression string": "string",
- "meta.template.expression comment": "comment",
- "entity.name.type.instance.jsdoc": "other",
- "entity.name.function.tagged-template": "other",
- "meta.import string.quoted": "other",
- "variable.other.jsdoc": "other"
- },
- "injectTo": [
- "source.js"
- ]
- }
- ],
- "semanticTokenScopes": [
- {
- "language": "ryx",
- "scopes": {
- "property": [
- "variable.other.property.ryx"
- ],
- "property.readonly": [
- "variable.other.constant.property.ryx"
- ],
- "variable": [
- "variable.other.readwrite.ryx"
- ],
- "variable.readonly": [
- "variable.other.constant.object.ryx"
- ],
- "function": [
- "entity.name.function.ryx"
- ],
- "namespace": [
- "entity.name.type.module.ryx"
- ],
- "variable.defaultLibrary": [
- "support.variable.js"
- ],
- "function.defaultLibrary": [
- "support.function.js"
- ]
- }
- }
- ],
- "snippets": [
- {
- "language": "ryx",
- "path": "./snippets/ryx-snippets.json"
- }
- ],
- "configuration": {
- "eslint.validate": [
- "javascript",
- "javascriptreact",
- "typescript",
- "typescriptreact",
- "ryx"
- ],
- "editor.codeActionsOnSave": {
- "source.fixAll.eslint": true
- },
- "emmet.includeLanguages": {
- "ryx": "html,javascript,javascriptreact"
- }
- }
- },
- "devDependencies": {
- "typescript": "^4.0.0",
- "vscode": "^1.1.33",
- "eslint": "^7.32.0",
- "prettier": "^2.3.2",
- "@vscode/vsce": "^2.27.0"
- }
-}
diff --git a/extensions/ryunix/snippets/ryx-snippets.json b/extensions/ryunix/snippets/ryx-snippets.json
deleted file mode 100644
index e3bf7637..00000000
--- a/extensions/ryunix/snippets/ryx-snippets.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
- "Return Fragment": {
- "prefix": "r:rfra",
- "body": [" return (", " <>", " $1", " ", " );"],
- "description": "Create a Fragment with return"
- },
- "Fragment": {
- "prefix": "r:fra",
- "body": ["<>$1"],
- "description": "Create a Fragment"
- },
- "Component": {
- "prefix": "r:afc",
- "body": [
- "const ${1:ComponentName} = () => {",
- " return (",
- " <>",
- " $2",
- " ",
- " );",
- "};",
- "",
- "export default ${1:ComponentName};"
- ],
- "description": "Create a arrow function component"
- },
- "useStore": {
- "prefix": "r:us",
- "body": ["const [${1:storeName}, ${2:setName}] = useStore()"],
- "description": "Create a useStore state"
- },
- "useEffect": {
- "prefix": "r:ue",
- "body": ["useEffect(() => {", " $1", "}, []);"],
- "description": "Create a useEffect"
- },
- "Import Ryunix": {
- "prefix": "r:imp",
- "body": ["import Ryunix from '@unsetsoft/ryunix'"],
- "description": "Import Ryunix lib"
- },
- "Import useStore": {
- "prefix": "r:store",
- "body": ["import { useStore } from '@unsetsoft/ryunix'"],
- "description": "Import useStore"
- },
- "Import useEffect": {
- "prefix": "r:effect",
- "body": ["import { useEffect } from '@unsetsoft/ryunix'"],
- "description": "Import useEffect from Ryunix lib"
- }
-}
diff --git a/extensions/ryunix/syntaxes/ryx.tmLanguage.json b/extensions/ryunix/syntaxes/ryx.tmLanguage.json
deleted file mode 100644
index 79813251..00000000
--- a/extensions/ryunix/syntaxes/ryx.tmLanguage.json
+++ /dev/null
@@ -1,222 +0,0 @@
-{
- "$schema": "https://raw.githubusercontent.com/martinring/tmlanguage/master/tmlanguage.json",
- "name": "RYX",
- "scopeName": "source.js.ryx",
- "fileTypes": ["ryx"],
- "patterns": [
- {
- "include": "#directives"
- },
- {
- "include": "#statements"
- },
- {
- "include": "#shebang"
- },
- {
- "include": "text.html.basic"
- },
- {
- "include": "source.js"
- }
- ],
- "repository": {
- "directives": {
- "patterns": [
- {
- "match": "^\\s*#\\w+",
- "name": "keyword.control.directive.ryx"
- }
- ]
- },
- "statements": {
- "patterns": [
- {
- "include": "#jsx"
- },
- {
- "include": "#function_call"
- },
- {
- "include": "#variable_declaration"
- },
- {
- "include": "#object_literal"
- },
- {
- "include": "#array_literal"
- },
- {
- "include": "#string_literal"
- },
- {
- "include": "#number_literal"
- },
- {
- "include": "#comment"
- }
- ]
- },
- "shebang": {
- "patterns": [
- {
- "match": "^#!.*$",
- "name": "comment.line.shebang.ryx"
- }
- ]
- },
- "jsx": {
- "begin": "<",
- "end": ">",
- "captures": {
- "0": {
- "name": "punctuation.definition.tag.ryx"
- },
- "1": {
- "patterns": [
- {
- "include": "#tag_name"
- },
- {
- "include": "#attribute"
- },
- {
- "include": "#tag_end"
- }
- ]
- }
- }
- },
- "function_call": {
- "match": "\\b\\w+\\(",
- "name": "entity.name.function.call.ryx",
- "captures": {
- "0": {
- "name": "entity.name.function.ryx"
- }
- }
- },
- "variable_declaration": {
- "match": "\\b(let|const|var)\\s+\\w+\\b",
- "name": "variable.declaration.ryx",
- "captures": {
- "1": {
- "name": "storage.type.ryx"
- },
- "2": {
- "name": "variable.other.readwrite.ryx"
- }
- }
- },
- "object_literal": {
- "begin": "{",
- "end": "}",
- "captures": {
- "0": {
- "name": "punctuation.section.object.ryx"
- },
- "1": {
- "patterns": [
- {
- "include": "#object_key_value_pair"
- }
- ]
- },
- "2": {
- "name": "punctuation.section.object.ryx"
- }
- }
- },
- "object_key_value_pair": {
- "patterns": [
- {
- "match": "\\b\\w+\\b\\s*:",
- "name": "entity.name.tag.ryx",
- "captures": {
- "0": {
- "name": "entity.name.tag.ryx"
- }
- }
- }
- ]
- },
- "array_literal": {
- "begin": "\\[",
- "end": "\\]",
- "captures": {
- "0": {
- "name": "punctuation.section.array.ryx"
- },
- "1": {
- "patterns": [
- {
- "include": "#array_value"
- }
- ]
- },
- "2": {
- "name": "punctuation.section.array.ryx"
- }
- }
- },
- "array_value": {
- "patterns": [
- {
- "match": "\\b\\w+\\b",
- "name": "variable.other.readwrite.ryx"
- }
- ]
- },
- "string_literal": {
- "match": "\"(\\\\\\\\|\\\\\"|[^\"])*\"",
- "name": "string.quoted.double.ryx"
- },
- "number_literal": {
- "match": "\\b\\d+\\b",
- "name": "constant.numeric.ryx"
- },
- "comment": {
- "match": "//.*$",
- "name": "comment.line.double-slash.ryx"
- },
- "tag_name": {
- "match": "\\b\\w+",
- "name": "entity.name.tag.ryx"
- },
- "attribute": {
- "match": "\\b\\w+\\b(?=\\s*=\\s*)",
- "name": "entity.other.attribute-name.ryx"
- },
- "tag_end": {
- "match": ">",
- "name": "punctuation.definition.tag.ryx"
- },
- "text.html.basic": {
- "patterns": [
- {
- "include": "#tag"
- }
- ]
- },
- "tag": {
- "patterns": [
- {
- "include": "#comment"
- },
- {
- "include": "#tag_name"
- },
- {
- "include": "#attribute"
- },
- {
- "include": "#string"
- }
- ]
- },
- "string": {
- "match": "\"(\\\\\\\\|\\\\\"|[^\"])*\"",
- "name": "string.quoted.double.html"
- }
- }
-}
diff --git a/extensions/ryunix/tags-language-configuration.json b/extensions/ryunix/tags-language-configuration.json
deleted file mode 100644
index d5fd603f..00000000
--- a/extensions/ryunix/tags-language-configuration.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
- "comments": {
- "blockComment": ["{/*", "*/}"]
- },
- "brackets": [
- ["{", "}"],
- ["[", "]"],
- ["(", ")"],
- ["<", ">"]
- ],
- "colorizedBracketPairs": [
- ["{", "}"],
- ["[", "]"],
- ["(", ")"]
- ],
- "autoClosingPairs": [
- {
- "open": "{",
- "close": "}"
- },
- {
- "open": "[",
- "close": "]"
- },
- {
- "open": "(",
- "close": ")"
- },
- {
- "open": "'",
- "close": "'",
- "notIn": ["string", "comment"]
- },
- {
- "open": "\"",
- "close": "\"",
- "notIn": ["string"]
- },
- {
- "open": "/**",
- "close": " */",
- "notIn": ["string"]
- }
- ],
- "surroundingPairs": [
- ["{", "}"],
- ["[", "]"],
- ["(", ")"],
- ["<", ">"],
- ["'", "'"],
- ["\"", "\""]
- ],
- "wordPattern": {
- "pattern": "(-?\\d*\\.\\d\\w*)|([^\\`\\~\\!\\@\\$\\^\\&\\*\\(\\)\\=\\+\\[\\{\\]\\}\\\\\\|\\;\\:'\"\\,\\.\\<\\>\\/\\s]+)"
- },
- "onEnterRules": [
- {
- "beforeText": {
- "pattern": "<(?!(?:area|base|br|col|embed|hr|img|input|keygen|link|menuitem|meta|param|source|track|wbr))([_:\\w][_:\\w\\-.\\d]*)([^/>]*(?!/)>)[^<]*$",
- "flags": "i"
- },
- "afterText": {
- "pattern": "^<\\/([_:\\w][_:\\w-.\\d]*)\\s*>$",
- "flags": "i"
- },
- "action": {
- "indent": "indentOutdent"
- }
- },
- {
- "beforeText": {
- "pattern": "<(?!(?:area|base|br|col|embed|hr|img|input|keygen|link|menuitem|meta|param|source|track|wbr))([_:\\w][_:\\w\\-.\\d]*)([^/>]*(?!/)>)[^<]*$",
- "flags": "i"
- },
- "action": {
- "indent": "indent"
- }
- },
- {
- "beforeText": {
- "pattern": "^>$"
- },
- "afterText": {
- "pattern": "^<\\/([_:\\w][_:\\w-.\\d]*)\\s*>$",
- "flags": "i"
- },
- "action": {
- "indent": "indentOutdent"
- }
- },
- {
- "beforeText": {
- "pattern": "^>$"
- },
- "action": {
- "indent": "indent"
- }
- }
- ]
-}
diff --git a/kgmono.config.js b/kgmono.config.js
index 3af43087..dc4a80ba 100644
--- a/kgmono.config.js
+++ b/kgmono.config.js
@@ -6,7 +6,4 @@ Include a list of package.json, for example:
"packages/test2/package.json"
]
*/
-module.exports = [
- 'packages/ryunix/package.json',
- 'packages/ryunix-webpack/package.json',
-]
+module.exports = ['packages/ryunix/package.json']
diff --git a/package.json b/package.json
index 557fbc87..d40d4d82 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "RyunixJS",
- "version": "1.2.1",
+ "version": "1.2.2",
"private": true,
"homepage": "./",
"workspaces": [
@@ -9,19 +9,19 @@
"license": "MIT",
"scripts": {
"lint": "eslint . --max-warnings=0 --config eslint.config.mjs ",
- "lint:fix": "yarn prettier-fix && eslint . --fix --max-warnings=0 --config eslint.config.mjs ",
+ "lint:fix": "pnpm run prettier-fix && eslint . --fix --max-warnings=0 --config eslint.config.mjs ",
"prettier-check": "prettier -c .",
"prettier-fix": "prettier -w .",
"kg:init": "gmvu init",
"kg:bump": "gmvu bump",
- "r:c": "yarn log --prerelease canary && yarn kg:bump && yarn prettier-fix && npm run canary:release --workspace=@unsetsoft/ryunix-webpack --workspace=@unsetsoft/ryunixjs && yarn git canary",
- "r:r": "yarn log main && yarn kg:bump && yarn prettier-fix && npm run release --workspace=@unsetsoft/ryunix-webpack --workspace=@unsetsoft/ryunixjs && yarn git main",
+ "r:c": "pnpm run kg:bump && pnpm run prettier-fix && npm run canary:release --workspace=@unsetsoft/ryunixjs && pnpm run git canary",
+ "r:r": "pnpm run kg:bump && pnpm run prettier-fix && npm run release --workspace=@unsetsoft/ryunixjs && pnpm run git main",
"cra:r": "npm run release --workspace=@unsetsoft/cra",
"cra:n": "npm run nightly:release --workspace=@unsetsoft/cra",
"log": "standard-version --header '# Changelog'",
"git": "git push --follow-tags origin",
- "ryunixjs:build": "yarn build:test --workspace=@unsetsoft/ryunixjs",
- "build": "yarn lint-fix && yarn build:test"
+ "ryunixjs:build": "pnpm run build:test --workspace=@unsetsoft/ryunixjs",
+ "build": "pnpm run lint-fix && pnpm run build:test"
},
"dependencies": {
"@babel/cli": "7.27.2",
@@ -53,7 +53,7 @@
"globals": "16.2.0",
"html-loader": "5.1.0",
"html-webpack-plugin": "5.6.3",
- "image-webpack-loader": "8.1.0",
+ "image-webpack-loader": "^8.0.1",
"lodash": "4.17.21",
"mini-css-extract-plugin": "2.9.2",
"prettier": "3.6.0",
@@ -81,5 +81,5 @@
"standard-version": "9.5.0",
"typescript": "5.8.3"
},
- "packageManager": "yarn@4.9.2"
+ "packageManager": "pnpm@10.20.0"
}
diff --git a/packages/cra/package.json b/packages/cra/package.json
index d1568e81..3af8bd87 100644
--- a/packages/cra/package.json
+++ b/packages/cra/package.json
@@ -1,7 +1,7 @@
{
"name": "@unsetsoft/cra",
"description": "Create Ryunix app",
- "version": "1.1.17",
+ "version": "1.1.18",
"author": "Neyunse",
"repository": "https://github.com/UnSetSoft/Ryunixjs",
"license": "MIT",
diff --git a/packages/cra/src/cli.js b/packages/cra/src/cli.js
index c7440691..72b8e996 100755
--- a/packages/cra/src/cli.js
+++ b/packages/cra/src/cli.js
@@ -20,18 +20,8 @@ create('create-cra', {
choices: ['Latest', 'Canary'],
prompt: 'if-no-arg',
},
- vscode: {
- type: 'confirm',
- default: false,
- describe: 'Do you whant to add Ryunix VScode addon? (Experimental)',
- prompt: hasVscode ? 'if-no-arg' : 'never',
- },
},
after: async ({ answers, template, installNpmPackage }) => {
- if (answers.vscode) {
- await InstallVsocodeAddon()
- }
-
if (template === 'Rspack') {
if (answers.channel === 'Latest') {
await installNpmPackage('@unsetsoft/ryunixjs@latest')
@@ -54,10 +44,10 @@ create('create-cra', {
if (answers.channel === 'Latest') {
await installNpmPackage('@unsetsoft/ryunixjs@latest')
- await installNpmPackage('@unsetsoft/ryunix-webpack@latest', true)
+ await installNpmPackage('@unsetsoft/ryunix-presets@latest', true)
} else if (answers.channel === 'Canary') {
await installNpmPackage('@unsetsoft/ryunixjs@canary')
- await installNpmPackage('@unsetsoft/ryunix-webpack@canary', true)
+ await installNpmPackage('@unsetsoft/ryunix-presets@canary', true)
}
} else if (template === 'Vite') {
// Ryunix
diff --git a/packages/ryunix-presets/package.json b/packages/ryunix-presets/package.json
index 1dfab51d..e1621551 100644
--- a/packages/ryunix-presets/package.json
+++ b/packages/ryunix-presets/package.json
@@ -1,7 +1,7 @@
{
"name": "@unsetsoft/ryunix-presets",
"description": "Package with presets for different development environments.",
- "version": "1.0.0",
+ "version": "1.0.17",
"author": "Neyunse",
"type": "module",
"repository": "https://github.com/UnSetSoft/Ryunixjs",
@@ -11,16 +11,66 @@
],
"files": [
"vite/",
- "rspack/"
+ "rspack/",
+ "webpack/"
],
+ "peerDependencies": {
+ "@unsetsoft/ryunixjs": "^1.2.1"
+ },
"publishConfig": {
"registry": "https://registry.npmjs.org"
},
"exports": {
"./vite": "./vite/index.js",
- "./rspack": "./rspack/index.js"
+ "./rspack": "./rspack/index.js",
+ "./webpack": "./webpack/index.js"
+ },
+ "types": "./webpack/config.d.ts",
+ "bin": {
+ "ryunix": "./webpack/bin/index.mjs"
},
"engines": {
- "node": "^20 || ^22"
+ "node": "^18 || ^20 || ^22"
+ },
+ "dependencies": {
+ "@babel/cli": "7.28.3",
+ "@babel/core": "7.28.5",
+ "@babel/plugin-proposal-class-properties": "7.18.6",
+ "@babel/plugin-transform-react-jsx": "7.27.1",
+ "@babel/preset-env": "7.28.5",
+ "@babel/preset-react": "7.28.5",
+ "@eslint/eslintrc": "3.3.1",
+ "@eslint/js": "9.38.0",
+ "@rollup/plugin-terser": "0.4.4",
+ "@swc/core": "1.12.14",
+ "babel-loader": "10.0.0",
+ "chalk": "5.6.2",
+ "copy-webpack-plugin": "13.0.1",
+ "css-loader": "7.1.2",
+ "css-minimizer-webpack-plugin": "7.0.2",
+ "dotenv-webpack": "8.1.1",
+ "eslint": "9.38.0",
+ "eslint-plugin-react": "^7.37.5",
+ "eslint-webpack-plugin": "5.0.2",
+ "file-loader": "6.2.0",
+ "glob": "11.0.3",
+ "globals": "16.4.0",
+ "html-loader": "5.1.0",
+ "html-webpack-plugin": "5.6.4",
+ "image-webpack-loader": "^8.1.0",
+ "lodash": "4.17.21",
+ "mini-css-extract-plugin": "2.9.4",
+ "rollup": "4.52.5",
+ "sass": "1.93.2",
+ "sass-loader": "16.0.6",
+ "style-loader": "4.0.0",
+ "terminal-log": "1.0.1",
+ "terser-webpack-plugin": "5.3.14",
+ "thread-loader": "4.0.4",
+ "url-loader": "4.1.1",
+ "webpack": "5.102.1",
+ "webpack-cli": "6.0.1",
+ "webpack-dev-server": "5.2.2",
+ "yargs": "18.0.0"
}
}
diff --git a/packages/ryunix-webpack/bin/compiler.mjs b/packages/ryunix-presets/webpack/bin/compiler.mjs
similarity index 100%
rename from packages/ryunix-webpack/bin/compiler.mjs
rename to packages/ryunix-presets/webpack/bin/compiler.mjs
diff --git a/packages/ryunix-webpack/bin/index.mjs b/packages/ryunix-presets/webpack/bin/index.mjs
old mode 100755
new mode 100644
similarity index 100%
rename from packages/ryunix-webpack/bin/index.mjs
rename to packages/ryunix-presets/webpack/bin/index.mjs
diff --git a/packages/ryunix-webpack/bin/prerender.mjs b/packages/ryunix-presets/webpack/bin/prerender.mjs
similarity index 95%
rename from packages/ryunix-webpack/bin/prerender.mjs
rename to packages/ryunix-presets/webpack/bin/prerender.mjs
index b8886410..d35562de 100644
--- a/packages/ryunix-webpack/bin/prerender.mjs
+++ b/packages/ryunix-presets/webpack/bin/prerender.mjs
@@ -73,7 +73,7 @@ const Prerender = async () => {
// title
if (meta.title) {
- html = html.replace(/.*<\/title>/, `<title>${meta.title}`)
+ html = html.replace(/.*<\/title>/, `<title>${meta.title}<\/title>`)
}
// Helper to add or replace metatag
@@ -82,16 +82,13 @@ const Prerender = async () => {
const isProperty = name.startsWith('og:') || name.startsWith('twitter:')
const attr = isProperty ? 'property' : 'name'
- const regex = new RegExp(
- `<meta ${attr}=["']${name}["'] content=".*?"\\s*\/?>`,
- 'i',
- )
+ const regex = new RegExp(`<meta ${attr}=["']${name}["'][^>]*>`, 'i')
const tag = `<meta ${attr}="${name}" content="${value}">`
if (regex.test(html)) {
return html.replace(regex, tag)
} else {
- return html.replace(/<\/head>/i, `${tag}\n</head>`)
+ return html.replace(/<\/head>/i, `${tag}\n<\/head>`)
}
}
diff --git a/packages/ryunix-webpack/bin/serve.mjs b/packages/ryunix-presets/webpack/bin/serve.mjs
similarity index 67%
rename from packages/ryunix-webpack/bin/serve.mjs
rename to packages/ryunix-presets/webpack/bin/serve.mjs
index 8a915bab..0d64331c 100644
--- a/packages/ryunix-webpack/bin/serve.mjs
+++ b/packages/ryunix-presets/webpack/bin/serve.mjs
@@ -73,31 +73,34 @@ const StartServer = async (cliSettings) => {
try {
await server.start() // Iniciar el servidor con el nuevo puerto
- logger.info(`\n
- ${chalk.bold(chalk.cyanBright(`<Ryunix/> ${version}`))}
+ // Mejor formato de información para el servidor
+ const url = `http://localhost:${port}`
+ const cfgStatus = configFileExist()
+ ? chalk.green('loaded')
+ : chalk.red('not found')
+ const envStatus = envPath()
+ ? chalk.green('loaded')
+ : chalk.yellow('not found')
+ const modeLabel = defaultSettings.webpack.production
+ ? chalk.green('production')
+ : chalk.yellow('development')
- - Running at: http://localhost:${port}
- - Config file: ${
- configFileExist()
- ? chalk.green(`loaded`)
- : chalk.red(`404 Not Found`)
- }
- - Environment file: ${
- envPath() ? chalk.green(`loaded`) : chalk.red(`404 Not Found`)
- }
- - Mode: ${
- defaultSettings.webpack.production
- ? chalk.green(`production`)
- : chalk.yellow(`development`)
- }
- ${
- devMode
- ? chalk.yellow(
- `⚠️ You are in development mode, remember update ryunix.config.js for production!`,
- )
- : '' // prevent false in the terminal
- }
- `)
+ const lines = []
+ lines.push(chalk.bold(chalk.cyanBright(`<Ryunix/> ${version}`)))
+ lines.push('')
+ lines.push(`${chalk.gray('-')} Running at: ${chalk.underline(url)}`)
+ lines.push(`${chalk.gray('-')} Config file: ${cfgStatus}`)
+ lines.push(`${chalk.gray('-')} Environment file: ${envStatus}`)
+ lines.push(`${chalk.gray('-')} Mode: ${modeLabel}`)
+ if (devMode)
+ lines.push(
+ chalk.yellow(
+ '⚠️ You are in development mode — update ryunix.config.js for production',
+ ),
+ )
+
+ lines.push('---------------------------')
+ logger.info(lines.join('\n'))
} catch (err) {
logger.error(`[error] ${err.message}`)
}
diff --git a/packages/ryunix-webpack/config.d.ts b/packages/ryunix-presets/webpack/config.d.ts
similarity index 100%
rename from packages/ryunix-webpack/config.d.ts
rename to packages/ryunix-presets/webpack/config.d.ts
diff --git a/packages/ryunix-webpack/eslint.config.mjs b/packages/ryunix-presets/webpack/eslint.config.mjs
similarity index 100%
rename from packages/ryunix-webpack/eslint.config.mjs
rename to packages/ryunix-presets/webpack/eslint.config.mjs
diff --git a/packages/ryunix-presets/webpack/index.js b/packages/ryunix-presets/webpack/index.js
new file mode 100644
index 00000000..e9a15296
--- /dev/null
+++ b/packages/ryunix-presets/webpack/index.js
@@ -0,0 +1,6 @@
+import webpackConfig from './webpack.config.mjs'
+
+const ryunixWebpack = () => webpackConfig
+
+export default ryunixWebpack
+export { ryunixWebpack }
diff --git a/packages/ryunix-webpack/template/index.html b/packages/ryunix-presets/webpack/template/index.html
similarity index 100%
rename from packages/ryunix-webpack/template/index.html
rename to packages/ryunix-presets/webpack/template/index.html
diff --git a/packages/ryunix-webpack/utils/config.cjs b/packages/ryunix-presets/webpack/utils/config.cjs
similarity index 100%
rename from packages/ryunix-webpack/utils/config.cjs
rename to packages/ryunix-presets/webpack/utils/config.cjs
diff --git a/packages/ryunix-webpack/utils/envExist.cjs b/packages/ryunix-presets/webpack/utils/envExist.cjs
similarity index 100%
rename from packages/ryunix-webpack/utils/envExist.cjs
rename to packages/ryunix-presets/webpack/utils/envExist.cjs
diff --git a/packages/ryunix-webpack/utils/index.mjs b/packages/ryunix-presets/webpack/utils/index.mjs
similarity index 97%
rename from packages/ryunix-webpack/utils/index.mjs
rename to packages/ryunix-presets/webpack/utils/index.mjs
index fe451611..c9edf97b 100644
--- a/packages/ryunix-webpack/utils/index.mjs
+++ b/packages/ryunix-presets/webpack/utils/index.mjs
@@ -60,7 +60,14 @@ const getEnviroment = () =>
const getPackageVersion = async () => {
const __dirname = dirname(fileURLToPath(import.meta.url)) // Para obtener el directorio actual
- const packageJsonPath = join(__dirname, '../package.json')
+ const packageJsonPath = join(
+ __dirname,
+ '..',
+ '..',
+ '..',
+ 'ryunixjs',
+ 'package.json',
+ )
const data = await fs.readFile(packageJsonPath, 'utf-8')
const packageJson = JSON.parse(data)
return packageJson
diff --git a/packages/ryunix-webpack/utils/settingfile.cjs b/packages/ryunix-presets/webpack/utils/settingfile.cjs
similarity index 100%
rename from packages/ryunix-webpack/utils/settingfile.cjs
rename to packages/ryunix-presets/webpack/utils/settingfile.cjs
diff --git a/packages/ryunix-webpack/webpack.config.mjs b/packages/ryunix-presets/webpack/webpack.config.mjs
similarity index 92%
rename from packages/ryunix-webpack/webpack.config.mjs
rename to packages/ryunix-presets/webpack/webpack.config.mjs
index eb8a3595..05a3d6d9 100644
--- a/packages/ryunix-webpack/webpack.config.mjs
+++ b/packages/ryunix-presets/webpack/webpack.config.mjs
@@ -164,7 +164,7 @@ export default {
],
},
{
- test: /\.s[ac]ss|css$/,
+ test: /\.s[ac]ss|css$/i,
exclude: /node_modules/,
use: [
config.webpack.production
@@ -254,8 +254,22 @@ export default {
{
from: resolveApp(dir, 'public'),
to: resolveApp(dir, `${config.webpack.output.buildDirectory}/static`),
+ // Exclude any html files (index.html or others) to avoid duplicate emission
+ // when HtmlWebpackPlugin also generates index.html from a template.
globOptions: {
- ignore: ['**/index.html', '**/favicon.png'],
+ ignore: [
+ '**/template.html',
+ '**/index.html',
+ '**/*.html',
+ '**/favicon.png',
+ ],
+ },
+ filter: (resourcePath) => {
+ try {
+ return !resourcePath.toLowerCase().endsWith('.html')
+ } catch (e) {
+ return true
+ }
},
noErrorOnMissing: true,
},
diff --git a/packages/ryunix-webpack/.npmignore b/packages/ryunix-webpack/.npmignore
deleted file mode 100644
index 8f4f0038..00000000
--- a/packages/ryunix-webpack/.npmignore
+++ /dev/null
@@ -1,6 +0,0 @@
-node_modules
-yarn.lock
-.npmrc
-old_lib
-
-
\ No newline at end of file
diff --git a/packages/ryunix-webpack/.npmrc b/packages/ryunix-webpack/.npmrc
deleted file mode 100644
index 38f11c64..00000000
--- a/packages/ryunix-webpack/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-registry=https://registry.npmjs.org
diff --git a/packages/ryunix-webpack/package.json b/packages/ryunix-webpack/package.json
deleted file mode 100644
index befecdce..00000000
--- a/packages/ryunix-webpack/package.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
- "name": "@unsetsoft/ryunix-webpack",
- "version": "1.2.1",
- "license": "MIT",
- "bugs": {
- "url": "https://github.com/UnSetSoft/Ryunixjs/issues"
- },
- "homepage": "https://github.com/UnSetSoft/Ryunixjs#readme",
- "scripts": {
- "canary:release": "npm publish --tag canary",
- "release": "npm publish"
- },
- "bin": {
- "ryunix": "./bin/index.mjs"
- },
- "types": "./config.d.ts",
- "dependencies": {
- "@babel/cli": "7.27.2",
- "@babel/core": "7.27.4",
- "@babel/plugin-proposal-class-properties": "7.18.6",
- "@babel/plugin-transform-react-jsx": "7.27.1",
- "@babel/preset-env": "7.27.2",
- "@babel/preset-react": "7.27.1",
- "@eslint/eslintrc": "3.3.1",
- "@eslint/js": "9.31.0",
- "@rollup/plugin-terser": "0.4.4",
- "@swc/core": "1.12.6",
- "babel-loader": "10.0.0",
- "chalk": "5.4.1",
- "copy-webpack-plugin": "13.0.0",
- "css-loader": "7.1.2",
- "css-minimizer-webpack-plugin": "7.0.2",
- "dotenv-webpack": "8.1.0",
- "eslint": "9.31.0",
- "eslint-plugin-react": "^7.37.5",
- "eslint-webpack-plugin": "5.0.2",
- "file-loader": "6.2.0",
- "glob": "11.0.3",
- "globals": "16.2.0",
- "html-loader": "5.1.0",
- "html-webpack-plugin": "5.6.3",
- "image-webpack-loader": "8.1.0",
- "lodash": "4.17.21",
- "mini-css-extract-plugin": "2.9.2",
- "rollup": "4.44.0",
- "sass": "1.89.2",
- "sass-loader": "16.0.5",
- "style-loader": "4.0.0",
- "terminal-log": "1.0.1",
- "terser-webpack-plugin": "5.3.14",
- "thread-loader": "4.0.4",
- "url-loader": "4.1.1",
- "webpack": "5.99.9",
- "webpack-cli": "6.0.1",
- "webpack-dev-server": "5.2.2",
- "yargs": "18.0.0"
- },
- "engines": {
- "node": "^18 || ^20 || ^22"
- },
- "keywords": [
- "ryunixjs"
- ],
- "publishConfig": {
- "registry": "https://registry.npmjs.org"
- }
-}
diff --git a/packages/ryunix/package.json b/packages/ryunix/package.json
index 9f0c7c43..b3517915 100644
--- a/packages/ryunix/package.json
+++ b/packages/ryunix/package.json
@@ -1,6 +1,6 @@
{
"name": "@unsetsoft/ryunixjs",
- "version": "1.2.1",
+ "version": "1.2.2",
"license": "MIT",
"main": "./dist/Ryunix.min.js",
"types": "./dist/Ryunix.d.ts",
diff --git a/packages/ryunix/src/lib/components.js b/packages/ryunix/src/lib/components.js
index 5473c597..2f1fe570 100644
--- a/packages/ryunix/src/lib/components.js
+++ b/packages/ryunix/src/lib/components.js
@@ -96,12 +96,7 @@ const optimizationImageApi = ({ src, props }) => {
const Image = ({ src, ...props }) => {
const optimization = props.optimization === 'true' ? true : false
- const url = optimization
- ? optimizationImageApi({
- src,
- props,
- })
- : src
+ const url = src
const ImageProps = {
src: url,
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
new file mode 100644
index 00000000..18ec407e
--- /dev/null
+++ b/pnpm-workspace.yaml
@@ -0,0 +1,2 @@
+packages:
+ - 'packages/*'