Skip to content

Commit 409cf12

Browse files
author
Olivier Ligot
committed
Make it work with Jspm 0.16
By updating * jspm-loader-css-modules to version 1.0.1-beta1 * jspm-loader-css to version 1.0.1-beta1 Note that due to a bug in SystemJS, one has to modify the file jspm_packages/npm/postcss@5.0.10/lib/parse.js so that a module isn't required in a string. In other words, line 14 has to be changed to something like this (just removing the require statement is enough) throw new Error('Option safe was removed. ' + 'Use parser: "postcss-safe-parser"'); Fixes css-modules#4 css-modules#6 css-modules#7
1 parent f129963 commit 409cf12

File tree

2 files changed

+81
-72
lines changed

2 files changed

+81
-72
lines changed

config.js

Lines changed: 79 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,138 +1,148 @@
11
System.config({
2-
"transpiler": "babel",
3-
"babelOptions": {
2+
defaultJSExtensions: true,
3+
transpiler: "babel",
4+
babelOptions: {
45
"optional": [
56
"runtime"
67
]
78
},
8-
"paths": {
9-
"*": "*.js",
10-
"github:*": "jspm_packages/github/*.js",
11-
"npm:*": "jspm_packages/npm/*.js"
9+
paths: {
10+
"github:*": "jspm_packages/github/*",
11+
"npm:*": "jspm_packages/npm/*"
1212
},
13-
"trace": true
14-
});
13+
trace: true,
1514

16-
System.config({
17-
"map": {
15+
map: {
1816
"babel": "npm:babel-core@5.5.6",
1917
"babel-runtime": "npm:babel-runtime@5.5.6",
2018
"core-js": "npm:core-js@0.9.15",
21-
"css": "npm:jspm-loader-css-modules@0.1.2",
22-
"css-global": "npm:jspm-loader-css@0.1.5",
19+
"css": "npm:jspm-loader-css-modules@1.0.1-beta1",
20+
"css-global": "npm:jspm-loader-css@1.0.1-beta1",
2321
"path": "npm:path@0.11.14",
2422
"github:jspm/nodelibs-assert@0.1.0": {
2523
"assert": "npm:assert@1.3.0"
2624
},
2725
"github:jspm/nodelibs-buffer@0.1.0": {
28-
"buffer": "npm:buffer@3.2.2"
26+
"buffer": "npm:buffer@3.5.1"
2927
},
3028
"github:jspm/nodelibs-path@0.1.0": {
3129
"path-browserify": "npm:path-browserify@0.0.0"
3230
},
33-
"github:jspm/nodelibs-process@0.1.1": {
34-
"process": "npm:process@0.10.1"
31+
"github:jspm/nodelibs-process@0.1.2": {
32+
"process": "npm:process@0.11.2"
3533
},
3634
"github:jspm/nodelibs-util@0.1.0": {
3735
"util": "npm:util@0.10.3"
3836
},
39-
"npm:amdefine@0.1.1": {
40-
"fs": "github:jspm/nodelibs-fs@0.1.2",
41-
"module": "github:jspm/nodelibs-module@0.1.0",
42-
"path": "github:jspm/nodelibs-path@0.1.0",
43-
"process": "github:jspm/nodelibs-process@0.1.1"
44-
},
4537
"npm:assert@1.3.0": {
4638
"util": "npm:util@0.10.3"
4739
},
4840
"npm:babel-runtime@5.5.6": {
49-
"process": "github:jspm/nodelibs-process@0.1.1"
41+
"process": "github:jspm/nodelibs-process@0.1.2"
5042
},
51-
"npm:buffer@3.2.2": {
43+
"npm:buffer@3.5.1": {
5244
"base64-js": "npm:base64-js@0.0.8",
5345
"ieee754": "npm:ieee754@1.1.6",
5446
"is-array": "npm:is-array@1.0.1"
5547
},
5648
"npm:core-js@0.9.15": {
5749
"fs": "github:jspm/nodelibs-fs@0.1.2",
58-
"process": "github:jspm/nodelibs-process@0.1.1",
50+
"process": "github:jspm/nodelibs-process@0.1.2",
5951
"systemjs-json": "github:systemjs/plugin-json@0.1.0"
6052
},
61-
"npm:css-modules-loader-core@0.0.10": {
53+
"npm:css-modules-loader-core@1.0.0": {
6254
"fs": "github:jspm/nodelibs-fs@0.1.2",
55+
"icss-replace-symbols": "npm:icss-replace-symbols@1.0.2",
6356
"path": "github:jspm/nodelibs-path@0.1.0",
64-
"postcss": "npm:postcss@4.1.13",
65-
"postcss-modules-extract-imports": "npm:postcss-modules-extract-imports@0.0.5",
66-
"postcss-modules-local-by-default": "npm:postcss-modules-local-by-default@0.0.9",
67-
"postcss-modules-scope": "npm:postcss-modules-scope@0.0.7"
68-
},
69-
"npm:css-selector-tokenizer@0.4.1": {
57+
"postcss": "npm:postcss@5.0.10",
58+
"postcss-modules-extract-imports": "npm:postcss-modules-extract-imports@1.0.0",
59+
"postcss-modules-local-by-default": "npm:postcss-modules-local-by-default@1.0.0",
60+
"postcss-modules-scope": "npm:postcss-modules-scope@1.0.0",
61+
"postcss-modules-values": "npm:postcss-modules-values@1.1.0"
62+
},
63+
"npm:css-selector-tokenizer@0.5.4": {
64+
"cssesc": "npm:cssesc@0.1.0",
7065
"fastparse": "npm:fastparse@1.1.1"
7166
},
72-
"npm:css-selector-tokenizer@0.5.2": {
73-
"fastparse": "npm:fastparse@1.1.1"
74-
},
75-
"npm:es6-promise@2.3.0": {
76-
"assert": "github:jspm/nodelibs-assert@0.1.0",
77-
"process": "github:jspm/nodelibs-process@0.1.1",
78-
"util": "github:jspm/nodelibs-util@0.1.0"
67+
"npm:debounce@1.0.0": {
68+
"date-now": "npm:date-now@1.0.1"
7969
},
8070
"npm:fastparse@1.1.1": {
81-
"process": "github:jspm/nodelibs-process@0.1.1"
71+
"process": "github:jspm/nodelibs-process@0.1.2"
72+
},
73+
"npm:has-flag@1.0.0": {
74+
"process": "github:jspm/nodelibs-process@0.1.2"
8275
},
8376
"npm:inherits@2.0.1": {
8477
"util": "github:jspm/nodelibs-util@0.1.0"
8578
},
86-
"npm:js-base64@2.1.8": {
79+
"npm:js-base64@2.1.9": {
8780
"buffer": "github:jspm/nodelibs-buffer@0.1.0"
8881
},
89-
"npm:jspm-loader-css-modules@0.1.2": {
90-
"jspm-loader-css": "npm:jspm-loader-css@0.1.5"
82+
"npm:jspm-loader-css-modules@1.0.1-beta1": {
83+
"jspm-loader-css": "npm:jspm-loader-css@1.0.1-beta1"
9184
},
92-
"npm:jspm-loader-css@0.1.5": {
93-
"css-modules-loader-core": "npm:css-modules-loader-core@0.0.10",
94-
"path": "npm:path@0.11.14"
85+
"npm:jspm-loader-css@1.0.1-beta1": {
86+
"css-modules-loader-core": "npm:css-modules-loader-core@1.0.0",
87+
"debounce": "npm:debounce@1.0.0",
88+
"path": "npm:path@0.12.7",
89+
"toposort": "npm:toposort@0.2.12"
9590
},
9691
"npm:path-browserify@0.0.0": {
97-
"process": "github:jspm/nodelibs-process@0.1.1"
92+
"process": "github:jspm/nodelibs-process@0.1.2"
9893
},
9994
"npm:path@0.11.14": {
10095
"fs": "github:jspm/nodelibs-fs@0.1.2",
101-
"process": "github:jspm/nodelibs-process@0.1.1",
96+
"process": "github:jspm/nodelibs-process@0.1.2",
10297
"util": "github:jspm/nodelibs-util@0.1.0"
10398
},
104-
"npm:postcss-modules-extract-imports@0.0.5": {
105-
"postcss": "npm:postcss@4.1.13",
106-
"process": "github:jspm/nodelibs-process@0.1.1"
99+
"npm:path@0.12.7": {
100+
"process": "npm:process@0.11.2",
101+
"util": "npm:util@0.10.3"
102+
},
103+
"npm:postcss-modules-extract-imports@1.0.0": {
104+
"postcss": "npm:postcss@5.0.10",
105+
"process": "github:jspm/nodelibs-process@0.1.2"
106+
},
107+
"npm:postcss-modules-local-by-default@1.0.0": {
108+
"css-selector-tokenizer": "npm:css-selector-tokenizer@0.5.4",
109+
"postcss": "npm:postcss@5.0.10"
107110
},
108-
"npm:postcss-modules-local-by-default@0.0.9": {
109-
"css-selector-tokenizer": "npm:css-selector-tokenizer@0.4.1",
110-
"postcss": "npm:postcss@4.1.13"
111+
"npm:postcss-modules-scope@1.0.0": {
112+
"css-selector-tokenizer": "npm:css-selector-tokenizer@0.5.4",
113+
"postcss": "npm:postcss@5.0.10",
114+
"process": "github:jspm/nodelibs-process@0.1.2"
111115
},
112-
"npm:postcss-modules-scope@0.0.7": {
113-
"css-selector-tokenizer": "npm:css-selector-tokenizer@0.5.2",
114-
"postcss": "npm:postcss@4.1.13",
115-
"process": "github:jspm/nodelibs-process@0.1.1"
116+
"npm:postcss-modules-values@1.1.0": {
117+
"icss-replace-symbols": "npm:icss-replace-symbols@1.0.2",
118+
"postcss": "npm:postcss@5.0.10"
116119
},
117-
"npm:postcss@4.1.13": {
118-
"es6-promise": "npm:es6-promise@2.3.0",
120+
"npm:postcss@5.0.10": {
119121
"fs": "github:jspm/nodelibs-fs@0.1.2",
120-
"js-base64": "npm:js-base64@2.1.8",
122+
"js-base64": "npm:js-base64@2.1.9",
121123
"path": "github:jspm/nodelibs-path@0.1.0",
122-
"process": "github:jspm/nodelibs-process@0.1.1",
123-
"source-map": "npm:source-map@0.4.2",
124+
"process": "github:jspm/nodelibs-process@0.1.2",
125+
"source-map": "npm:source-map@0.5.3",
126+
"supports-color": "npm:supports-color@3.1.2",
124127
"systemjs-json": "github:systemjs/plugin-json@0.1.0"
125128
},
126-
"npm:source-map@0.4.2": {
127-
"amdefine": "npm:amdefine@0.1.1",
128-
"fs": "github:jspm/nodelibs-fs@0.1.2",
129-
"path": "github:jspm/nodelibs-path@0.1.0",
130-
"process": "github:jspm/nodelibs-process@0.1.1"
129+
"npm:process@0.11.2": {
130+
"assert": "github:jspm/nodelibs-assert@0.1.0"
131+
},
132+
"npm:source-map@0.5.3": {
133+
"process": "github:jspm/nodelibs-process@0.1.2"
134+
},
135+
"npm:supports-color@3.1.2": {
136+
"has-flag": "npm:has-flag@1.0.0",
137+
"process": "github:jspm/nodelibs-process@0.1.2"
138+
},
139+
"npm:toposort@0.2.12": {
140+
"assert": "github:jspm/nodelibs-assert@0.1.0",
141+
"process": "github:jspm/nodelibs-process@0.1.2"
131142
},
132143
"npm:util@0.10.3": {
133144
"inherits": "npm:inherits@2.0.1",
134-
"process": "github:jspm/nodelibs-process@0.1.1"
145+
"process": "github:jspm/nodelibs-process@0.1.2"
135146
}
136147
}
137148
});
138-

package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
{
22
"jspm": {
3-
"directories": {},
43
"dependencies": {
5-
"css": "npm:jspm-loader-css-modules@^0.1.2",
6-
"css-global": "npm:jspm-loader-css@^0.1.3",
4+
"css": "npm:jspm-loader-css-modules@^1.0.1-beta1",
5+
"css-global": "npm:jspm-loader-css@^1.0.1-beta1",
76
"path": "npm:path@^0.11.14"
87
},
98
"devDependencies": {

0 commit comments

Comments
 (0)