Merge pull request #695 from adopted-ember-addons/monorepo

Switch to monorepo

.github/workflows/ci.yml

@@ -20,8 +20,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: pnpm/action-setup@v4
-        with:
-          version: 9
       - name: Install Node
         uses: actions/setup-node@v4
         with:
@@ -31,8 +29,10 @@ jobs:
         run: pnpm install --frozen-lockfile
       - name: Lint
         run: pnpm lint
+        working-directory: test-app
       - name: Run Tests
         run: pnpm test:ember
+        working-directory: test-app
 
   floating:
     name: "Floating Dependencies"
@@ -42,8 +42,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: pnpm/action-setup@v4
-        with:
-          version: 9
       - uses: actions/setup-node@v4
         with:
           node-version: 18
@@ -52,6 +50,7 @@ jobs:
         run: pnpm install --no-lockfile
       - name: Run Tests
         run: pnpm test:ember
+        working-directory: test-app
 
   try-scenarios:
     name: ${{ matrix.try-scenario }}
@@ -82,8 +81,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: pnpm/action-setup@v4
-        with:
-          version: 9
       - name: Install Node
         uses: actions/setup-node@v4
         with:
@@ -92,4 +89,5 @@ jobs:
       - name: Install Dependencies
         run: pnpm install --frozen-lockfile
       - name: Run Tests
-        run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}
+        run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }} --skip-cleanup
+        working-directory: test-app

.github/workflows/push-dist.yml

@@ -0,0 +1,34 @@
+# Because this library needs to be built,
+# we can't easily point package.json files at the git repo for easy cross-repo testing.
+#
+# This workflow brings back that capability by placing the compiled assets on a "dist" branch
+# (configurable via the "branch" option below)
+name: Push dist
+
+on:
+  push:
+    branches:
+      - main
+      - master
+
+jobs:
+  push-dist:
+    name: Push dist
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v4
+      - name: Install Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 18
+          cache: pnpm
+      - name: Install Dependencies
+        run: pnpm install --frozen-lockfile
+      - uses: kategengler/[email protected]
+        with:
+          branch: dist
+          token: ${{ secrets.GITHUB_TOKEN }}
+          working-directory: 'test-app'

.gitignore

@@ -1,25 +1,21 @@
-# compiled output
-/dist/
-/declarations/
+# See https://help.github.com/ignore-files/ for more about ignoring files.
 
 # dependencies
-/node_modules/
+node_modules/
 
 # misc
-/.env*
-/.pnp*
-/.eslintcache
-/coverage/
-/npm-debug.log*
-/testem.log
-/yarn-error.log
+.env*
+.pnp*
+.pnpm-debug.log
+.sass-cache
+.eslintcache
+coverage/
+npm-debug.log*
+yarn-error.log
 
 # ember-try
 /.node_modules.ember-try/
-/npm-shrinkwrap.json.ember-try
 /package.json.ember-try
 /package-lock.json.ember-try
 /yarn.lock.ember-try
-
-# broccoli-debug
-/DEBUG/
+/pnpm-lock.ember-try.yaml

.npmrc

@@ -0,0 +1,9 @@
+# Docs: https://pnpm.io/npmrc
+# https://github.com/emberjs/rfcs/pull/907
+
+# we don't want addons to be bad citizens of the ecosystem
+auto-install-peers=false
+
+# we want true isolation,
+# if a dependency is not declared, we want an error
+resolve-peers-from-workspace-root=false

.prettierignore

@@ -1,13 +1,10 @@
-# unconventional js
-/blueprints/*/files/
-
-# compiled output
-/dist/
+# Prettier is also run from each package, so the ignores here
+# protect against files that may not be within a package
 
 # misc
-/coverage/
 !.*
-.*/
+.lint-todo/
 
 # ember-try
 /.node_modules.ember-try/
+/pnpm-lock.ember-try.yaml

.prettierrc.js

@@ -1,12 +1,6 @@
 'use strict';
 
 module.exports = {
-  overrides: [
-    {
-      files: '*.{js,ts}',
-      options: {
-        singleQuote: true,
-      },
-    },
-  ],
+  plugins: ['prettier-plugin-ember-template-tag'],
+  singleQuote: true,
 };

package.json

@@ -1,114 +1,22 @@
 {
-  "name": "ember-changeset",
-  "version": "4.1.2",
-  "description": "Changesets for Ember",
-  "keywords": [
-    "ember-addon",
-    "changeset"
-  ],
-  "homepage": "https://github.com/adopted-ember-addons/ember-changeset",
-  "bugs": "https://github.com/adopted-ember-addons/ember-changeset/issues",
+  "private": true,
   "repository": "https://github.com/adopted-ember-addons/ember-changeset",
   "license": "MIT",
   "author": "Lauren Tan <[email protected]>",
-  "contributors": [
-    {
-      "name": "Scott Newcomer",
-      "url": "https://github.com/snewcomer"
-    }
-  ],
-  "types": "./index.d.ts",
-  "directories": {
-    "doc": "doc",
-    "test": "tests"
-  },
   "scripts": {
-    "build": "ember build --environment=production",
-    "contributors": "pnpm dlx contributor-faces -e \"(*-bot|*\\[bot\\]|*-tomster|homu|bors)\"",
-    "lint": "concurrently \"pnpm:lint:*(!fix)\" --names \"lint:\"",
-    "lint:css": "stylelint \"**/*.css\"",
-    "lint:css:fix": "concurrently \"pnpm:lint:css -- --fix\"",
-    "lint:fix": "concurrently \"pnpm:lint:*:fix\" --names \"fix:\"",
-    "lint:hbs": "ember-template-lint .",
-    "lint:hbs:fix": "ember-template-lint . --fix",
-    "lint:js": "eslint . --cache",
-    "lint:js:fix": "eslint . --fix",
-    "start": "ember serve",
-    "test": "concurrently \"pnpm:lint\" \"pnpm:test:*\" --names \"lint,test:\"",
-    "test:ember": "ember test",
-    "test:ember-compatibility": "ember try:each"
-  },
-  "dependencies": {
-    "@babel/core": "^7.25.2",
-    "@embroider/macros": "^1.0.0",
-    "@glimmer/tracking": "^1.1.2",
-    "ember-auto-import": "^2.8.1",
-    "ember-cli-babel": "^7.26.11",
-    "validated-changeset": "~1.3.4"
+    "lint": "pnpm --filter '*' lint",
+    "lint:fix": "pnpm --filter '*' lint:fix",
+    "test": "pnpm --filter '*' test",
+    "test:ember": "pnpm --filter '*' test:ember"
   },
   "devDependencies": {
-    "@babel/eslint-parser": "^7.25.1",
-    "@babel/plugin-proposal-decorators": "^7.24.7",
-    "@ember/optional-features": "^2.1.0",
-    "@ember/string": "^3.0.1",
-    "@ember/test-helpers": "^3.3.1",
-    "@embroider/test-setup": "^4.0.0",
-    "@glimmer/component": "^1.1.2",
-    "@glimmer/tracking": "^1.1.2",
-    "broccoli-asset-rev": "^3.0.0",
-    "concurrently": "^8.2.2",
-    "ember-cli": "~5.12.0",
-    "ember-cli-clean-css": "^3.0.0",
-    "ember-cli-dependency-checker": "^3.3.2",
-    "ember-cli-htmlbars": "^6.3.0",
-    "ember-cli-inject-live-reload": "^2.1.0",
-    "ember-cli-sri": "^2.1.1",
-    "ember-cli-terser": "^4.0.2",
-    "ember-data": "~4.12.8",
-    "ember-load-initializers": "^2.1.2",
-    "ember-qunit": "^8.1.0",
-    "ember-resolver": "^12.0.1",
-    "ember-source": "~5.12.0",
-    "ember-source-channel-url": "^3.0.0",
-    "ember-template-lint": "^6.0.0",
-    "ember-try": "^3.0.0",
-    "eslint": "^8.57.1",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-ember": "^12.2.1",
-    "eslint-plugin-n": "^16.6.2",
-    "eslint-plugin-prettier": "^5.2.1",
-    "eslint-plugin-qunit": "^8.1.2",
-    "loader.js": "^4.7.0",
+    "concurrently": "^9.1.0",
     "prettier": "^3.3.3",
-    "qunit": "^2.22.0",
-    "qunit-dom": "^3.2.1",
-    "release-plan": "^0.10.0",
-    "stylelint": "^15.11.0",
-    "stylelint-config-standard": "^34.0.0",
-    "stylelint-prettier": "^4.1.0",
-    "webpack": "^5.95.0",
-    "yup": "^0.32.11"
-  },
-  "peerDependencies": {
-    "ember-data": "*",
-    "ember-source": ">=3.20.0"
-  },
-  "peerDependenciesMeta": {
-    "ember-data": {
-      "optional": true
-    }
-  },
-  "engines": {
-    "node": "18.* || 20.* || >= 22"
+    "prettier-plugin-ember-template-tag": "^2.0.2"
   },
+  "packageManager": "[email protected]",
   "volta": {
     "node": "18.20.4",
     "pnpm": "9.12.3"
-  },
-  "ember": {
-    "edition": "octane"
-  },
-  "ember-addon": {
-    "configPath": "tests/dummy/config"
   }
 }