Skip to content

Commit

Permalink
Merge pull request #114 from elycruz/dev
Browse files Browse the repository at this point in the history
fix: rollup, and @rollup/pluginutils, version ranges update
  • Loading branch information
elycruz committed Mar 5, 2023
2 parents c6e45f1 + bbdfcfc commit 9e0aca0
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 89 deletions.
15 changes: 0 additions & 15 deletions .github/workflows/publish.yml
Expand Up @@ -22,18 +22,3 @@ jobs:
env:
NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}

build-test-publish-to-github-pkgs:
runs-on: ubuntu-latest
permissions:
contents: read
packages: write
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: 14
registry-url: https://npm.pkg.github.com/
- run: npm ci
- run: npm publish
env:
NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
61 changes: 11 additions & 50 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 4 additions & 6 deletions package.json
@@ -1,6 +1,6 @@
{
"name": "rollup-plugin-sass",
"version": "1.12.18",
"version": "1.12.19",
"description": "Rollup Sass files.",
"main": "dist/index.js",
"typings": "dist/index.d.ts",
Expand Down Expand Up @@ -56,16 +56,14 @@
]
},
"dependencies": {
"@rollup/pluginutils": "^3.1.0",
"@rollup/pluginutils": "^3 || ^4 || ^5",
"resolve": "^1.5.0",
"sass": "^1.7.2"
},
"devDependencies": {
"@ava/typescript": "^3.0.1",
"@types/node": "^15.14.9",
"@types/node": "^18.14.6",
"@types/resolve": "^0.0.8",
"@types/rollup": "^0.54.0",
"@types/sass": "^1.16.1",
"ava": "^4.3.1",
"coveralls": "^3.1.1",
"downlevel-dts": "^0.10.0",
Expand All @@ -74,7 +72,7 @@
"jsdom": "^17.0.0",
"nyc": "^15.1.0",
"postcss": "^8.4.16",
"rollup": "^1.32.1",
"rollup": "^1 || ^2 || ^3",
"sinon": "^7.2.2",
"ts-node": "^10.9.1",
"typescript": "^4.7.4"
Expand Down
39 changes: 21 additions & 18 deletions scripts/clean-and-run-downlevel-dts.js
Expand Up @@ -23,30 +23,33 @@ const fs = require('fs').promises,
// ----
(fs.rm ? fs.rm : fs.rmdir)(outputDir, {recursive: true})

.then(() => fs.mkdir(outputDir))
// If error is any other than "file doesn't exist"/"ENOENT" ensure error is thrown.
.catch(err => err.code !== 'ENOENT' ? error(err) : null)

.then(() => fs.copyFile(tsConfigFilePath, tsConfigOutFilePath))
.then(() => fs.mkdir(outputDir))

// Run downlevel-dts
.then(() => new Promise((resolve, reject) => {
.then(() => fs.copyFile(tsConfigFilePath, tsConfigOutFilePath))

// Start downlevel-dts package script
const subProcess = spawn('npm', ['run', 'downlevel-dts'], {cwd: rootDir});
// Run downlevel-dts
.then(() => new Promise((resolve, reject) => {

// Log child process buffer data as `string`
subProcess.stdout.on('data', data => log(data.toString().trim() + '\n'));
// Start downlevel-dts package script
const subProcess = spawn('npm', ['run', 'downlevel-dts'], {cwd: rootDir});

// Log stderr, child process, buffer data as a `string`
subProcess.stderr.on('data', data => warn(data.toString().trim() + '\n'));
// Log child process buffer data as `string`
subProcess.stdout.on('data', data => log(data.toString().trim() + '\n'));

// Handle process end
subProcess.on('close', (code) => code !== 0 ?
reject(`Child process existed with code ${code}.\n`) :
resolve('"clean-and-run-downlevel-dts" completed successfully.\n')
);
// Log stderr, child process, buffer data as a `string`
subProcess.stderr.on('data', data => warn(data.toString().trim() + '\n'));

// Catch process start errors
subProcess.on('error', reject);
}))
// Handle process end
subProcess.on('close', (code) => code !== 0 ?
reject(`Child process existed with code ${code}.\n`) :
resolve('"clean-and-run-downlevel-dts" completed successfully.\n')
);

// Catch process start errors
subProcess.on('error', reject);
}))

)().then(log, error);

0 comments on commit 9e0aca0

Please sign in to comment.