Merge pull request #916 from mainmatter/step3-v1-with-monorepo

Create a monorepo to separate v1 addon from test-app

.github/workflows/ci.yml

@@ -35,6 +35,7 @@ jobs:
         run: pnpm run lint
       - name: Run Tests
         run: pnpm run test
+        working-directory: packages/test-app
 
   floating:
     name: "Floating Dependencies"
@@ -54,6 +55,7 @@ jobs:
         run: pnpm install
       - name: Run Tests
         run: pnpm run test
+        working-directory: packages/test-app
 
   try-scenarios:
     name: ${{ matrix.try-scenario }}
@@ -89,3 +91,4 @@ jobs:
         run: pnpm install
       - name: Run Tests
         run: pnpm exec ember try:one ${{ matrix.try-scenario }}
+        working-directory: packages/test-app

.github/workflows/deploy.yml

@@ -15,11 +15,11 @@ jobs:
 
       - name: Install and Build 🔧
         run: |
-          yarn
-          yarn build
+          pnpm install
+          pnpm build:test-app
 
       - name: Deploy 🚀
         uses: JamesIves/[email protected]
         with:
           branch: gh-pages
-          folder: dist
+          folder: packages/test-app/dist

.github/workflows/release.yml

@@ -18,5 +18,6 @@ jobs:
           registry-url: 'https://registry.npmjs.org'
 
       - run: npm publish
+        working-directory: packages/ember-promise-modals
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.gitignore

@@ -1,29 +1,22 @@
 # See https://help.github.com/ignore-files/ for more about ignoring files.
 
-# compiled output
-/dist/
-/tmp/
-
 # dependencies
-/bower_components/
-/node_modules/
+node_modules/
 
 # misc
-/.env*
-/.pnp*
-/.sass-cache
-/.eslintcache
-/connect.lock
-/coverage/
-/libpeerconnection.log
-/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/
 /bower.json.ember-try
 /npm-shrinkwrap.json.ember-try
 /package.json.ember-try
 /package-lock.json.ember-try
-/yarn.lock.ember-try
+/yarn.lock.ember-try

.prettierrc.js

@@ -7,7 +7,7 @@ module.exports = {
   trailingComma: 'all',
   overrides: [
     {
-      files: '**/*.{hbs,yml,yaml}',
+      files: '**/*.{yml,yaml}',
       options: {
         singleQuote: false,
       },

MIGRATION.md

@@ -110,7 +110,7 @@ Furthermore, some CSS variables will need to be overridden so that the new anima
 
 ### Using both animations
 
-If you need to switch between both animations it's easiest to replicate the setup shown in the dummy app. See [the application.js controller](./tests/dummy/app/controllers/application.js)
-for how the modals are openend in your JavaScript actions and look at
-[app.css](./tests/dummy/app/styles/app.css) for the style definition of these
+If you need to switch between both animations it's easiest to replicate the setup shown in the dummy app. See [the application.js controller](./packages/test-app/app/controllers/application.js)
+for how the modals are opened in your JavaScript actions and look at
+[app.css](./packages/test-app/app/styles/app.css) for the style definition of these
 custom animations.

README.md

@@ -1,4 +1,4 @@
-<p align="center"><img src="./tests/dummy/public/ember-promise-modals-logo.svg" role="presentation" alt="" width="600" height="400" /></p>
+<p align="center"><img src="./packages/test-app/public/ember-promise-modals-logo.svg" role="presentation" alt="" width="600" height="400" /></p>
 
 # ember-promise-modals
 
@@ -193,9 +193,9 @@ The CSS animations which are applied by the custom CSS class _must_ end in
 Examples for custom animations and how to apply them can be found in the addon's
 dummy application.
 
-See [the application.js controller](./tests/dummy/app/controllers/application.js)
+See [the application.js controller](./packages/test-app/app/controllers/application.js)
 for how the modals are opened in your JavaScript actions and look at
-[app.css](./tests/dummy/app/styles/app.css) for the style definition of these
+[app.css](./packages/test-app/app/styles/app.css) for the style definition of these
 custom animations.
 
 ## Accessibility

package.json

@@ -1,84 +1,27 @@
 {
-  "name": "ember-promise-modals",
   "version": "4.1.0",
+  "private": true,
   "description": "The better way to handle modals in your Ember.js apps.",
-  "keywords": [
-    "ember-addon"
-  ],
   "repository": "https://github.com/mainmatter/ember-promise-modals",
   "license": "MIT",
   "author": "Mainmatter GmbH",
-  "directories": {
-    "doc": "doc",
-    "test": "tests"
-  },
+  "workspaces": [
+    "packages/*"
+  ],
   "scripts": {
-    "build": "ember build --env=production",
+    "build:test-app": "pnpm --filter test-app build",
     "lint": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
-    "lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:*:fix\"",
-    "lint:hbs": "ember-template-lint .",
-    "lint:hbs:fix": "ember-template-lint . --fix",
-    "lint:js": "eslint . --cache",
-    "lint:js:fix": "eslint . --fix",
     "lint:md": "prettier --check '**/*.md'",
     "lint:md:fix": "prettier --write '**/*.md'",
-    "release": "release-it",
-    "start": "ember serve",
-    "test": "ember test",
-    "test:all": "npm-run-all lint test:*",
-    "test:ember-compatibility": "ember try:each"
-  },
-  "dependencies": {
-    "@ember/test-waiters": "^3.0.2",
-    "@embroider/util": "^1.7.1",
-    "ember-auto-import": "^2.4.2",
-    "ember-cli-babel": "^7.26.11",
-    "ember-cli-htmlbars": "^6.0.1",
-    "focus-trap": "^6.9.3"
+    "lint:addon": "pnpm --filter ember-promise-modals lint",
+    "lint:test-app": "pnpm --filter test-app lint",
+    "release": "release-it"
   },
   "devDependencies": {
-    "@babel/eslint-parser": "7.23.10",
-    "@ember/optional-features": "2.0.0",
-    "@ember/string": "3.1.1",
-    "@ember/test-helpers": "3.2.1",
-    "@embroider/macros": "1.13.5",
-    "@embroider/test-setup": "3.0.3",
     "@release-it-plugins/lerna-changelog": "5.0.0",
-    "broccoli-asset-rev": "3.0.0",
-    "ember-cli": "4.12.2",
-    "ember-cli-dependency-checker": "3.3.2",
-    "ember-cli-inject-live-reload": "2.1.0",
-    "ember-cli-sri": "2.1.1",
-    "ember-cli-terser": "4.0.2",
-    "ember-disable-prototype-extensions": "1.1.3",
-    "ember-load-initializers": "2.1.2",
-    "ember-maybe-import-regenerator": "1.0.0",
-    "ember-qunit": "8.0.2",
-    "ember-resolver": "8.1.0",
-    "ember-source": "4.12.4",
-    "ember-source-channel-url": "3.0.0",
-    "ember-template-lint": "5.13.0",
-    "ember-try": "2.0.0",
-    "eslint": "8.56.0",
-    "eslint-config-prettier": "8.10.0",
-    "eslint-plugin-ember": "11.12.0",
-    "eslint-plugin-import-helpers": "1.3.1",
-    "eslint-plugin-n": "16.6.2",
-    "eslint-plugin-prettier": "4.2.1",
-    "eslint-plugin-promise": "6.1.1",
-    "eslint-plugin-qunit": "7.3.4",
-    "loader.js": "4.7.0",
     "npm-run-all": "4.1.5",
     "prettier": "2.8.8",
-    "qunit": "2.20.0",
-    "qunit-console-grouper": "0.3.0",
-    "qunit-dom": "2.0.0",
-    "release-it": "15.11.0",
-    "sinon": "15.2.0",
-    "webpack": "5.90.1"
-  },
-  "engines": {
-    "node": ">= 16.*"
+    "release-it": "15.11.0"
   },
   "changelog": {
     "repo": "mainmatter/ember-promise-modals",
@@ -90,12 +33,6 @@
       "internal": ":house: Internal"
     }
   },
-  "ember": {
-    "edition": "octane"
-  },
-  "ember-addon": {
-    "configPath": "tests/dummy/config"
-  },
   "pnpm": {
     "peerDependencyRules": {
       "ignoreMissing": [
@@ -106,4 +43,4 @@
       ]
     }
   }
-}
+}

packages/ember-promise-modals/.eslintignore

@@ -0,0 +1,9 @@
+# unconventional js
+/blueprints/*/files/
+
+# compiled output
+/dist/
+/declarations/
+
+# misc
+/coverage/