Use nested directory structure

siku2 · Mar 23, 2022 · d9d1a1b · d9d1a1b
1 parent 3051829
commit d9d1a1b
Show file tree

Hide file tree

Showing 19 changed files with 18 additions and 18 deletions.
diff --git a/build/.gitignore b/build/.gitignore
@@ -1,5 +1,5 @@
 /dist-debug/
-/dist-prod/
+/dist-release/
 /node_modules/
 
 package-lock.json
diff --git a/build/README.md b/build/README.md
@@ -18,5 +18,5 @@ just install
 just build
 ```
 
-> **NOTE:** This will output the files to the `dist-debug/` and `dist-prod/` directories.
+> **NOTE:** This will output the files to the `dist-debug/` and `dist-release/` directories.
 > Use `just build_js` in the root directory to update the files used by the library.
diff --git a/build/justfile b/build/justfile
@@ -1,9 +1,9 @@
 # Build the Monaco Javascript files
-@build: build-debug build-prod
+@build: build-debug build-release
 
-@build-prod:
-    -rm dist-prod/*
-    npm run build-prod
+@build-release:
+    -rm dist-release/*
+    npm run build-release
 
 @build-debug:
     -rm dist-debug/*

diff --git a/build/package.json b/build/package.json
@@ -1,6 +1,6 @@
 {
   "scripts": {
-    "build-prod": "rollup -c",
+    "build-release": "rollup -c",
     "build-debug": "rollup -c --configDebug"
   },
   "dependencies": {

diff --git a/build/rollup.config.js b/build/rollup.config.js
@@ -20,7 +20,7 @@ const workers = [
 
 export default args => {
   const commonPlugins = args.configDebug ? [nodeResolve()] : [nodeResolve(), terser()];
-  const dist = args.configDebug ? "dist-debug" : "dist-prod";
+  const dist = args.configDebug ? "dist-debug" : "dist-release";
 
   const workerConfigs = workers.map((worker) => ({
     input: `monaco-editor/esm/vs/${worker.input}`,

diff --git a/js-debug/css.worker.js → js/debug/css.worker.js b/js-debug/css.worker.js → js/debug/css.worker.js
diff --git a/js-debug/editor.js → js/debug/editor.js b/js-debug/editor.js → js/debug/editor.js
diff --git a/js-debug/editor.worker.js → js/debug/editor.worker.js b/js-debug/editor.worker.js → js/debug/editor.worker.js
diff --git a/js-debug/html.worker.js → js/debug/html.worker.js b/js-debug/html.worker.js → js/debug/html.worker.js
diff --git a/js-debug/json.worker.js → js/debug/json.worker.js b/js-debug/json.worker.js → js/debug/json.worker.js
diff --git a/js-prod/css.worker.js → js/release/css.worker.js b/js-prod/css.worker.js → js/release/css.worker.js
diff --git a/js-prod/editor.js → js/release/editor.js b/js-prod/editor.js → js/release/editor.js
diff --git a/js-prod/editor.worker.js → js/release/editor.worker.js b/js-prod/editor.worker.js → js/release/editor.worker.js
diff --git a/js-prod/html.worker.js → js/release/html.worker.js b/js-prod/html.worker.js → js/release/html.worker.js
diff --git a/js-prod/json.worker.js → js/release/json.worker.js b/js-prod/json.worker.js → js/release/json.worker.js
diff --git a/justfile b/justfile
@@ -19,7 +19,7 @@ doc *args:
 # Build the Javascript code
 @build_js:
     just build/build
-    -rm js-debug/*
-    -rm js-prod/*
-    cp build/dist-debug/*.js js-debug
-    cp build/dist-prod/*.js js-prod
+    -rm js/debug/*
+    -rm js/release/*
+    cp build/dist-debug/*.js js/debug
+    cp build/dist-release/*.js js/release
diff --git a/src/sys/editor.rs b/src/sys/editor.rs
@@ -53,8 +53,8 @@ impl_default_empty_obj![
 
 // DANGER: Generated code ahead. Keep out!
 
-#[cfg_attr(debug_assertions, wasm_bindgen(module = "/js-debug/editor.js"))]
-#[cfg_attr(not(debug_assertions), wasm_bindgen(module = "/js-prod/editor.js"))]
+#[cfg_attr(debug_assertions, wasm_bindgen(module = "/js/debug/editor.js"))]
+#[cfg_attr(not(debug_assertions), wasm_bindgen(module = "/js/release/editor.js"))]
 extern "C" {
     /// Create a new editor under `domElement`.
     /// `domElement` should be empty (not contain other dom nodes).

diff --git a/src/sys/mod.rs b/src/sys/mod.rs
@@ -18,8 +18,8 @@ impl Default for Environment {
 
 // You're entering generated land, tread with care.
 
-#[cfg_attr(debug_assertions, wasm_bindgen(module = "/js-debug/editor.js"))]
-#[cfg_attr(not(debug_assertions), wasm_bindgen(module = "/js-prod/editor.js"))]
+#[cfg_attr(debug_assertions, wasm_bindgen(module = "/js/debug/editor.js"))]
+#[cfg_attr(not(debug_assertions), wasm_bindgen(module = "/js/release/editor.js"))]
 extern "C" {
     /// A helper that allows to emit and listen to typed events
     #[derive(Debug)]

diff --git a/src/workers/mod.rs b/src/workers/mod.rs
@@ -9,14 +9,14 @@ use web_sys::{Blob, Url, Worker};
 #[cfg(debug_assertions)]
 macro_rules! include_worker {
     ($name: literal) => {
-        include_str!(concat!("../../js-debug/", $name))
+        include_str!(concat!("../../js/debug/", $name))
     };
 }
 
 #[cfg(not(debug_assertions))]
 macro_rules! include_worker {
     ($name: literal) => {
-        include_str!(concat!("../../js-prod/", $name))
+        include_str!(concat!("../../js/release/", $name))
     };
 }