Update Ember CLI blueprints to 3.26.0

.eslintignore

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

.eslintrc.js

@@ -27,6 +27,7 @@ module.exports = {
     {
       files: [
         '.eslintrc.js',
+        '.prettierrc.js',
         '.template-lintrc.js',
         'ember-cli-build.js',
         'index.js',
@@ -50,13 +51,7 @@ module.exports = {
         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'],
     },
     // mocha tests, extending node files configuration
     {

.github/dependabot.yml

@@ -0,0 +1,10 @@
+version: 2
+updates:
+- package-ecosystem: npm
+  directory: "/"
+  schedule:
+    interval: monthly
+    time: "03:00"
+    timezone: America/New_York
+  open-pull-requests-limit: 10
+  versioning-strategy: increase

.gitignore

@@ -12,6 +12,7 @@
 /.env*
 /.pnp*
 /.sass-cache
+/.eslintcache
 /connect.lock
 /coverage/
 /libpeerconnection.log
@@ -23,6 +24,3 @@
 /.node_modules.ember-try/
 /bower.json.ember-try
 /package.json.ember-try
-
-# cache
-.eslintcache

.npmignore

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

.prettierignore

@@ -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

.prettierrc.js

@@ -1,5 +1,5 @@
 'use strict';
-/* eslint-env node */
+
 module.exports = {
   singleQuote: true,
 };

CHANGELOG.md

@@ -1,6 +1,15 @@
 # Changelog
 
 
+## v2.0.0-4 (2021-05-06)
+
+#### :bug: Bug Fix
+* [#201](https://github.com/rwjblue/ember-cli-content-security-policy/pull/201) Support Ember CLI >= 3.26.0 and match injected script element by all supported Ember CLI versions with same RegExp ([@snewcomer](https://github.com/snewcomer))
+
+#### Committers: 1
+- Scott Newcomer ([@snewcomer](https://github.com/snewcomer))
+
+
 ## v2.0.0-3 (2021-04-16)
 
 #### :bug: Bug Fix

CONTRIBUTING.md

@@ -2,29 +2,24 @@
 
 ## Installation
 
-- `git clone https://github.com/rwjblue/ember-cli-content-security-policy.git`
-- `cd ember-cli-content-security-policy`
-- `yarn install`
+* `git clone https://github.com/rwjblue/ember-cli-content-security-policy.git`
+* `cd ember-cli-content-security-policy`
+* `yarn install`
 
 ## Linting
 
-- `yarn lint:hbs`
-- `yarn lint:js`
-- `yarn lint:js --fix`
-
-## Formating
-
-- `yarn format`
+* `yarn lint`
+* `yarn 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/).

config/ember-try.js

@@ -1,46 +1,49 @@
 'use strict';
 
 const getChannelURL = require('ember-source-channel-url');
+const { embroiderSafe, embroiderOptimized } = require('@embroider/test-setup');
 
 module.exports = async function () {
   return {
     useYarn: true,
     scenarios: [
       {
-        name: 'ember-lts-2.18',
-        env: {
-          EMBER_OPTIONAL_FEATURES: JSON.stringify({
-            'jquery-integration': true,
-          }),
+        name: 'ember-lts-3.4',
+        npm: {
+          devDependencies: {
+            'ember-source': '~3.4.0',
+          },
         },
+      },
+      {
+        name: 'ember-lts-3.8',
         npm: {
           devDependencies: {
-            '@ember/jquery': '^0.5.1',
-            'ember-source': '~2.18.0',
+            'ember-source': '~3.8.0',
           },
         },
       },
       {
-        name: 'ember-lts-3.4',
+        name: 'ember-lts-3.12',
         npm: {
           devDependencies: {
-            'ember-source': '~3.4.0',
+            'ember-source': '~3.12.0',
           },
         },
       },
       {
-        name: 'ember-lts-3.8',
+        name: 'ember-lts-3.16',
         npm: {
           devDependencies: {
-            'ember-source': '~3.8.0',
+            'ember-source': '~3.16.0',
           },
         },
       },
       {
-        name: 'ember-lts-3.12',
+        name: 'ember-lts-3.20',
         npm: {
           devDependencies: {
-            'ember-source': '~3.12.0',
+            'ember-source': '~3.20.5',
           },
         },
       },
@@ -68,16 +71,6 @@ module.exports = async function () {
           },
         },
       },
-      // The default `.travis.yml` runs this scenario via `yarn test`,
-      // not via `ember try`. It's still included here so that running
-      // `ember try:each` manually or from a customized CI config will run it
-      // along with all the other scenarios.
-      {
-        name: 'ember-default',
-        npm: {
-          devDependencies: {},
-        },
-      },
       {
         name: 'ember-default-with-jquery',
         env: {
@@ -87,7 +80,7 @@ module.exports = async function () {
         },
         npm: {
           devDependencies: {
-            '@ember/jquery': '^0.5.1',
+            '@ember/jquery': '^1.1.0',
           },
         },
       },
@@ -106,6 +99,8 @@ module.exports = async function () {
           },
         },
       },
+      embroiderSafe(),
+      embroiderOptimized(),
     ],
   };
 };

ember-cli-build.js

@@ -14,5 +14,6 @@ module.exports = function (defaults) {
     behave. You most likely want to be modifying `./index.js` or app's build file
   */
 
-  return app.toTree();
+  const { maybeEmbroider } = require('@embroider/test-setup');
+  return maybeEmbroider(app);
 };

fastboot/instance-initializers/content-security-policy.js

@@ -9,9 +9,7 @@ function readAddonConfig(appInstance) {
   //       if already available through CSP meta element
   assert(
     'Required configuration is available at run-time',
-    addonConfig &&
-      addonConfig.hasOwnProperty('reportOnly') &&
-      addonConfig.hasOwnProperty('policy')
+    addonConfig && addonConfig['reportOnly'] && addonConfig['policy']
   );
 
   return config['ember-cli-content-security-policy'];

index.js

@@ -296,21 +296,10 @@ module.exports = {
 
     // Add nonce to <script> tag inserted by Ember CLI to assert that test file was loaded.
     if (type === 'test-body-footer') {
-      let emberCliDependency = new VersionChecker(this.project).for(
-        'ember-cli'
-      );
-
       existingContent.forEach((entry, index) => {
-        let result;
-        if (emberCliDependency.exists() && emberCliDependency.lt('3.25.1')) {
-          result = /<script>\s*Ember.assert\(.*EmberENV.TESTS_FILE_LOADED\);\s*<\/script>/.test(
-            entry
-          );
-        } else {
-          result = /<script>.*?Ember\.assert\(.*EmberENV\.TESTS_FILE_LOADED\);\s*}\);<\/script>/.test(
-            entry
-          );
-        }
+        let result = /<script>[\s\S]*?'The tests file was not loaded\. Make sure your tests index\.html includes "assets\/tests\.js"\.'[\s\S]*?<\/script>/.test(
+          entry
+        );
 
         if (result) {
           existingContent[index] = entry.replace(

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-cli-content-security-policy",
-  "version": "2.0.0-3",
+  "version": "2.0.0-4",
   "description": "This addon adds the Content-Security-Policy header to response sent from the Ember CLI Express server.",
   "keywords": [
     "ember-addon"
@@ -26,53 +26,57 @@
   },
   "dependencies": {
     "body-parser": "^1.17.0",
-    "chalk": "^4.0.0",
+    "chalk": "^4.1.1",
     "debug": "^4.3.1",
-    "ember-cli-babel": "^7.17.2",
+    "ember-cli-babel": "^7.26.3",
     "ember-cli-version-checker": "^5.0.2"
   },
   "devDependencies": {
     "@ember/optional-features": "^2.0.0",
+    "@ember/test-helpers": "^2.2.5",
+    "@embroider/test-setup": "^0.37.0",
     "@glimmer/tracking": "^1.0.0",
-    "babel-eslint": "^10.0.3",
+    "babel-eslint": "^10.1.0",
     "broccoli-asset-rev": "^3.0.0",
     "chai": "^4.3.0",
     "denodeify": "^1.2.1",
     "ember-addon-tests": "^0.0.2",
-    "ember-cli": "~3.16.1",
+    "ember-cli": "~3.26.0",
     "ember-cli-addon-tests": "^0.11.1",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-eslint": "^5.1.0",
     "ember-cli-fastboot": "^2.2.1",
-    "ember-cli-htmlbars": "^5.3.1",
+    "ember-cli-htmlbars": "^5.7.1",
     "ember-cli-inject-live-reload": "^2.0.2",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-template-lint": "^2.0.2",
-    "ember-cli-uglify": "^3.0.0",
+    "ember-cli-terser": "^4.0.1",
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-export-application-global": "^2.0.1",
     "ember-load-initializers": "^2.1.2",
     "ember-maybe-import-regenerator": "^0.1.6",
-    "ember-qunit": "^4.6.0",
+    "ember-qunit": "^5.1.4",
     "ember-resolver": "^8.0.2",
-    "ember-source": "~3.25.1",
+    "ember-source": "~3.26.1",
     "ember-source-channel-url": "^3.0.0",
     "ember-try": "^1.4.0",
-    "eslint-config-prettier": "^7.2.0",
-    "eslint-plugin-ember": "^8.14.0",
-    "eslint-plugin-node": "^11.0.0",
-    "eslint-plugin-prettier": "^3.1.4",
+    "eslint": "^7.23.0",
+    "eslint-config-prettier": "^8.1.0",
+    "eslint-plugin-ember": "^10.3.0",
+    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-prettier": "^3.3.1",
     "execa": "^4.1.0",
     "fs-extra": "^9.1.0",
     "loader.js": "^4.7.0",
     "mocha": "^7.0.0",
     "npm-run-all": "^4.1.5",
-    "prettier": "2.2.1",
-    "qunit-dom": "^1.0.0",
+    "prettier": "~2.2.1",
+    "qunit": "^2.14.1",
+    "qunit-dom": "^1.6.0",
     "release-it": "^14.4.1",
     "release-it-lerna-changelog": "^3.1.0",
     "request": "^2.88.0",
-    "semver": "^7.3.2"
+    "semver": "^7.3.5"
   },
   "engines": {
     "node": "10.* || >= 12"

tests/dummy/app/app.js

@@ -1,14 +1,12 @@
 import Application from '@ember/application';
 import Resolver from 'ember-resolver';
 import loadInitializers from 'ember-load-initializers';
-import config from './config/environment';
+import config from 'dummy/config/environment';
 
-const App = Application.extend({
-  modulePrefix: config.modulePrefix,
-  podModulePrefix: config.podModulePrefix,
-  Resolver,
-});
+export default class App extends Application {
+  modulePrefix = config.modulePrefix;
+  podModulePrefix = config.podModulePrefix;
+  Resolver = Resolver;
+}
 
 loadInitializers(App, config.modulePrefix);
-
-export default App;