From ddda5aece0cb2b16537ec2e53faff19a2e1884b9 Mon Sep 17 00:00:00 2001 From: Edward Faulkner Date: Wed, 2 Feb 2022 17:26:07 -0500 Subject: [PATCH 1/3] convert to v2 addon --- addon/.eslintrc.js | 2 +- addon/addon-main.js | 2 + addon/addon/.gitkeep | 0 addon/babel.config.json | 7 + addon/blueprints/ember-page-title/index.js | 41 ------ addon/config/environment.js | 5 - addon/index.js | 5 - addon/package.json | 42 ++++-- addon/rollup.config.js | 50 +++++++ addon/{addon => src}/helpers/page-title.js | 0 .../services/page-title-list.js | 0 addon/{addon => src}/services/page-title.js | 0 .../test-support}/get-page-title.js | 0 .../test-support}/index.js | 0 yarn.lock | 135 +++++++++++++++++- 15 files changed, 220 insertions(+), 69 deletions(-) create mode 100644 addon/addon-main.js delete mode 100644 addon/addon/.gitkeep create mode 100644 addon/babel.config.json delete mode 100644 addon/blueprints/ember-page-title/index.js delete mode 100644 addon/config/environment.js delete mode 100644 addon/index.js create mode 100644 addon/rollup.config.js rename addon/{addon => src}/helpers/page-title.js (100%) rename addon/{addon => src}/services/page-title-list.js (100%) rename addon/{addon => src}/services/page-title.js (100%) rename addon/{addon-test-support => src/test-support}/get-page-title.js (100%) rename addon/{addon-test-support => src/test-support}/index.js (100%) diff --git a/addon/.eslintrc.js b/addon/.eslintrc.js index 3697332e..be99d4ce 100644 --- a/addon/.eslintrc.js +++ b/addon/.eslintrc.js @@ -27,7 +27,7 @@ module.exports = { './.eslintrc.js', './.prettierrc.js', './.template-lintrc.js', - './index.js', + './addon-main.js', './blueprints/*/index.js', './config/**/*.js', ], diff --git a/addon/addon-main.js b/addon/addon-main.js new file mode 100644 index 00000000..9375da06 --- /dev/null +++ b/addon/addon-main.js @@ -0,0 +1,2 @@ +const { addonV1Shim } = require('@embroider/addon-shim'); +module.exports = addonV1Shim(__dirname); diff --git a/addon/addon/.gitkeep b/addon/addon/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/addon/babel.config.json b/addon/babel.config.json new file mode 100644 index 00000000..47975004 --- /dev/null +++ b/addon/babel.config.json @@ -0,0 +1,7 @@ +{ + "plugins": [ + "@embroider/addon-dev/template-colocation-plugin", + ["@babel/plugin-proposal-decorators", { "legacy": true }], + "@babel/plugin-proposal-class-properties" + ] +} \ No newline at end of file diff --git a/addon/blueprints/ember-page-title/index.js b/addon/blueprints/ember-page-title/index.js deleted file mode 100644 index d495472e..00000000 --- a/addon/blueprints/ember-page-title/index.js +++ /dev/null @@ -1,41 +0,0 @@ -'use strict'; - -const path = require('path'); -const fs = require('fs'); - -module.exports = { - normalizeEntityName() {}, - - afterInstall(opts) { - let project = opts.project; - - let isFastBootPresent = 'ember-cli-fastboot' in project.dependencies(); - - if (isFastBootPresent) { - let indexHtmlPath = project.isEmberCLIAddon() - ? path.join(project.root, 'tests', 'dummy', 'app', 'index.html') - : path.join(project.root, 'app', 'index.html'); - - if (fs.existsSync(indexHtmlPath)) { - const contents = fs.readFileSync(indexHtmlPath, { - encoding: 'utf8', - }); - - const titleMatches = contents.match(/\s*(.*)\s*<\/title>/i); - const title = (titleMatches && titleMatches[1]) || 'Example Title'; - if (titleMatches) { - fs.writeFileSync( - indexHtmlPath, - contents.replace(/\s*<title>\s*.*\s*<\/title>/gi, ''), - { - encoding: 'utf8', - } - ); - } - opts.ui.writeWarnLine( - `<title> has been removed from index.html due to ember-cli-fastboot being present, please add {{page-title "${title}"}} to application.hbs` - ); - } - } - }, -}; diff --git a/addon/config/environment.js b/addon/config/environment.js deleted file mode 100644 index 331ab30d..00000000 --- a/addon/config/environment.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict'; - -module.exports = function (/* environment, appConfig */) { - return {}; -}; diff --git a/addon/index.js b/addon/index.js deleted file mode 100644 index 0ca063d4..00000000 --- a/addon/index.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict'; - -module.exports = { - name: require('./package').name, -}; diff --git a/addon/package.json b/addon/package.json index 790551c6..255bf916 100644 --- a/addon/package.json +++ b/addon/package.json @@ -11,41 +11,61 @@ ], "license": "MIT", "author": "Tim Evans <tim.c.evans@me.com>", - "directories": { - "doc": "doc", - "test": "tests" + "exports": { + ".": "./dist/index.js", + "./*": "./dist/*", + "./test-support": "./dist/test-support/index.js", + "./addon-main.js": "./addon-main.js" }, + "files": [ + "addon-main.js", + "dist" + ], "repository": "https://github.com/ember-cli/ember-page-title", "scripts": { + "build": "rollup --config", "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:js:fix": "eslint . --fix", + "start": "rollup --config --watch", + "prepublishOnly": "rollup --config" }, "dependencies": { - "ember-cli-babel": "^7.26.6" + "@embroider/addon-shim": "^1.0.0" }, "devDependencies": { + "@babel/core": "^7.16.12", + "@babel/plugin-proposal-class-properties": "^7.16.7", + "@babel/plugin-proposal-decorators": "^7.16.7", + "@embroider/addon-dev": "^1.0.0", + "@rollup/plugin-babel": "^5.3.0", "babel-eslint": "^10.1.0", + "ember-template-lint": "^3.6.0", "eslint": "^7.32.0", "eslint-config-prettier": "^8.3.0", "eslint-plugin-ember": "^10.5.4", "eslint-plugin-node": "^11.1.0", "eslint-plugin-prettier": "^3.4.1", - "ember-template-lint": "^3.6.0", "npm-run-all": "^4.1.5", - "prettier": "^2.3.2" + "prettier": "^2.3.2", + "rollup": "^2.67.0" }, "engines": { "node": "12.* || 14.* || >= 16" }, - "ember": { - "edition": "octane" - }, "ember-addon": { - "demoURL": "https://ember-cli.github.io/ember-page-title" + "demoURL": "https://ember-cli.github.io/ember-page-title", + "main": "addon-main.js", + "type": "addon", + "version": 2, + "app-js": { + "./helpers/page-title.js": "./dist/_app_/helpers/page-title.js", + "./services/page-title-list.js": "./dist/_app_/services/page-title-list.js", + "./services/page-title.js": "./dist/_app_/services/page-title.js" + } }, "homepage": "https://ember-cli.github.io/ember-page-title", "volta": { diff --git a/addon/rollup.config.js b/addon/rollup.config.js new file mode 100644 index 00000000..d54fca8b --- /dev/null +++ b/addon/rollup.config.js @@ -0,0 +1,50 @@ +import babel from '@rollup/plugin-babel'; +import { Addon } from '@embroider/addon-dev/rollup'; + +const addon = new Addon({ + srcDir: 'src', + destDir: 'dist', +}); + +export default { + // This provides defaults that work well alongside `publicEntrypoints` below. + // You can augment this if you need to. + output: addon.output(), + + plugins: [ + // These are the modules that users should be able to import from your + // addon. Anything not listed here may get optimized away. + addon.publicEntrypoints([ + 'helpers/**/*.js', + 'services/**/*.js', + 'test-support/index.js', + ]), + + // These are the modules that should get reexported into the traditional + // "app" tree. Things in here should also be in publicEntrypoints above, but + // not everything in publicEntrypoints necessarily needs to go here. + addon.appReexports(['helpers/**/*.js', 'services/**/*.js']), + + // This babel config should *not* apply presets or compile away ES modules. + // It exists only to provide development niceties for you, like automatic + // template colocation. + babel({ + babelHelpers: 'bundled', + }), + + // Follow the V2 Addon rules about dependencies. Your code can import from + // `dependencies` and `peerDependencies` as well as standard Ember-provided + // package names. + addon.dependencies(), + + // Ensure that standalone .hbs files are properly integrated as Javascript. + addon.hbs(), + + // addons are allowed to contain imports of .css files, which we want rollup + // to leave alone and keep in the published output. + addon.keepAssets(['**/*.css']), + + // Remove leftover build artifacts when starting a new build. + addon.clean(), + ], +}; diff --git a/addon/addon/helpers/page-title.js b/addon/src/helpers/page-title.js similarity index 100% rename from addon/addon/helpers/page-title.js rename to addon/src/helpers/page-title.js diff --git a/addon/addon/services/page-title-list.js b/addon/src/services/page-title-list.js similarity index 100% rename from addon/addon/services/page-title-list.js rename to addon/src/services/page-title-list.js diff --git a/addon/addon/services/page-title.js b/addon/src/services/page-title.js similarity index 100% rename from addon/addon/services/page-title.js rename to addon/src/services/page-title.js diff --git a/addon/addon-test-support/get-page-title.js b/addon/src/test-support/get-page-title.js similarity index 100% rename from addon/addon-test-support/get-page-title.js rename to addon/src/test-support/get-page-title.js diff --git a/addon/addon-test-support/index.js b/addon/src/test-support/index.js similarity index 100% rename from addon/addon-test-support/index.js rename to addon/src/test-support/index.js diff --git a/yarn.lock b/yarn.lock index cd94278a..d2b36cde 100644 --- a/yarn.lock +++ b/yarn.lock @@ -21,7 +21,7 @@ resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.16.8.tgz#31560f9f29fdf1868de8cb55049538a1b9732a60" integrity sha512-m7OkX0IdKLKPpBlJtF561YJal5y/jyI5fNfWbPxh2D/nbzzGI4qRyrD8xO2jB24u7l+5I2a43scCG2IrfjC50Q== -"@babel/core@^7.1.6", "@babel/core@^7.12.0", "@babel/core@^7.12.3", "@babel/core@^7.13.8", "@babel/core@^7.16.7", "@babel/core@^7.3.4": +"@babel/core@^7.1.6", "@babel/core@^7.12.0", "@babel/core@^7.12.3", "@babel/core@^7.13.8", "@babel/core@^7.16.12", "@babel/core@^7.16.7", "@babel/core@^7.3.4": version "7.16.12" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.16.12.tgz#5edc53c1b71e54881315923ae2aedea2522bb784" integrity sha512-dK5PtG1uiN2ikk++5OzSYsitZKny4wOCD0nrO4TqnW4BVBTQ2NGS3NgilvT/TEyxTST7LNyWV/T4tXDoD3fOgg== @@ -155,7 +155,7 @@ dependencies: "@babel/types" "^7.16.7" -"@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.16.7", "@babel/helper-module-imports@^7.8.3": +"@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.16.7", "@babel/helper-module-imports@^7.8.3": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz#25612a8091a999704461c8a222d0efec5d091437" integrity sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg== @@ -1040,6 +1040,28 @@ ember-cli-version-checker "^5.1.2" semver "^7.3.5" +"@embroider/addon-dev@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@embroider/addon-dev/-/addon-dev-1.0.0.tgz#8fa29414d5055f1030c9d7fe67913764d5939637" + integrity sha512-zLtLd0lQxDmHSUdNy7qVMG1CrzDYMOJemiCJ2a+OZNZRUvG5cuyDOUDrEJVdhdBMG1gKfAhBh5qgT2YvrPZyWw== + dependencies: + "@embroider/shared-internals" "^1.0.0" + "@rollup/pluginutils" "^4.1.1" + fs-extra "^10.0.0" + minimatch "^3.0.4" + rollup-plugin-copy-assets "^2.0.3" + rollup-plugin-delete "^2.0.0" + walk-sync "^3.0.0" + yargs "^17.0.1" + +"@embroider/addon-shim@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@embroider/addon-shim/-/addon-shim-1.0.0.tgz#e56327dd46ccbf87f82729614bafd07b88cb298c" + integrity sha512-RkUkQDe56M/15pA7rAL9mTdxYnw/MukQYM2JcJ+9x8mTjkFc6mRnuHVdjVt/r6mUw9YG6FvN3G5nIadsDdXTyQ== + dependencies: + "@embroider/shared-internals" "^1.0.0" + semver "^7.3.5" + "@embroider/macros@^1.0.0": version "1.0.0" resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-1.0.0.tgz#2dfab550ba4e03cbf6e3524759949749ced98cc2" @@ -1323,6 +1345,31 @@ node-gyp "^8.2.0" read-package-json-fast "^2.0.1" +"@rollup/plugin-babel@^5.3.0": + version "5.3.0" + resolved "https://registry.yarnpkg.com/@rollup/plugin-babel/-/plugin-babel-5.3.0.tgz#9cb1c5146ddd6a4968ad96f209c50c62f92f9879" + integrity sha512-9uIC8HZOnVLrLHxayq/PTzw+uS25E14KPUBh5ktF+18Mjo5yK0ToMMx6epY0uEgkjwJw0aBW4x2horYXh8juWw== + dependencies: + "@babel/helper-module-imports" "^7.10.4" + "@rollup/pluginutils" "^3.1.0" + +"@rollup/pluginutils@^3.1.0": + version "3.1.0" + resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-3.1.0.tgz#706b4524ee6dc8b103b3c995533e5ad680c02b9b" + integrity sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg== + dependencies: + "@types/estree" "0.0.39" + estree-walker "^1.0.1" + picomatch "^2.2.2" + +"@rollup/pluginutils@^4.1.1": + version "4.1.2" + resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-4.1.2.tgz#ed5821c15e5e05e32816f5fb9ec607cdf5a75751" + integrity sha512-ROn4qvkxP9SyPeHaf7uQC/GPFY6L/OWy9+bd9AwcjOAWQwxRscoEyAUD8qCY5o5iL4jqQwoLk2kaTKJPb/HwzQ== + dependencies: + estree-walker "^2.0.1" + picomatch "^2.2.2" + "@simple-dom/document@^1.4.0": version "1.4.0" resolved "https://registry.yarnpkg.com/@simple-dom/document/-/document-1.4.0.tgz#af60855f957f284d436983798ef1006cca1a1678" @@ -1452,6 +1499,11 @@ resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.50.tgz#1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83" integrity sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw== +"@types/estree@0.0.39": + version "0.0.39" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f" + integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw== + "@types/express-serve-static-core@^4.17.18": version "4.17.28" resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz#c47def9f34ec81dc6328d0b1b5303d1ec98d86b8" @@ -4961,6 +5013,20 @@ define-property@^2.0.2: is-descriptor "^1.0.2" isobject "^3.0.1" +del@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/del/-/del-5.1.0.tgz#d9487c94e367410e6eff2925ee58c0c84a75b3a7" + integrity sha512-wH9xOVHnczo9jN2IW68BabcecVPxacIA3g/7z6vhSU/4stOKQzeCRK0yD0A24WiAAUJmmVpWqrERcTxnLo3AnA== + dependencies: + globby "^10.0.1" + graceful-fs "^4.2.2" + is-glob "^4.0.1" + is-path-cwd "^2.2.0" + is-path-inside "^3.0.1" + p-map "^3.0.0" + rimraf "^3.0.0" + slash "^3.0.0" + delayed-stream@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" @@ -6325,6 +6391,16 @@ estraverse@^5.1.0, estraverse@^5.2.0: resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA== +estree-walker@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-1.0.1.tgz#31bc5d612c96b704106b477e6dd5d8aa138cb700" + integrity sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg== + +estree-walker@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac" + integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w== + esutils@^2.0.2: version "2.0.3" resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" @@ -7534,6 +7610,20 @@ globby@10.0.0: merge2 "^1.2.3" slash "^3.0.0" +globby@^10.0.1: + version "10.0.2" + resolved "https://registry.yarnpkg.com/globby/-/globby-10.0.2.tgz#277593e745acaa4646c3ab411289ec47a0392543" + integrity sha512-7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg== + dependencies: + "@types/glob" "^7.1.1" + array-union "^2.1.0" + dir-glob "^3.0.1" + fast-glob "^3.0.3" + glob "^7.1.3" + ignore "^5.1.1" + merge2 "^1.2.3" + slash "^3.0.0" + globby@^11.0.3, globby@^11.0.4: version "11.1.0" resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b" @@ -7608,7 +7698,7 @@ got@^9.6.0: to-readable-stream "^1.0.0" url-parse-lax "^3.0.0" -graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.5, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9: +graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.5, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9: version "4.2.9" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96" integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ== @@ -8530,6 +8620,11 @@ is-object@^1.0.1: resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.2.tgz#a56552e1c665c9e950b4a025461da87e72f86fcf" integrity sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA== +is-path-cwd@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz#67d43b82664a7b5191fd9119127eb300048a9fdb" + integrity sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ== + is-path-inside@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036" @@ -8537,7 +8632,7 @@ is-path-inside@^1.0.0: dependencies: path-is-inside "^1.0.1" -is-path-inside@^3.0.2: +is-path-inside@^3.0.1, is-path-inside@^3.0.2: version "3.0.3" resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== @@ -10972,6 +11067,13 @@ p-locate@^5.0.0: dependencies: p-limit "^3.0.2" +p-map@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/p-map/-/p-map-3.0.0.tgz#d704d9af8a2ba684e2600d9a215983d4141a979d" + integrity sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ== + dependencies: + aggregate-error "^3.0.0" + p-map@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b" @@ -11253,7 +11355,7 @@ picocolors@^1.0.0: resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== -picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3: +picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.2.3: version "2.3.1" resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== @@ -12306,6 +12408,27 @@ ripemd160@^2.0.0, ripemd160@^2.0.1: hash-base "^3.0.0" inherits "^2.0.1" +rollup-plugin-copy-assets@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/rollup-plugin-copy-assets/-/rollup-plugin-copy-assets-2.0.3.tgz#9a9098894c3ded16d2eee8c4108055e332b5f59f" + integrity sha512-ETShhQGb9SoiwcNrvb3BhUNSGR89Jao0+XxxfzzLW1YsUzx8+rMO4z9oqWWmo6OHUmfNQRvqRj0cAyPkS9lN9w== + dependencies: + fs-extra "^7.0.1" + +rollup-plugin-delete@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/rollup-plugin-delete/-/rollup-plugin-delete-2.0.0.tgz#262acf80660d48c3b167fb0baabd0c3ab985c153" + integrity sha512-/VpLMtDy+8wwRlDANuYmDa9ss/knGsAgrDhM+tEwB1npHwNu4DYNmDfUL55csse/GHs9Q+SMT/rw9uiaZ3pnzA== + dependencies: + del "^5.1.0" + +rollup@^2.67.0: + version "2.67.0" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.67.0.tgz#496de7e641dbe39f681c5a82419cb5013917d406" + integrity sha512-W83AaERwvDiHwHEF/dfAfS3z1Be5wf7n+pO3ZAO5IQadCT2lBTr7WQ2MwZZe+nodbD+n3HtC4OCOAdsOPPcKZQ== + optionalDependencies: + fsevents "~2.3.2" + rsvp@^3.0.14, rsvp@^3.0.17, rsvp@^3.0.18, rsvp@^3.0.21, rsvp@^3.0.6: version "3.6.2" resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a" @@ -14778,7 +14901,7 @@ yargs@^16.0.0, yargs@^16.2.0: y18n "^5.0.5" yargs-parser "^20.2.2" -yargs@^17.0.0: +yargs@^17.0.0, yargs@^17.0.1: version "17.3.1" resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.3.1.tgz#da56b28f32e2fd45aefb402ed9c26f42be4c07b9" integrity sha512-WUANQeVgjLbNsEmGk20f+nlHgOqzRFpiGWVaBrYGYIGANIIu3lWjoyi0fNlFmJkvfhCZ6BXINe7/W2O2bV4iaA== From c38db61da0c77bec29aa25dcb0dca7eb37e45825 Mon Sep 17 00:00:00 2001 From: Edward Faulkner <edward@eaf4.com> Date: Wed, 2 Feb 2022 17:27:23 -0500 Subject: [PATCH 2/3] drop unused app tree --- addon/app/.gitkeep | 0 addon/app/helpers/page-title.js | 3 --- addon/app/services/page-title-list.js | 1 - addon/app/services/page-title.js | 1 - 4 files changed, 5 deletions(-) delete mode 100644 addon/app/.gitkeep delete mode 100644 addon/app/helpers/page-title.js delete mode 100644 addon/app/services/page-title-list.js delete mode 100644 addon/app/services/page-title.js diff --git a/addon/app/.gitkeep b/addon/app/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/addon/app/helpers/page-title.js b/addon/app/helpers/page-title.js deleted file mode 100644 index 0dc40f04..00000000 --- a/addon/app/helpers/page-title.js +++ /dev/null @@ -1,3 +0,0 @@ -import pageTitle from 'ember-page-title/helpers/page-title'; - -export default pageTitle; diff --git a/addon/app/services/page-title-list.js b/addon/app/services/page-title-list.js deleted file mode 100644 index 2bde4e4a..00000000 --- a/addon/app/services/page-title-list.js +++ /dev/null @@ -1 +0,0 @@ -export { default } from 'ember-page-title/services/page-title-list'; diff --git a/addon/app/services/page-title.js b/addon/app/services/page-title.js deleted file mode 100644 index dd465342..00000000 --- a/addon/app/services/page-title.js +++ /dev/null @@ -1 +0,0 @@ -export { default } from 'ember-page-title/services/page-title'; From 82d68a4a66fb8f32aaac5ce6c4e339200b571ed8 Mon Sep 17 00:00:00 2001 From: Edward Faulkner <edward@eaf4.com> Date: Wed, 2 Feb 2022 17:31:34 -0500 Subject: [PATCH 3/3] build addon the first time automatically after yarn install --- package.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package.json b/package.json index 8b7da53f..7ccb357b 100644 --- a/package.json +++ b/package.json @@ -5,6 +5,9 @@ "docs", "test-app" ], + "scripts": { + "prepare": "cd addon && yarn build" + }, "volta": { "node": "12.22.10", "yarn": "1.22.17"