move node_modules into root folder [action required]

Recommend removing ts/node_modules folder before attempting to
build after this update.

This moves ts/node_modules into the root of the project to work around
#1405 (comment)
 
Also fixes the sass errors shown when running scripts/svelte-check

.bazelignore

@@ -1 +1 @@
-ts/node_modules
+node_modules

.buildkite/linux/entrypoint

@@ -11,7 +11,7 @@ BAZEL="bazel --output_user_root=/state/bazel --output_base=/state/bazel/anki"
 BUILDARGS="--config=ci --experimental_convenience_symlinks=ignore --disk_cache=/state/bazel/disk --repository_cache=/state/bazel/repo"
 
 # move existing node_modules into tree
-test -e /state/node_modules && mv /state/node_modules ts/
+test -e /state/node_modules && mv /state/node_modules .
 
 $BAZEL build $BUILDARGS ...
 
@@ -26,4 +26,4 @@ python scripts/copyright_headers.py
 
 echo "--- Cleanup"
 # if tests succeed, back up node_modules folder
-mv ts/node_modules /state/
+mv node_modules /state/

.buildkite/mac/entrypoint

@@ -7,7 +7,7 @@ BAZEL="bazel --output_user_root=~/bazel --output_base=~/bazel/anki"
 BUILDARGS="--config=ci --experimental_convenience_symlinks=ignore"
 
 # move existing node_modules into tree
-test -e ~/node_modules && mv ~/node_modules ts/
+test -e ~/node_modules && mv ~/node_modules .
 
 $BAZEL build $BUILDARGS ...
 
@@ -16,4 +16,4 @@ $BAZEL test $BUILDARGS ...
 
 echo "--- Cleanup"
 # if tests succeed, back up node_modules folder
-mv ts/node_modules ~/
+mv node_modules ~/

.gitignore

@@ -6,3 +6,4 @@ target
 user.bazelrc
 .dmypy.json
 rust-project.json
+node_modules

BUILD.bazel

@@ -33,5 +33,7 @@ pkg_tar(
     tags = ["manual"],
 )
 
-# for version info
-exports_files(["defs.bzl"])
+exports_files([
+    "defs.bzl",
+    "package.json",
+])

WORKSPACE

@@ -1,7 +1,7 @@
 workspace(
     name = "ankidesktop",
     managed_directories = {"@npm": [
-        "ts/node_modules",
+        "node_modules",
     ]},
 )
 

defs.bzl

@@ -43,12 +43,12 @@ def setup_deps():
         python_runtime = "@python//:python",
     )
 
-    node_repositories(package_json = ["@ankidesktop//ts:package.json"])
+    node_repositories(package_json = ["@ankidesktop//:package.json"])
 
     yarn_install(
         name = "npm",
-        package_json = "@ankidesktop//ts:package.json",
-        yarn_lock = "@ankidesktop//ts:yarn.lock",
+        package_json = "@ankidesktop//:package.json",
+        yarn_lock = "@ankidesktop//:yarn.lock",
     )
 
     sass_repositories()

docs/development.md

@@ -181,7 +181,7 @@ of `use` statements.
 
 The Bazel build products will make RA start up slowly out of the box. For a much
 nicer experience, add each of the bazel-* folders to Rust Analyzer's excludeDirs
-settings, and ts/node_modules. Wildcards don't work unfortunately. Then adjust
+settings, and node_modules. Wildcards don't work unfortunately. Then adjust
 VS Code's "watcher exclude", and add `**/bazel-*`.
 
 After running 'code' from the project root, it may take a minute or two to be
@@ -203,12 +203,12 @@ Recording also requires `lame` to be in your system path.
 ## Build errors and cleaning
 
 If you get errors with @npm and node_modules in the message, try deleting the
-ts/node_modules folder.
+node_modules folder.
 
 Unlike the old Make system, a "clean build" should almost never be required
 unless you are debugging issues with the build system. But if you need to get
-things to a fresh state, you can run `bazel clean --expunge`. Afte doing so,
-make sure you remove the ts/node_modules folder, or subsequent build commands
+things to a fresh state, you can run `bazel clean --expunge`. After doing so,
+make sure you remove the node_modules folder, or subsequent build commands
 will fail with a "no such file or directory node_modules/anki" message.
 
 ## Tracing build problems

ts/package.json → package.json

@@ -51,7 +51,7 @@
     },
     "scripts": {
         "fix": "prettier --write */*.ts */*.svelte",
-        "postinstall": "patch-package"
+        "postinstall": "patch-package --patch-dir ts/patches"
     },
     "dependencies": {
         "@fluent/bundle": "^0.17.0",

scripts/copyright_headers.py

@@ -18,7 +18,7 @@
 ignored_folders = [
     "bazel-",
     "qt/forms",
-    "ts/node_modules",
+    "node_modules",
 ]
 
 if not os.path.exists("WORKSPACE"):

scripts/svelte-check

@@ -1,3 +1,5 @@
 #!/bin/bash
 
-SASS_PATH=$(pwd)/bazel-bin ts/node_modules/.bin/svelte-check --workspace ts
+SASS_PATH=ts/sass:$(pwd)/bazel-bin/ts/sass \
+    node_modules/.bin/svelte-check \
+    --workspace ts

ts/tsconfig.json

@@ -30,8 +30,7 @@
         ],
         // uncomment for building with tsc directly
         // "outDir": "dist",
-        // "rootDir": "..",
-        "rootDir": ".",
+        "rootDir": "..",
         "rootDirs": [
             ".",
             // for VS code

ts/update-licenses.sh

@@ -3,6 +3,6 @@
 
 set -e
 
-./node_modules/.bin/license-checker-rseidelsohn --production --json \
+cd .. && ./node_modules/.bin/license-checker-rseidelsohn --production --json \
     --excludePackages anki --relativeLicensePath \
-    --relativeModulePath > licenses.json
+    --relativeModulePath > ts/licenses.json