Skip to content

Commit 01a5a82

Browse files
authored
Merge pull request #6861 from StoDevX/hawken/remove-bundled-docs
2 parents fb31b3c + 29fb0e9 commit 01a5a82

File tree

14 files changed

+218
-246
lines changed

14 files changed

+218
-246
lines changed

.github/workflows/check.yml

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -214,8 +214,6 @@ jobs:
214214
- if: steps.node-cache.outputs.cache-hit != 'true'
215215
run: exit 1
216216

217-
- run: npm run bundle-data
218-
219217
- name: Run tests
220218
run: npm run test -- --coverage
221219

@@ -243,8 +241,6 @@ jobs:
243241
- if: steps.node-cache.outputs.cache-hit != 'true'
244242
run: exit 1
245243

246-
- run: npm run bundle-data
247-
248244
- run: npx tsc
249245

250246
data:
@@ -310,9 +306,9 @@ jobs:
310306

311307
- name: Generate jsbundle
312308
if: steps.jsbundle-cache.outputs.cache-hit != 'true'
313-
run: |
314-
npm run bundle-data
315-
APP_MODE=mocked npm run bundle:ios
309+
run: npm run bundle:ios
310+
env:
311+
APP_MODE: mocked
316312

317313
- name: Cache the jsbundle
318314
uses: actions/cache/save@58c146cc91c5b9e778e71775dfe9bf1442ad9a12 # v3
@@ -359,9 +355,9 @@ jobs:
359355

360356
- name: Generate jsbundle
361357
if: steps.jsbundle-cache.outputs.cache-hit != 'true'
362-
run: |
363-
npm run bundle-data
364-
APP_MODE=mocked npm run bundle:android
358+
run: npm run bundle:android
359+
env:
360+
APP_MODE: mocked
365361

366362
- name: Cache the jsbundle
367363
if: steps.jsbundle-cache.outputs.cache-hit != 'true'
@@ -402,9 +398,6 @@ jobs:
402398
echo 524288 | sudo tee -a /proc/sys/fs/inotify/max_queued_events
403399
echo 524288 | sudo tee -a /proc/sys/fs/inotify/max_user_instances
404400
sudo sysctl -p
405-
406-
# temporary, until we can get SKIP_BUNDLING to work
407-
- run: npm run bundle-data
408401
409402
- name: Gradle
410403
uses: gradle/gradle-build-action@3fbe033aaae657f011f88f29be9e65ed26bd29ef # v2

android/app/build.gradle

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -231,22 +231,6 @@ dependencyLocking {
231231
// lockMode = LockMode.STRICT
232232
}
233233

234-
// Bundles the app's data for the build process
235-
task bundleData(type: Exec) {
236-
workingDir '../../'
237-
commandLine 'npm', 'run', 'bundle-data'
238-
}
239-
240-
gradle.projectsEvaluated {
241-
// hook bundleData into the android build process
242-
if (project.hasProperty('bundleDebugJsAndAssets')) {
243-
bundleDebugJsAndAssets.dependsOn bundleData
244-
}
245-
if (project.hasProperty('bundleReleaseJsAndAssets')) {
246-
bundleReleaseJsAndAssets.dependsOn bundleData
247-
}
248-
}
249-
250234
project.ext.vectoricons = [
251235
// Name of the font files you want to copy
252236
iconFontNames: [

data/_schemas/chapel.yaml

Lines changed: 0 additions & 9 deletions
This file was deleted.

data/_schemas/credits.yaml

Lines changed: 0 additions & 11 deletions
This file was deleted.

data/chapel.yaml

Lines changed: 0 additions & 4 deletions
This file was deleted.

data/credits.yaml

Lines changed: 0 additions & 51 deletions
This file was deleted.

data/legal.md

Lines changed: 0 additions & 17 deletions
This file was deleted.

data/privacy.md

Lines changed: 0 additions & 67 deletions
This file was deleted.

ios/AllAboutOlaf.xcodeproj/project.pbxproj

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -633,7 +633,6 @@
633633
13B07F8C1A680F5B00A75B9A /* Frameworks */,
634634
13B07F8E1A680F5B00A75B9A /* Resources */,
635635
679C3A6C2050B47F00B4D498 /* Embed Frameworks */,
636-
6776346D1ECC93FA00C6F018 /* Bundle Data Files */,
637636
00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
638637
878A020C8F21FDAF804AB318 /* [CP] Copy Pods Resources */,
639638
E8D5872EA86435C8F87A0C7B /* [CP] Embed Pods Frameworks */,
@@ -1050,21 +1049,6 @@
10501049
shellPath = /bin/sh;
10511050
shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh\n";
10521051
};
1053-
6776346D1ECC93FA00C6F018 /* Bundle Data Files */ = {
1054-
isa = PBXShellScriptBuildPhase;
1055-
alwaysOutOfDate = 1;
1056-
buildActionMask = 2147483647;
1057-
files = (
1058-
);
1059-
inputPaths = (
1060-
);
1061-
name = "Bundle Data Files";
1062-
outputPaths = (
1063-
);
1064-
runOnlyForDeploymentPostprocessing = 0;
1065-
shellPath = /bin/sh;
1066-
shellScript = "if [ ! -e package.json ]; then\n cd ..\nfi\n\nnpm run bundle-data\n";
1067-
};
10681052
71669A1E2623AE93009C095C /* [CP] Copy Pods Resources */ = {
10691053
isa = PBXShellScriptBuildPhase;
10701054
buildActionMask = 2147483647;

modules/markdown/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
export {Heading} from './heading'
2+
export {Link} from './link'
23
export {Paragraph, Strong, Emph, BlockQuote} from './formatting'
34
export {Markdown} from './markdown'
45
export type {MarkdownProps} from './markdown'

0 commit comments

Comments
 (0)