Convert back to v1 format

packages/test-app/.eslintrc.js → .eslintrc.js

@@ -28,11 +28,11 @@ module.exports = {
         './.prettierrc.js',
         './.template-lintrc.js',
         './ember-cli-build.js',
+        './index.js',
         './testem.js',
         './blueprints/*/index.js',
         './config/**/*.js',
-        './lib/*/index.js',
-        './server/**/*.js',
+        './tests/dummy/config/**/*.js',
       ],
       parserOptions: {
         sourceType: 'script',
@@ -43,11 +43,6 @@ module.exports = {
       },
       plugins: ['node'],
       extends: ['plugin:node/recommended'],
-      rules: {
-        // this can be removed once the following is fixed
-        // https://github.com/mysticatea/eslint-plugin-node/issues/77
-        'node/no-unpublished-require': 'off',
-      },
     },
     {
       // test files

.github/workflows/ci.yml

@@ -8,8 +8,8 @@ on:
   pull_request: {}
 
 concurrency:
-   group: ci-${{ github.head_ref || github.ref }}
-   cancel-in-progress: true
+  group: ci-${{ github.head_ref || github.ref }}
+  cancel-in-progress: true
 
 jobs:
   test:
@@ -28,7 +28,7 @@ jobs:
       - name: Lint
         run: yarn lint
       - name: Run Tests
-        run: yarn test
+        run: yarn test:ember
 
   floating:
     name: "Floating Dependencies"
@@ -43,12 +43,12 @@ jobs:
       - name: Install Dependencies
         run: yarn install --no-lockfile
       - name: Run Tests
-        run: yarn test
+        run: yarn test:ember
 
   try-scenarios:
     name: ${{ matrix.try-scenario }}
     runs-on: ubuntu-latest
-    needs: 'test'
+    needs: "test"
 
     strategy:
       fail-fast: false
@@ -74,4 +74,3 @@ jobs:
         run: yarn install --frozen-lockfile
       - name: Run Tests
         run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}
-        working-directory: packages/test-app

.npmignore

@@ -0,0 +1,40 @@
+# compiled output
+/dist/
+/tmp/
+
+# dependencies
+/bower_components/
+
+# misc
+/.bowerrc
+/.editorconfig
+/.ember-cli
+/.env*
+/.eslintcache
+/.eslintignore
+/.eslintrc.js
+/.git/
+/.github/
+/.gitignore
+/.prettierignore
+/.prettierrc.js
+/.template-lintrc.js
+/.travis.yml
+/.watchmanconfig
+/bower.json
+/config/ember-try.js
+/CONTRIBUTING.md
+/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

CONTRIBUTING.md

@@ -13,12 +13,13 @@
 
 ## Running tests
 
-* `yarn test` – Runs the test suite on the current Ember version
-* `yarn test:watch` – Runs the test suite in "watch mode"
+* `ember test` – Runs the test suite on the current Ember version
+* `ember test --server` – Runs the test suite in "watch mode"
+* `ember try:each` – Runs the test suite against multiple Ember versions
 
 ## Running the dummy application
 
-* `yarn start`
+* `ember serve`
 * Visit the dummy application at [http://localhost:4200](http://localhost:4200).
 
 For more information on using ember-cli, visit [https://cli.emberjs.com/release/](https://cli.emberjs.com/release/).

README.md

@@ -8,7 +8,8 @@ Compatibility
 ------------------------------------------------------------------------------
 
 * Ember.js v3.24 or above
-* Embroider or ember-auto-import v2
+* Ember CLI v3.24 or above
+* Node.js v12 or above
 
 
 Installation

app/components/bs-form.js

@@ -0,0 +1 @@
+export { default } from 'ember-bootstrap-constraint-validations/components/bs-form';

app/components/bs-form/element.js

@@ -0,0 +1 @@
+export { default } from 'ember-bootstrap-constraint-validations/components/bs-form/element';

config/environment.js

@@ -0,0 +1,5 @@
+'use strict';
+
+module.exports = function (/* environment, appConfig */) {
+  return {};
+};

ember-cli-build.js

@@ -0,0 +1,28 @@
+'use strict';
+
+const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
+
+module.exports = function (defaults) {
+  let app = new EmberAddon(defaults, {
+    'ember-bootstrap': {
+      bootstrapVersion: 5,
+      importBootstrapCSS: true,
+    },
+  });
+
+  /*
+    This build file specifies the options for the dummy test app of this
+    addon, located in `/tests/dummy`
+    This build file does *not* influence how the addon or the app using it
+    behave. You most likely want to be modifying `./index.js` or app's build file
+  */
+
+  const { maybeEmbroider } = require('@embroider/test-setup');
+  return maybeEmbroider(app, {
+    skipBabel: [
+      {
+        package: 'qunit',
+      },
+    ],
+  });
+};

packages/test-app/.prettierrc.js → index.js

@@ -1,5 +1,5 @@
 'use strict';
 
 module.exports = {
-  singleQuote: true,
+  name: require('./package').name,
 };

package.json

@@ -1,54 +1,102 @@
 {
+  "name": "ember-bootstrap-constraint-validations",
   "version": "0.1.0",
-  "private": true,
+  "description": "Add support for native HTML5 constraint validation to ember-bootstrap forms.",
+  "keywords": [
+    "ember-addon"
+  ],
   "repository": "https://github.com/kaliber5/ember-bootstrap-constraint-validations.git",
   "license": "MIT",
   "author": "Simon Ihmig <[email protected]>",
-  "workspaces": [
-    "packages/*"
-  ],
+  "directories": {
+    "doc": "doc",
+    "test": "tests"
+  },
   "scripts": {
-    "prepare": "yarn workspace ember-bootstrap-constraint-validations run prepare",
-    "start": "npm-run-all --parallel start:*",
-    "start:addon": "yarn workspace ember-bootstrap-constraint-validations run start",
-    "start:test-app": "yarn workspace test-app run start",
+    "build": "ember build --environment=production",
     "lint": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
-    "lint:addon": "yarn workspace ember-bootstrap-constraint-validations run lint",
-    "lint:test-app": "yarn workspace test-app run lint",
-    "lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:fix:*",
-    "lint:fix:addon": "yarn workspace ember-bootstrap-constraint-validations run lint:fix",
-    "lint:fix:test-app": "yarn workspace test-app run lint:fix",
-    "test": "npm-run-all --aggregate-output --continue-on-error --parallel \"test:!(watch)\"",
-    "test:watch": "npm-run-all --aggregate-output --continue-on-error --parallel test:watch:*",
-    "test:test-app": "yarn workspace test-app run test",
-    "test:watch:test-app": "yarn workspace test-app run test:watch",
-    "test:watch:addon": "yarn workspace ember-bootstrap-constraint-validations run start"
+    "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",
+    "start": "ember serve",
+    "test": "npm-run-all lint test:*",
+    "test:ember": "ember test",
+    "test:ember-compatibility": "ember try:each"
+  },
+  "dependencies": {
+    "ember-cli-babel": "^7.26.11",
+    "ember-cli-htmlbars": "^6.0.1"
   },
   "devDependencies": {
+    "@ember/optional-features": "^2.0.0",
+    "@ember/test-helpers": "^2.6.0",
+    "@embroider/test-setup": "^1.5.0",
+    "@glimmer/component": "^1.0.4",
+    "@glimmer/tracking": "^1.0.4",
+    "babel-eslint": "^10.1.0",
+    "bootstrap": "^5.0.0",
+    "broccoli-asset-rev": "^3.0.0",
+    "ember-auto-import": "^2.4.1",
+    "ember-bootstrap": "^5.1.1",
+    "ember-cli": "~4.3.0",
+    "ember-cli-dependency-checker": "^3.2.0",
+    "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-export-application-global": "^2.0.1",
+    "ember-focus-trap": "^1.0.1",
+    "ember-load-initializers": "^2.1.2",
+    "ember-page-title": "^7.0.0",
+    "ember-qunit": "^5.1.5",
+    "ember-resolver": "^8.0.3",
+    "ember-source": "~4.3.0",
+    "ember-source-channel-url": "^3.0.0",
+    "ember-template-lint": "^4.3.0",
+    "ember-try": "^2.0.0",
+    "eslint": "^7.32.0",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-plugin-ember": "^10.5.9",
+    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-prettier": "^4.0.0",
+    "eslint-plugin-qunit": "^7.2.0",
+    "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
-    "prettier": "^2.5.1",
+    "prettier": "^2.6.1",
+    "qunit": "^2.18.0",
+    "qunit-dom": "^2.0.0",
     "release-it": "^14.2.1",
     "release-it-lerna-changelog": "^3.1.0",
-    "release-it-yarn-workspaces": "^2.0.0"
+    "webpack": "^5.70.0"
+  },
+  "engines": {
+    "node": "12.* || 14.* || >= 16"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
+  "ember": {
+    "edition": "octane"
+  },
+  "ember-addon": {
+    "after": "ember-bootstrap",
+    "configPath": "tests/dummy/config"
+  },
   "release-it": {
     "plugins": {
       "release-it-lerna-changelog": {
         "infile": "CHANGELOG.md",
         "launchEditor": true
-      },
-      "release-it-yarn-workspaces": true
+      }
     },
     "git": {
       "tagName": "v${version}"
     },
     "github": {
       "release": true,
       "tokenRef": "GITHUB_AUTH"
-    },
-    "npm": false
+    }
   }
 }