Skip to content

Commit a83908d

Browse files
committed
Using php-arra-loader instead.
1 parent f50595b commit a83908d

File tree

6 files changed

+386
-407
lines changed

6 files changed

+386
-407
lines changed
Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
2-
const phpArrayParser = require('./parser/php-array')
3-
const jsonParser = require('json-loader')
1+
const phpArrayLoader = require('php-array-loader')
2+
const jsonLoader = require('json-loader')
43

54
/**
65
* The Laravel Localization loader.
@@ -9,15 +8,12 @@ const jsonParser = require('json-loader')
98
*/
109
const laravelLocalizationLoader = function(source) {
1110
const isPHP = ~source.indexOf('<?php')
12-
let parsed;
1311

1412
if (isPHP) {
15-
parsed = phpArrayParser(source)
13+
return phpArrayLoader(source)
1614
} else {
17-
parsed = jsonParser(source)
15+
return jsonLoader(source)
1816
}
19-
20-
return parsed
2117
}
2218

2319
module.exports = laravelLocalizationLoader

loader/parser/php-array.js

Lines changed: 0 additions & 44 deletions
This file was deleted.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
},
1212
"devDependencies": {
1313
"jest": "^19.0.2",
14-
"json-loader": "^0.5.4",
1514
"webpack": "^2.2.1",
1615
"webpack-merge": "^4.0.0"
1716
},
1817
"dependencies": {
19-
"php-parser": "^2.0.2"
18+
"json-loader": "^0.5.4",
19+
"php-array-loader": "^1.0.0"
2020
}
2121
}

tests/loader.test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const path = require('path')
2-
const webpack = require('webpack')
32
const merge = require('webpack-merge')
3+
const webpack = require('webpack')
44

55
test('should load PHP Laravel translation file', () => {
66
return runWebpack({
@@ -32,7 +32,7 @@ function runWebpack(config) {
3232
},
3333
resolveLoader: {
3434
alias: {
35-
'laravel-localization-loader': path.resolve(__dirname, '../loader/index.js'),
35+
'laravel-localization-loader': path.resolve(__dirname, '../index.js'),
3636
}
3737
}
3838
}, config)

tests/output/translation.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ return /******/ (function(modules) { // webpackBootstrap
1616
/******/ function __webpack_require__(moduleId) {
1717
/******/
1818
/******/ // Check if module is in cache
19-
/******/ if(installedModules[moduleId])
19+
/******/ if(installedModules[moduleId]) {
2020
/******/ return installedModules[moduleId].exports;
21-
/******/
21+
/******/ }
2222
/******/ // Create a new module (and put it into the cache)
2323
/******/ var module = installedModules[moduleId] = {
2424
/******/ i: moduleId,

0 commit comments

Comments
 (0)