Skip to content

Commit 211df5b

Browse files
author
Xiaoxing Hu
authored
Merge pull request #109 from orgapp/yarn2
yarn2
2 parents 8ae978f + adaef1f commit 211df5b

File tree

34 files changed

+26517
-19891
lines changed

34 files changed

+26517
-19891
lines changed

‎.gitattributes

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
/.yarn/releases/** binary
2+
/.yarn/plugins/** binary

‎.github/workflows/ut.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ jobs:
1515
node-version: 14
1616
- name: bootstrap and test
1717
run: |
18-
yarn run bootstrap
18+
yarn install
1919
yarn run compile
2020
yarn test

‎.gitignore

+9
Original file line numberDiff line numberDiff line change
@@ -97,3 +97,12 @@ dist
9797
# gatsby
9898
public
9999
.cache
100+
101+
# yarn 2
102+
.yarn/*
103+
!.yarn/patches
104+
!.yarn/releases
105+
!.yarn/plugins
106+
!.yarn/sdks
107+
!.yarn/versions
108+
.pnp.*

‎.yarn/releases/yarn-berry.cjs

+55
Large diffs are not rendered by default.

‎.yarnrc.yml

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
yarnPath: .yarn/releases/yarn-berry.cjs
2+
nodeLinker: node-modules

‎docs/index.org

-3
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,4 @@ The React Framework
5757

5858
Because orga is native to webpack, it's fairly simply to intergrate with nextjs. Example project.
5959

60-
61-
62-
6360
* React

‎examples/gatsby-blorg/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"private": true,
44
"description": "A simple starter to get up and developing quickly with Gatsby",
55
"version": "2.4.9",
6-
"author": "Xiaoxing Hu <hi@huxiaoxing.com>",
6+
"author": "Xiaoxing Hu <xiaoxing@huxx.org>",
77
"dependencies": {
88
"gatsby": "^3.2.1",
99
"gatsby-theme-blorg": "^2.4.9",

‎examples/webpack/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "@orgajs/example-webpack",
33
"private": true,
44
"version": "2.4.9",
5-
"author": "Xiaoxing Hu <hi@huxiaoxing.com>",
5+
"author": "Xiaoxing Hu <xiaoxing@huxx.org>",
66
"main": "index.js",
77
"type": "module",
88
"scripts": {

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"@types/estree": "^0.0.48",
99
"@types/hast": "^2.3.1",
1010
"@types/jest": "^26.0.23",
11-
"@types/node": "^15.12.2",
11+
"@types/node": "^16.3.3",
1212
"@typescript-eslint/eslint-plugin": "^4.26.1",
1313
"@typescript-eslint/parser": "^4.26.1",
1414
"chalk": "^4.1.0",

‎packages/estree-jsx/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"dist"
77
],
88
"main": "dist/index.js",
9-
"author": "Xiaoxing Hu <hi@huxiaoxing.com>",
9+
"author": "Xiaoxing Hu <xiaoxing@huxx.org>",
1010
"license": "MIT",
1111
"homepage": "https://github.com/orgapp/orgajs/tree/master/packages/estree-jsx#readme",
1212
"repository": {
@@ -16,7 +16,7 @@
1616
},
1717
"scripts": {
1818
"build": "yarn clean && yarn compile",
19-
"clean": "del ./dist/* && rm -rf tsconfig.tsbuildinfo",
19+
"clean": "del ./dist tsconfig.tsbuildinfo",
2020
"compile": "tsc -b",
2121
"prepublishOnly": "yarn build"
2222
},

‎packages/gatsby-plugin-orga/package.json

+3-4
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
],
1818
"scripts": {
1919
"build": "yarn clean && yarn compile",
20-
"clean": "del ./dist/* && rm -rf tsconfig.tsbuildinfo",
21-
"compile": "node ./scripts/build.js",
20+
"clean": "del ./dist tsconfig.tsbuildinfo",
21+
"compile": "tsc -b",
2222
"prepublishOnly": "yarn build"
2323
},
2424
"peerDependencies": {
@@ -32,7 +32,7 @@
3232
"@orgajs/rehype-estree": "^2.4.9",
3333
"@orgajs/reorg-rehype": "^2.4.9",
3434
"dataloader": "^2.0.0",
35-
"estree-util-build-jsx": "^2.0.0",
35+
"estree-util-build-jsx": "1.1.1",
3636
"gatsby-core-utils": "^2.3.0",
3737
"memory-fs": "^0.5.0",
3838
"p-queue": "^7.1.0"
@@ -41,7 +41,6 @@
4141
"@orgajs/loader": "^2.4.9",
4242
"@orgajs/react": "^2.4.9",
4343
"del-cli": "^3.0.1",
44-
"esbuild": "^0.12.6",
4544
"typescript": "^4.3.2"
4645
}
4746
}

‎packages/gatsby-plugin-orga/tsconfig.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
2-
"extends": "../../tsconfig.esm.json",
2+
"extends": "../../tsconfig.base.json",
33
"compilerOptions": {
4-
"outDir": "./dist"
4+
"rootDir": "./src",
5+
"outDir": "./dist",
56
},
67
"references": [
78
{ "path": "../estree-jsx" },

‎packages/gatsby-theme-blorg/gatsby-config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ module.exports = options => {
1414
social: [
1515
{ name: 'twitter', url: 'https://twitter.com/xiaoxinghu' },
1616
{ name: 'website', url: 'https://huxiaoxing.com' },
17-
{ name: 'email', url: 'mailto:contact@huxiaoxing.com' },
17+
{ name: 'email', url: 'mailto:contact@huxx.org' },
1818
],
1919
},
2020
plugins: [

‎packages/gatsby-theme-blorg/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "2.4.9",
44
"description": "gatsby org-mode theme for blog",
55
"main": "index.js",
6-
"author": "Xiaoxing Hu <hi@huxiaoxing.com>",
6+
"author": "Xiaoxing Hu <xiaoxing@huxx.org>",
77
"keywords": [
88
"gatsby",
99
"org-mode",

‎packages/gatsby-theme-orga-docs/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "gatsby-theme-orga-docs",
33
"version": "2.4.9",
44
"description": "gatsby theme for orga.js",
5-
"author": "Xiaoxing Hu <hi@huxiaoxing.com>",
5+
"author": "Xiaoxing Hu <xiaoxing@huxx.org>",
66
"homepage": "https://github.com/orgapp/orgajs#readme",
77
"license": "MIT",
88
"main": "index.js",
@@ -22,6 +22,7 @@
2222
"@emotion/styled": "^11.3.0",
2323
"gatsby-plugin-image": "^1.9.0",
2424
"gatsby-plugin-orga": "^2.4.9",
25+
"gatsby-plugin-page-creator": "^3.9.0",
2526
"gatsby-plugin-react-helmet": "^4.9.0",
2627
"gatsby-plugin-sharp": "^3.9.0",
2728
"gatsby-plugin-theme-ui": "^0.10.1",

‎packages/gatsby-theme-orga/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "gatsby-theme-orga",
33
"version": "2.4.9",
44
"description": "gatsby theme for orga.js",
5-
"author": "Xiaoxing Hu <hi@huxiaoxing.com>",
5+
"author": "Xiaoxing Hu <xiaoxing@huxx.org>",
66
"homepage": "https://github.com/orgapp/orgajs#readme",
77
"license": "MIT",
88
"main": "index.js",

‎packages/gatsby-transformer-orga/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "gatsby-transformer-orga",
33
"description": "Gatsby transformer plugin for org-mode with orga",
44
"version": "2.4.9",
5-
"author": "Xiaoxing Hu <hi@huxiaoxing.com>",
5+
"author": "Xiaoxing Hu <xiaoxing@huxx.org>",
66
"dependencies": {
77
"bluebird": "^3.7.0",
88
"gatsby-core-utils": "^2.2.0",
@@ -31,7 +31,7 @@
3131
},
3232
"scripts": {
3333
"build": "yarn clean && yarn compile",
34-
"clean": "del ./dist/* && rm -rf tsconfig.tsbuildinfo",
34+
"clean": "del ./dist tsconfig.tsbuildinfo",
3535
"compile": "tsc -b",
3636
"prepublishOnly": "yarn build"
3737
}

‎packages/loader/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "2.4.9",
44
"description": "Load org-mode content through orga.",
55
"main": "dist/index.js",
6-
"author": "Xiaoxing Hu <hi@huxiaoxing.com>",
6+
"author": "Xiaoxing Hu <xiaoxing@huxx.org>",
77
"license": "MIT",
88
"homepage": "https://github.com/orgapp/orgajs/tree/master/packages/loader#readme",
99
"repository": {
@@ -16,7 +16,7 @@
1616
],
1717
"scripts": {
1818
"build": "yarn clean && yarn compile",
19-
"clean": "del ./dist/* && rm -rf tsconfig.tsbuildinfo",
19+
"clean": "del ./dist tsconfig.tsbuildinfo",
2020
"compile": "tsc -b",
2121
"prepublishOnly": "yarn build"
2222
},

‎packages/next/package.json

+2-5
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
},
1111
"scripts": {
1212
"build": "yarn clean && yarn compile",
13-
"clean": "del ./dist/* && rm -rf tsconfig.tsbuildinfo",
14-
"compile": "node ./build.js",
13+
"clean": "del ./dist tsconfig.tsbuildinfo",
14+
"compile": "tsc -b",
1515
"prepublishOnly": "yarn build"
1616
},
1717
"peerDependencies": {
@@ -22,8 +22,5 @@
2222
"@orgajs/estree-jsx": "^2.4.9",
2323
"@orgajs/rehype-estree": "^2.4.9",
2424
"@orgajs/reorg-rehype": "^2.4.9"
25-
},
26-
"devDependencies": {
27-
"esbuild": "^0.12.9"
2825
}
2926
}

‎packages/next/tsconfig.json

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"extends": "../../tsconfig.base.json",
3+
"compilerOptions": {
4+
"rootDir": "./src",
5+
"outDir": "./dist"
6+
},
7+
"references": [
8+
{ "path": "../rehype-estree" },
9+
{ "path": "../reorg-rehype" },
10+
{ "path": "../estree-jsx" },
11+
{ "path": "../loader" }
12+
],
13+
"include": ["./src"]
14+
}

‎packages/oast-to-hast/package.json

+2-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"dist"
77
],
88
"main": "dist/index.js",
9-
"author": "Xiaoxing Hu <hi@huxiaoxing.com>",
9+
"author": "Xiaoxing Hu <xiaoxing@huxx.org>",
1010
"license": "MIT",
1111
"repository": "https://github.com/orgapp/orgajs/tree/master/packages/oast-to-hast",
1212
"dependencies": {
@@ -17,11 +17,8 @@
1717
},
1818
"scripts": {
1919
"build": "yarn clean && yarn compile",
20-
"clean": "del ./dist/* && rm -rf tsconfig.tsbuildinfo",
20+
"clean": "del ./dist tsconfig.tsbuildinfo",
2121
"compile": "tsc -b",
2222
"prepublishOnly": "yarn build"
23-
},
24-
"devDependencies": {
25-
"@types/hast": "^2.3.1"
2623
}
2724
}

‎packages/orga-posts/package.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"dist"
77
],
88
"main": "dist/index.js",
9-
"author": "Xiaoxing Hu <hi@huxiaoxing.com>",
9+
"author": "Xiaoxing Hu <xiaoxing@huxx.org>",
1010
"license": "MIT",
1111
"repository": {
1212
"type": "git",
@@ -15,7 +15,7 @@
1515
},
1616
"scripts": {
1717
"build": "yarn clean && yarn compile",
18-
"clean": "del ./dist/* && rm -rf tsconfig.tsbuildinfo",
18+
"clean": "del ./dist tsconfig.tsbuildinfo",
1919
"compile": "tsc -b",
2020
"prepublishOnly": "yarn build"
2121
},
@@ -32,6 +32,7 @@
3232
"rehype-stringify": "^8.0.0",
3333
"unified": "^9.2.0",
3434
"unist-util-select": "^3.0.2",
35+
"unist-util-visit": "2.0.3",
3536
"unist-util-visit-parents": "^3.1.1"
3637
}
3738
}

‎packages/orga-theme-ui-preset/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
],
1313
"scripts": {
1414
"build": "yarn clean && yarn compile",
15-
"clean": "del ./dist/*",
15+
"clean": "del ./dist",
1616
"compile": "tsc -b",
1717
"prepublishOnly": "yarn build"
1818
},
@@ -22,7 +22,7 @@
2222
"url": "https://github.com/orgapp/orgajs.git",
2323
"directory": "packages/orga-theme-ui-preset"
2424
},
25-
"author": "Xiaoxing Hu <hi@huxiaoxing.com>",
25+
"author": "Xiaoxing Hu <xiaoxing@huxx.org>",
2626
"license": "MIT",
2727
"dependencies": {
2828
"@theme-ui/preset-base": "^0.6.0"

‎packages/orga/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"dist"
77
],
88
"main": "dist/index.js",
9-
"author": "Xiaoxing Hu <hi@huxiaoxing.com>",
9+
"author": "Xiaoxing Hu <xiaoxing@huxx.org>",
1010
"license": "MIT",
1111
"repository": {
1212
"type": "git",
@@ -15,7 +15,7 @@
1515
},
1616
"scripts": {
1717
"build": "yarn clean && yarn compile",
18-
"clean": "del ./dist/* && rm -rf tsconfig.tsbuildinfo",
18+
"clean": "del ./dist tsconfig.tsbuildinfo",
1919
"compile": "tsc -b",
2020
"prepublishOnly": "yarn build"
2121
},

‎packages/react/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"main": "dist/index.js",
99
"scripts": {
1010
"build": "yarn clean && yarn compile",
11-
"clean": "del ./dist/* && rm -rf tsconfig.tsbuildinfo",
11+
"clean": "del ./dist tsconfig.tsbuildinfo",
1212
"compile": "tsc -b",
1313
"prepublishOnly": "yarn build"
1414
},

‎packages/rehype-estree/package.json

+6-7
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22
"name": "@orgajs/rehype-estree",
33
"version": "2.4.9",
44
"description": "hast to estree",
5-
"author": "Xiaoxing Hu <hi@huxiaoxing.com>",
5+
"author": "Xiaoxing Hu <xiaoxing@huxx.org>",
66
"license": "MIT",
77
"repository": "https://github.com/orgapp/orgajs/tree/master/packages/rehype-estree",
8-
"type": "module",
98
"types": "./dist/index.d.ts",
10-
"exports": "./dist/index.js",
9+
"main": "./dist/index.js",
1110
"files": [
1211
"dist"
1312
],
@@ -16,19 +15,19 @@
1615
},
1716
"scripts": {
1817
"build": "yarn clean && yarn compile",
19-
"clean": "del ./dist/* && rm -rf tsconfig.tsbuildinfo",
18+
"clean": "del ./dist tsconfig.tsbuildinfo",
2019
"compile": "tsc -b",
2120
"prepublishOnly": "yarn build"
2221
},
2322
"dependencies": {
2423
"acorn": "^8.4.1",
2524
"acorn-jsx": "^5.3.1",
26-
"estree-walker": "3.0.0",
27-
"hast-util-to-estree": "^2.0.0",
25+
"estree-walker": "2.0.2",
26+
"hast-util-to-estree": "1.4.0",
27+
"lodash": "^4.17.21",
2828
"periscopic": "2.0.3"
2929
},
3030
"devDependencies": {
31-
"del-cli": "^3.0.1",
3231
"estree-jsx": "^0.0.1"
3332
}
3433
}

‎packages/rehype-estree/src/hast-to-estree.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Node as HastNode } from 'hast'
2-
import { toEstree as hast2estree } from 'hast-util-to-estree'
2+
import hast2estree from 'hast-util-to-estree'
33
import { Handler, Options } from './options'
44
import { Parser } from 'acorn'
55
import jsx from 'acorn-jsx'

‎packages/rehype-estree/tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "../../tsconfig.esm.json",
2+
"extends": "../../tsconfig.base.json",
33
"compilerOptions": {
44
"rootDir": "./src",
55
"outDir": "./dist"

‎packages/reorg-parse/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"dist"
77
],
88
"main": "dist/index.js",
9-
"author": "Xiaoxing Hu <hi@huxiaoxing.com>",
9+
"author": "Xiaoxing Hu <xiaoxing@huxx.org>",
1010
"license": "MIT",
1111
"homepage": "https://github.com/orgapp/orgajs/tree/master/packages/reorg-parse#readme",
1212
"repository": {
@@ -16,7 +16,7 @@
1616
},
1717
"scripts": {
1818
"build": "yarn clean && yarn compile",
19-
"clean": "del ./dist/* && rm -rf tsconfig.tsbuildinfo",
19+
"clean": "del ./dist tsconfig.tsbuildinfo",
2020
"compile": "tsc -b",
2121
"prepublishOnly": "yarn build"
2222
},

0 commit comments

Comments
 (0)