Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update xrun #2013

Merged
merged 42 commits into from
May 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
f43f383
fix: add scss sample subapp v2
May 24, 2023
e9e2126
fix(subappv2): resolve babel runtime dependency
May 31, 2023
0a01e30
fix(subappv2): resolve babel runtime dependency
May 31, 2023
5ace5f7
fix(subappv2): resolve test case failure issue
Jun 2, 2023
17a63fa
fix(subappv2): resolve test case failure issue
Jun 2, 2023
7347c36
chore: update changelog
Jun 3, 2023
709c46b
chore: resolve pnpm-lock.yml conflicts
Jun 3, 2023
c36f492
fix(conflict): merge conflict
shubham2811 Jul 6, 2023
8625b60
fix(conflict): fix conflict
shubham2811 Jul 18, 2023
fbe0cf0
fix(CEECORE-4406): replace request with axios
shubham2811 Jul 18, 2023
06842fc
fix(snyk): replace request package with node-fetch in subapp-web
shubham2811 Jul 19, 2023
a78130e
fix(snyk): replace request package with node-fetch in subapp-web
shubham2811 Jul 19, 2023
3eba58a
fix(snyk): replace request package with node-fetch in subapp-web
shubham2811 Jul 19, 2023
412119f
fix(chore): update changelog
shubham2811 Jul 20, 2023
3a26ca6
Merge branch 'master' of github.com:electrode-io/electrode
shubham2811 Jul 25, 2023
59ad7f5
Merge branch 'master' of github.com:electrode-io/electrode
shubham2811 Aug 9, 2023
4ef157a
Merge branch 'master' of github.com:electrode-io/electrode
shubham2811 Sep 5, 2023
662868b
Merge branch 'master' of github.com:electrode-io/electrode
shubham2811 Sep 12, 2023
94bae6b
Merge branch 'master' of github.com:electrode-io/electrode
shubham2811 Oct 12, 2023
103ca74
Merge branch 'master' of github.com:electrode-io/electrode
shubham2811 Oct 27, 2023
4fe5bd8
Merge branch 'master' of github.com:electrode-io/electrode
Nov 16, 2023
d5fb776
Merge branch 'master' of github.com:electrode-io/electrode
Nov 30, 2023
72592a2
fix(deprecated): remove electrode-react-webapp package
Nov 30, 2023
d151351
Merge branch 'master' of github.com:electrode-io/electrode
Nov 30, 2023
c89e746
fix(peer-dependencies): added react-router-dom as peerDependencies
Dec 11, 2023
2462ca3
fix(changelog): added change log
Dec 13, 2023
ad31c06
Merge branch 'master' of github.com:electrode-io/electrode
Dec 21, 2023
6278918
Merge branch 'master' of github.com:electrode-io/electrode
Jan 5, 2024
e35fb28
fix(jsdom): downgrade jsdom to v21 to work for backward node compatib…
Jan 5, 2024
74583aa
fix(update): replace xclap to xrun
May 23, 2024
5a2aa22
fix(update): replace xclap to xrun
shubham2811 May 23, 2024
6c08125
fix(lint): add lint command
shubham2811 May 27, 2024
d44e081
fix(lint): add lint command
shubham2811 May 27, 2024
25aff91
Merge branch 'master' of github.com:shubham2811/electrode into update…
shubham2811 May 27, 2024
669daf4
fix(lint): add lint command
shubham2811 May 27, 2024
6c32cc3
fix(lint): add lint command
shubham2811 May 27, 2024
06337c1
fix(lint): add lint command
shubham2811 May 27, 2024
4825d6c
fix(lint): add lint command
shubham2811 May 27, 2024
dc6f217
fix(lint): move tslib to dev dependency
shubham2811 May 28, 2024
0a9a207
fix(lint): move tslib to dev dependency
shubham2811 May 28, 2024
8c73293
fix(lint): move tslib to dev dependency
shubham2811 May 28, 2024
41fa0a2
Merge branch 'update-xrun' of github.com:electrode-io/electrode into …
shubham2811 May 29, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@xarc/index-page",
"comment": "add lint inside script",
"type": "none"
}
],
"packageName": "@xarc/index-page"
}
10 changes: 10 additions & 0 deletions common/changes/subapp-react/update-xrun_2024-05-28-15-25.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "subapp-react",
"comment": "no change",
"type": "none"
}
],
"packageName": "subapp-react"
}
3,658 changes: 1,130 additions & 2,528 deletions common/config/rush/pnpm-lock.yaml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/subapp-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,4 +91,4 @@
"trailingComma": "none",
"arrowParens": "avoid"
}
}
}
5 changes: 5 additions & 0 deletions packages/xarc-index-page/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
const { eslintRcTestTypeScript } = require("@xarc/module-dev");
module.exports = {
extends: eslintRcTestTypeScript,
parser: "@typescript-eslint/parser",
};
23 changes: 17 additions & 6 deletions packages/xarc-index-page/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@
"scripts": {
"build": "xrun user/build",
"test": "xrun xarc/test-only",
"lint": "xrun xarc/lint",
"coverage": "xrun xarc/test-cov",
"check": "xrun xarc/check",
"prepublishOnly": "xrun [[build, docs], xarc/check]",
"prepublishOnly": "xrun --serial [[build, docs], xarc/check]",
"docs": "xrun xarc/docs"
},
"repository": {
Expand Down Expand Up @@ -36,19 +37,21 @@
"@istanbuljs/nyc-config-typescript": "^1.0.2",
"@types/chai": "^4.3.16",
"@types/mocha": "^10.0.6",
"@types/node": "^20.12.11",
"@types/node": "^20.12.12",
"@types/sinon": "^17.0.3",
"@types/sinon-chai": "^3.2.12",
"@typescript-eslint/eslint-plugin": "^7.9.0",
"@typescript-eslint/parser": "^7.9.0",
"@typescript-eslint/eslint-plugin": "7.10.0",
"@typescript-eslint/parser": "7.10.0",
"@xarc/module-dev": "^5.0.0",
"@xarc/run": "^1.1.1",
"babel-eslint": "^10.1.0",
"chai": "^4.2.0",
"eslint": "^9.3.0",
"eslint": "^8.52.0",
"eslint-config-walmart": "^2.2.1",
"eslint-plugin-filenames": "^1.3.2",
"eslint-plugin-jsdoc": "^30.3.0",
"eslint-plugin-jsdoc": "^48.2.6",
"mocha": "^10.4.0",
"tslib": "^2.6.2",
"nyc": "^15.1.0",
"sinon": "^18.0.0",
"sinon-chai": "^3.7.0",
Expand Down Expand Up @@ -96,5 +99,13 @@
"@xarc/module-dev/config/test/setup.js"
],
"recursive": true
},
"@xarc/module-dev": {
"features": [
"eslint",
"mocha",
"typedoc",
"typescript"
]
}
}
20 changes: 11 additions & 9 deletions packages/xarc-index-page/test/fixtures/react-helmet-handler.js
Original file line number Diff line number Diff line change
@@ -1,35 +1,37 @@
"use strict";

const Helmet = require("react-helmet").Helmet;
import { Helmet } from "react-helmet";

const emptyTitleRegex = /<title[^>]*><\/title>/;

module.exports = handlerContext => {
module.exports = (handlerContext) => {
const routeOptions = handlerContext.user.routeOptions;
const iconStats = handlerContext.user.routeData.iconStats;

return {
HEAD_INITIALIZE: context => {
HEAD_INITIALIZE: (context) => {
context.user.helmet = Helmet.renderStatic();
},

PAGE_TITLE: context => {
PAGE_TITLE: (context) => {
const helmet = context.user.helmet;
const helmetTitleScript = helmet.title.toString();
const helmetTitleEmpty = helmetTitleScript.match(emptyTitleRegex);

return helmetTitleEmpty ? `<title>${routeOptions.pageTitle}</title>` : helmetTitleScript;
return helmetTitleEmpty
? `<title>${routeOptions.pageTitle}</title>`
: helmetTitleScript;
},

REACT_HELMET_SCRIPTS: context => {
REACT_HELMET_SCRIPTS: (context) => {
const scriptsFromHelmet = ["link", "style", "script", "noscript"]
.map(tagName => context.user.helmet[tagName].toString())
.map((tagName) => context.user.helmet[tagName].toString())
.join("");
return `<!--scripts from helmet-->${scriptsFromHelmet}`;
},

META_TAGS: context => {
META_TAGS: (context) => {
return context.user.helmet.meta.toString() + iconStats;
}
},
};
};
10 changes: 3 additions & 7 deletions packages/xarc-index-page/test/jsx-templates/test1.jsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
/* @jsx createElement */
import { IndexPage, Token, Require, Literal, Component } from "../../lib/jsx";

/* eslint-disable no-unused-vars */

import { IndexPage, createElement, Token, Require, Literal, Component } from "../../lib/jsx";

const MyTest = (props, context) => {
const MyTest = (props) => {
return (
<div {...props} v={() => 50}>
<Token _id="PAGE_TITLE" />
Expand All @@ -23,7 +19,7 @@ class TestComponent1 extends Component {
}
}

function AsyncComponent(props, context, scope) {
function AsyncComponent(props, scope) {
return new Promise(resolve => {
setTimeout(() => {
scope.output.add(`${props.indent}async component ${props.key}\n`);
Expand Down
2 changes: 1 addition & 1 deletion packages/xarc-index-page/test/jsx-templates/test2.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import { IndexPage, createElement, Token, Require, Literal, Component } from "../../lib/jsx"; // eslint-disable-line

const MyTest = (props, context) => {
const MyTest = (props) => {
return (
<div {...props} v={() => 50}>
<Token _id="PAGE_TITLE" />
Expand Down
Loading