Ensure style-spec is published with mapbox-gl (#6586)

Cherry pick 478dd56 from master * Ensure style spec is published with build Closes #6433 Closes #6574 * Consolidate build unit test commands * Workaround CI image path bash/sh issue mapbox/mbgl-ci-images#17
mapbox · May 3, 2018 · d358246 · d358246
1 parent 3f43d80
commit d358246
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 48 deletions.
diff --git a/circle.yml b/circle.yml
@@ -130,6 +130,8 @@ jobs:
           at: .
       - run: yarn run build-min
       - run: yarn run build-dev
+      - run: yarn run build-style-spec
+      - run: yarn run test-build
       - persist_to_workspace:
           root: .
           paths:

diff --git a/package.json b/package.json
@@ -114,9 +114,10 @@
     "sourceCache": true
   },
   "scripts": {
-    "build-dev": "rollup -c --environment BUILD:dev && build/run-tap --no-coverage test/build/dev.test.js",
+    "build-dev": "rollup -c --environment BUILD:dev",
     "watch-dev": "rollup -c --environment BUILD:dev --watch",
-    "build-min": "rollup -c --environment BUILD:production && build/run-tap --no-coverage test/build/min.test.js",
+    "build-min": "rollup -c --environment BUILD:production",
+    "build-style-spec": "cd src/style-spec && npm run build && cd ../.. && cp -R src/style-spec/dist dist/style-spec",
     "build-token": "node build/generate-access-token-script.js",
     "build-benchmarks": "BENCHMARK_VERSION=${BENCHMARK_VERSION:-\"$(git rev-parse --abbrev-ref HEAD) $(git rev-parse --short=7 HEAD)\"} rollup -c bench/rollup_config_benchmarks.js",
     "build-benchmarks-view": "BENCHMARK_VERSION=${BENCHMARK_VERSION:-\"$(git rev-parse --abbrev-ref HEAD) $(git rev-parse --short=7 HEAD)\"} rollup -c bench/rollup_config_benchmarks_view.js",
@@ -137,13 +138,14 @@
     "test-suite": "run-s test-render test-query",
     "test-suite-clean": "find test/integration/{render,query}-tests -mindepth 2 -type d  -not \\( -exec test -e \"{}/style.json\" \\; \\) -print | xargs -t rm -r",
     "test-unit": "build/run-tap --reporter classic --no-coverage test/unit",
+    "test-build": "build/run-tap --no-coverage test/build/**/*.test.js",
     "test-render": "node --max-old-space-size=2048 test/render.test.js",
     "test-query": "node test/query.test.js",
     "test-expressions": "build/run-node test/expression.test.js",
     "test-flow": "node build/generate-flow-typed-style-spec && flow .",
     "test-flow-cov": "flow-coverage-report -i 'src/**/*.js' -t html",
     "test-cov": "nyc --require=@mapbox/flow-remove-types/register --reporter=text-summary --reporter=lcov --cache run-s test-unit test-expressions test-query test-render",
-    "prepublish": "in-publish && run-s build-dev build-min || not-in-publish",
+    "prepublish": "in-publish && run-s build-dev build-min build-style-spec test-build || not-in-publish",
     "codegen": "build/run-node build/generate-style-code.js && build/run-node build/generate-struct-arrays.js"
   },
   "files": [

diff --git a/test/build/style-spec.test.js b/test/build/style-spec.test.js
@@ -4,7 +4,6 @@
 const test = require('mapbox-gl-js-test').test;
 const fs = require('fs');
 const path = require('path');
-const exec = require('child_process').exec;
 const isBuiltin = require('is-builtin-module');
 
 const Linter = require('eslint').Linter;
@@ -15,55 +14,43 @@ import rollupConfig from '../../src/style-spec/rollup.config';
 // some paths
 const styleSpecDirectory = path.join(__dirname, '../../src/style-spec');
 const styleSpecPackage = require('../../src/style-spec/package.json');
-const styleSpecDistBundle = path.join(styleSpecDirectory, styleSpecPackage.main);
+const styleSpecDistBundle = fs.readFileSync(path.join(__dirname, '../../dist/style-spec/index.js'), 'utf-8');
 
 test('@mapbox/mapbox-gl-style-spec npm package', (t) => {
-    // simulate npm install of @mapbox/mapbox-gl-style-spec
     t.test('build plain ES5 bundle in prepublish', (t) => {
-        t.tearDown(() => {
-            fs.unlink(styleSpecDistBundle, (error) => {
-                if (error) console.error(error);
-            });
-        });
-
-        exec(`rm -f ${styleSpecDistBundle} && npm run build`, { cwd: styleSpecDirectory }, (error) => {
-            t.error(error);
-            t.ok(fs.existsSync(styleSpecDistBundle), 'dist bundle exists');
+        const linter = new Linter();
+        const messages = linter.verify(styleSpecDistBundle, {
+            parserOptions: {
+                ecmaVersion: 5
+            },
+            rules: {},
+            env: {
+                node: true
+            }
+        }).map(message => `${message.line}:${message.column}: ${message.message}`);
+        t.deepEqual(messages, [], 'distributed bundle is plain ES5 code');
+
+        t.stub(console, 'warn');
+        rollup.rollup({
+            input: `${styleSpecDirectory}/style-spec.js`,
+            plugins: [{
+                resolveId: (id, importer) => {
+                    if (
+                        /^[\/\.]/.test(id) ||
+                        isBuiltin(id) ||
+                        /node_modules/.test(importer)
+                    ) {
+                        return null;
+                    }
 
-            const linter = new Linter();
-            const messages = linter.verify(fs.readFileSync(styleSpecDistBundle, 'utf-8'), {
-                parserOptions: {
-                    ecmaVersion: 5
-                },
-                rules: {},
-                env: {
-                    node: true
+                    t.ok(styleSpecPackage.dependencies[id], `External dependency ${id} (imported from ${importer}) declared in style-spec's package.json`);
+                    return false;
                 }
-            }).map(message => `${message.line}:${message.column}: ${message.message}`);
-            t.deepEqual(messages, [], 'distributed bundle is plain ES5 code');
-
-            t.stub(console, 'warn');
-            rollup.rollup({
-                input: `${styleSpecDirectory}/style-spec.js`,
-                plugins: [{
-                    resolveId: (id, importer) => {
-                        if (
-                            /^[\/\.]/.test(id) ||
-                            isBuiltin(id) ||
-                            /node_modules/.test(importer)
-                        ) {
-                            return null;
-                        }
-
-                        t.ok(styleSpecPackage.dependencies[id], `External dependency ${id} (imported from ${importer}) declared in style-spec's package.json`);
-                        return false;
-                    }
-                }].concat(rollupConfig[0].plugins)
-            }).then(() => {
-                t.end();
-            }).catch(e => {
-                t.error(e);
-            });
+            }].concat(rollupConfig[0].plugins)
+        }).then(() => {
+            t.end();
+        }).catch(e => {
+            t.error(e);
         });
     });