diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index 6d020246..2dd13106 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -90,13 +90,15 @@ jobs: - name: Run tests for webpack version ${{ matrix.webpack-version }} run: npm run test:coverage -- --ci + env: + EXPERIMENTAL_USE_IMPORT_MODULE: "false" - name: Submit coverage data to codecov uses: codecov/codecov-action@v1 with: token: ${{ secrets.CODECOV_TOKEN }} - test2: + test-new-api: name: Test - ${{ matrix.os }} - Node v${{ matrix.node-version }}, Webpack latest, experimentalUseImportModule strategy: diff --git a/test/TestCases.test.js b/test/TestCases.test.js index 256bbcbc..9a3cb78b 100644 --- a/test/TestCases.test.js +++ b/test/TestCases.test.js @@ -9,6 +9,8 @@ import webpack from "webpack"; import Self from "../src/index"; +import yn from "./helpers/yn"; + function clearDirectory(dirPath) { let files; @@ -128,9 +130,12 @@ describe("TestCases", () => { config.plugins.map((p) => { if (p.constructor === Self) { const { options } = p; - options.experimentalUseImportModule = - !!process.env.EXPERIMENTAL_USE_IMPORT_MODULE; + + options.experimentalUseImportModule = yn( + process.env.EXPERIMENTAL_USE_IMPORT_MODULE + ); } + return p; }), }, @@ -192,7 +197,9 @@ describe("TestCases", () => { const expectedDirectoryByVersion = path.join( expectedDirectory, `webpack-${webpack.version[0]}${ - process.env.EXPERIMENTAL_USE_IMPORT_MODULE ? "-importModule" : "" + yn(process.env.EXPERIMENTAL_USE_IMPORT_MODULE) + ? "-importModule" + : "" }` ); diff --git a/test/cases/auxiliary-assets/test.filter.js b/test/cases/auxiliary-assets/test.filter.js index d04b7de0..c51829af 100644 --- a/test/cases/auxiliary-assets/test.filter.js +++ b/test/cases/auxiliary-assets/test.filter.js @@ -1 +1,3 @@ -module.exports = () => !process.env.EXPERIMENTAL_USE_IMPORT_MODULE; +import yn from "../../helpers/yn"; + +module.exports = () => !yn(process.env.EXPERIMENTAL_USE_IMPORT_MODULE); diff --git a/test/helpers/yn.js b/test/helpers/yn.js new file mode 100644 index 00000000..9834ac74 --- /dev/null +++ b/test/helpers/yn.js @@ -0,0 +1,13 @@ +function yn(value, defaultValue = false) { + if (/^(?:y|yes|true|1|on)$/i.test(value)) { + return true; + } + + if (/^(?:n|no|false|0|off)$/i.test(value)) { + return false; + } + + return defaultValue; +} + +module.exports = yn;