Move tests to own app

.github/workflows/ci.yml

@@ -40,7 +40,7 @@ jobs:
         path:
           # - ./docs
           - ./ember-headlessui
-          # - ./test-app
+          - ./test-app
           # - ./test-build
     steps:
       - uses: actions/checkout@v3
@@ -118,10 +118,7 @@ jobs:
       #   with:
       #     name: dist
       #     path: ${{ env.dist }}
-      - run: pnpm test:ember
-        working-directory: 'ember-headlessui'
-      # monorepo prep
-      # - run: pnpm --filter test-app run test:ember
+      - run: pnpm --filter test-app run test:ember
 
 
   try-scenarios:
@@ -133,8 +130,10 @@ jobs:
       fail-fast: true
       matrix:
         ember-try-scenario:
-          - ember-minimum-supported
+          - ember-3-25
           - ember-lts-3-28
+          - ember-4-0
+          - ember-4-4
           - ember-release
           - ember-beta
           - ember-canary
@@ -161,8 +160,7 @@ jobs:
       #     name: dist
       #     path: ${{ env.dist }}
       - name: test
-        # working-directory: test-app
-        working-directory: 'ember-headlessui'
+        working-directory: test-app
         run: >
           node_modules/.bin/ember try:one ${{ matrix.ember-try-scenario }}
           --skip-cleanup
@@ -206,16 +204,22 @@ jobs:
       #   with:
       #     name: dist
       #     path: ${{ env.dist }}
+      - name: Update TS Version
+        run: pnpm add --save-dev ${{ matrix.typescript-scenario }}
+        working-directory: test-app
+      - name: Type checking
+        run: |
+          pnpm --filter test-app exec tsc -v
+          pnpm --filter test-app exec tsc --build
+
+      # Temporariy while the addon is still a v1 addon.
+      # These checks will be handled by rollup in the future.
       - name: Update TS Version
         run: pnpm add --save-dev ${{ matrix.typescript-scenario }}
         working-directory: 'ember-headlessui'
-        # working-directory: test-app
       - name: Type checking
         working-directory: 'ember-headlessui'
         run: |
           pnpm tsc -v
           pnpm tsc --build
-          # monorepo prep
-          # pnpm --filter test-app exec tsc -v
-          # pnpm --filter test-app exec tsc --build
 

.github/workflows/docs.yml

@@ -30,10 +30,10 @@ jobs:
         run: pnpm build:docs
 
       - name: Generate Fallback Page
-        run: cp ember-headlessui/dist/index.html ember-headlessui/dist/404.html
+        run: cp test-app/dist/index.html test-app/dist/404.html
 
       - name: Upload to GitHub Pages
         uses: JamesIves/github-pages-deploy-action@4.1.4
         with:
           branch: gh-pages
-          folder: ember-headlessui/dist
+          folder: test-app/dist

.gitignore

@@ -1,2 +1,5 @@
 dist/
 node_modules/
+
+.github/
+.pnpm-debug.log

ember-headlessui/.ember-cli

@@ -5,5 +5,11 @@
 
     Setting `disableAnalytics` to true will prevent any data from being sent.
   */
-  "disableAnalytics": false
+  "disableAnalytics": false,
+
+  /**
+  Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
+  rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
+  */
+  "isTypeScriptProject": true
 }

ember-headlessui/.gitignore

@@ -23,6 +23,12 @@
 # ember-try
 /.node_modules.ember-try/
 /bower.json.ember-try
+/npm-shrinkwrap.json.ember-try
 /package.json.ember-try
+/package-lock.json.ember-try
+/yarn.lock.ember-try
 
 /.env
+
+# broccoli-debug
+/DEBUG/

ember-headlessui/.npmignore

@@ -14,6 +14,7 @@
 /.eslintignore
 /.eslintrc.js
 /.git/
+/.github/
 /.gitignore
 /.prettierignore
 /.prettierrc.js
@@ -26,10 +27,14 @@
 /ember-cli-build.js
 /testem.js
 /tests/
+/yarn-error.log
 /yarn.lock
 .gitkeep
 
 # ember-try
 /.node_modules.ember-try/
 /bower.json.ember-try
+/npm-shrinkwrap.json.ember-try
 /package.json.ember-try
+/package-lock.json.ember-try
+/yarn.lock.ember-try

ember-headlessui/.prettierignore

@@ -14,8 +14,12 @@
 /coverage/
 !.*
 .eslintcache
+.lint-todo/
 
 # ember-try
 /.node_modules.ember-try/
 /bower.json.ember-try
+/npm-shrinkwrap.json.ember-try
 /package.json.ember-try
+/package-lock.json.ember-try
+/yarn.lock.ember-try

ember-headlessui/ember-cli-build.js

@@ -3,24 +3,7 @@
 const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
 
 module.exports = function (defaults) {
-  let app = new EmberAddon(defaults, {
-    autoImport: {
-      webpack: {
-        node: {
-          // Required to import `testdouble` in tests
-          global: true,
-        },
-      },
-    },
-
-    postcssOptions: {
-      compile: {
-        plugins: [
-          require('tailwindcss')('./tests/dummy/config/tailwind.config.js'),
-        ],
-      },
-    },
-  });
+  let app = new EmberAddon(defaults, {});
 
   /*
     This build file specifies the options for the dummy test app of this
@@ -29,7 +12,5 @@ module.exports = function (defaults) {
     behave. You most likely want to be modifying `./index.js` or app's build file
   */
 
-  const { maybeEmbroider } = require('@embroider/test-setup');
-
-  return maybeEmbroider(app);
+  return app.toTree();
 };

ember-headlessui/index.js

@@ -2,4 +2,6 @@
 
 module.exports = {
   name: require('./package').name,
+
+  isDevelopingAddon: () => true,
 };

ember-headlessui/package.json

@@ -28,35 +28,31 @@
     "start": "ember serve",
     "test": "npm-run-all lint test:*",
     "test:ember": "ember test",
-    "test:ember-compatibility": "ember try:each",
     "release": "dotenv release-it --",
     "prepack": "ember ts:precompile",
     "postpack": "ember ts:clean"
   },
   "dependencies": {
-    "@tailwindcss/typography": "^0.5.2",
     "ember-auto-import": "^2.2.0",
     "ember-cli-babel": "^7.26.3",
     "ember-cli-htmlbars": "^6.0.1",
     "ember-cli-typescript": "^5.1.0",
     "ember-concurrency": "^2.1.2",
     "ember-element-helper": "^0.6.0",
-    "ember-modifier": "4.0.0-beta.1",
+    "ember-modifier": "^4.0.0-beta.1",
     "ember-set-helper": "^2.0.1",
     "ember-truth-helpers": "^3.0.0",
     "focus-trap": "^6.7.1",
     "tracked-maps-and-sets": "^3.0.1"
   },
+  "peerDependencies": {
+    "ember-source": ">= 3.25.0 || ^4.0.0"
+  },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
     "@ember/optional-features": "^2.0.0",
-    "@ember/test-helpers": "^2.4.2",
-    "@embroider/test-setup": "^1.2.0",
     "@glimmer/component": "^1.0.4",
     "@glimmer/tracking": "^1.0.4",
     "@nullvoxpopuli/eslint-configs": "^1.5.1",
-    "@testing-library/dom": "^8.1.0",
-    "@testing-library/user-event": "^13.1.9",
     "@types/ember": "^4.0.0",
     "@types/ember-qunit": "^5.0.0",
     "@types/ember-resolver": "^5.0.11",
@@ -76,63 +72,33 @@
     "@types/ember__string": "^3.0.9",
     "@types/ember__template": "^4.0.0",
     "@types/ember__test": "^4.0.0",
-    "@types/ember__test-helpers": "^2.6.1",
     "@types/ember__utils": "^4.0.0",
     "@types/htmlbars-inline-precompile": "^3.0.0",
     "@types/qunit": "^2.19.0",
     "@types/rsvp": "^4.0.4",
-    "autoprefixer": "^10.0.2",
     "babel-eslint": "^10.1.0",
     "broccoli-asset-rev": "^3.0.0",
     "dotenv-cli": "^4.0.0",
     "ember-cli": "~4.4.0",
-    "ember-cli-dependency-checker": "^3.2.0",
-    "ember-cli-deprecation-workflow": "^2.0.0",
     "ember-cli-inject-live-reload": "^2.1.0",
-    "ember-cli-postcss": "^7.0.2",
-    "ember-cli-sri": "^2.1.1",
-    "ember-cli-terser": "^4.0.1",
-    "ember-css-transitions": "^2.1.0",
-    "ember-disable-prototype-extensions": "^1.1.3",
-    "ember-export-application-global": "^2.0.1",
-    "ember-load-initializers": "^2.1.2",
-    "ember-maybe-import-regenerator": "^1.0.0",
-    "ember-on-helper": "^0.1.0",
-    "ember-page-title": "^7.0.0",
-    "ember-qunit": "^5.1.4",
-    "ember-resolver": "^8.0.3",
-    "ember-source": "~3.28.1",
-    "ember-source-channel-url": "^3.0.0",
+    "ember-source": "~3.25.0",
     "ember-template-lint": "^3.5.1",
     "ember-template-lint-plugin-prettier": "^2.0.1",
-    "ember-test-selectors": "^6.0.0",
-    "ember-try": "^2.0.0",
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.1.0",
     "eslint-plugin-ember": "^10.5.5",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^3.3.1",
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
-    "postcss": "^8.2.14",
-    "postcss-import": "^14.0.2",
     "prettier": "^2.3.2",
     "qunit": "^2.14.1",
     "qunit-dom": "^1.6.0",
-    "qunit-wait-for": "^2.0.1",
     "release-it": "^14.8.0",
     "release-it-lerna-changelog": "^3.1.0",
-    "tailwindcss": "^3.0.24",
-    "testdouble": "^3.16.1",
-    "testdouble-qunit": "^3.0.0",
     "typescript": "^4.7.3",
     "webpack": "^5.64.1"
   },
-  "resolutions": {
-    "@embroider/core": "^1.2.0",
-    "@embroider/macros": "^1.2.0",
-    "@embroider/util": "^1.2.0"
-  },
   "engines": {
     "node": "10.* || >= 12"
   },
@@ -148,20 +114,5 @@
   },
   "volta": {
     "node": "16.15.0"
-  },
-  "pnpm": {
-    "overrides-notes": {
-      "@types/eslint": "webpack brings in @types/eslint@8, which breaks our type checking",
-      "everything else": "results of audit --fix"
-    },
-    "overrides": {
-      "@types/eslint": "7.29.0",
-      "glob-parent@<5.1.2": ">=5.1.2",
-      "minimist@<1.2.6": ">=1.2.6",
-      "ansi-html@<0.0.8": ">=0.0.8",
-      "markdown-it@<12.3.2": ">=12.3.2",
-      "clean-css@<4.1.11": ">=4.1.11",
-      "async@<2.6.4": ">=2.6.4"
-    }
   }
 }

ember-headlessui/tests/dummy/config/environment.js

@@ -5,7 +5,7 @@ module.exports = function (environment) {
     modulePrefix: 'dummy',
     environment,
     rootURL: '/',
-    locationType: 'auto',
+    locationType: 'history',
     EmberENV: {
       FEATURES: {
         // Here you can enable experimental features on an ember canary build
@@ -45,7 +45,6 @@ module.exports = function (environment) {
 
   if (environment === 'production') {
     // here you can enable a production-specific feature
-    ENV.rootURL = '/ember-headlessui';
   }
 
   return ENV;

package.json

@@ -2,25 +2,39 @@
   "name": "ember-headlessui-monorepo-root",
   "version": "0.0.0",
   "private": true,
+  "keywords": [],
+  "author": "",
+  "license": "MIT",
   "scripts": {
+    "dev": "concurrently 'npm:dev:*' --restart-after 5000 --prefix-colors cyan,white,yellow",
+    "dev:ember": "pnpm --filter test-app run start",
+    "dev:addon": "echo 'pnpm run --filter ember-headlessui start --no-watch.clearScreen'",
+    "dev:docs": "echo 'pnpm run --filter docs docs:watch --preserveWatchOutput'",
     "build:docs": "pnpm --filter ember-headlessui run build",
     "release": "pnpm --filter ember-headlessui run release",
     "lint": "pnpm --filter '*' lint",
     "lint:fix": "pnpm --filter '*' lint:fix",
     "lint:js": "pnpm --filter '*' lint:js",
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "pnpm --filter test-app test:ember"
+  },
+  "devDependencies": {
+    "concurrently": "^7.2.1"
   },
-  "keywords": [],
-  "author": "",
-  "license": "MIT",
   "packageManager": "pnpm@7.1.7",
   "pnpm": {
     "overrides": {
       "@types/eslint": "7.29.0"
     },
     "overrides-notes": {
-      "@embroider/addon-shim": "some addons from the test-app are not using ^1.0.0",
       "@types/eslint": "webpack brings in @types/eslint@8, which breaks our type checking"
+    },
+    "peerDependencyRules": {
+      "ignoreMissing": [
+        "@babel/core"
+      ],
+      "ignore-notes": {
+        "@babel/core": "See bug report + discussion: https://github.com/ember-cli/ember-cli/issues/9933"
+      }
     }
   }
 }