Try to fix lint in the package
This commit is contained in:
@@ -1,2 +1,3 @@
|
|||||||
examples/Jugl.js
|
examples/Jugl.js
|
||||||
examples/resources/
|
examples/resources/
|
||||||
|
build/package/**/*webgl*
|
||||||
|
|||||||
@@ -310,3 +310,4 @@ package:
|
|||||||
@rm build/package/typedefs.js
|
@rm build/package/typedefs.js
|
||||||
@cp css/ol.css build/package
|
@cp css/ol.css build/package
|
||||||
./node_modules/.bin/jscodeshift --transform transforms/module.js build/package
|
./node_modules/.bin/jscodeshift --transform transforms/module.js build/package
|
||||||
|
npm run lint-package
|
||||||
|
|||||||
@@ -13,6 +13,7 @@
|
|||||||
"postinstall": "closure-util update",
|
"postinstall": "closure-util update",
|
||||||
"start": "node tasks/serve.js",
|
"start": "node tasks/serve.js",
|
||||||
"pretest": "eslint tasks test test_rendering src examples",
|
"pretest": "eslint tasks test test_rendering src examples",
|
||||||
|
"lint-package": "eslint --fix build/package",
|
||||||
"test": "node tasks/test.js",
|
"test": "node tasks/test.js",
|
||||||
"debug-server": "node tasks/serve-lib.js"
|
"debug-server": "node tasks/serve-lib.js"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -0,0 +1,5 @@
|
|||||||
|
{
|
||||||
|
"parserOptions": {
|
||||||
|
"sourceType": "module"
|
||||||
|
}
|
||||||
|
}
|
||||||
+13
-9
@@ -1,5 +1,5 @@
|
|||||||
const pkg = require('../package.json');
|
const parentPackage = require('../package.json');
|
||||||
const version = require('../package/package.json').version;
|
const thisPackage = require('../package/package.json');
|
||||||
|
|
||||||
const defines = {
|
const defines = {
|
||||||
'ol.ENABLE_WEBGL': false
|
'ol.ENABLE_WEBGL': false
|
||||||
@@ -17,14 +17,18 @@ function resolve(fromName, toName) {
|
|||||||
let name = toParts[2];
|
let name = toParts[2];
|
||||||
let packageName;
|
let packageName;
|
||||||
let imported;
|
let imported;
|
||||||
for (let i = 0, ii = pkg.ext.length; i < ii; ++i) {
|
for (let i = 0, ii = parentPackage.ext.length; i < ii; ++i) {
|
||||||
const dependency = pkg.ext[i];
|
const dependency = parentPackage.ext[i];
|
||||||
imported = dependency.import;
|
imported = dependency.import;
|
||||||
if (dependency.module === name) {
|
if (dependency.module === name || dependency.name === name) {
|
||||||
packageName = name;
|
|
||||||
break;
|
|
||||||
} else if (dependency.name === name) {
|
|
||||||
packageName = dependency.module;
|
packageName = dependency.module;
|
||||||
|
// ensure dependency is listed on both package.json
|
||||||
|
if (
|
||||||
|
!thisPackage.dependencies[packageName] ||
|
||||||
|
thisPackage.dependencies[packageName] !== parentPackage.dependencies[packageName]
|
||||||
|
) {
|
||||||
|
throw new Error(`Package ${packageName} must appear in all package.json at the same version`);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -128,7 +132,7 @@ module.exports = function(info, api) {
|
|||||||
// replace `ol.VERSION = ''` with correct version
|
// replace `ol.VERSION = ''` with correct version
|
||||||
root.find(j.ExpressionStatement, getMemberExpressionAssignment('ol.VERSION'))
|
root.find(j.ExpressionStatement, getMemberExpressionAssignment('ol.VERSION'))
|
||||||
.forEach(path => {
|
.forEach(path => {
|
||||||
path.value.expression.right = j.literal(version);
|
path.value.expression.right = j.literal(thisPackage.version);
|
||||||
});
|
});
|
||||||
|
|
||||||
const replacements = {};
|
const replacements = {};
|
||||||
|
|||||||
Reference in New Issue
Block a user