Replace bower with npm

wet-boew · May 8, 2018 · 59e0c1c · 59e0c1c
1 parent 50b438b
commit 59e0c1c
Show file tree

Hide file tree

Showing 10 changed files with 41 additions and 93 deletions.
diff --git a/.bowerrc b/.bowerrc
diff --git a/Gruntfile.coffee b/Gruntfile.coffee
@@ -51,15 +51,6 @@ module.exports = (grunt) ->
 		]
 	)
 
-	@registerTask(
-		"init"
-		"Only needed when the repo is first cloned"
-		[
-			"install-dependencies"
-			"hub"
-		]
-	)
-
 	@registerTask(
 		"deploy"
 		"Build and deploy artifacts to wet-boew-dist"
@@ -183,8 +174,8 @@ module.exports = (grunt) ->
 		# Metadata.
 		pkg: @file.readJSON "package.json"
 		themeDist: "dist/<%= pkg.name %>"
-		jqueryVersion: @file.readJSON "lib/jquery/bower.json"
-		jqueryOldIEVersion: @file.readJSON "lib/jquery-oldIE/bower.json"
+		#jqueryVersion: grunt.file.readJSON("lib/jquery/bower.json")
+		#jqueryOldIEVersion: grunt.file.readJSON("lib/jquery-oldIE/bower.json")
 		banner: "/*!\n * Web Experience Toolkit (WET) / Boîte à outils de l'expérience Web (BOEW)\n * wet-boew.github.io/wet-boew/License-en.html / wet-boew.github.io/wet-boew/Licence-fr.html\n" +
 				" * v<%= pkg.version %> - " + "<%= grunt.template.today('yyyy-mm-dd') %>\n *\n */"
 
@@ -212,7 +203,6 @@ module.exports = (grunt) ->
 
 		clean:
 			dist: [ "dist"]
-			lib: ["lib"]
 			deps: ["<%= themeDist %>/theme-js-deps"]
 
 		concat:
@@ -230,22 +220,22 @@ module.exports = (grunt) ->
 
 			test:
 				src: [
-					"lib/wet-boew/src/test.js"
+					"node_modules/wet-boew/src/test.js"
 					"src/**/test.js"
 				]
 				dest: "dist/unmin/test/tests.js"
 
 		copy:
 			wetboew:
 				expand: true
-				cwd: "lib/wet-boew/dist"
+				cwd: "node_modules/wet-boew/dist"
 				src: [
 					"wet-boew/**/*.*"
 				]
 				dest: "dist"
 			wetboew_demo:
 				expand: true
-				cwd: "lib/wet-boew/dist/unmin"
+				cwd: "node_modules/wet-boew/dist/unmin"
 				src: [
 					"demos/**/*.*"
 					"docs/**/*.*"
@@ -255,7 +245,7 @@ module.exports = (grunt) ->
 				dest: "dist/unmin"
 			wetboew_demo_min:
 				expand: true
-				cwd: "lib/wet-boew/dist"
+				cwd: "node_modules/wet-boew/dist"
 				src: "<%= copy.wetboew_demo.src %>"
 				dest: "dist"
 			site:
@@ -277,7 +267,7 @@ module.exports = (grunt) ->
 			js_lib:
 				expand: true
 				flatten: true
-				cwd: "lib"
+				cwd: "node_modules"
 				src: [
 					"jsonpointer/src/jsonpointer.js"
 					"JSON-Patch/src/json-patch.js"
@@ -406,6 +396,10 @@ module.exports = (grunt) ->
 					]
 
 		sass:
+			options:
+				includePaths: [
+					"./node_modules"
+				]
 			all:
 				expand: true
 				cwd: "src"
@@ -508,15 +502,15 @@ module.exports = (grunt) ->
 					sanitize: false
 				production: false
 				data: [
-					"lib/wet-boew/site/data/**/*.{yml,json}"
+					"node_modules/wet-boew/site/data/**/*.{yml,json}"
 					"site/data/**/*.{yml,json}"
 				]
 				helpers: [
-					"lib/wet-boew/site/helpers/helper{,s}-*.js"
+					"node_modules/wet-boew/site/helpers/helper{,s}-*.js"
 					"site/helpers/helper{,s}-*.js"
 				]
 				partials: [
-					"lib/wet-boew/site/includes/**/*.hbs"
+					"node_modules/wet-boew/site/includes/**/*.hbs"
 					"site/includes/**/*.hbs"
 				]
 				layoutdir: "site/layouts"
@@ -528,7 +522,7 @@ module.exports = (grunt) ->
 
 			ajax:
 				options:
-					layoutdir: "lib/wet-boew/site/layouts"
+					layoutdir: "node_modules/wet-boew/site/layouts"
 					layout: "ajax.hbs"
 
 				cwd: "site/pages/ajax"
@@ -561,34 +555,34 @@ module.exports = (grunt) ->
 					,
 						#docs
 						expand: true
-						cwd: "lib/wet-boew/site/pages/docs"
+						cwd: "node_modules/wet-boew/site/pages/docs"
 						src: [
 							"**/*.hbs"
 						]
 						dest: "dist/unmin/docs"
 					,
 						#plugins
 						expand: true
-						cwd: "lib/wet-boew/site/pages/demos"
+						cwd: "node_modules/wet-boew/site/pages/demos"
 						src: [
 							"**/*.hbs"
 						]
 						dest: "dist/unmin/demos"
 					,
 						expand: true
-						cwd: "lib/wet-boew/src/plugins"
+						cwd: "node_modules/wet-boew/src/plugins"
 						src: [
 							"**/*.hbs"
 						]
 						dest: "dist/unmin/demos"
 					,
 						expand: true
-						cwd: "lib/wet-boew/src/polyfills"
+						cwd: "node_modules/wet-boew/src/polyfills"
 						src: "**/*.hbs"
 						dest: "dist/unmin/demos"
 					,
 						expand: true
-						cwd: "lib/wet-boew/src/other"
+						cwd: "node_modules/wet-boew/src/other"
 						src: "**/*.hbs"
 						dest: "dist/unmin/demos"
 				]
@@ -729,28 +723,13 @@ module.exports = (grunt) ->
 
 		eslint:
 			options:
-				configFile: if process.env.CI == "true" then "lib/wet-boew/.eslintrc.ci.json" else "lib/wet-boew/.eslintrc.json"
+				configFile: if process.env.CI == "true" then "node_modules/wet-boew/.eslintrc.ci.json" else "node_modules/wet-boew/.eslintrc.json"
 				quiet: true
 			all:
 				src: [
 					"src/**/*.js"
 				]
 
-		hub:
-			"wet-boew":
-				src: [
-					"lib/wet-boew/Gruntfile.coffee"
-				]
-				tasks: [
-					"dist"
-				]
-
-		"install-dependencies":
-			options:
-				cwd: "lib/wet-boew"
-				failOnError: false
-				isDevelopment: true
-
 		connect:
 			options:
 				port: 8000

diff --git a/bower.json b/bower.json
diff --git a/package.json b/package.json
@@ -5,7 +5,7 @@
   "main": "index.html",
   "scripts": {
     "test": "grunt test",
-    "postinstall": "bower update",
+    "prepare": "grunt dist",
     "travis_script": "grunt dist test-mocha",
     "travis_after_success": "grunt deploy"
   },
@@ -29,13 +29,18 @@
   ],
   "author": "",
   "license": "MIT",
+  "dependencies": {
+    "fast-json-patch": "github:wet-boew/JSON-Patch#wb1.0+1.1.4",
+    "jsonpointer.js": "^0.4.0",
+    "wet-boew": "wet-boew/wet-boew"
+  },
   "devDependencies": {
-    "assemble-contrib-i18n": "~0.1.2",
+    "assemble-contrib-i18n": "0.1.*",
     "eslint-config-jquery": "^1.0.0",
     "expect.js": "^0.3.1",
     "grunt": "~0.4.5",
     "grunt-assemble": "~0.6.3",
-    "grunt-autoprefixer": "^0.7.2",
+    "grunt-autoprefixer": "^3.0.3",
     "grunt-banner": "^0.3.1",
     "grunt-bootlint": "^0.9.1",
     "grunt-check-dependencies": "~0.6.0",
@@ -53,14 +58,13 @@
     "grunt-html": "^5.0.0",
     "grunt-hub": "~0.7.0",
     "grunt-i18n-csv": "0.1.0",
-    "grunt-install-dependencies": "~0.2.0",
     "grunt-mocha": "~0.4.12",
-    "grunt-sass": "^1.0.0",
+    "grunt-sass": "^2.0.0",
     "grunt-sass-lint": "^0.2.0",
     "grunt-wet-boew-postbuild": "^0.1.4",
     "load-grunt-tasks": "^3.2.0",
     "mocha": "^1.21.5",
     "sinon": "~1.12.2",
     "time-grunt": "~1.3.0"
   }
-}
+}
diff --git a/site/layouts/default.hbs b/site/layouts/default.hbs
@@ -1,6 +1,6 @@
 ---
 {
-"layout": "../../lib/wet-boew/site/layouts/core.hbs"
+"layout": "../../node_modules/wet-boew/site/layouts/core.hbs"
 }
 ---
 {{>google}}

diff --git a/src/_variables.scss b/src/_variables.scss
@@ -33,4 +33,4 @@ $menu-colour: #555;
 
 $input-color-placeholder: #5c5c5c !important;
 
-@import "../lib/wet-boew/src/variables";
+@import "wet-boew/src/variables";
diff --git a/src/ie8-theme-srv.scss b/src/ie8-theme-srv.scss
@@ -8,10 +8,10 @@
 
 @import "variables";
 
-@import "../lib/wet-boew/src/base/ie8-bootstrap";
+@import "wet-boew/src/base/ie8-bootstrap";
 
 /* WET Core */
-@import "../lib/wet-boew/src/base/ie8-wet-boew";
+@import "wet-boew/src/base/ie8-wet-boew";
 
 /*
  Views

diff --git a/src/ie8-theme.scss b/src/ie8-theme.scss
@@ -5,10 +5,10 @@
 
 @import "variables";
 
-@import "../lib/wet-boew/src/base/ie8-bootstrap";
+@import "wet-boew/src/base/ie8-bootstrap";
 
 /* WET Core */
-@import "../lib/wet-boew/src/base/ie8-wet-boew";
+@import "wet-boew/src/base/ie8-wet-boew";
 
 /*
  * GCWeb Theme
@@ -151,5 +151,3 @@
 	@import "share/print";
 	@import "social-media-icons/print";
 }
-
-
diff --git a/src/theme-srv.scss b/src/theme-srv.scss
@@ -8,10 +8,10 @@
 
 @import "variables";
 
-@import "../lib/wet-boew/src/base/bootstrap";
+@import "wet-boew/src/base/bootstrap";
 
 /* WET Core */
-@import "../lib/wet-boew/src/base/wet-boew";
+@import "wet-boew/src/base/wet-boew";
 
 /*
  Views

diff --git a/src/theme.scss b/src/theme.scss
@@ -9,10 +9,10 @@
 
 @import "variables";
 
-@import "../lib/wet-boew/src/base/bootstrap";
+@import "wet-boew/src/base/bootstrap";
 
 /* WET Core */
-@import "../lib/wet-boew/src/base/wet-boew";
+@import "wet-boew/src/base/wet-boew";
 
 /*
  * GCWeb Theme