Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

more brfs cleanup #431

Merged
merged 2 commits into from
Mar 16, 2017
Merged

more brfs cleanup #431

merged 2 commits into from
Mar 16, 2017

Conversation

gnavvy
Copy link
Contributor

@gnavvy gnavvy commented Mar 16, 2017

glsl cleanup
brfs cleanup (except those in tests, brfs as devDep)

@@ -47,7 +47,6 @@
"babel-preset-es2015": "^6.3.13",
"babel-preset-react": "^6.3.13",
"babel-preset-stage-2": "^6.3.13",
"brfs-babel": "^1.0.0",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we still need the transform-loader after removing this (Per my understanding, the webpack transform loader is used to run browserify transforms under webpack, and brfs-babel is a browserify transform).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

theoretically no we don't need it, but removing transform-loader from devDep completely caused tests to fails. (we are still using fs.readFileSync in the tests, I'd assume it is handled by node.js so we should not need transform-loader but it failed in my first trial.

Since transform-loader is in devDep only, I'd prefer to land this PR first to release the rc.2 (a blocker).

@@ -5,7 +5,7 @@
"build": "webpack app bundle.js --env.local --display-error-details"
},
"dependencies": {
"deck.gl": "^4.0.0-beta.3",
"deck.gl": "^4.0.0-rc1",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@shaojingli Didn't notice this until now. Correct semver versioning is 4.0.0-rc.1 (note the last dot). We should probably republish the RC (make it a rc.2).

Hopefully the wildcards will still work and pick up the latest after we change.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. I noticed that yesterday. @Pessimistress 's ocs-lite got updated to this version automatically.

I'm going to republish it today after @gnavvy 's change got landed

// Needed to inline deck.gl GLSL shaders
include: [resolve(__dirname, '../../src')],
loader: 'transform-loader',
options: 'brfs-babel'
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: I still don't see the last line in this example that imports the webpack.local.config, like other examples do. Fine if intentional. Just want to make sure the mechanism is understood.

@gnavvy gnavvy merged commit 3e192d3 into master Mar 16, 2017
@gnavvy gnavvy deleted the glsl-clean-up branch March 16, 2017 17:35
@gnavvy
Copy link
Contributor Author

gnavvy commented Mar 16, 2017

found a regression in layer-browser that mapbox-gl still needs fs, aka cannot remove the transform-loaders I guess.
will patch together with #432

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants