Skip to content

feat!: switch from CJS to ESM and bump Yeoman packages #269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 6 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node-version: [ 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23 ]
node-version: [ 18, 19, 20, 21, 22, 23 ]

name: node v${{ matrix.node-version }} test

Expand Down
12 changes: 7 additions & 5 deletions __tests__/app.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
'use strict';
const path = require('path');
const assert = require('yeoman-assert');
const helpers = require('yeoman-test');
const generatorGeneratorPkg = require('../package.json');
import path from 'path';
import assert from 'yeoman-assert';
import helpers from 'yeoman-test';
import { jest } from '@jest/globals';

import generatorGeneratorPkg from '../package.json';
import { __dirname } from './dirname.cjs';

jest.mock('superb', () => ({ random: () => "cat's meow" }));
jest.mock('npm-name', () => () => Promise.resolve(true));
Expand Down
1 change: 1 addition & 0 deletions __tests__/dirname.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = { __dirname };
12 changes: 7 additions & 5 deletions __tests__/subgenerator.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
'use strict';
const path = require('path');
const assert = require('yeoman-assert');
const helpers = require('yeoman-test');
const fs = require('fs');
import path from 'path';
import assert from 'yeoman-assert';
import helpers from 'yeoman-test';
import fs from 'fs';
import { jest } from '@jest/globals';

import { __dirname } from './dirname.cjs';

jest.mock('superb', () => ({ random: () => "cat's meow" }));

Expand Down
21 changes: 11 additions & 10 deletions app/index.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
const path = require('path');
const Generator = require('yeoman-generator');
const askName = require('inquirer-npm-name');
const _ = require('lodash');
const extend = require('deep-extend');
const mkdirp = require('mkdirp');
import path from 'path';
import Generator from 'yeoman-generator';
import askName from 'inquirer-npm-name';
import _ from 'lodash';
import extend from 'deep-extend';
import mkdirp from 'mkdirp';

import generatorGeneratorPkg from '../package.json';

function parseScopedName(name) {
const nameFragments = name.split('/');
Expand All @@ -28,7 +30,7 @@ function makeGeneratorName(name) {
return parsedName.scopeName ? `${parsedName.scopeName}/${name}` : name;
}

module.exports = class extends Generator {
export default class extends Generator {
initializing() {
this.props = {};
}
Expand Down Expand Up @@ -62,7 +64,7 @@ module.exports = class extends Generator {

const readmeTpl = _.template(this.fs.read(this.templatePath('README.md')));

this.composeWith(require.resolve('generator-node/generators/app'), {
this.composeWith(import.meta.resolve('generator-node/generators/app'), {
boilerplate: false,
name: this.props.name,
projectRoot: 'generators',
Expand All @@ -73,14 +75,13 @@ module.exports = class extends Generator {
})
});

this.composeWith(require.resolve('../subgenerator'), {
this.composeWith(import.meta.resolve('../subgenerator'), {
arguments: ['app']
});
}

writing() {
const pkg = this.fs.readJSON(this.destinationPath('package.json'), {});
const generatorGeneratorPkg = require('../package.json');

extend(pkg, {
dependencies: {
Expand Down
Loading
Loading