Skip to content

Commit bd7d3ab

Browse files
FolydFolyd
committed
Migrate index to ESM
1 parent fedf88f commit bd7d3ab

File tree

10 files changed

+38
-28
lines changed

10 files changed

+38
-28
lines changed

‎docs/static/js/update-index.js

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
import caniuseIndex from "./index/caniuse.js";
2+
import booksIndex from "./index/books.js";
3+
import commandsIndex from "./index/commands.js";
4+
import labelsIndex from "./index/labels.js";
5+
import lintsIndex from "./index/lints.js";
6+
import rfcsIndex from "./index/rfcs.js";
7+
import rustcIndex from "./index/rustc.js";
8+
import targetsIndex from "./index/targets.js";
9+
import { mapping, crateIndex } from "./crates/index.js";
10+
111
const indexList = document.querySelector(".index-list");
212

313
function updateIndex(target, index, extra) {
@@ -22,31 +32,31 @@ function renderSuccessMessage(message) {
2232
}
2333

2434
document.addEventListener("DOMContentLoaded", async () => {
25-
updateIndex("book", window.booksIndex).then(() => {
35+
updateIndex("book", booksIndex).then(() => {
2636
renderSuccessMessage("Book index");
2737
});
28-
updateIndex("lint", window.lintsIndex).then(() => {
38+
updateIndex("lint", lintsIndex).then(() => {
2939
renderSuccessMessage("Clippy lint index");
3040
});
31-
updateIndex("caniuse", window.caniuseIndex).then(() => {
41+
updateIndex("caniuse", caniuseIndex).then(() => {
3242
renderSuccessMessage("Caniuse index");
3343
});
34-
updateIndex("label", window.labelsIndex).then(() => {
44+
updateIndex("label", labelsIndex).then(() => {
3545
renderSuccessMessage("Github rust-lang/rust repository label index");
3646
});
37-
updateIndex("rfc", window.rfcsIndex).then(() => {
47+
updateIndex("rfc", rfcsIndex).then(() => {
3848
renderSuccessMessage("Rust RFC index");
3949
});
40-
updateIndex("rustc", window.rustcIndex).then(() => {
50+
updateIndex("rustc", rustcIndex).then(() => {
4151
renderSuccessMessage("`:rustc` command index");
4252
});
43-
updateIndex("target", window.targetsIndex).then(() => {
53+
updateIndex("target", targetsIndex).then(() => {
4454
renderSuccessMessage("`:target` command index");
4555
});
46-
updateIndex("crate", window.crateIndex, { mapping: window.mapping }).then(() => {
56+
updateIndex("crate", crateIndex, { mapping: mapping }).then(() => {
4757
renderSuccessMessage("Top 20K crate index");
4858
});
49-
updateIndex("command", window.commandsIndex).then(() => {
59+
updateIndex("command", commandsIndex).then(() => {
5060
renderSuccessMessage("Command index");
5161
});
5262

‎docs/templates/update.html

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@ <h1>Notice</h1>
3737
e.data.hasOwnProperty("frameHeight") && (document.getElementById("footer").style.height = `${e.data.frameHeight}px`)
3838
}
3939
</script>
40-
<script src="/crates/index.js"></script>
41-
<script src="/index/commands.js"></script>
42-
<script src="/index/books.js"></script>
43-
<script src="/index/labels.js"></script>
44-
<script src="/index/rfcs.js"></script>
45-
<script src="/index/lints.js"></script>
46-
<script src="/index/caniuse.js"></script>
47-
<script src="/index/rustc.js"></script>
48-
<script src="/index/targets.js"></script>
49-
<script src="/js/update-index.js"></script>
40+
<script src="/crates/index.js" type="module"></script>
41+
<script src="/index/commands.js" type="module"></script>
42+
<script src="/index/books.js" type="module"></script>
43+
<script src="/index/labels.js" type="module"></script>
44+
<script src="/index/rfcs.js" type="module"></script>
45+
<script src="/index/lints.js" type="module"></script>
46+
<script src="/index/caniuse.js" type="module"></script>
47+
<script src="/index/rustc.js" type="module"></script>
48+
<script src="/index/targets.js" type="module"></script>
49+
<script src="/js/update-index.js" type="module"></script>
5050
{% endblock footer %}

‎rust/src/tasks/books.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ impl BooksTask {
155155
Ok(result) => {
156156
let books: Vec<_> = result.into_iter().filter(|book| !book.is_empty()).collect();
157157
let contents = format!(
158-
"var N=null;var booksIndex={};",
158+
"let N=null;const booksIndex={};export default booksIndex;",
159159
serde_json::to_string(&books)?
160160
);
161161
let path = Path::new(&self.dest_path);

‎rust/src/tasks/caniuse.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ impl Task for CaniuseTask {
106106
let path = Path::new(&self.dest_path);
107107
fs::write(
108108
path,
109-
format!("var caniuseIndex={};", serde_json::to_string(&feats)?),
109+
format!("const caniuseIndex={};export default caniuseIndex;", serde_json::to_string(&feats)?),
110110
)?;
111111
Ok(())
112112
}

‎rust/src/tasks/crates.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ fn generate_javascript_crates_index(crates: &[Crate], minifier: &Minifier) -> St
110110
})
111111
.collect();
112112
let crate_index = format!(
113-
"var crateIndex={};",
113+
"const crateIndex={};export default crateIndex;",
114114
serde_json::to_string(&crates_map).unwrap()
115115
);
116116
contents.push_str(&Minifier::minify_js(&crate_index));
@@ -175,7 +175,7 @@ impl Task for CratesTask {
175175
let minifier = Minifier::new(&frequency_words);
176176
let mapping = minifier.get_key_to_word_mapping();
177177
let mut contents = format!(
178-
"var mapping=JSON.parse('{}');",
178+
"let mapping=JSON.parse('{}');",
179179
serde_json::to_string(&mapping)?
180180
);
181181
contents.push_str(&generate_javascript_crates_index(&crates, &minifier));

‎rust/src/tasks/labels.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ impl LabelsTask {
6969
fs::write(
7070
Path::new(&self.dest_path),
7171
format!(
72-
"var labelsIndex={};",
72+
"var labelsIndex={};export default labelsIndex;",
7373
serde_json::to_string(&labels).unwrap()
7474
),
7575
)?;

‎rust/src/tasks/lints.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ impl LintsTask {
9090
})
9191
.collect();
9292

93-
let contents = format!("var lintsIndex={};", serde_json::to_string(&lints)?);
93+
let contents = format!("const lintsIndex={};export default lintsIndex;", serde_json::to_string(&lints)?);
9494
let path = Path::new(&self.dest_path);
9595
fs::write(path, Minifier::minify_js(&contents))?;
9696
println!("\nGenerate javascript lints index successful!");

‎rust/src/tasks/rfcs.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ impl Task for RfcsTask {
6363
let path = Path::new(&self.dest_path);
6464
fs::write(
6565
path,
66-
format!("var rfcsIndex={};", serde_json::to_string(&metadatas)?),
66+
format!("const rfcsIndex={};export default rfcsIndex;", serde_json::to_string(&metadatas)?),
6767
)?;
6868

6969
Ok(())

‎rust/src/tasks/rustc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ impl RustcTask {
6767

6868
fs::write(
6969
Path::new(&self.dest_path),
70-
format!("var rustcIndex={};", serde_json::to_string(&map).unwrap()),
70+
format!("const rustcIndex={};export default rustcIndex;", serde_json::to_string(&map).unwrap()),
7171
)?;
7272
println!("\nGenerate rustc index successful!");
7373
Ok(())

‎rust/src/tasks/targets.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ impl TargetsTask {
118118

119119
fs::write(
120120
Path::new(&self.dest_path),
121-
format!("var targetsIndex={};", serde_json::to_string(&map).unwrap()),
121+
format!("const targetsIndex={};export default targetsIndex;", serde_json::to_string(&map).unwrap()),
122122
)?;
123123
println!("\nGenerate targets index successful!");
124124
Ok(())

0 commit comments

Comments
 (0)