Merge pull request #1016 from form8ion/beta

promote beta to stable

Author: travi

.github/workflows/codeql.yml

@@ -47,7 +47,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@6e5455904168f98c75d8e5ad848b4dc4ab3ae77e # v3.28.7
+      uses: github/codeql-action/init@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -61,7 +61,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, Go, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@6e5455904168f98c75d8e5ad848b4dc4ab3ae77e # v3.28.7
+      uses: github/codeql-action/autobuild@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -74,6 +74,6 @@ jobs:
     #     ./location_of_script_within_repo/buildscript.sh
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@6e5455904168f98c75d8e5ad848b4dc4ab3ae77e # v3.28.7
+      uses: github/codeql-action/analyze@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
       with:
         category: "/language:${{matrix.language}}"

.github/workflows/node-ci.yml

@@ -25,6 +25,7 @@ jobs:
           node-version-file: .nvmrc
           cache: npm
       - run: npm clean-install
+      - run: npm install --global corepack@latest
       - run: corepack npm audit signatures
       - run: npm test
       - uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1
@@ -34,8 +35,9 @@ jobs:
       matrix:
         node:
           - 18.19.0
-          - 20.6.1
-          - 22.0.0
+          - 20.9.0
+          - 22.11.0
+          - 23
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Setup node

.github/workflows/scorecard.yml

@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@6e5455904168f98c75d8e5ad848b4dc4ab3ae77e # v3.28.7
+        uses: github/codeql-action/upload-sarif@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
         with:
           sarif_file: results.sarif

README.md

@@ -46,88 +46,85 @@ $ npm install @form8ion/javascript --save
 #### Import
 
 ```javascript
-const {dialects, projectTypes} = require('@form8ion/javascript-core');
+const {dialects, projectTypes} = await import('@form8ion/javascript-core');
 const {
   scaffold: scaffoldJavaScript,
   lift: liftJavascript,
   test: thisIsAJavaScriptProject,
   scaffoldUnitTesting,
   questionNames
-} = require('@form8ion/javascript');
+} = await import('./lib/index.js');
 ```
 
 #### Execute
 
 ```javascript
-(async () => {
-  const accountName = 'form8ion';
-  const projectRoot = process.cwd();
+const accountName = 'form8ion';
+const projectRoot = process.cwd();
+
+await scaffoldJavaScript({
+  projectRoot,
+  projectName: 'project-name',
+  visibility: 'Public',
+  license: 'MIT',
+  configs: {
+    eslint: {scope: `@${accountName}`},
+    remark: `@${accountName}/remark-lint-preset`,
+    babelPreset: {name: `@${accountName}`, packageName: `@${accountName}/babel-preset`},
+    commitlint: {name: `@${accountName}`, packageName: `@${accountName}/commitlint-config`}
+  },
+  plugins: {
+    unitTestFrameworks: {},
+    applicationTypes: {},
+    packageTypes: {},
+    packageBundlers: {},
+    ciServices: {}
+  },
+  decisions: {
+    [questionNames.DIALECT]: dialects.BABEL,
+    [questionNames.NODE_VERSION_CATEGORY]: 'LTS',
+    [questionNames.PACKAGE_MANAGER]: 'npm',
+    [questionNames.PROJECT_TYPE]: projectTypes.PACKAGE,
+    [questionNames.SHOULD_BE_SCOPED]: true,
+    [questionNames.SCOPE]: accountName,
+    [questionNames.AUTHOR_NAME]: 'Your Name',
+    [questionNames.AUTHOR_EMAIL]: '[email protected]',
+    [questionNames.AUTHOR_URL]: 'https://your.website.tld',
+    [questionNames.UNIT_TESTS]: true,
+    [questionNames.INTEGRATION_TESTS]: true,
+    [questionNames.PROVIDE_EXAMPLE]: true
+  }
+});
 
-  await scaffoldJavaScript({
+if (await thisIsAJavaScriptProject({projectRoot})) {
+  await liftJavascript({
     projectRoot,
-    projectName: 'project-name',
-    visibility: 'Public',
-    license: 'MIT',
-    configs: {
-      eslint: {scope: `@${accountName}`},
-      remark: `@${accountName}/remark-lint-preset`,
-      babelPreset: {name: `@${accountName}`, packageName: `@${accountName}/babel-preset`},
-      commitlint: {name: `@${accountName}`, packageName: `@${accountName}/commitlint-config`}
-    },
-    plugins: {
-      unitTestFrameworks: {},
-      applicationTypes: {},
-      packageTypes: {},
-      packageBundlers: {},
-      ciServices: {}
+    configs: {eslint: {scope: '@foo'}},
+    results: {
+      dependencies: {javascript: {production: [], development: []}},
+      scripts: {},
+      eslint: {configs: [], ignore: {directories: []}},
+      packageManager: 'npm'
     },
-    decisions: {
-      [questionNames.DIALECT]: dialects.BABEL,
-      [questionNames.NODE_VERSION_CATEGORY]: 'LTS',
-      [questionNames.PACKAGE_MANAGER]: 'npm',
-      [questionNames.PROJECT_TYPE]: projectTypes.PACKAGE,
-      [questionNames.SHOULD_BE_SCOPED]: true,
-      [questionNames.SCOPE]: accountName,
-      [questionNames.AUTHOR_NAME]: 'Your Name',
-      [questionNames.AUTHOR_EMAIL]: '[email protected]',
-      [questionNames.AUTHOR_URL]: 'https://your.website.tld',
-      [questionNames.UNIT_TESTS]: true,
-      [questionNames.INTEGRATION_TESTS]: true,
-      [questionNames.PROVIDE_EXAMPLE]: true
-    }
-  });
-
-  if (await thisIsAJavaScriptProject({projectRoot})) {
-    await liftJavascript({
-      projectRoot,
-      configs: {eslint: {scope: '@foo'}},
-      results: {
-        dependencies: [],
-        devDependencies: [],
-        scripts: {},
-        eslint: {configs: [], ignore: {directories: []}},
-        packageManager: 'npm'
-      },
-      enhancers: {
-        PluginName: {
-          test: () => true,
-          lift: () => ({})
-        }
+    enhancers: {
+      PluginName: {
+        test: () => true,
+        lift: () => ({})
       }
-    });
-  }
-
-  await scaffoldUnitTesting({
-    projectRoot: process.cwd(),
-    frameworks: {
-      Mocha: {scaffold: options => options},
-      Jest: {scaffold: options => options}
-    },
-    visibility: 'Public',
-    vcs: {host: 'GitHub', owner: 'foo', name: 'bar'},
-    decisions: {[questionNames.UNIT_TEST_FRAMEWORK]: 'Mocha'}
+    }
   });
-})();
+}
+
+await scaffoldUnitTesting({
+  projectRoot: process.cwd(),
+  frameworks: {
+    Mocha: {scaffold: options => options},
+    Jest: {scaffold: options => options}
+  },
+  visibility: 'Public',
+  vcs: {host: 'GitHub', owner: 'foo', name: 'bar'},
+  decisions: {[questionNames.UNIT_TEST_FRAMEWORK]: 'Mocha'}
+});
 ```
 
 ### Documentation

docs/api/scaffold.md

@@ -8,7 +8,7 @@ Language scaffolder for JavaScript projects
   * [`projectRoot` __string__ (_required_)](#projectroot-string-required)
   * [`projectName` __string__ (_required_)](#projectname-string-required)
   * [`description` __string__ (_optional_)](#description-string-optional)
-  * [`pathWithinParent` __string__ (_required_)](#pathwithinparent-string-required)
+  * [`pathWithinParent` __string__ (_optional_)](#pathwithinparent-string-optional)
   * [`license` __string__ (_required_)](#license-string-required)
   * [`decisions` __object__ (_optional_)](#decisions-object-optional)
   * [`visibility` __string__ (_required_)](#visibility-string-required)

example.js

@@ -5,17 +5,18 @@ import stubbedFs from 'mock-fs';
 import * as td from 'testdouble';
 import 'validate-npm-package-name';
 
-// remark-usage-ignore-next 10
+// remark-usage-ignore-next 11
 stubbedFs({
   node_modules: stubbedFs.load(resolve('node_modules')),
   '.nvmrc': 'v1.2.3',
   lib: stubbedFs.load(resolve('lib')),
   templates: stubbedFs.load(resolve('templates'))
 });
-const execa = td.replace('execa');
+const {execa} = await td.replaceEsm('execa');
 td.when(execa('. ~/.nvm/nvm.sh && nvm ls-remote --lts', {shell: true}))
   .thenResolve({stdout: ['v16.5.4', ''].join('\n')});
 td.when(execa('. ~/.nvm/nvm.sh && nvm install', {shell: true})).thenReturn({stdout: {pipe: () => undefined}});
+td.when(execa('npm', ['--version'])).thenResolve({stdout: '10.6.18'});
 
 const {dialects, projectTypes} = await import('@form8ion/javascript-core');
 const {
@@ -69,8 +70,7 @@ if (await thisIsAJavaScriptProject({projectRoot})) {
     projectRoot,
     configs: {eslint: {scope: '@foo'}},
     results: {
-      dependencies: [],
-      devDependencies: [],
+      dependencies: {javascript: {production: [], development: []}},
       scripts: {},
       eslint: {configs: [], ignore: {directories: []}},
       packageManager: 'npm'