Port v51.4.0 (#322)

* feat: added default jest config in new project template (#289) * docs: add semvar info to publishing doc (#312) * chore: remove codecov.io (#315) * fix: add *.app to eslintignore (#313) * feat(gitignore): add dotenv files (#314) * add code folders to analytics projects (#316) * fix: update .nvmrc to match volta config * feat: add code folders to analytics projects This is aura/, classes/, and lwc/, plus the corresponding eslint configs. Also adds the analytics vscode extension to the extension recommendations. * build: upgrade dependencies (#317) * build: update nyc in packages/templates * build: update lerna * build: update commitlint deps * build: upgrade yeoman packages Co-authored-by: Philippe Ozil <[email protected]> Co-authored-by: Shelby Holden <[email protected]> Co-authored-by: Willie Ruemmele <[email protected]> Co-authored-by: Jonathan Wiesel <[email protected]> Co-authored-by: Greg Smith <[email protected]> Co-authored-by: Bryan Powell <[email protected]>
forcedotcom · May 10, 2021 · 62cef9c · 62cef9c
1 parent 9cb89e0
commit 62cef9c
Show file tree

Hide file tree

Showing 15 changed files with 1,354 additions and 850 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -154,7 +154,6 @@ jobs:
             yarn --version
             node --version
             yarn
-            yarn global add codecov
       - save_cache:
           key: dependency-cache-win1-{{checksum ".circleci/config.yml"}}-{{checksum "yarn.lock"}}
           paths:
@@ -167,10 +166,6 @@ jobs:
           name: 'Running unit tests'
           command: |
             yarn test
-      - run:
-          name: Submitting code coverage to codecov
-          command: |
-            npx codecov --disable=gcov
 
   prepublish:
     description: 'Prepublish'

diff --git a/.codecov.yml b/.codecov.yml
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-v10.15.3
+v12.4.0
diff --git a/README.md b/README.md
@@ -1,7 +1,6 @@
 # salesforcedx-templates
 
 [![CircleCI](https://circleci.com/gh/forcedotcom/salesforcedx-templates/tree/master.svg?style=shield)](https://circleci.com/gh/forcedotcom/salesforcedx-templates/tree/master)
-[![Codecov](https://codecov.io/gh/forcedotcom/salesforcedx-templates/branch/master/graph/badge.svg)](https://codecov.io/gh/forcedotcom/salesforcedx-templates)
 [![Known Vulnerabilities](https://snyk.io/test/github/forcedotcom/salesforcedx-templates/badge.svg)](https://snyk.io/test/github/forcedotcom/salesforcedx-templates)
 [![License](https://img.shields.io/npm/l/salesforcedx-templates.svg)](https://github.com/forcedotcom/salesforcedx-templates/blob/master/package.json)
 [![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg)](http://commitizen.github.io/cz-cli/)

diff --git a/contributing/publishing.md b/contributing/publishing.md
@@ -23,7 +23,7 @@ To port changes from the develop branch to main, we utilize a script called `por
 1. Search for `Tasks: Run Task`.
 1. Select `Create Port PR for Publishing`.
 1. Select `-v` to see the full output.
-1. Select the type of version bump. Typically using the default value of `minor` is fine.
+1. Select the type of version bump. In most instances we will be using `minor`. Select `patch` when backwards compatible bug fixes are made. Select `minor` when new backwards compatible functionality is added. Select `major` when incompatible API changes are made. See https://semver.org/ for more information.
 1. Push your branch up with `git push origin <branchName>` and open the pull request for review.
 1. <b>Important:</b> When your PR has been approved, be sure to merge with the option `Rebase and Merge`. We do <b>not</b> want to squash these commits.
 

diff --git a/package.json b/package.json
@@ -7,9 +7,9 @@
   "devDependencies": {
     "@commitlint/cli": "^7",
     "@commitlint/config-conventional": "^7",
+    "@salesforce/dev-config": "1.4.1",
     "commitizen": "^3.0.5",
     "cz-conventional-changelog": "^2.1.0",
-    "@salesforce/dev-config": "1.4.1",
     "eslint": "6.6.0",
     "eslint-config-prettier": "6.5.0",
     "globby": "^8",

diff --git a/packages/plugin-templates/README.md b/packages/plugin-templates/README.md
@@ -3,7 +3,6 @@
 This repository provides a series of commands, templates, and generators for various metadata types. It is bundled with the [salesforcedx plugin](https://www.npmjs.com/package/salesforcedx).
 
 [![CircleCI](https://circleci.com/gh/forcedotcom/salesforcedx-templates/tree/master.svg?style=shield)](https://circleci.com/gh/forcedotcom/salesforcedx-templates/tree/master)
-[![Codecov](https://codecov.io/gh/forcedotcom/salesforcedx-templates/branch/master/graph/badge.svg)](https://codecov.io/gh/forcedotcom/salesforcedx-templates)
 [![Known Vulnerabilities](https://snyk.io/test/github/forcedotcom/salesforcedx-templates/badge.svg)](https://snyk.io/test/github/forcedotcom/salesforcedx-templates)
 [![License](https://img.shields.io/npm/l/salesforcedx-templates.svg)](https://github.com/forcedotcom/salesforcedx-templates/blob/master/package.json)
 

diff --git a/packages/plugin-templates/test/commands/project/create.test.ts b/packages/plugin-templates/test/commands/project/create.test.ts
@@ -29,10 +29,11 @@ const filestocopy = [
   '.gitignore',
   '.prettierignore',
   '.prettierrc',
+  'jest.config.js',
   'package.json'
 ];
 const emptyfolderarray = ['aura', 'lwc'];
-const analyticsfolderarray = ['waveTemplates'];
+const analyticsfolderarray = ['aura', 'classes', 'lwc', 'waveTemplates'];
 const vscodearray = ['extensions', 'launch', 'settings'];
 
 Messages.importMessagesDirectory(__dirname);
@@ -263,6 +264,7 @@ describe('Project creation tests:', () => {
           assert.file([path.join('footest', 'manifest', 'package.xml')]);
         }
       );
+
     test
       .withOrg()
       .withProject()
@@ -381,13 +383,27 @@ describe('Project creation tests:', () => {
             path.join('analytics1', 'sfdx-project.json'),
             'sourceApiVersion'
           );
+          const srcDir = path.join(
+            'analytics1',
+            'force-app',
+            'main',
+            'default'
+          );
           for (const folder of analyticsfolderarray) {
-            assert(
-              fs.existsSync(
-                path.join('analytics1', 'force-app', 'main', 'default', folder)
-              )
-            );
+            const dir = path.join(srcDir, folder);
+            assert(fs.existsSync(dir), `Missing ${dir}`);
           }
+          for (const file of vscodearray) {
+            assert.file(path.join('analytics1', '.vscode', `${file}.json`));
+          }
+          assert.fileContent(
+            path.join('analytics1', '.vscode', 'extensions.json'),
+            '"salesforce.analyticsdx-vscode"'
+          );
+          assert.fileContent(
+            path.join('analytics1', '.vscode', 'extensions.json'),
+            '"salesforce.salesforcedx-vscode"'
+          );
           assert.fileContent(
             path.join('analytics1', 'config', 'project-scratch-def.json'),
             '"DevelopmentWave"'
@@ -400,6 +416,8 @@ describe('Project creation tests:', () => {
             path.join('analytics1', 'README.md'),
             '# Salesforce DX Project: Next Steps'
           );
+          assert.file([path.join(srcDir, 'lwc', '.eslintrc.json')]);
+          assert.file([path.join(srcDir, 'aura', '.eslintrc.json')]);
         }
       );
 
@@ -436,6 +454,7 @@ describe('Project creation tests:', () => {
         }
       );
   });
+
   describe('project creation failures', () => {
     test
       .withOrg()