Skip to content

Commit c86dec4

Browse files
authored
Merge pull request #83 from pmowrer/revert-fileName
Revert #74
2 parents 8f29d48 + 20d5a1f commit c86dec4

File tree

6 files changed

+1948
-920
lines changed

6 files changed

+1948
-920
lines changed

.babelrc

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"presets": [
3+
[
4+
"@babel/preset-env"
5+
]
6+
]
7+
}

CHANGELOG.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
# Changelog
22

3-
## 4.1.0
3+
## *Deprecated*
4+
For versions above **4.1.0**, please refer to "Releases" in GitHub UI.
45

5-
- Return `fileName` to have sass-loader handle dependency correctly (#74).
6+
## 4.1.0
67

78
## 4.0.1
89
* Update package.json's main field (#73).

package.json

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "node-sass-json-importer",
3-
"version": "4.0.1",
3+
"version": "0.0.0-development",
44
"description": "Allows importing json in sass files parsed by node-sass.",
55
"main": "dist/index.js",
66
"license": "MIT",
@@ -15,23 +15,26 @@
1515
"json"
1616
],
1717
"scripts": {
18-
"test": "mocha --compilers js:babel/register",
18+
"test": "mocha --require @babel/register",
1919
"compile": "mkdirp dist && babel src -d dist",
20-
"prepublish": "npm run compile"
20+
"prepublishOnly": "npm run compile"
2121
},
2222
"peerDependencies": {
2323
"node-sass": ">=3.5.3"
2424
},
2525
"dependencies": {
26-
"is-there": "^4.0.0",
27-
"json5": "^1.0",
28-
"lodash": "^4.17"
26+
"is-there": "^4.4.4",
27+
"json5": "^2.1.1",
28+
"lodash": "^4.17.15"
2929
},
3030
"devDependencies": {
31-
"babel": "^5.8.23",
32-
"chai": "^3.2.0",
33-
"mkdirp": "^0.5.1",
34-
"mocha": "^2.3.2",
31+
"@babel/cli": "^7.8.4",
32+
"@babel/core": "^7.8.4",
33+
"@babel/preset-env": "^7.8.4",
34+
"@babel/register": "^7.8.3",
35+
"chai": "^4.2.0",
36+
"mkdirp": "^1.0.3",
37+
"mocha": "^7.0.1",
3538
"node-sass": ">=3.5.3",
3639
"semantic-release": "^17.0.2",
3740
"semantic-release-github-pr": "^6.0.0"

src/index.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ export default function(options = {}) {
3636

3737
return {
3838
contents: transformJSONtoSass(json),
39-
file: fileName,
4039
};
4140
} catch(error) {
4241
return new Error(`node-sass-json-importer: Error transforming JSON/JSON5 to SASS. Check if your JSON/JSON5 parses correctly. ${error}`);

test/index.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@ describe('node-sass-json-importer', function() {
2020
});
2121

2222
expect(result.css.toString()).to.eql(EXPECTATION);
23-
expect(result.stats.includedFiles).to.eql([
24-
resolve('./test/fixtures/strings/style.scss'),
25-
resolve('./test/fixtures/strings/variables.json'),
26-
].sort());
2723
});
2824

2925
// TODO: Added to verify named exports + CommonJS default export hack (see index.js).

0 commit comments

Comments
 (0)