Skip to content

Commit 8973929

Browse files
authored
Merge pull request #737 from salesforcecli/sh/update-deps
fix: update templates dep and adjust NUTs
2 parents 8661332 + 667cba9 commit 8973929

3 files changed

Lines changed: 12 additions & 36 deletions

File tree

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"dependencies": {
88
"@salesforce/core": "^8.14.0",
99
"@salesforce/sf-plugins-core": "^12",
10-
"@salesforce/templates": "^62.0.5"
10+
"@salesforce/templates": "^64.2.0"
1111
},
1212
"devDependencies": {
1313
"@oclif/plugin-command-snapshot": "^5.3.2",

test/commands/project/create.nut.ts

Lines changed: 7 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ describe('Project creation tests:', () => {
7272
assert.file([path.join(session.project.dir, 'foo', '.vscode', `${file}.json`)]);
7373
}
7474
assert.fileContent(path.join(session.project.dir, 'foo', 'README.md'), messages.getMessage('StandardReadMe'));
75-
assert.file([path.join(session.project.dir, 'foo', 'force-app', 'main', 'default', 'lwc', '.eslintrc.json')]);
76-
assert.file([path.join(session.project.dir, 'foo', 'force-app', 'main', 'default', 'aura', '.eslintrc.json')]);
75+
assert.file([path.join(session.project.dir, 'foo', 'eslint.config.js')]);
76+
assert.file([path.join(session.project.dir, 'foo', 'eslint.config.js')]);
7777
for (const file of filestocopy) {
7878
assert.file([path.join(session.project.dir, 'foo', file)]);
7979
}
@@ -90,30 +90,8 @@ describe('Project creation tests:', () => {
9090
for (const file of vscodearray) {
9191
assert.file([path.join(session.project.dir, 'test outputdir', 'foo', '.vscode', `${file}.json`)]);
9292
}
93-
assert.file([
94-
path.join(
95-
session.project.dir,
96-
'test outputdir',
97-
'foo',
98-
'force-app',
99-
'main',
100-
'default',
101-
'lwc',
102-
'.eslintrc.json'
103-
),
104-
]);
105-
assert.file([
106-
path.join(
107-
session.project.dir,
108-
'test outputdir',
109-
'foo',
110-
'force-app',
111-
'main',
112-
'default',
113-
'aura',
114-
'.eslintrc.json'
115-
),
116-
]);
93+
assert.file([path.join(session.project.dir, 'test outputdir', 'foo', 'eslint.config.js')]);
94+
assert.file([path.join(session.project.dir, 'test outputdir', 'foo', 'eslint.config.js')]);
11795
for (const file of filestocopy) {
11896
assert.file([path.join(session.project.dir, 'test outputdir', 'foo', file)]);
11997
}
@@ -140,9 +118,7 @@ describe('Project creation tests:', () => {
140118
for (const file of vscodearray) {
141119
assert.file([path.join(session.project.dir, 'foo-project', '.vscode', `${file}.json`)]);
142120
}
143-
assert.file([
144-
path.join(session.project.dir, 'foo-project', 'force-app', 'main', 'default', 'lwc', '.eslintrc.json'),
145-
]);
121+
assert.file([path.join(session.project.dir, 'foo-project', 'eslint.config.js')]);
146122
for (const file of filestocopy) {
147123
assert.file([path.join(session.project.dir, 'foo-project', file)]);
148124
}
@@ -246,8 +222,8 @@ describe('Project creation tests:', () => {
246222
path.join(session.project.dir, 'analytics1', 'README.md'),
247223
'# Salesforce DX Project: Next Steps'
248224
);
249-
assert.file([path.join(srcDir, 'lwc', '.eslintrc.json')]);
250-
assert.file([path.join(srcDir, 'aura', '.eslintrc.json')]);
225+
assert.file([path.join(session.project.dir, 'analytics1', 'eslint.config.js')]);
226+
assert.file([path.join(session.project.dir, 'analytics1', 'eslint.config.js')]);
251227
});
252228
});
253229

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1798,10 +1798,10 @@
17981798
cli-progress "^3.12.0"
17991799
terminal-link "^3.0.0"
18001800

1801-
"@salesforce/templates@^62.0.5":
1802-
version "62.0.5"
1803-
resolved "https://registry.yarnpkg.com/@salesforce/templates/-/templates-62.0.5.tgz#ec0b76c699394abb4724f2b344e6b810d55e005a"
1804-
integrity sha512-W/QZsxYQMjX40NmBusxjP/bquGLZDaSu5AjFq46dffgCBAdNBAB9YCKzRnFPa9ReCi3PJyDTQl7QpqeHyMXnJQ==
1801+
"@salesforce/templates@^64.2.0":
1802+
version "64.2.0"
1803+
resolved "https://registry.yarnpkg.com/@salesforce/templates/-/templates-64.2.0.tgz#252c50a6e112f7d94c02ab191ff8bbfac22b69eb"
1804+
integrity sha512-PRqXkLWbNO75ILwkY7U1Cv/BYkhg++7aOCBVyUdIX5rcwfLR3D1pI28axA5t8HMArXXBn02NoRZhVvbOXSfwYw==
18051805
dependencies:
18061806
"@salesforce/kit" "^3.2.3"
18071807
ejs "^3.1.10"

0 commit comments

Comments
 (0)