Merge pull request #730 from dtinth/rushv2

.circleci/config.yml

@@ -1,47 +1,27 @@
 version: 2
-references:
-  restore_node_modules_cache: &restore_node_modules_cache
-    restore_cache:
-      keys:
-        - deps-{{ .Branch }}-{{ checksum "yarn.lock" }}
-        - deps-{{ .Branch }}-
-        - deps-
-  bootstrap: &bootstrap
-    run:
-      name: lerna bootstrap
-      command: lerna bootstrap && lerna run prepare
-  save_node_modules_cache: &save_node_modules_cache
-    save_cache:
-      key: deps-{{ .Branch }}-{{ checksum "yarn.lock" }}
-      paths:
-        - ./node_modules
-        - ./packages/bemuse-indexer/node_modules
-        - ./packages/bemuse-notechart/node_modules
-        - ./packages/bemuse-tools/node_modules
-        - ./packages/bms/node_modules
-        - ./packages/bmson/node_modules
 jobs:
   build:
     working_directory: ~/bemuse
     environment:
       FORCE_COLOR: '1'
     docker:
-      - image: circleci/node:16.3.0-browsers
+      - image: circleci/node:16.12.0-browsers
     steps:
-      - run: sudo npm i -g lerna
       - checkout
       - add_ssh_keys
-      - *restore_node_modules_cache
-      - *bootstrap
-      - *save_node_modules_cache
+      - run:
+          name: install deps
+          command: |
+            node common/scripts/install-run-rush.js install
       - run:
           name: build
           command: |
             rm -rf dist
             node build-scripts build
       - run:
           name: checks
-          command: yarn pre-deploy
+          command: |
+            node build-scripts pre-deploy
       - run:
           name: deploy
           command: |
@@ -58,19 +38,21 @@ jobs:
           root: .
           paths:
             - dist
-            - node_modules
-            - e2e/node_modules
   e2e:
     working_directory: ~/bemuse
     environment:
       FORCE_COLOR: '1'
       SCREENSHOT_DIR: /tmp/bemuse-e2e-screenshot
     docker:
-      - image: circleci/node:16.3.0-browsers
+      - image: circleci/node:16.12.0-browsers
     steps:
       - checkout
       - attach_workspace:
           at: .
+      - run:
+          name: install deps
+          command: |
+            node common/scripts/install-run-rush.js install
       - run:
           name: Install HTTP server
           command: |
@@ -85,7 +67,7 @@ jobs:
           command: |
             cd e2e
             mkdir -p "$SCREENSHOT_DIR"
-            env BEMUSE_PORT=8089 yarn prescript tests/Gameplay-test.js
+            env BEMUSE_PORT=8089 npx prescript tests/Gameplay-test.js
           no_output_timeout: 1m
       - store_artifacts:
           path: /tmp/bemuse-e2e-screenshot

.eslintignore

@@ -4,4 +4,7 @@
 **/dist/**/*
 **/build/**/*
 **/coverage/**/*
+**/common/scripts/**/*
+**/temp/**/*
+**/tmp/**/*
 **/.yarn/**/*

.gitattributes

@@ -31,3 +31,18 @@
 *.PDF diff=astextplain
 *.rtf diff=astextplain
 *.RTF diff=astextplain
+
+# Don't allow people to merge changes to these generated files, because the result
+# may be invalid.  You need to run "rush update" again.
+pnpm-lock.yaml               merge=binary
+shrinkwrap.yaml              merge=binary
+npm-shrinkwrap.json          merge=binary
+yarn.lock                    merge=binary
+
+# Rush's JSON config files use JavaScript-style code comments.  The rule below prevents pedantic
+# syntax highlighters such as GitHub's from highlighting these comments as errors.  Your text editor
+# may also require a special configuration to allow comments in JSON.
+#
+# For more information, see this issue: https://github.com/microsoft/rushstack/issues/1088
+#
+*.json                       linguist-language=JSON-with-Comments

.github/workflows/checks.yml

@@ -22,13 +22,16 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Install Deps
-        run: yarn install && yarn lerna run prepare
+        run: node common/scripts/install-run-rush.js install
       - name: Lint
-        run: yarn danger ci
+        run: node common/scripts/install-run-rush.js danger-ci
         env:
           DANGER_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Type Check
-        run: yarn workspace bemuse tsc
+      - name: Build dependencies
+        run: node common/scripts/install-run-rush.js build --to-except bemuse
+      - name: Typecheck
+        run: node ../common/scripts/install-run-rushx.js typecheck
+        working-directory: bemuse
   test:
     runs-on: ubuntu-latest
     steps:
@@ -38,9 +41,12 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Install Deps
-        run: yarn install && yarn lerna run prepare
+        run: node common/scripts/install-run-rush.js install
+      - name: Build
+        run: node common/scripts/install-run-rush.js build --to-except bemuse
       - name: Test
-        run: yarn test
+        run: node ../common/scripts/install-run-rushx.js test
+        working-directory: bemuse
       - uses: codecov/codecov-action@v2
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
@@ -53,9 +59,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Install Deps
-        run: yarn install && yarn lerna run prepare
+        run: node common/scripts/install-run-rush.js install
+      - name: Build
+        run: node common/scripts/install-run-rush.js build --to-except bemuse
       - name: Test Packages
-        run: yarn lerna run test
+        run: node common/scripts/install-run-rush.js test --to-except bemuse
       - uses: codecov/codecov-action@v2
         with:
           token: ${{ secrets.CODECOV_TOKEN }}

.gitignore

@@ -54,3 +54,9 @@ Icon
 /.otto/
 /packages/*/lib/
 .nyc_output
+
+# Rush temporary files
+common/deploy/
+common/temp/
+common/autoinstallers/*/.npmrc
+**/.rush/temp/

.gitpod.yml

@@ -1,3 +1,5 @@
 tasks:
-  - init: nvm i && yarn && yarn lerna run prepare
-    command: nvm i && yarn start
+  - init: |
+      npm install --global @microsoft/rush && rush install && rush build --to-except bemuse
+    command: |
+      rush dev

.nvmrc

@@ -1 +1 @@
-16.3.0
+16.13.0

.prettierignore

@@ -1,8 +1,18 @@
 **/node_modules/**/*
+**/public/**/*
 **/vendor/**/*
 **/lib/**/*
 **/dist/**/*
 **/build/**/*
 **/coverage/**/*
 **/.nyc_output/**/*
 **/.yarn/**/*
+common/changes/**/*
+common/temp/**/*
+common/scripts/**/*
+common/config/**/*
+pnpm-lock.yaml
+yarn.lock
+package-lock.json
+shrinkwrap.json
+**/*.md

.vscode/settings.json

@@ -6,23 +6,19 @@
   "editor.formatOnSave": true,
   "cSpell.words": [
     "AGPL",
-    "BGAs",
-    "Bemuse's",
-    "Browserslist",
-    "Bugfixes",
-    "Cachier",
-    "IIDX",
-    "IPFS",
-    "JKOC",
-    "METTATUNES",
-    "Pangsakulyanont",
+    "autoinstaller",
     "autoplay",
     "baconjs",
+    "Bemuse's",
     "bemusegame",
     "bemusic",
+    "BGAs",
     "bmson",
     "bmspec",
+    "Browserslist",
     "bson",
+    "Bugfixes",
+    "Cachier",
     "chardet",
     "codebases",
     "codecov",
@@ -39,7 +35,10 @@
     "gameplay",
     "gmail",
     "hardcoded",
+    "IIDX",
     "interop",
+    "IPFS",
+    "JKOC",
     "joezeng",
     "kbps",
     "keycode",
@@ -50,12 +49,14 @@
     "keytime",
     "laggy",
     "lerna",
+    "METTATUNES",
     "module",
     "monorepo",
     "netlify",
     "notechart",
     "notecharts",
     "objectid",
+    "Pangsakulyanont",
     "pegjs",
     "pixi",
     "pixijs",
@@ -80,5 +81,8 @@
     "updeep",
     "workspaces"
   ],
-  "eslint.enable": true
+  "eslint.enable": true,
+  "search.exclude": {
+    "**/.yarn": true
+  }
 }

.vscode/tasks.json

@@ -7,6 +7,9 @@
       "label": "Run Bemuse development server",
       "type": "npm",
       "script": "start",
+      "options": {
+        "cwd": "${workspaceFolder}/bemuse"
+      },
       "group": {
         "kind": "build",
         "isDefault": true