diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 38ac5fbef..4dcb2bd85 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -30,6 +30,11 @@ jobs: echo branch `git branch --show-current`; echo node `node -v`; + - name: Initliaze .npmrc + run: > + echo -e "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}\n$(cat .npmrc)" > .npmrc + && cat -n .npmrc + - name: Install pnpm run: | npm install pnpm -g; @@ -43,8 +48,6 @@ jobs: - name: pnpm install run: pnpm install - env: - NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}} - name: Build Packages run: pnpm build --recursive @@ -58,4 +61,5 @@ jobs: - name: Release and Publish Packages run: pnpm release --filter [HEAD^] env: - NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}} + NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}} + NPM_TOKEN: ${{ secrets.NPM_TOKEN }} diff --git a/.npmrc b/.npmrc index a4dc4a3e9..b500e9003 100644 --- a/.npmrc +++ b/.npmrc @@ -1,3 +1,5 @@ +registry=https://registry.npmjs.org/ + enable-pre-post-scripts = true link-workspace-packages = false shamefully-hoist = true diff --git a/packages/dynamic-import-vars/src/dynamic-import-to-glob.js b/packages/dynamic-import-vars/src/dynamic-import-to-glob.js index d3e1f18a1..c814b123b 100644 --- a/packages/dynamic-import-vars/src/dynamic-import-to-glob.js +++ b/packages/dynamic-import-vars/src/dynamic-import-to-glob.js @@ -86,7 +86,9 @@ export function dynamicImportToGlob(node, sourceString) { ); } - if (glob.startsWith('./*.')) { + // Disallow ./*.ext + const ownDirectoryStarExtension = /^\.\/\*\.[\w]+$/; + if (ownDirectoryStarExtension.test(glob)) { throw new VariableDynamicImportError( `${ `invalid import "${sourceString}". Variable imports cannot import their own directory, ` + diff --git a/packages/dynamic-import-vars/test/src/dynamic-import-to-glob.test.js b/packages/dynamic-import-vars/test/src/dynamic-import-to-glob.test.js index bbd350e40..5d0508ec8 100644 --- a/packages/dynamic-import-vars/test/src/dynamic-import-to-glob.test.js +++ b/packages/dynamic-import-vars/test/src/dynamic-import-to-glob.test.js @@ -17,6 +17,15 @@ test('template literal with variable filename', (t) => { t.is(glob, './foo/*.js'); }); +test('template literal with dot-prefixed suffix', (t) => { + const ast = CustomParser.parse('import(`./${bar}.entry.js`);', { + sourceType: 'module' + }); + + const glob = dynamicImportToGlob(ast.body[0].expression.arguments[0]); + t.is(glob, './*.entry.js'); +}); + test('template literal with variable directory', (t) => { const ast = CustomParser.parse('import(`./foo/${bar}/x.js`);', { sourceType: 'module'