Merge pull request #394 from ef4/roll-package-lock

updating test suite dependencies and minimum tested versions

Author: ef4

.github/workflows/nodejs.yml

@@ -50,7 +50,7 @@ jobs:
           key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
           restore-keys: |
             ${{ runner.os }}-node-
-      - run: npm install
+      - run: npm install --no-package-lock
       - name: test
         run: ${{ matrix.command }}
         working-directory: test-scenarios

CHANGELOG.md

@@ -13,6 +13,8 @@
 - BUGFIX: fix compatibility with babel 7.26+ by @rwjblue
 - ENHANCEMENT: support auto-importing dependencies via `@embroider/macros` `importSync` by @simonihmig
 - BUGFIX: fix accidental duplication of webpack config
+- BREAKING: minimum supported Node is 12 (because 10 hit EOL on 2021-04-30)
+- BREAKING: minimum supported Ember and EmberCLI versions are both 3.4
 
 ### 1.11.3
 

docs/upgrade-guide-2.0.md

@@ -8,6 +8,7 @@
 - apps should confirm that their deployment strategy includes all files produced under `dist` (not just the traditional expected ones like `dist/assets/your-app.js` and `dist/assets/vendor.js`)
 - addons that upgrade to ember-auto-import >= 2 will only work in apps that have ember-auto-import >= 2, so they should do their own semver major releases when they upgrade
 - our `alias` option has changed slightly to align better with how it works in webpack
+- we dropped support for node < 12 and ember-source < 3.4 and ember-cli < 3.4.
 
 # Details
 
@@ -21,9 +22,9 @@ One of the changes in webpack 5 is the removal of automatic node polyfills, but
 
 Apps are required to depend on webpack. This gives the app control over the exact webpack version in use, and it makes it possible for the app to import directly from webpack for access to features like `DefinePlugin` that it may want to put into the webpack config.
 
-Addons that use ember-auto-import 2.0 should *not* put webpack into `dependencies` (the app's version will be used instead). They will need it in `devDependencies` in order to build their own dummy app.
+Addons that use ember-auto-import 2.0 should _not_ put webpack into `dependencies` (the app's version will be used instead). They will need it in `devDependencies` in order to build their own dummy app.
 
-ember-auto-import will not list webpack in `peerDependencies`, because the ember-auto-import package does double duty -- it needs webpack when used by an app, but does *not* need webpack when used by an addon, and we don't want addons to accidentally install webpack. 
+ember-auto-import will not list webpack in `peerDependencies`, because the ember-auto-import package does double duty -- it needs webpack when used by an app, but does _not_ need webpack when used by an addon, and we don't want addons to accidentally install webpack.
 
 ### Embroider v2 Addon Format support
 

package-lock.json

@@ -3,7 +3,8 @@
   "scripts": {
     "test": "cd test-scenarios && npm run test",
     "watch": "cd packages/ember-auto-import && npm run compile -- --watch",
-    "prepare": "cd packages/ember-auto-import && npm run compile"
+    "prepare": "cd packages/ember-auto-import && npm run compile",
+    "nom": "rm -rf node_modules packages/*/node_modules test-scenarios/node_modules types/*/node_modules"
   },
   "workspaces": [
     "packages/*",

package.json

@@ -4,7 +4,6 @@
 
 root = true
 
-
 [*]
 end_of_line = lf
 charset = utf-8

packages/addon-template/.editorconfig

@@ -13,6 +13,7 @@
 # misc
 /coverage/
 !.*
+.eslintcache
 
 # ember-try
 /.node_modules.ember-try/

packages/addon-template/.eslintignore

@@ -1,53 +1,54 @@
+'use strict';
+
 module.exports = {
   root: true,
   parser: 'babel-eslint',
   parserOptions: {
     ecmaVersion: 2018,
-    sourceType: 'module'
+    sourceType: 'module',
+    ecmaFeatures: {
+      legacyDecorators: true,
+    },
   },
-  plugins: [
-    'ember'
-  ],
+  plugins: ['ember'],
   extends: [
     'eslint:recommended',
-    'plugin:ember/recommended'
+    'plugin:ember/recommended',
+    'plugin:prettier/recommended',
   ],
   env: {
-    browser: true
-  },
-  rules: {
-    'ember/no-jquery': 'error'
+    browser: true,
   },
+  rules: {},
   overrides: [
     // node files
     {
       files: [
         '.eslintrc.js',
+        '.prettierrc.js',
         '.template-lintrc.js',
         'ember-cli-build.js',
         'index.js',
         'testem.js',
         'blueprints/*/index.js',
         'config/**/*.js',
-        'tests/dummy/config/**/*.js'
+        'tests/dummy/config/**/*.js',
       ],
       excludedFiles: [
         'addon/**',
         'addon-test-support/**',
         'app/**',
-        'tests/dummy/app/**'
+        'tests/dummy/app/**',
       ],
       parserOptions: {
-        sourceType: 'script'
+        sourceType: 'script',
       },
       env: {
         browser: false,
-        node: true
+        node: true,
       },
       plugins: ['node'],
-      rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
-        // add your custom rules and overrides for node files here
-      })
-    }
-  ]
+      extends: ['plugin:node/recommended'],
+    },
+  ],
 };

packages/addon-template/.eslintrc.js

@@ -12,6 +12,7 @@
 /.env*
 /.pnp*
 /.sass-cache
+/.eslintcache
 /connect.lock
 /coverage/
 /libpeerconnection.log

packages/addon-template/.gitignore

@@ -10,10 +10,13 @@
 /.editorconfig
 /.ember-cli
 /.env*
+/.eslintcache
 /.eslintignore
 /.eslintrc.js
 /.git/
 /.gitignore
+/.prettierignore
+/.prettierrc.js
 /.template-lintrc.js
 /.travis.yml
 /.watchmanconfig

packages/addon-template/.npmignore

@@ -0,0 +1,21 @@
+# unconventional js
+/blueprints/*/files/
+/vendor/
+
+# compiled output
+/dist/
+/tmp/
+
+# dependencies
+/bower_components/
+/node_modules/
+
+# misc
+/coverage/
+!.*
+.eslintcache
+
+# ember-try
+/.node_modules.ember-try/
+/bower.json.ember-try
+/package.json.ember-try

packages/addon-template/.prettierignore

@@ -0,0 +1,5 @@
+'use strict';
+
+module.exports = {
+  singleQuote: true,
+};

packages/addon-template/.prettierrc.js

@@ -1,5 +1,5 @@
 'use strict';
 
 module.exports = {
-  extends: 'recommended'
+  extends: 'octane',
 };

packages/addon-template/.template-lintrc.js

@@ -3,10 +3,9 @@ language: node_js
 node_js:
   # we recommend testing addons with the same minimum supported node version as Ember CLI
   # so that your addon works for all apps
-  - "8"
+  - '10'
 
-sudo: false
-dist: trusty
+dist: xenial
 
 addons:
   chrome: stable
@@ -26,35 +25,38 @@ branches:
     - /^v\d+\.\d+\.\d+/
 
 jobs:
-  fail_fast: true
+  fast_finish: true
   allow_failures:
     - env: EMBER_TRY_SCENARIO=ember-canary
 
   include:
     # runs linting and tests with current locked deps
-
-    - stage: "Tests"
-      name: "Tests"
+    - stage: 'Tests'
+      name: 'Tests'
       install:
         - yarn install --non-interactive
       script:
-        - yarn lint:hbs
-        - yarn lint:js
-        - yarn test
+        - npm run lint
+        - npm run test:ember
 
-    - name: "Floating Dependencies"
+    - stage: 'Additional Tests'
+      name: 'Floating Dependencies'
+      install:
+        - npm install --no-package-lock
       script:
-        - yarn test
+        - npm run test:ember
 
     # we recommend new addons test the current and previous LTS
     # as well as latest stable release (bonus points to beta/canary)
-    - stage: "Additional Tests"
-      env: EMBER_TRY_SCENARIO=ember-lts-3.4
-    - env: EMBER_TRY_SCENARIO=ember-lts-3.8
+    - env: EMBER_TRY_SCENARIO=ember-lts-3.16
+    - env: EMBER_TRY_SCENARIO=ember-lts-3.20
     - env: EMBER_TRY_SCENARIO=ember-release
     - env: EMBER_TRY_SCENARIO=ember-beta
     - env: EMBER_TRY_SCENARIO=ember-canary
     - env: EMBER_TRY_SCENARIO=ember-default-with-jquery
+    - env: EMBER_TRY_SCENARIO=ember-classic
+    - env: EMBER_TRY_SCENARIO=embroider-safe
+    - env: EMBER_TRY_SCENARIO=embroider-optimized
 
 before_install:
   - curl -o- -L https://yarnpkg.com/install.sh | bash

packages/addon-template/.travis.yml

@@ -2,25 +2,24 @@
 
 ## Installation
 
-* `git clone <repository-url>`
-* `cd @ef4/addon-template`
-* `yarn install`
+- `git clone <repository-url>`
+- `cd @ef4/addon-template`
+- `yarn install`
 
 ## Linting
 
-* `yarn lint:hbs`
-* `yarn lint:js`
-* `yarn lint:js --fix`
+- `npm run lint`
+- `npm run lint:fix`
 
 ## Running tests
 
-* `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
+- `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
 
-* `ember serve`
-* Visit the dummy application at [http://localhost:4200](http://localhost:4200).
+- `ember serve`
+- Visit the dummy application at [http://localhost:4200](http://localhost:4200).
 
-For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
+For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).

packages/addon-template/CONTRIBUTING.md

@@ -7,9 +7,9 @@
 Compatibility
 ------------------------------------------------------------------------------
 
-* Ember.js v3.4 or above
+* Ember.js v3.16 or above
 * Ember CLI v2.13 or above
-* Node.js v8 or above
+* Node.js v10 or above
 
 
 Installation