Skip to content

Commit b312200

Browse files
authored
refactor(theme-classic): migrate to tsc for build (facebook#7447)
* refactor(theme-classic): migrate to tsc for build * fix
1 parent 6b53d42 commit b312200

15 files changed

+47
-104
lines changed

.eslintignore

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ examples/
1111
packages/lqip-loader/lib/
1212
packages/docusaurus/lib/
1313
packages/docusaurus-*/lib/*
14-
packages/docusaurus-*/lib-next/
1514
packages/eslint-plugin/lib/
1615
packages/stylelint-copyright/lib/
1716

.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ packages/docusaurus/lib/
2525
packages/docusaurus-*/lib/*
2626
packages/eslint-plugin/lib/
2727
packages/stylelint-copyright/lib/
28-
packages/docusaurus-*/lib-next/
2928

3029
website/netlifyDeployPreview/*
3130
website/changelog

.prettierignore

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ coverage
77
packages/lqip-loader/lib/
88
packages/docusaurus/lib/
99
packages/docusaurus-*/lib/*
10-
packages/docusaurus-*/lib-next/
1110
packages/create-docusaurus/lib/*
1211
packages/create-docusaurus/templates/*/docusaurus.config.js
1312
packages/eslint-plugin/lib/

.stylelintignore

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ examples/
1010
packages/lqip-loader/lib/
1111
packages/docusaurus/lib/
1212
packages/docusaurus-*/lib/*
13-
packages/docusaurus-*/lib-next/
1413
packages/create-docusaurus/lib/*
1514
packages/create-docusaurus/templates/
1615
website/static/katex/katex.min.css

jest.config.mjs

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ const ignorePatterns = [
2323
'/packages/docusaurus-plugin-content-docs/lib',
2424
'/packages/docusaurus-plugin-content-pages/lib',
2525
'/packages/docusaurus-theme-classic/lib',
26-
'/packages/docusaurus-theme-classic/lib-next',
2726
'/packages/docusaurus-theme-common/lib',
2827
'/packages/docusaurus-migrate/lib',
2928
'/jest',

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"test": "jest",
5555
"test:build:website": "./admin/scripts/test-release.sh",
5656
"watch": "yarn lerna run --parallel watch",
57-
"clear": "(yarn workspace website clear || echo 'Failure while running docusaurus clear') && yarn lerna exec --ignore docusaurus yarn rimraf lib lib-next",
57+
"clear": "(yarn workspace website clear || echo 'Failure while running docusaurus clear') && yarn lerna exec --ignore docusaurus yarn rimraf lib",
5858
"test:baseUrl": "yarn build:website:baseUrl && yarn serve:website:baseUrl",
5959
"lock:update": "npx yarn-deduplicate"
6060
},
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
11
.tsbuildinfo*
22
tsconfig*
33
__tests__
4-
5-
lib/theme
6-
lib-next/**
7-
!lib-next/theme/**
8-
9-
babel.config.js

packages/docusaurus-theme-classic/babel.config.js

-30
This file was deleted.

packages/docusaurus-theme-classic/package.json

+6-12
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,10 @@
1414
},
1515
"license": "MIT",
1616
"scripts": {
17-
"build": "tsc --noEmit && yarn babel:lib && yarn babel:lib-next && yarn format:lib-next",
18-
"watch": "run-p --continue-on-error babel:lib:watch babel:lib-next:watch",
19-
"babel:lib": "cross-env BABEL_ENV=lib babel src -d lib --extensions \".tsx,.ts\" --ignore \"**/*.d.ts\" --copy-files",
20-
"babel:lib-next": "cross-env BABEL_ENV=lib-next babel src -d lib-next --extensions \".tsx,.ts\" --ignore \"**/*.d.ts\" --copy-files",
21-
"babel:lib:watch": "yarn babel:lib --watch",
22-
"babel:lib-next:watch": "yarn babel:lib-next --watch",
23-
"format:lib-next": "prettier --config ../../.prettierrc --write \"lib-next/**/*.{js,ts,jsx,tsc}\""
17+
"build": "tsc --build && node ../../admin/scripts/copyUntypedFiles.mjs && prettier --config ../../.prettierrc --write \"lib/theme/**/*.js\"",
18+
"watch": "run-p -c copy:watch build:watch",
19+
"build:watch": "tsc --build --watch",
20+
"copy:watch": "node ../../admin/scripts/copyUntypedFiles.mjs --watch"
2421
},
2522
"dependencies": {
2623
"@docusaurus/core": "2.0.0-beta.20",
@@ -42,19 +39,16 @@
4239
"prism-react-renderer": "^1.3.3",
4340
"prismjs": "^1.28.0",
4441
"react-router-dom": "^5.2.0",
45-
"rtlcss": "^3.5.0"
42+
"rtlcss": "^3.5.0",
43+
"tslib": "^2.4.0"
4644
},
4745
"devDependencies": {
48-
"@babel/cli": "^7.17.10",
49-
"@babel/core": "^7.17.12",
50-
"@babel/preset-typescript": "^7.17.12",
5146
"@docusaurus/module-type-aliases": "2.0.0-beta.20",
5247
"@docusaurus/types": "2.0.0-beta.20",
5348
"@types/mdx-js__react": "^1.5.5",
5449
"@types/nprogress": "^0.2.0",
5550
"@types/prismjs": "^1.26.0",
5651
"@types/rtlcss": "^3.1.4",
57-
"cross-env": "^7.0.3",
5852
"fs-extra": "^10.1.0",
5953
"react-test-renderer": "^17.0.2",
6054
"utility-types": "^3.10.0"

packages/docusaurus-theme-classic/src/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ export default function themeClassic(
112112
name: 'docusaurus-theme-classic',
113113

114114
getThemePath() {
115-
return '../lib-next/theme';
115+
return '../lib/theme';
116116
},
117117

118118
getTypeScriptThemePath() {
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"extends": "../../tsconfig.json",
3+
"compilerOptions": {
4+
"noEmit": false,
5+
"composite": true,
6+
"incremental": true,
7+
"tsBuildInfoFile": "./lib/.tsbuildinfo-client",
8+
"rootDir": "src",
9+
"outDir": "lib",
10+
"module": "esnext",
11+
"target": "esnext"
12+
},
13+
"include": [
14+
"src/nprogress.ts",
15+
"src/prism-include-languages.ts",
16+
"src/theme",
17+
"src/*.d.ts"
18+
],
19+
"exclude": ["**/__tests__/**"]
20+
}
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,19 @@
11
{
22
"extends": "../../tsconfig.json",
3+
"references": [{"path": "./tsconfig.client.json"}],
34
"compilerOptions": {
4-
"lib": ["DOM", "ES2019"],
5-
"module": "esnext",
6-
"noEmit": true
5+
"noEmit": false,
6+
"incremental": true,
7+
"tsBuildInfoFile": "./lib/.tsbuildinfo",
8+
"module": "commonjs",
9+
"rootDir": "src",
10+
"outDir": "lib"
711
},
8-
"include": ["src/"],
9-
"exclude": ["**/__tests__/**"]
12+
"include": ["src"],
13+
"exclude": [
14+
"src/nprogress.ts",
15+
"src/prism-include-languages.ts",
16+
"src/theme",
17+
"**/__tests__/**"
18+
]
1019
}

packages/docusaurus-theme-translations/src/utils.ts

+1-4
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,7 @@ async function getPackageCodePath(packageName: string) {
2525
const packageJsonPath = path.join(packagePath, 'package.json');
2626
const {main} = await fs.readJSON(packageJsonPath);
2727
const packageSrcPath = path.join(packagePath, path.dirname(main));
28-
const packageLibNextPath = packageSrcPath.replace('lib', 'lib-next');
29-
return (await fs.pathExists(packageLibNextPath))
30-
? packageLibNextPath
31-
: packageSrcPath;
28+
return packageSrcPath;
3229
}
3330

3431
export async function getThemes(): Promise<{name: string; src: string[]}[]> {

website/_dogfooding/testSwizzleThemeClassic.mjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ const classicThemePathBase = path.join(
3131

3232
const themePath = swizzleConfig
3333
? path.join(classicThemePathBase, 'src/theme')
34-
: path.join(classicThemePathBase, 'lib-next/theme');
34+
: path.join(classicThemePathBase, 'lib/theme');
3535

3636
const toPath = path.join(dirname, '_swizzle_theme_tests');
3737

yarn.lock

+3-39
Original file line numberDiff line numberDiff line change
@@ -147,22 +147,6 @@
147147
jsonpointer "^5.0.0"
148148
leven "^3.1.0"
149149

150-
"@babel/cli@^7.17.10":
151-
version "7.17.10"
152-
resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.17.10.tgz#5ea0bf6298bb78f3b59c7c06954f9bd1c79d5943"
153-
integrity sha512-OygVO1M2J4yPMNOW9pb+I6kFGpQK77HmG44Oz3hg8xQIl5L/2zq+ZohwAdSaqYgVwM0SfmPHZHphH4wR8qzVYw==
154-
dependencies:
155-
"@jridgewell/trace-mapping" "^0.3.8"
156-
commander "^4.0.1"
157-
convert-source-map "^1.1.0"
158-
fs-readdir-recursive "^1.1.0"
159-
glob "^7.0.0"
160-
make-dir "^2.1.0"
161-
slash "^2.0.0"
162-
optionalDependencies:
163-
"@nicolo-ribaudo/chokidar-2" "2.1.8-no-fsevents.3"
164-
chokidar "^3.4.0"
165-
166150
"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.16.0", "@babel/code-frame@^7.16.7", "@babel/code-frame@^7.8.3":
167151
version "7.16.7"
168152
resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789"
@@ -1872,7 +1856,7 @@
18721856
resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz#b6461fb0c2964356c469e115f504c95ad97ab88c"
18731857
integrity sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w==
18741858

1875-
"@jridgewell/trace-mapping@^0.3.7", "@jridgewell/trace-mapping@^0.3.8", "@jridgewell/trace-mapping@^0.3.9":
1859+
"@jridgewell/trace-mapping@^0.3.7", "@jridgewell/trace-mapping@^0.3.9":
18761860
version "0.3.13"
18771861
resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz#dcfe3e95f224c8fe97a87a5235defec999aa92ea"
18781862
integrity sha512-o1xbKhp9qnIAoHJSWd6KlCZfqslL4valSF81H8ImioOAxluWYWOpWkpyktY2vnt4tbrX9XYaxovq6cgowaJp2w==
@@ -2611,11 +2595,6 @@
26112595
dependencies:
26122596
is-promise "^4.0.0"
26132597

2614-
"@nicolo-ribaudo/[email protected]":
2615-
version "2.1.8-no-fsevents.3"
2616-
resolved "https://registry.yarnpkg.com/@nicolo-ribaudo/chokidar-2/-/chokidar-2-2.1.8-no-fsevents.3.tgz#323d72dd25103d0c4fbdce89dadf574a787b1f9b"
2617-
integrity sha512-s88O1aVtXftvp5bCPB7WnmXc5IwOZZ7YPuwNPt+GtOOXpPvad1LfbmjYv+qII7zP6RU2QGnqve27dnLycEnyEQ==
2618-
26192598
"@nodelib/[email protected]":
26202599
version "2.1.5"
26212600
resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
@@ -5219,7 +5198,7 @@ cheerio@^1.0.0-rc.10:
52195198
parse5-htmlparser2-tree-adapter "^6.0.1"
52205199
tslib "^2.2.0"
52215200

5222-
chokidar@^3.4.0, chokidar@^3.4.2, chokidar@^3.5.3:
5201+
chokidar@^3.4.2, chokidar@^3.5.3:
52235202
version "3.5.3"
52245203
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
52255204
integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
@@ -5520,11 +5499,6 @@ commander@^2.20.0:
55205499
resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
55215500
integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
55225501

5523-
commander@^4.0.1:
5524-
version "4.1.1"
5525-
resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
5526-
integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
5527-
55285502
commander@^5.0.0, commander@^5.1.0:
55295503
version "5.1.0"
55305504
resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae"
@@ -5773,7 +5747,7 @@ conventional-recommended-bump@^6.1.0:
57735747
meow "^8.0.0"
57745748
q "^1.5.1"
57755749

5776-
convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
5750+
convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
57775751
version "1.8.0"
57785752
resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369"
57795753
integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==
@@ -7615,11 +7589,6 @@ [email protected]:
76157589
resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.3.tgz#ae3ac92d53bb328efe0e9a1d9541f6ad8d48e2d3"
76167590
integrity sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==
76177591

7618-
fs-readdir-recursive@^1.1.0:
7619-
version "1.1.0"
7620-
resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz#e32fc030a2ccee44a6b5371308da54be0b397d27"
7621-
integrity sha512-GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA==
7622-
76237592
fs.realpath@^1.0.0:
76247593
version "1.0.0"
76257594
resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
@@ -13670,11 +13639,6 @@ sitemap@^7.1.1:
1367013639
arg "^5.0.0"
1367113640
sax "^1.2.4"
1367213641

13673-
slash@^2.0.0:
13674-
version "2.0.0"
13675-
resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
13676-
integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==
13677-
1367813642
slash@^3.0.0:
1367913643
version "3.0.0"
1368013644
resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"

0 commit comments

Comments
 (0)