Merge pull request #782 from ember-cli/v2-part-1

.eslintignore

@@ -3,8 +3,8 @@
 /vendor/
 
 # compiled output
-/dist/
-/tmp/
+/test-app/dist/
+/test-app/tmp/
 
 # dependencies
 /bower_components/

.eslintrc.js

@@ -28,18 +28,17 @@ module.exports = {
         '.eslintrc.js',
         '.template-lintrc.js',
         'ember-cli-build.js',
-        'index.js',
-        'testem.js',
-        'blueprints/*/index.js',
-        'config/**/*.js',
-        'tests/dummy/config/**/*.js'
+        'addon/index.js',
+        'addon/blueprints/*/index.js',
+        'addon/config/**/*.js',
+        'test-app/config/**/*.js',
+        'test-app/server/**/*.js',
+        'test-app/testem.js',
       ],
       excludedFiles: [
-        'mu-trees/**',
-        'addon/**',
-        'addon-test-support/**',
-        'app/**',
-        'tests/dummy/app/**'
+        'addon/addon/**',
+        'addon/addon-test-support/**',
+        'addon/app/**',
       ],
       parserOptions: {
         sourceType: 'script'
@@ -48,10 +47,6 @@ module.exports = {
         browser: false,
         node: true
       },
-      plugins: ['node'],
-      rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
-        // add your custom rules and overrides for node files here
-      })
     }
   ]
 };

.github/workflows/ci-build.yml

@@ -33,7 +33,8 @@ jobs:
         if: steps.npm-cache.outputs.cache-hit != 'true'
         run: npm ci
       - run: npm run lint
-      - run: npm test
+      - run: npm run test:ember
+        working-directory: ./test-app/
 
   floating-dependencies:
     timeout-minutes: 10
@@ -45,18 +46,9 @@ jobs:
       - uses: volta-cli/action@v1
         with:
           node-version: 16.x
-      - uses: actions/cache@v2
-        id: npm-cache
-        with:
-          path: '**/node_modules'
-          key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-npm-
-      - name: npm ci
-        if: steps.npm-cache.outputs.cache-hit != 'true'
-        run: npm ci
       - run: npm install --no-shrinkwrap
       - run: npm test
+        working-directory: ./test-app/
 
   try-scenarios:
     timeout-minutes: 10
@@ -95,4 +87,5 @@ jobs:
         if: steps.npm-cache.outputs.cache-hit != 'true'
         run: npm ci
       - name: test
-        run: node_modules/.bin/ember try:one ${{ matrix.ember-try-scenario }} --skip-cleanup
+        run: npx ember try:one ${{ matrix.ember-try-scenario }} --skip-cleanup
+        working-directory: ./test-app/

.gitignore

@@ -1,27 +1,14 @@
-# See https://help.github.com/ignore-files/ for more about ignoring files.
+node_modules
 
-# compiled output
-/dist/
-/tmp/
-
-# dependencies
-/bower_components/
-/node_modules/
-
-# misc
-/.env*
-/.pnp*
-/.sass-cache
-/connect.lock
-/coverage/
-/libpeerconnection.log
-/npm-debug.log*
+# and you can put in anything else that tends to accumulate in your environment:
+yarn-error.log
+.DS_Store
 /testem.log
-/yarn-error.log
+/test-app/dist/
+/test-app/tmp/
 
 # ember-try
-/.node_modules.ember-try/
-/bower.json.ember-try
-/package.json.ember-try
+/test-app/.node_modules.ember-try/
+/test-app/package.json.ember-try
 
-.eslintcache
+/.eslintcache

addon/.gitignore

@@ -0,0 +1,27 @@
+# See https://help.github.com/ignore-files/ for more about ignoring files.
+
+# compiled output
+/dist/
+/tmp/
+
+# dependencies
+/bower_components/
+/node_modules/
+
+# misc
+/.env*
+/.pnp*
+/.sass-cache
+/connect.lock
+/coverage/
+/libpeerconnection.log
+/npm-debug.log*
+/testem.log
+/yarn-error.log
+
+# ember-try
+/.node_modules.ember-try/
+/bower.json.ember-try
+/package.json.ember-try
+
+.eslintcache

addon/addon/resolver.js

@@ -0,0 +1 @@
+export { default } from './resolvers/classic';

addon/index.js

@@ -1 +1,5 @@
-export { default } from './resolvers/classic';
+'use strict';
+
+module.exports = {
+  name: require('./package.json').name,
+};

addon/package.json

@@ -0,0 +1,55 @@
+{
+  "name": "ember-resolver",
+  "version": "8.0.3",
+  "description": "The default modules based resolver for Ember CLI.",
+  "keywords": [
+    "ember-addon"
+  ],
+  "homepage": "https://github.com/ember-cli/ember-resolver#readme",
+  "bugs": {
+    "url": "https://github.com/ember-cli/ember-resolver/issues"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/ember-cli/ember-resolver.git"
+  },
+  "license": "MIT",
+  "author": "Robert Jackson <me@rwjblue.com>",
+  "main": "index.js",
+  "directories": {
+    "doc": "doc",
+    "test": "tests"
+  },
+  "scripts": {},
+  "dependencies": {
+    "ember-cli-babel": "^7.26.11"
+  },
+  "devDependencies": {},
+  "engines": {
+    "node": "14.* || 16.* || >= 18"
+  },
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org"
+  },
+  "ember": {
+    "edition": "octane"
+  },
+  "release-it": {
+    "plugins": {
+      "release-it-lerna-changelog": {
+        "infile": "CHANGELOG.md",
+        "launchEditor": true
+      }
+    },
+    "git": {
+      "tagName": "v${version}"
+    },
+    "github": {
+      "release": true,
+      "tokenRef": "GITHUB_AUTH"
+    }
+  },
+  "volta": {
+    "extends": "../package.json"
+  }
+}