From 1dd135e52ab1585294f1436e9f63bfc9f2af324e Mon Sep 17 00:00:00 2001 From: Simon Ihmig Date: Thu, 12 Jan 2023 12:41:52 +0100 Subject: [PATCH] Update to v1.4 of blueprint --- .github/workflows/ci.yml | 38 ++++--- config/ember-cli-update.json | 2 +- ember-headless-form/package.json | 2 +- ember-headless-form/rollup.config.mjs | 16 +-- pnpm-lock.yaml | 150 ++++---------------------- test-app/package.json | 7 +- 6 files changed, 59 insertions(+), 156 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 489bfd46..0a7138bf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,42 +8,50 @@ 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: - name: "Tests" + name: 'Tests' runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 + - name: Install pnpm + uses: pnpm/action-setup@v2 + with: + version: 7 - name: Install Node uses: actions/setup-node@v3 with: node-version: 14.x - cache: npm + cache: pnpm - name: Install Dependencies - run: npm ci + run: pnpm install --frozen-lockfile - name: Lint - run: npm run lint + run: pnpm lint - name: Run Tests - run: npm run test + run: pnpm test floating: - name: "Floating Dependencies" + name: 'Floating Dependencies' runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 + - name: Install pnpm + uses: pnpm/action-setup@v2 + with: + version: 7 - uses: actions/setup-node@v3 with: node-version: 14.x - cache: npm + cache: pnpm - name: Install Dependencies - run: npm install --no-shrinkwrap + run: pnpm install --no-lockfile - name: Run Tests - run: npm run test + run: pnpm test try-scenarios: name: ${{ matrix.try-scenario }} @@ -65,13 +73,17 @@ jobs: steps: - uses: actions/checkout@v3 + - name: Install pnpm + uses: pnpm/action-setup@v2 + with: + version: 7 - name: Install Node uses: actions/setup-node@v3 with: node-version: 14.x - cache: npm + cache: pnpm - name: Install Dependencies - run: npm ci + run: pnpm install --frozen-lockfile - name: Run Tests run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }} working-directory: test-app diff --git a/config/ember-cli-update.json b/config/ember-cli-update.json index 6b17cb27..02893852 100644 --- a/config/ember-cli-update.json +++ b/config/ember-cli-update.json @@ -3,7 +3,7 @@ "packages": [ { "name": "@embroider/addon-blueprint", - "version": "1.3.0", + "version": "1.4.0", "blueprints": [ { "name": "@embroider/addon-blueprint", diff --git a/ember-headless-form/package.json b/ember-headless-form/package.json index d432009f..85a6f08b 100644 --- a/ember-headless-form/package.json +++ b/ember-headless-form/package.json @@ -34,7 +34,7 @@ "@babel/plugin-proposal-class-properties": "^7.16.7", "@babel/plugin-proposal-decorators": "^7.17.0", "@babel/plugin-syntax-decorators": "^7.17.0", - "@embroider/addon-dev": "^2.0.0", + "@embroider/addon-dev": "^3.0.0", "@glint/core": "^0.9.7", "@glint/environment-ember-loose": "^0.9.7", "@tsconfig/ember": "^1.0.0", diff --git a/ember-headless-form/rollup.config.mjs b/ember-headless-form/rollup.config.mjs index 260a773f..917e220a 100644 --- a/ember-headless-form/rollup.config.mjs +++ b/ember-headless-form/rollup.config.mjs @@ -15,13 +15,22 @@ export default { 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(['components/**/*.js', 'index.js', 'template-registry.js']), + addon.publicEntrypoints([ + 'components/**/*.js', + 'index.js', + 'template-registry.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(['components/**/*.js']), + // 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(), + // compile TypeScript to latest JavaScript, including Babel transpilation typescript({ transpiler: 'babel', @@ -29,11 +38,6 @@ export default { transpileOnly: false, }), - // 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(), diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1d4b3544..10f9141e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -17,7 +17,7 @@ importers: '@babel/plugin-proposal-decorators': ^7.17.0 '@babel/plugin-syntax-decorators': ^7.17.0 '@babel/preset-typescript': ^7.18.6 - '@embroider/addon-dev': ^2.0.0 + '@embroider/addon-dev': ^3.0.0 '@embroider/addon-shim': ^1.0.0 '@glint/core': ^0.9.7 '@glint/environment-ember-loose': ^0.9.7 @@ -62,7 +62,7 @@ importers: '@babel/plugin-proposal-decorators': 7.20.7_@babel+core@7.20.12 '@babel/plugin-syntax-decorators': 7.19.0_@babel+core@7.20.12 '@babel/preset-typescript': 7.18.6_@babel+core@7.20.12 - '@embroider/addon-dev': 2.0.0_rollup@2.79.1 + '@embroider/addon-dev': 3.0.0_rollup@2.79.1 '@glint/core': 0.9.7_typescript@4.9.4 '@glint/environment-ember-loose': 0.9.7 '@tsconfig/ember': 1.1.0 @@ -1881,17 +1881,12 @@ packages: - supports-color dev: true - /@embroider/addon-dev/2.0.0_rollup@2.79.1: - resolution: {integrity: sha512-XOThXF6/4rQWmKOaD20xFsdPkNzmSCRUsLG2Qb9z/NpNonN9AFjo385OkUgMju2bp1E+U2QQNqCEsZLH9jdG9w==} + /@embroider/addon-dev/3.0.0_rollup@2.79.1: + resolution: {integrity: sha512-h3ISDdp8LASA6583WC3IU3ECZ5fHlW3V3EkgpEeeH7KhxTerHjDjNf+S6+ZvPH+ZHi3WOCYPvUA5OfNICyMbtA==} engines: {node: 12.* || 14.* || >= 16} hasBin: true - peerDependencies: - ember-source: '*' - peerDependenciesMeta: - ember-source: - optional: true dependencies: - '@embroider/core': 1.9.0 + '@embroider/core': 2.0.2 '@rollup/pluginutils': 4.2.1 assert-never: 1.2.1 fs-extra: 10.1.0 @@ -1919,8 +1914,8 @@ packages: - supports-color dev: false - /@embroider/core/1.9.0: - resolution: {integrity: sha512-fjPb1pU7a+V9clpfBCa8CHdxbz7hr6azwNw/DqRQIMM272nrOPml65YVsBE24z7NrHdkqHjvmvDQ+qtl6oBhPw==} + /@embroider/core/2.0.2: + resolution: {integrity: sha512-noxrIOTiOI8ZW9s7hLCOhSHfsttgkPXN1on/2aovCHza0lQ9DNi4V5Ybpd4QMaTh+OzsrLGnV9qdj7kd9GpWSg==} engines: {node: 12.* || 14.* || >= 16} dependencies: '@babel/core': 7.20.12 @@ -1929,11 +1924,11 @@ packages: '@babel/plugin-transform-runtime': 7.19.6_@babel+core@7.20.12 '@babel/runtime': 7.20.7 '@babel/traverse': 7.20.12 - '@embroider/macros': 1.9.0 - '@embroider/shared-internals': 1.8.3 + '@embroider/macros': 1.10.0 + '@embroider/shared-internals': 2.0.0 assert-never: 1.2.1 babel-import-util: 1.3.0 - babel-plugin-ember-template-compilation: 1.0.2 + babel-plugin-ember-template-compilation: 2.0.0 broccoli-node-api: 1.7.0 broccoli-persistent-filter: 3.1.3 broccoli-plugin: 4.0.7 @@ -1950,10 +1945,8 @@ packages: lodash: 4.17.21 resolve: 1.22.1 resolve-package-path: 4.0.3 - strip-bom: 4.0.0 typescript-memoize: 1.1.1 walk-sync: 3.0.0 - wrap-legacy-hbs-plugin-if-needed: 1.0.1 transitivePeerDependencies: - bufferutil - canvas @@ -1977,36 +1970,6 @@ packages: - supports-color dev: true - /@embroider/macros/1.9.0: - resolution: {integrity: sha512-12ElrRT+mX3aSixGHjHnfsnyoH1hw5nM+P+Ax0ITZdp6TaAvWZ8dENnVHltdnv4ssHiX0EsVEXmqbIIdMN4nLA==} - engines: {node: 12.* || 14.* || >= 16} - dependencies: - '@embroider/shared-internals': 1.8.3 - assert-never: 1.2.1 - babel-import-util: 1.3.0 - ember-cli-babel: 7.26.11 - find-up: 5.0.0 - lodash: 4.17.21 - resolve: 1.22.1 - semver: 7.3.8 - transitivePeerDependencies: - - supports-color - dev: true - - /@embroider/shared-internals/1.8.3: - resolution: {integrity: sha512-N5Gho6Qk8z5u+mxLCcMYAoQMbN4MmH+z2jXwQHVs859bxuZTxwF6kKtsybDAASCtd2YGxEmzcc1Ja/wM28824w==} - engines: {node: 12.* || 14.* || >= 16} - dependencies: - babel-import-util: 1.3.0 - ember-rfc176-data: 0.3.17 - fs-extra: 9.1.0 - js-string-escape: 1.0.1 - lodash: 4.17.21 - resolve-package-path: 4.0.3 - semver: 7.3.8 - typescript-memoize: 1.1.1 - dev: true - /@embroider/shared-internals/2.0.0: resolution: {integrity: sha512-qZ2/xky9mWm5YC6noOa6AiAwgISEQ78YTZNv4SNu2PFgEK/H+Ha/3ddngzGSsnXkVnIHZyxIBzhxETonQYHY9g==} engines: {node: 12.* || 14.* || >= 16} @@ -2122,13 +2085,6 @@ packages: resolution: {integrity: sha512-moRwafNDwHTnTHzyyZC9D+mUSvYrs1Ak0tRPjjmCghdoHHIvMshVbEnwKb/1WmW5CUlKc2eL9rlAV32n3GiItg==} dev: true - /@glimmer/encoder/0.42.2: - resolution: {integrity: sha512-8xkdly0i0BP5HMI0suPB9ly0AnEq8x9Z8j3Gee1HYIovM5VLNtmh7a8HsaHYRs/xHmBEZcqtr8JV89w6F59YMQ==} - dependencies: - '@glimmer/interfaces': 0.42.2 - '@glimmer/vm': 0.42.2 - dev: true - /@glimmer/env/0.1.7: resolution: {integrity: sha512-JKF/a9I9jw6fGoz8kA7LEQslrwJ5jms5CXhu/aqkBWk+PmZ6pTl8mlb/eJ/5ujBGTiQzBhy5AIWF712iA+4/mw==} dev: true @@ -2139,10 +2095,6 @@ packages: '@glimmer/env': 0.1.7 dev: true - /@glimmer/interfaces/0.42.2: - resolution: {integrity: sha512-7LOuQd02cxxNNHChzdHMAU8/qOeQvTro141CU5tXITP7z6aOv2D2gkFdau97lLQiVxezGrh8J7h8GCuF7TEqtg==} - dev: true - /@glimmer/interfaces/0.83.1: resolution: {integrity: sha512-rjAztghzX97v8I4rk3+NguM3XGYcFjc/GbJ8qrEj19KF2lUDoDBW1sB7f0tov3BD5HlrGXei/vOh4+DHfjeB5w==} dependencies: @@ -2155,24 +2107,6 @@ packages: '@simple-dom/interface': 1.4.0 dev: true - /@glimmer/low-level/0.42.2: - resolution: {integrity: sha512-s+Q44SnKdTBTnkgX0deBlVNnNPVas+Pg8xEnwky9VrUqOHKsIZRrPgfVULeC6bIdFXtXOKm5CjTajhb9qnQbXQ==} - dev: true - - /@glimmer/program/0.42.2: - resolution: {integrity: sha512-XpQ6EYzA1VL9ESKoih5XW5JftFmlRvwy3bF/I1ABOa3yLIh8mApEwrRI/sIHK0Nv5s1j0uW4itVF196WxnJXgw==} - dependencies: - '@glimmer/encoder': 0.42.2 - '@glimmer/interfaces': 0.42.2 - '@glimmer/util': 0.42.2 - dev: true - - /@glimmer/reference/0.42.2: - resolution: {integrity: sha512-XuhbRjr3M9Q/DP892jGxVfPE6jaGGHu5w9ppGMnuTY7Vm/x+A+68MCiaREhDcEwJlzGg4UkfVjU3fdgmUIrc5Q==} - dependencies: - '@glimmer/util': 0.42.2 - dev: true - /@glimmer/reference/0.83.1: resolution: {integrity: sha512-BThEwDlMkJB1WBPWDrww+VxgGyDbwxh5FFPvGhkovvCZnCb7fAMUCt9pi6CUZtviugkWOBFtE9P4eZZbOLkXeg==} dependencies: @@ -2183,27 +2117,6 @@ packages: '@glimmer/validator': 0.83.1 dev: true - /@glimmer/runtime/0.42.2: - resolution: {integrity: sha512-52LVZJsLKM3GzI3TEmYcw2LdI9Uk0jotISc3w2ozQBWvkKoYxjDNvI/gsjyMpenj4s7FcG2ggOq0x4tNFqm1GA==} - dependencies: - '@glimmer/interfaces': 0.42.2 - '@glimmer/low-level': 0.42.2 - '@glimmer/program': 0.42.2 - '@glimmer/reference': 0.42.2 - '@glimmer/util': 0.42.2 - '@glimmer/vm': 0.42.2 - '@glimmer/wire-format': 0.42.2 - dev: true - - /@glimmer/syntax/0.42.2: - resolution: {integrity: sha512-SR26SmF/Mb5o2cc4eLHpOyoX5kwwXP4KRhq4fbWfrvan74xVWA38PLspPCzwGhyVH/JsE7tUEPMjSo2DcJge/Q==} - dependencies: - '@glimmer/interfaces': 0.42.2 - '@glimmer/util': 0.42.2 - handlebars: 4.7.7 - simple-html-tokenizer: 0.5.11 - dev: true - /@glimmer/syntax/0.83.1: resolution: {integrity: sha512-n3vEd0GtjtgkOsd2gqkSimp8ecqq5KrHyana/s1XJZvVAPD5rMWT9WvAVWG8XAktns8BxjwLIUoj/vkOfA+eHg==} dependencies: @@ -2229,10 +2142,6 @@ packages: '@glimmer/validator': 0.44.0 dev: true - /@glimmer/util/0.42.2: - resolution: {integrity: sha512-Heck0baFSaWDanCYtmOcLeaz7v+rSqI8ovS7twrp2/FWEteb3Ze5sWQ2BEuSAG23L/k/lzVwYM/MY7ZugxBpaA==} - dev: true - /@glimmer/util/0.44.0: resolution: {integrity: sha512-duAsm30uVK9jSysElCbLyU6QQYO2X9iLDLBIBUcCqck9qN1o3tK2qWiHbGK5d6g8E2AJ4H88UrfElkyaJlGrwg==} dev: true @@ -2272,20 +2181,6 @@ packages: - '@babel/core' dev: true - /@glimmer/vm/0.42.2: - resolution: {integrity: sha512-D2MNU5glICLqvet5SfVPrv+l6JNK2TR+CdQhch1Ew+btOoqlW+2LIJIF/5wLb1POjIMEkt+78t/7RN0mDFXGzw==} - dependencies: - '@glimmer/interfaces': 0.42.2 - '@glimmer/util': 0.42.2 - dev: true - - /@glimmer/wire-format/0.42.2: - resolution: {integrity: sha512-IqUo6mdJ7GRsK7KCyZxrc17ioSg9RBniEnb418ZMQxsV/WBv9NQ359MuClUck2M24z1AOXo4TerUw0U7+pb1/A==} - dependencies: - '@glimmer/interfaces': 0.42.2 - '@glimmer/util': 0.42.2 - dev: true - /@glint/config/0.9.7: resolution: {integrity: sha512-XkWIZ3fuOlcofUJUaJmRS57mVVNi+Af2HtrZkBXEOCh4+BNz2wclxv2WKvkhmtvLhEUOhHb5eU3gwI58SuwgXQ==} dependencies: @@ -2970,7 +2865,7 @@ packages: dev: true /@types/eslint/7.29.0: - resolution: {integrity: sha512-VNcvioYDH8/FxaeTKkM4/TiTwt6pBV9E3OfGmvaw8tPl0rrHCJ4Ll15HRT+pMiFAf/MLQvAzC+6RzUMEL9Ceng==} + resolution: {integrity: sha512-VNcvioYDH8/FxaeTKkM4/TiTwt6pBV9E3OfGmvaw8tPl0rrHCJ4Ll15HRT+pMiFAf/MLQvAzC+6RzUMEL9Ceng==, tarball: '@types/eslint/-/eslint-7.29.0.tgz'} dependencies: '@types/estree': 1.0.0 '@types/json-schema': 7.0.11 @@ -3855,6 +3750,13 @@ packages: string.prototype.matchall: 4.0.8 dev: true + /babel-plugin-ember-template-compilation/2.0.0: + resolution: {integrity: sha512-d+4jaB2ik0rt9TH0K9kOlKJeRBHEb373FgFMcU9ZaJL2zYuVXe19bqy+cWlLpLf1tpOBcBG9QTlFBCoImlOt1g==} + engines: {node: '>= 12.*'} + dependencies: + babel-import-util: 1.3.0 + dev: true + /babel-plugin-filter-imports/4.0.0: resolution: {integrity: sha512-jDLlxI8QnfKd7PtieH6pl4tZJzymzfCDCPGdTq/grgbiYAikwDPp/oL0IlFJn0HQjLpcLkyYhPKkUVneRESw5w==} engines: {node: '>=8'} @@ -6894,7 +6796,7 @@ packages: dev: true /eslint-plugin-es/4.1.0_eslint@7.32.0: - resolution: {integrity: sha512-GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ==} + resolution: {integrity: sha512-GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ==, tarball: eslint-plugin-es/-/eslint-plugin-es-4.1.0.tgz} engines: {node: '>=8.10.0'} peerDependencies: eslint: '>=4.19.1' @@ -11560,11 +11462,6 @@ packages: ansi-regex: 5.0.1 dev: true - /strip-bom/4.0.0: - resolution: {integrity: sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==} - engines: {node: '>=8'} - dev: true - /strip-eof/1.0.0: resolution: {integrity: sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q==} engines: {node: '>=0.10.0'} @@ -12604,15 +12501,6 @@ packages: strip-ansi: 6.0.1 dev: true - /wrap-legacy-hbs-plugin-if-needed/1.0.1: - resolution: {integrity: sha512-aJjXe5WwrY0u0dcUgKW3m2SGnxosJ66LLm/QaG0YMHqgA6+J2xwAFZfhSLsQ2BmO5x8PTH+OIxoAXuGz3qBA7A==} - dependencies: - '@glimmer/reference': 0.42.2 - '@glimmer/runtime': 0.42.2 - '@glimmer/syntax': 0.42.2 - '@simple-dom/interface': 1.4.0 - dev: true - /wrappy/1.0.2: resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==} diff --git a/test-app/package.json b/test-app/package.json index 5f16e95b..2743217e 100644 --- a/test-app/package.json +++ b/test-app/package.json @@ -2,7 +2,7 @@ "name": "test-app", "version": "0.0.0", "private": true, - "description": "Small description for test-app goes here", + "description": "Test app for ember-headless-form addon", "repository": "", "license": "MIT", "author": "", @@ -20,9 +20,8 @@ "lint:js:fix": "eslint . --fix", "lint:types": "tsc --noEmit", "start": "ember serve", - "test": "npm-run-all lint \"test:!(watch)\"", - "test:ember": "ember test", - "test:watch": "ember test --server" + "test": "concurrently \"npm:lint\" \"npm:test:*\" --names \"lint,test:\"", + "test:ember": "ember test" }, "devDependencies": { "@ember/optional-features": "^2.0.0",