@embroider/test-setup 2.1.2-unstable.f004d11 → 3.0.1-unstable.18fd6a9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/package.json +21 -2
  2. package/src/index.js +14 -20
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@embroider/test-setup",
3
- "version": "2.1.2-unstable.f004d11",
3
+ "version": "3.0.1-unstable.18fd6a9",
4
4
  "repository": {
5
5
  "type": "git",
6
6
  "url": "https://github.com/embroider-build/embroider.git",
@@ -16,7 +16,26 @@
16
16
  "resolve": "^1.20.0"
17
17
  },
18
18
  "devDependencies": {
19
- "@embroider/compat": "2.1.2-unstable.f004d11"
19
+ "@embroider/compat": "3.0.1-unstable.18fd6a9",
20
+ "@embroider/core": "3.0.1-unstable.18fd6a9",
21
+ "@embroider/webpack": "3.0.1-unstable.18fd6a9",
22
+ "@types/lodash": "^4.14.170"
23
+ },
24
+ "peerDependencies": {
25
+ "@embroider/compat": "3.0.1-unstable.18fd6a9",
26
+ "@embroider/core": "3.0.1-unstable.18fd6a9",
27
+ "@embroider/webpack": "3.0.1-unstable.18fd6a9"
28
+ },
29
+ "peerDependenciesMeta": {
30
+ "@embroider/compat": {
31
+ "optional": true
32
+ },
33
+ "@embroider/core": {
34
+ "optional": true
35
+ },
36
+ "@embroider/webpack": {
37
+ "optional": true
38
+ }
20
39
  },
21
40
  "engines": {
22
41
  "node": "12.* || 14.* || >= 16"
package/src/index.js CHANGED
@@ -2,7 +2,14 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.embroiderOptimized = exports.embroiderSafe = exports.maybeEmbroider = void 0;
4
4
  // eslint-disable-next-line @typescript-eslint/no-require-imports
5
- const currentEmbroiderVersion = `^${require('../package.json').version}`;
5
+ const ourPeerDeps = require('../package.json').peerDependencies;
6
+ const embroiderDevDeps = {
7
+ '@embroider/core': `^${ourPeerDeps['@embroider/core']}`,
8
+ '@embroider/webpack': `^${ourPeerDeps['@embroider/webpack']}`,
9
+ '@embroider/compat': `^${ourPeerDeps['@embroider/compat']}`,
10
+ // Webpack is a peer dependency of `@embroider/webpack`
11
+ webpack: '^5.0.0',
12
+ };
6
13
  /*
7
14
  Use this instead of `app.toTree()` in your ember-cli-build.js:
8
15
 
@@ -17,12 +24,11 @@ function maybeEmbroider(app, opts = {}) {
17
24
  // - we don't want to load any of these things until they're actually needed;
18
25
  // - we can't use `await import()` because this function needs to be synchronous to go inside ember-cli-build.js
19
26
  /* eslint-disable @typescript-eslint/no-require-imports */
20
- let resolve = require('resolve');
21
- let { Webpack } = require(resolve.sync('@embroider/webpack', {
22
- basedir: app.project.root,
27
+ let { Webpack } = require(require.resolve('@embroider/webpack', {
28
+ paths: [app.project.root],
23
29
  }));
24
- let Compat = require(resolve.sync('@embroider/compat', {
25
- basedir: app.project.root,
30
+ let Compat = require(require.resolve('@embroider/compat', {
31
+ paths: [app.project.root],
26
32
  }));
27
33
  let mergeWith = require('lodash/mergeWith');
28
34
  /* eslint-enable @typescript-eslint/no-require-imports */
@@ -43,13 +49,7 @@ function embroiderSafe(extension) {
43
49
  return extendScenario({
44
50
  name: 'embroider-safe',
45
51
  npm: {
46
- devDependencies: {
47
- '@embroider/core': currentEmbroiderVersion,
48
- '@embroider/webpack': currentEmbroiderVersion,
49
- '@embroider/compat': currentEmbroiderVersion,
50
- // Webpack is a peer dependency of `@embroider/webpack`
51
- webpack: '^5.0.0',
52
- },
52
+ devDependencies: embroiderDevDeps,
53
53
  },
54
54
  env: {
55
55
  EMBROIDER_TEST_SETUP_OPTIONS: 'safe',
@@ -61,13 +61,7 @@ function embroiderOptimized(extension) {
61
61
  return extendScenario({
62
62
  name: 'embroider-optimized',
63
63
  npm: {
64
- devDependencies: {
65
- '@embroider/core': currentEmbroiderVersion,
66
- '@embroider/webpack': currentEmbroiderVersion,
67
- '@embroider/compat': currentEmbroiderVersion,
68
- // Webpack is a peer dependency of `@embroider/webpack`
69
- webpack: '^5.0.0',
70
- },
64
+ devDependencies: embroiderDevDeps,
71
65
  },
72
66
  env: {
73
67
  EMBROIDER_TEST_SETUP_OPTIONS: 'optimized',